| 
					
				 | 
			
			
				@@ -398,23 +398,23 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       columns () { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         const arr = [ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           { title: '序号', dataIndex: 'no', width: '4%', align: 'center' }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          { title: '产品编码', dataIndex: 'productEntity.code', scopedSlots: { customRender: 'productCode' }, width: '15%', align: 'center' }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          { title: '产品名称', dataIndex: 'productEntity.name', scopedSlots: { customRender: 'productName' }, width: '20%', align: 'left' }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          { title: '起订量', dataIndex: 'unitQtyV', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          { title: '销售数量', scopedSlots: { customRender: 'salesNums' }, width: '7%', align: 'center' }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          { title: '库存', dataIndex: 'stockQty', scopedSlots: { customRender: 'stockQty' }, width: '7%', align: 'center' }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          { title: '产品编码', dataIndex: 'productEntity.code', scopedSlots: { customRender: 'productCode' }, width: '13%', align: 'center' }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          { title: '产品名称', dataIndex: 'productEntity.name', scopedSlots: { customRender: 'productName' }, width: this.promo.promotionRule.promotionRuleType=='PROMO_PROD' ? '20%' : '26%', align: 'left' }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          { title: '起订量', dataIndex: 'unitQtyV', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          { title: '销售数量', scopedSlots: { customRender: 'salesNums' }, width: '6%', align: 'center' }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          { title: '库存', dataIndex: 'stockQty', scopedSlots: { customRender: 'stockQty' }, width: '6%', align: 'center' }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           { title: '出库仓库', scopedSlots: { customRender: 'warehouseBox' }, width: '10%', align: 'center' }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          { title: '单位', dataIndex: 'productEntity.unit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          { title: '单位', dataIndex: 'productEntity.unit', width: '4%', align: 'center', customRender: function (text) { return text || '--' } }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           // { title: '售价小计', dataIndex: 'totalAmount', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          { title: '操作', scopedSlots: { customRender: 'action' }, width: '12%', align: 'center' } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         ] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (this.$hasPermissions('B_salesEdit_salesPrice')) { // 售价权限 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          arr.splice(3, 0, { title: '售价', dataIndex: 'price', width: '7%', align: 'right', scopedSlots: { customRender: 'price' } }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          arr.splice(3, 0, { title: '售价', dataIndex: 'price', width: '6%', align: 'right', scopedSlots: { customRender: 'price' } }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           // 如果是特价活动 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           if(this.promo.promotionRule.promotionRuleType=='PROMO_PROD'){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            arr.splice(4, 0, { title: '促销价', dataIndex: 'discountPrice', width: '7%', align: 'right', scopedSlots: { customRender: 'discountPrice' }}) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            arr.splice(4, 0, { title: '促销价', dataIndex: 'discountPrice', width: '6%', align: 'right', scopedSlots: { customRender: 'discountPrice' }}) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          arr.splice(7, 0, { title: '售价小计', dataIndex: 'totalAmount', width: '7%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          arr.splice(7, 0, { title: '售价小计', dataIndex: 'totalAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return arr 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       } 
			 |