From 0c26a0906a17b14cd7966a334f66976cba1147ed Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 02 九月 2025 17:01:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ynhfwcs1' into ynhfwcs1
---
src/main/webapp/views/commandManage/commandManage.html | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/views/commandManage/commandManage.html b/src/main/webapp/views/commandManage/commandManage.html
index c858206..a95fb72 100644
--- a/src/main/webapp/views/commandManage/commandManage.html
+++ b/src/main/webapp/views/commandManage/commandManage.html
@@ -63,7 +63,7 @@
</el-table-column>
<el-table-column show-overflow-tooltip property="durationTime" label="鎸佺画鏃堕暱">
</el-table-column>
- <el-table-column property="commandType" label="鎸囦护绫诲瀷">
+ <el-table-column property="commandType$" label="鎸囦护绫诲瀷">
</el-table-column>
<el-table-column property="device" label="璁惧">
</el-table-column>
@@ -106,7 +106,10 @@
tableSearchParam: {
task_no: null,
status: null,
- wrk_no: null
+ wrk_no: null,
+ barcode: null,
+ start_point: null,
+ target_point : null
},
commandStep: -1
},
@@ -196,7 +199,7 @@
break;
case "completeCommand":
//瀹屾垚鎸囦护
- this.completeWrk(row)
+ this.completeCommand(row)
break;
}
},
--
Gitblit v1.9.1