Browse Source

Merge branch 'develop_cuxiao' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_cuxiao

lilei 1 year ago
parent
commit
da422ebeec

+ 1 - 1
src/views/promotionRulesManagement/dealerPromotions/chooseProductsModal.vue

@@ -76,7 +76,7 @@
           <!-- 包装数 -->
           <template slot="productQty" slot-scope="text, record">
             <span v-if="record.packQty">
-              {{ record.packQty }}{{ record.unit }}{{ record.packQtyUnit?'/'+record.packQtyUnit:'' }}
+              {{ record.packQty }}{{ record.unit }}/{{ record.packQtyUnit?record.packQtyUnit:'--' }}
             </span>
             <span v-else>--</span>
           </template>

+ 6 - 0
src/views/promotionRulesManagement/dealerPromotions/sendAmountModal.vue

@@ -42,6 +42,7 @@
               id="promotionList-gateType"
               code="PROMOTION_GATE_TYPE"
               placeholder="请选择"
+              @change="changeGateTypeFlag"
               allowClear></v-select>
             <div v-if="form.gateType==='RATIO_AMOUNT'">
               购买门槛产品金额 <a-input-number v-model="form.gateAmount" :min="0" :max="999999" :precision="2" size="small"/> %作为配额
@@ -292,6 +293,11 @@ export default {
         }
       }
     },
+    changeGateTypeFlag (val) {
+      this.form.gateType = val
+      this.form.gateAmount = undefined
+      this.form.quotaAmount = undefined
+    },
     //  保存
     handleSave () {
       const _this = this

+ 6 - 0
src/views/promotionRulesManagement/dealerPromotions/sendProductsModal.vue

@@ -42,6 +42,7 @@
               id="promotionList-gateType"
               code="PROMOTION_GATE_TYPE"
               placeholder="请选择"
+              @change="changeGateTypeFlag"
               allowClear></v-select>
             <div v-if="form.gateType==='RATIO_AMOUNT'">
               购买门槛产品金额 <a-input-number v-model="form.gateAmount" :min="0" :max="999999" :precision="2" size="small"/> %作为配额
@@ -319,6 +320,11 @@ export default {
         }
       }
     },
+    changeGateTypeFlag (val) {
+      this.form.gateType = val
+      this.form.gateAmount = undefined
+      this.form.quotaAmount = undefined
+    },
     //  保存
     handleSave () {
       const _this = this

+ 6 - 0
src/views/promotionRulesManagement/dealerPromotions/specialOfferModal.vue

@@ -42,6 +42,7 @@
               id="promotionList-gateType"
               code="PROMOTION_GATE_TYPE"
               placeholder="请选择"
+              @change="changeGateTypeFlag"
               allowClear></v-select>
             <div v-if="form.gateType==='RATIO_AMOUNT'">
               购买门槛产品金额 <a-input-number v-model="form.gateAmount" :min="0" :max="999999" :precision="2" size="small"/> %作为配额
@@ -225,6 +226,11 @@ export default {
         this.form.quotaAmount = undefined
       }
     },
+    changeGateTypeFlag (val) {
+      this.form.gateType = val
+      this.form.gateAmount = undefined
+      this.form.quotaAmount = undefined
+    },
     //  保存
     handleSave () {
       const _this = this