|
@@ -25,17 +25,6 @@
|
|
|
placeholder="请输入规则简称(最多20个字符)"
|
|
|
:maxLength="20"></a-input>
|
|
|
</a-form-model-item>
|
|
|
- <a-form-model-item label="规则叠加">
|
|
|
- <v-select
|
|
|
- style="width:40%;"
|
|
|
- size="small"
|
|
|
- v-model="form.stackFlag"
|
|
|
- id="promotionList-stackFlag"
|
|
|
- code="FLAG"
|
|
|
- placeholder="请选择是否叠加规则"
|
|
|
- allowClear></v-select>
|
|
|
- <span>(销售单内的产品可同时参与多个叠加规则)</span>
|
|
|
- </a-form-model-item>
|
|
|
<a-form-model-item label="规则门槛" prop="gateFlag">
|
|
|
<div class="fixWidthBox">
|
|
|
<a-radio-group v-model="form.gateFlag" id="promotionList-gateFlag" button-style="solid" size="small" @change="changeGateFlag">
|
|
@@ -228,6 +217,17 @@
|
|
|
</a-radio-group>
|
|
|
</div>
|
|
|
</a-form-model-item> -->
|
|
|
+ <a-form-model-item label="规则叠加" prop="stackFlag">
|
|
|
+ <v-select
|
|
|
+ style="width:40%;"
|
|
|
+ size="small"
|
|
|
+ v-model="form.stackFlag"
|
|
|
+ id="promotionList-stackFlag"
|
|
|
+ code="FLAG"
|
|
|
+ placeholder="请选择是否叠加规则"
|
|
|
+ allowClear></v-select>
|
|
|
+ <span>(销售单内的产品可同时参与多个叠加规则)</span>
|
|
|
+ </a-form-model-item>
|
|
|
</a-form-model>
|
|
|
<a-card size="small" :bordered="false" class="pages-wrap">
|
|
|
<div class="flex" style="margin-bottom:10px;">
|
|
@@ -310,7 +310,7 @@ export default {
|
|
|
giveRuleType: 'RATIO', // 满赠规则类型: SUM_MONEY[金额叠加] / RATIO[按比例] 满产品送产品写死为: 按比例
|
|
|
promotionRuleType: 'BUY_PROD_GIVE_PROD', // 买产品送产品
|
|
|
description: '', // 简称
|
|
|
- stackFlag: '0', // 叠加规则 1是 0否
|
|
|
+ stackFlag: undefined, // 叠加规则 1是 0否
|
|
|
gateFlag: '0', // 门槛
|
|
|
gateType: undefined, // 选择门槛类型
|
|
|
gateValue: undefined, // 门槛值
|
|
@@ -336,7 +336,8 @@ export default {
|
|
|
gateFlag: [ { required: true, message: '请选择规则门槛', trigger: 'change' } ],
|
|
|
regularSameFlag: [{ required: true, message: '请选择满赠规则', trigger: 'change' }],
|
|
|
accrualFlag: [{ required: true, message: '请选择数量是否叠加', trigger: 'change' }],
|
|
|
- regularPromotionSameFlag: [{ required: true, message: '请选择促销品与正品是否一致', trigger: 'change' }]
|
|
|
+ regularPromotionSameFlag: [{ required: true, message: '请选择促销品与正品是否一致', trigger: 'change' }],
|
|
|
+ stackFlag: [{ required: true, message: '请选择规则叠加', trigger: 'change' }]
|
|
|
},
|
|
|
chooseVal: 'a', // a门槛产品 b正价产品 c 或者c+id促销产品 促销阶梯产品
|
|
|
openGuideModal: false, // 导入弹窗
|
|
@@ -606,7 +607,7 @@ export default {
|
|
|
giveRuleType: 'RATIO', // 满赠规则类型: SUM_MONEY[金额叠加] / RATIO[按比例] 满产品送产品写死为: 按比例
|
|
|
promotionRuleType: 'BUY_PROD_GIVE_PROD', // 买产品送产品
|
|
|
description: '', // 简称
|
|
|
- stackFlag: '0', // 叠加规则 1是 0否
|
|
|
+ stackFlag: undefined, // 叠加规则 1是 0否
|
|
|
gateFlag: '0', // 门槛
|
|
|
gateType: undefined,
|
|
|
gateValue: undefined,
|