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/weight2.html | 195 +++++++++++++++++++++++++++++++-----------------
1 files changed, 124 insertions(+), 71 deletions(-)
diff --git a/fzzy-igdss-web/src/main/resources/templates/inout/weight2.html b/fzzy-igdss-web/src/main/resources/templates/inout/weight2.html
index 3480c78..4813f3e 100644
--- a/fzzy-igdss-web/src/main/resources/templates/inout/weight2.html
+++ b/fzzy-igdss-web/src/main/resources/templates/inout/weight2.html
@@ -8,7 +8,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}">
<!--浣跨敤鎵撳嵃鎻掍欢 闅愯棌褰撳墠鎻掍欢 -->
@@ -113,13 +113,13 @@
}
.rkbk-search-input {
- background: #FFFFFF;
+ background: #e7eaec !important;
}
.kccz-left-box1 {
padding: 1px 20px 10px 20px;
}
.kccz-left-box2 {
- height: 512px;
+ height: 520px;
}
.text-info{
margin: 0 0 20px 0;
@@ -312,8 +312,33 @@
</div>
<!--l-container end-->
+<script th:inline="javascript">
+ //娴佺▼鐜妭
+ var inoutProgress = [[${inoutProgress}]];
+ var progress = [[${progress}]];
+ var deptId = [[${deptId}]];
+ var listDepot = [[${listDepot}]];
+ var weightEditTag = [[${weightEditTag}]];
+ var listFoodVariety = [[${listFoodVariety}]];
+ //userId
+ var userId = [[${loginUser.loginName}]];
+ //鍑哄叆搴撶被鍨�
+ var type = [[${type}]];
+ var companyId = [[${loginUser.companyId}]];
-<script th:src="@{/ajax/libs/layui-ruoyi/layui.js}"></script>
+ //鍦扮淇℃伅
+ var weightDto = [[${weightDto}]];
+
+ //杩囩▼鎽勫儚澶�
+ var snapDto1 = [[${snapDto1}]];
+ var snapDto2 = [[${snapDto2}]];
+ var snapDto3 = [[${snapDto3}]];
+ //榛樿鏌ヨ鏃堕棿
+ var startTime = [[${startTime}]];
+ var endTime = [[${endTime}]];
+</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>
@@ -322,36 +347,6 @@
<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;">
@@ -427,30 +422,68 @@
</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">
+ <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-fullWeight">
+ <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="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="progress-hand" class="">
+ <li id="ck-progress-cardBack">
<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>
+ <img th:src="@{/img/web/inout/icon-banli.png}"/>
+ </span>
+ <p>绂诲簱纭</p>
</li>
</ul>
</div>
@@ -507,24 +540,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>
@@ -605,7 +654,7 @@
</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 id="perWet" type="text" name="perWet" autocomplete="off"
placeholder="璇疯緭鍏�" class="layui-input weight"> <em
@@ -615,7 +664,7 @@
</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 id="deOther" type="text" name="deOther" autocomplete="off"
placeholder="璇疯緭鍏�" class="layui-input weight"> <em
@@ -625,7 +674,7 @@
</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 id="price" type="text" name="price" autocomplete="off"
placeholder="璇疯緭鍏�" class="layui-input weight"> <em
@@ -635,7 +684,7 @@
</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 id="perImpurity" type="text" name="perImpurity" autocomplete="off"
placeholder="璇疯緭鍏�" class="layui-input weight"> <em
@@ -647,7 +696,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>
@@ -666,7 +715,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>
@@ -683,17 +732,19 @@
</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"
+ <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)">
+ <input type="button" value="璇昏溅鐗�"
+ style="height: 34px;line-height: 34px;width: 100px;"
+ 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>
@@ -701,7 +752,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>
@@ -710,7 +761,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>
@@ -734,9 +785,11 @@
</div>
</div>
- <div class="layui-col-xs8" style="padding-left: 50px;color: #2ab5ad;margin-top: -5px">
+ <div class="layui-col-xs8" style="padding-left: 50px;color: #2ab5ad;">
璇存槑锛�
- <span style="color: #2ab5ad;">1. 鍑�閲�=姣涢噸-鐨噸锛涘叆搴撻噸閲�=缁撶畻閲嶉噺=鍑�閲�-鎵ｉ噸锛�</span>
+ <span style="color: #2ab5ad;">
+ 1. 鍑�閲�=姣涢噸-鐨噸锛涘叆搴撻噸閲�=缁撶畻閲嶉噺=鍑�閲�-鎵ｉ噸锛�
+ </span>
</div>
</form>
</div>
--
Gitblit v1.9.3