From a25ca87edcfd4c8ef831f2af31d7aed0f9d6f625 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期六, 27 十二月 2025 16:41:01 +0800
Subject: [PATCH] 越库相关sql

---
 src/main/webapp/static/js/taskLog/taskLog.js |   42 ++++++++++++++++++++++++------------------
 1 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/src/main/webapp/static/js/taskLog/taskLog.js b/src/main/webapp/static/js/taskLog/taskLog.js
index 762510f..231f2bb 100644
--- a/src/main/webapp/static/js/taskLog/taskLog.js
+++ b/src/main/webapp/static/js/taskLog/taskLog.js
@@ -11,7 +11,7 @@
     // 鏁版嵁娓叉煋
     tableIns = table.render({
         elem: '#taskLog',
-        headers: {token: localStorage.getItem('token')},
+        headers: { token: localStorage.getItem('token') },
         url: baseUrl + '/taskLog/list/auth',
         page: true,
         limit: 16,
@@ -20,20 +20,24 @@
         toolbar: '#toolbar',
         cellMinWidth: 50,
         cols: [[
-            {field: 'wrkNo', align: 'center', title: '宸ヤ綔鍙�', event: 'wrkNo', sort: true}
-            , {field: 'ioTime$', 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: 'modiUser$', align: 'center', title: '淇敼浜哄憳', hide: true}
-            , {field: 'modiTime$', align: 'center', title: '淇敼鏃堕棿', hide: true}
-            , {field: 'barcode', align: 'center', title: '鏉$爜'}
-            , {fixed: 'right', title: '鎿嶄綔', align: 'center', toolbar: '#operate', width: 80}
+            // {field: 'id', align: 'center', title: 'id'}
+            { field: 'wrkNo', align: 'center', title: '宸ヤ綔鍙�', sort: true, width: 105 }
+            , { field: 'ioTime$', align: 'center', title: '宸ヤ綔鏃堕棿', }
+            , { field: 'wrkSts$', align: 'center', title: '宸ヤ綔鐘舵��', }
+            , { field: 'ioType$', align: 'center', title: '鍏ュ嚭搴撶被鍨�', width: 150 }
+            , { field: 'ioPri', align: 'center', title: '浼樺厛绾�', width: 80 }
+            , { field: 'taskType$', align: 'center', title: '浠诲姟绫诲瀷', width: 120 }
+            , { field: 'crnNo$', align: 'center', title: '鍫嗗灈鏈�', hide: true }
+            , { field: 'sourceStaNo$', align: 'center', title: '婧愮珯', width: 120 }
+            , { field: 'sourceLocNo', align: 'center', title: '婧愬簱浣�', width: 120 }
+            , { field: 'staNo$', align: 'center', title: '鐩爣绔�', width: 120 }
+            , { field: 'locNo', align: 'center', title: '鐩爣搴撲綅', width: 120 }
+            , { field: 'barcode', align: 'center', title: '鏉$爜', width: 110 }
+            , { field: 'preHave', align: 'center', title: '鍏堝叆鍝�', hide: true }
+            , { field: 'takeNone', align: 'center', title: '绌烘搷浣�', hide: true }
+            , { field: 'modiUser$', align: 'center', title: '淇敼浜哄憳', hide: true }
+            , { field: 'modiTime$', align: 'center', title: '淇敼鏃堕棿', hide: true, width: 160 }
+            , { fixed: 'right', title: '鎿嶄綔', align: 'center', toolbar: '#operate', width: 200 }
         ]],
         request: {
             pageName: 'curr',
@@ -96,6 +100,7 @@
         switch (obj.event) {
             // 鏄庣粏灞曠ず
             case 'detlShow':
+                id = data.id;
                 wrkNo = data.wrkNo;
                 ioTime = data.ioTime;
                 // 琛ㄦ牸涓嬫柟鏄剧ず
@@ -134,7 +139,7 @@
             shade: [0.5, '#000'] //0.1閫忔槑搴︾殑鑳屾櫙
         });
         var data = {
-//            id: $('#id').val(),
+            //            id: $('#id').val(),
             id: $('#id').val(),
             wrkNo: $('#wrkNo').val(),
             invWh: $('#invWh').val(),
@@ -195,7 +200,7 @@
         };
         $.ajax({
             url: baseUrl + "/taskLog/" + name + "/auth",
-            headers: {'token': localStorage.getItem('token')},
+            headers: { 'token': localStorage.getItem('token') },
             data: top.reObject(data),
             method: 'POST',
             success: function (res) {
@@ -227,6 +232,7 @@
 
     // 鎼滅储鏍忔悳绱簨浠�
     form.on('submit(search)', function (data) {
+        console.log('1111')
         pageCurr = 1;
         tableReload(false);
     });
@@ -372,7 +378,7 @@
         height = ($(window).height() * 0.8);
     }
     layer.style(index, {
-//        top: (($(window).height()-height)/3)+"px",
+        //        top: (($(window).height()-height)/3)+"px",
         height: height + 'px'
     });
 }

--
Gitblit v1.9.1