| 
					
				 | 
			
			
				@@ -380,16 +380,18 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.queryParam.salesBillSn = this.salesBillSn 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.queryParam.showStock = true 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         const params = this.queryParam 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        const active = this.activeList 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // 正常产品 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         const proList = await salesDetailAllList(params).then(res => res.data) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         const norTotal = await salesDetaiCount(params).then(res => res.data) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        let listData = [{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        //没有活动时不显示统计 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        let listData = active.length ? [{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             id: 'promo-normal', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             total: norTotal 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          },...proList] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          },...proList] : proList 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				          
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // 循环获取活动产品 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        const active = this.activeList 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         for(let i=0;i<active.length;i++){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           const promo = active[i] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           const activeParams = { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -545,4 +547,7 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   .ve-table .ve-table-container .ve-table-content-wrapper table.ve-table-content tbody.ve-table-body tr.ve-table-expand-tr td.table-body-cell-no{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     padding: 0; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   }  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+  .ve-table .ve-table-container .ve-table-content-wrapper{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      border-bottom: 1px solid #ddd; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 </style> 
			 |