From 52ea5fd92596267379be7924deb27de6cb10632b Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期四, 04 十二月 2025 20:33:46 +0800
Subject: [PATCH] 称重及值仓页面及逻辑

---
 fzzy-igdss-web/src/main/resources/templates/inout/weight.html |  143 ++++++++++++++++++++++++++++++-----------------
 1 files changed, 92 insertions(+), 51 deletions(-)

diff --git a/fzzy-igdss-web/src/main/resources/templates/inout/weight.html b/fzzy-igdss-web/src/main/resources/templates/inout/weight.html
index aaa13c5..abbfe16 100644
--- a/fzzy-igdss-web/src/main/resources/templates/inout/weight.html
+++ b/fzzy-igdss-web/src/main/resources/templates/inout/weight.html
@@ -7,7 +7,7 @@
     <meta name="renderer" content="webkit">
     <title>鍑哄叆搴撶鐞�-鍏ュ簱绉伴噸</title>
 
-    <link rel="stylesheet" type="text/css" th:href="@{/ajax/libs/layui-ruoyi/css/layui.css}"/>
+    <link rel="stylesheet" type="text/css" th:href="@{/ajax/libs/layui/css/layui.css}"/>
     <link rel="stylesheet" type="text/css" th:href="@{/inout/inout-style.css}">
 
     <!--浣跨敤鎵撳嵃鎻掍欢 闅愯棌褰撳墠鎻掍欢 -->
@@ -17,9 +17,11 @@
         .kccz-r-btnbox {
             width: 86px !important;
         }
+
         .layui-table-body {
             max-height: 400px;
         }
+
         .kccz-r-btn {
             width: 86px !important;
         }
@@ -120,11 +122,7 @@
         }
 
         .rkbk-search-input {
-            background: #FFF !important;
-        }
-
-        .rkbk-search-input.bg-date {
-            background: #FFF !important;
+            background: #e7eaec !important;
         }
 
         #scaleName {
@@ -218,41 +216,67 @@
             </div>
             <!-- 娴佺▼寮曞 -->
             <div class="rk-step-wrap fr">
-                <ul class="rk-step">
-                    <li id="progress-register" class="active rk-step-first">
+                <ul class="rk-step" id="rk_progress" style="display: none;">
+                    <li id="rk-progress-register" class="rk-step-first">
+                        <span class="rk-step-span">
+                            <img th:src="@{/img/web/inout/icon-dengji.png}"/>
+						</span>
+                        <p>鍏ュ簱鐧昏</p>
+                    </li>
+                    <li id="rk-progress-fullWeight">
+                        <span class="rk-step-span">
+                            <img th:src="@{/img/web/inout/icon-chengzhong.png}"/>
+						</span>
+                        <p>婊¤溅绉伴噸</p>
+                    </li>
+                    <li id="rk-progress-hand">
+                        <span class="rk-step-span">
+                            <img th:src="@{/img/web/inout/icon-xiehuo.png}"/>
+						</span>
+                        <p>鍏ュ簱鍊间粨</p>
+                    </li>
+                    <li id="rk-progress-emptyWeight">
+                        <span class="rk-step-span">
+                            <img th:src="@{/img/web/inout/icon-chengzhong.png}"/>
+						</span>
+                        <p>绌鸿溅绉伴噸</p>
+                    </li>
+                    <li id="rk-progress-cardBack">
+                        <span class="rk-step-span">
+                            <img th:src="@{/img/web/inout/icon-banli.png}"/>
+						</span>
+                        <p>绂诲簱纭</p>
+                    </li>
+                </ul>
+                <ul class="rk-step" id="ck_progress" style="display: none;">
+                    <li id="ck-progress-register" class="rk-step-first">
                         <span class="rk-step-span">
                             <img th:src="@{/img/web/inout/icon-dengji.png}"/>
                         </span>
-                        <p>鍏ュ簱鐧昏</p>
+                        <p>鍑哄簱鐧昏</p>
                     </li>
-                    <li id="progress-check" class="active">
-                        <span class="rk-step-span">
-                            <img th:src="@{/img/web/inout/icon-zhijian.png}"/>
-                        </span>
-                        <p>鎵︽牱璐ㄦ</p>
-                    </li>
-                    <li id="progress-fullWeight" class="active">
-                        <span class="rk-step-span">
-                            <img th:src="@{/img/web/inout/icon-chengzhong.png}"/>
-                        </span>
-                        <p>婊¤溅绉伴噸</p>
-                    </li>
-                    <li id="progress-hand" class="">
-                        <span class="rk-step-span">
-                            <img th:src="@{/img/web/inout/icon-xiehuo.png}"/>
-                        </span>
-                        <p>鍏ュ簱鍊间粨</p>
-                    </li>
-                    <li id="progress-emptyWeight" class="">
+                    <li id="ck-progress-emptyWeight">
                         <span class="rk-step-span">
                             <img th:src="@{/img/web/inout/icon-chengzhong.png}"/>
                         </span>
                         <p>绌鸿溅绉伴噸</p>
                     </li>
