From 7f5ecaf7dbd07e218fbda575e45d8264a560a1e6 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 05 六月 2023 13:50:59 +0800
Subject: [PATCH] 出入库优化-称重页面逻辑优化完成
---
igds-web/src/main/resources/templates/admin/inout/in-weight.html | 331 ++++++++++++++++++++++++++++--------------------------
1 files changed, 170 insertions(+), 161 deletions(-)
diff --git a/igds-web/src/main/resources/templates/admin/inout/in-weight.html b/igds-web/src/main/resources/templates/admin/inout/in-weight.html
index 8da7613..7350385 100644
--- a/igds-web/src/main/resources/templates/admin/inout/in-weight.html
+++ b/igds-web/src/main/resources/templates/admin/inout/in-weight.html
@@ -7,16 +7,28 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="renderer" content="webkit">
<title>鍑哄叆搴撶鐞�-鍏ュ簱绉伴噸</title>
-
<link rel="stylesheet" type="text/css"
th:href="@{../../static/plugins/layui/css/layui.css?v=2.5.5}">
<link rel="stylesheet" type="text/css"
th:href="@{../../static/admin/inout/style.css}">
-
<!--浣跨敤鎵撳嵃鎻掍欢 闅愯棌褰撳墠鎻掍欢 -->
<script th:src="@{../../static/plugins/lodop/LodopFuncs.js}"></script>
<style>
+ .kccz-r-btnbox {
+ width: 86px !important;
+ }
+
+ .kccz-r-btn {
+ width: 86px !important;
+ }
+
+ #text-param {
+ font-size: 14px;
+ color: red;
+ padding-left: 10px;
+ }
+
.display-none {
display: none;
}
@@ -33,7 +45,7 @@
}
.kccz-left-box2 {
- height: 500px;
+ height: 555px;
}
.color-red {
@@ -126,25 +138,20 @@
<div class="qyzj-btnbox layui-clear">
<div class="rkbk-quick fl">
- <button class="rkbk-quick-btn layui-btn" onclick="showCheck()">
- <i><img th:src="@{../../static/images/icon-hyd.png}"/></i>鍖栭獙鍗�
- </button>
<button id="btn-weight" class="rkbk-quick-btn layui-btn btn-blue"
onclick="weight()">
- <i><img th:src="@{../../static/images/icon-chengzhong.png}"/></i>绉伴噸纭
+ <i><img th:src="@{../../static/images/icon-chengzhong.png}"/></i>姝ラ1锛氱О閲嶇‘璁�
</button>
<button id="btn-submit"
- class="rkbk-quick-btn layui-btn btn-green layui-btn-disabled"
- disabled=true onclick="submit()">
- <i><img th:src="@{../../static/images/icon-ok.png}"/></i>瀹屾垚绉伴噸
+ class="rkbk-quick-btn layui-btn btn-green" onclick="submit()">
+ <i><img th:src="@{../../static/images/icon-ok.png}"/></i>姝ラ2锛氬畬鎴愮О閲�
</button>
<button id="btn-printBill"
- class="rkbk-quick-btn layui-btn btn-blue layui-btn-disabled"
- disabled=true onclick="printBill()">
- <i><img th:src="@{../../static/images/icon-dayin.png}"/></i>鎵撳嵃杩囩鍗�
+ class="rkbk-quick-btn layui-btn btn-blue" onclick="printBill()">
+ <i><img th:src="@{../../static/images/icon-dayin.png}"/></i>姝ラ3锛氭墦鍗拌繃纾呭崟
</button>
- <button class="rkbk-quick-btn layui-btn" onclick="gateCtrl()">
- <i><img th:src="@{../../static/images/icon-hyd.png}"/></i>閬撻椄鎿嶄綔
+ <button class="rkbk-quick-btn layui-btn" onclick="showCheck()">
+ <i><img th:src="@{../../static/images/icon-hyd.png}"/></i>璐ㄦ璇︾粏
</button>
<button class="rkbk-quick-btn layui-btn btn-violet"
onclick="flushPage()">
@@ -241,70 +248,58 @@
<!--kccz-left-box1 end-->
<div class="kccz-left-box2 mt-10 radius-6">
-
<div class="rkbk-tit">
<i></i>
- <h3>涓氬姟鏁版嵁</h3>
+ <h3>涓氬姟鏁版嵁<span id="text-param"></span></h3>
<div>
<input type="button" value="璇绘櫤鎱у崱"
class="rkbk-search-btn layui-btn r-240"
onclick="flushICCard()">
-
<input type="button" value="璇昏韩浠借瘉"
class="rkbk-search-btn layui-btn r-120"
onclick="flushIdCard()">
-
<input type="button" value="鎵嬪姩鏌ヨ"
- class="rkbk-search-btn layui-btn" onclick="flushData()">
-
+ class="rkbk-search-btn layui-btn" onclick="flushByHand()">
</div>
</div>
<div class="kccz-data-form layui-row">
<form class="layui-form" action="" id="form-data"
lay-filter="form-data">
-
<div class="layui-form-item display-none">
- <label class="layui-form-label">闅愯棌瀛楁-ID</label>
<input type="text" name="id">
</div>
<div class="layui-form-item display-none">
- <label class="layui-form-label">闅愯棌瀛楁-娴佺▼鑺傜偣</label>
<input type="text" name="progress">
</div>
<div class="layui-form-item display-none">
- <label class="layui-form-label">闅愯棌瀛楁-涓氬姟绫诲瀷</label>
<input type="text" name="type">
</div>
<div class="layui-form-item display-none">
- <label class="layui-form-label">闅愯棌瀛楁-瀹㈡埛缂栫爜Id</label>
- <input type="text" name="customerId">
+ <input type="text" name="foodLocationId">
</div>
<div class="layui-form-item display-none">
- <label class="layui-form-label">闅愯棌瀛楁-閫氱煡鍗旾D</label>
<input type="text" name="noticeId">
</div>
<div class="layui-form-item display-none">
- <label class="layui-form-label">闅愯棌瀛楁-绮鎬ц川</label>
<input type="text" name="foodType">
</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="intelCard" id="intelCard"
- placeholder="鏅烘収鍗″彿" autocomplete="off" class="layui-input">
+ 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>
+ <label class="layui-form-label color-red">杞︾墝鍙�</label>
<div class="layui-input-block">
- <input type="text" name="plateNum" id="plateNum" placeholder="杞︾墝鍙�"
+ <input type="text" name="plateNum" id="plateNum" placeholder="鑷姩甯﹀叆/鎵嬪姩褰曞叆"
autocomplete="off" class="layui-input">
</div>
</div>
@@ -312,19 +307,9 @@
<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">
- </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="userName" placeholder="涓嶅彲缂栬緫" class="layui-input"
+ <input type="text" name="userName" placeholder="鑷姩甯﹀叆锛屼笉鍙紪杈�" class="layui-input"
disabled>
</div>
</div>
@@ -336,7 +321,7 @@
<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 weight rkbk-search-input" disabled>
+ placeholder="鍦扮鑷姩甯﹀叆" class="layui-input rkbk-search-input" disabled>
<em
class="kccz-data-dw">KG</em>
</div>
@@ -348,23 +333,14 @@
<label class="layui-form-label color-red">鐨噸(绌鸿溅)</label>
<div class="layui-input-block">
<input type="text" name="emptyWeight" id="emptyWeight" autocomplete="off"
- placeholder="璇疯緭鍏�" class="layui-input weight rkbk-search-input" disabled>
+ placeholder="鍦扮鑷姩甯﹀叆" class="layui-input weight 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="customerName" placeholder="璇烽�夋嫨锛屼笉鍙墜鍔ㄥ綍鍏�"
- autocomplete="off" class="layui-input" disabled="disabled"> <em
- class="kccz-data-dw cursor" onclick="showNotice()">鈥�</em>
- </div>
- </div>
- </div>
<div class="layui-col-xs4">
<div class="layui-form-item">
@@ -377,28 +353,20 @@
</div>
</div>
-
<div class="layui-col-xs4">
- <div class="layui-form-item kccz-data-group-md">
- <label class="layui-form-label">鏉傝川鎵ｉ噸</label>
- <div class="posi-r kccz-data-bfb fr">
- <input id="impurity" type="text" name="impurity" placeholder="璇疯緭鍏�"
- autocomplete="off" class="layui-input rkbk-search-input" disabled> <em
- class="kccz-data-dw">%</em>
- </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label color-red">瀹㈡埛淇℃伅</label>
<div class="layui-input-block">
- <div class="posi-r">
- <input id="deImpurity" type="text" name="deImpurity" placeholder="璇疯緭鍏�"
- autocomplete="off" class="layui-input weight"> <em
- class="kccz-data-dw">KG</em>
- </div>
+ <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>
<div class="layui-col-xs4">
<div class="layui-form-item">
- <label class="layui-form-label">瑁呭嵏浠撳簱</label>
+ <label class="layui-form-label" id="depotIdLabel">瑁呭嵏浠撳簱</label>
<div class="layui-input-block">
<select name="depotId" id="depotId" lay-filter="select_depotId">
<option value=""></option>
@@ -408,6 +376,38 @@
</div>
</div>
</div>
+
+ <div class="layui-col-xs4">
+ <div class="layui-form-item kccz-data-group-md">
+ <label class="layui-form-label">璐ㄦ鎵ｉ噸</label>
+ <div class="posi-r kccz-data-bfb fr">
+ <button class="rkbk-quick-btn layui-btn" onclick="showCheck()">
+ <i><img th:src="@{../../static/images/icon-hyd.png}"/></i>璇︾粏
+ </button>
+ </div>
+ <div class="layui-input-block">
+ <div class="posi-r">
+ <input id="deCheck" type="text" name="deCheck" placeholder="璇疯緭鍏�"
+ autocomplete="off" class="layui-input weight"> <em
+ class="kccz-data-dw">KG</em>
+ </div>
+ </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">
+ <select name="foodVariety" id="foodVariety">
+ <option value=""></option>
+ <option th:each="dic,dicSet:${listFoodVariety}"
+ th:value="${dic.code}" th:text="${dic.name}"></option>
+ </select>
+ </div>
+ </div>
+ </div>
+
<div class="layui-col-xs4">
<div class="layui-form-item">
@@ -422,30 +422,29 @@
<div class="layui-col-xs4">
<div class="layui-form-item kccz-data-group-md">
- <label class="layui-form-label">姘村垎鎵ｉ噸</label>
+ <label class="layui-form-label">璐ㄦ澧為噸</label>
<div class="posi-r kccz-data-bfb fr">
- <input id="wet" type="text" name="wet" placeholder="璇疯緭鍏�"
- autocomplete="off" class="layui-input rkbk-search-input" disabled> <em
- class="kccz-data-dw">%</em>
+ <button class="rkbk-quick-btn layui-btn" onclick="showCheck()">
+ <i><img th:src="@{../../static/images/icon-hyd.png}"/></i>璇︾粏
+ </button>
</div>
<div class="layui-input-block">
<div class="posi-r">
- <input id="deWet" type="text" name="deWet" placeholder="璇疯緭鍏�"
+ <input id="addCheck" type="text" name="addCheck" placeholder="璇疯緭鍏�"
autocomplete="off" class="layui-input weight"> <em
class="kccz-data-dw">KG</em>
</div>
</div>
</div>
</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">
- <select name="foodVariety" id="foodVariety">
- <option value=""></option>
- <option th:each="dic,dicSet:${listFoodVariety}"
- th:value="${dic.code}" th:text="${dic.name}"></option>
- </select>
+ <input type="text" name="foodLocation" placeholder="璇烽�夋嫨"
+ autocomplete="off" class="layui-input" disabled="disabled"> <em
+ class="kccz-data-dw cursor" onclick="showFoodLocation()">鈥︹��</em>
</div>
</div>
</div>
@@ -463,41 +462,10 @@
<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="deSum" placeholder="鑷姩璁＄畻"
- autocomplete="off" 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">瑙� 鏍�</label>
- <div class="layui-input-block">
- <select name="specType" id="specType">
- <option value="鏁ｇ伯">鏁ｇ伯</option>
- <option value="25kg">25kg</option>
- <option value="50kg">50kg</option>
- </select>
- </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="foodLocation" 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="price" placeholder="璇疯緭鍏ュ崟浠�"
- class="layui-input"> <em class="kccz-data-dw">鍏�/鍏枻</em>
+ <input type="text" name="deOtherInfo" autocomplete="off"
+ placeholder="鍏朵粬鎵ｉ噸璇存槑" class="layui-input">
</div>
</div>
</div>
@@ -511,30 +479,10 @@
</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="settleWeight" placeholder="鑷姩璁＄畻"
- autocomplete="off" class="layui-input rkbk-search-input"
- disabled> <em class="kccz-data-dw">KG</em>
- </div>
- </div>
- </div>
- <div class="layui-col-xs8">
- <span style="padding-left: 50px;color: blue;">
- 娉ㄦ剰锛�1銆佹按鏉傚鎵ｉ噸鏍规嵁鍖栭獙缁撴灉鑷姩璁＄畻锛屾鏁�=鎵ｉ噸锛岃礋鏁�=澧為噸 <br>
- </span>
- <span style="padding-left: 93px;color: blue;">
- 2銆佸噣閲� = 姣涢噸 - 鐨噸 锛涙�绘墸閲� = 鎵ｆ按鏉傦紙澶т簬0锛� + 鐜板満鎵ｉ噸 + 鍏朵粬鎵ｉ噸<br>
- </span>
- <span style="padding-left: 93px;color: blue;">
- 3銆佺粨绠楅噸閲� = 鍑�閲� - 鎬绘墸閲� + 姘存潅澧為噸锛涘叆搴撻噸閲� = 鍑�閲� - 鎬绘墸閲�
- </span>
- </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="recordWeight" placeholder="鑷姩璁＄畻"
autocomplete="off" class="layui-input rkbk-search-input"
@@ -542,6 +490,88 @@
</div>
</div>
</div>
+ <div class="layui-col-xs8">
+ <span style="padding-left: 50px;color: #2ab5ad;">
+ 璇存槑锛氬噣閲�=姣涢噸-鐨噸锛涜川妫�澧炴墸閲嶆牴鎹川妫�璇︾粏濉啓锛涘叆搴撻噸閲�=鍑�閲�-鎵ｉ噸锛涚粨绠楅噸閲�=鍏ュ簱閲嶉噺+璐ㄦ澧為噸<br>
+ </span>
+ </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="settleWeight" placeholder="鑷姩璁＄畻"
+ autocomplete="off" class="layui-input rkbk-search-input"
+ disabled> <em class="kccz-data-dw">KG</em>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-col-xs12">
+ <div class="line-container">
+ <div class="line"></div>
+ <div class="line-text">浠ヤ笅鏍规嵁搴撳尯绉伴噸浣滀笟瑕佹眰濉啓</div>
+ <div class="line"></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="radio" name="bzw" value="1" title="楹昏">
+ <input type="radio" name="bzw"
+ value="2" title="缂栫粐琚�">
+ <input type="radio" name="bzw"
+ value="3" title="鏁ｈ" checked>
+ </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="dePackage" autocomplete="off"
+ placeholder="璇疯緭鍏�" class="layui-input weight"> <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">鍗曚环</label>
+ <div class="layui-input-block">
+ <input type="text" name="price" placeholder="璇疯緭鍏�"
+ class="layui-input"> <em class="kccz-data-dw">鍏�/鍏枻</em>
+ </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="dbz" autocomplete="off"
+ placeholder="璇疯緭鍏�" class="layui-input"> <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">鍖呬欢鎬绘暟</label>
+ <div class="layui-input-block">
+ <input type="text" name="bzbjs" autocomplete="off"
+ placeholder="璇疯緭鍏�" class="layui-input"> <em
+ class="kccz-data-dw">浠�</em>
+ </div>
+ </div>
+ </div>
+
</form>
</div>
</div>
@@ -558,8 +588,6 @@
</div>
<div class="kccz-r-con">
<div class="kccz-r-vedio" id="kccz-r-video1">
-
-
</div>
<div class="kccz-r-btnbox">
<a href="javascript:;" class="kccz-r-btn kccz-r-btn1 active">
@@ -653,19 +681,14 @@
var weightEditTag = [[${weightEditTag}]];
//userId
var userId = [[${loginUser.username}]];
-
//鍑哄叆搴撶被鍨�
var type = [[${type}]];
-
var companyId = [[${loginUser.companyId}]];
//鍝佺
var listFoodVariety = [[${listFoodVariety}]];
//鍦扮淇℃伅
var weightDto = [[${weightDto}]];
-
- //杞︾墝璇嗗埆淇℃伅
- //var lprDto = [[${lprDto}]];
//杩囩▼鎽勫儚澶�
var snapDto1 = [[${snapDto1}]];
@@ -684,6 +707,7 @@
<script th:src="@{../../static/js/igds-common.js}"></script>
<script th:src="@{../../static/admin/inout/inout-print.js}"></script>
<script th:src="@{../../static/admin/inout/video-play.js}"></script>
+<script th:src="@{../../static/admin/inout/inout-common.js}"></script>
<script th:src="@{../../static/admin/inout/weight.js}"></script>
<script th:src="@{../../static/admin/inout/in-weight.js}"></script>
@@ -732,21 +756,6 @@
</tr>
</tbody>
</table>
-</div>
-<!-- 寮瑰嚭妗�-閬撻椄鎿嶄綔-->
-<div class="layui-tab-content areation-center" id="control-gate"
- style="display: none;">
- <div class="layui-btn-container m10">
- <button class="rkbk-quick-btn layui-btn btn-violet"
- onClick="controlGate('OPEN')">
- <i><img th:src="@{../../static/images/icon-sm-fc.png}" /></i>寮�閬撻椄
- </button>
- <button class="rkbk-quick-btn layui-btn btn-red"
- onClick="controlGate('CLOSE')">
- <i><img th:src="@{../../static/images/icon-sm-fc.png}" /></i>鍏抽亾闂�
- </button>
- </div>
-
</div>
<script type="text/html" id="toolbarFoodLocaton">
--
Gitblit v1.9.3