فهرست منبع

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

lilei 1 سال پیش
والد
کامیت
918ed7faab

+ 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

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

@@ -598,11 +598,13 @@ export default {
           }
           if (resultObj.giveRuleList && resultObj.giveRuleList.length > 0) {
             _this.fullGiftRuleList = resultObj.giveRuleList
-            _this.$nextTick(() => {
-              resultObj.giveRuleList.forEach((item, i) => {
-                _this.$refs['offerProduct' + i][0].setTabVal(_this.newData(resultObj.giftProductMap['GIFT' + (i * 1 + 1)]))
+            if (resultObj.giftProductMap && Object.keys(resultObj.giftProductMap).length > 0) {
+              _this.$nextTick(() => {
+                resultObj.giveRuleList.forEach((item, i) => {
+                  _this.$refs['offerProduct' + i][0].setTabVal(_this.newData(resultObj.giftProductMap['GIFT' + (i * 1 + 1)]))
+                })
               })
-            })
+            }
           }
           // 重新组成保存数据
           if (resultObj.gateProductList && resultObj.gateProductList.length > 0) {
@@ -721,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 = {

+ 1 - 1
src/views/reportData/tireSalesReport/outDetailModal.vue

@@ -15,7 +15,7 @@
         :columns="columns"
         :data="loadData"
         :style="{height: '400px' }"
-        :scroll="{ y: 600 }"
+        :scroll="{ y: 330 }"
         :showPagination="true"
         :defaultLoadData="false"
         bordered>