From ff73a7a1c938699e7fe56067e747b515538790d5 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 21 七月 2023 13:34:09 +0800
Subject: [PATCH] # 有疑问，暂时提交本地
---
src/main/webapp/static/js/wrkMast/wrkMast.js | 52 +++++++++++++++++++++++++++++++++++++---------------
1 files changed, 37 insertions(+), 15 deletions(-)
diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index a1992a6..087b08d 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -67,7 +67,7 @@
// return html;
// }}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:300}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:290}
]],
request: {
pageName: 'curr',
@@ -293,14 +293,26 @@
break;
// 瀹屾垚
case 'complete':
- layer.confirm('纭瀹屾垚璇ョ瑪宸ヤ綔妗ｏ紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
- http.post(baseUrl+"/hand/control/wrkMast", {workNo: data.wrkNo, type:1}, function (res) {
- $(".layui-laypage-btn")[0].click();
- layer.msg(data.wrkNo + res.msg);
- })
- layer.closeAll();
+ //鍏堟煡璇㈠伐浣滄。鐘舵��
+ let tit_text = ''
+ http.post(baseUrl+"/hand/query/wrkSts", {workNo: data.wrkNo, type:1}, function (res) {
+ var sts = res.data.wrkSts
+ if (sts == 2 || sts == 9 || sts == 10 || sts == 11 || sts == 17 || sts == 18 ) {
+ tit_text = '纭瀹屾垚璇ョ瑪宸ヤ綔妗ｏ紵'
+ } else {
+ tit_text = '褰撳墠浠诲姟鍦ㄨ繍琛屼腑锛岀‘璁ゅ畬鎴愯绗斿伐浣滄。锛�'
+ }
+ //$(".layui-laypage-btn")[0].click();
+ //layer.msg(data.wrkNo + res.msg);
+ layer.confirm(tit_text, {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
+ http.post(baseUrl+"/hand/control/wrkMast", {workNo: data.wrkNo, type:1}, function (res) {
+ $(".layui-laypage-btn")[0].click();
+ layer.msg(data.wrkNo + res.msg);
+ })
+ layer.closeAll();
- });
+ });
+ })
break;
// 鍙栨秷
case 'cancel':
@@ -313,13 +325,23 @@
layer.closeAll();
});
} else {
- layer.confirm('纭鍙栨秷璇ョ瑪宸ヤ綔妗ｏ紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
- http.post(baseUrl+"/hand/control/wrkMast", {workNo: data.wrkNo, type:2}, function (res) {
- $(".layui-laypage-btn")[0].click();
- layer.msg(data.wrkNo + res.msg);
- })
- layer.closeAll();
- });
+ let tit_text = ''
+ http.post(baseUrl+"/hand/query/wrkSts", {workNo: data.wrkNo, type:1}, function (res) {
+ var sts = res.data.wrkSts
+ if (sts == 2 || sts == 9 || sts == 10 || sts == 11 || sts == 17 || sts == 18 ) {
+ tit_text = '纭鍙栨秷璇ョ瑪宸ヤ綔妗ｏ紵'
+ } else {
+ tit_text = '褰撳墠浠诲姟鍦ㄨ繍琛屼腑锛岀‘璁ゅ畬鎴愯绗斿伐浣滄。锛�'
+ }
+ layer.confirm(tit_text, {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
+ http.post(baseUrl+"/hand/control/wrkMast", {workNo: data.wrkNo, type:2}, function (res) {
+ $(".layui-laypage-btn")[0].click();
+ layer.msg(data.wrkNo + res.msg);
+ })
+ layer.closeAll();
+ });
+ })
+
}
break;
// 鎷ｆ枡鍏ュ簱
--
Gitblit v1.9.1