-                    <li id="progress-cardBack">
+                    <li id="ck-progress-hand">
+                        <span class="rk-step-span">
+                            <img th:src="@{/img/web/inout/icon-xiehuo.png}"/>
+                        </span>
+                        <p>鍑哄簱鍊间粨</p>
+                    </li>
+                    <li id="ck-progress-fullWeight">
+                        <span class="rk-step-span">
+                            <img th:src="@{/img/web/inout/icon-chengzhong.png}"/>
+                        </span>
+                        <p>婊¤溅绉伴噸</p>
+                    </li>
+                    <li id="ck-progress-cardBack">
                         <span class="rk-step-span">
                             <img th:src="@{/img/web/inout/icon-banli.png}"/>
-                        </span>
+						</span>
                         <p>绂诲簱纭</p>
                     </li>
                 </ul>
@@ -311,24 +335,40 @@
                         <form class="layui-form" action="" id="form-data"
                               lay-filter="form-data">
                             <div class="layui-form-item display-none">
-                                <input type="text" name="id">
+                                <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 class="layui-form-item display-none">
-                                <input type="text" name="progress">
+                                <label class="layui-form-label">闅愯棌-娴佺▼鑺傜偣</label>
+                                <div class="layui-input-block">
+                                    <input type="text" name="progress" autocomplete="off"
+                                           class="layui-input rkbk-search-input">
+                                </div>
                             </div>
                             <div class="layui-form-item display-none">
-                                <input type="text" name="type">
+                                <label class="layui-form-label">闅愯棌-閫氱煡鍗曞彿</label>
+                                <div class="layui-input-block">
+                                    <input type="text" name="noticeId" autocomplete="off"
+                                           class="layui-input rkbk-search-input">
+                                </div>
                             </div>
                             <div class="layui-form-item display-none">
-                                <input type="text" name="foodLocationId">
+                                <label class="layui-form-label">闅愯棌-浜у湴</label>
+                                <div class="layui-input-block">
+                                    <input type="text" name="foodLocationId"
+                                           autocomplete="off" class="layui-input rkbk-search-input">
+                                </div>
                             </div>
                             <div class="layui-form-item display-none">
-                                <input type="text" name="noticeId">
+                                <label class="layui-form-label">闅愯棌-绫诲瀷</label>
+                                <div class="layui-input-block">
+                                    <input type="text" name="type" th:value="${type}"
+                                           autocomplete="off" class="layui-input rkbk-search-input">
+                                </div>
                             </div>
-                            <div class="layui-form-item display-none">
-                                <input type="text" name="foodType">
-                            </div>
-
                             <div class="layui-col-xs4">
                                 <div class="layui-form-item">
                                     <label class="layui-form-label  color-red" id="depotIdLabel">瑁呭嵏浠撳簱</label>
@@ -409,7 +449,7 @@
                             </div>
                             <div class="layui-col-xs4">
                                 <div class="layui-form-item">
-                                    <label class="layui-form-label">姘村垎</label>
+                                    <label class="layui-form-label">姘�&nbsp;&nbsp;&nbsp;&nbsp;鍒�</label>
                                     <div class="layui-input-block">
                                         <input id="perWet" type="text" name="perWet" autocomplete="off"
                                                placeholder="璇疯緭鍏�" class="layui-input weight"> <em
@@ -419,7 +459,7 @@
                             </div>
                             <div class="layui-col-xs4">
                                 <div class="layui-form-item">
-                                    <label class="layui-form-label">鎵i噸</label>
+                                    <label class="layui-form-label">鎵�&nbsp;&nbsp;&nbsp;&nbsp;閲�</label>
                                     <div class="layui-input-block">
                                         <input id="deOther" type="text" name="deOther" autocomplete="off"
                                                placeholder="璇疯緭鍏�" class="layui-input weight"> <em
@@ -429,7 +469,7 @@
                             </div>
                             <div class="layui-col-xs4">
                                 <div class="layui-form-item">
