|  | @@ -169,14 +169,15 @@
 | 
	
		
			
				|  |  |        <el-table-column label="货物属性" align="center" prop="fBusinessTypes" width="120"/>
 | 
	
		
			
				|  |  |        <el-table-column label="属性详情" align="center" prop="fMarks" width="120"/>
 | 
	
		
			
				|  |  |        <el-table-column label="品名" align="center" prop="fGoodsName" width="120"/>
 | 
	
		
			
				|  |  | -      <el-table-column label="库区" align="center" prop="fWarehouseLocationids" width="120"/>
 | 
	
		
			
				|  |  | -      <el-table-column
 | 
	
		
			
				|  |  | +      <el-table-column label="库区" align="center" prop="fWarehouseLocationids" width="160"/>
 | 
	
		
			
				|  |  | +      <el-table-column label="贸易方式" align="center" prop="fTrademodeid" width="120"/>
 | 
	
		
			
				|  |  | +<!--      <el-table-column
 | 
	
		
			
				|  |  |          label="贸易方式"
 | 
	
		
			
				|  |  |          align="center"
 | 
	
		
			
				|  |  |          prop="fTrademodeid"
 | 
	
		
			
				|  |  |          :formatter="fTrademodeidFormat"
 | 
	
		
			
				|  |  |          width="120"
 | 
	
		
			
				|  |  | -      />
 | 
	
		
			
				|  |  | +      />-->
 | 
	
		
			
				|  |  |        <el-table-column label="件数" align="center" prop="fQty" />
 | 
	
		
			
				|  |  |        <el-table-column label="毛重" align="center" prop="fGrossweight" />
 | 
	
		
			
				|  |  |        <el-table-column label="净重" align="center" prop="fNetweight" />
 | 
	
	
		
			
				|  | @@ -301,7 +302,7 @@
 | 
	
		
			
				|  |  |  </template>
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  <script>
 | 
	
		
			
				|  |  | -import { listWhgenleg, getWhgenleg, delWhgenleg, addWhgenleg, updateWhgenleg, exportWhgenleg } from "@/api/reportManagement/Statistics";
 | 
	
		
			
				|  |  | +import { listWhgenleg, getWhgenleg, delWhgenleg, addWhgenleg, updateWhgenleg, exportWhgenleg , } from "@/api/reportManagement/Statistics";
 | 
	
		
			
				|  |  |  import {listWarehouse} from "@/api/basicdata/warehouse";
 | 
	
		
			
				|  |  |  import {listArea} from "@/api/basicdata/area";
 | 
	
		
			
				|  |  |  import {listGoods} from "@/api/basicdata/goods";
 |