diff --git a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue index e24347795..6f58cc396 100644 --- a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue @@ -210,7 +210,7 @@ :label="item1.name" :value="item1.id"> - + { + if (!item.consumeAmount || !item.givePoints){ + flag = true + } + }) } } + if (flag){ + this.$message.error("请确保赠送积分信息已经填写!") + return; + } if (this.ruleForm.activeGift && this.ruleForm.activeGift.includes(3)) { if (!this.growthValueList || this.growthValueList.length == 0) { this.$message.error("请先选择赠送成长值信息!") return; + }else { + this.growthValueList.forEach(item => { + if (!item.consumeAmount || !item.giveGrowthValue){ + flag = true + } + }) } } + if (flag){ + this.$message.error("请确保赠送成长值信息已经填写!") + return; + } if (this.ruleForm.activeGift && this.ruleForm.activeGift.includes(1)) { if (!this.couponList || this.couponList.length == 0) { this.$message.error("请先选择赠送优惠券信息!") return; + }else { + this.couponList.forEach(item => { + if (!item.vouchersId || !item.giftCardTotal || !item.consumeAmount){ + flag = true + } + }) } } + if (flag){ + this.$message.error("请确保赠送优惠券信息已经填写!") + return; + } this.$refs[formName].validate((valid) => { if (valid) { // 使用时间段 diff --git a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue index 1babe130d..75813ad65 100644 --- a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue @@ -282,12 +282,23 @@ export default { return } } + let flag = false; if (this.ruleForm.courtesyReward && this.ruleForm.courtesyReward.includes("0")) { if (!this.couponList || this.couponList.length == 0) { this.$message.error("请先选择赠送优惠券信息!") return; + }else { + this.couponList.forEach(item => { + if (!item.vouchersId || !item.giftCardTotal){ + flag = true + } + }) } } + if (flag){ + this.$message.error("请先确保赠送优惠券信息已经填写!") + return; + } if (this.ruleForm.courtesyReward && this.ruleForm.courtesyReward.includes("3")) { if (!this.ruleForm.points) { this.$message.error("请输入赠送积分!") diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/birthday.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/birthday.vue index 71d3f89bd..b70553e54 100644 --- a/fuintAdmin/src/views/EventMarketing/openCardGift/birthday.vue +++ b/fuintAdmin/src/views/EventMarketing/openCardGift/birthday.vue @@ -309,12 +309,24 @@ export default { return } } + + let flag = false; if (this.ruleForm.courtesyReward && this.ruleForm.courtesyReward.includes("0")) { if (!this.couponList || this.couponList.length == 0) { this.$message.error("请先选择赠送优惠券信息!") return; + }else { + this.couponList.forEach(item => { + if (!item.vouchersId || !item.giftCardTotal){ + flag = true; + } + }) } } + if (flag){ + this.$message.error("请先确保赠送优惠券信息已经填写!") + return; + } if (this.ruleForm.courtesyReward && this.ruleForm.courtesyReward.includes("3")) { if (!this.ruleForm.points) { this.$message.error("请输入赠送积分!") diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/invite.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/invite.vue index 122a36f59..e3786eb93 100644 --- a/fuintAdmin/src/views/EventMarketing/openCardGift/invite.vue +++ b/fuintAdmin/src/views/EventMarketing/openCardGift/invite.vue @@ -285,12 +285,24 @@ export default { return } } + + let flag = false; if (this.ruleForm.rewardDisplay && this.ruleForm.rewardDisplay.includes("0")) { if (!this.couponList || this.couponList.length == 0) { this.$message.error("请先选择赠送优惠券信息!") return; + }else { + this.couponList.forEach(item => { + if (!item.vouchersId || !item.giftCardTotal){ + flag = true; + } + }) } } + if (flag){ + this.$message.error("请先确保赠送优惠券信息已经填写!") + return; + } if (this.ruleForm.rewardDisplay && this.ruleForm.rewardDisplay.includes("3")) { if (!this.ruleForm.points) { this.$message.error("请输入赠送积分!") diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/popUp.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/popUp.vue index 8e1e7ce23..6e359bc59 100644 --- a/fuintAdmin/src/views/EventMarketing/openCardGift/popUp.vue +++ b/fuintAdmin/src/views/EventMarketing/openCardGift/popUp.vue @@ -375,12 +375,24 @@ export default { return } } + + let flag = false; if (this.ruleForm.courtesyReward && this.ruleForm.courtesyReward.includes("0")) { if (!this.couponList || this.couponList.length == 0) { this.$message.error("请先选择赠送优惠券信息!") return; + }else { + this.couponList.forEach(item => { + if (!item.vouchersId || !item.giftCardTotal){ + flag = true; + } + }) } } + if (flag){ + this.$message.error("请先确保赠送优惠券信息已经填写!") + return; + } this.$refs[formName].validate((valid) => { if (valid) { if (this.ruleForm.suitTimeSlotType==0){ diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/userConsume.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/userConsume.vue index 8a8bfb6f1..5d95f98be 100644 --- a/fuintAdmin/src/views/EventMarketing/openCardGift/userConsume.vue +++ b/fuintAdmin/src/views/EventMarketing/openCardGift/userConsume.vue @@ -364,12 +364,24 @@ export default { return } } + + let flag = false; if (this.ruleForm.courtesyReward && this.ruleForm.courtesyReward.includes("0")) { if (!this.couponList || this.couponList.length == 0) { this.$message.error("请先选择赠送优惠券信息!") return; + }else { + this.couponList.forEach(item => { + if (!item.vouchersId || !item.giftCardTotal){ + flag = true; + } + }) } } + if (flag){ + this.$message.error("请先确保赠送优惠券信息已经填写!") + return; + } if (this.ruleForm.courtesyReward && this.ruleForm.courtesyReward.includes("3")) { if (!this.ruleForm.points) { this.$message.error("请输入赠送积分!") diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/userRecharge.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/userRecharge.vue index f41dc30fe..ad1782012 100644 --- a/fuintAdmin/src/views/EventMarketing/openCardGift/userRecharge.vue +++ b/fuintAdmin/src/views/EventMarketing/openCardGift/userRecharge.vue @@ -313,12 +313,24 @@ export default { return } } + + let flag = false; if (this.ruleForm.courtesyReward && this.ruleForm.courtesyReward.includes("0")) { if (!this.couponList || this.couponList.length == 0) { this.$message.error("请先选择赠送优惠券信息!") return; + }else { + this.couponList.forEach(item => { + if (!item.vouchersId || !item.giftCardTotal){ + flag = true; + } + }) } } + if (flag){ + this.$message.error("请先确保赠送优惠券信息已经填写!") + return; + } if (this.ruleForm.courtesyReward && this.ruleForm.courtesyReward.includes("3")) { if (!this.ruleForm.points) { this.$message.error("请输入赠送积分!")