chenrui hace 4 años
padre
commit
1b4a9cef2d

+ 1 - 1
src/views/common/chooseBrandModal.vue

@@ -13,7 +13,7 @@
         <a-checkbox :checked="checkAll" @change="onCheckAllChange">全选</a-checkbox>
       </div>
       <a-divider />
-      <a-checkbox-group v-model="checkedList" @change="onChange">
+      <a-checkbox-group v-model="checkedList" @change="onChange" style="width: 100%;">
         <a-row style="height: 400px;overflow-y: scroll;">
           <a-col :span="6" v-for="item in brandList" :key="item.brandSn">
             <a-checkbox :value="item.brandSn">

+ 7 - 2
src/views/promotionRulesManagement/promotionRules/editRuleModal.vue

@@ -257,10 +257,15 @@ export default {
             })
           }
           if (data.promoRuleType == 'BUY_PROD_GIVE_MONEY' && data.promoType == 'promo_amount') { //  买产品送采购额  金额
-            this.form.orderAmounts = data.orderAmount
+            this.form.orderAmounts = data.orderAmount ? data.orderAmount : null
+            this.form.promoAmount = data.promoAmount ? data.promoAmount : null
+            this.form.promoAmountPer = ''
+            this.form.orderAmount = ''
           } else if (data.promoRuleType == 'BUY_PROD_GIVE_MONEY' && data.promoType == 'promo_amount_per') { //  买产品送采购额  百分比
+            this.form.orderAmount = data.orderAmount ? data.orderAmount : null
             this.form.promoAmountPer = Number(data.promoAmountPer) * 100
-            this.form.promoAmount = data.promoAmount == 0 ? null : data.promoAmount
+            this.form.orderAmounts = ''
+            this.form.promoAmount = ''
           }
           this.normalGoodsList = data.normalGoodsList || []
           this.promoGoodsList = data.promoGoodsList || []