托盘所在库位

imcs-ui/src/lang/zh/prepare.js

@@ -171,7 +171,7 @@ export default {
 				expiryDate: '有效期',
 				materialNo: '材料编号',
 				joinDate: '入库日期',
-       			materialType: '物料类型',
+       	materialType: '物料类型',
 				status: '启用状态',
 				remark: '备注',
 				jjPosion: '可加工夹紧位置',
@@ -257,6 +257,7 @@ export default {
 				no: '物料编码',
 				name: '托板名称',
         materialType: '物料类型',
+        storgeName: '库位',
         factory: '生产分厂/制造商',
         productionType: '产品分类',
 		categoryType: '托盘类型',

imcs-ui/src/views/zuihou/prepareProductMgr/trayMgr/Index.vue

@@ -77,6 +77,7 @@
       <el-table-column prop="no" :label='$t("prepare.table.tray.no")' :show-overflow-tooltip="true" width="160px"></el-table-column>
       <el-table-column prop="name" :label='$t("prepare.table.tray.name")' :show-overflow-tooltip="true" width="120px"></el-table-column>
       <el-table-column prop="materialType" :label='$t("prepare.table.tray.materialType")' :show-overflow-tooltip="true" width="150px"></el-table-column>
+      <el-table-column prop="storgeName" :label='$t("prepare.table.tray.storgeName")' :show-overflow-tooltip="true" width="150px"></el-table-column>
 	  <el-table-column prop="productionType.data" :label='$t("prepare.table.tray.productionType")' :show-overflow-tooltip="true" width="120px"></el-table-column>
 	  <el-table-column prop="fiveAxis" :label='$t("prepare.table.tray.fiveAxis")' :show-overflow-tooltip="true" width="100px">
 		<template slot-scope="{ row }">
@@ -84,7 +85,7 @@
           	{{ row.fiveAxis==1 ? $t("common.yes") : $t("common.no") }}
           </el-tag>
         </template>
-	  </el-table-column> 
+	  </el-table-column>
 	  <el-table-column prop="factory" :label='$t("prepare.table.tray.factory")' :show-overflow-tooltip="true" width="200px"></el-table-column>
       <el-table-column prop="joinDate" :label='$t("prepare.table.tray.joinDate")' :show-overflow-tooltip="true" width="150px"></el-table-column>
       <el-table-column prop="expiryDate" :label="$t('prepare.table.tray.expiryDate')+' (月)'" align="center" :show-overflow-tooltip="true" width="100px"></el-table-column>
@@ -97,7 +98,7 @@
         </template>
       </el-table-column>
       <el-table-column
-        :label="$t('table.operation')" 
+        :label="$t('table.operation')"
         fixed="right"
         align="center"
         column-key="operation"
@@ -214,7 +215,7 @@
 	      },
 	      dicts: {
 		  BUSINESS_PRODUCT_TYPE: {},
-		  TRAY_CATEGORY_TYPE: {},	
+		  TRAY_CATEGORY_TYPE: {},
           METERIAL_BRAND: {}  //工具材料品牌
         },
 	      enums: {
@@ -228,7 +229,7 @@
 	  	// 调用常量-审核状态
 	  	this.audioStatus = this.$constWKS.STATUSORTHERLIST
 	  	// 加载【字典】
-	  	initDicts(['BUSINESS_PRODUCT_TYPE','TRAY_CATEGORY_TYPE'], this.dicts)		  
+	  	initDicts(['BUSINESS_PRODUCT_TYPE','TRAY_CATEGORY_TYPE'], this.dicts)
 	  	// 加载列表数据
 	  	this.fetch()
 		},
@@ -241,7 +242,7 @@
       },
 	    metcatgList() {
         return convertEnum(this.dicts.METERIAL_CATEGORY)
-      }	 
+      }
 	  },
 	  mounted () {