From dc1a8783473d2a93344082013ec8014af1e75731 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 03 十二月 2024 15:44:41 +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