diff --git a/src/main/resources/static/assets/js/project_final.js b/src/main/resources/static/assets/js/project_final.js index 5b8ad68..931ec0b 100644 --- a/src/main/resources/static/assets/js/project_final.js +++ b/src/main/resources/static/assets/js/project_final.js @@ -320,7 +320,7 @@ function calGrossProfitProfitMargin() { var grossProfitProfitMargin = $("input[name='grossProfitProfitMargin']"); if (grossProfitFinalTotal && incomeFinalTotal) { - grossProfitProfitMargin.val(100 * grossProfitFinalTotal / incomeFinalTotal); + grossProfitProfitMargin.val(f2(100 * grossProfitFinalTotal / incomeFinalTotal)); } else { grossProfitProfitMargin.val(""); } @@ -352,7 +352,7 @@ function calContributionMarginProfitMargin() { var contributionMarginProfitMargin = $("input[name='contributionMarginProfitMargin']"); if (contributionMarginFinalTotal && incomeFinalTotal) { - contributionMarginProfitMargin.val(100 * contributionMarginFinalTotal / incomeFinalTotal); + contributionMarginProfitMargin.val(f2(100 * contributionMarginFinalTotal / incomeFinalTotal)); } else { contributionMarginProfitMargin.val(""); } @@ -384,12 +384,23 @@ function calNetMarginProfitMargin() { var netMarginProfitMargin = $("input[name='netMarginProfitMargin']"); if (netMarginFinalTotal && incomeFinalTotal) { - netMarginProfitMargin.val(100 * netMarginFinalTotal / incomeFinalTotal); + netMarginProfitMargin.val(f2(100 * netMarginFinalTotal / incomeFinalTotal)); } else { netMarginProfitMargin.val(""); } } +function f2(x) { + if(!x){ + return 0; + } + var f = parseFloat(x); + if (isNaN(f)) { + return 0; + } + return Math.round(x*100)/100; +} + diff --git a/src/main/resources/static/assets/js/project_settle.js b/src/main/resources/static/assets/js/project_settle.js index 9efb385..3c72c17 100644 --- a/src/main/resources/static/assets/js/project_settle.js +++ b/src/main/resources/static/assets/js/project_settle.js @@ -557,7 +557,7 @@ function calGrossProfitProfitMargin() { var grossProfitProfitMargin = $("input[name='grossProfitProfitMargin']"); if(grossProfitSettleTotal && incomeSettleTotal){ - grossProfitProfitMargin.val(100*(parseFloat(grossProfitSettleTotal)/parseFloat(incomeSettleTotal))); + grossProfitProfitMargin.val(f2(100*(parseFloat(grossProfitSettleTotal)/parseFloat(incomeSettleTotal)))); }else { grossProfitProfitMargin.val(""); } @@ -605,7 +605,7 @@ function calContributionProfitProfitMargin() { var contributionProfitProfitMargin = $("input[name='contributionProfitProfitMargin']"); if(contributionProfitSettleTotal && incomeSettleTotal){ - contributionProfitProfitMargin.val(100*(parseFloat(contributionProfitSettleTotal)/parseFloat(incomeSettleTotal))); + contributionProfitProfitMargin.val(f2(100*(parseFloat(contributionProfitSettleTotal)/parseFloat(incomeSettleTotal)))); }else { contributionProfitProfitMargin.val(""); } @@ -653,7 +653,7 @@ function calNetProfitProfitMargin() { var netProfitProfitMargin = $("input[name='netProfitProfitMargin']"); if(netProfitSettleTotal && incomeSettleTotal){ - netProfitProfitMargin.val(100*(parseFloat(netProfitSettleTotal)/parseFloat(incomeSettleTotal))); + netProfitProfitMargin.val(f2(100*(parseFloat(netProfitSettleTotal)/parseFloat(incomeSettleTotal)))); }else { netProfitProfitMargin.val(""); } @@ -955,6 +955,17 @@ function calNetIncreaseMonetaryFunds() { } } +function f2(x) { + if(!x){ + return 0; + } + var f = parseFloat(x); + if (isNaN(f)) { + return 0; + } + return Math.round(x*100)/100; +} + diff --git a/src/main/resources/templates/admin/project_final_add.ftl b/src/main/resources/templates/admin/project_final_add.ftl index 2a24e9e..1d5436d 100644 --- a/src/main/resources/templates/admin/project_final_add.ftl +++ b/src/main/resources/templates/admin/project_final_add.ftl @@ -51,7 +51,7 @@