From d2a5ef4694be0ffb37a358ccf53f6d6cd3ef93f8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 28 十月 2025 17:14:47 +0800
Subject: [PATCH] 添加的分属环境配置文件 暂停上报功能

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

diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index fe33064..b367be3 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -20,53 +20,23 @@
         cellMinWidth: 50,
         cols: [[
             {type: 'checkbox'}
-            ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�',sort: true, width: 85}
-            ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿',sort: true, width: 160}
-            ,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��'}
-            ,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�'}
+            ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�',sort: true, width: 95}
+            ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿',sort: true, width: 170}
+            ,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��', width: 120}
+            ,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�', width: 140}
             ,{field: 'ioPri', align: 'center',title: '浼樺厛绾�'}
+            ,{field: 'taskType$', align: 'center',title: '浠诲姟绫诲瀷'}
+            ,{field: 'barcode', align: 'center',title: '鏉$爜', width: 120}
             ,{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: 'barcode', align: 'center',title: '鏉$爜'}
+            ,{field: 'sourceLocNo', align: 'center',title: '婧愬簱浣�', width: 120}
+            ,{field: 'locNo', align: 'center',title: '鐩爣搴撲綅', width: 120}
             ,{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}
+            ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:300}
         ]],
         request: {
             pageName: 'curr',
@@ -346,6 +316,24 @@
                 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_detail2.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;
         }
     });
 

--
Gitblit v1.9.1