From 5eb90395313f5d7232aad2fb1a821a0028ca7764 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期三, 31 五月 2023 11:49:48 +0800
Subject: [PATCH] 出入库优化-称重页面
---
igds-web/src/main/resources/templates/admin/inout/in-weight20230530.html | 221 ++++++++++++++++++++++++++++---------------------------
1 files changed, 113 insertions(+), 108 deletions(-)
diff --git a/igds-web/src/main/resources/templates/admin/inout/in-weight-bak20221110.html b/igds-web/src/main/resources/templates/admin/inout/in-weight20230530.html
similarity index 86%
rename from igds-web/src/main/resources/templates/admin/inout/in-weight-bak20221110.html
rename to igds-web/src/main/resources/templates/admin/inout/in-weight20230530.html
index 63d7ad8..8da7613 100644
--- a/igds-web/src/main/resources/templates/admin/inout/in-weight-bak20221110.html
+++ b/igds-web/src/main/resources/templates/admin/inout/in-weight20230530.html
@@ -6,7 +6,7 @@
content="width=device-width, initial-scale=1, maximum-scale=1">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="renderer" content="webkit">
- <title>鍑哄叆搴撶鐞�-绉伴噸</title>
+ <title>鍑哄叆搴撶鐞�-鍏ュ簱绉伴噸</title>
<link rel="stylesheet" type="text/css"
th:href="@{../../static/plugins/layui/css/layui.css?v=2.5.5}">
@@ -20,6 +20,7 @@
.display-none {
display: none;
}
+
.cursor {
cursor: pointer;
}
@@ -32,7 +33,7 @@
}
.kccz-left-box2 {
- height: 510px;
+ height: 500px;
}
.color-red {
@@ -89,28 +90,31 @@
.rkbk-search-btn {
width: 100px;
height: 30px;
- line-height: 30px;
- font-size: 16px;
- }
- .r-240{
- right: 240px;
- }
- .r-120{
- right: 120px;
- }
-
- .rkbk-search-input{
- background: #FFF !important;
- }
- .rkbk-search-input.bg-date {
- background: #FFF !important;
+ line-height: 30px;
+ font-size: 16px;
}
- #scaleName{
+ .r-240 {
+ right: 240px;
+ }
+
+ .r-120 {
+ right: 120px;
+ }
+
+ .rkbk-search-input {
+ background: #FFF !important;
+ }
+
+ .rkbk-search-input.bg-date {
+ background: #FFF !important;
+ }
+
+ #scaleName {
width: 130px;
height: 28px;
}
-
+
</style>
</head>
@@ -138,6 +142,9 @@
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>鎵撳嵃杩囩鍗�
+ </button>
+ <button class="rkbk-quick-btn layui-btn" onclick="gateCtrl()">
+ <i><img th:src="@{../../static/images/icon-hyd.png}"/></i>閬撻椄鎿嶄綔
</button>
<button class="rkbk-quick-btn layui-btn btn-violet"
onclick="flushPage()">
@@ -224,7 +231,7 @@
<div class="kccz-czxx-wrap">
<div class="kccz-czxx-num">
- <span id="weightValue">0.00<em>KG</em></span>
+ <span id="weightValue">0.00</span><em>KG</em>
</div>
</div>
@@ -259,42 +266,29 @@
<div class="layui-form-item display-none">
<label class="layui-form-label">闅愯棌瀛楁-ID</label>
- <div class="layui-input-block">
- <input type="text" name="id" autocomplete="off"
- class="layui-input rkbk-search-input">
- </div>
+ <input type="text" name="id">
</div>
-
<div class="layui-form-item display-none">
<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>
+ <input type="text" name="progress">
</div>
-
- <div class="layui-form-item display-none">
- <label class="layui-form-label">闅愯棌瀛楁-瀹㈡埛ID</label>
- <div class="layui-input-block">
- <input type="text" name="customerId" 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="type" autocomplete="off"
- class="layui-input rkbk-search-input">
- </div>
+ <input type="text" name="type">
</div>
<div class="layui-form-item display-none">
- <label class="layui-form-label">闅愯棌瀛楁-閫氱煡鍗昳d</label>
- <div class="layui-input-block">
- <input type="text" name="noticeId" autocomplete="off"
- class="layui-input rkbk-search-input">
- </div>
+ <label class="layui-form-label">闅愯棌瀛楁-瀹㈡埛缂栫爜Id</label>
+ <input type="text" name="customerId">
</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">
@@ -305,7 +299,6 @@
</div>
</div>
</div>
-
<div class="layui-col-xs4">
<div class="layui-form-item">
@@ -331,7 +324,8 @@
<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" disabled>
+ <input type="text" name="userName" placeholder="涓嶅彲缂栬緫" class="layui-input"
+ disabled>
</div>
</div>
</div>
@@ -363,11 +357,11 @@
<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">瀹㈡埛鍚嶇О</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="showCustomer()">鈥�</em>
+ class="kccz-data-dw cursor" onclick="showNotice()">鈥�</em>
</div>
</div>
</div>
@@ -401,6 +395,7 @@
</div>
</div>
</div>
+
<div class="layui-col-xs4">
<div class="layui-form-item">
<label class="layui-form-label">瑁呭嵏浠撳簱</label>
@@ -468,7 +463,7 @@
<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"
@@ -476,7 +471,18 @@
</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>
@@ -486,43 +492,17 @@
</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="foodLevel">-->
-<!-- <option value=""></option>-->
-<!-- <option th:each="dic,dicSet:${listFoodLevel}"-->
-<!-- th:value="${dic.code}" th:text="${dic.name}"></option>-->
-<!-- </select>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </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="settleWeight" placeholder="鑷姩璁＄畻"
- autocomplete="off" class="layui-input rkbk-search-input"
- disabled> <em class="kccz-data-dw">KG</em>
+ <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 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-xs12">
+ <div class="layui-col-xs8">
<div class="layui-form-item">
<label class="layui-form-label">澶囨敞璇存槑</label>
<div class="layui-input-block">
@@ -531,17 +511,36 @@
</div>
</div>
</div>
-
- <div class="layui-col-xs12">
+ <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>
+ 娉ㄦ剰锛�1銆佹按鏉傚鎵ｉ噸鏍规嵁鍖栭獙缁撴灉鑷姩璁＄畻锛屾鏁�=鎵ｉ噸锛岃礋鏁�=澧為噸 <br>
</span>
- <span style="padding-left: 93px;color: blue;">
- 2銆佹按鍒嗘墸閲嶆牴鎹寲楠屾按鍒嗕俊鎭嚜鍔ㄨ绠楋紝姝ｆ暟=鎵ｉ噸锛岃礋鏁�=澧為噸<br>
+ <span style="padding-left: 93px;color: blue;">
+ 2銆佸噣閲� = 姣涢噸 - 鐨噸 锛涙�绘墸閲� = 鎵ｆ按鏉傦紙澶т簬0锛� + 鐜板満鎵ｉ噸 + 鍏朵粬鎵ｉ噸<br>
</span>
- <span style="padding-left: 93px;color: blue;">
- 3銆佺粨绠楅噸閲� = 鍑�閲� - 鎬绘墸閲� 锛堝惈姘存潅澧為噸锛夛紱 鍏ュ簱閲嶉噺 = 鍑�閲� - 鎬绘墸閲� 锛堜笉鍚按鏉傚閲嶏級
+ <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>
+ <div class="layui-input-block">
+ <input type="text" name="recordWeight" placeholder="鑷姩璁＄畻"
+ autocomplete="off" class="layui-input rkbk-search-input"
+ disabled> <em class="kccz-data-dw">KG</em>
+ </div>
+ </div>
</div>
</form>
</div>
@@ -671,7 +670,10 @@
//杩囩▼鎽勫儚澶�
var snapDto1 = [[${snapDto1}]];
var snapDto2 = [[${snapDto2}]];
- var snapDto3 = [[${snapDto2}]];
+ var snapDto3 = [[${snapDto3}]];
+ var gateDto = [[${gateDto}]];
+ //鏅烘収鍗�
+ var cardDto = [[${cardDto}]];
var ship = null; //鏄惁鑸硅繍椤甸潰鏍囪瘑
</script>
@@ -680,30 +682,18 @@
<script th:src="@{../../static/js/jquery.min.js}"></script>
<script th:src="@{../../static/js/constant.js}"></script>
<script th:src="@{../../static/js/igds-common.js}"></script>
-<script th:src="@{../../static/plugins/video/EasyPlayer-element.min.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/weight.js}"></script>
<script th:src="@{../../static/admin/inout/in-weight.js}"></script>
</body>
-<!-- 寮瑰嚭寰�鏉ュ崟浣嶅垪琛� -->
-<div class="layui-tab-content" id="listCustomer" style="display: none;">
- <table class="layui-table" lay-skin="nob" id="tableCustomer"
- lay-filter="tableCustomer" style="margin: 0px;"></table>
+<!-- 寮瑰嚭閫氱煡鍗� -->
+<div class="layui-tab-content" id="listNotice" style="display: none;">
+ <table class="layui-table" lay-skin="nob" id="tableNotice"
+ lay-filter="tableNotice" style="margin: 0px;"></table>
</div>
-
-<script type="text/html" id="toolbarCustomer">
- <div class="">
- <div class="layui-col-xs6">
- <input type="text" id="key" placeholder="杈撳叆缂栫爜鎴栬�呭悕绉扳�︹��" class="layui-input">
- </div>
- <div class="layui-col-xs6" style="padding-left: 10px;">
- <button class="layui-btn layui-btn-sm" onclick="flushCustomer()">鏌ヨ</button>
- </div>
- </div>
-</script>
-
<!-- 寮瑰嚭绮浜у湴 -->
<div class="layui-tab-content" id="listFoodLocation"
@@ -743,6 +733,21 @@
</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">
<div class="">
--
Gitblit v1.9.3