From fe6fb6ebaa3100680194c2edda3cc6b88110137e Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Tue, 1 Mar 2022 15:46:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=A2=AB=E9=99=A4=E6=95=B0?=
 =?UTF-8?q?=E4=B8=BA0=E7=9A=84=E6=83=85=E5=86=B5=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/cn/palmte/work/utils/Utils.java           | 4 ++--
 src/main/resources/static/assets/js/project_common.js   | 4 ++--
 src/main/resources/static/assets/js/project_estimate.js | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/cn/palmte/work/utils/Utils.java b/src/main/java/cn/palmte/work/utils/Utils.java
index 9eef788..f134bd4 100644
--- a/src/main/java/cn/palmte/work/utils/Utils.java
+++ b/src/main/java/cn/palmte/work/utils/Utils.java
@@ -58,7 +58,7 @@ public class Utils {
         }
     }
     public static String format(Number number){
-        return format(number, "#,##0.00");
+        return format(number, "0.00");
     }
 
     /**
@@ -72,7 +72,7 @@ public class Utils {
         }
     }
     public static String format2(Number number){
-        return format(number, "#,##0.00###");
+        return format(number, "0.00");
     }
 
 
diff --git a/src/main/resources/static/assets/js/project_common.js b/src/main/resources/static/assets/js/project_common.js
index 88e1cee..6b7b4ae 100644
--- a/src/main/resources/static/assets/js/project_common.js
+++ b/src/main/resources/static/assets/js/project_common.js
@@ -36,8 +36,8 @@ function f2(x) {
  * @returns {string}
  */
 function f2Fixed(f) {
-    if(!x){
-        return f2Fixed(0);
+    if(!f){
+        return "0.00";
     }
     //return Number(f).toFixed(2);
     //格式化413,423,423.24
diff --git a/src/main/resources/static/assets/js/project_estimate.js b/src/main/resources/static/assets/js/project_estimate.js
index ac1ad26..f3c3f3e 100644
--- a/src/main/resources/static/assets/js/project_estimate.js
+++ b/src/main/resources/static/assets/js/project_estimate.js
@@ -452,15 +452,15 @@ function calIncomeCost() {
         $projectGrossProfit.val(f2Fixed(f2(incomeTotalTaxExclude) - f2(costTotalTaxExclude) - f2(costExpropriationTaxExclude)));
         $projectGrossProfitRate.val(f2Fixed(f2($projectGrossProfit.val()) * 100 / incomeTotalTaxExcludeValue));
     } else {
-        $projectGrossProfit.val("");
-        $projectGrossProfitRate.val("");
+        $projectGrossProfit.val("0.00");
+        $projectGrossProfitRate.val("0.00");
     }
 
     if ($projectGrossProfit.val()) {
         $projectContributionProfit.val(f2Fixed(f2($projectGrossProfit.val()) - f2(costCompanyManageTaxExclude)));
         $projectContributionProfitRate.val(f2Fixed(f2($projectContributionProfit.val()) * 100 / f2(incomeTotalTaxExclude)))
     } else {
-        $projectContributionProfit.val("");
-        $projectContributionProfitRate.val("");
+        $projectContributionProfit.val("0.00");
+        $projectContributionProfitRate.val("0.00");
     }
 }
\ No newline at end of file