From 7bea8428d74527993cb4ae47d01c79850b5f34bc Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 20 三月 2023 08:09:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs' into bfasrs

---
 src/main/webapp/views/mat/mat.html |   42 ++++++++++++++++++++++++++++++++++--------
 1 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index 103d755..31b2fda 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -104,7 +104,7 @@
                             </div>
                         </div>
                         <div class="layui-inline">&emsp;
-                            <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
+                            <button class="layui-btn icon-btn" id="search" lay-filter="search" lay-submit>
                                 <i class="layui-icon">&#xe615;</i>鎼滅储
                             </button>
                             <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
@@ -197,13 +197,28 @@
                         <input name="maktx" placeholder="璇疯緭鍏ュ晢鍝佸悕绉�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
                     </div>
                 </div>
-
                 <div class="layui-form-item">
-                    <label class="layui-form-label">澶囨敞</label>
+                    <label class="layui-form-label">搴撳瓨涓婇檺</label>
                     <div class="layui-input-block">
-                        <input name="memo" placeholder="璇疯緭鍏ュ娉�" class="layui-input">
+                        <input name="storeMax" placeholder="搴撳瓨涓婇檺" type="number" class="layui-input">
                     </div>
                 </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">搴撻緞涓婇檺(澶�)</label>
+                    <div class="layui-input-block">
+                        <input name="storeMaxDate" placeholder="搴撻緞涓婇檺(澶�)" type="number" class="layui-input">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label layui-form-required">楂橀鐗╂枡</label>
+                    <div class="layui-input-block">
+                        <select name="inoutEveryday" lay-vertype="tips" lay-verify="required" required="">
+                            <option value="0">鍚�</option>
+                            <option value="1">鏄�</option>
+                        </select>
+                    </div>
+                </div>
+
 
             </div>
 
@@ -219,6 +234,21 @@
                     <label class="layui-form-label">瑙勬牸</label>
                     <div class="layui-input-block">
                         <input name="specs" placeholder="璇疯緭鍏ヨ鏍�" class="layui-input">
+                    </div>
+                </div>
+
+                <div class="layui-form-item">
+                    <label class="layui-form-label">搴撳瓨涓嬮檺</label>
+                    <div class="layui-input-block">
+                        <input name="storeMin" placeholder="搴撳瓨涓嬮檺" type="number" class="layui-input">
+                    </div>
+                </div>
+
+
+                <div class="layui-form-item">
+                    <label class="layui-form-label">澶囨敞</label>
+                    <div class="layui-input-block">
+                        <input name="memo" placeholder="璇疯緭鍏ュ娉�" class="layui-input">
                     </div>
                 </div>
 
@@ -376,14 +406,10 @@
         <tr style="height: 74px" >
             <td align="center" scope="col" colspan="1">鍟嗗搧</td>
             <td align="center" scope="col" colspan="1" style="
-                display: inline-block;
-                line-height: 20px;
-                vertical-align: middle;
                 border: none;
                 border-top: 1px solid #000;
                 overflow: hidden;
                 text-overflow: ellipsis;
-                display: -webkit-box;
                 -webkit-line-clamp: 3;
                 -webkit-box-orient: vertical;
                     ">

--
Gitblit v1.9.1