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/weight2.html |  883 +++++++++++++++++++++++++++++-----------------------------
 1 files changed, 447 insertions(+), 436 deletions(-)

diff --git a/fzzy-igdss-web/src/main/resources/templates/inout/inout-register.html b/fzzy-igdss-web/src/main/resources/templates/inout/weight2.html
similarity index 69%
rename from fzzy-igdss-web/src/main/resources/templates/inout/inout-register.html
rename to fzzy-igdss-web/src/main/resources/templates/inout/weight2.html
index e479495..3480c78 100644
--- a/fzzy-igdss-web/src/main/resources/templates/inout/inout-register.html
+++ b/fzzy-igdss-web/src/main/resources/templates/inout/weight2.html
@@ -2,61 +2,67 @@
 <html lang="zh-cn" xmlns:th=http://www.thymeleaf.org>
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <meta name="viewport"
+          content="width=device-width, initial-scale=1, maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="renderer" content="webkit">
-    <title>鍑哄叆搴撶鐞�-鍏ュ簱绉伴噸</title>
+    <title>鍑哄叆搴撶鐞�-鍑哄簱绠�鏄撴搷浣�</title>
 
-    <link rel="stylesheet" type="text/css" th:href="@{/ajax/libs/layui/css/layui.css}"/>
+    <link rel="stylesheet" type="text/css" th:href="@{/ajax/libs/layui-ruoyi/css/layui.css}"/>
     <link rel="stylesheet" type="text/css" th:href="@{/inout/inout-style.css}">
 
     <!--浣跨敤鎵撳嵃鎻掍欢 闅愯棌褰撳墠鎻掍欢 -->
     <script th:src="@{/js/plugins/lodop/LodopFuncs.js}"></script>
