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/weight.html | 237 +++++++++++++++++++++++++++++++++++------------------------
1 files changed, 141 insertions(+), 96 deletions(-)
diff --git a/fzzy-igdss-web/src/main/resources/templates/inout/inout-weight.html b/fzzy-igdss-web/src/main/resources/templates/inout/weight.html
similarity index 83%
rename from fzzy-igdss-web/src/main/resources/templates/inout/inout-weight.html
rename to fzzy-igdss-web/src/main/resources/templates/inout/weight.html
index 35b8bca..aaa13c5 100644
--- a/fzzy-igdss-web/src/main/resources/templates/inout/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/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}">
<!--浣跨敤鎵撳嵃鎻掍欢 闅愯棌褰撳墠鎻掍欢 -->
@@ -17,7 +17,9 @@
.kccz-r-btnbox {
width: 86px !important;
}
-
+ .layui-table-body {
+ max-height: 400px;
+ }
.kccz-r-btn {
width: 86px !important;
}
@@ -44,7 +46,7 @@
}
.kccz-left-box2 {
- height: 555px;
+ height: 570px;
}
.color-red {
@@ -104,15 +106,19 @@
line-height: 30px;
font-size: 16px;
}
+
.r-360 {
right: 360px;
}
+
.r-240 {
right: 240px;
}
+
.r-120 {
right: 120px;
}
+
.rkbk-search-input {
background: #FFF !important;
}
@@ -125,20 +131,32 @@
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;
padding-right: unset;
+ }
+
+ .rk-step li {
+ width: 60px;
+ height: 40px;
+ display: inline-block;
+ margin: 0 20px;
+ position: relative;
}
.kccz-r-box .rkbk-tit {
@@ -149,22 +167,26 @@
text-align: center;
margin-left: 6px;
}
+
.kccz-r-con {
- height: 215px;
+ height: 222px;
position: relative;
float: right;
width: 90%;
margin: 10px 0;
}
+
.kccz-r-vedio {
width: 100%;
height: 100%;
background: #dee6ec;
}
+
.kccz-r-item {
- height: 235px;
+ height: 242px;
}
</style>
+
</head>
<body>
@@ -175,18 +197,22 @@
<div class="rkbk-quick fl">
<button class="rkbk-quick-btn layui-btn" onclick="selectByHand()">
- <i><img th:src="@{/img/web/inout/icon-hyd.png}"/></i>閫夋嫨杞﹁締绉伴噸
+ <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 id="btn-weight" 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()">
+ <button id="btn-submit"
+ 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 id="btn-printBill"
+ 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()">
+ <button class="rkbk-quick-btn layui-btn btn-violet"
+ onclick="flushPage()">
<i><img th:src="@{/img/web/inout/icon-shuaxin2.png}"/></i>鍒锋柊椤甸潰
</button>
</div>
@@ -198,6 +224,12 @@
<img th:src="@{/img/web/inout/icon-dengji.png}"/>
</span>
<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">
@@ -217,13 +249,16 @@
</span>
<p>绌鸿溅绉伴噸</p>
</li>
+ <li id="progress-cardBack">
+ <span class="rk-step-span">
+ <img th:src="@{/img/web/inout/icon-banli.png}"/>
+ </span>
+ <p>绂诲簱纭</p>
+ </li>
</ul>
</div>
<!-- 娴佺▼寮曞EDN -->
</div>
- <!--qyzj-btnbox end-->
-
-
<div class="kccz-con">
<div class="kccz-left fl">
<div class="kccz-left-box1 radius-6">
@@ -296,20 +331,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>
@@ -318,30 +346,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>
@@ -359,10 +367,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>
@@ -467,6 +476,78 @@
</div>
</div>
</div>
+
+ <div class="layui-col-xs12">
+ <div class="line-container" style="margin: 10px 0 0 0;">
+ <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">
+ <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)">
+ </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">鍦� 鍧�</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;">
+ 璇存槑锛�
+ <span style="color: #2ab5ad;">
+ 1. 鍑�閲�=姣涢噸-鐨噸锛涘叆搴撻噸閲�=缁撶畻閲嶉噺=鍑�閲�-鎵ｉ噸锛�
+ </span>
+ <br>
+ <span style="padding-left: 46px;color: #2ab5ad;">
+ 2. 娴佺▼涓溅杈嗗彲鐐瑰嚮杞﹁締閫夋嫨锛岃繘琛岀О閲嶏紱鏈櫥璁拌溅杈嗭紝鍙～鍐欑浉鍏充俊鎭紝鐩存帴绉伴噸锛�
+ </span>
+ </div>
</form>
</div>
</div>
@@ -537,23 +618,18 @@
</div>
<!--l-container end-->
-
<script th:inline="javascript">
//娴佺▼鐜妭
var inoutProgress = [[${inoutProgress}]];
var progress = [[${progress}]];
var deptId = [[${deptId}]];
var listDepot = [[${listDepot}]];
- //涓氬姟姝ラ
- var bizType = [[${bizType}]];
var weightEditTag = [[${weightEditTag}]];
//userId
var userId = [[${loginUser.loginName}]];
//鍑哄叆搴撶被鍨�
var type = [[${type}]];
var companyId = [[${loginUser.companyId}]];
- //鍝佺
- var listFoodVariety = [[${listFoodVariety}]];
//鍦扮淇℃伅
var weightDto = [[${weightDto}]];
@@ -562,14 +638,10 @@
var snapDto1 = [[${snapDto1}]];
var snapDto2 = [[${snapDto2}]];
var snapDto3 = [[${snapDto3}]];
- var gateDto = [[${gateDto}]];
- //鏅烘収鍗�
- var cardDto = [[${cardDto}]];
- var ship = null; //鏄惁鑸硅繍椤甸潰鏍囪瘑
</script>
-<script th:src="@{/ajax/libs/layui/layui.js}"></script>
+<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>
@@ -577,7 +649,7 @@
<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="@{/web/inout/inout-weight.js}"></script>
+<script th:src="@{/inout/inout-weight.js}"></script>
</body>
@@ -588,44 +660,21 @@
</div>
<!-- 寮瑰嚭绮浜у湴 -->
-<div class="layui-tab-content" id="listFoodLocation"
- style="display: none;">
+<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>鎵ｉ噸</th>
- <th>澧為噸</th>
- <th>鎵ｄ环</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>
+ <th>鍗曟嵁鍙�</th>
+ <th>鎵胯繍浜�</th>
+ <th>杞︾墝鍙�</th>
+ <th>鎿嶄綔</th>
</tr>
</thead>
<tbody>
@@ -655,10 +704,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