From 99d0bb96043ba5d6db66bbfb00f67ca4e09f3ffb Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 07 三月 2025 09:08:33 +0800
Subject: [PATCH] 小片尺寸和成品尺寸不相同时，打印显示小片信息
---
north-glass-erp/northglass-erp/src/utils/decimal.js | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/utils/decimal.js b/north-glass-erp/northglass-erp/src/utils/decimal.js
index d28d34c..f340131 100644
--- a/north-glass-erp/northglass-erp/src/utils/decimal.js
+++ b/north-glass-erp/northglass-erp/src/utils/decimal.js
@@ -10,28 +10,40 @@
// 灏佽鍑忔硶鍑芥暟
function subtract(num1, num2) {
- const decimal1 = new Decimal(num1===null?0:num1);
- const decimal2 = new Decimal(num2===null?0:num2);
- return decimal1.minus(decimal2).toFixed(2);
+ const decimal1 = new Decimal(num1===null || num1===''?0:num1);
+ const decimal2 = new Decimal(num2===null || num2===''?0:num2);
+ return decimal1.minus(decimal2).toFixed(2)
}
// 灏佽涔樻硶鍑芥暟
function multiply(num1, num2) {
- const decimal1 = new Decimal(num1===null?0:num1);
- const decimal2 = new Decimal(num2===null?0:num2);
+ const decimal1 = new Decimal(num1===null || num1===''?0:num1);
+ const decimal2 = new Decimal(num2===null || num2===''?0:num2);
return decimal1.times(decimal2).toFixed(2)
+}
+function multiplyAuto(num1, num2,scale) {
+ const decimal1 = new Decimal(num1===null || num1===''?0:num1);
+ const decimal2 = new Decimal(num2===null || num2===''?0:num2);
+ return decimal1.times(decimal2).toFixed(scale)
}
// 灏佽闄ゆ硶鍑芥暟
function divide(num1, num2) {
- const decimal1 = new Decimal(num1===null?0:num1);
- const decimal2 = new Decimal(num2===null?0:num2);
+ const decimal1 = new Decimal(num1===null || num1===''?0:num1);
+ const decimal2 = new Decimal(num2===null || num2===''?0:num2);
return decimal1.dividedBy(decimal2).toFixed(2);
+}
+function divideAuto(num1, num2,scale) {
+ const decimal1 = new Decimal(num1===null || num1===''?0:num1);
+ const decimal2 = new Decimal(num2===null || num2===''?0:num2);
+ return decimal1.dividedBy(decimal2).toFixed(scale)
}
export {
add,
subtract,
multiply,
- divide
+ divide,
+ multiplyAuto,
+ divideAuto
}
\ No newline at end of file
--
Gitblit v1.8.0