| 
					
				 | 
			
			
				@@ -160,7 +160,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 :maxTagCount="3" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 :tree-data="colsArr" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 tree-checkable 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                placeholder="请选择要显示的列" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                placeholder="请选择要显示的列(多选)" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             </div> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           </div> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -433,22 +433,26 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           title: '取消数量', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           value: 'showCancelQty', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          key: 'showCancelQty' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          key: 'showCancelQty', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          disabled: false 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           title: '待下推数量', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           value: 'showPushedQty', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          key: 'showPushedQty' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          key: 'showPushedQty', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          disabled: false 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           title: '待下推金额', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           value: 'showPushedPrice', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          key: 'showPushedPrice' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          key: 'showPushedPrice', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          disabled: !this.$hasPermissions('M_salesQueryList_salesPrice') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           title: '转采购额数量', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           value: 'showPurchaseQty', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          key: 'showPurchaseQty' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          key: 'showPurchaseQty', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          disabled: false 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       ] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -486,11 +490,13 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         arr.splice(pos, 0, { title: '待下推数量', dataIndex: 'totalUnpushedQty', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       if (this.$hasPermissions('M_salesQueryList_salesPrice') && this.showCols.includes('showPushedPrice')) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        arr.splice(12, 0, { title: '待下推金额', dataIndex: 'totalUnpushedAmount', width: '4%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        const pos = this.showCols.includes('showCancelQty') && this.showCols.includes('showPushedQty') ? 12 : 10 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        arr.splice(pos, 0, { title: '待下推金额', dataIndex: 'totalUnpushedAmount', width: '4%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       if (this.showCols.includes('showPurchaseQty')) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        arr.splice(13, 0, { title: '转采购额数量', dataIndex: 'totalConvertPromoGiftsQty', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        const pos = this.$hasPermissions('M_salesQueryList_salesPrice') && this.showCols.includes('showCancelQty') && this.showCols.includes('showPushedQty') ? 13 : 10 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        arr.splice(pos, 0, { title: '转采购额数量', dataIndex: 'totalConvertPromoGiftsQty', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       return arr 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 |