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/pack/pack.html |   33 +++++++++++++++++++++------------
 1 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/main/webapp/views/pack/pack.html b/src/main/webapp/views/pack/pack.html
index 3fb43c3..8380b1a 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;
@@ -40,7 +50,7 @@
 
 <script type="text/html" id="toolbar">
     <div class="layui-btn-container">
-<!--        <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>-->
+        <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
         <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
         <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>
     </div>
@@ -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>
@@ -88,15 +97,15 @@
                     </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 class="layui-input" name="matnr" placeholder="璇疯緭鍏ュ晢鍝佺紪鍙�">
                     </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 class="layui-input" name="batch" placeholder="璇疯緭鍏ユ壒鍙�">
+                        <input class="layui-input" name="batch" placeholder="璇疯緭鍏ュ簭鍒楃爜">
                     </div>
                 </div>
                 <div class="layui-form-item">

--
Gitblit v1.9.1