-                                    <label class="layui-form-label">鍗曚环</label>
+                                    <label class="layui-form-label">鍗�&nbsp;&nbsp;&nbsp;&nbsp;浠�</label>
                                     <div class="layui-input-block">
                                         <input id="price" type="text" name="price" autocomplete="off"
                                                placeholder="璇疯緭鍏�" class="layui-input weight"> <em
@@ -439,7 +479,7 @@
                             </div>
                             <div class="layui-col-xs4">
                                 <div class="layui-form-item">
-                                    <label class="layui-form-label">鏉傝川</label>
+                                    <label class="layui-form-label">鏉�&nbsp;&nbsp;&nbsp;&nbsp;璐�</label>
                                     <div class="layui-input-block">
                                         <input id="perImpurity" type="text" name="perImpurity" autocomplete="off"
                                                placeholder="璇疯緭鍏�" class="layui-input weight"> <em
@@ -451,7 +491,7 @@
                                 <div class="layui-form-item">
                                     <label class="layui-form-label">鍏ュ簱閲嶉噺</label>
                                     <div class="layui-input-block">
-                                        <input type="text" name="recordWeight" placeholder="鑷姩璁$畻"
+                                        <input type="text" name="recordWeight" placeholder="鑷姩璁$畻锛屼笉鍙紪杈�"
                                                autocomplete="off" class="layui-input rkbk-search-input"
                                                disabled> <em class="kccz-data-dw">KG</em>
                                     </div>
@@ -470,7 +510,7 @@
                                 <div class="layui-form-item">
                                     <label class="layui-form-label">缁撶畻閲嶉噺</label>
                                     <div class="layui-input-block">
-                                        <input type="text" name="settleWeight" placeholder="鑷姩璁$畻"
+                                        <input type="text" name="settleWeight" placeholder="鑷姩璁$畻锛屼笉鍙紪杈�"
                                                autocomplete="off" class="layui-input rkbk-search-input"
                                                disabled> <em class="kccz-data-dw">KG</em>
                                     </div>
@@ -487,17 +527,18 @@
                             </div>
                             <div class="layui-col-xs12">
                                 <div style="height: 40px">
-                                    <input type="button" value="璇昏韩浠借瘉" style="height: 34px;line-height: 34px;right: 120px;"
+                                    <input type="button" value="璇昏韩浠借瘉"
+                                           style="height: 34px;line-height: 34px;right: 120px;"
                                            class="rkbk-search-btn layui-btn" onclick="flushIdCard()">
                                     <input type="button" value="璇昏溅鐗�" style="height: 34px;line-height: 34px"
-                                           class="rkbk-search-btn layui-btn" onclick="flushData(null,null)">
+                                           class="rkbk-search-btn layui-btn" onclick="flushPlateNum()">
                                 </div>
                             </div>
                             <div class="layui-col-xs4">
                                 <div class="layui-form-item">
                                     <label class="layui-form-label color-red">鎵胯繍浜�</label>
                                     <div class="layui-input-block">
-                                        <input type="text" name="userName1" placeholder="璇疯緭鍏�" class="layui-input">
+                                        <input type="text" name="userName" placeholder="璇疯緭鍏�" class="layui-input">
                                     </div>
                                 </div>
                             </div>
@@ -505,7 +546,7 @@
                                 <div class="layui-form-item">
                                     <label class="layui-form-label color-red">韬唤璇佸彿</label>
                                     <div class="layui-input-block">
-                                        <input type="text" name="userId1" id="userId1" placeholder="璇疯緭鍏�"
+                                        <input type="text" name="userId" id="userId" placeholder="璇疯緭鍏�"
                                                autocomplete="off" class="layui-input">
                                     </div>
                                 </div>
@@ -514,7 +555,7 @@
                                 <div class="layui-form-item">
                                     <label class="layui-form-label color-red">杞︾墝鍙�</label>
                                     <div class="layui-input-block">
-                                        <input type="text" name="plateNum1" id="plateNum1" placeholder="璇疯緭鍏�"
+                                        <input type="text" name="plateNum" id="plateNum" placeholder="璇疯緭鍏�"
                                                autocomplete="off" class="layui-input">
                                     </div>
                                 </div>
@@ -641,7 +682,7 @@
 
 </script>
 
-<script th:src="@{/ajax/libs/layui-ruoyi/layui.js}"></script>
+<script th:src="@{/ajax/libs/layui/layui.js}"></script>
 <script th:src="@{/js/jquery.min.js}"></script>
 <script th:src="@{/common/constant.js}"></script>
 <script th:src="@{/common/igds-common.js}"></script>

--
Gitblit v1.9.3