From 2b57e31589ba1825c025badb28ec8272412572ca Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 22 Apr 2025 09:32:00 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=97=A5=E5=BF=97=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E4=B8=AD=E5=B7=A5=E8=89=BA=E8=B7=AF=E7=BA=BF=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E5=B7=A5=E8=89=BA=E6=AD=A5=E9=AA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/fmlogs.vue |  2 +-
 src/views/wpm_gx/mlogs.vue  | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/views/wpm_gx/fmlogs.vue b/src/views/wpm_gx/fmlogs.vue
index 8fc7ad18..e7116ed7 100644
--- a/src/views/wpm_gx/fmlogs.vue
+++ b/src/views/wpm_gx/fmlogs.vue
@@ -49,7 +49,7 @@
 				:query="params"
 			>
 				<el-table-column label="#" type="index" width="50"></el-table-column>
-				<el-table-column label="工艺路线" prop="route_name" :min-width="100">
+				<el-table-column label="工艺步骤" prop="route_name" :min-width="100">
 				</el-table-column>
 				<el-table-column label="任务编号" prop="mtask_number">
 				</el-table-column>
diff --git a/src/views/wpm_gx/mlogs.vue b/src/views/wpm_gx/mlogs.vue
index 7ac41563..f8b6c2d1 100644
--- a/src/views/wpm_gx/mlogs.vue
+++ b/src/views/wpm_gx/mlogs.vue
@@ -60,7 +60,7 @@
 					width="50"
 				></el-table-column>
 				<el-table-column
-					label="工艺路线"
+					label="工艺步骤"
 					prop="material_out_name"
 					min-width="130"
 				>
@@ -110,17 +110,22 @@
 					label="结束时间"
 					prop="work_end_time"
 				></el-table-column>
-				<el-table-column label="是否提交">
+				<!-- <el-table-column label="是否提交">
 					<template #default="scope">
 						<el-icon v-if="scope.row.submit_time != null" color="green">
 							<CircleCheckFilled />
 						</el-icon>
 					</template>
-				</el-table-column>
+				</el-table-column> -->
 				<el-table-column
 					label="提交时间"
 					prop="submit_time"
-				></el-table-column>
+				>
+					<template #default="scope">
+						<span v-if="scope.row.submit_time != null">{{scope.row.submit_time}}</span>
+						<span v-else style="color: red;">未提交</span>
+					</template>
+				</el-table-column>
 				<el-table-column
 					label="操作"
 					fixed="right"