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/pack/pack.html |   25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/views/pack/pack.html b/src/main/webapp/views/pack/pack.html
index 5207c2e..a0acf45 100644
--- a/src/main/webapp/views/pack/pack.html
+++ b/src/main/webapp/views/pack/pack.html
@@ -18,9 +18,19 @@
             <div class="layui-form toolbar" id="search-box">
                 <div class="layui-form-item">
                     <div class="layui-inline">
-                        <label class="layui-form-label">鏉＄爜:</label>
+                        <label class="layui-form-label">鏉�&emsp;鐮�:</label>
                         <div class="layui-input-inline">
                             <input class="layui-input" type="text" name="barcode" placeholder="璇疯緭鍏�..." autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">鐘�&emsp;鎬�:</label>
+                        <div class="layui-input-inline">
+                            <select name="settle">
+                                <option value="">閫夋嫨鐘舵��</option>
+                                <option value="1">鏈鐞�</option>
+                                <option value="2">涓嬬嚎甯墭</option>
+                            </select>
                         </div>
                     </div>
                     <div class="layui-inline">&emsp;
@@ -54,19 +64,18 @@
 <script type="text/html" id="settleTpl">
     <span name="settle"
           {{# if( d.settle === 1){ }}
-          class="layui-badge layui-badge-red"
+          class="layui-badge layui-badge-red" >{{d.settle$}}</span>
           {{# }else if(d.settle === 2){ }}
-          class="layui-badge layui-badge-green"
+          class="layui-badge layui-badge-green" >涓嬬嚎甯墭</span>
           {{# }else if(d.settle === 3){ }}
-          class="layui-badge layui-badge-gray"
+          class="layui-badge layui-badge-gray" >{{d.settle$}}</span>
           {{# }else if(d.settle === 4){ }}
-          class="layui-badge layui-badge-blue"
+          class="layui-badge layui-badge-blue" >{{d.settle$}}</span>
           {{# }else if(d.settle === 5){ }}
-          class="layui-badge layui-badge-gray"
+          class="layui-badge layui-badge-gray" >{{d.settle$}}</span>
           {{# }else if(d.settle === 6){ }}
-          class="layui-badge layui-badge-gray"
+          class="layui-badge layui-badge-gray" >{{d.settle$}}</span>
           {{# } }}
-    >{{d.settle$}}</span>
 </script>
 
 <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>

--
Gitblit v1.9.1