From e9f8d23f55f64903d834308f9f167aaf3195c20d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 30 七月 2025 09:10:26 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/utils/decimal.js | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/utils/decimal.js b/north-glass-erp/northglass-erp/src/utils/decimal.js
index f340131..cbc7dce 100644
--- a/north-glass-erp/northglass-erp/src/utils/decimal.js
+++ b/north-glass-erp/northglass-erp/src/utils/decimal.js
@@ -7,6 +7,11 @@
const decimal2 = new Decimal(num2===null?0:num2);
return decimal1.plus(decimal2).toString();
}
+function addAuto(num1, num2,scale) {
+ const decimal1 = new Decimal(num1===null?0:num1);
+ const decimal2 = new Decimal(num2===null?0:num2);
+ return decimal1.plus(decimal2).toFixed(2)
+}
// 灏佽鍑忔硶鍑芥暟
function subtract(num1, num2) {
@@ -44,6 +49,7 @@
multiply,
divide,
multiplyAuto,
- divideAuto
+ divideAuto,
+ addAuto
}
\ No newline at end of file
--
Gitblit v1.8.0