From 3c4f0cc8c6f677bf2756f25581ff0c1729e93829 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 25 四月 2022 16:42:14 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/PackController.java |    2 +-
 src/main/webapp/views/pack/pack.html                     |   12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/PackController.java b/src/main/java/com/zy/asrs/controller/PackController.java
index ef5ed9b..542d0a8 100644
--- a/src/main/java/com/zy/asrs/controller/PackController.java
+++ b/src/main/java/com/zy/asrs/controller/PackController.java
@@ -49,7 +49,7 @@
         excludeTrash(param);
         convert(param, wrapper);
         if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
-            wrapper.orderBy("create_time", false);
+            wrapper.orderBy("settle").orderBy("create_time", false);
         }
         return R.ok(packService.selectPage(new Page<>(curr, limit), wrapper));
     }
diff --git a/src/main/webapp/views/pack/pack.html b/src/main/webapp/views/pack/pack.html
index a8f1c75..d6d5aac 100644
--- a/src/main/webapp/views/pack/pack.html
+++ b/src/main/webapp/views/pack/pack.html
@@ -18,11 +18,21 @@
             <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;
                         <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
                             <i class="layui-icon">&#xe615;</i>鎼滅储

--
Gitblit v1.9.1