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/register.html | 100 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 71 insertions(+), 29 deletions(-)
diff --git a/fzzy-igdss-web/src/main/resources/templates/inout/out-register.html b/fzzy-igdss-web/src/main/resources/templates/inout/register.html
similarity index 73%
rename from fzzy-igdss-web/src/main/resources/templates/inout/out-register.html
rename to fzzy-igdss-web/src/main/resources/templates/inout/register.html
index 52ca228..c7224c2 100644
--- a/fzzy-igdss-web/src/main/resources/templates/inout/out-register.html
+++ b/fzzy-igdss-web/src/main/resources/templates/inout/register.html
@@ -7,8 +7,8 @@
<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="@{/inout/inout-style.css}">
+ <link rel="stylesheet" th:href="@{/ajax/libs/layui/css/layui.css}"/>
+ <link rel="stylesheet" th:href="@{/inout/inout-style.css}">
<style>
.display-none {
@@ -99,38 +99,71 @@
<!--娴佺▼寮曞-->
<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="active 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="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-emptyWeight">
+ <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-hand">
+ <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="progress-fullWeight">
+ <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="progress-cardBack">
+ <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>
+
</div>
<!--娴佺▼寮曞缁撴潫-->
</div>
@@ -150,12 +183,28 @@
<div class="rkbk-form-box1">
- <div class="layui-form-item display-none">
- <label class="layui-form-label">闅愯棌瀛楁-绫诲瀷</label>
- <input type="text" name="type" th:value="${type}">
- </div>
-
<div class="rkbk-form-left">
+ <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-form-item display-none">
+ <label class="layui-form-label">闅愯棌-缁勭粐缂栫爜</label>
+ <div class="layui-input-block">
+ <input type="text" name="companyId" th:value="${loginUser.companyId}"
+ 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-form-item">
<label class="layui-form-label color-red">濮� 鍚嶏細</label>
<div class="layui-input-block">
@@ -165,15 +214,15 @@
</div>
</div>
<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="userId" id="userId" required
- lay-verify="required" placeholder="蹇呭～淇℃伅" autocomplete="off"
+ lay-verify="required" placeholder="韬唤璇佸彿" autocomplete="off"
oninput="getPhone()" class="layui-input rkbk-search-input">
</div>
</div>
<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="userContact" id="userContact"
placeholder="璇疯緭鍏�" autocomplete="off"
@@ -224,9 +273,9 @@
<div class="layui-form-item">
<label class="layui-form-label color-red">涓氬姟绫诲瀷锛�</label>
<div class="layui-input-block">
- <select name="type">
- <option th:each="dic,dicSet:${listInoutType}"
- th:value="${dic.dictValue}" th:text="${dic.dictLabel}"></option>
+ <select name="type" id="type" lay-filter="select_type">
+ <option value="IN">鍏ュ簱</option>
+ <option value="OUT">鍑哄簱</option>
</select>
</div>
</div>
@@ -236,7 +285,7 @@
onclick="flushPlateNum()"/>
<label class="layui-form-label color-red">杩愯緭杞︾墝锛�</label>
<div class="layui-input-block">
- <input type="text" name="plateNum" id="plateNum" required placeholder="濉啓鍓嶈溅鐗屽彿"
+ <input type="text" name="plateNum" id="plateNum" required placeholder="濉啓杞︾墝鍙�"
lay-verify="required" autocomplete="off"
class="layui-input rkbk-search-input">
</div>
@@ -274,12 +323,9 @@
var deptId = [[${deptId}]];
//鍑哄叆搴撶被鍨�
var type = [[${type}]];
- var userId = [[${loginUser.loginName}]];
var companyId = [[${loginUser.companyId}]];
//杞︾墝璇嗗埆
var lprDto = [[${lprDto}]];
- var plateTag = [[${plateTag}]];
- var ship = null; //鏄惁鑸硅繍椤甸潰鏍囪瘑
</script>
<script th:src="@{/ajax/libs/layui/layui.js}"></script>
@@ -288,7 +334,7 @@
<script th:src="@{/common/igds-common.js}"></script>
<script th:src="@{/inout/inout-common.js}"></script>
<script th:src="@{/inout/video-play.js}"></script>
-<script th:src="@{/inout/out-register.js}"></script>
+<script th:src="@{/inout/register.js}"></script>
<!-- 寮瑰嚭妗嗙殑淇℃伅 -->
<div class="layui-tab-content" id="dialog-from-notify" style="display: none;">
@@ -312,10 +358,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