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