|
|
@@ -116,24 +116,18 @@
|
|
|
<el-radio :label="'1'">是</el-radio>
|
|
|
</el-radio-group>
|
|
|
</el-form-item>
|
|
|
- <el-form-item v-if="dataForm.relationCoupon=='1'" label="兑换券" prop="couponIds">
|
|
|
+ <el-form-item v-if="dataForm.type!='3' && dataForm.relationCoupon=='1'" label="兑换券" prop="couponIds">
|
|
|
<el-select v-model="dataForm.couponIds" clearable multiple collapse-tags placeholder="请选择兑换券" class="filter-item" style="width: 350px">
|
|
|
<el-option :key="item.id" v-for="item in couponsList" :label="item.couponName" :value="item.id">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item v-if="dataForm.type=='3'" label="抽奖次数" prop="prizeNum">
|
|
|
- <el-input v-model="dataForm.prizeNum" style="width: 350px"></el-input>
|
|
|
+ <el-input-number style="width: 350px" :min="1" :step="1" v-model="dataForm.prizeNum"></el-input-number>
|
|
|
</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 v-if="dataForm.relationCoupon=='1' || dataForm.type=='3'" label="兑换截至日期" prop="couponEndTime">
|
|
|
+ <el-date-picker value-format="yyyy-MM-dd" v-model="dataForm.couponEndTime" type="date" placeholder="请选择结束时间" style="width: 350px">
|
|
|
+ </el-date-picker>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="活动连接">
|
|
|
<el-input v-model="dataForm.activityUrl" style="width: 350px"></el-input>
|
|
|
@@ -160,9 +154,6 @@
|
|
|
<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>
|
|
|
|
|
|
@@ -229,7 +220,7 @@ export default {
|
|
|
activityUrl: '',
|
|
|
startCron: '',
|
|
|
endCron: '',
|
|
|
- couponEndCron:'',
|
|
|
+ couponEndTime:'',
|
|
|
prizePoolId:'',
|
|
|
relationCoupon:'0',
|
|
|
couponIds:[],
|
|
|
@@ -263,8 +254,8 @@ export default {
|
|
|
endCron: [
|
|
|
{ required: true, message: "cron执行表达式不能为空", trigger: "blur" }
|
|
|
],
|
|
|
- couponEndCron:[
|
|
|
- { required: true, message: "cron执行表达式不能为空", trigger: "blur" }
|
|
|
+ couponEndTime:[
|
|
|
+ { required: true, message: "请选择兑换截止日期", trigger: "blur" }
|
|
|
],
|
|
|
prizePoolId: [
|
|
|
{ required: true, message: "请选择奖池", trigger: "blur" }
|
|
|
@@ -315,10 +306,6 @@ 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;
|
|
|
@@ -326,9 +313,6 @@ export default {
|
|
|
crontabFillEnd(value) {
|
|
|
this.dataForm.endCron = value;
|
|
|
},
|
|
|
- crontabFillEndCron(value) {
|
|
|
- this.dataForm.couponEndCron = value;
|
|
|
- },
|
|
|
//校验开始时间
|
|
|
checkStartTime(rule, value, callback) {
|
|
|
if (!value) {
|
|
|
@@ -404,7 +388,7 @@ export default {
|
|
|
activityUrl: '',
|
|
|
startCron: '',
|
|
|
endCron: '',
|
|
|
- couponEndCron:'',
|
|
|
+ couponEndTime:'',
|
|
|
prizePoolId:'',
|
|
|
relationCoupon:'0',
|
|
|
couponIds:[],
|
