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 +++++++++-------------------
1 files changed, 9 insertions(+), 19 deletions(-)
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();
-
-}
/**
* 鏍规嵁鍖栭獙椤瑰拰浼犻�掕繃鏉ョ殑鍙傛暟鑾峰彇褰撳墠鍙傛暟鐨勯厤缃俊鎭�
--
Gitblit v1.9.3