|
@@ -161,7 +161,7 @@
|
|
</a-form-model-item>
|
|
</a-form-model-item>
|
|
</a-form-model>
|
|
</a-form-model>
|
|
<a-card size="small" :bordered="false" class="pages-wrap">
|
|
<a-card size="small" :bordered="false" class="pages-wrap">
|
|
- <div class="flex">
|
|
|
|
|
|
+ <div class="flex" style="margin-bottom:10px;">
|
|
<a-radio-group v-model="chooseVal" button-style="solid" @change="onChooseVal">
|
|
<a-radio-group v-model="chooseVal" button-style="solid" @change="onChooseVal">
|
|
<a-radio-button value="a" v-show="form.gateFlag==='1'">
|
|
<a-radio-button value="a" v-show="form.gateFlag==='1'">
|
|
门槛产品
|
|
门槛产品
|
|
@@ -250,7 +250,9 @@ export default {
|
|
regularPromotionSameFlag: '1',
|
|
regularPromotionSameFlag: '1',
|
|
giftProductMap: {},
|
|
giftProductMap: {},
|
|
gateInfo: undefined,
|
|
gateInfo: undefined,
|
|
- ruleInfo: undefined
|
|
|
|
|
|
+ ruleInfo: undefined,
|
|
|
|
+ gateUnit: undefined,
|
|
|
|
+ quotaUnit: undefined
|
|
},
|
|
},
|
|
rules: {
|
|
rules: {
|
|
description: [ { required: true, message: '请输入规则简称', trigger: 'blur' } ],
|
|
description: [ { required: true, message: '请输入规则简称', trigger: 'blur' } ],
|
|
@@ -371,6 +373,14 @@ export default {
|
|
_this.$message.warning('规则门槛条件不能为空!')
|
|
_this.$message.warning('规则门槛条件不能为空!')
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
+ if (_this.form.gateType == 'RATIO_AMOUNT') {
|
|
|
|
+ _this.form.gateUnit = 'RATIO'
|
|
|
|
+ } else if (_this.form.gateType == 'MIN_AMOUNT') {
|
|
|
|
+ _this.form.gateUnit = 'YUAN'
|
|
|
|
+ } else {
|
|
|
|
+ _this.form.gateUnit = 'YUAN'
|
|
|
|
+ _this.form.quotaUnit = 'YUAN'
|
|
|
|
+ }
|
|
}
|
|
}
|
|
const hasNullVal = _this.fullGiftRuleList.some(itemVal => {
|
|
const hasNullVal = _this.fullGiftRuleList.some(itemVal => {
|
|
if (itemVal.regularValue && itemVal.promotionValue) {
|
|
if (itemVal.regularValue && itemVal.promotionValue) {
|
|
@@ -478,8 +488,8 @@ export default {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
var newInfo = `<div>${form.accrualFlag == '1' ? '数量叠加;' : ''}${form.convertExpenseFlag == '1' ? '可转费用报销单;' : ''}</div>`
|
|
var newInfo = `<div>${form.accrualFlag == '1' ? '数量叠加;' : ''}${form.convertExpenseFlag == '1' ? '可转费用报销单;' : ''}</div>`
|
|
- _this.fullGiftRuleList.forEach((item,i) => {
|
|
|
|
- newInfo += `<div>${i*1+1}、${form.regularSameFlag == '1' ? '同款' : '不同款'}产品购买满${item.regularValue}${form.regularUnit == 'YUAN' ? '元' : '个'}正价产品,送${item.promotionValue}个促销产品</div>`
|
|
|
|
|
|
+ _this.fullGiftRuleList.forEach((item, i) => {
|
|
|
|
+ newInfo += `<div>${i * 1 + 1}、${form.regularSameFlag == '1' ? '同款' : '不同款'}产品购买满${item.regularValue}${form.regularUnit == 'YUAN' ? '元' : '个'}正价产品,送${item.promotionValue}个促销产品</div>`
|
|
})
|
|
})
|
|
newInfo += form.restrictFlag == '1' ? `<div>限制正价产品${form.restrictCategory}款</div>` : ''
|
|
newInfo += form.restrictFlag == '1' ? `<div>限制正价产品${form.restrictCategory}款</div>` : ''
|
|
form.ruleInfo = newInfo
|
|
form.ruleInfo = newInfo
|
|
@@ -546,7 +556,9 @@ export default {
|
|
gateProductList: undefined,
|
|
gateProductList: undefined,
|
|
regularProductList: undefined,
|
|
regularProductList: undefined,
|
|
gateInfo: undefined,
|
|
gateInfo: undefined,
|
|
- ruleInfo: undefined
|
|
|
|
|
|
+ ruleInfo: undefined,
|
|
|
|
+ gateUnit: undefined,
|
|
|
|
+ quotaUnit: undefined
|
|
}
|
|
}
|
|
this.$nextTick(() => {
|
|
this.$nextTick(() => {
|
|
this.$refs.ruleForm.resetFields()
|
|
this.$refs.ruleForm.resetFields()
|
|
@@ -718,5 +730,8 @@ export default {
|
|
background-color: #ed1c24 !important;
|
|
background-color: #ed1c24 !important;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ /deep/.ve-table{
|
|
|
|
+ border-radius:5px;
|
|
|
|
+ }
|
|
|
|
|
|
</style>
|
|
</style>
|