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 | 119 +++++++++++++++++++----------------------------------------
1 files changed, 39 insertions(+), 80 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 6b5511d..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
@@ -138,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()">
@@ -264,7 +259,7 @@
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>
@@ -272,30 +267,23 @@
<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">
@@ -333,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>
@@ -345,7 +333,8 @@
<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>
@@ -370,14 +359,14 @@
<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>
+ 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>
@@ -399,7 +388,7 @@
<div class="layui-input-block">
<div class="posi-r">
<input id="deCheck" type="text" name="deCheck" placeholder="璇疯緭鍏�"
- autocomplete="off" class="layui-input"> <em
+ autocomplete="off" class="layui-input weight"> <em
class="kccz-data-dw">KG</em>
</div>
</div>
@@ -442,7 +431,7 @@
<div class="layui-input-block">
<div class="posi-r">
<input id="addCheck" type="text" name="addCheck" placeholder="璇疯緭鍏�"
- autocomplete="off" class="layui-input"> <em
+ autocomplete="off" class="layui-input weight"> <em
class="kccz-data-dw">KG</em>
</div>
</div>
@@ -454,7 +443,8 @@
<label class="layui-form-label color-red">绮浜у湴</label>
<div class="layui-input-block">
<input type="text" name="foodLocation" placeholder="璇烽�夋嫨"
- autocomplete="off" class="layui-input">
+ autocomplete="off" class="layui-input" disabled="disabled"> <em
+ class="kccz-data-dw cursor" onclick="showFoodLocation()">鈥︹��</em>
</div>
</div>
</div>
@@ -528,16 +518,6 @@
<!-- 琛ュ厖瀛楁榛樿闅愯棌 -->
<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="jjlx" value="0" title="绉伴噸鍏ュ簱" checked>
- <input type="radio" name="jjlx" value="1" title="鏍囧噯鍖呭叆搴�">
- </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="楹昏">
@@ -554,30 +534,8 @@
<label class="layui-form-label">鍖呰鎵ｉ噸</label>
<div class="layui-input-block">
<input type="text" name="dePackage" 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="dbz" 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="bzbjs" autocomplete="off"
- placeholder="璇疯緭鍏�" class="layui-input weight"> <em
- class="kccz-data-dw">浠�</em>
</div>
</div>
</div>
@@ -592,6 +550,27 @@
</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>
@@ -702,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}]];
@@ -782,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