Merge remote-tracking branch 'remotes/origin/dev-mvp-20200331' into release

src/components/education/template/templateMessage.vue

@@ -51,7 +51,7 @@
         </el-popover>
       </el-form-item>
 
-      <div>
+      <div v-if="formData.expireDay">
         <el-form-item label="项目时间：" required>
           <el-col :span="5">
             <el-form-item prop="projectBegintime">
@@ -300,7 +300,13 @@ export default {
       pickerOptions1: {
         disabledDate: time => {
           if( !(time.getTime() < new Date(vm.formData.projectBegintime).getTime() || time.getTime() > new Date(vm.formData.projectBegintime).getTime() + 1000 * 60 * 60 * 24 * vm.formData.expireDay)) {
-            console.log('可以使用的天数');
+            console.log('开始时间:',vm.formData.projectBegintime);
+            console.log('今天之前：',time.getTime() < new Date(vm.formData.projectBegintime).getTime());
+            console.log('当前时间大于有效期:', time.getTime() > new Date(vm.formData.projectBegintime).getTime() + 1000 * 60 * 60 * 24 * vm.formData.expireDay);
+            console.log('当前时间：',new Date(time.getTime()));
+            console.log('有效期最后一天:',new Date(new Date(vm.formData.projectBegintime).getTime() + 1000 * 60 * 60 * 24 * vm.formData.expireDay));
+            console.log('可以使用的天数:',vm.formData.expireDay);
+            console.log('====================================');
           }
           return (
             time.getTime() < new Date(vm.formData.projectBegintime).getTime() || time.getTime() > new Date(vm.formData.projectBegintime).getTime() + 1000 * 60 * 60 * 24 * vm.formData.expireDay