From aa33e56e37cd19b88ae8eea69c5ebc7c6da8b1d2 Mon Sep 17 00:00:00 2001
From: Administrator <pjb>
Date: 星期四, 05 六月 2025 17:59:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/glccwcs' into glccwcs
---
src/main/webapp/views/taskWrk/taskWrk.html | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/views/taskWrk/taskWrk.html b/src/main/webapp/views/taskWrk/taskWrk.html
index 3553bee..0fe0b23 100644
--- a/src/main/webapp/views/taskWrk/taskWrk.html
+++ b/src/main/webapp/views/taskWrk/taskWrk.html
@@ -52,7 +52,8 @@
<el-dropdown @command="(command)=>{handleCommand(command, scope.row)}">
<el-button icon="el-icon-more" size="mini" type="primary"></el-button>
<el-dropdown-menu slot="dropdown">
- <el-dropdown-item command="showCommand">鏌ョ湅鎸囦护</el-dropdown-item>
+<!-- <el-dropdown-item command="showCommand">鏌ョ湅鎸囦护</el-dropdown-item>-->
+ <el-dropdown-item command="returnWorkingCondition">閲嶆柊缁欏爢鍨涙満涓嬪彂浠诲姟</el-dropdown-item>
<el-dropdown-item command="changeCommand">淇敼</el-dropdown-item>
<el-dropdown-item command="assign">娲惧彂</el-dropdown-item>
<el-dropdown-item command="complete">瀹岀粨</el-dropdown-item>
@@ -82,6 +83,8 @@
<el-table-column property="barcode" label="鎵樼洏鐮�">
</el-table-column>
<el-table-column property="crnNo" label="鍫嗗灈鏈哄彿">
+ </el-table-column>
+ <el-table-column property="ioPri" label="浼樺厛绾�">
</el-table-column>
<el-table-column property="memo" label="澶囨敞">
</el-table-column>
@@ -205,9 +208,9 @@
},
handleCommand(command, row) {
switch (command) {
- case "showCommand":
- //鏌ョ湅鎸囦护
- this.showCommand(row)
+ case "returnWorkingCondition":
+ //閲嶆柊缁欏爢鍨涙満涓嬪彂浠诲姟
+ this.returnWorkingConditionWrk(row)
break;
case "changeCommand":
//淇敼鎸囦护
@@ -306,6 +309,36 @@
}
});
},
+ returnWorkingConditionWrk(row){
+ //閲嶆柊缁欏爢鍨涙満涓嬪彂浠诲姟
+ let that = this
+ $.ajax({
+ url: baseUrl + "/taskWrk/returnWorkingCondition/auth",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data: {
+ taskNo: row.taskNo
+ },
+ method: 'POST',
+ success: function(res) {
+ if (res.code == 200) {
+ that.$message({
+ message: "鍙栨秷鎴愬姛",
+ type: 'success'
+ });
+ that.getTableData()
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
+ that.$message({
+ message: res.msg,
+ type: 'error'
+ });
+ }
+ }
+ });
+ },
cancelWrk(row){
//鍙栨秷浠诲姟
let that = this
--
Gitblit v1.9.1