From dbbd8b7066092b3ce4eab44fa0e2b746dad16a95 Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期五, 07 七月 2023 19:15:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 igds-web/src/main/resources/templates/admin/inout/in-check.html |   96 ++++++++++++++++++++++++++++++++----------------
 1 files changed, 64 insertions(+), 32 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 a4ae6e7..b7bb6a6 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
@@ -111,6 +111,11 @@
         .input_ba {
             background: #e7eaec !important;
         }
+        .layui-layer-btn .layui-layer-btn1 {
+            border-color: #53adce;
+            background-color: #53adce;
+            color: #fff;
+        }
     </style>
 
 </head>
@@ -122,29 +127,32 @@
         <div class="qyzj-btnbox layui-clear">
 
             <div class="rkbk-quick fl">
-                <button type="button" class="rkbk-quick-btn layui-btn btn-violet"
-                        onclick="checkExe('big')">
-                    <i><img th:src="@{../../static/images/icon-hyd.png}"/></i>澶ц溅鎵︽牱
+                <button type="button" class="rkbk-quick-btn layui-btn btn-violet" onclick="showScanCode()">
+                    <i><img th:src="@{../../static/images/icon-hyd.png}"/></i>鎵爜褰曞叆
                 </button>
+<!--                <button type="button" class="rkbk-quick-btn layui-btn btn-violet"-->
+<!--                        onclick="checkExe('big')">-->
+<!--                    <i><img th:src="@{../../static/images/icon-hyd.png}"/></i>澶ц溅鎵︽牱-->
+<!--                </button>-->
 
-                <button type="button" class="rkbk-quick-btn layui-btn btn-violet"
-                        onclick="checkExe('small')">
-                    <i><img th:src="@{../../static/images/icon-hyd.png}"/></i>灏忚溅鎵︽牱
-                </button>
+<!--                <button type="button" class="rkbk-quick-btn layui-btn btn-violet"-->
+<!--                        onclick="checkExe('small')">-->
+<!--                    <i><img th:src="@{../../static/images/icon-hyd.png}"/></i>灏忚溅鎵︽牱-->
+<!--                </button>-->
 
-                <button class="rkbk-quick-btn layui-btn btn-blue"
-                        onclick="checkReset()">
-                    <i><img th:src="@{../../static/images/icon-fuwei.png}"/></i>鎵︽牱澶嶄綅
-                </button>
+<!--                <button class="rkbk-quick-btn layui-btn btn-blue"-->
+<!--                        onclick="checkReset()">-->
+<!--                    <i><img th:src="@{../../static/images/icon-fuwei.png}"/></i>鎵︽牱澶嶄綅-->
+<!--                </button>-->
 
-                <button class="rkbk-quick-btn layui-btn btn-red"
-                        onclick="checkStop()">
-                    <i><img th:src="@{../../static/images/icon-stop.png}"/></i>鎵︽牱鎬ュ仠
-                </button>
-                <button class="rkbk-quick-btn layui-btn btn-blue"
-                        onclick="checkResetStop()">
-                    <i><img th:src="@{../../static/images/icon-fuwei.png}"/></i>鎬ュ仠澶嶄綅
-                </button>
+<!--                <button class="rkbk-quick-btn layui-btn btn-red"-->
+<!--                        onclick="checkStop()">-->
+<!--                    <i><img th:src="@{../../static/images/icon-stop.png}"/></i>鎵︽牱鎬ュ仠-->
+<!--                </button>-->
+<!--                <button class="rkbk-quick-btn layui-btn btn-blue"-->
+<!--                        onclick="checkResetStop()">-->
+<!--                    <i><img th:src="@{../../static/images/icon-fuwei.png}"/></i>鎬ュ仠澶嶄綅-->
+<!--                </button>-->
             </div>
 
             <!--娴佺▼寮曞-->
@@ -357,16 +365,37 @@
 <script th:src="@{../../static/js/jquery.min.js}"></script>
 <script th:src="@{../../static/js/constant.js}"></script>
 <script th:src="@{../../static/js/igds-common.js}"></script>
+<script th:src="@{../../static/admin/inout/inout-common.js}"></script>
 <script th:src="@{../../static/admin/inout/in-check.js}"></script>
 
 <script type="text/html" id="barControl">
-    <a class="layui-btn control-btn" lay-event="edit">鍖栭獙</a>
+    <a class="layui-btn control-btn" lay-event="edit">缁撴灉褰曞叆</a>
 </script>
-
 </body>
 
+<!-- 鎵爜寮圭獥 -->
+<div class="layui-tab-content" id="scanCodeDetail" style="display: none;">
+    <!-- 琛ㄥ崟鍩烘湰淇℃伅 -->
+        <form class="layui-form" id="form-sacnCodeDetail" lay-filter="form-sacnCodeDetail">
+            <div class="layui-col-xs12">
+                <div class="layui-form-item">
+                    <label class="layui-form-label">璐ㄦ鍗曞彿</label>
+                    <div class="layui-input-block">
+                        <input type="text" id="checkId" name="checkId" placeholder="璇锋壂鐮侊紝涔熷彲鎵嬪姩杈撳叆" class="layui-input">
+                    </div>
+                </div>
+            </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;">澶囨敞锛氳川妫�鍗曞彿鍙互鎵爜锛屼篃鍙互鎵嬪姩杈撳叆锛屾墜鍔ㄨ緭鍏ュ悗闇�瑕佺偣鍑绘煡璇�</span>
+                </div>
+            </div>
+        </form>
+</div>
+
+
+<!-- 鎵嬪姩褰曞彇鍖栭獙淇℃伅寮圭獥 -->
 <div class="layui-tab-content" id="checkDetail" style="display: none;">
 
     <!-- 琛ㄥ崟鍩烘湰淇℃伅 -->
@@ -464,7 +493,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>
@@ -498,16 +527,19 @@
                 <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