解决云箭新需求中模块和字段的变化 （托板、托盘功能等）

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

@@ -220,9 +220,11 @@ export default {
 				specification: '规格',
 				positionSort: '夹紧位置',
 				status: '启用状态',
-        tray: '可放托盘',
-        number: '可放托盘数量',
-        weight: '排序(升序)'
+				num: '托盘数量',
+        	    tray: '可放托盘',
+        		number: '可放托盘数量',
+        		weight: '排序(升序)',
+				number: '托板数量'
 			},
 			// 【托盘管理-新增-夹紧位置】列表table字段名称
 			trayPosition: {

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

@@ -78,7 +78,8 @@ export default {
 	  		tongbEq: '同步到设备',
 	  		tongbSk: '同步数控程序',
 			mode:  '模式',
-			autoCode: '设备业务自动化节点'
+			autoCode: '设备业务自动化节点',
+			detailConf: '详情配置'
 	  	},
 	  	// 列表的cell名称
 		table: {

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

@@ -76,7 +76,8 @@
       <el-table-column prop="brand.data" :label='$t("prepare.table.tray.brand")' :show-overflow-tooltip="true" width="150px"></el-table-column>
       <el-table-column prop="specification" :label='$t("prepare.table.tray.specification")' :show-overflow-tooltip="true"></el-table-column>
       <el-table-column prop="name" :label='$t("prepare.table.tray.name")' :show-overflow-tooltip="true" width="150px"></el-table-column>
-      <!--排序(升序)-->
+      <el-table-column prop="number" :label='$t("prepare.table.tray.number")' :show-overflow-tooltip="true" align="center" width="80px"></el-table-column>
+	  <!--排序(升序)-->
       <el-table-column prop="weight" :label='$t("lineSide.table.shelves.weight")' :show-overflow-tooltip="true" width="100px"></el-table-column>
       <!--状态-->
       <el-table-column prop="status" :label='$t("prepare.table.tray.status")' align="center" width="90px">

imcs-ui/src/views/zuihou/prepareProductMgr/plateMgr/components/View.vue

@@ -23,13 +23,13 @@
       <el-table-column prop="size" :label='$t("prepare.table.trayPosition.size")' align="center" width="100px">
       	<template slot-scope="{ row }">
       		<el-input size="small" v-model="row.size" v-if="row.isEdit" :placeholder='$t("common.pleaseEnter")'></el-input>
-      		<span v-else="">{{row.size}}</span>
+      		<span v-else>{{row.size}}</span>
       	</template>
       </el-table-column>
       <el-table-column prop="remark" :label='$t("prepare.table.trayPosition.remark")'>
       	<template slot-scope="{ row }">
       		<el-input size="small" v-model="row.remark" v-if="row.isEdit" :placeholder='$t("common.pleaseEnter")'></el-input>
-      		<span v-else="">{{row.remark}}</span>
+      		<span v-else>{{row.remark}}</span>
       	</template>
       </el-table-column>
     </el-table>

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

@@ -78,7 +78,7 @@
       <el-table-column prop="name" :label='$t("prepare.table.tray.name")' :show-overflow-tooltip="true" width="120px"></el-table-column>
       <el-table-column prop="brand.data" :label='$t("prepare.table.tray.brand")' :show-overflow-tooltip="true" width="150px"></el-table-column>
       <el-table-column prop="specification" :label='$t("prepare.table.tray.specification")' :show-overflow-tooltip="true"></el-table-column>
-      <el-table-column prop="name" :label='$t("prepare.table.tray.name")' :show-overflow-tooltip="true" width="150px"></el-table-column>
+      <el-table-column prop="num" :label='$t("prepare.table.tray.num")' e:show-overflow-tooltip="tru" width="80px"></el-table-column>
       <el-table-column prop="positionSort" :label='$t("prepare.table.tray.positionSort")' :show-overflow-tooltip="true" width="150px"></el-table-column>
       <el-table-column prop="status" :label='$t("prepare.table.tray.status")' align="center" width="90px">
       	<template slot-scope="{ row }">

imcs-ui/src/views/zuihou/prepareProductMgr/trayMgr/components/Edit.vue

@@ -23,6 +23,10 @@
       <el-form-item :label='$t("prepare.table.tray.specification")+"："' prop="specification">
         <el-input v-model="tenant.specification" :placeholder='$t("common.pleaseEnter")'/>
       </el-form-item>
+      <!--数量-->
+      <el-form-item :label='$t("prepare.table.tray.num")+"："' prop="num">
+         <el-input-number v-model="tenant.num" :min="1" :max="100" label="1"></el-input-number>
+      </el-form-item>
       <!--夹紧位置-->
       <el-form-item :label='$t("prepare.table.tray.positionSort")+"："'>
         <!-- 功能按钮 -->
@@ -209,7 +213,8 @@ export default {
         brand: {
           key: ''
         },
-        status: '1'
+        status: '1',
+        num: '1'
       }
     },
     initWidth () {