lilei преди 6 месеца
родител
ревизия
1292798944

+ 1 - 1
src/views/salesManagement/salesCollection/list.vue

@@ -223,7 +223,7 @@ import rangeDate from '@/views/common/rangeDate.vue'
 import subarea from '@/views/common/subarea.js'
 import Area from '@/views/common/area.js'
 import commonModal from '@/views/common/commonModal.vue'
-import salesDetail from '@/views/salesManagement/salesQueryNew/detailAll.vue'
+import salesDetail from '@/views/salesManagement/salesQueryNew/detail.vue'
 import dispatchDetail from '@/views/salesManagement/pushOrderManagement/detail.vue'
 import voucherModal from './voucherModal.vue'
 import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'

+ 5 - 2
src/views/salesManagement/salesQueryNew/comps/activeQueryPart.vue

@@ -268,6 +268,9 @@ export default {
       const isMcpScp = this.promoRuleData && this.promoRuleData.convertExpenseFlag == 1 && this.promoRuleData.promotionRuleType == 'BUY_PROD_GIVE_PROD'
       // 是否卖产品送采购额
       const isMcpScge = this.promoRuleData.promotionRuleType == 'BUY_PROD_GIVE_MONEY' && this.promoRuleData.scopeFlag === '1'
+      // 阶梯
+      const hasScopeLevel = this.promoRuleData && this.promoRuleData.giveRuleList && this.promoRuleData.giveRuleList[0]
+      // 选项卡数据
       // 选项卡数据
       const tabList = []
       if (this.promoRuleData) {
@@ -278,7 +281,7 @@ export default {
           tabList.push({ text: '正价产品', val: 'REGULAR' })
         }
         if (this.promoRuleData.regularPromotionSameFlag === '0' || this.promoRuleData.scopeFlag === '0' || isMcpScge) {
-          const levelText = promo.countData.scopeLevelFlag && isMcpScp ? '(阶梯' + promo.countData.scopeLevel + ')' : ''
+          const levelText = hasScopeLevel && isMcpScp ? '(阶梯' + hasScopeLevel.scopeLevel + ')' : ''
           tabList.push({ text: '促销产品' + levelText, val: 'GIFT' })
         }
         if (this.promoRuleData.promotionRuleType == 'PROMO_PROD') {
@@ -288,7 +291,7 @@ export default {
       this.tabList = tabList
       this.promoProductClz = tabList[0].val
       this.tableHeight = window.innerHeight - 330
-      this.queryParam.scopeLevel = promo.countData.scopeLevel
+      this.queryParam.scopeLevel = hasScopeLevel.scopeLevel
       this.resetSearchForm()
     },
     // 刷新当前页面

+ 2 - 1
src/views/salesManagement/salesQueryNew/comps/activeStatisticsList.vue

@@ -68,6 +68,7 @@ export default {
     activeList: {
       handler (val) {
         if (!this.hasInit) {
+          this.tableData = []
           this.getDataList()
         }
       },
@@ -106,7 +107,7 @@ export default {
             this.checkboxOption.selectedRowKeys = isSelected ? [endSelProduct] : []
           }
           // 查询此活动下的已选产品列表
-          this.$emit('selected', isSelected ? this.checkboxOption.selectedRowKeys : null)
+          this.$emit('selected', this.checkboxOption.selectedRowKeys)
         }
       },
       // 单元格样式

+ 1 - 1
src/views/salesManagement/salesQueryNew/comps/chooseProduct.vue

@@ -75,7 +75,7 @@ export default {
       this.$emit('addProduct', row, this.promoData, promoProductClz, this.cptype)
     },
     // 初始化数据,
-    // data 订单数据, promo 促销活动数据, type 组件类型
+    // data 销售单详情数据, promo 促销活动规则数据, type 组件类型
     pageInit (data, promo, type) {
       this.cptype = type
       this.orderData = data

+ 2 - 2
src/views/salesManagement/salesQueryNew/edit.vue

@@ -346,7 +346,7 @@ export default {
       this.showDiscountSortModal = false
       this.getOrderDetail(true)
     },
-    // 打开选择产品弹框
+    // 打开选择产品弹框,type:0 正常产品,1活动产品,2累计产品
     openProductModal (type, promo) {
       this.$refs.chooseProduct.pageInit(this.detailData, promo, type)
       this.showCpModal = true
@@ -376,7 +376,7 @@ export default {
         if (this.activeList.length) this.$refs.productActiveList.resetSearchForm()
       }
       // 重新获取详情信息
-      this.getOrderDetail(false)
+      this.getOrderDetail(true)
     },
     // 确定新增产品到列表,
     insterProduct (row, promo, promoProductClz, cptype) {