From d814bde01eb91d1544b718463cd31317726bbf6b Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 27 十二月 2023 21:52:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion

---
 src/main/webapp/views/pakStore/turnOverQuery.html |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/views/pakStore/turnOverQuery.html b/src/main/webapp/views/pakStore/turnOverQuery.html
index 14b2091..502b8b1 100644
--- a/src/main/webapp/views/pakStore/turnOverQuery.html
+++ b/src/main/webapp/views/pakStore/turnOverQuery.html
@@ -62,6 +62,11 @@
                 <input class="layui-input" type="text" name="owner$" placeholder="璐т富" autocomplete="off">
             </div>
         </div>
+        <div class="layui-inline">
+            <div class="layui-input-inline">
+                <input class="layui-input" type="text" name="payment$" placeholder="璐х墿褰㈡��" autocomplete="off">
+            </div>
+        </div>
         <!-- 寰呮坊鍔� -->
         <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
             <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
@@ -90,8 +95,8 @@
 
     function getCol() {
         var cols = [
-            {type: 'checkbox'}
-            ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
+            {type: 'checkbox',width: 50}
+            ,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'}
         ];
         cols.push.apply(cols, detlCols);
         cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true}

--
Gitblit v1.9.1