From 53fab3f56e8335fbf39fc07c4e10f6abdb0505bb Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 03 十二月 2025 18:48:11 +0800
Subject: [PATCH] 登记、化验、称重页面调整，及登记化验数据提交

---
 fzzy-igdss-web/src/main/resources/templates/inout/check.html |  343 +++++++++++++++++---------------------------------------
 1 files changed, 104 insertions(+), 239 deletions(-)

diff --git a/fzzy-igdss-web/src/main/resources/templates/inout/inout-check.html b/fzzy-igdss-web/src/main/resources/templates/inout/check.html
similarity index 62%
rename from fzzy-igdss-web/src/main/resources/templates/inout/inout-check.html
rename to fzzy-igdss-web/src/main/resources/templates/inout/check.html
index c477bcc..47984ba 100644
--- a/fzzy-igdss-web/src/main/resources/templates/inout/inout-check.html
+++ b/fzzy-igdss-web/src/main/resources/templates/inout/check.html
@@ -16,7 +16,9 @@
             overflow: hidden;
             width: 100%;
         }
-
+        .layui-table-view .layui-table {
+            width: 100%;
+        }
         #layui-table-page1 {
             text-align: right !important;
         }
@@ -82,10 +84,6 @@
             background: #FFF !important;
         }
 
-        thead span {
-            font-weight: bold
-        }
-
         .red {
             color: red;
             font-weight: bold;
@@ -93,10 +91,6 @@
 
         .layui-select-disabled .layui-disabled {
             color: #000 !important;
-        }
-
-        .layui-table td {
-            font-weight: bold;
         }
 
         .layui-elem-quote {
@@ -113,6 +107,9 @@
             border-color: #53adce;
             background-color: #53adce;
             color: #fff;
+        }
+        .qyzj-con {
+            height: 710px;
         }
     </style>
 
@@ -168,26 +165,31 @@
                                    autocomplete="off" class="layui-input rkbk-search-input">
                         </div>
                     </div>
-                    <div class="layui-form-item display-none">
-                        <label class="layui-form-label">闅愯棌-娴佺▼</label>
-                        <div class="layui-input-block">
-                            <input type="text" name="progress" th:value="${progress}"
-                                   autocomplete="off" class="layui-input rkbk-search-input">
-                        </div>
-                    </div>
                     <div class="layui-col-xs3">
                         <div class="layui-form-item">
-                            <label class="layui-form-label">璐ㄦ鍗曞彿</label>
+                            <label class="layui-form-label">寰�鏉ュ崟浣�</label>
                             <div class="layui-input-block">
-                                <input type="text" name="checkId" placeholder="璇疯緭鍏�"
+                                <input type="text" name="customerName" placeholder="璇疯緭鍏�"
                                        autocomplete="off" class="layui-input rkbk-search-input">
                             </div>
                         </div>
                     </div>
                     <div class="layui-col-xs3">
                         <div class="layui-form-item">
+                            <label class="layui-form-label">瑁呭嵏浠撳簱</label>
+                            <div class="layui-input-block">
+                                <select name="depotId">
+                                    <option value=""></option>
+                                    <option th:each="depot,depotSet:${listDepot}"
+                                            th:value="${depot.id}" th:text="${depot.name}"></option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-col-xs3">
+                        <div class="layui-form-item">
                             <label class="layui-form-label">绮鍝佺</label>
-                            <div class="layui-input-block rkbk-selBox">
+                            <div class="layui-input-block">
                                 <select name="foodVariety">
                                     <option value=""></option>
                                     <option th:each="dic,dicSet:${listFoodVariety}"
@@ -198,41 +200,8 @@
                     </div>
                     <div class="layui-col-xs3">
                         <div class="layui-form-item">
-                            <label class="layui-form-label">璧峰鏃堕棿</label>
-                            <div class="layui-input-block">
-                                <input type="text" name="start" placeholder="璇疯緭鍏�" autocomplete="off"
-                                       class="layui-input rkbk-search-input bg-date" id="start">
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="layui-col-xs3">
-                        <div class="layui-form-item">
-                            <label class="layui-form-label">鎴鏃堕棿</label>
-                            <div class="layui-input-block">
-                                <input type="text" name="end" placeholder="璇疯緭鍏�" autocomplete="off"
-                                       class="layui-input rkbk-search-input bg-date" id="end">
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="layui-col-xs3">
-                        <div class="layui-form-item">
-                            <label class="layui-form-label">瑁呭嵏浠撳簱</label>
-                            <div class="layui-input-block rkbk-selBox">
-                                <select name="depotId">
-                                    <option value=""></option>
-                                    <option th:each="depot,depotSet:${listDepot}"
-                                            th:value="${depot.id}" th:text="${depot.name}"></option>
-                                </select>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="layui-col-xs3">
-                        <div class="layui-form-item">
                             <label class="layui-form-label">鏄惁鍖栭獙</label>
-                            <div class="layui-input-block rkbk-selBox">
+                            <div class="layui-input-block">
                                 <select name="checkStatus">
                                     <option value="NONE" selected>鏈寲楠�</option>
                                     <option value="CHECK">宸插寲楠�</option>
@@ -240,14 +209,30 @@
                             </div>
                         </div>
                     </div>
-
+                    <div class="layui-col-xs3">
+                        <div class="layui-form-item">
+                            <label class="layui-form-label">璧峰鏃堕棿</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="start" placeholder="璇烽�夋嫨" autocomplete="off"
+                                       class="layui-input rkbk-search-input bg-date" id="start">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-col-xs3">
+                        <div class="layui-form-item">
+                            <label class="layui-form-label">鎴鏃堕棿</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="end" placeholder="璇烽�夋嫨" autocomplete="off"
+                                       class="layui-input rkbk-search-input bg-date" id="end">
+                            </div>
+                        </div>
+                    </div>
                     <div class="layui-col-xs3 layui-text-right">
-                        <input type="button" value="鏌ヨ/鍒锋柊"
+                        <input type="button" style="border-radius: 50px;background-color: #1c84c6 !important;width: 94px;height: 32px;line-height: 32px;font-size: 14px;" value="鎼滅储"
                                class="qyzj-top-btn layui-btn btn-blue" onclick="flushData()"/>
-                        <input type="button" value="娓呯┖鏉′欢"
+                        <input type="button" style="border-radius: 50px;background-color: #f8ac59 !important;width: 94px;height: 32px;line-height: 32px;font-size: 14px;" value="閲嶇疆"
                                class="qyzj-top-btn layui-btn btn-red" onclick="resetForm()"/>
                     </div>
-
                 </form>
             </div>
             <!--qyzj-con-oop end-->
@@ -257,26 +242,27 @@
                        lay-filter="tableData">
                     <colgroup>
                         <col width="10%">
-                        <col width="10%">
-                        <col width="10%">
-                        <col width="10%">
-                        <col width="10%">
-                        <col width="10%">
-                        <col width="10%">
-                        <col width="10%">
+                        <col width="8%">
+                        <col width="6%">
                         <col width="">
                         <col width="10%">
+                        <col width="10%">
+                        <col width="8%">
+                        <col width="8%">
+                        <col width="10%">
+                        <col width="9%">
                     </colgroup>
                     <thead>
                     <tr class="qyzj-table-tit">
-                        <th>璐ㄦ鍗曞彿</th>
-                        <th>鐧昏鏃堕棿</th>
-                        <th>鎵︽牱鐘舵��</th>
-                        <th>鎵︽牱浜�</th>
-                        <th>鎵︽牱鏃堕棿</th>
-                        <th>绮鍝佺</th>
+                        <th>鍗曟嵁鍙�</th>
+                        <th>杞︾墝鍙�</th>
+                        <th>绫诲瀷</th>
+                        <th>寰�鏉ュ崟浣�</th>
                         <th>瑁呭嵏浠撳簱</th>
-                        <th>妫�楠岀粨鏋�</th>
+                        <th>绮鍝佺</th>
+                        <th>姘村垎</th>
+                        <th>鏉傝川</th>
+                        <th>娴佺▼杩涘害</th>
                         <th>鎿嶄綔</th>
                     </tr>
                     </thead>
@@ -304,12 +290,8 @@
     //鍝佺
     var listFoodVariety = [[${listFoodVariety}]];
     //鎬ц川
-    var listFoodType = [[${listFoodType}]];
     var startTime = [[${startTime}]];
     var endTime = [[${endTime}]];
-    var foodYear = [[${foodYear}]];
-    //鎵︽牱鏈轰俊鎭�
-    var checkDto = [[${checkDto}]];
 
     //鎵�灞炲垎搴�
     var deptId = [[${deptId}]];
@@ -322,102 +304,78 @@
 <script th:src="@{/common/constant.js}"></script>
 <script th:src="@{/common/igds-common.js}"></script>
 <script th:src="@{/inout/inout-common.js}"></script>
-<script th:src="@{/web/inout/inout-check.js}"></script>
+<script th:src="@{/inout/check.js}"></script>
 
 <script type="text/html" id="barControl">
     <a class="layui-btn control-btn" lay-event="edit">缁撴灉褰曞叆</a>
 </script>
 </body>
 
-<!-- 鎵爜寮圭獥 -->
-<div class="layui-tab-content" id="scanCodeDetail" style="display: none;" 慰nsubmit="return false;">
-    <!-- 琛ㄥ崟鍩烘湰淇℃伅 -->
-    <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">
-                    <!--杩欒浠ｇ爜涓嶈兘鍒�-->
-                    <!--褰揻orm琛ㄥ崟涓彧鏈変竴涓猧nput鏃舵寜鍥炶溅鎸夐敭浼氬埛鏂伴〉闈紝鍥犳娣诲姞涓�涓猧nput骞堕殣钘忥紝涓嶈兘浣跨敤type="hidden"鏂瑰紡闅愯棌-->
-                    <input type="text" id="hiddenText" name="hiddenText" style="display:none"/>
-                </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;">
 
     <!-- 琛ㄥ崟鍩烘湰淇℃伅 -->
     <form class="layui-form" id="form-detail" lay-filter="form-detail">
-
-        <div class="layui-col-xs12" style="display: none;">
+        <div class="layui-col-xs4" style="display: none;">
             <div class="layui-form-item">
-                <label class="layui-form-label">闅愯棌瀛楁-娴佹按缂栧彿</label>
+                <label class="layui-form-label">闅愯棌瀛楁-缁勭粐鍙�</label>
                 <div class="layui-input-block">
-                    <input type="text" name="id" autocomplete="off" class="layui-input rkbk-search-input">
-                </div>
-            </div>
-        </div>
-
-        <div class="layui-col-xs4">
-            <div class="layui-form-item">
-                <label class="layui-form-label">璐ㄦ鍗曞彿</label>
-                <div class="layui-input-block">
-                    <input type="text" name="checkId" autocomplete="off"
+                    <input type="text" name="companyId" autocomplete="off"
                            class="layui-input input_ba" disabled="">
                 </div>
             </div>
         </div>
-
-        <div class="layui-col-xs4">
+        <div class="layui-col-xs4" style="display: none;">
             <div class="layui-form-item">
-                <label class="layui-form-label">鎵� 鏍� 浜�</label>
+                <label class="layui-form-label">闅愯棌瀛楁-搴撳尯缂栫爜</label>
                 <div class="layui-input-block">
-                    <input type="text" name="sampleUser" autocomplete="off"
+                    <input type="text" name="deptId" autocomplete="off"
                            class="layui-input input_ba" disabled="">
                 </div>
             </div>
         </div>
-        <div class="layui-col-xs4">
+        <div class="layui-col-xs6">
             <div class="layui-form-item">
-                <label class="layui-form-label">鎵︽牱鏃堕棿</label>
+                <label class="layui-form-label">鍗曟嵁鍙�</label>
                 <div class="layui-input-block">
-                    <input type="text" name="sampleTime" autocomplete="off"
-                           class="layui-input input_ba" disabled="">
+                    <input type="text" name="id" autocomplete="off"
+                           class="layui-input input_ba" disabled>
                 </div>
             </div>
         </div>
-        <div class="layui-col-xs4">
+        <div class="layui-col-xs6">
             <div class="layui-form-item">
-                <label class="layui-form-label">璐� 妫� 浜�</label>
-                <div class="layui-input-block">
-                    <input type="text" name="checkUser" autocomplete="off"
-                           class="layui-input">
-                </div>
-            </div>
-        </div>
-        <div class="layui-col-xs4">
-            <div class="layui-form-item">
-                <label class="layui-form-label red">瑁呭嵏浠撳簱</label>
+                <label class="layui-form-label">瑁呭嵏浠撳簱</label>
                 <div class="layui-input-block">
                     <select name="depotId" id="depotId" lay-filter="select_depot">
+                        <option value=""></option>
+                        <option th:each="depot,depotSet:${listDepot}"
+                                th:value="${depot.id}" th:text="${depot.name}"></option>
                     </select>
                 </div>
             </div>
         </div>
-        <div class="layui-col-xs4">
+        <div class="layui-col-xs6">
             <div class="layui-form-item">
-                <label class="layui-form-label red">绮鍝佺</label>
+                <label class="layui-form-label">杞︾墝鍙�</label>
+                <div class="layui-input-block">
+                    <input type="text" name="plateNum" autocomplete="off"
+                           class="layui-input input_ba" disabled>
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6">
+            <div class="layui-form-item">
+                <label class="layui-form-label">寰�鏉ュ崟浣�</label>
+                <div class="layui-input-block">
+                    <select name="depotId" id="customerName" lay-filter="select_depot">
+                    </select>
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6">
+            <div class="layui-form-item">
+                <label class="layui-form-label">绮鍝佺</label>
                 <div class="layui-input-block">
                     <select name="foodVariety" style="font-weight: bold"
                             id="foodVariety" lay-filter="select_foodVariety">
@@ -428,27 +386,7 @@
                 </div>
             </div>
         </div>
-        <div class="layui-col-xs4">
-            <div class="layui-form-item">
-                <label class="layui-form-label">璐ㄦ鏃堕棿</label>
-                <div class="layui-input-block">
-                    <input type="text" name="checkTime" autocomplete="off"
-                           class="layui-input">
-                </div>
-            </div>
-        </div>
-        <div class="layui-col-xs4">
-            <div class="layui-form-item">
-                <label class="layui-form-label">鏀剁伯瀹氫环</label>
-                <div class="layui-input-block">
-                    <input type="text" name="price" id="price"
-                           class="layui-input rkbk-search-input" placeholder="鏍规嵁绮绛夌骇甯﹀叆/鎵嬪姩褰曞叆">
-                    <em class="kccz-data-dw">鍏�/鍏枻</em>
-                </div>
-            </div>
-        </div>
-
-        <div class="layui-col-xs4">
+        <div class="layui-col-xs6">
             <div class="layui-form-item">
                 <label class="layui-form-label red">绮绛夌骇</label>
                 <div class="layui-input-block">
@@ -460,37 +398,23 @@
                 </div>
             </div>
         </div>
-        <div class="layui-col-xs4">
+        <div class="layui-col-xs6">
             <div class="layui-form-item">
-                <label class="layui-form-label">绮骞翠唤</label>
+                <label class="layui-form-label red">姘村垎</label>
                 <div class="layui-input-block">
-                    <input type="text" name="foodYear" placeholder="璇疯緭鍏�" autocomplete="off"
-                           class="layui-input rkbk-search-input bg-date" id="foodYear">
+                    <input id="perWet" type="text" name="perWet" autocomplete="off"
+                           placeholder="璇疯緭鍏�" class="layui-input weight"> <em
+                        class="kccz-data-dw">%</em>
                 </div>
             </div>
         </div>
-        <div class="layui-col-xs4">
+        <div class="layui-col-xs6">
             <div class="layui-form-item">
-                <label class="layui-form-label red">绮鎬ц川</label>
+                <label class="layui-form-label red">鏉傝川</label>
                 <div class="layui-input-block">
-                    <select id="foodType" name="foodType" lay-filter="select_foodType">
-                        <option value=""></option>
-                        <option th:each="dic,dicSet:${listFoodType}"
-                                th:value="${dic.dictValue}" th:text="${dic.dictLabel}"></option>
-                    </select>
-                </div>
-            </div>
-        </div>
-
-        <div class="layui-col-xs4">
-            <div class="layui-form-item">
-                <label class="layui-form-label red">鍖栭獙缁撴灉</label>
-                <div class="layui-input-block">
-                    <select name="checkStatus" id="checkStatus">
-                        <option value="NONE">鏈寲楠�</option>
-                        <option value="PASS">鍚堟牸</option>
-                        <option value="UNPASS">涓嶅悎鏍�</option>
-                    </select>
+                    <input id="perImpurity" type="text" name="perImpurity" autocomplete="off"
+                           placeholder="璇疯緭鍏�" class="layui-input weight"> <em
+                        class="kccz-data-dw">%</em>
                 </div>
             </div>
         </div>
@@ -503,62 +427,7 @@
                 </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;">澶囨敞璇存槑锛�1.缁撴灉鍒ゅ畾锛氱郴缁熸牴鎹悇鍖栭獙椤圭粨鏋滃垽瀹氾紝鏈�鍚庡寲楠岀粨鏋滈渶鎵嬪姩閫夋嫨纭锛�2.鏍哥畻瀹氫环锛氭牴鎹寲楠岄」閰嶇疆璁＄畻鐩稿叧澧炴墸浠凤紝鏈�鍚庡崟浠烽渶鎵嬪姩纭銆�</span>
-            </div>
-        </div>
-        <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>
-                </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>
     </form>
-
-    <!-- 鍖栭獙缁撴灉淇℃伅 -->
-    <table class="layui-table tableCheckItem" id="tableCheckItem"
-           lay-filter="tableCheckItem">
-        <colgroup>
-            <col width="10%">
-            <col width="10%">
-            <col width="10%">
-            <col width="10%">
-            <col width="10%">
-            <col width="10%">
-            <col width="10%">
-            <col width="10%">
-            <col width="10%">
-            <col width="">
-        </colgroup>
-        <thead>
-        <tr class="qyzj-table-tit">
-            <th>妫�楠岄」鐩�</th>
-            <th>妫�楠屽��</th>
-            <th>鏍囧噯鍊�</th>
-            <th>鍗曚綅</th>
-            <th>鎵ｉ噸</th>
-            <th>澧為噸</th>
-            <th>鎵ｄ环</th>
-            <th>澧炰环</th>
-            <th>妫�楠岀粨鏋�</th>
-            <th>澶囨敞</th>
-        </tr>
-        </thead>
-        <tbody>
-        </tbody>
-    </table>
-
 </div>
 
 <!-- 寮瑰嚭妗嗙殑淇℃伅 -->
@@ -584,10 +453,6 @@
         <tr>
             <td>涓嬩竴姝�</td>
             <td id="resultType" style="font-weight: bold;"></td>
-        </tr>
-        <tr>
-            <td>鏅烘収鍗″彿</td>
-            <td id="resultIntelCard" style="font-weight: bold;"></td>
         </tr>
         </tbody>
     </table>

--
Gitblit v1.9.3