diff --git a/src/main/resources/static/assets/js/project_final.js b/src/main/resources/static/assets/js/project_final.js index ac54375..5f92b92 100644 --- a/src/main/resources/static/assets/js/project_final.js +++ b/src/main/resources/static/assets/js/project_final.js @@ -378,7 +378,7 @@ function calGrossProfitProfitMargin() { var grossProfitProfitMargin = $("input[name='grossProfitProfitMargin']"); if (grossProfitFinalTotal && incomeFinalTotal) { - grossProfitProfitMargin.val(f2Fixed(100 * f2(grossProfitFinalTotal) / f2(incomeFinalTotal))); + grossProfitProfitMargin.val(f2Fixed(100 * f2(grossProfitFinalTotal) / f2min(incomeFinalTotal))); } else { grossProfitProfitMargin.val(""); } @@ -410,7 +410,7 @@ function calContributionMarginProfitMargin() { var contributionMarginProfitMargin = $("input[name='contributionMarginProfitMargin']"); if (contributionMarginFinalTotal && incomeFinalTotal) { - contributionMarginProfitMargin.val(f2Fixed(100 * f2(contributionMarginFinalTotal) / f2(incomeFinalTotal))); + contributionMarginProfitMargin.val(f2Fixed(100 * f2(contributionMarginFinalTotal) / f2min(incomeFinalTotal))); } else { contributionMarginProfitMargin.val(""); } @@ -442,7 +442,7 @@ function calNetMarginProfitMargin() { var netMarginProfitMargin = $("input[name='netMarginProfitMargin']"); if (netMarginFinalTotal && incomeFinalTotal) { - netMarginProfitMargin.val(f2Fixed(100 * f2(netMarginFinalTotal) / f2(incomeFinalTotal))); + netMarginProfitMargin.val(f2Fixed(100 * f2(netMarginFinalTotal) / f2min(incomeFinalTotal))); } else { netMarginProfitMargin.val(""); } diff --git a/src/main/resources/templates/admin/project_final_edit.ftl b/src/main/resources/templates/admin/project_final_edit.ftl index f926a6d..ab63464 100644 --- a/src/main/resources/templates/admin/project_final_edit.ftl +++ b/src/main/resources/templates/admin/project_final_edit.ftl @@ -218,7 +218,7 @@