From 0621dc7f7121a8b2a2a785687ec1fc8d0a8d3d45 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期二, 08 三月 2022 16:23:18 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/pakStore/locDetlQuery.html |   85 ++++++++++++++++++++----------------------
 1 files changed, 41 insertions(+), 44 deletions(-)

diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html
index e604b4e..9c5d9f1 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -51,12 +51,12 @@
         </div>
         <div class="layui-inline">
             <div class="layui-input-inline">
-                <input class="layui-input" type="text" name="mat_no" placeholder="浜у搧缂栫爜"  autocomplete="off">
+                <input class="layui-input" type="text" name="mat_no" placeholder="鐗╂枡鍙�"  autocomplete="off">
             </div>
         </div>
         <div class="layui-inline">
             <div class="layui-input-inline">
-                <input class="layui-input" type="text" name="mat_name" placeholder="浜у搧鍚嶇О" autocomplete="off">
+                <input class="layui-input" type="text" name="mat_name" placeholder="鐗╂枡鎻忚堪" autocomplete="off">
             </div>
         </div>
         <!-- 鏃ユ湡鑼冨洿 -->
@@ -97,11 +97,29 @@
         var cols = [
             {type: 'checkbox'}
             ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
+            ,{field: 'matNo', align: 'center',title: '浜у搧缂栫爜'}
+            ,{field: 'matName', align: 'center',title: '浜у搧鍚嶇О'}
+            ,{field: 'specs', align: 'center',title: '瑙勬牸'}
+            ,{field: 'qty', align: 'center',title: '鏁伴噺'}
+            ,{field: 'source', title: '鏉ユ簮', align: 'center'}
+            ,{field: 'vendor', title: '渚涘簲鍟�', align: 'center'}
+            ,{field: 'qtyBox', align: 'center', title: '姣忕鏁伴噺(PCS)'}
+            ,{field: 'allQty', title: '鎬绘暟閲�(PCS)', align: 'center'}
+            ,{field: 'weight', align: 'center', title: '姣忕閲嶉噺(KG)'}
+            ,{field: 'allWeight', title: '鎬婚噸閲�(KG)', align: 'center'}
+            ,{field: 'unit', align: 'center',title: '鍗曚綅', width:80, hide: true}
+            ,{field: 'supplier', align: 'center',title: '鎵瑰彿'}
+            ,{field: 'color', align: 'center',title: '棰滆壊'}
+            ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉$爜'}
+            // ,{field: 'bname', align: 'center',title: '搴撲綅鍚嶇О'}
+            ,{field: 'memo', align: 'center',title: '鐢熶骇鏃ユ湡'}
+            ,{field: 'str3', align: 'center',title: '瀹㈡埛鍚嶇О'}
+            ,{field: 'str4', align: 'center',title: '椤圭洰淇℃伅'}
+            ,{field: 'str5$', align: 'center',title: '绫诲埆'}
         ];
-        cols.push.apply(cols, detlCols);
-        cols.push(
-            {field: 'memo', align: 'center',title: '澶囨敞'}
-            ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true}
+        // cols.push.apply(cols, detlCols);
+        
+        cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true}
             ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'})
         return cols;
     }
@@ -143,8 +161,14 @@
                     top.location.href = baseUrl+"/";
                 }
                 pageCurr=curr;
-                $('.layui-form-checkbox').css("pointer-events", "none");
-                $('td[data-field="0').css("cursor", "pointer")
+                form.on('checkbox(tableCheckbox)', function (data) {
+                    var _index = $(data.elem).attr('table-index')||0;
+                    if(data.elem.checked){
+                        res.data[_index][data.value] = 'Y';
+                    }else{
+                        res.data[_index][data.value] = 'N';
+                    }
+                });
             }
         });
 
@@ -158,26 +182,6 @@
                         layer.msg("璇烽�夋嫨鏁版嵁");
                         return;
                     }
-                    var locNos = [];
-                    data.forEach(function(elem) {
-                        locNos.push(elem.locNo);
-                    });
-                    $.ajax({
-                        url: baseUrl+"/locDetl/auth",
-                        headers: {'token': localStorage.getItem('token')},
-                        data: {locNos:locNos},
-                        method: 'POST',
-                        async: false,
-                        success: function (res) {
-                            if (res.code === 200) {
-                                data = res.data;
-                            } else if (res.code === 403) {
-                                top.location.href = baseUrl + "/";
-                            } else {
-                                layer.msg(res.msg)
-                            }
-                        }
-                    })
                     parent.addTableData(data);
                     break;
             }
@@ -203,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() {
@@ -232,8 +222,15 @@
                     top.location.href = baseUrl+"/";
                 }
                 pageCurr=curr;
-                $('.layui-form-checkbox').css("pointer-events", "none");
-                $('td[data-field="0').css("cursor", "pointer")
+                if (res.data.length === 0 && count !== 0) {
+                    locDetlTableIns.reload({
+                        where: searchData,
+                        page: {
+                            curr: pageCurr-1
+                        }
+                    });
+                    pageCurr -= 1;
+                }
             }
         });
     }

--
Gitblit v1.9.1