From e81318100e3f88e8dbed3c2855de7ffafcdfe23f Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Fri, 13 Oct 2023 09:50:18 +0800
Subject: [PATCH] change

---
 pages/modules/taskmanage.vue | 10 ++++------
 pages/modules/zlmanage.vue   | 16 ++++++++--------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/pages/modules/taskmanage.vue b/pages/modules/taskmanage.vue
index 02679f5..d989be0 100644
--- a/pages/modules/taskmanage.vue
+++ b/pages/modules/taskmanage.vue
@@ -11,10 +11,9 @@
 								<th>起点</th>
 								<th>终点</th>
 								<th>状态</th>
-								<th>托盘号</th>
-								<th>物料类型</th>
 								<th>优先级</th>
-								<th>时间</th>
+								<th>创建时间</th>
+								<th>载具号</th>
 							</tr>
 						</thead>
 						<tbody>
@@ -22,11 +21,10 @@
 								<td>{{e.task_no}}</td>
 								<td>{{e.start_devicecode}}</td>
 								<td>{{e.next_devicecode}}</td>
-								<td>{{e.task_status_name}}</td>
-								<td>{{e.vehicle_code}}</td>
-								<td>{{e.material_type_name}}</td>
+								<td>{{e.inst_status}}</td>
 								<td>{{e.priority}}</td>
 								<td>{{e.create_time}}</td>
+								<td>{{e.carrier}}</td>
 							</tr>
 						</tbody>
 					</table>
diff --git a/pages/modules/zlmanage.vue b/pages/modules/zlmanage.vue
index 58238fd..616e353 100644
--- a/pages/modules/zlmanage.vue
+++ b/pages/modules/zlmanage.vue
@@ -12,11 +12,11 @@
 								<th>起点</th>
 								<th>终点</th>
 								<th>状态</th>
-								<th>托盘号</th>
-								<th>agv车号</th>
-								<th>物料类型</th>
+								<th>执行步骤</th>
+								<th>载具号</th>
 								<th>优先级</th>
-								<th>时间</th>
+								<th>创建时间</th>
+								<th>agv车号</th>
 							</tr>
 						</thead>
 						<tbody>
@@ -25,12 +25,12 @@
 								<td>{{e.inst_no}}</td>
 								<td>{{e.start_devicecode}}</td>
 								<td>{{e.next_devicecode}}</td>
-								<td>{{e.inst_status_name}}</td>
-								<td>{{e.vehicle_code}}</td>
-								<td>{{e.carno}}</td>
-								<td>{{e.material_type_name}}</td>
+								<td>{{e.inst_status}}</td>
+								<td>{{e.inst_step}}</td>
+								<td>{{e.carrier}}</td>
 								<td>{{e.priority}}</td>
 								<td>{{e.create_time}}</td>
+								<td>{{e.carno}}</td>
 							</tr>
 						</tbody>
 					</table>