update: 设置固化时间和分组有效期得关系

src/view/memberGroup/memberGroupEdit.vue

@@ -291,7 +291,7 @@ export default {
         updateDay: '',
         effectiveStatus: 1,
         fixedType: 0, // 是否固化人群
-        fixedTime: new Date(), // 期初固化时间
+        fixedTime: parseTime(new Date().setHours(24,0,0,0), '{y}-{m}-{d}'), // 期初固化时间
         isTogether: false // 是否同时开启非固化分组
       },
       refreshList: {},
@@ -319,7 +319,7 @@ export default {
       },
       fixedTimeOptions: {
         disabledDate: (date)=> {
-          let begin = new Date().setHours(0,0,0,0);
+          let begin = new Date().setHours(24,0,0,0);
           let end = new Date(this.ruleForm.effectiveDateTmp).getTime();
           return date.getTime() < begin || date.getTime() > end ;
         }
@@ -446,13 +446,6 @@ export default {
     'ruleForm.fixedType'(newVal) {
       const { isActive } = this.ruleForm;
       this.ruleForm.updateType = this.watchUpdateType(isActive, newVal);
-    },
-    'ruleForm.effectiveDateTmp'(newVal) {
-      const fixedTime = new Date(this.ruleForm.fixedTime);
-      const newTime = new Date(newVal);
-      if (+newTime <= +fixedTime) {
-        this.ruleForm.fixedTime = new Date(newVal);
-      }
     }
   },
   methods: {
@@ -543,11 +536,16 @@ export default {
     confirmSavePost() {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
+          const { fixedType, fixedTime, effectiveDateTmp } = this.ruleForm;
           const isEmpty = this.ruleForm.selectedTags.length === 0 || this.ruleForm.selectedTags.some(item => item.length === 0);
           if (isEmpty) {
             this.$message.error({ message: '请至少保留一个标签!' });
             return false;
           }
+          if (fixedType && new Date(fixedTime).setHours(0,0,0,0) > new Date(effectiveDateTmp).setHours(0,0,0,0)) {
+            this.$message.error({ message: '固化生效时间不能晚于分组有效期' });
+            return false;
+          }
           this.postSave();
         }
       });

src/view/platformTag/member-tag.vue

@@ -249,7 +249,7 @@ export default {
         isRealTime: 0, // 实时
         effectiveStatus: 1, // 有效状态nage
         fixedType: 0, // 是否固化人群
-        fixedTime: parseTime(new Date(), '{y}-{m}-{d}'), // 期初固化时间
+        fixedTime: parseTime(new Date().setHours(24,0,0,0), '{y}-{m}-{d}'), // 期初固化时间
         isTogether: false
       },
       activeTagsGroupIndex: 0,
@@ -274,7 +274,7 @@ export default {
       },
       fixedTimeOptions: {
         disabledDate: (date)=> {
-          let begin = new Date().setHours(0,0,0,0);
+          let begin = new Date().setHours(24,0,0,0);
           let end = new Date(this.tagConfig.date).getTime();
           return date.getTime() < begin || date.getTime() > end ;
         }
@@ -477,10 +477,10 @@ export default {
       //   return;
       // }
 
-      // if (param.fixedType === 2 && new Date(this.tagConfig.fixedTime) > new Date(this.tagConfig.fixedEndTime)) {
-      //   this.$message.error({ message: '固化开始时间不允许晚于结束时间!' });
-      //   return false;
-      // }
+      if (param.fixedType && new Date(this.tagConfig.fixedTime).setHours(0,0,0,0) > new Date(this.tagConfig.date).setHours(0,0,0,0)) {
+        this.$message.error({ message: '固化生效时间不能晚于分组有效期' });
+        return false;
+      }
 
       if (param.fixedType) {
         param.fixedTime = this.tagConfig.fixedTime;
@@ -907,13 +907,6 @@ export default {
       const { isRealTime } = this.tagConfig;
       this.tagConfig.updateType = this.watchUpdateType(isRealTime, newVal);
     },
-    'tagConfig.date'(newVal) {
-      const fixedTime = new Date(this.tagConfig.fixedTime);
-      const newTime = new Date(newVal);
-      if (+newTime <= +fixedTime) {
-        this.tagConfig.fixedTime = new Date(newVal);
-      }
-    }
   }
 };
 </script>