lilei 1 éve
szülő
commit
ab8a9171a9

+ 12 - 10
src/views/salesManagement/salesQueryNew/comps/detailProductList.vue

@@ -301,8 +301,6 @@
                 ...params
               }
               
-              // 获取活动产品列表
-              const aclist = await salesDetailAllList(activeParams).then(res => res.data)
               // 获取活动产品统计
               const acTotal = await salesPromoDetailCount(activeParams).then(res => res.data)
               if(acTotal){
@@ -311,14 +309,18 @@
                 // 采购额超出
                 acTotal.cgeccAmount = Number(acTotal.totalUsePromoGiftsAmount||0) - Number(acTotal.totalPromoGiftsAmount||0)
               }
-              
-              const retList = aclist.length ? [{
-                id: 'promo-'+i,
-                promo: promo,
-                total: acTotal
-              },...aclist] : []
-              // 将活动产品数据拼接
-              listData = aclist&&aclist.length ? listData.concat(retList) : listData
+              // 有数据时才调用接口,避免做无用的调用
+              if(acTotal&&acTotal.totalQty){
+                // 获取活动产品列表
+                const aclist = await salesDetailAllList(activeParams).then(res => res.data)
+                const retList = aclist.length ? [{
+                  id: 'promo-'+i,
+                  promo: promo,
+                  total: acTotal
+                },...aclist] : []
+                // 将活动产品数据拼接
+                listData = aclist&&aclist.length ? listData.concat(retList) : listData
+              }
             }
             console.log(listData)
             // 如果活动没有任何产品,不显示统计一行

+ 14 - 8
src/views/salesManagement/waitDispatchNew/queryPart.vue

@@ -424,8 +424,7 @@ export default {
             ...params
           }
           
-          // 获取活动产品列表
-          const aclist = await salesDetailAllList(activeParams).then(res => res.data)
+          
           // 获取活动产品统计
           const acTotal = await salesPromoDetailCount(activeParams).then(res => res.data)
           if(acTotal){
@@ -434,12 +433,19 @@ export default {
             // 采购额超出
             acTotal.cgeccAmount = Number(acTotal.totalUsePromoGiftsAmount||0) - Number(acTotal.totalPromoGiftsAmount||0)
           }
-          const retList = [{
-            id: 'promo-'+i,
-            promo: promo,
-            total: acTotal
-          },...aclist]
-          listData = aclist&&aclist.length ? listData.concat(retList) : listData
+           
+          // 有数据时才调用接口,避免做无用的调用
+          if(acTotal&&acTotal.totalQty){
+            // 获取活动产品列表
+            const aclist = await salesDetailAllList(activeParams).then(res => res.data)
+            const retList = aclist.length ? [{
+              id: 'promo-'+i,
+              promo: promo,
+              total: acTotal
+            },...aclist] : []
+            // 将活动产品数据拼接
+            listData = aclist&&aclist.length ? listData.concat(retList) : listData
+          }
         }
   
         // 如果活动没有任何产品