| 
					
				 | 
			
			
				@@ -237,13 +237,6 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     // 获取销售单参与的活动列表 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     async getActiveList(){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      const hasNewActive = await salesQueryUnPartPromo({ salesBillSn: this.$route.params.sn }).then(res => res.data) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      // 有新活动 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      if(hasNewActive.length){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        this.newActiveList = hasNewActive 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        this.showNewActiveModal=true 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       // 已参与活动列表 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.activeList = await salesPromoQueryList({ salesBillSn: this.$route.params.sn }).then(res => res.data || []) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.activeList.map(item => { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -253,6 +246,14 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.activeDesKey['search-'+item.promoRuleSn] = false 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    // 获取是否有新活动 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    async getNewActive(){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      const hasNewActive = await salesQueryUnPartPromo({ salesBillSn: this.$route.params.sn }).then(res => res.data) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      if(hasNewActive.length){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        this.newActiveList = hasNewActive 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        this.showNewActiveModal=true 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     showNewActiveOk(){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.showNewActiveModal = false 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.pageInit() 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -486,6 +487,7 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.salesBillSn = this.$route.params.sn 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.warehouseSn = this.$route.params.sn ? this.$route.params.wSn : '' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.getOrderDetail(true) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.getNewActive() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   mounted () { 
			 |