From 2f63acadcd111fe47b2feedf13adb9cffcd64b2c Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 25 十月 2024 13:28:50 +0800
Subject: [PATCH] mes调用立即出库修改

---
 src/main/webapp/static/js/wrkMast/wrkMast.js |   29 ++++++++++++++++++++++++++---
 1 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index 36c02f5..181419e 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -273,7 +273,7 @@
     table.on('tool(wrkMast)', function(obj){
         let data = obj.data;
         switch (obj.event) {
-            // 鏄庣粏灞曠ず todo
+            // 鏄庣粏灞曠ず
             case 'detlShow':
                 wrkNo = data.wrkNo;
                 // 琛ㄦ牸涓嬫柟鏄剧ず
@@ -320,7 +320,6 @@
                         layer.closeAll();
                     });
                 }
-
                 break;
             //  鎷f枡鍏ュ簱
             case 'pick':
@@ -334,12 +333,35 @@
                 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;
             //  绌烘搷浣�
             case 'takeNone':
                 layer.confirm('浠诲姟鍙戦�佺┖鎿嶄綔寮傚父锛佹槸鍚︺�傘�傘�傘�傘�傘�傘�傘�傦紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
+                });
+                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('#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;
         }
@@ -550,6 +572,7 @@
                 ,{field: 'tbpos', align: 'center',title: '琛岄」鐩�'}
                 ,{field: 'zmatid', align: 'center',title: '鐗╂枡鏍囩ID'}
                 ,{field: 'maktx', align: 'center',title: '鐗╂枡鎻忚堪'}
+                ,{field: 'model', align: 'center',title: '浜у搧浠g爜'}
                 ,{field: 'werks', align: 'center',title: '宸ュ巶'}
                 ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
                 ,{field: 'altme', align: 'center',title: '鍗曚綅'}

--
Gitblit v1.9.1