lilei 1 year ago
parent
commit
c9ce7d910a

+ 11 - 6
src/views/salesManagement/salesQueryNew/comps/detailProductList.vue

@@ -304,10 +304,13 @@
               const aclist = await salesDetailAllList(activeParams).then(res => res.data)
               // 获取活动产品统计
               const acTotal = await salesPromoDetailCount(activeParams).then(res => res.data)
-              // 采购额结余
-              acTotal.cgejyAmount = Number(acTotal.totalPromoGiftsAmount) - Number(acTotal.totalUsePromoGiftsAmount)
-              // 采购额超出
-              acTotal.cgeccAmount = Number(acTotal.totalUsePromoGiftsAmount) - Number(acTotal.totalPromoGiftsAmount)
+              if(acTotal){
+                // 采购额结余
+                acTotal.cgejyAmount = Number(acTotal.totalPromoGiftsAmount||0) - Number(acTotal.totalUsePromoGiftsAmount||0)
+                // 采购额超出
+                acTotal.cgeccAmount = Number(acTotal.totalUsePromoGiftsAmount||0) - Number(acTotal.totalPromoGiftsAmount||0)
+              }
+              
               const retList = aclist.length ? [{
                 id: 'promo-'+i,
                 promo: promo,
@@ -316,13 +319,15 @@
               // 将活动产品数据拼接
               listData = aclist&&aclist.length ? listData.concat(retList) : listData
             }
+            console.log(listData)
             // 如果活动没有任何产品,不显示统计一行
             if(active.length){
-              const hasAcp = listData.filter(item => item.id=='promo-normal').filter(item => item.id.indexOf("promo-")>=0)
-              if(hasAcp && hasAcp.length==1){
+              const hasAcp = listData.filter(item => item.id!='promo-normal').filter(item => item.id.indexOf("promo-")>=0)
+              if(hasAcp && hasAcp.length==0){
                 listData = listData.filter(item => item.id.indexOf("promo-")<0) || []
               }
             }
+
             console.log(listData)
             this.dataSource = listData
 

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

@@ -415,10 +415,12 @@ export default {
           const aclist = await salesDetailAllList(activeParams).then(res => res.data)
           // 获取活动产品统计
           const acTotal = await salesPromoDetailCount(activeParams).then(res => res.data)
-          // 采购额结余
-          acTotal.cgejyAmount = Number(acTotal.totalPromoGiftsAmount) - Number(acTotal.totalUsePromoGiftsAmount)
-          // 采购额超出
-          acTotal.cgeccAmount = Number(acTotal.totalUsePromoGiftsAmount) - Number(acTotal.totalPromoGiftsAmount)
+          if(acTotal){
+            // 采购额结余
+            acTotal.cgejyAmount = Number(acTotal.totalPromoGiftsAmount||0) - Number(acTotal.totalUsePromoGiftsAmount||0)
+            // 采购额超出
+            acTotal.cgeccAmount = Number(acTotal.totalUsePromoGiftsAmount||0) - Number(acTotal.totalPromoGiftsAmount||0)
+          }
           const retList = [{
             id: 'promo-'+i,
             promo: promo,
@@ -429,8 +431,8 @@ export default {
   
         // 如果活动没有任何产品
         if(active.length){
-          const hasAcp = listData.filter(item => item.id=='promo-normal').filter(item => item.id.indexOf("promo-")>=0)
-          if(hasAcp && hasAcp.length==1){
+          const hasAcp = listData.filter(item => item.id!='promo-normal').filter(item => item.id.indexOf("promo-")>=0)
+          if(hasAcp && hasAcp.length==0){
             listData = listData.filter(item => item.id.indexOf("promo-")<0) || []
           }
         }

+ 2 - 2
vue.config.js

@@ -108,9 +108,9 @@ const vueConfig = {
     // If you want to turn on the proxy, please remosve the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://192.168.2.113:8660/ocs-admin',
+        // target: 'http://192.168.2.113:8660/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  练习
-        // target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
+        target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
         ws: false,
         changeOrigin: true,
         pathRewrite: {