lilei 3 days ago
parent
commit
0bafbf1e44

+ 15 - 14
src/views/promotionRulesManagement/dealerPromotions/sendAmountModal.vue

@@ -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 id="promotionList-gateFlag" v-model="form.gateFlag" button-style="solid" size="small" @change="changeGateFlag">
@@ -225,6 +214,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;">
@@ -308,7 +308,7 @@ export default {
         promotionRuleType: 'BUY_PROD_GIVE_MONEY', // 买产品送采购额
         accrualFlag: 1,
         description: '', // 规则简称
-        stackFlag: '0', // 叠加规则  1是 0否
+        stackFlag: undefined, // 叠加规则  1是 0否
         gateFlag: '0', // 门槛
         gateType: undefined, // 页面类型
         gateValue: undefined, // 门槛产品有效值
@@ -328,7 +328,8 @@ export default {
         description: [ { required: true, message: '请输入规则简称', trigger: 'blur' } ],
         gateFlag: [ { required: true, message: '请选择规则门槛', trigger: 'change' } ],
         giveRuleType: [{ required: true, message: '请选择满赠规则', trigger: 'change' }],
-        scopeFlag: [{ required: true, message: '请选择采购额适用范围', trigger: 'change' }]
+        scopeFlag: [{ required: true, message: '请选择采购额适用范围', trigger: 'change' }],
+        stackFlag: [{ required: true, message: '请选择规则叠加', trigger: 'change' }]
       },
       chooseVal: 'a', // 当前页面展示值
       scaleNum: 0, // 促销品采购额比例
@@ -549,7 +550,7 @@ export default {
       this.form = {
         promotionRuleType: 'BUY_PROD_GIVE_MONEY', // 买产品送采购额
         description: '',
-        stackFlag: '0',
+        stackFlag: undefined,
         gateFlag: '0', // 门槛
         gateType: undefined, //
         gateValue: undefined,

+ 15 - 14
src/views/promotionRulesManagement/dealerPromotions/sendProductsModal.vue

@@ -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,

+ 5 - 4
src/views/promotionRulesManagement/dealerPromotions/specialOfferModal.vue

@@ -241,7 +241,7 @@
             </template>
           </a-table>
         </a-form-model-item>
-        <a-form-model-item label="规则叠加" v-if="form.discountType!=0">
+        <a-form-model-item label="规则叠加" prop="stackFlag" v-if="form.discountType!=0">
           <v-select
             style="width:40%;"
             size="small"
@@ -348,7 +348,7 @@ export default {
       form: {
         promotionRuleType: 'PROMO_PROD', // 特价产品
         description: '', // 规则简称
-        stackFlag: '0', // 规则叠加
+        stackFlag: undefined, // 规则叠加
         gateFlag: '0', // 门槛
         gateType: undefined, // 门槛产品类型
         gateValue: undefined, // 门槛产品配额值、满最低金额值、最低门槛金额和最低个数值
@@ -365,7 +365,8 @@ export default {
       rules: {
         description: [ { required: true, message: '请输入规则简称', trigger: 'blur' } ],
         gateFlag: [ { required: true, message: '请选择规则门槛', trigger: 'change' } ],
-        discountType: [{ required: true, message: '请选择特价规则', trigger: 'change' }]
+        discountType: [{ required: true, message: '请选择特价规则', trigger: 'change' }],
+        stackFlag: [{ required: true, message: '请选择规则叠加', trigger: 'change' }]
       },
       setTableData: null, // 特价表格规则
       chooseVal: 'a', // 显示规则类型 a门槛产品  d特价产品
@@ -659,7 +660,7 @@ export default {
       this.form = {
         promotionRuleType: 'PROMO_PROD', // 特价产品
         description: '', // 规则简称
-        stackFlag: '0', // 规则叠加
+        stackFlag: undefined, // 规则叠加
         gateFlag: '0', // 门槛
         gateType: undefined,
         gateValue: undefined,