From 1b13c69e4e2bb00bea4e90232a78715d49f1e24f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期五, 01 四月 2022 13:38:14 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/wrkMast/wrkMast.js |   27 +++++++++++++++++++--------
 1 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index a66c4d1..b10040c 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -64,7 +64,7 @@
             //         return html;
             //     }}
 
-            ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:200}
+            ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:230}
         ]],
         request: {
             pageName: 'curr',
@@ -301,13 +301,24 @@
                 break;
             // 鍙栨秷
             case 'cancel':
-                layer.confirm('纭鍙栨秷璇ョ瑪宸ヤ綔妗o紵', {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();
-                });
+                if (data.pdcType === "Y") {
+                    layer.confirm('褰撳墠浠诲姟鍏宠仈ERP閿�鍞崟锛屽彇娑堝皢閲嶆柊鐢熸垚鍑哄簱浣滀笟锛屾槸鍚︾户缁紵', {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();
+                    });
+                } else {
+                    layer.confirm('纭鍙栨秷璇ョ瑪宸ヤ綔妗o紵', {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;
             //  鎷f枡鍏ュ簱
             case 'pick':

--
Gitblit v1.9.1