update: 智能营销日期选择器调整

src/views/ecm/form.js

@@ -944,6 +944,7 @@ export default {
             params.effectTime = Number(this.form.effectTime.split(':')[0]);
             params.marketingTimesType = this.form.marketingOnceFlag ? 0 : -1; // 1对用户营销一次
             params.marketingTimes = 1;
+            params.endDate = params.endDate.replace('00:00:00', '23:59:59');
           } else {
             params.effectTime = -1;
           }

src/views/ecm/form.vue

@@ -351,8 +351,14 @@
         <el-form-item label="有效时间" prop="endDate" :show-message="showMessage" v-if="form.consum_type == 1">
           <el-radio :disabled="isEdit && onlineStatus != 0 && form.expireType == 1" v-model="form.expireType" :label="0">长期有效</el-radio>
           <el-radio :disabled="isEdit && onlineStatus != 0 && form.expireType == 0" v-model="form.expireType" :label="1">固定期限</el-radio>
-          <el-date-picker class="ml10" v-if="form.expireType" v-model="form.beginDate" :disabled="isEdit && onlineStatus != 0" type="datetime" placeholder="开始时间" @change="checkBeginEndTime"> </el-date-picker>
-          <el-date-picker v-if="form.expireType" v-model="form.endDate" :disabled="isEdit && onlineStatus == 2" type="datetime" :picker-options="endDatePickerOptions" placeholder="结束时间" @change="checkBeginEndTime"> </el-date-picker>
+          <template v-if="form.effectType == 1">
+            <el-date-picker class="ml10" v-if="form.expireType" v-model="form.beginDate" :disabled="isEdit && onlineStatus != 0" type="date" placeholder="开始时间" @change="checkBeginEndTime"> </el-date-picker>
+            <el-date-picker v-if="form.expireType" v-model="form.endDate" :disabled="isEdit && onlineStatus == 2" type="date" :picker-options="endDatePickerOptions" placeholder="结束时间" @change="checkBeginEndTime"> </el-date-picker>
+          </template>
+          <template v-else>
+            <el-date-picker class="ml10" v-if="form.expireType" v-model="form.beginDate" :disabled="isEdit && onlineStatus != 0" type="datetime" placeholder="开始时间" @change="checkBeginEndTime"> </el-date-picker>
+            <el-date-picker v-if="form.expireType" v-model="form.endDate" :disabled="isEdit && onlineStatus == 2" type="datetime" :picker-options="endDatePickerOptions" placeholder="结束时间" @change="checkBeginEndTime"> </el-date-picker>
+          </template>
         </el-form-item>
         <el-form-item label="固定期限" prop="endDate" :show-message="showMessage" v-else>
           <el-date-picker class="ml10" v-model="form.beginDate" :disabled="isEdit && onlineStatus != 0" type="datetime" placeholder="开始时间" @change="checkBeginEndTime" :picker-options="endDatePickerOptions"> </el-date-picker>