update: 固化时间校验

src/components/tag/tag-config-options.vue

@@ -841,7 +841,7 @@
               <div slot="content">可根据客户最新一次同意协议的时间来筛选符合条件的客户。由于协议可能存在更新，客户同意协议的版本可能不一，建议根据“后台最新一次上传协议文件的时间至当前时间”来筛选出同意了最新版协议的客户；</div>
               <i class="iconfont icon-tishi m-l-4" style="color: #909399"></i></el-tooltip></label>
             <el-date-picker v-model="parent.date" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="选择日期"></el-date-picker><span class="m-l-16">至&nbsp;&nbsp;当前时间</span>
-            <el-popover placement="bottom" width="600" trigger="click" :open-delay="200">
+            <el-popover placement="bottom" width="600" trigger="click" :open-delay="200" v-if="!parent.channel">
               <el-table :data="parent.options" max-height="400">
                 <el-table-column min-width="150" property="agreementName" label="协议名称"></el-table-column>
                 <el-table-column width="100" property="agreementType" label="协议类型">
@@ -851,7 +851,7 @@
                   <template slot-scope="{row}">{{row.createTime|formatDate}}</template>
                 </el-table-column>
               </el-table>
-              <el-button slot="reference" type="text" class="m-l-16" v-if="!parent.channel">查看上传记录</el-button>
+              <el-button slot="reference" type="text" class="m-l-16">查看上传记录</el-button>
             </el-popover>
           </div>
         </div>

src/view/memberGroup/memberGroupEdit.vue

@@ -48,9 +48,11 @@
               <el-date-picker
                 v-model="ruleForm.effectiveDateTmp"
                 type="date"
+                :clearable="false"
                 value-format="yyyy-MM-dd HH:mm:ss"
                 default-time="23:59:59"
                 :picker-options="pickerOptions"
+                 @change="validPeriodDateChange"
               ></el-date-picker>
             </el-form-item>
             <el-form-item label prop :class="{'m-l-60': ruleForm.selectedTags.length > 1}">
@@ -434,12 +436,16 @@ export default {
             return tagsGroup.length === 0 || tagsGroup.some(tag => parseInt(tag.isActive) === 0);
           });
         this.ruleForm.isActive = flag ? 0 : 1;
-        fixEndTime=+new Date(n.effectiveDateTmp) + (1000 * 60 * 60 * 24)
-        this.ruleForm.fixedEndTime=parseTime(fixEndTime)
       }
     }
   },
   methods: {
+    validPeriodDateChange(v){
+      fixEndTime=+new Date(v) + (1000 * 60 * 60 * 24)
+      this.ruleForm.fixedEndTime=parseTime(fixEndTime)
+      this.ruleForm.fixedTime=parseTime(fixBeginTime)
+
+    },
     // 设置默认的分组有效期
     defaultDate() {
       let date = new Date(new Date().getTime() + 90 * 24 * 3600 * 1000);
@@ -533,6 +539,10 @@ export default {
             this.$message.error({ message: '请至少保留一个标签!' });
             return false;
           }
+          if (this.ruleForm.fixedType===2&&new Date(this.ruleForm.fixedTime) >new Date(this.ruleForm.fixedEndTime)) {
+            this.$message.error({ message: '固化开始时间不允许晚于结束时间!' });
+            return false;
+          }
           this.postSave();
         }
       });

src/view/platformTag/member-tag.vue

@@ -92,7 +92,7 @@
                   <i class="form-tip-icon">i</i>
                 </el-tooltip>
               </label>
-              <el-date-picker class="w-220" v-model="tagConfig.date" :picker-options="pickerOptions" value-format="yyyy-MM-dd HH:mm:ss" type="date" placeholder="选择日期"> </el-date-picker>
+              <el-date-picker class="w-220" :clearable="false" v-model="tagConfig.date" :picker-options="pickerOptions" value-format="yyyy-MM-dd HH:mm:ss" type="date" placeholder="选择日期" @change="validPeriodDateChange"> </el-date-picker>
             </div>
             <div :class="['form-item', {'margin-60': marginSixty}]">
               <label for="">分组所属分类</label>
@@ -311,15 +311,6 @@ export default {
       isSync: false  // 是否开启自动同步开关
     };
   },
-  watch: {
-    tagConfig: {
-      deep: true,
-      handler: function(n,o){
-        fixEndTime=+new Date(n.date) + (1000 * 60 * 60 * 24)
-        this.tagConfig.fixedEndTime=parseTime(fixEndTime)
-      }
-    }
-  },
   computed: {
     groupListNumber() {
       let listNumber = 0;
@@ -338,6 +329,11 @@ export default {
   },
 
   methods: {
+    validPeriodDateChange(v){
+      fixEndTime=+new Date(v) + (1000 * 60 * 60 * 24)
+      this.tagConfig.fixedEndTime=parseTime(fixEndTime)
+      this.tagConfig.fixedTime=parseTime(fixBeginTime)
+    },
     getMemberTagGradeEnsure() {
       getMemberTagGradeEnsure({ requestProject: 'gic-member-tag-web' })
         .then(res => this.memberTagGradeEnsure = res.result);
@@ -426,6 +422,11 @@ 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) {
         param.fixedTime = this.tagConfig.fixedTime;
         param.fixedEndTime = this.tagConfig.fixedEndTime;