From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1

---
 src/main/webapp/views/agvPakStore/locDetlCheckQuery.html |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/src/main/webapp/views/agvPakStore/locDetlCheckQuery.html b/src/main/webapp/views/agvPakStore/locDetlCheckQuery.html
index faf54f8..49614ff 100644
--- a/src/main/webapp/views/agvPakStore/locDetlCheckQuery.html
+++ b/src/main/webapp/views/agvPakStore/locDetlCheckQuery.html
@@ -61,6 +61,11 @@
                 <input class="layui-input" type="text" name="maktx" placeholder="鐗╂枡鎻忚堪" autocomplete="off">
             </div>
         </div>
+        <div class="layui-inline">
+            <div class="layui-input-inline">
+                <input class="layui-input" type="number" name="floor" placeholder="妤煎眰" autocomplete="off">
+            </div>
+        </div>
         <!-- 鏃ユ湡鑼冨洿 -->
         <div class="layui-inline" style="width: 300px">
             <div class="layui-input-inline">
@@ -98,7 +103,9 @@
         let cols = [
             {type: 'checkbox', merge: ['locNo']}
             ,{field: 'locNo', align: 'center',title: '搴撲綅鍙�', merge: true, width:150, style: 'font-weight: bold'}
+            ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
         ];
+        arrRemove(detlCols,  'field', 'zpallet');
         cols.push.apply(cols, detlCols);
         cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true}
             ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'})
@@ -208,6 +215,14 @@
             tableReload();
         });
 
+        // 鎼滅储鏍忛噸缃簨浠�
+        form.on('submit(reset)', function (data) {
+            pageCurr = 1;
+            clearFormVal($('#search-box'));
+            $('#detlTable').css("display", 'none');
+            tableReload(false);
+        });
+
         layDate.render({
             elem: '.layui-laydate-range'
             ,type: 'datetime'

--
Gitblit v1.9.1