From 82bcd0328dddbaad65933e2fada22bc68e82b3d5 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期六, 26 八月 2023 10:07:46 +0800
Subject: [PATCH] # 导入订单增加单据类型
---
src/main/webapp/static/js/wrkMast/wrkMast.js | 101 ++++++++++++++++++++++++++++----------------------
1 files changed, 57 insertions(+), 44 deletions(-)
diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index 4a96ed2..e0617d6 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -24,6 +24,7 @@
,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿',sort: true, width: 160}
,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��'}
,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�'}
+ ,{field: 'orderNo$', align: 'center',title: '鍗曟嵁缂栧彿'}
,{field: 'ioPri', align: 'center',title: '浼樺厛绾�'}
,{field: 'crnNo$', align: 'center',title: '鍫嗗灈鏈�'}
,{field: 'sourceStaNo$', align: 'center',title: '婧愮珯'}
@@ -67,7 +68,7 @@
// return html;
// }}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:250}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:290}
]],
request: {
pageName: 'curr',
@@ -267,35 +268,6 @@
});
});
break;
- case 'priWrkMast':
- var list=[];
- checkStatus.data.map(function (track) {
- list.push({
- wrkNo: track.wrkNo,
- ioTime: track.ioTime,
- ioPri: track.ioPri
- });
- });
- $.ajax({
- url: baseUrl+"/wrkMast/red/wrk/mast",
- headers: {'token': localStorage.getItem('token')},
- contentType:'application/json;charset=UTF-8',
- data: JSON.stringify(list),
- method: 'POST',
- traditional:true,
- success: function (res) {
- layer.closeAll();
- if (res.code === 200){
- $(".layui-laypage-btn")[0].click();
- layer.msg(res.msg);
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- } else {
- layer.msg(res.msg)
- }
- }
- })
- break;
}
});
@@ -322,14 +294,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':
@@ -342,13 +326,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;
// 鎷ｆ枡鍏ュ簱
@@ -386,6 +380,25 @@
layer.closeAll();
});
break;
+ case 'priWrkMast':
+ layer.open({
+ type: 2,
+ title: '缁存姢宸ヤ綔妗�',
+ maxmin: true,
+ area: ['500px', top.detailHeight],
+ shadeClose: false,
+ content: 'wrkMast_detail.html',
+ success: function(layero, index){
+ layer.getChildFrame('#data-detail-submit-save', index).hide();
+ setFormVal(layer.getChildFrame('#detail', index), data, false);
+ // top.convertDisabled(layer.getChildFrame('#data-detail :input', index), false);
+ top.convertDisabled(layer.getChildFrame('#locNo', index), true);
+ layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ layero.find('iframe')[0].contentWindow.layui.form.render('select');
+ layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
+ }
+ });
+ break;
}
});
--
Gitblit v1.9.1