|  | @@ -175,9 +175,14 @@
 | 
	
		
			
				|  |  |        <el-table-column type="selection" width="55" align="center" />
 | 
	
		
			
				|  |  |        <el-table-column label="客户" align="center" prop="fCorpid" />
 | 
	
		
			
				|  |  |        <el-table-column label="提单号" align="center" prop="fMblno" />
 | 
	
		
			
				|  |  | -      <el-table-column label="库区" align="center" prop="fWarehouseLocationid" />
 | 
	
		
			
				|  |  | -      <el-table-column label="货物品名" align="center" prop="fGoodsid" />
 | 
	
		
			
				|  |  | -      <el-table-column label="贸易方式" align="center" prop="fTrademodeid" />
 | 
	
		
			
				|  |  | +      <el-table-column label="库区" align="center" prop="fWarehouseLocationids" />
 | 
	
		
			
				|  |  | +      <el-table-column label="货物品名" align="center" prop="fGoodsids" />
 | 
	
		
			
				|  |  | +      <el-table-column
 | 
	
		
			
				|  |  | +        label="贸易方式"
 | 
	
		
			
				|  |  | +        align="center"
 | 
	
		
			
				|  |  | +        prop="fTrademodeid"
 | 
	
		
			
				|  |  | +        :formatter="fTrademodeidFormat"
 | 
	
		
			
				|  |  | +      />
 | 
	
		
			
				|  |  |        <el-table-column label="入库件数" align="center" prop="fQtyd" />
 | 
	
		
			
				|  |  |        <el-table-column label="入库尺码" align="center" prop="fVolumnd" />
 | 
	
		
			
				|  |  |        <el-table-column label="入库毛重" align="center" prop="fGrossweightd" />
 | 
	
	
		
			
				|  | @@ -374,6 +379,10 @@ export default {
 | 
	
		
			
				|  |  |      });
 | 
	
		
			
				|  |  |    },
 | 
	
		
			
				|  |  |    methods: {
 | 
	
		
			
				|  |  | +    // 贸易方式(数据字典),对���t_trademodels 字典翻译
 | 
	
		
			
				|  |  | +    fTrademodeidFormat(row, column) {
 | 
	
		
			
				|  |  | +      return this.selectDictLabel(this.fTrademodeidOptions, row.fTrademodeid);
 | 
	
		
			
				|  |  | +    },
 | 
	
		
			
				|  |  |      /* 远程模糊查询仓库 */
 | 
	
		
			
				|  |  |      warehouseRemoteMethod(name) {
 | 
	
		
			
				|  |  |        if (name == null || name === "") {
 |