diff --git a/src/main/resources/static/assets/js/project_estimate.js b/src/main/resources/static/assets/js/project_estimate.js index f8327d7..ed0a1b1 100644 --- a/src/main/resources/static/assets/js/project_estimate.js +++ b/src/main/resources/static/assets/js/project_estimate.js @@ -134,7 +134,7 @@ function calIncomeCost() { var incomeTotalTaxExcludeValue = f2(incomeTotalTaxExclude); if (incomeTotalTaxExcludeValue != 0) { $projectGrossProfit.val(f2(incomeTotalTaxExclude) - f2(costTotalTaxExclude) - f2(costExpropriationTaxExclude)); - $projectGrossProfitRate.val(f2($projectGrossProfit.val()) * 100 / incomeTotalTaxExcludeValue); + $projectGrossProfitRate.val(f2(f2($projectGrossProfit.val()) * 100 / incomeTotalTaxExcludeValue)); } else { $projectGrossProfit.val(""); $projectGrossProfitRate.val(""); @@ -142,7 +142,7 @@ function calIncomeCost() { if ($projectGrossProfit.val()) { $projectContributionProfit.val(f2($projectGrossProfit.val()) - f2(costCompanyManageTaxExclude)); - $projectContributionProfitRate.val(f2($projectContributionProfit.val()) * 100 / f2(incomeTotalTaxExclude)) + $projectContributionProfitRate.val(f2(f2($projectContributionProfit.val()) * 100 / f2(incomeTotalTaxExclude))) } else { $projectContributionProfit.val(""); $projectContributionProfitRate.val("");