fix: ecm

src/views/ecm/form.js

@@ -199,7 +199,7 @@ export default {
   },
   watch: {
     'form.effectType'(val) {
-      this.form.execTime = '08:00:00';
+      this.form.execTime = '';
     },
     checked(val) {
       switch (val[0]) {
@@ -903,6 +903,12 @@ export default {
         }
       }
     },
+    // 改变单次 定时  time
+    changeExecTime(val) {
+      if (val && new Date(val) <= new Date()) {
+        this.form.execTime = formatDateTimeByType(Date.now() + 1 * 30 * 60 * 1000); // 最多只能选择当前时间的30分钟之后
+      }
+    },
     /* ----------------人群筛选器的方法--------------- */
     // async triggerPeopleSet() {
     //   await this.$refs.peopleFilter.confirmSet();

src/views/ecm/form.vue

@@ -9,11 +9,11 @@
         </el-form-item>
         <el-form-item label="时效">
           <el-radio v-model="form.effectType" :label="0" :disabled="!isAdd">触点</el-radio>
+          <el-radio v-model="form.effectType" :label="1" :disabled="!isAdd">重复</el-radio>
           <el-radio v-model="form.effectType" :label="2" :disabled="!isAdd">单次</el-radio>
-          <el-radio class="mr10" v-model="form.effectType" :label="1" :disabled="!isAdd">重复</el-radio>
-          <el-select style="width:262px;" :disabled="!isAdd" v-model="form.effectTime" v-if="form.effectType == 1" placeholder="请选择时间">
+          <!-- <el-select style="width:262px;" :disabled="!isAdd" v-model="form.effectTime" v-if="form.effectType == 1" placeholder="请选择时间">
             <el-option v-for="(v, i) in dayOptions" :key="i" :label="v.label" :value="v.value"></el-option>
-          </el-select>
+          </el-select> -->
           <div class="layout--tips mt10" v-if="form.effectType == 1 || form.effectType == 2">
             <!-- <i class="el-icon-info inline-block"></i> -->
             <div class="layout--tips__content">
@@ -32,7 +32,8 @@
             <el-option v-for="(v, i) in effectActionOptions" :key="i" :label="v.label" :value="v.value"></el-option>
           </el-select>
         </el-form-item>
-        <!-- <template v-if="form.effectType == 2">
+        <!-- 重复执行 -->
+        <template v-if="form.effectType == 1">
           <el-form-item label="执行频率" prop="execDate">
             <div class="flex">
               <el-select :disabled="!isAdd" style="width:220px;" class="mr20" v-model="form.execDateType" placeholder="请选择" @change="form.execDate = []">
@@ -44,11 +45,12 @@
             </div>
           </el-form-item>
           <el-form-item label="执行时间" prop="execTime" class="mt10">
-            <el-time-picker :disabled="!isAdd" class="w220" v-model="form.execTime" value-format="HH:mm:ss" placeholder="请设置" />
+            <!-- <el-time-picker :disabled="!isAdd" class="w220" v-model="form.execTime" value-format="HH:mm:ss" placeholder="请设置" /> -->
+            <el-time-select v-model="form.execTime" :picker-options="{ start: '00:00', step: '01:00', end: '23:00' }" placeholder="请设置"></el-time-select>
           </el-form-item>
-        </template> -->
+        </template>
         <!-- 单次执行 -->
-        <!-- <template v-if="form.effectType === 1">
+        <template v-if="form.effectType === 2">
           <el-form-item label="执行时间">
             <el-radio-group :disabled="!isAdd" v-model="form.execType">
               <el-radio :label="1">立即执行</el-radio>
@@ -60,9 +62,9 @@
             </el-radio-group>
           </el-form-item>
           <el-form-item v-if="form.execType === 0" prop="execTime" key="execTime2">
-            <el-time-select :disabled="!isAdd" v-model="form.execTime" :picker-options="pickerOptions" value-format="HH:mm:ss" placeholder="请选择" />
+            <el-date-picker :disabled="!isAdd" class="inputTime" value-format="yyyy-MM-dd HH:mm:ss" @change="changeExecTime" v-model="form.execTime" :picker-options="pickerOptions" type="datetime" placeholder="请选择" />
           </el-form-item>
-        </template> -->
+        </template>
         <el-form-item label="常用场景" v-if="form.effectType == 1">
           <div class="fz12 gray">选填，勾选后生效</div>
           <el-checkbox-group v-model="checked" :max="1">
@@ -187,7 +189,7 @@
         </el-form-item>
       </section>
       <!-- 营销次数配置  重复 -->
-      <!-- <section class="dm-form__wrap" v-if="form.effectType == 2">
+      <section class="dm-form__wrap" v-if="form.effectType == 1">
         <h3 class="dm-title__label">
           营销次数配置
           <i class="dm-title__label--icon iconfont icon-xinxixianshi"></i>
@@ -198,7 +200,7 @@
           <el-switch v-model="form.marketingOnceFlag" :active-value="1" :inactive-value="0"></el-switch>
           <span class="gray ml10 fz13">{{ form.marketingOnceFlag ? '该营销计划对每个用户执行一次' : '该营销计划对每个用户不限制执行次数' }}</span>
         </div>
-      </section> -->
+      </section>
       <!-- 营销次数配置  实时触点 -->
       <section class="dm-form__wrap" v-if="form.effectType == 0 && ['consume', 'upgrade', 'degrade'].includes(form.effectAction)">
         <h3 class="dm-title__label">