瀏覽代碼

修改bug

chenrui 1 年之前
父節點
當前提交
3d1bdd7213

+ 2 - 2
src/views/promotionRulesManagement/dealerPromotions/detail.vue

@@ -80,7 +80,7 @@
               <div>{{ record.accrualFlag==='1'?'数量叠加;':'' }}{{ record.convertExpenseFlag==='1'?'可转费用报销单;':'' }}</div>
               <div v-if="record.giveRuleList && record.giveRuleList.length>0">
                 <div v-for="item in record.giveRuleList" :key="item.scopeLevel">
-                  {{ item.scopeLevel }}{{ item.regularSameFlag==='1'?'同款':'不同款' }}产品,购买满{{ item.regularValue }}{{ item.regularUnit==='YUAN'?'元':'个' }}正价产品,送{{ item.promotionValue }}个促销产品;
+                  {{ record.giveRuleList.length>1?item.scopeLevel+'、' :'' }}{{ item.regularSameFlag==='1'?'同款':'不同款' }}产品购买满{{ item.regularValue }}{{ item.regularUnit==='YUAN'?'元':'个' }}正价产品,送{{ item.promotionValue }}个促销产品;
                 </div>
               </div>
               <div v-if="record.restrictFlag==='1'">限制正价产品{{ record.restrictCategory }}款</div>
@@ -90,7 +90,7 @@
               <div v-if="record.giveRuleType==='RATIO' &&record.giveRuleList && record.giveRuleList.length>0 ">
                 <span>按比例;</span>
                 <div v-for="item in record.giveRuleList" :key="item.scopeLevel">
-                  {{ item.scopeLevel }}产品购买满{{ item.regularValue }}{{ item.regularUnit==='YUAN'?'元':'个' }}正价产品,送正价产品总金额的{{ item.promotionValue }}%为促销品采购额
+                  {{ record.giveRuleList.length>1?item.scopeLevel+'、' :'' }}产品购买满{{ item.regularValue }}{{ item.regularUnit==='YUAN'?'元':'个' }}正价产品,送正价产品总金额的{{ item.promotionValue }}%为促销品采购额
                 </div>
               </div>
             </div>

+ 2 - 3
src/views/promotionRulesManagement/dealerPromotions/detailModal.vue

@@ -29,18 +29,17 @@
         </a-form-model-item>
         <!-- 买产品送产品 -->
         <a-form-model-item label="满赠规则" prop="regularSameFlag" v-if="form.promotionRuleType ==='BUY_PROD_GIVE_PROD'&&form.giveRuleList&&form.giveRuleList.length>0">
-          <div v-for="item in form.giveRuleList" :key="item.scopeLevel">{{ item.scopeLevel }}{{ item.regularSameFlag==='1'?'同款':'不同款' }}产品购买满 {{ item.regularValue }} {{ item.regularUnit==='YUAN'?'元':'个' }}正价产品,送 {{ item.promotionValue }} 个促销产品</div>
+          <div v-for="item in form.giveRuleList" :key="item.scopeLevel">{{ form.giveRuleList.length>1?item.scopeLevel+'、' :'' }}{{ item.regularSameFlag==='1'?'同款':'不同款' }}产品购买满 {{ item.regularValue }} {{ item.regularUnit==='YUAN'?'元':'个' }}正价产品,送 {{ item.promotionValue }} 个促销产品</div>
           <div v-if="form.restrictFlag&&form.restrictFlag==1">限制正价产品{{ form.restrictCategory }}款 </div>
           <div v-if="form.convertExpenseFlag&&form.convertExpenseFlag==1">可转费用报销单</div>
         </a-form-model-item>
         <!-- 买产品送采购额 -->
         <a-form-model-item label="满赠规则" prop="regularSameFlag" v-if="form.promotionRuleType ==='BUY_PROD_GIVE_MONEY'">
-          <!--          购买满 {{ form.regularAmount }} 元正价产品,送 {{ form.giveAmount }} 元({{ perCentNum }}%促销品采购额) -->
           <div>{{ form.giveRuleType==='SUM_MONEY'?'金额叠加':'按比例' }}</div>
           <div v-if="form.giveRuleType==='SUM_MONEY'">购买满{{ form.giveRuleList[0].regularValue }}{{ form.giveRuleList[0].regularUnit==='YUAN'?'元':'个' }}正价产品,送{{ form.giveRuleList[0].promotionValue }}元<span v-if="form.giveRuleList[0].regularUnit==='YUAN'">({{ perCentNum }}%促销品采购额)</span></div>
           <div v-if="form.giveRuleType==='RATIO' &&form.giveRuleList && form.giveRuleList.length>0 ">
             <div v-for="item in form.giveRuleList" :key="item.scopeLevel">
-              {{ item.scopeLevel }}产品购买满{{ item.regularValue }}{{ item.regularUnit==='YUAN'?'元':'个' }}正价产品,送正价产品总金额的{{ item.promotionValue }}%为促销品采购额
+              {{ form.giveRuleList.length>1?item.scopeLevel+'、' :'' }}产品购买满{{ item.regularValue }}{{ item.regularUnit==='YUAN'?'元':'个' }}正价产品,送正价产品总金额的{{ item.promotionValue }}%为促销品采购额
             </div>
           </div>
         </a-form-model-item>

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

