修改

src/views/activityManage/activityList.vue

@@ -55,7 +55,7 @@
         </div>
         <!-- 添加或修改对话框 -->
         <el-dialog :close-on-click-modal="false" :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" width="70%">
-            <el-form :rules="rules" ref="dataForm" :model="dataForm" status-icon label-position="left" label-width="100px" style='width:700px; margin-left:50px;'>
+            <el-form :rules="rules" ref="dataForm" :model="dataForm" status-icon label-position="left" label-width="110px" style='width:700px; margin-left:50px;'>
                 <el-form-item label="活动类型" prop="type">
                     <el-select v-model="dataForm.type" filterable placeholder="请选择" style="width: 350px"
                         value-key="value">
@@ -95,14 +95,14 @@
                 </el-input>
                 </el-form-item>
                 <el-form-item label="结束日期" prop="endCron">
-                <el-input v-model="dataForm.endCron" placeholder="请输入cron执行表达式" style="width: 350px">
+                    <el-input v-model="dataForm.endCron" placeholder="请输入cron执行表达式" style="width: 350px">
-                    <template slot="append">
+                        <template slot="append">
-                    <el-button type="primary" @click="handleShowCronEnd">
+                            <el-button type="primary" @click="handleShowCronEnd">
-                        生成表达式
+                                生成表达式
-                        <i class="el-icon-time el-icon--right"></i>
+                                <i class="el-icon-time el-icon--right"></i>
-                    </el-button>
+                            </el-button>
-                    </template>
+                        </template>
-                </el-input>
+                    </el-input>
                 </el-form-item>
                 <el-form-item v-if="dataForm.type=='3'"  label="关联奖池" prop="prizePoolId">
                     <el-select v-model="dataForm.prizePoolId" clearable placeholder="请选择奖池" class="filter-item" style="width: 350px">
@@ -125,6 +125,16 @@
                 <el-form-item v-if="dataForm.type=='3'" label="抽奖次数" prop="prizeNum">
                     <el-input v-model="dataForm.prizeNum" style="width: 350px"></el-input>
                 </el-form-item>
+                <el-form-item v-if="dataForm.relationCoupon=='1' || dataForm.type=='3'" label="兑换截至日期" prop="couponEndCron">
+                    <el-input v-model="dataForm.couponEndCron" placeholder="请输入cron执行表达式" style="width: 350px">
+                        <template slot="append">
+                            <el-button type="primary" @click="handleShowEndCron">
+                                生成表达式
+                                <i class="el-icon-time el-icon--right"></i>
+                            </el-button>
+                        </template>
+                    </el-input>
+                </el-form-item>
                 <el-form-item label="活动连接">
                     <el-input v-model="dataForm.activityUrl" style="width: 350px"></el-input>
                 </el-form-item>
@@ -150,7 +160,9 @@
         <el-dialog title="结束日期Cron表达式生成器" :visible.sync="openCronEnd" append-to-body destroy-on-close class="scrollbar">
             <crontab @hide="openCronEnd=false" @fill="crontabFillEnd" :expression="expressionEnd"></crontab>
         </el-dialog>
-
+        <el-dialog title="兑换截止日期Cron表达式生成器" :visible.sync="openEndCron" append-to-body destroy-on-close class="scrollbar">
+            <crontab @hide="openEndCron=false" @fill="crontabFillEndCron" :expression="expressionEndCron"></crontab>
+        </el-dialog>
     </div>
 </template>
   
@@ -187,9 +199,11 @@ export default {
              // 是否显示Cron表达式弹出层
             openCronStart: false,
             openCronEnd: false,
+            openEndCron: false,
             // 传入的表达式
             expressionStart: "",
             expressionEnd: "",
+            expressionEndCron: "",
             setDisabled: {
                 disabledDate(time) {
                     // return time.getTime() > Date.now();  // 可选历史天、可选当前天、不可选未来天
@@ -215,6 +229,7 @@ export default {
                 activityUrl: '',
                 startCron: '',
                 endCron: '',
+                couponEndCron:'',
                 prizePoolId:'',
                 relationCoupon:'0',
                 couponIds:[],
@@ -248,6 +263,9 @@ export default {
                 endCron: [
                     { required: true, message: "cron执行表达式不能为空", trigger: "blur" }
                 ],
+                couponEndCron:[
+                    { required: true, message: "cron执行表达式不能为空", trigger: "blur" }
+                ],
                 prizePoolId: [
                     { required: true, message: "请选择奖池", trigger: "blur" }
                 ],
@@ -297,6 +315,10 @@ export default {
             this.expressionEnd = this.dataForm.endCron;
             this.openCronEnd = true;
         },
+        handleShowEndCron() {
+            this.expressionEndCron = this.dataForm.couponEndCron;
+            this.openEndCron = true;
+        },
         /** 确定后回传值 */
         crontabFillStart(value) {
             this.dataForm.startCron = value;
@@ -304,6 +326,9 @@ export default {
         crontabFillEnd(value) {
             this.dataForm.endCron = value;
         },
+        crontabFillEndCron(value) {
+            this.dataForm.couponEndCron = value;
+        },
         //校验开始时间
         checkStartTime(rule, value, callback) {
             if (!value) {
@@ -379,6 +404,7 @@ export default {
                 activityUrl: '',
                 startCron: '',
                 endCron: '',
+                couponEndCron:'',
                 prizePoolId:'',
                 relationCoupon:'0',
                 couponIds:[],