From cd280ead41b98ee60154038e36d9b83cc25e7d16 Mon Sep 17 00:00:00 2001 From: lsh <1> Date: 星期三, 20 十二月 2023 12:55:25 +0800 Subject: [PATCH] # --- src/main/webapp/static/js/wrkMast/wrkMast.js | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js index 36c02f5..de1e9c0 100644 --- a/src/main/webapp/static/js/wrkMast/wrkMast.js +++ b/src/main/webapp/static/js/wrkMast/wrkMast.js @@ -30,7 +30,8 @@ ,{field: 'staNo$', align: 'center',title: '鐩爣绔�'} ,{field: 'sourceLocNo$', align: 'center',title: '婧愬簱浣�'} ,{field: 'locNo$', align: 'center',title: '鐩爣搴撲綅'} - ,{field: 'barcode', align: 'center',title: '鏉$爜'} + ,{field: 'barcode', align: 'center',title: '鎵樼洏鐮�'} + ,{field: 'mk', align: 'center',title: '鍚姩鎸夐挳'} ,{field: 'preHave', align: 'center',title: '鍏堝叆鍝�', hide: true} ,{field: 'takeNone', align: 'center',title: '绌烘搷浣�', hide: true} // ,{field: 'picking', align: 'center',title: '鎷f枡', templet:function(row){ @@ -273,7 +274,7 @@ table.on('tool(wrkMast)', function(obj){ let data = obj.data; switch (obj.event) { - // 鏄庣粏灞曠ず todo + // 鏄庣粏灞曠ず case 'detlShow': wrkNo = data.wrkNo; // 琛ㄦ牸涓嬫柟鏄剧ず @@ -320,7 +321,6 @@ layer.closeAll(); }); } - break; // 鎷f枡鍏ュ簱 case 'pick': @@ -334,7 +334,12 @@ break; // 鍏堝叆鍝� case 'preHave': - layer.confirm('浠诲姟鍙戦�佸厛鍏ュ搧寮傚父锛佹槸鍚︺�傘�傘�傘�傘�傘�傘�傘�傦紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){ + layer.confirm('浠诲姟鍙戠敓鍏堝叆鍝佸紓甯搞�傚闇�閲嶆柊鍏ュ簱锛岃纭繚璐х墿宸叉斁鑷冲爢鍨涙満鍑哄簱绔欙紒', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){ + http.post(baseUrl+"/deal/preHave/start", {wrkNo: data.wrkNo}, function (res) { + $(".layui-laypage-btn")[0].click(); + layer.msg(data.wrkNo + res.msg, {icon: 1}); + }) + layer.closeAll(); }); break; // 绌烘搷浣� @@ -553,7 +558,7 @@ ,{field: 'werks', align: 'center',title: '宸ュ巶'} ,{field: 'anfme', align: 'center',title: '鏁伴噺'} ,{field: 'altme', align: 'center',title: '鍗曚綅'} - ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉$爜'} + ,{field: 'zpallet', align: 'center',title: 'pack鐮�'} ,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'} ,{field: 'memo', align: 'center',title: '澶囨敞'} -- Gitblit v1.9.1