From 8d5c70aef9cbacbcc412d73c4b730e21f94e6514 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 30 六月 2025 09:04:10 +0800
Subject: [PATCH] 1

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

diff --git a/src/main/webapp/static/wms/js/wrkMast/wrkMast.js b/src/main/webapp/static/wms/js/wrkMast/wrkMast.js
index e702b10..7ebc08a 100644
--- a/src/main/webapp/static/wms/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/wms/js/wrkMast/wrkMast.js
@@ -1,5 +1,7 @@
 var pageCurr;
 var wrkNo;
+var wmsWrkNo;
+var ioTime;
 layui.config({
     base: baseUrl + "/static/wms/layui/lay/modules/"
 }).extend({
@@ -12,12 +14,13 @@
     var form = layui.form;
 
     $('#wrkNo').val(parent.wrkNo);
+    $('#wmsWrkNo').val(parent.wmsWrkNo);
     // 鏁版嵁娓叉煋
     tableIns = table.render({
         elem: '#wrkMast',
         headers: {token: localStorage.getItem('token')},
         url: baseUrl + '/wrkMast/list/auth',
-        where: {wrk_no: parent.wrkNo},
+        where: {wrk_no: parent.wrkNo, wms_wrk_no: parent.wmsWrkNo},
         page: true,
         limit: 16,
         limits: [16, 30, 50, 100, 200, 500],
@@ -26,8 +29,8 @@
         cellMinWidth: 50,
         cols: [[
             {type: 'checkbox'}
-            , {field: 'wmsWrkNo', align: 'center', title: 'WMS浠诲姟鍙�', sort: true, width: 85}
-            , {field: 'wrkNo', align: 'center', title: '浠诲姟鍙�', sort: true, width: 85}
+            , {field: 'wmsWrkNo', align: 'center', title: 'WMS浠诲姟鍙�', sort: true, width: 120}
+            , {field: 'wrkNo', align: 'center', title: '浠诲姟鍙�', sort: true, width: 120}
             , {field: 'ioTime$', align: 'center', title: '浠诲姟鏃堕棿', sort: true, width: 160}
             , {field: 'durationTime', align: 'center', title: '鎸佺画鏃堕暱', width: 160}
             , {field: 'wrkSts$', align: 'center', title: '浠诲姟鐘舵��'}
@@ -95,7 +98,7 @@
             if (res.code === 403) {
                 top.location.href = baseUrl + "/";
             }
-            $(".layui-table-body, .layui-table-box, .layui-table-cell").css('overflow','visible');//瑙e喅layui鏁版嵁琛ㄦ牸涓祵濂椾笅鎷夋鏄剧ず闂
+            $(".layui-table-body, .layui-table-box, .layui-table-cell").css('overflow', 'visible');//瑙e喅layui鏁版嵁琛ㄦ牸涓祵濂椾笅鎷夋鏄剧ず闂
             pageCurr = curr;
             limit();
             form.on('checkbox(tableCheckbox)', function (data) {
@@ -287,6 +290,7 @@
             // 鏄庣粏灞曠ず
             case 'detlShow':
                 wrkNo = data.wrkNo;
+                ioTime =  data.ioTime;
                 // 琛ㄦ牸涓嬫柟鏄剧ず
                 // locDetl(data.wrkNo);
                 // 寮瑰眰鏄剧ず
@@ -401,6 +405,7 @@
                 break;
             case 'commandShow'://鏌ョ湅鎸囦护
                 wrkNo = data.wrkNo;
+                wmsWrkNo = data.wmsWrkNo;
                 layer.open({
                     type: 2,
                     title: 'WMS浠诲姟鎸囦护',
@@ -408,7 +413,7 @@
                     area: [top.detailWidth, top.detailHeight],
                     shadeClose: true,
                     content: '../commandManage/commandManage.html',
-                    success: function(layero, index){
+                    success: function (layero, index) {
                     }
                 });
                 break;

--
Gitblit v1.9.1