From e50fa16b6dbc4e7c50d5fbdbc04d2a556ca01c4e Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 02 十二月 2024 11:26:36 +0800
Subject: [PATCH] 补片流程卡调整
---
north-glass-erp/northglass-erp/src/utils/decimal.js | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/utils/decimal.js b/north-glass-erp/northglass-erp/src/utils/decimal.js
index c7c6a69..f340131 100644
--- a/north-glass-erp/northglass-erp/src/utils/decimal.js
+++ b/north-glass-erp/northglass-erp/src/utils/decimal.js
@@ -3,35 +3,47 @@
// 灏佽鍔犳硶鍑芥暟
function add(num1, num2) {
- const decimal1 = new Decimal(num1);
- const decimal2 = new Decimal(num2);
+ const decimal1 = new Decimal(num1===null?0:num1);
+ const decimal2 = new Decimal(num2===null?0:num2);
return decimal1.plus(decimal2).toString();
}
// 灏佽鍑忔硶鍑芥暟
function subtract(num1, num2) {
- const decimal1 = new Decimal(num1);
- const decimal2 = new Decimal(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);
- const decimal2 = new Decimal(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);
- const decimal2 = new Decimal(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