diff --git a/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue b/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue index 6fcfea55a..53595dc3a 100644 --- a/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue @@ -192,13 +192,17 @@ - +
- + + +
- + + +
@@ -233,7 +237,29 @@ - + + + 无会员日 + 指定日 + 指定星期 + + + + + {{item}}日 + + + + + 星期一 + 星期二 + 星期三 + 星期四 + 星期五 + 星期六 + 星期日 + + @@ -357,11 +383,12 @@ export default { status: null, isonline: null, }, + weekDay:[], + monthDay:[], // 表单参数 form: { - }, // 表单校验 rules: { @@ -398,6 +425,9 @@ export default { activeDiscountChildList:[ { required: true, message: '不能为空', trigger: 'change' } ], + memberDayType:[ + { required: true, message: '不能为空', trigger: 'change' } + ], } }; }, @@ -509,9 +539,14 @@ export default { handleAdd() { this.reset(); this.activeDiscountChildList = [ {amount:'',discount:''}, ] + this.monthDay = [] + this.weekDay = [] this.open = true; this.title = "添加折扣营销"; }, + changeMonth(val){ + console.log(val,this.monthDay,111) + }, // 获取油号名称 getName(oilNameList,ids){ let name = "" @@ -537,6 +572,16 @@ export default { }else { this.activeDiscountChildList = [ {amount:'',discount:''}, ] } + if (this.form.monthDay){ + this.monthDay = this.form.monthDay.split(",") + }else { + this.monthDay = [] + } + if (this.form.weekDay){ + this.weekDay = this.form.weekDay.split(",") + }else { + this.weekDay = [] + } this.open = true; this.title = "修改折扣营销"; }); @@ -602,6 +647,8 @@ export default { this.form.activeDiscountChildList = this.activeDiscountChildList this.$refs["form"].validate(valid => { if (valid) { + this.form.monthDay = this.monthDay.toString() + this.form.weekDay = this.weekDay.toString() if (this.form.id != null) { updateActiveDiscount(this.form).then(response => { this.$modal.msgSuccess("修改成功"); diff --git a/fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue b/fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue index ee1385712..3e622bd39 100644 --- a/fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue @@ -183,10 +183,14 @@
- + + +
- + + +
@@ -220,6 +224,31 @@ + + + + 无会员日 + 指定日 + 指定星期 + + + + + {{item}}日 + + + + + 星期一 + 星期二 + 星期三 + 星期四 + 星期五 + 星期六 + 星期日 + + + {{item.oilType}}{{item.oilName}} @@ -336,6 +365,8 @@ export default { status: null, isonline: null, }, + weekDay:[], + monthDay:[], // 表单参数 form: {}, // 表单校验 @@ -478,6 +509,8 @@ export default { /** 新增按钮操作 */ handleAdd() { this.reset(); + this.monthDay = [] + this.weekDay = [] this.activeDiscountChildList = [ {amount:'',deductionAmount:''}, ] this.open = true; this.title = "添加满减营销"; @@ -507,6 +540,16 @@ export default { }else { this.activeDiscountChildList = [ {amount:'',deductionAmount:''}, ] } + if (this.form.monthDay){ + this.monthDay = this.form.monthDay.split(",") + }else { + this.monthDay = [] + } + if (this.form.weekDay){ + this.weekDay = this.form.weekDay.split(",") + }else { + this.weekDay = [] + } this.open = true; this.title = "修改满减营销"; }); @@ -570,6 +613,8 @@ export default { this.form.activeDiscountChildList = this.activeDiscountChildList this.$refs["form"].validate(valid => { if (valid) { + this.form.monthDay = this.monthDay.toString() + this.form.weekDay = this.weekDay.toString() if (this.form.id != null) { updateActiveFullminus(this.form).then(response => { this.$modal.msgSuccess("修改成功");