前端页面功能处理

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

@@ -207,7 +207,10 @@ export default {
 				name7: '上料任务号',
 				name8: '最后流转任务号',
 				name9: '入库时间',
-				name10: '是否锁定'
+				name10: '是否锁定',
+				name11: '是否冻结',
+				name12: '目标位置',
+				name13: '业务批次'
 			}
 		},
 		// 表单数据名称

imcs-ui/src/views/zuihou/dispatchMgr/tools/Index.vue

@@ -7,14 +7,14 @@
 			<el-row :gutter="12">				
 				<el-col :xs="6" :sm="5">
 					<el-form-item label="起始位:" prop="start">
-						<el-tooltip content="例如:BZ_361" placement="top">
+						<el-tooltip content="例如:CT_LAUP000101" placement="top">
                     		<el-input v-model="form.start" placeholder="起始库位"></el-input>
 					   </el-tooltip>
 					</el-form-item>
 				</el-col>
 				<el-col :xs="6" :sm="5">
 					<el-form-item label="目的位:" prop="goal">
-						<el-tooltip content="例如:KT_130" placement="top">
+						<el-tooltip content="例如:CT_MERK000101" placement="top">
                     		<el-input  v-model="form.goal" placeholder="目的库位"></el-input>
 						</el-tooltip>
 					</el-form-item>

imcs-ui/src/views/zuihou/lineSideLibrary/lineSideEmulate/components/Edit.vue

@@ -40,7 +40,7 @@
 	      <!-- 库存编码 -->
 	      <el-table-column prop="storgeNo" label='库存编码' width="180px"></el-table-column>
 	      <!-- 数量 -->
-	      <el-table-column prop="num" :label='$t("lineSide.table.emulateProd.name6")' width="180px"></el-table-column>
+	      <el-table-column prop="num" :label='$t("lineSide.table.emulateProd.name6")' width="60px"></el-table-column>
 	      <!-- 入库时间 -->
 	     	<el-table-column prop="createTime" :label='$t("lineSide.table.emulateProd.name9")' width="180px"></el-table-column>
 	      <!-- 是否锁定 -->
@@ -51,6 +51,26 @@
 	          </el-tag>
 	        </template>
 	      </el-table-column>
+        <!-- 是否冻结 -->
+        <el-table-column prop="status" :label='$t("lineSide.table.emulateProd.name11")' align="center" width="90px">
+	      	<template slot-scope="{ row }">             
+	          <el-tag :type="row.status=='0' ? 'danger':'success'">
+	          	{{ row.status=='0' ? $t("common.yes") : $t("common.no") }}
+	          </el-tag>
+	        </template>
+	      </el-table-column>
+        <el-table-column  prop="targetName" :label='$t("lineSide.table.emulateProd.name12")' align="center" width="180px">
+          <template slot-scope="{ row }">
+            <el-tag :type="row.targetName ? 'success' : 'danger'">
+	            {{ row.targetName? row.targetName: '无'}}
+            </el-tag>  
+	        </template>
+        </el-table-column>
+        <el-table-column prop="completeBatchNo" :label='$t("lineSide.table.emulateProd.name13")' align="center" width="200px">
+          <template slot-scope="{ row }">
+            {{ row.completeBatchNo? row.completeBatchNo: (row.campId? row.campId: '')}}
+	        </template>
+        </el-table-column>
 	    </el-table>
 	    <!--<pagination
 	      v-show="tableData.total > 0"