From 887f8167fbcfa30ac9e2acabfa823c20d2aa21ad Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期六, 18 九月 2021 10:49:17 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/matOut/waitMatoutQuery.html |   23 +++++------------------
 1 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/src/main/webapp/views/matOut/waitMatoutQuery.html b/src/main/webapp/views/matOut/waitMatoutQuery.html
index 8756b0f..d0c0cd4 100644
--- a/src/main/webapp/views/matOut/waitMatoutQuery.html
+++ b/src/main/webapp/views/matOut/waitMatoutQuery.html
@@ -99,7 +99,7 @@
             ,{field: 'qty', title: '閫氱煡鍑哄簱閲�', fixed: 'left', width:100}
             ,{field: 'outQty', title: '宸插嚭搴撻噺', fixed: 'left', width:90}
         ];
-        cols.push.apply(cols, matCols);
+        cols.push.apply(cols, detlCols);
         cols.push({field: 'billNo', title:'鍗曟嵁缂栧彿', align: 'center'}
             ,{field: 'seqNo', title:'搴忓彿', align: 'center', width:80}
             ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true}
@@ -107,12 +107,15 @@
         return cols;
     }
 
-    layui.use(['table','laydate', 'form'], function() {
+    layui.config({
+        base: baseUrl + "/static/layui/lay/modules/"
+    }).use(['table','laydate', 'form', 'tableMerge'], function() {
         var table = layui.table;
         var $ = layui.jquery;
         var layer = layui.layer;
         var layDate = layui.laydate;
         var form = layui.form;
+        var tableMerge = layui.tableMerge;
         // 鏁版嵁娓叉煋
         locDetlTableIns = table.render({
             elem: '#stockOut',
@@ -204,20 +207,6 @@
         });
     })
 
-    var b = true;
-    $(function(){
-        $(document.body).on('click','td[data-field="0"]',function(){
-            var locNo = $(this).next().children("div").html();
-            if (b) {
-                b = false;
-                $("tr td[data-field=locNo\\$] div:contains("+ locNo +")").parent().prev().children().children("div").click();
-                setTimeout(function () {
-                    b = true;
-                }, 200)
-            }
-        });
-    })
-
     function tableReload(child) {
         var searchData = {};
         $.each($('#search-box [name]').serializeArray(), function() {
@@ -233,8 +222,6 @@
                     top.location.href = baseUrl+"/";
                 }
                 pageCurr=curr;
-                $('.layui-form-checkbox').css("pointer-events", "none");
-                $('td[data-field="0').css("cursor", "pointer")
             }
         });
     }

--
Gitblit v1.9.1