| 
					
				 | 
			
			
				@@ -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) || [] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 |