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 | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index 657dae3..b10040c 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -20,7 +20,7 @@
cellMinWidth: 50,
cols: [[
{type: 'checkbox'}
- ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�',sort: true}
+ ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�',sort: true, width: 85}
,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿',sort: true, width: 160}
,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��'}
,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�'}
@@ -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,8 +301,29 @@
break;
// 鍙栨秷
case 'cancel':
- layer.confirm('纭鍙栨秷璇ョ瑪宸ヤ綔妗ｏ紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
- http.post(baseUrl+"/hand/control/wrkMast", {workNo: data.wrkNo, type:2}, function (res) {
+ 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('纭鍙栨秷璇ョ瑪宸ヤ綔妗ｏ紵', {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;
+ // 鎷ｆ枡鍏ュ簱
+ case 'pick':
+ layer.confirm('鎷ｆ枡鍏ュ簱璇ョ瑪宸ヤ綔妗ｏ紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
+ http.post(baseUrl+"/hand/control/wrkMast", {workNo: data.wrkNo, type:3}, function (res) {
$(".layui-laypage-btn")[0].click();
layer.msg(data.wrkNo + res.msg);
})
--
Gitblit v1.9.1