| 
					
				 | 
			
			
				@@ -119,14 +119,14 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     // 叠加活动 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     stackActiveList () { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       if (this.salesBillDetailSnList.length) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        return this.activeList.filter(item => item.promotionRule && item.promotionRule.stackFlag == 1) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        return this.activeList.filter(item => item.promotionRule && item.promotionRule.stackFlag == 1 && item.enabledFlag == 1) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       return this.activeList.filter(item => item.stackFlag == 1) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     // 非叠加活动 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     noStackActiveList () { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       if (this.salesBillDetailSnList.length) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        return this.activeList.filter(item => item.promotionRule && item.promotionRule.stackFlag == 0) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        return this.activeList.filter(item => item.promotionRule && item.promotionRule.stackFlag == 0 && item.enabledFlag == 1) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       return this.activeList.filter(item => item.stackFlag == 0) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 |