From 1c35f2b1215c136625c3a2eda0c1a50772bddad1 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 23 九月 2025 16:31:14 +0800
Subject: [PATCH] 任务工作档修改

---
 src/main/webapp/static/js/wrkMast/wrkMast.js |   46 ++++++++++------------------------------------
 1 files changed, 10 insertions(+), 36 deletions(-)

diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index 36c02f5..39e2ddf 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -25,47 +25,17 @@
             ,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��'}
             ,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�'}
             ,{field: 'ioPri', align: 'center',title: '浼樺厛绾�'}
+            ,{field: 'taskType$', align: 'center',title: '浠诲姟绫诲瀷'}
             ,{field: 'crnNo$', align: 'center',title: '鍫嗗灈鏈�'}
             ,{field: 'sourceStaNo$', align: 'center',title: '婧愮珯'}
             ,{field: 'staNo$', align: 'center',title: '鐩爣绔�'}
-            ,{field: 'sourceLocNo$', align: 'center',title: '婧愬簱浣�'}
-            ,{field: 'locNo$', align: 'center',title: '鐩爣搴撲綅'}
+            ,{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 ";}
-            //         html += ">";
-            //         return html;
-            //     }}
-            // ,{field: 'exitMk', align: 'center',title: '閫�鍑�', templet:function(row){
-            //         var html = "<input value='exitMk' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
-            //         if(row.exitMk === 'Y'){html += " checked ";}
-            //         html += ">";
-            //         return html;
-            //     }}
-            // ,{field: 'emptyMk', align: 'center',title: '绌烘澘', templet:function(row){
-            //         var html = "<input value='emptyMk' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
-            //         if(row.emptyMk === 'Y'){html += " checked ";}
-            //         html += ">";
-            //         return html;
-            //     }}
-            //
-            // ,{field: 'crnStrTime$', align: 'center',title: '鍫嗗灈鏈哄惎鍔ㄦ椂闂�'}
-            // ,{field: 'crnEndTime$', align: 'center',title: '鍫嗗灈鏈哄仠姝㈡椂闂�'}
-            // ,{field: 'refIotime$', align: 'center',title: '鎷f枡鏃堕棿'}
             ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
             ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true, width: 160}
-            // ,{field: 'memo', align: 'center',title: '澶囨敞'}
-            //
-            // ,{field: 'fullPlt', align: 'center',title: '婊℃澘', templet:function(row){
-            //         var html = "<input value='fullPlt' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
-            //         if(row.fullPlt === 'Y'){html += " checked ";}
-            //         html += ">";
-            //         return html;
-            //     }}
-
             ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:250}
         ]],
         request: {
@@ -273,7 +243,7 @@
     table.on('tool(wrkMast)', function(obj){
         let data = obj.data;
         switch (obj.event) {
-            // 鏄庣粏灞曠ず todo
+            // 鏄庣粏灞曠ず
             case 'detlShow':
                 wrkNo = data.wrkNo;
                 // 琛ㄦ牸涓嬫柟鏄剧ず
@@ -320,7 +290,6 @@
                         layer.closeAll();
                     });
                 }
-
                 break;
             //  鎷f枡鍏ュ簱
             case 'pick':
@@ -334,7 +303,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;
             //  绌烘搷浣�

--
Gitblit v1.9.1