| 
					
				 | 
			
			
				@@ -188,7 +188,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 { title: '原厂编码', field: 'productOrigCode',key: "d", width: 150, align: 'left',operationColumn: false,ellipsis: { showTitle: true },renderBodyCell: ({ row, column, rowIndex }, h) => { return row[column.field] || '--'} }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 { title: '出库仓库', field: 'warehouseName',key: "e", width: 100, align: 'center',operationColumn: false,renderBodyCell: ({ row, column, rowIndex }, h) => { return row[column.field] || '--'}} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             ] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            this.colspanNums = 5 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            this.colspanNums = this.showConvertPromoGifts ? 6 : 5 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if (this.$hasPermissions(this.authCode + '_costPrice')) { //  成本价权限 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               this.colspanNums = this.colspanNums + 1 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               arr.push({ title: '成本价', field: 'showCost', width: 80,key: "f", align: 'right',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return priceFormat(row[column.field])} }) 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -228,7 +228,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 { title: '已下推数', field: 'pushedQty', width: 80,key: "p", align: 'center',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return numsFormat(row[column.field])} }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             ]) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				              
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            if(this.hasConvertPromoGifts){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if(this.showConvertPromoGifts){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               arr.push({ title: '转采购额数量', field: 'convertPromoGiftsQty', width: 100,key: "z", align: 'center',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return numsFormat(row[column.field])} }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             arr.push({ title: '已取消数', field: 'cancelQty', width: 80,key: "q", align: 'center',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return numsFormat(row[column.field])} }) 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -237,6 +237,9 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         hasConvertPromoGifts(){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           return this.detailData && this.detailData.totalConvertPromoGiftsQty 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        showConvertPromoGifts(){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          return this.activeList&&this.activeList.find(item => item.promotionRule&&item.promotionRule.convertExpenseFlag==1&&item.promotionRule.promotionRuleType=='BUY_PROD_GIVE_PROD') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         showStock(){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             return this.detailData && (this.detailData.billStatus == 'WAIT_AUDIT' || this.detailData.billStatus == 'HQ_CHANGE') && this.$hasPermissions('B_salesAudit') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 |