From d051d72b3c8c91ce415b33efc9ee560c6aa29e5d Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 16 十一月 2023 13:59:17 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/commandManage/commandManage.html |   24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/main/webapp/views/commandManage/commandManage.html b/src/main/webapp/views/commandManage/commandManage.html
index fe8ee81..c858206 100644
--- a/src/main/webapp/views/commandManage/commandManage.html
+++ b/src/main/webapp/views/commandManage/commandManage.html
@@ -53,7 +53,7 @@
 								</el-dropdown>
 							</template>
 						</el-table-column>
-						<el-table-column property="id" label="鎸囦护缂栧彿">
+						<el-table-column property="id" label="#ID">
 						</el-table-column>
 						<el-table-column property="wrkNo" label="宸ヤ綔鍙�">
 						</el-table-column>
@@ -178,6 +178,12 @@
 						}
 						this.getTableData()
 					},
+					tableRowClassName({row, rowIndex}) {
+						if (rowIndex === this.commandStep) {
+							return 'success-row';
+						}
+						return '';
+					},
 					handleCommand(command, row) {
 						switch (command) {
 							case "showTask":
@@ -190,27 +196,23 @@
 								break;
 							case "completeCommand":
 								//瀹屾垚鎸囦护
-								this.completeCommand(row)
+								this.completeWrk(row)
 								break;
 						}
 					},
 					showTask(row) {
-						//鏌ョ湅浠诲姟
+						let wrkNo = row.wrkNo == null ? "" : row.wrkNo
+						console.log(wrkNo)
+						//鏌ョ湅鎸囦护
 						$layui.layer.open({
 							type: 2,
 							title: '浠诲姟绠$悊',
 							maxmin: true,
 							area: [top.detailWidth, top.detailHeight],
 							shadeClose: true,
-							content: '../taskWrk/taskWrk.html?taskNo=' + row.taskNo + "&wrkNo=" + row.wrkNo,
+							content: '../taskWrk/taskWrk.html?taskNo=' + row.taskNo + "&wrkNo=" + wrkNo,
 							success: function(layero, index) {}
 						});
-					},
-					tableRowClassName({row, rowIndex}) {
-						if (rowIndex === this.commandStep) {
-							return 'success-row';
-						}
-						return '';
 					},
 					executeCommand(row) {
 						//鎵ц鎸囦护
@@ -271,7 +273,7 @@
 								}
 							}
 						});
-					}
+					},
 				}
 			})
 		</script>

--
Gitblit v1.9.1