update: 解决冲突

src/views/ecm/marketing-event/components/item-qfxx.vue

@@ -2,12 +2,14 @@
   <div class="dm-qywx__item__wrap">
     <div class="fz16">
       {{ qfxx.qfxxEnterpriseName }}
-      <span style="margin-left: 16px">{{ item.qfxx.consumerStoreType ? '按门店条件' : '固定门店' }}</span>
     </div>
     <div class="divider"></div>
     <div>{{ item.title }}</div>
     <div style="margin-top:12px;color:#606266;white-space:pre-wrap;word-break:break-word">{{ qfxx.remark }}</div>
     <p style="margin-top:12px;color:#606266">
+      <span>选择门店： {{ item.qfxx.consumerStoreType ? '按门店条件' : '固定门店' }}</span>
+    </p>
+    <p style="margin-top:12px;color:#606266">
       <span>群发内容：</span>
       <span v-for="(el, index) in materials" :key="el">
         <template v-if="index !== 0"> / </template>

src/views/ecm/marketing-event/components/item-teltask.vue

@@ -2,7 +2,7 @@
   <span class="dm-teltask__item__wrap">
     <div class="dm-teltask__item">
       <p class="dm-teltask__item--title">
-        {{ item.title }} <span class="fz13 gray-color">任务逾期判定{{ item.lateDays }}天之后</span>
+        {{ item.title }} <span class="fz13 gray-color">任务开始{{ item.lateDays }}天逾期，逾期{{ item.invalidDay }}天后失效，失效后不可操作</span>
       </p>
       <p class="dm-teltask__item--content">{{ item.content }}</p>
     </div>

src/views/ecm/marketing-event/components/lib-qfxx.vue

@@ -46,6 +46,11 @@
           <el-input-number v-model="form.expireDays" :min="0" controls-position="right" :disabled="readOnly"></el-input-number>
           <span>天之后</span>
         </el-form-item>
+        <el-form-item label="任务逾期" prop="invalidDay">
+          <el-input-number v-model="form.invalidDay" :min="0" controls-position="right" :disabled="readOnly"></el-input-number>
+          <span>天之后失效</span>
+          <i style="color:#FA8C16;font-size:14px;margin: 0 5px 0 10px;" class="el-icon-warning" /><span class="gray fz12">逾期任务失效后不可再操作</span>
+        </el-form-item>
         <el-form-item class="is-required" label="添加群发内容" prop="">
           <template slot="label">
             <span>添加群发内容</span>
@@ -149,6 +154,7 @@ export default {
         remark: '',
         title: '',
         expireDays: 0,
+        invalidDay: 90,
         failSetting: '',
         gicSmsTemplateId: '',
         telFlag: 0,
@@ -165,6 +171,7 @@ export default {
         title: { required: true, message: '请填写任务标题', trigger: 'blur' },
         remark: { required: true, message: '请填写任务描述', trigger: 'blur' },
         expireDays: { required: true, message: '请填写', trigger: 'blur' },
+        invalidDay: { required: true, message: '请填写', trigger: 'blur' },
         consumerStoreType: { required: true, message: '请选择门店' }
       },
       entepriseList: [],
@@ -218,6 +225,7 @@ export default {
         remark: '',
         title: '',
         expireDays: 0,
+        invalidDay: 90,
         failSetting: '',
         gicSmsTemplateId: '',
         telFlag: 0,

src/views/ecm/marketing-event/components/lib-teltask.vue

 <template>
-  <el-dialog title="编辑话务" :visible.sync="show" width="620px" :before-close="close">
-    <el-form ref="form" :model="form" label-width="130px" :rules="rules" v-loading="loading">
+  <el-dialog title="编辑话务" :visible.sync="show" width="600px" :before-close="close">
+    <el-form ref="form" :model="form" label-width="125px" :rules="rules" v-loading="loading">
       <el-form-item label="话务任务标题" class="pb10" prop="title">
         <template slot="label">
           <span>话务任务标题</span>
@@ -21,7 +21,8 @@
         </template>
         <dm-input class="w400" :rows="4" type="textarea" v-model="form.content" placeholder="限制200个字符" :maxlength="200"></dm-input>
       </el-form-item>
-      <el-form-item label="任务逾期判定" prop="lateDays"> <el-input-number controls-position="right" :min="0" class="w400" v-model="form.lateDays"></el-input-number> 天之后 </el-form-item>
+      <el-form-item label="任务逾期判定" prop="lateDays"> <el-input-number controls-position="right" :min="0" v-model="form.lateDays"></el-input-number> 天之后 </el-form-item>
+      <el-form-item prop="invalidDay" label="任务逾期"> <el-input-number controls-position="right" :min="0" v-model="form.invalidDay"></el-input-number> 天之后失效 <i style="color:#FA8C16;font-size:14px;margin: 0 5px 0 10px;" class="el-icon-warning" /><span class="gray fz12">逾期任务失效后不可再操作</span> </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
       <el-button @click="close">关 闭</el-button>
@@ -60,7 +61,8 @@ export default {
       rules: {
         title: { required: true, type: 'string', message: '话务任务标题不能为空', trigger: 'blur' },
         content: { required: true, type: 'string', message: '话务任务内容不能为空', trigger: 'blur' },
-        lateDays: { required: true, type: 'number', message: '任务逾期判定不能为空', trigger: 'blur' }
+        lateDays: { required: true, type: 'number', message: '任务逾期判定不能为空', trigger: 'blur' },
+        invalidDay: { required: true, type: 'number', message: '任务逾期不能为空', trigger: 'blur' }
       },
       loading: false
     };
@@ -87,12 +89,14 @@ export default {
     },
     addItem() {
       this.form.comName = 'teltask';
-      if (!this.form.title || !this.form.content) {
-        this.$message({ type: 'warning', message: '话务未填写完整' });
-        return;
-      }
-      this.$emit('sendItem', this.form);
-      this.close();
+      this.$refs.form.validate(val => {
+        console.log(val);
+        if (val) {
+          console.log(val);
+          this.$emit('sendItem', this.form);
+          this.close();
+        }
+      });
     }
   }
 };

src/views/ecm/marketing-event/index.vue

@@ -397,7 +397,8 @@ export default {
           // ecm话务对象
           title: val.title,
           content: val.content,
-          lateDays: val.lateDays
+          lateDays: val.lateDays,
+          invalidDay: val.invalidDay
         };
       }
       // 2.文本