Browse Source

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

lilei 1 year ago
parent
commit
d4051d2245

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

@@ -87,7 +87,7 @@
             促销产品
           </a-radio-button>
           <a-radio-button :value="'c'+i" v-for="(item,i) in form.giveRuleList" :key="i" v-show="(form.regularPromotionSameFlag==='0'||form.scopeFlag==='0')&&form.promotionRuleType=='BUY_PROD_GIVE_PROD'&&form.giveRuleList">
-            {{ i==0?'促销产品':'促销产品'+'(阶梯'+i +')' }}
+            {{ '促销产品'+'(阶梯'+(i*1+1) +')' }}
           </a-radio-button>
           <a-radio-button value="d" v-show="form.promotionRuleType=='PROMO_PROD'">
             特价产品

+ 4 - 1
src/views/promotionRulesManagement/dealerPromotions/sendProductsModal.vue

@@ -301,10 +301,13 @@ export default {
     // 满赠  同款    促销品与正品一致  默认是 可修改
     //     不同款                   默认否 不可修改
     handleFullGift (e) {
-      if (e === '0') {
+      if (e === '0') { // 不同款
         this.form.regularPromotionSameFlag = '0'
       } else {
         this.form.regularPromotionSameFlag = '1'
+        if (this.chooseVal.indexOf('c') != -1) {
+          this.chooseVal = this.form.gateFlag == '0' ? 'b' : 'a'
+        }
       }
     },
     // 导入

+ 7 - 7
src/views/promotionRulesManagement/dealerPromotions/specialOfferModal.vue

@@ -55,8 +55,8 @@
             </div>
             <div class="ruleDescList" v-if="form.gateType==='FIXED_AMOUNT'">
               购买每满
-              <a-input-number v-model="form.gateValue" :max="999999" :min="0" :precision="form.regularUnit=='YUAN'?2:0" size="small"/>
-              <a-select default-value="GE" v-model="form.regularUnit" style="width: 50px;margin-left:5px;" size="small" @change="handleUnit">
+              <a-input-number v-model="form.gateValue" :max="999999" :min="0" :precision="form.gateUnit=='YUAN'?2:0" size="small"/>
+              <a-select default-value="GE" v-model="form.gateUnit" style="width: 50px;margin-left:5px;" size="small" @change="handleUnit">
                 <a-select-option value="GE">
                 </a-select-option>
@@ -255,7 +255,7 @@ export default {
         gateFlag: '0', // 门槛
         gateType: undefined,
         gateValue: undefined,
-        regularUnit: 'GE',
+        gateUnit: 'GE',
         quotaAmount: undefined,
         discountType: '0', // 特价规则
         gateInfo: undefined,
@@ -296,7 +296,7 @@ export default {
   methods: {
     // 单位切换时,满赠规则数据清空
     handleUnit (val) {
-      this.form.regularUnit = val
+      this.form.gateUnit = val
       this.form.gateValue = undefined
     },
     handleProvincePrice (e) {
@@ -360,7 +360,7 @@ export default {
           }
           // 判断特价规则必填
           if (_this.form.discountType != '0' && _this.setTableData) {
-            if (_this.setTableData[0].provinceValue==undefined || _this.setTableData[0].cityValue==undefined || _this.setTableData[0].specialValue==undefined) {
+            if (_this.setTableData[0].provinceValue == undefined || _this.setTableData[0].cityValue == undefined || _this.setTableData[0].specialValue == undefined) {
               _this.$message.warning('特价规则条件不能为空!')
               return
             }
@@ -436,7 +436,7 @@ export default {
             } else if (form.gateType === 'MIN_AMOUNT') {
               form.gateInfo = '购买门槛产品满最低金额' + form.gateValue + '不限制配额'
             } else {
-              form.gateInfo = '购买每满' + form.gateValue + form.regularUnit == 'YUAN' ? '元' : '个' + '门槛产品,可采购' + form.quotaAmount + '个特价产品(配额算销售额)'
+              form.gateInfo = '购买每满' + form.gateValue + form.gateUnit == 'YUAN' ? '元' : '个' + '门槛产品,可采购' + form.quotaAmount + '个特价产品(配额算销售额)'
             }
           }
           if (form.discountType == '0') {
@@ -511,7 +511,7 @@ export default {
         gateFlag: '0', // 门槛
         gateType: undefined,
         gateValue: undefined,
-        regularUnit: 'GE',
+        gateUnit: 'GE',
         quotaAmount: undefined,
         discountType: '0', // 特价规则
         gateProductList: undefined,