lilei hai 1 ano
pai
achega
0b7b8ea3b0

+ 7 - 1
src/views/salesManagement/salesQueryNew/comps/detailProductList.vue

@@ -314,7 +314,13 @@
               },...aclist] : []
               listData = aclist&&aclist.length ? listData.concat(retList) : listData
             }
-
+            // 如果活动没有任何产品
+            if(active.length){
+              const hasAcp = listData.filter(item => item.id.indexOf("promo-")>=0)
+              if(hasAcp && hasAcp.length==1){
+                listData = listData.filter(item => item.id.indexOf("promo-")<0) || []
+              }
+            }
             console.log(listData)
             this.dataSource = listData
 

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

@@ -418,7 +418,14 @@ export default {
           },...aclist]
           listData = aclist&&aclist.length ? listData.concat(retList) : listData
         }
-
+        // 如果活动没有任何产品
+        if(active.length){
+          const hasAcp = listData.filter(item => item.id.indexOf("promo-")>=0)
+          if(hasAcp && hasAcp.length==1){
+            listData = listData.filter(item => item.id.indexOf("promo-")<0) || []
+          }
+        }
+        
         console.log(listData)
         this.dataSource = listData