From 32099d29dca4874ed255a51206be7a46b7a2fe4c Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期二, 20 五月 2025 11:35:57 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/wrkMast/wrkMast.js |   81 +++++++++++++++++++---------------------
 1 files changed, 39 insertions(+), 42 deletions(-)

diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index b10040c..0569122 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -31,6 +31,8 @@
             ,{field: 'sourceLocNo$', align: 'center',title: '婧愬簱浣�'}
             ,{field: 'locNo$', align: 'center',title: '鐩爣搴撲綅'}
             ,{field: 'barcode', 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){
             //         var html = "<input value='picking' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
             //         if(row.picking === 'Y'){html += " checked ";}
@@ -64,7 +66,7 @@
             //         return html;
             //     }}
 
-            ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:230}
+            ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:250}
         ]],
         request: {
             pageName: 'curr',
@@ -123,7 +125,9 @@
 
     // 鐩戝惉澶村伐鍏锋爮浜嬩欢
     table.on('toolbar(wrkMast)', function (obj) {
+        console.log(obj)
         var checkStatus = table.checkStatus(obj.config.id);
+        console.log(obj)
         switch(obj.event) {
             // 澧炲姞浼樺厛绾�
             case 'priAdd':
@@ -264,14 +268,15 @@
                     });
                 });
                 break;
+
         }
     });
 
     // 鐩戝惉琛屽伐鍏蜂簨浠�
     table.on('tool(wrkMast)', function(obj){
-        var data = obj.data;
+        let data = obj.data;
         switch (obj.event) {
-            // 鏄庣粏灞曠ず todo
+            // 鏄庣粏灞曠ず
             case 'detlShow':
                 wrkNo = data.wrkNo;
                 // 琛ㄦ牸涓嬫柟鏄剧ず
@@ -318,8 +323,27 @@
                         layer.closeAll();
                     });
                 }
-
                 break;
+              case 'priWrkMast':
+                              console.log(123)
+                              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;
             //  鎷f枡鍏ュ簱
             case 'pick':
                 layer.confirm('鎷f枡鍏ュ簱璇ョ瑪宸ヤ綔妗o紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
@@ -330,46 +354,19 @@
                     layer.closeAll();
                 });
                 break;
-            // 璇︽儏
-            case 'detail':
-                layer.open({
-                    type: 2,
-                    title: '璇︽儏',
-                    maxmin: true,
-                    area: [top.detailWidth, top.detailHeight],
-                    shadeClose: false,
-                    content: 'wrkMast_detail.html',
-                    success: function(layero, index){
-                        setFormVal(layer.getChildFrame('#detail', index), data, true);
-                        top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
-                        layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
-                        layero.find('iframe')[0].contentWindow.layui.form.render('select');
-                        layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
-                        layer.getChildFrame('##dealDownLine', index).hide();
-                        layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
-                    }
+            //  鍏堝叆鍝�
+            case 'preHave':
+                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 'edit':
-                layer.open({
-                    type: 2,
-                    title: '淇敼',
-                    maxmin: true,
-                    area: [top.detailWidth, top.detailHeight],
-                    shadeClose: false,
-                    content: 'wrkMast_detail.html',
-                    success: function(layero, index){
-                        layer.getChildFrame('#crnStrTime\\$,#crnEndTime\\$,#refIotime\\$,#ioTime\\$', index).parent().parent().hide();
-                        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('#wrkNo', index), true);
-                        layero.find('iframe')[0].contentWindow.layui.form.render('select');
-                        layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
-                        layer.getChildFrame('##dealDownLine', index).hide();
-                        layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
-                    }
+            //  绌烘搷浣�
+            case 'takeNone':
+                layer.confirm('浠诲姟鍙戦�佺┖鎿嶄綔寮傚父锛佹槸鍚︺�傘�傘�傘�傘�傘�傘�傘�傦紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
                 });
                 break;
         }

--
Gitblit v1.9.1