From 0c8b8c908925d26fd3f176efa112edbf569c1283 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 07 七月 2023 19:17:40 +0800
Subject: [PATCH] 称重调整
---
igds-web/src/main/resources/static/admin/inout/weight.js | 28 +---
igds-web/src/main/resources/templates/admin/inout/out-handle.html | 131 ++++++++++++++++++++------
igds-web/src/main/resources/static/admin/inout/out-weight.js | 25 +++++
igds-web/src/main/resources/templates/admin/inout/out-weight.html | 91 +++++++++++-------
4 files changed, 190 insertions(+), 85 deletions(-)
diff --git a/igds-web/src/main/resources/static/admin/inout/out-weight.js b/igds-web/src/main/resources/static/admin/inout/out-weight.js
index f044d4d..5edb8da 100644
--- a/igds-web/src/main/resources/static/admin/inout/out-weight.js
+++ b/igds-web/src/main/resources/static/admin/inout/out-weight.js
@@ -478,6 +478,31 @@
// delDisabled();
}
+//鏄剧ず璐ㄦ淇℃伅
+function showCheck() {
+ if (!recordData) {
+ alertError("娌℃湁涓氬姟鏁版嵁淇℃伅锛屾墽琛岃鎷掔粷");
+ return;
+ }
+
+ // 鑾峰彇鍖栭獙椤逛俊鎭�
+ // flushCheckItem();
+
+ layer.open({
+ type: 1,
+ title: "璐ㄦ璇︾粏",
+ offset: ['120px', '100px'],
+ area: ['1000px', '520px'],
+ shade: 0,
+ content: $('#checkDetail'),
+ btnAlign: 'c',
+ btn: ['鍙栨秷'],
+ yes: function () {
+ layer.closeAll();
+ },
+ closeBtn: 0
+ });
+}
function flushPage() {
layer.confirm('纭畾瑕佸埛鏂伴〉闈㈠悧锛�', {icon: 3, title: '鎻愮ず'}, function (index) {
diff --git a/igds-web/src/main/resources/static/admin/inout/weight.js b/igds-web/src/main/resources/static/admin/inout/weight.js
index a4c137f..379559f 100644
--- a/igds-web/src/main/resources/static/admin/inout/weight.js
+++ b/igds-web/src/main/resources/static/admin/inout/weight.js
@@ -34,9 +34,8 @@
/**
* 鍑哄簱-绉伴噸鑷姩璁＄畻
- * 1銆佸噣閲� = 姣涢噸 - 鐨噸 锛� 鎬绘墸閲� = 鎵ｆ按鏉� + 鐜板満鎵ｉ噸 + 鍏朵粬鎵ｉ噸
- * 2銆佹按鍒嗗閲嶏紝鏁存暟 = 澧為噸锛岃礋鏁�= 鎵ｉ噸
- * 3銆佺粨绠楅噸閲� = 鍑�閲� - 鎬绘墸閲� 锛堝惈姘存潅澧為噸锛夛紱 鍏ュ簱閲嶉噺 = 鍑�閲� - 鎬绘墸閲� 锛堜笉鍚按鏉傚閲嶏級
+ * 1銆佸噣閲� = 姣涢噸 - 鐨噸 锛� 鎬绘墸閲� = 璐ㄦ鎵ｉ噸 + 鍏朵粬鎵ｉ噸
+ * 2銆佺粨绠楅噸閲� = 鍑�閲� - 鎬绘墸閲� + 璐ㄦ鎵ｉ噸锛� 鍏ュ簱閲嶉噺 = 鍑�閲� - 鎬绘墸閲�
* 娉ㄦ剰锛氬鏋滄槸鎵嬪姩淇敼浜嗘按鍒嗗拰鏉傝川鐨勬墸閲嶏紝鍒欎笉鎸夌収閰嶇疆瑙勫垯杩涜澧炴墸閲嶈绠�
* @param name 瑙﹀彂浜嬩欢鐨勫睘鎬у悕绉�
*/
@@ -52,11 +51,13 @@
return;
}
//鍏朵粬淇℃伅
- var deHandle = curData.deHandle, dePackage = curData.dePackage, deOther = curData.deOther, settleWeight = 0,
- recordWeight = 0, deSum = 0;
- recordWeight = Number(netWeight) - Number(deHandle) - Number(dePackage) - Number(deOther);
- settleWeight = Number(recordWeight);
- deSum = Number(deOther) + Number(deHandle)
+ var dePackage = curData.dePackage, deOther = curData.deOther, settleWeight = 0,
+ recordWeight = 0, deSum = 0, deCheck = curData.deCheck, addCheck = curData.addCheck;
+
+ recordWeight = Number(netWeight) - Number(dePackage) - Number(deOther) - Number(deCheck);
+ settleWeight = Number(recordWeight) + Number(addCheck);
+
+ deSum = Number(deOther) + Number(deCheck)
netWeight = netWeight.toFixed(0);
recordWeight = recordWeight.toFixed(0);
@@ -146,17 +147,6 @@
// });
// form.render();
// }
-function deAutoByHandle(name) {
- var curData = form.val("form-data");
- var deOther = curData.deOther, deHandle = curData.deHandle;
- deSum = Number(deOther) + Number(deHandle);
- deSum = deSum.toFixed(0);
- form.val("form-data", {
- deSum: deSum,
- });
- form.render();
-
-}
/**
* 鏍规嵁鍖栭獙椤瑰拰浼犻�掕繃鏉ョ殑鍙傛暟鑾峰彇褰撳墠鍙傛暟鐨勯厤缃俊鎭�
diff --git a/igds-web/src/main/resources/templates/admin/inout/out-handle.html b/igds-web/src/main/resources/templates/admin/inout/out-handle.html
index 254ff9e..ab4a51e 100644
--- a/igds-web/src/main/resources/templates/admin/inout/out-handle.html
+++ b/igds-web/src/main/resources/templates/admin/inout/out-handle.html
@@ -9,7 +9,7 @@
<title>鍑哄叆搴撶鐞�-鍊间粨绠＄悊</title>
<link rel="stylesheet" type="text/css"
- th:href="@{../../static/plugins/layui/css/layui.css?v=2.5.5}">
+ th:href="@{../../static/plugins/layui/css/layui.css}">
<link rel="stylesheet" type="text/css"
th:href="@{../../static/admin/inout/style.css}">
@@ -349,6 +349,23 @@
</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 type="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="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 kccz-data-group-md">-->
<!-- <label class="layui-form-label">姘村垎澧為噸</label>-->
@@ -381,6 +398,42 @@
<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="handleUser" autocomplete="off"
+ placeholder="鎵嬪姩褰曞叆" class="layui-input">
+ </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 type="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">鐜板満鎵ｉ噸</label>-->
+ <!-- <div class="layui-input-block">-->
+ <!-- <input type="text" name="deHandle" placeholder="璇疯緭鍏�"-->
+ <!-- autocomplete="off" 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="deOther" autocomplete="off" placeholder="璇疯緭鍏�"
@@ -389,27 +442,16 @@
</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="deHandle" placeholder="璇疯緭鍏�"
- autocomplete="off" 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="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">-->
+ <!-- <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">-->
@@ -444,15 +486,7 @@
<!-- </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="handleUser" autocomplete="off"
- placeholder="鎵嬪姩褰曞叆" class="layui-input">
- </div>
- </div>
- </div>
+
<div class="layui-col-xs8">
<div class="layui-form-item">
<label class="layui-form-label">鍏朵粬璇存槑</label>
@@ -462,6 +496,41 @@
</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="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>
+
<div class="layui-col-xs12">
<div class="layui-form-item">
<label class="layui-form-label">澶囨敞璇存槑</label>
diff --git a/igds-web/src/main/resources/templates/admin/inout/out-weight.html b/igds-web/src/main/resources/templates/admin/inout/out-weight.html
index 89ff31b..abc679c 100644
--- a/igds-web/src/main/resources/templates/admin/inout/out-weight.html
+++ b/igds-web/src/main/resources/templates/admin/inout/out-weight.html
@@ -41,7 +41,7 @@
}
.kccz-left-box2 {
- height: 560px;
+ height: 540px;
}
.color-red {
@@ -403,15 +403,32 @@
</div>
</div>
<div class="layui-col-xs4">
- <div class="layui-form-item">
- <label class="layui-form-label">鐜板満鎵ｉ噸</label>
+ <div class="layui-form-item kccz-data-group-md">
+ <label class="layui-form-label">璐ㄦ澧為噸</label>
+ <div class="posi-r kccz-data-bfb fr">
+ <button type="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">
- <input id="deHandle" type="text" name="deHandle" autocomplete="off"
- placeholder="璇疯緭鍏�" class="layui-input weight"> <em
- class="kccz-data-dw">KG</em>
+ <div class="posi-r">
+ <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>-->
+ <!-- <div class="layui-input-block">-->
+ <!-- <input id="deHandle" type="text" name="deHandle" 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 kccz-data-group-md">-->
@@ -454,6 +471,33 @@
</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 type="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">绮浜у湴</label>
+ <div class="layui-input-block">
+ <input type="text" name="foodLocation" placeholder="璇烽�夋嫨"
+ autocomplete="off" class="layui-input"> <em
+ class="kccz-data-dw cursor" onclick="showFoodLocation()">鈥︹��</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">
@@ -463,16 +507,7 @@
</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="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>-->
@@ -485,16 +520,7 @@
<!-- </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"> <em
- class="kccz-data-dw cursor" onclick="showFoodLocation()">鈥︹��</em>
- </div>
- </div>
- </div>
+
<div class="layui-col-xs4">
<div class="layui-form-item">
@@ -516,7 +542,6 @@
<!-- </div>-->
<!--</div>-->
-
<div class="layui-col-xs8">
<div class="layui-form-item">
<label class="layui-form-label">澶囨敞璇存槑</label>
@@ -526,8 +551,6 @@
</div>
</div>
</div>
-
-
<div class="layui-col-xs4">
<div class="layui-form-item">
<label class="layui-form-label color-red">鍑哄簱閲嶉噺</label>
@@ -538,12 +561,10 @@
</div>
</div>
</div>
- <div class="layui-col-xs8">
- <span style="padding-left: 93px;color: blue;">
- 璇存槑锛� 1銆佸噣閲� = 姣涢噸 - 鐨噸 锛涙�绘墸閲� = 鐜板満鎵ｉ噸 + 鍏朵粬鎵ｉ噸<br>
- </span>
- <span style="padding-left: 93px;color: blue;">
- 2銆佺粨绠楅噸閲� = 鍑�閲� - 鎬绘墸閲� 锛涘嚭搴撻噸閲� = 鍑�閲� - 鎬绘墸閲�
+
+ <div class="layui-col-xs12">
+ <span style="padding-left: 93px;color: blue;margin-bottom: 15px">
+ 璇存槑锛氬噣閲� = 姣涢噸 - 鐨噸 锛涙�绘墸閲� = 璐ㄦ鎵ｉ噸 + 鍏朵粬鎵ｉ噸锛涚粨绠楅噸閲� = 鍑�閲� - 鎬绘墸閲� + 璐ㄦ澧為噸 锛涘嚭搴撻噸閲� = 鍑�閲� - 鎬绘墸閲�
</span>
</div>
--
Gitblit v1.9.3