-
-    <style>
-        .kccz-r-btnbox {
-            width: 86px !important;
+    <style type="text/css">
+        .qyzj-tabBox {
+            margin-top: 0px !important;
+            overflow: hidden;
+            width: 100%;
         }
 
-        .kccz-r-btn {
-            width: 86px !important;
+        .layui-table, .layui-table-view {
+            margin: 0;
         }
 
-        #text-param {
-            font-size: 14px;
-            color: red;
-            padding-left: 10px;
+        #layui-table-page1 {
+            text-align: right !important;
         }
 
         .display-none {
             display: none;
         }
-
-        .cursor {
-            cursor: pointer;
+        #scaleName {
+            width: 130px;
+            height: 28px;
+        }
+        .control-btn {
+            height: 28px;
+            line-height: 28px;
+            background-color: #f67d06;
         }
 
-        .kccz-czxx-dl dt {
-            width: 25px;
-            height: 24px;
-            color: #000;
-            font-size: 18px;
-        }
-
-        .kccz-left-box2 {
-            height: 400px;
-        }
-
-        .color-red {
-            color: red !important;
-        }
-
-        .layui-table td {
+        .tip-red {
+            text-align: right;
+            padding-left: 40px;
+            font-size: 16px;
+            color: red;
             font-weight: bold;
+        }
+
+        thead span {
+            font-weight: bold
+        }
+
+        .red-color {
+            color: red;
         }
 
         .layui-select-disabled .layui-disabled {
             color: #000 !important;
+        }
+
+        .layui-table td {
+            font-weight: bold;
         }
 
         .depot-food input {
@@ -67,188 +73,393 @@
             background: #eff4f6;
         }
 
-        .rk-step-wrap {
-            padding: 0px;
-            border-bottom: 0px;
-            text-align: center;
+        .rk-main {
+            margin: 0 16px;
         }
 
-        .rkbk-quick {
-            margin-top: 15px !important;
+        .qyzj-con {
+            margin-top: 0;
+            padding: 15px;
+            background: #dee6ec;
         }
 
         .kccz-con {
-            margin: 10px 0px;
+            margin: 16px 0;
         }
 
-        .border-no {
-            border: 0px;
+        .kccz-r-item {
+            height: 265px;
         }
 
-        .qyzj-btnbox {
-            margin-top: 10px;
-        }
-
-        .kccz-data-btnbox {
-            min-height: 38px;
-            padding-top: 2px;
-        }
-
-        .layui-layer-title {
-            font-weight: bold;
-        }
-
-        .rkbk-search-btn {
-            width: 100px;
-            height: 30px;
-            line-height: 30px;
-            font-size: 16px;
-        }
-        .r-360 {
-            right: 360px;
-        }
-        .r-240 {
-            right: 240px;
-        }
-        .r-120 {
-            right: 120px;
-        }
-        .rkbk-search-input {
-            background: #FFF !important;
-        }
-
-        .rkbk-search-input.bg-date {
-            background: #FFF !important;
-        }
-
-        #scaleName {
-            width: 130px;
-            height: 28px;
-        }
-        .layui-table, .layui-table-view {
-            margin: 0 0;
-        }
-        .layui-table-body {
-            max-height: 350px;
-        }
-        .video {
-            width: 100%;
-            height: 100%;
-        }
-        .layui-form-radio {
-            margin: unset;
-            margin-top: 5px;
+        .kccz-r-con {
+            height: unset;
             padding-right: unset;
         }
-        .rk-step li {
-            width: 60px;
-            height: 40px;
-            display: inline-block;
-            margin: 0 20px;
-            position: relative;
+
+        .kccz-r-vedio {
+            height: 215px;
         }
 
-        .kccz-r-box .rkbk-tit {
-            margin: 6px 0;
-            float: left;
-            width: 5%;
-            height: 100%;
-            text-align: center;
-            margin-left: 6px;
+        .layui-flow-more a *, .layui-laypage input, .layui-table-view select[lay-ignore] {
+            display: none;
         }
-        .kccz-r-con {
-            height: 215px;
-            position: relative;
-            float: right;
-            width: 90%;
-            margin: 10px 0;
+
+        .layui-laypage .layui-laypage-skip {
+            display: none;
         }
-        .kccz-r-vedio {
-            width: 100%;
-            height: 100%;
-            background: #dee6ec;
+
+        .color-red {
+            color: red !important;
         }
-        .kccz-r-item {
-            height: 235px;
+
+        .rkbk-search-input {
+            background: #FFFFFF;
+        }
+        .kccz-left-box1 {
+            padding: 1px 20px 10px 20px;
+        }
+        .kccz-left-box2 {
+            height: 512px;
+        }
+        .text-info{
+            margin: 0 0 20px 0;
         }
     </style>
 
 </head>
 
 <body>
-
 <div class="l-container layui-clear">
     <div class="rk-main">
         <div class="kccz-con">
-            <div class="kccz-left fl">
-                <div class="kccz-left-box1 radius-6">
-                    <div class="rkbk-tit">
-                        <i></i>
-                        <div>
-                            <h3 style="width: 150px; float: left;">鐧昏淇℃伅</h3>
-                            <div style="float: right;margin-top: -5px">
-                                <button class="rkbk-quick-btn layui-btn btn-blue" onclick="weight()">
-                                    <i><img th:src="@{/img/web/inout/icon-hyd.png}"/></i>姝ラ1锛氳溅鐗岃瘑鍒�
-                                </button>
-                                <button class="rkbk-quick-btn layui-btn btn-green" onclick="submit()">
-                                    <i><img th:src="@{/img/web/inout/icon-ok.png}"/></i>姝ラ2锛氱櫥璁版彁浜�
-                                </button>
+            <div class="kccz-left fl" style="width: 76%;">
+                <div class="qyzj-con radius-6">
+                    <div class="qyzj-con-top layui-row" style="margin-top: 5px;">
+                        <form class="layui-form" action="" id="form-param"
+                              lay-filter="form-param">
+
+                            <div class="layui-form-item display-none">
+                                <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>
-                    </div>
-                    <div class="kccz-data-form layui-row">
-                        <form class="layui-form" action="" id="form-data-regster"
-                              lay-filter="form-data-regster">
+                            <div class="layui-form-item display-none">
+                                <label class="layui-form-label">闅愯棌-搴撳尯缂栫爜</label>
+                                <div class="layui-input-block">
+                                    <input type="text" name="deptId" th:value="${deptId}"
+                                           autocomplete="off" class="layui-input rkbk-search-input">
+                                </div>
+                            </div>
                             <div class="layui-col-xs4">
                                 <div class="layui-form-item">
-                                    <label class="layui-form-label color-red">鎵胯繍浜�</label>
+                                    <label class="layui-form-label">鍗曟嵁鍙�</label>
                                     <div class="layui-input-block">
-                                        <input type="text" name="userName1" placeholder="璇疯緭鍏�" class="layui-input">
+                                        <input type="text" name="checkId" placeholder="璇疯緭鍏�"
+                                               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="userId1" id="userId1" placeholder="璇疯緭鍏�"
-                                               autocomplete="off" class="layui-input">
+                                    <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-xs4">
                                 <div class="layui-form-item">
-                                    <label class="layui-form-label color-red">杞︾墝鍙�</label>
+                                    <label class="layui-form-label">寰�鏉ュ崟浣�</label>
                                     <div class="layui-input-block">
-                                        <input type="text" name="plateNum1" id="plateNum1" placeholder="璇疯緭鍏�"
-                                               autocomplete="off" class="layui-input">
+                                        <input type="text" name="customerName" placeholder="璇疯緭鍏�"
+                                               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>
+                                    <label class="layui-form-label">寮�濮嬫椂闂�</label>
                                     <div class="layui-input-block">
-                                        <input type="text" name="userContact" id="userContact" placeholder="璇疯緭鍏�"
-                                               autocomplete="off" class="layui-input">
+                                        <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-xs8">
+                            <div class="layui-col-xs4">
                                 <div class="layui-form-item">
-                                    <label class="layui-form-label">鍦�&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;鍧�</label>
+                                    <label class="layui-form-label">缁撴潫鏃堕棿</label>
                                     <div class="layui-input-block">
-                                        <input type="text" name="userAddress" id="userAddress" placeholder="璇疯緭鍏�"
-                                               autocomplete="off" class="layui-input">
+                                        <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-xs4 layui-text-right">
+                                <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" 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()"/>
+                                <input type="button" style="border-radius: 50px;background-color: #1ab394 !important;width: 94px;height: 32px;line-height: 32px;font-size: 14px;" value="鐧昏" class="qyzj-top-btn layui-btn btn-group" onclick="quickRegister()"/>
+                            </div>
+
                         </form>
                     </div>
-                    <!--kccz-czxx-wrap end-->
+                    <!--qyzj-con-oop end-->
+
+                    <div class="qyzj-tabBox">
+                        <table class="layui-table" lay-skin="nob" id="tableData"
+                               lay-filter="tableData">
+                            <colgroup>
+                                <col width="10%">
+                                <col width="10%">
+                                <col width="10%">
+                                <col width="10%">
+                                <col width="10%">
+                                <col width="10%">
+                                <col width="">
+                                <col width="15%">
+                            </colgroup>
+                            <thead>
+                            <tr class="qyzj-table-tit">
+                                <th>鍗曟嵁鍙�</th>
+                                <th>杞︾墝鍙�</th>
+                                <th>绫诲瀷</th>
+                                <th>寰�鏉ュ崟浣�</th>
+                                <th>瑁呭嵏浠撳簱</th>
+                                <th>绮鍝佺</th>
+                                <th>娴佺▼杩涘害</th>
+                                <th>鎿嶄綔</th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            </tbody>
+                        </table>
+
+                    </div>
+                    <!--qyzj-tabBox end-->
+
+                    <!--qyzj-page-wrap end-->
 
                 </div>
-                <div class="kccz-left-box1 radius-6" style="margin-top: 10px">
+                <!--qyzj-con end-->
+            </div>
+
+            <!--kccz-left end-->
+            <div class="kccz-right fr" style=" width: 23%;">
+                <div class="kccz-r-item radius-6">
+                    <div class="kccz-r-box">
+                        <div class="rkbk-tit">
+                            <i></i>
+                            <h3>杩囩▼鎶撴媿瑙嗛1</h3>
+                        </div>
+                        <div class="kccz-r-con">
+                            <div class="kccz-r-vedio" id="kccz-r-video1">
+
+                            </div>
+                        </div>
+
+                    </div>
+
+                </div>
+                <!--kccz-r-item end-->
+
+                <div class="kccz-r-item radius-6 mt-10">
+                    <div class="kccz-r-box">
+                        <div class="rkbk-tit">
+                            <i></i>
+                            <h3>杩囩▼鎶撴媿瑙嗛2</h3>
+                        </div>
+                        <div class="kccz-r-con">
+                            <div class="kccz-r-vedio" id="kccz-r-video2">
+
+                            </div>
+                        </div>
+
+                    </div>
+
+                </div>
+                <!--kccz-r-item end-->
+
+                <div class="kccz-r-item radius-6 mt-10">
+                    <div class="kccz-r-box">
+                        <div class="rkbk-tit">
+                            <i></i>
+                            <h3>杩囩▼鎶撴媿瑙嗛3</h3>
+                        </div>
+                        <div class="kccz-r-con">
+                            <div class="kccz-r-vedio" id="kccz-r-video3">
+
+                            </div>
+                        </div>
+
+                    </div>
+
+                </div>
+                <!--kccz-r-item end-->
+
+            </div>
+        </div>
+        <!--kccz-con end-->
+
+    </div>
+    <!--rk-main end-->
+
+</div>
+<!--l-container end-->
+
+<script th:src="@{/ajax/libs/layui-ruoyi/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>
+<script th:src="@{/inout/inout-common.js}"></script>
+<script th:src="@{/inout/inout-print.js}"></script>
+<script th:src="@{/inout/video-play.js}"></script>
+<script th:src="@{/inout/weight.js}"></script>
+<script th:src="@{/inout/inout-weight2.js}"></script>
+
+<script th:inline="javascript">
+    //娴佺▼鐜妭
+    var inoutProgress = [[${inoutProgress}]];
+    //搴撳尯缂栫爜
+    var deptId = [[${deptId}]];
+    //浠撳簱鍒楄〃
+    var listDepot = [[${listDepot}]];
+    //涓氬姟姝ラ
+    var bizType = [[${bizType}]];
+    //userId
+    var userId = [[${loginUser.loginName}]];
+    //鍑哄叆搴撶被鍨�
+    var type = [[${type}]];
+    var companyId = [[${loginUser.companyId}]];
+    //鍝佺
+    var listFoodVariety = [[${listFoodVariety}]];
+    //褰撳墠娴佺▼
+    var progress = [[${progress}]];
+    //鍦扮淇℃伅
+    var weightDto = [[${weightDto}]];
+
+    //鎶撴媿鎽勫儚鏈�
+    var snapDto1 = [[${snapDto1}]];
+    var snapDto2 = [[${snapDto2}]];
+    var snapDto3 = [[${snapDto3}]];
+    //榛樿鏌ヨ鏃堕棿
+    var startTime = [[${startTime}]];
+    var endTime = [[${endTime}]];
+</script>
+
+<!-- 寮瑰嚭閫氱煡鍗� -->
+<div class="layui-tab-content" id="listNotice" style="display: none;">
+    <table class="layui-table" lay-skin="nob" id="tableNotice"
+           lay-filter="tableNotice" style="margin: 0px;"></table>
+</div>
+
+<!-- 寮瑰嚭绮浜у湴 -->
+<div class="layui-tab-content" id="listFoodLocation" style="display: none;">
+    <table class="layui-table" lay-skin="nob" id="tableFoodLoaction"
+           lay-filter="tableFoodLoaction" style="margin: 0px;"></table>
+</div>
+
+<!-- 寮瑰嚭妗嗙殑淇℃伅 -->
+<div class="layui-tab-content" id="dialog-from-notify" style="display: none;">
+    <table class="layui-table">
+        <colgroup>
+            <col>
+        </colgroup>
+        <tbody>
+        <tr>
+            <td>杩斿洖淇℃伅</td>
+            <td id="resultMsg" style="color: red;font-weight: bold;"></td>
+        </tr>
+        <tr>
+            <td>鎵胯繍浜�</td>
+            <td id="resultUserName" style="font-weight: bold;"></td>
+        </tr>
+        <tr>
+            <td>杞︾墝鍙�</td>
+            <td id="resultPlateNum" style="font-weight: bold;"></td>
+        </tr>
+        <tr>
+            <td>涓嬩竴姝�</td>
+            <td id="resultType" style="font-weight: bold;"></td>
+        </tr>
+        </tbody>
+    </table>
+</div>
+
+<script type="text/html" id="toolbarFoodLocaton">
+    <div class="">
+        <div class="layui-col-xs6">
+            <input type="text" id="key2" placeholder="杈撳叆缂栫爜鎴栬�呭悕绉扳�︹��" class="layui-input">
+        </div>
+        <div class="layui-col-xs6" style="padding-left: 10px;">
+            <button class="layui-btn layui-btn-sm" onclick="flushFoodLocation()">鏌ヨ</button>
+        </div>
+    </div>
+</script>
+
+<script type="text/html" id="barControl">
+    <a class="layui-btn control-btn" lay-event="edit">绉伴噸</a>
+</script>
+<!-- --------------绉伴噸鎿嶄綔寮圭獥-------------- -->
+<div class="layui-tab-content" id="weightDetail" style="display: none;padding: 10px 10px;">
+    <div class="rk-main" style="margin: 0;">
+        <div class="qyzj-btnbox layui-clear" style="margin-top: unset;">
+            <div class="rkbk-quick fl" style="line-height: 60px">
+                <button class="rkbk-quick-btn layui-btn btn-blue" onclick="weight()">
+                    <i><img th:src="@{/img/web/inout/icon-chengzhong.png}"/></i>姝ラ1锛氱О閲嶅強鎶撴媿
+                </button>
+                <button class="rkbk-quick-btn layui-btn btn-green" onclick="submit()">
+                    <i><img th:src="@{/img/web/inout/icon-ok.png}"/></i>姝ラ2锛氬畬鎴愮О閲�
+                </button>
+                <button class="rkbk-quick-btn layui-btn btn-blue" onclick="printBill()">
+                    <i><img th:src="@{/img/web/inout/icon-dayin.png}"/></i>鎵撳嵃杩囩鍗�
+                </button>
+                <button class="rkbk-quick-btn layui-btn btn-violet"
+                        onclick="flushPage()">
+                    <i><img th:src="@{/img/web/inout/icon-shuaxin2.png}"/></i>鍒锋柊椤甸潰
+                </button>
+            </div>
+            <!-- 娴佺▼寮曞 -->
+            <div class="rk-step-wrap fr" style="padding: unset;border-bottom: unset">
+                <ul class="rk-step">
+                    <li id="progress-register" class="active rk-step-first">
+                        <span class="rk-step-span">
+                            <img th:src="@{/img/web/inout/icon-dengji.png}"/>
+                        </span>
+                        <p>鍏ュ簱鐧昏</p>
+                    </li>
+                    <li id="progress-fullWeight">
+                        <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="">
+                        <span class="rk-step-span">
+                            <img th:src="@{/img/web/inout/icon-chengzhong.png}"/>
+                        </span>
+                        <p>绌鸿溅绉伴噸</p>
+                    </li>
+                </ul>
+            </div>
+            <!-- 娴佺▼寮曞EDN -->
+        </div>
+        <!--qyzj-btnbox end-->
+        <div class="kccz-con" style="margin: 5px 0 0 0">
+            <div class="kccz-left fl" style="width: 100%">
+                <div class="kccz-left-box1 radius-6">
                     <div class="rkbk-tit">
                         <i></i>
                         <div>
@@ -277,12 +488,10 @@
                             </div>
                         </div>
                     </div>
-
                     <div class="kccz-czxx-wrap">
                         <div class="kccz-czxx-num">
                             <span id="weightValue">0.00</span><em>KG</em>
                         </div>
-
                     </div>
                     <!--kccz-czxx-wrap end-->
 
@@ -292,25 +501,7 @@
                 <div class="kccz-left-box2 mt-10 radius-6">
                     <div class="rkbk-tit">
                         <i></i>
-                        <h3>绉伴噸鏁版嵁<span id="text-param"></span></h3>
-                        <div style="float: right;margin-top: -35px">
-                            <button class="rkbk-quick-btn layui-btn" onclick="selectByHand()">
-                                <i><img th:src="@{/img/web/inout/icon-hyd.png}"/></i>閫夋嫨杞﹁締绉伴噸
-                            </button>
-                            <button class="rkbk-quick-btn layui-btn btn-blue" onclick="weight()">
-                                <i><img th:src="@{/img/web/inout/icon-chengzhong.png}"/></i>姝ラ1锛氱О閲嶅強鎶撴媿
-                            </button>
-                            <button class="rkbk-quick-btn layui-btn btn-green" onclick="submit()">
-                                <i><img th:src="@{/img/web/inout/icon-ok.png}"/></i>姝ラ2锛氬畬鎴愮О閲�
-                            </button>
-                            <button class="rkbk-quick-btn layui-btn btn-blue" onclick="printBill()">
-                                <i><img th:src="@{/img/web/inout/icon-dayin.png}"/></i>姝ラ3锛氭墦鍗拌繃纾呭崟
-                            </button>
-                            <button class="rkbk-quick-btn layui-btn btn-violet"
-                                    onclick="flushPage()">
-                                <i><img th:src="@{/img/web/inout/icon-shuaxin2.png}"/></i>鍒锋柊椤甸潰
-                            </button>
-                        </div>
+                        <h3>涓氬姟鏁版嵁<span id="text-param"></span></h3>
                     </div>
                     <div class="kccz-data-form layui-row">
                         <form class="layui-form" action="" id="form-data"
@@ -336,20 +527,13 @@
 
                             <div class="layui-col-xs4">
                                 <div class="layui-form-item">
-                                    <label class="layui-form-label color-red">杞︾墝鍙�</label>
+                                    <label class="layui-form-label  color-red" id="depotIdLabel">瑁呭嵏浠撳簱</label>
                                     <div class="layui-input-block">
-                                        <input type="text" name="plateNum" id="plateNum" placeholder="鑷姩甯﹀叆"
-                                               autocomplete="off" class="layui-input">
-                                    </div>
-                                </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="customerName" placeholder="璇烽�夋嫨"
-                                               autocomplete="off" class="layui-input" disabled="disabled"> <em
-                                            class="kccz-data-dw cursor" onclick="showNotice()">鈥︹��</em>
+                                        <select name="depotId" id="depotId" lay-filter="select_depotId">
+                                            <option value=""></option>
+                                            <option th:each="depot,depotSet:${listDepot}"
+                                                    th:value="${depot.id}" th:text="${depot.name}"></option>
+                                        </select>
                                     </div>
                                 </div>
                             </div>
@@ -358,30 +542,10 @@
                                     <label class="layui-form-label color-red">姣涢噸(婊¤溅)</label>
                                     <div class="layui-input-block">
                                         <input type="text" name="fullWeight" id="fullWeight" autocomplete="off"
-                                               placeholder="鍦扮鑷姩甯﹀叆" class="layui-input rkbk-search-input" disabled>
+                                               placeholder="鍦扮鑷姩甯﹀叆" class="layui-input rkbk-search-input"
+                                               disabled>
                                         <em
                                                 class="kccz-data-dw">KG</em>
-                                    </div>
-                                </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="userName" placeholder="鑷姩甯﹀叆锛屼笉鍙紪杈�" class="layui-input"
-                                               disabled>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="layui-col-xs4">
-                                <div class="layui-form-item">
-                                    <label class="layui-form-label  color-red" id="depotIdLabel">瑁呭嵏浠撳簱</label>
-                                    <div class="layui-input-block">
-                                        <select name="depotId" id="depotId" lay-filter="select_depotId">
-                                            <option value=""></option>
-                                            <option th:each="depot,depotSet:${listDepot}"
-                                                    th:value="${depot.id}" th:text="${depot.name}"></option>
-                                        </select>
                                     </div>
                                 </div>
                             </div>
@@ -399,10 +563,11 @@
                             </div>
                             <div class="layui-col-xs4">
                                 <div class="layui-form-item">
-                                    <label class="layui-form-label">韬唤璇佸彿</label>
+                                    <label class="layui-form-label color-red">閫氱煡鍗�</label>
                                     <div class="layui-input-block">
-                                        <input type="text" name="userId" id="userId" placeholder="韬唤璇佸彿"
-                                               autocomplete="off" class="layui-input">
+                                        <input type="text" name="customerName" placeholder="璇烽�夋嫨"
+                                               autocomplete="off" class="layui-input" disabled="disabled"> <em
+                                            class="kccz-data-dw cursor" onclick="showNotice()">鈥︹��</em>
                                     </div>
                                 </div>
                             </div>
@@ -507,233 +672,79 @@
                                     </div>
                                 </div>
                             </div>
+
+                            <div class="layui-col-xs12">
+                                <div class="line-container" id="text-info">
+                                    <div class="line"></div>
+                                    <div class="line-text" style="font-size: 16px">浠ヤ笅涓虹櫥璁颁俊鎭�</div>
+                                    <div class="line"></div>
+                                </div>
+
+                            </div>
+                            <div class="layui-col-xs12">
+                                <div style="height: 40px" id="btn_register">
+                                    <input type="button" value="璇昏韩浠借瘉" style="height: 34px;line-height: 34px;right: 120px;width: 100px"
+                                           class="rkbk-search-btn layui-btn" onclick="flushIdCard()">
+                                    <input type="button" value="璇昏溅鐗�" style="height: 34px;line-height: 34px;width: 100px"
+                                           class="rkbk-search-btn layui-btn" onclick="flushData(null,null)">
+                                </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">
+                                    </div>
+                                </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="userId1" id="userId1" placeholder="璇疯緭鍏�"
+                                               autocomplete="off" class="layui-input">
+                                    </div>
+                                </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="plateNum1" id="plateNum1" placeholder="璇疯緭鍏�"
+                                               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="userContact" id="userContact" placeholder="璇疯緭鍏�"
+                                               autocomplete="off" class="layui-input">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="layui-col-xs8">
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">鍦�&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;鍧�</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" name="userAddress" id="userAddress" placeholder="璇疯緭鍏�"
+                                               autocomplete="off" class="layui-input">
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="layui-col-xs8" style="padding-left: 50px;color: #2ab5ad;margin-top: -5px">
+                                璇存槑锛�
+                                <span style="color: #2ab5ad;">1. 鍑�閲�=姣涢噸-鐨噸锛涘叆搴撻噸閲�=缁撶畻閲嶉噺=鍑�閲�-鎵i噸锛�</span>
+                            </div>
                         </form>
                     </div>
                 </div>
                 <!--kccz-left-box2 end-->
-
             </div>
-            <!--kccz-left end-->
-            <div class="kccz-right fr">
-                <ul class="rk-step" style="background-color: #FFFFFF;border-radius: 6px;margin-bottom: 10px;padding: 10px 0;">
-                    <li id="progress-register" class="active rk-step-first">
-                        <span class="rk-step-span">
-                            <img th:src="@{/img/web/inout/icon-dengji.png}"/>
-                        </span>
-                        <p>鍏ュ簱鐧昏</p>
-                    </li>
-                    <li id="progress-fullWeight">
-                        <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="">
-                        <span class="rk-step-span">
-                            <img th:src="@{/img/web/inout/icon-chengzhong.png}"/>
-                        </span>
-                        <p>绌鸿溅绉伴噸</p>
-                    </li>
-                </ul>
-                <div class="kccz-r-item radius-6">
-                    <div class="kccz-r-box">
-                        <div class="rkbk-tit">
-                            <i style="margin: 8px 3px 0 3px"></i>
-                            <h3>杞︾墝璇嗗埆瑙嗛</h3>
-                        </div>
-                        <div class="kccz-r-con">
-                            <div class="kccz-r-vedio" id="kccz-r-video1">
-                            </div>
-                        </div>
 
-                    </div>
-
-                </div>
-                <!--kccz-r-item end-->
-
-                <div class="kccz-r-item radius-6 mt-10">
-                    <div class="kccz-r-box">
-                        <div class="rkbk-tit">
-                            <i style="margin: 8px 3px 0 3px"></i>
-                            <h3>杞﹂《鎶撴媿瑙嗛</h3>
-                        </div>
-                        <div class="kccz-r-con">
-                            <div class="kccz-r-vedio" id="kccz-r-video2">
-
-
-                            </div>
-                        </div>
-
-                    </div>
-
-                </div>
-                <!--kccz-r-item end-->
-
-                <div class="kccz-r-item radius-6 mt-10">
-                    <div class="kccz-r-box">
-                        <div class="rkbk-tit">
-                            <i style="margin: 8px 3px 0 3px"></i>
-                            <h3>杞﹀熬鎶撴媿瑙嗛</h3>
-                        </div>
-                        <div class="kccz-r-con">
-                            <div class="kccz-r-vedio" id="kccz-r-video3">
-
-
-                            </div>
-                        </div>
-
-                    </div>
-
-                </div>
-                <!--kccz-r-item end-->
-
-            </div>
-        </div>
-        <!--kccz-con end-->
-
-    </div>
-    <!--rk-main end-->
-
-</div>
-<!--l-container end-->
-
-<script th:inline="javascript">
-    //娴佺▼鐜妭
-    var inoutProgress = [[${inoutProgress}]];
-    var progress = [[${progress}]];
-    var deptId = [[${deptId}]];
-    var listDepot = [[${listDepot}]];
-    var weightEditTag = [[${weightEditTag}]];
-    //userId
-    var userId = [[${loginUser.loginName}]];
-    //鍑哄叆搴撶被鍨�
-    var type = [[${type}]];
-    var companyId = [[${loginUser.companyId}]];
-
-    //鍦扮淇℃伅
-    var weightDto = [[${weightDto}]];
-
-    //杩囩▼鎽勫儚澶�
-    var snapDto1 = [[${snapDto1}]];
-    var snapDto2 = [[${snapDto2}]];
-    var snapDto3 = [[${snapDto3}]];
-
-</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>
-<script th:src="@{/inout/inout-common.js}"></script>
-<script th:src="@{/inout/inout-print.js}"></script>
-<script th:src="@{/inout/video-play.js}"></script>
-<script th:src="@{/inout/weight.js}"></script>
-<script th:src="@{/inout/inout-register.js}"></script>
-
-</body>
-
-<!-- 寮瑰嚭閫氱煡鍗� -->
-<div class="layui-tab-content" id="listNotice" style="display: none;">
-    <table class="layui-table" lay-skin="nob" id="tableNotice"
-           lay-filter="tableNotice" style="margin: 0px;"></table>
-</div>
-
-<!-- 寮瑰嚭绮浜у湴 -->
-<div class="layui-tab-content" id="listFoodLocation"
-     style="display: none;">
-    <table class="layui-table" lay-skin="nob" id="tableFoodLoaction"
-           lay-filter="tableFoodLoaction" style="margin: 0px;"></table>
-</div>
-
-<!-- 璐ㄦ淇℃伅 -->
-<div class="layui-tab-content" id="checkDetail" style="display: none;">
-    <!-- 鍖栭獙缁撴灉淇℃伅 -->
-    <table class="layui-table tableCheckItem" id="tableCheckItem"
-           lay-filter="tableCheckItem">
-        <colgroup><col><col><col><col><col><col><col><col><col><col>
-        </colgroup>
-        <thead>
-        <tr class="qyzj-table-tit">
-            <th>妫�楠岄」鐩�</th>
-            <th>妫�楠屽��</th>
-            <th>鏍囧噯鍊�</th>
-            <th>鍗曚綅</th>
-            <th>鎵i噸</th>
-            <th>澧為噸</th>
-            <th>鎵d环</th>
-            <th>澧炰环</th>
-            <th>妫�楠岀粨鏋�</th>
-            <th>澶囨敞</th>
-        </tr>
-        </thead>
-        <tbody>
-        </tbody>
-    </table>
-</div>
-<!-- 娴佺▼鏁版嵁淇℃伅 -->
-<div class="layui-tab-content" id="listProgressData" style="display: none;">
-    <table class="layui-table tableListProgressData" id="tableListProgressData"
-           lay-filter="tableListProgressData">
-        <thead>
-        <tr class="qyzj-table-tit">
-            <th>鍗曟嵁鍙�</th><th>鎵胯繍浜�</th><th>杞︾墝鍙�</th><th>鎿嶄綔</th>
-        </tr>
-        </thead>
-        <tbody>
-        </tbody>
-    </table>
-</div>
-
-<!-- 寮瑰嚭妗嗙殑淇℃伅 -->
-<div class="layui-tab-content" id="dialog-from-notify" style="display: none;">
-    <table class="layui-table">
-        <colgroup>
-            <col>
-        </colgroup>
-        <tbody>
-        <tr>
-            <td>杩斿洖淇℃伅</td>
-            <td id="resultMsg" style="color: red;font-weight: bold;"></td>
-        </tr>
-        <tr>
-            <td>鎵胯繍浜�</td>
-            <td id="resultUserName" style="font-weight: bold;"></td>
-        </tr>
-        <tr>
-            <td>杞︾墝鍙�</td>
-            <td id="resultPlateNum" style="font-weight: bold;"></td>
-        </tr>
-        <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>
-</div>
-
-<script type="text/html" id="toolbarFoodLocaton">
-    <div class="">
-        <div class="layui-col-xs6">
-            <input type="text" id="key2" placeholder="杈撳叆缂栫爜鎴栬�呭悕绉扳�︹��" class="layui-input">
-        </div>
-        <div class="layui-col-xs6" style="padding-left: 10px;">
-            <button class="layui-btn layui-btn-sm" onclick="flushFoodLocation()">鏌ヨ</button>
         </div>
     </div>
-</script>
-
-<script type="text/html" id="barSelectProgress">
-    <a class="layui-btn layui-btn-xs" lay-event="select">閫夋嫨绉伴噸</a>
-</script>
-
+</div>
 </html>
\ No newline at end of file

--
Gitblit v1.9.3