chenrui 1 vuosi sitten
vanhempi
commit
3e70150bcd

+ 1 - 1
src/views/allocationManagement/transferReturn/edit.vue

@@ -292,7 +292,7 @@ export default {
           for (var i = 0; i < data.list.length; i++) {
             data.list[i].no = no + i + 1
             data.list[i].qty = 1
-            if (_this.dealerLevel === 'DEALER') {
+            if (_this.basicInfoData.targetType === 'DEALER') {
               data.list[i].productPrice = data.list[i].priceLevel === 'PROVINCE' ? data.list[i].provincePrice : data.list[i].priceLevel === 'CITY' ? data.list[i].cityPrice : data.list[i].specialPrice
             } else {
               data.list[i].productPrice = data.list[i].lastStockCost

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

@@ -723,9 +723,11 @@ export default {
         }
       } else {
         // 阶梯数据处理
-        const stepIndex = this.chooseVal.split('')[1]
-        if (this.form.giftProductMap && Object.keys(this.form.giftProductMap).length > 0) {
+        const idInfo = this.chooseVal.split('c')[1]
+        const stepIndex = this.fullGiftRuleList.findIndex(item => item.id === idInfo)
+        if (this.form.giftProductMap && Object.keys(this.form.giftProductMap).length > 0 && stepIndex > -1) {
           const stepPreviewList = this.getPreviewList(this.form.giftProductMap['GIFT' + (stepIndex * 1 + 1)])
+
           if (stepPreviewList && stepPreviewList.length > 0) {
             this.previewList = stepPreviewList
             const resuleObj = {