From 26493fe5a12ce09bd3cc489421b6e2872e6542c0 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 12 十一月 2025 14:33:02 +0800
Subject: [PATCH] *

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

diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index 8565ac7..6fb0aae 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -32,6 +32,7 @@
             ,{field: 'locNo$', align: 'center',title: '鐩爣搴撲綅'}
             ,{field: 'barcode', align: 'center',title: '鏉$爜'}
             ,{field: 'sheetNo$', align: 'center',title: '鏈烘鑷�', hide: false}
+            ,{field: 'logMk', align: 'center',title: 'MES', hide: false}
             ,{field: 'preHave', align: 'center',title: '鍏堝叆鍝�', hide: true}
             ,{field: 'takeNone', align: 'center',title: '绌烘搷浣�', hide: true}
             // ,{field: 'picking', align: 'center',title: '鎷f枡', templet:function(row){
@@ -274,6 +275,34 @@
     table.on('tool(wrkMast)', function(obj){
         let data = obj.data;
         switch (obj.event) {
+            case 'upSheetNo':
+                layer.open({
+                    type: 2,
+                    title: '淇敼宸ヤ綔妗g殑鏈烘鑷傜浉鍏冲弬鏁�',
+                    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;
+            case 'mesLogMk':
+                layer.confirm('鏄惁璺宠繃涓婃姤MES杞负涓婃姤瀹屾垚锛�', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
+                    http.post(baseUrl+"/hand/control/wrkMast", {workNo: data.wrkNo, type:6}, function (res) {
+                        $(".layui-laypage-btn")[0].click();
+                        layer.msg(data.wrkNo + res.msg);
+                    })
+                    layer.closeAll();
+
+                });
+                break;
             // 鏄庣粏灞曠ず
             case 'detlShow':
                 wrkNo = data.wrkNo;

--
Gitblit v1.9.1