From 5026865596b57287aefc72acdc9938bc0d93dbec Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期日, 22 六月 2025 15:35:27 +0800
Subject: [PATCH] #改造
---
src/main/java/com/zy/asrs/controller/RgvController.java | 19 +++++++++++++++++++
src/main/webapp/views/index.html | 34 +++++++++++++++++++++++++++++++++-
2 files changed, 52 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/RgvController.java b/src/main/java/com/zy/asrs/controller/RgvController.java
index 0b889d3..dc29079 100644
--- a/src/main/java/com/zy/asrs/controller/RgvController.java
+++ b/src/main/java/com/zy/asrs/controller/RgvController.java
@@ -545,4 +545,23 @@
return R.ok();
}
+ @PostMapping("/disable/task/delete1")
+// @ManagerAuth(memo = "鍒濆鍖栦换鍔�")
+ public R taskDisabledelete1(@RequestParam Long wrkNo){
+ Date now = new Date();
+ log.info("/disable/task/delete1===銆嬪垵濮嬪寲浠诲姟锛侊紒锛亀rkNo:{},data:{}",wrkNo,new Date());
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkNo));
+ if (Cools.isEmpty(wrkMast)){
+ return R.error().add("鏈壘鍒版浠诲姟锛屽紓甯革紒锛侊紒");
+ }
+ wrkMast.setWrkSts(1L);
+ wrkMast.setRgvNo(0);
+ wrkMast.setAppeTime(now);
+ wrkMast.setLogErrTime(now);
+ if (wrkMastService.updateById(wrkMast)){
+ return R.ok();
+ }
+ return R.error("鍒濆鍖栧け璐ワ紒锛侊紒");
+ }
+
}
\ No newline at end of file
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index b2aeede..a3bd79f 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -335,6 +335,12 @@
<el-button
type="danger"
size="small"
+ @click="taskDelete1(scope.row)">
+ 鍒濆鍖�
+ </el-button>
+ <el-button
+ type="danger"
+ size="small"
@click="taskDelete(scope.row)">
鍒犻櫎
</el-button>
@@ -610,7 +616,7 @@
},
taskDelete(row) {
let that = this;
- that.$confirm('纭瑕佸垹闄よ璁惧鍚�?', '鎻愮ず', {
+ that.$confirm('纭瑕佸垹闄よ浠诲姟鍚�?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning'
@@ -634,6 +640,32 @@
});
});
},
+ taskDelete1(row) {
+ let that = this;
+ that.$confirm('纭瑕佸垵濮嬪寲璇ヤ换鍔″悧?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ $.ajax({
+ url: baseUrl + "/rgv/disable/task/delete1",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ data: {
+ wrkNo: row.wrkNo
+ },
+ success: function (res) {
+ if (res.code === 200) {
+ that.$message.success('鍒濆鍖栨垚鍔�');
+ // 鍒犻櫎褰撳墠琛�
+ // that.tableDataRight.splice(that.tableDataRight.indexOf(row), 1);
+ } else {
+ that.$message.error('鍒濆鍖栧け璐�');
+ }
+ }
+ });
+ });
+ },
toggleStatus(index, row) {
let that = this;
const currentStatus = row.status;
--
Gitblit v1.9.1