|
@@ -62,9 +62,9 @@
|
|
</div>
|
|
</div>
|
|
<!-- 买产品送采购额 -->
|
|
<!-- 买产品送采购额 -->
|
|
<div v-if="form.promoRuleType == 'BUY_PROD_GIVE_MONEY'">
|
|
<div v-if="form.promoRuleType == 'BUY_PROD_GIVE_MONEY'">
|
|
- <a-form-model-item label="促销设置" prop="orderRuleType">
|
|
|
|
- <a-radio-group v-model="form.orderRuleType" @change="radioChange">
|
|
|
|
- <a-radio value="PROD_QTY" style="margin-bottom: 10px;">
|
|
|
|
|
|
+ <a-form-model-item label="促销设置" prop="promoType">
|
|
|
|
+ <a-radio-group v-model="form.promoType" @change="radioChange">
|
|
|
|
+ <a-radio value="promo_amount" style="margin-bottom: 10px;">
|
|
购买满
|
|
购买满
|
|
<a-form-model-item prop="orderAmounts" :label-col="{span: 0}" style="display: inline-block;">
|
|
<a-form-model-item prop="orderAmounts" :label-col="{span: 0}" style="display: inline-block;">
|
|
<a-input-number
|
|
<a-input-number
|
|
@@ -89,7 +89,7 @@
|
|
</a-form-model-item>
|
|
</a-form-model-item>
|
|
元采购额可用于购买促销品
|
|
元采购额可用于购买促销品
|
|
</a-radio>
|
|
</a-radio>
|
|
- <a-radio value="ORDER_AMOUNT">
|
|
|
|
|
|
+ <a-radio value="promo_amount_per">
|
|
购买满
|
|
购买满
|
|
<a-form-model-item prop="orderAmount" :label-col="{span: 0}" style="display: inline-block;">
|
|
<a-form-model-item prop="orderAmount" :label-col="{span: 0}" style="display: inline-block;">
|
|
<a-input-number
|
|
<a-input-number
|
|
@@ -195,7 +195,7 @@ export default {
|
|
promoRuleType: undefined, // 促销类型
|
|
promoRuleType: undefined, // 促销类型
|
|
orderGoodsQty: '', // 正价品数量
|
|
orderGoodsQty: '', // 正价品数量
|
|
promoQty: '', // 促销品数量
|
|
promoQty: '', // 促销品数量
|
|
- orderRuleType: undefined, // 促销设置(买产品送采购额(定额)、买产品送采购额(定比例))
|
|
|
|
|
|
+ promoType: undefined, // 促销设置(买产品送采购额(定额)、买产品送采购额(定比例))
|
|
orderAmounts: '', // 正价品金额 金额
|
|
orderAmounts: '', // 正价品金额 金额
|
|
orderAmount: '', // 正价品金额 百分比
|
|
orderAmount: '', // 正价品金额 百分比
|
|
promoAmount: '', // 采购额
|
|
promoAmount: '', // 采购额
|
|
@@ -207,7 +207,7 @@ export default {
|
|
promoRuleType: [{ required: true, message: '请选择促销类型', trigger: 'change' }],
|
|
promoRuleType: [{ required: true, message: '请选择促销类型', trigger: 'change' }],
|
|
orderGoodsQty: [{ required: true, message: '请输入正价品数量', trigger: 'blur' }],
|
|
orderGoodsQty: [{ required: true, message: '请输入正价品数量', trigger: 'blur' }],
|
|
promoQty: [{ required: true, message: '请输入促销品数量', trigger: 'blur' }],
|
|
promoQty: [{ required: true, message: '请输入促销品数量', trigger: 'blur' }],
|
|
- orderRuleType: [{ required: true, message: '请选择促销方式', trigger: 'change' }],
|
|
|
|
|
|
+ promoType: [{ required: true, message: '请选择促销方式', trigger: 'change' }],
|
|
orderAmounts: [ { validator: this.orderAmountsValidator } ],
|
|
orderAmounts: [ { validator: this.orderAmountsValidator } ],
|
|
orderAmount: [ { validator: this.orderAmountValidator } ],
|
|
orderAmount: [ { validator: this.orderAmountValidator } ],
|
|
promoAmount: [ { validator: this.promoAmountValidator } ],
|
|
promoAmount: [ { validator: this.promoAmountValidator } ],
|
|
@@ -256,9 +256,9 @@ export default {
|
|
item.name = item.goodsName
|
|
item.name = item.goodsName
|
|
})
|
|
})
|
|
}
|
|
}
|
|
- if (data.promoRuleType == 'BUY_PROD_GIVE_MONEY' && data.orderRuleType == 'PROD_QTY') { // 买产品送采购额 金额
|
|
|
|
|
|
+ if (data.promoRuleType == 'BUY_PROD_GIVE_MONEY' && data.promoType == 'promo_amount') { // 买产品送采购额 金额
|
|
this.form.orderAmounts = data.orderAmount
|
|
this.form.orderAmounts = data.orderAmount
|
|
- } else if (data.promoRuleType == 'BUY_PROD_GIVE_MONEY' && data.orderRuleType == 'ORDER_AMOUNT') { // 买产品送采购额 百分比
|
|
|
|
|
|
+ } else if (data.promoRuleType == 'BUY_PROD_GIVE_MONEY' && data.promoType == 'promo_amount_per') { // 买产品送采购额 百分比
|
|
this.form.promoAmountPer = Number(data.promoAmountPer) * 100
|
|
this.form.promoAmountPer = Number(data.promoAmountPer) * 100
|
|
this.form.promoAmount = data.promoAmount == 0 ? null : data.promoAmount
|
|
this.form.promoAmount = data.promoAmount == 0 ? null : data.promoAmount
|
|
}
|
|
}
|
|
@@ -269,7 +269,7 @@ export default {
|
|
},
|
|
},
|
|
// 采购金额自定义校验 金额
|
|
// 采购金额自定义校验 金额
|
|
orderAmountsValidator (rule, value, callback) {
|
|
orderAmountsValidator (rule, value, callback) {
|
|
- if (this.form.orderRuleType == 'PROD_QTY' && !value) {
|
|
|
|
|
|
+ if (this.form.promoType == 'promo_amount' && !value) {
|
|
callback(new Error('请输入正价品金额'))
|
|
callback(new Error('请输入正价品金额'))
|
|
} else {
|
|
} else {
|
|
callback()
|
|
callback()
|
|
@@ -277,7 +277,7 @@ export default {
|
|
},
|
|
},
|
|
// 采购金额自定义校验 百分比
|
|
// 采购金额自定义校验 百分比
|
|
orderAmountValidator (rule, value, callback) {
|
|
orderAmountValidator (rule, value, callback) {
|
|
- if (this.form.orderRuleType == 'ORDER_AMOUNT' && !value) {
|
|
|
|
|
|
+ if (this.form.promoType == 'promo_amount_per' && !value) {
|
|
callback(new Error('请输入正价品金额'))
|
|
callback(new Error('请输入正价品金额'))
|
|
} else {
|
|
} else {
|
|
callback()
|
|
callback()
|
|
@@ -285,7 +285,7 @@ export default {
|
|
},
|
|
},
|
|
// 采购额百分比自定义校验
|
|
// 采购额百分比自定义校验
|
|
promoAmountValidator (rule, value, callback) {
|
|
promoAmountValidator (rule, value, callback) {
|
|
- if (this.form.orderRuleType == 'PROD_QTY' && !value) {
|
|
|
|
|
|
+ if (this.form.promoType == 'promo_amount' && !value) {
|
|
callback(new Error('请输入采购额'))
|
|
callback(new Error('请输入采购额'))
|
|
} else {
|
|
} else {
|
|
callback()
|
|
callback()
|
|
@@ -293,7 +293,7 @@ export default {
|
|
},
|
|
},
|
|
// 采购额百分比自定义校验
|
|
// 采购额百分比自定义校验
|
|
promoAmountPerValidator (rule, value, callback) {
|
|
promoAmountPerValidator (rule, value, callback) {
|
|
- if (this.form.orderRuleType == 'ORDER_AMOUNT' && !value) {
|
|
|
|
|
|
+ if (this.form.promoType == 'promo_amount_per' && !value) {
|
|
callback(new Error('请输入百分比'))
|
|
callback(new Error('请输入百分比'))
|
|
} else {
|
|
} else {
|
|
callback()
|
|
callback()
|
|
@@ -311,11 +311,12 @@ export default {
|
|
form.normalGoodsList = this.normalGoodsList
|
|
form.normalGoodsList = this.normalGoodsList
|
|
form.promoGoodsList = this.promoGoodsList
|
|
form.promoGoodsList = this.promoGoodsList
|
|
form.promoActiveSn = this.$route.params.sn
|
|
form.promoActiveSn = this.$route.params.sn
|
|
- if (form.promoRuleType == 'BUY_PROD_GIVE_MONEY' && form.orderRuleType == 'ORDER_AMOUNT') { // 买产品送采购额 百分比
|
|
|
|
|
|
+ if (form.promoRuleType == 'BUY_PROD_GIVE_MONEY' && form.promoType == 'promo_amount_per') { // 买产品送采购额 百分比
|
|
form.promoAmountPer = Number(form.promoAmountPer) / 100
|
|
form.promoAmountPer = Number(form.promoAmountPer) / 100
|
|
- } else if (form.promoRuleType == 'BUY_PROD_GIVE_MONEY' && form.orderRuleType == 'PROD_QTY') { // 买产品送采购额 金额
|
|
|
|
|
|
+ } else if (form.promoRuleType == 'BUY_PROD_GIVE_MONEY' && form.promoType == 'promo_amount') { // 买产品送采购额 金额
|
|
form.orderAmount = form.orderAmounts
|
|
form.orderAmount = form.orderAmounts
|
|
}
|
|
}
|
|
|
|
+ if (!_this.itemSn) { delete form.id }
|
|
promoRuleSave(form).then(res => {
|
|
promoRuleSave(form).then(res => {
|
|
if (res.status == 200) {
|
|
if (res.status == 200) {
|
|
_this.$message.success(res.message)
|
|
_this.$message.success(res.message)
|
|
@@ -353,10 +354,10 @@ export default {
|
|
this.openPriceProductsModal = false
|
|
this.openPriceProductsModal = false
|
|
},
|
|
},
|
|
radioChange (e) {
|
|
radioChange (e) {
|
|
- if (e.target.value == 'PROD_QTY') {
|
|
|
|
|
|
+ if (e.target.value == 'promo_amount') {
|
|
this.form.orderAmount = null
|
|
this.form.orderAmount = null
|
|
this.form.promoAmountPer = null
|
|
this.form.promoAmountPer = null
|
|
- } else if (e.target.value == 'ORDER_AMOUNT') {
|
|
|
|
|
|
+ } else if (e.target.value == 'promo_amount_per') {
|
|
this.form.orderAmounts = null
|
|
this.form.orderAmounts = null
|
|
this.form.promoAmount = null
|
|
this.form.promoAmount = null
|
|
}
|
|
}
|
|
@@ -366,7 +367,7 @@ export default {
|
|
this.form.promoRuleType = val
|
|
this.form.promoRuleType = val
|
|
this.form.orderGoodsQty = ''
|
|
this.form.orderGoodsQty = ''
|
|
this.form.promoQty = ''
|
|
this.form.promoQty = ''
|
|
- this.form.orderRuleType = undefined
|
|
|
|
|
|
+ this.form.promoType = undefined
|
|
this.form.orderAmounts = ''
|
|
this.form.orderAmounts = ''
|
|
this.form.orderAmount = ''
|
|
this.form.orderAmount = ''
|
|
this.form.promoAmount = ''
|
|
this.form.promoAmount = ''
|