rfid流程修改

src/views/mes/rfidProcess/index.vue

@@ -86,6 +86,16 @@
 			<!-- <el-table-column label="工单名称" align="center" prop="workorderName"/> -->
 			<!-- <el-table-column label="订单ID" align="center" prop="orderId" width="180"/> -->
       <el-table-column label="订单编号" align="center" prop="orderCode" width="200"/>
+      <el-table-column label="产品编码" align="center" prop="productCode" width="200"/>
+      <el-table-column label="产品名称" align="center" prop="productName" width="200"/>
+      <el-table-column label="生产时间" align="center" prop="productDate" width="200"/>
+<!--      <el-table-column label="班次" align="center" prop="shiftId" width="200"/>-->
+      <el-table-column label="班次" align="center" prop="shiftId" >
+        <template slot-scope="scope">
+          <span v-if="scope.row.shiftId == 5">白班</span>
+          <span v-else>夜班</span>
+        </template>
+      </el-table-column>
 			<el-table-column label="rfid号" align="center" prop="rfid" width="180"/>
 			<el-table-column label="工厂编码" align="center" prop="factoryCode" />
 			<el-table-column label="机台编码" align="center" prop="machineCode" />
@@ -103,7 +113,7 @@
 			<el-table-column label="出时间" align="center" prop="outTime" width="180">
 				<template slot-scope="scope">
           <span>{{ parseTime(scope.row.outTime, '{y}-{m}-{d}') }}</span>
-          {{ parseTime(scope.row.outTime, '{h}:{m}:{s}') }}
+          <span>{{ parseTime(scope.row.outTime, '{h}:{m}:{s}') }}</span>
 				</template>
 			</el-table-column>
 			<el-table-column label="状态" align="center" prop="status">
@@ -235,6 +245,10 @@ export default {
 				attr2: null,
 				attr3: null,
 				attr4: null,
+        shiftId: null,
+        productCode: null,
+        productName: null,
+        productDate: null
 			},
 			// 表单参数
 			form: {},
@@ -293,7 +307,8 @@ export default {
 				createBy: null,
 				createTime: null,
 				updateBy: null,
-				updateTime: null
+				updateTime: null,
+        shiftId: null
 			};
 			this.resetForm("form");
 		},