From 401da88caef79968c8c0b1cb15487c4a554761ec Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期三, 23 十月 2024 14:37:04 +0800
Subject: [PATCH] 测试环境暂时注释

---
 src/main/webapp/static/js/agvWrkMastLog/wrkMastLog.js |   47 +++++------------------------------------------
 1 files changed, 5 insertions(+), 42 deletions(-)

diff --git a/src/main/webapp/static/js/agvWrkMastLog/wrkMastLog.js b/src/main/webapp/static/js/agvWrkMastLog/wrkMastLog.js
index 7cafe4f..c29516e 100644
--- a/src/main/webapp/static/js/agvWrkMastLog/wrkMastLog.js
+++ b/src/main/webapp/static/js/agvWrkMastLog/wrkMastLog.js
@@ -20,53 +20,16 @@
         toolbar: '#toolbar',
         cellMinWidth: 50,
         cols: [[
-            // {type: 'checkbox'}
-//            ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
-//             ,{field: 'id', align: 'center',title: '缂栧彿'}
             {field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�',event: 'wrkNo', sort: true}
-            ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿', width:160, sort: true}
+            ,{field: 'modiTime$', align: 'center',title: '宸ヤ綔鏃堕棿', width:160, sort: true}
             ,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��', width:160}
             ,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�', width:160}
             ,{field: 'ioPri', 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: '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: 'plcStrTime$', align: 'center',title: '鎷f枡鏃堕棿'}
+            ,{field: 'sourceLocNo', align: 'center',title: '婧愬簱浣�'}
+            ,{field: 'locNo', align: 'center',title: '鐩爣搴撲綅'}
             ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
-            ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true}
-            // ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�',event: 'appeUser', style: 'cursor:pointer'}
-            // ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
-            ,{field: 'barcode', 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;
-            //     }}
-
+            ,{field: 'appeTime$', align: 'center',title: '寮�濮嬫椂闂�', hide:false}
+            ,{field: 'barcode', align: 'center',title: '璐ф灦鐮�'}
             ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 80}
         ]],
         request: {

--
Gitblit v1.9.1