From b4cc9e9057de229921f2fe45db7a55519650ac6f Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Wed, 27 Sep 2023 14:55:54 +0800
Subject: [PATCH] mes rfid

---
 src/views/mes/rfidProcess/index.vue | 30 ++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/views/mes/rfidProcess/index.vue b/src/views/mes/rfidProcess/index.vue
index f8cdcc1..1b84dc2 100644
--- a/src/views/mes/rfidProcess/index.vue
+++ b/src/views/mes/rfidProcess/index.vue
@@ -80,32 +80,40 @@
 		<el-table v-loading="loading" :data="rfidProcessList" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="55" align="center" />
 			<!-- 序号 -->
-      <el-table-column type="index" align="center" :index="indexMethod" label="序号"/>
+      <el-table-column type="index" align="center" :index="indexMethod" label="序号" fixed/>
 			<!-- <el-table-column label="工单ID" align="center" prop="workorderId" width="180"/> -->
-			<el-table-column label="工单编号" align="center" prop="workorderCode" width="200"/>
+			<el-table-column label="工单编号" align="center" prop="workorderCode" width="200" fixed/>
 			<!-- <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="180"/>
-			<el-table-column label="rfid号" align="center" prop="rfid" />
+      <el-table-column label="订单编号" align="center" prop="orderCode" width="200"/>
+			<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" />
-			<el-table-column label="当前步" align="center" prop="nowProcessId" />
-			<el-table-column label="下一步" align="center" prop="nextProcessId" />
+			<el-table-column label="当前步工序编码" align="center" prop="nowProcessCode" width="150"/>
+			<el-table-column label="当前步工序名称" align="center" prop="nowProcessName" width="150"/>
+			<el-table-column label="下一步工序编码" align="center" prop="nextProcessCode" width="150"/>
+			<el-table-column label="下一步工序名称" align="center" prop="nextProcessName" width="150"/>
 			<el-table-column label="工序步骤" align="center" prop="orderNum" />
 			<el-table-column label="入时间" align="center" prop="inTime" width="180">
 				<template slot-scope="scope">
-					<span>{{ parseTime(scope.row.inTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.inTime, '{y}-{m}-{d}') }}</span>
+          {{ parseTime(scope.row.inTime, '{h}:{m}:{s}') }}
 				</template>
 			</el-table-column>
 			<el-table-column label="出时间" align="center" prop="outTime" width="180">
 				<template slot-scope="scope">
-					<span>{{ parseTime(scope.row.outTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.outTime, '{y}-{m}-{d}') }}</span>
+          {{ parseTime(scope.row.outTime, '{h}:{m}:{s}') }}
 				</template>
 			</el-table-column>
-			<el-table-column label="状态" align="center" prop="status" />
+			<el-table-column label="状态" align="center" prop="status">
+			  <template slot-scope="scope">
+          {{ scope.row.status == "0" ? "待办" : "完成" }}
+        </template>
+			</el-table-column>
 			<el-table-column label="备注" align="center" prop="remark" />
-			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-				<!-- <template slot-scope="scope">
+			<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+				<template slot-scope="scope">
 					<el-button
 						size="mini"
 						type="text"