From 651dfb24aa82ea28e6348907bc02dc8c84a6e13f Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 29 六月 2023 19:33:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 igds-web/src/main/resources/templates/admin/inout/in-check.html |   25 ++++++++++++++-----------
 1 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/igds-web/src/main/resources/templates/admin/inout/in-check.html b/igds-web/src/main/resources/templates/admin/inout/in-check.html
index 2f9816f..8f962a6 100644
--- a/igds-web/src/main/resources/templates/admin/inout/in-check.html
+++ b/igds-web/src/main/resources/templates/admin/inout/in-check.html
@@ -464,7 +464,7 @@
             <div class="layui-form-item">
                 <label class="layui-form-label red">绮绛夌骇</label>
                 <div class="layui-input-block">
-                    <select id="foodLevel" name="foodLevel" lay-filter="foodLevel">
+                    <select id="foodLevel" name="foodLevel" lay-filter="select_foodLevel">
                         <option value=""></option>
                         <option th:each="dic,dicSet:${listFoodLevel}"
                                 th:value="${dic.code}" th:text="${dic.name}"></option>
@@ -495,19 +495,22 @@
         </div>
         <div class="layui-col-xs12" style="margin-bottom: 10px">
             <div style="padding-left: 50px; color: #2ab5ad;">
-                <span style="font-weight: bold; margin-right: 10px;">澶囨敞璇存槑锛�1.缁撴灉鍒ゅ畾锛氱郴缁熸牴鎹悇鍖栭獙椤圭粨鏋滃垽瀹氾紝鏈�鍚庡寲楠岀粨鏋滈渶鎵嬪姩閫夋嫨纭锛�2.鍗曚环澶嶆牳锛氭牴鎹寲楠岄」閰嶇疆璁$畻鐩稿叧澧炴墸浠凤紝鏈�鍚庡崟浠烽渶鎵嬪姩纭銆�</span>
+                <span style="font-weight: bold; margin-right: 10px;">澶囨敞璇存槑锛�1.缁撴灉鍒ゅ畾锛氱郴缁熸牴鎹悇鍖栭獙椤圭粨鏋滃垽瀹氾紝鏈�鍚庡寲楠岀粨鏋滈渶鎵嬪姩閫夋嫨纭锛�2.鏍哥畻瀹氫环锛氭牴鎹寲楠岄」閰嶇疆璁$畻鐩稿叧澧炴墸浠凤紝鏈�鍚庡崟浠烽渶鎵嬪姩纭銆�</span>
             </div>
         </div>
-        <div class="layui-col-xs12">
-            <blockquote class="layui-elem-quote">
+        <div class="layui-col-xs6">
+            <blockquote class="layui-elem-quote" style="width: 95%;float: left;">
                 <div>
-                    <span style="font-weight: bold; margin-right: 10px;">绯荤粺鍒ゅ畾锛�</span>
-                    <span id="check-result-tip" style="margin-right: 25px;">鍖栭獙缁撴灉#锛� 鏀剁伯鍗曚环锛�#鍏�/鍏枻</span>
-                    <span id="check-result-msg" style="margin-right: 25px;color: red;float: right;">
-                         <button style="margin-top: -6px;" class="rkbk-quick-btn layui-btn btn-blue" onclick="checkReset()">
-                            <i><img th:src="@{../../static/images/icon-fuwei.png}"/></i>鍗曚环鍒ゅ畾
-                        </button>
-                    </span>
+                    <span style="font-weight: bold; margin-right: 10px;">缁撴灉鍒ゅ畾锛�</span>
+                    <span id="check-result-tip" style="margin-right: 25px;">鍖栭獙缁撴灉锛�</span>
+                </div>
+            </blockquote>
+        </div>
+        <div class="layui-col-xs6">
+            <blockquote class="layui-elem-quote"  style="width: 95%;float: right;">
+                <div>
+                    <span style="font-weight: bold; margin-right: 10px;">瀹氫环鍒ゅ畾锛�</span>
+                    <span id="check-result-tip2" style="margin-right: 25px;">鏀剁伯鍗曚环锛�#鍏�/鍏枻</span>
                 </div>
             </blockquote>
         </div>

--
Gitblit v1.9.3