@@ -169,7 +169,7 @@
             <a-radio-button value="b">
               正价产品
             </a-radio-button>
-            <a-radio-button :value="'c'+i" v-for="(item,i) in fullGiftRuleList" :key="i" v-show="form.regularPromotionSameFlag==='0'">
+            <a-radio-button :value="'c'+item.id" v-for="(item,i) in fullGiftRuleList" :key="i" v-show="form.regularPromotionSameFlag==='0'">
               {{ fullGiftRuleList.length>1?'促销产品('+'阶梯'+(i*1+1)+')':'促销产品' }}
             </a-radio-button>
           </a-radio-group>
@@ -182,7 +182,7 @@
         </div>
         <div v-show="chooseVal=='a'"><tableType1 ref="cillProduct"></tableType1></div>
         <div v-show="chooseVal=='b'"><tableType1 ref="normalPriceProduct"></tableType1></div>
-        <div v-show="chooseVal==('c'+i)" v-for="(item,i) in fullGiftRuleList" :key="item.id"><tableType1 :ref="'offerProduct'+i"></tableType1></div>
+        <div v-show="chooseVal==('c'+item.id)" v-for="(item,i) in fullGiftRuleList" :key="item.id"><tableType1 :ref="'offerProduct'+i"></tableType1></div>
       </a-card>
       <div class="btn-cont">
         <a-button id="promotionList-basicInfo-modal-back" @click="isShow = false">取消</a-button>
@@ -289,13 +289,14 @@ export default {
         promotionValue: undefined
       }
       this.fullGiftRuleList.push(obj)
-      debugger
     },
     // 删除满减规则
     delFullGiftRule (id) {
       const pos = this.fullGiftRuleList.findIndex(con => { return con.id == id })
       this.fullGiftRuleList.splice(pos, 1)
-      this.chooseVal = this.form.gateFlag == '0' ? 'b' : 'a'
+      if (this.chooseVal == 'c' + id) {
+        this.chooseVal = this.form.gateFlag == '0' ? 'b' : 'a'
+      }
     },
     // 满赠  同款    促销品与正品一致  默认是 可修改
     //     不同款                   默认否 不可修改

+ 17 - 12
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="2" size="small"/>
-              <a-select default-value="YUAN" v-model="form.regularUnit" style="width: 50px;margin-left:5px;" size="small">
+              <a-input-number v-model="form.gateValue" :max="999999" :min="0" :precision="form.regularUnit==='YUAN'?2:0" size="small"/>
+              <a-select default-value="YUAN" v-model="form.regularUnit" style="width: 50px;margin-left:5px;" size="small" @change="handleUnit">
                 <a-select-option value="YUAN">
                 </a-select-option>
@@ -65,7 +65,7 @@
                 </a-select-option>
               </a-select>
               门槛产品,可采购
-              <a-input-number v-model="form.quotaAmount" :max="999999" :min="0" :precision="2" size="small"/>
+              <a-input-number v-model="form.quotaAmount" :max="999999" :min="0" :precision="0" size="small"/>
               个特价产品(配额算销售额)
             </div>
           </div>
@@ -265,7 +265,7 @@ export default {
         gateFlag: [ { required: true, message: '请选择规则门槛', trigger: 'change' } ],
         discountType: [{ required: true, message: '请选择特价规则', trigger: 'change' }]
       },
-      setTableData: [],
+      setTableData: null,
       chooseVal: 'a',
       openProductsModal: false,
       chooseProducts: [],
@@ -289,28 +289,33 @@ export default {
           { title: '特约直降', scopedSlots: { customRender: 'specialPrice' }, width: '33%', align: 'center' }
         ]
       }
-      _this.setTableData = [{
-        provinceValue: undefined,
-        cityValue: undefined,
-        specialValue: undefined
-      }]
       return arr
     }
   },
   methods: {
+    // 单位切换时,满赠规则数据清空
+    handleUnit (val) {
+      this.form.regularUnit = val
+      this.form.gateValue = undefined
+    },
     handleProvincePrice (e) {
-      this.setTableData[0].provinceValue = e.target.value
+      this.setTableData[0].provinceValue = Number(e.target.value)
       if (this.setTableData[0].cityValue) {
-        this.setTableData[0].cityValue = e.target.value
+        this.setTableData[0].cityValue = Number(e.target.value)
       }
     },
     handleCityPrice (e) {
-      this.setTableData[0].cityValue = e.target.value
+      this.setTableData[0].cityValue = Number(e.target.value)
     },
     // 特价规则切换时清空数据
     handleDiscountType (val) {
       this.form.discountType = val
       this.$refs.specialProduct.reSetTableData()
+      this.setTableData = [{
+        provinceValue: undefined,
+        cityValue: undefined,
+        specialValue: undefined
+      }]
     },
     // 导入
     closeGuideModel () {