From b2bc013ec7d64896c16af0dc1e940c2c6ea7abae Mon Sep 17 00:00:00 2001 From: OathK1per Date: Tue, 30 Nov 2021 18:14:23 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=90=E5=88=B6=E8=AE=A1=E7=AE=97=E5=90=8E?= =?UTF-8?q?=E7=9A=84=E5=B0=8F=E6=95=B0=E4=BD=8D=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/assets/js/project_final.js | 28 +++--- .../static/assets/js/project_settle.js | 88 +++++++++---------- 2 files changed, 58 insertions(+), 58 deletions(-) diff --git a/src/main/resources/static/assets/js/project_final.js b/src/main/resources/static/assets/js/project_final.js index 931ec0b..691b81d 100644 --- a/src/main/resources/static/assets/js/project_final.js +++ b/src/main/resources/static/assets/js/project_final.js @@ -148,8 +148,8 @@ function calNetCashFlow() { if (saleIncomeCash && taxReturn && earnestMoneyIncome && purchaseCost && taxCost && earnestMoneyCost) { - netCashFlow.val(parseFloat(saleIncomeCash) + parseFloat(taxReturn) + parseFloat(earnestMoneyIncome) - - parseFloat(purchaseCost) - parseFloat(taxCost) - parseFloat(earnestMoneyCost)); + netCashFlow.val((parseFloat(saleIncomeCash) + parseFloat(taxReturn) + parseFloat(earnestMoneyIncome) + - parseFloat(purchaseCost) - parseFloat(taxCost) - parseFloat(earnestMoneyCost)).toFixed(2)); } else { netCashFlow.val(""); } @@ -165,7 +165,7 @@ function calNetCashFromInvestingActivities() { var netCashFromInvestingActivities = $("input[name='netCashFromInvestingActivities']"); if (cashInflowFromInvestingActivities && cashOutflowFromInvestingActivities) { - netCashFromInvestingActivities.val(parseFloat(cashInflowFromInvestingActivities) - parseFloat(cashOutflowFromInvestingActivities)); + netCashFromInvestingActivities.val((parseFloat(cashInflowFromInvestingActivities) - parseFloat(cashOutflowFromInvestingActivities)).toFixed(2)); } else { netCashFromInvestingActivities.val(""); } @@ -181,7 +181,7 @@ function calFinancingCapitalCashflow() { var financingCapitalCashflow = $("input[name='financingCapitalCashflow']"); if (financingCapitalInflow && financingCapitalOutflow) { - financingCapitalCashflow.val(parseFloat(financingCapitalInflow) - parseFloat(financingCapitalOutflow)); + financingCapitalCashflow.val((parseFloat(financingCapitalInflow) - parseFloat(financingCapitalOutflow)).toFixed(2)); } else { financingCapitalCashflow.val(""); } @@ -195,7 +195,7 @@ function calNetIncreaseMonetaryFunds() { var netIncreaseMonetaryFunds = $("input[name='netIncreaseMonetaryFunds']"); if (netCashFlow && netCashFromInvestingActivities && financingCapitalCashflow) { - netIncreaseMonetaryFunds.val(parseFloat(netCashFlow) + parseFloat(netCashFromInvestingActivities) + parseFloat(financingCapitalCashflow)); + netIncreaseMonetaryFunds.val((parseFloat(netCashFlow) + parseFloat(netCashFromInvestingActivities) + parseFloat(financingCapitalCashflow)).toFixed(2)); } else { netIncreaseMonetaryFunds.val(""); } @@ -212,7 +212,7 @@ function calIncomeFinalTotal() { var incomeFinalTotal = $("input[name='incomeFinalTotal']"); if (incomeDeviceFinalTotal && incomeEngineerFinalTotal && incomeServiceFinalTotal) { - incomeFinalTotal.val(parseFloat(incomeDeviceFinalTotal) + parseFloat(incomeEngineerFinalTotal) + parseFloat(incomeServiceFinalTotal)); + incomeFinalTotal.val((parseFloat(incomeDeviceFinalTotal) + parseFloat(incomeEngineerFinalTotal) + parseFloat(incomeServiceFinalTotal)).toFixed(2)); } else { incomeFinalTotal.val(""); } @@ -233,8 +233,8 @@ function calCostFinalTotal() { if (costPurchaseDeviceFinalTotal && costPurchaseBuildFinalTotal && costPurchaseServiceFinalTotal && costPurchaseOtherFinalTotal && costProjectManageFinalTotal && costOtherFinalTotal) { - costFinalTotal.val(parseFloat(costPurchaseDeviceFinalTotal) + parseFloat(costPurchaseBuildFinalTotal) + parseFloat(costPurchaseServiceFinalTotal) + - parseFloat(costPurchaseOtherFinalTotal) + parseFloat(costProjectManageFinalTotal) + parseFloat(costOtherFinalTotal)); + costFinalTotal.val((parseFloat(costPurchaseDeviceFinalTotal) + parseFloat(costPurchaseBuildFinalTotal) + parseFloat(costPurchaseServiceFinalTotal) + + parseFloat(costPurchaseOtherFinalTotal) + parseFloat(costProjectManageFinalTotal) + parseFloat(costOtherFinalTotal)).toFixed(2)); } else { costFinalTotal.val(""); } @@ -252,7 +252,7 @@ function calManageFinalTotal() { var manageFinalTotal = $("input[name='manageFinalTotal']"); if (costExpropriationFinalTotal && costCompanyManageFinalTotal && costIncomeTaxFinalTotal) { - manageFinalTotal.val(parseFloat(costExpropriationFinalTotal) + parseFloat(costCompanyManageFinalTotal) + parseFloat(costIncomeTaxFinalTotal)); + manageFinalTotal.val((parseFloat(costExpropriationFinalTotal) + parseFloat(costCompanyManageFinalTotal) + parseFloat(costIncomeTaxFinalTotal)).toFixed(2)); } else { manageFinalTotal.val(""); } @@ -284,11 +284,11 @@ function calCashFluxFinalTotal() { netCashFlow && cashInflowFromInvestingActivities && cashOutflowFromInvestingActivities && netCashFromInvestingActivities && financingCapitalInflow && financingCapitalOutflow && financingCapitalCashflow && netIncreaseMonetaryFunds) { - cashFluxFinalTotal.val(parseFloat(saleIncomeCash) + parseFloat(taxReturn) + parseFloat(earnestMoneyIncome) + + cashFluxFinalTotal.val((parseFloat(saleIncomeCash) + parseFloat(taxReturn) + parseFloat(earnestMoneyIncome) + parseFloat(purchaseCost) + parseFloat(taxCost) + parseFloat(earnestMoneyCost) + parseFloat(netCashFlow) + parseFloat(cashInflowFromInvestingActivities) + parseFloat(cashOutflowFromInvestingActivities) + parseFloat(netCashFromInvestingActivities) + parseFloat(financingCapitalInflow) + parseFloat(financingCapitalOutflow) + - parseFloat(financingCapitalCashflow) + parseFloat(netIncreaseMonetaryFunds)); + parseFloat(financingCapitalCashflow) + parseFloat(netIncreaseMonetaryFunds)).toFixed(2)); } else { cashFluxFinalTotal.val(""); } @@ -305,7 +305,7 @@ function calGrossProfitFinalTotal() { var grossProfitFinalTotal = $("input[name='grossProfitFinalTotal']"); if (incomeFinalTotal && costFinalTotal && costExpropriationFinalTotal) { - grossProfitFinalTotal.val(parseFloat(incomeFinalTotal) - parseFloat(costFinalTotal) - parseFloat(costExpropriationFinalTotal)); + grossProfitFinalTotal.val((parseFloat(incomeFinalTotal) - parseFloat(costFinalTotal) - parseFloat(costExpropriationFinalTotal)).toFixed(2)); } else { grossProfitFinalTotal.val(""); } @@ -337,7 +337,7 @@ function calContributionMarginFinalTotal() { var contributionMarginFinalTotal = $("input[name='contributionMarginFinalTotal']"); if (grossProfitFinalTotal && costCompanyManageFinalTotal) { - contributionMarginFinalTotal.val(parseFloat(grossProfitFinalTotal) - parseFloat(costCompanyManageFinalTotal)); + contributionMarginFinalTotal.val((parseFloat(grossProfitFinalTotal) - parseFloat(costCompanyManageFinalTotal)).toFixed(2)); } else { contributionMarginFinalTotal.val(""); } @@ -369,7 +369,7 @@ function calNetMarginFinalTotal() { var netMarginFinalTotal = $("input[name='netMarginFinalTotal']"); if (contributionMarginFinalTotal && costIncomeTaxFinalTotal) { - netMarginFinalTotal.val(parseFloat(contributionMarginFinalTotal) - parseFloat(costIncomeTaxFinalTotal)); + netMarginFinalTotal.val((parseFloat(contributionMarginFinalTotal) - parseFloat(costIncomeTaxFinalTotal)).toFixed(2)); } else { netMarginFinalTotal.val(""); } diff --git a/src/main/resources/static/assets/js/project_settle.js b/src/main/resources/static/assets/js/project_settle.js index 3c72c17..f5b72cb 100644 --- a/src/main/resources/static/assets/js/project_settle.js +++ b/src/main/resources/static/assets/js/project_settle.js @@ -222,7 +222,7 @@ function calIncomeDeviceSettleTotal() { var incomeDeviceSettleTotal = $("input[name='incomeDeviceSettleTotal']"); if(incomeDeviceFormerSettleTotal && incomeDevice){ - incomeDeviceSettleTotal.val(parseFloat(incomeDeviceFormerSettleTotal)+parseFloat(incomeDevice)); + incomeDeviceSettleTotal.val((parseFloat(incomeDeviceFormerSettleTotal)+parseFloat(incomeDevice)).toFixed(2)); }else { incomeDeviceSettleTotal.val(""); } @@ -238,7 +238,7 @@ function calIncomeEngineerSettleTotal() { var incomeEngineerSettleTotal = $("input[name='incomeEngineerSettleTotal']"); if(incomeEngineerFormerSettleTotal && incomeEngineer){ - incomeEngineerSettleTotal.val(parseFloat(incomeEngineerFormerSettleTotal)+parseFloat(incomeEngineer)); + incomeEngineerSettleTotal.val((parseFloat(incomeEngineerFormerSettleTotal)+parseFloat(incomeEngineer)).toFixed(2)); }else { incomeEngineerSettleTotal.val(""); } @@ -254,7 +254,7 @@ function calIncomeServiceSettleTotal() { var incomeServiceSettleTotal = $("input[name='incomeServiceSettleTotal']"); if(incomeServiceFormerSettleTotal && incomeService){ - incomeServiceSettleTotal.val(parseFloat(incomeServiceFormerSettleTotal)+parseFloat(incomeService)); + incomeServiceSettleTotal.val((parseFloat(incomeServiceFormerSettleTotal)+parseFloat(incomeService)).toFixed(2)); }else { incomeServiceSettleTotal.val(""); } @@ -271,7 +271,7 @@ function calIncomeTotal() { var incomeTotal = $("input[name='incomeTotal']"); if(incomeDevice && incomeEngineer && incomeService){ - incomeTotal.val(parseFloat(incomeDevice)+parseFloat(incomeEngineer)+parseFloat(incomeService)); + incomeTotal.val((parseFloat(incomeDevice)+parseFloat(incomeEngineer)+parseFloat(incomeService)).toFixed(2)); }else { incomeTotal.val(""); } @@ -288,7 +288,7 @@ function calIncomeSettleTotal() { var incomeSettleTotal = $("input[name='incomeSettleTotal']"); if(incomeDeviceSettleTotal && incomeEngineerSettleTotal && incomeServiceSettleTotal){ - incomeSettleTotal.val(parseFloat(incomeDeviceSettleTotal)+parseFloat(incomeEngineerSettleTotal)+parseFloat(incomeServiceSettleTotal)); + incomeSettleTotal.val((parseFloat(incomeDeviceSettleTotal)+parseFloat(incomeEngineerSettleTotal)+parseFloat(incomeServiceSettleTotal)).toFixed(2)); }else { incomeSettleTotal.val(""); } @@ -304,7 +304,7 @@ function calCostPurchaseDeviceSettleTotal() { var costPurchaseDeviceSettleTotal = $("input[name='costPurchaseDeviceSettleTotal']"); if(costPurchaseDeviceFormerSettleTotal && costPurchaseDevice){ - costPurchaseDeviceSettleTotal.val(parseFloat(costPurchaseDeviceFormerSettleTotal)+parseFloat(costPurchaseDevice)); + costPurchaseDeviceSettleTotal.val((parseFloat(costPurchaseDeviceFormerSettleTotal)+parseFloat(costPurchaseDevice)).toFixed(2)); }else { costPurchaseDeviceSettleTotal.val(""); } @@ -320,7 +320,7 @@ function calCostPurchaseBuildSettleTotal() { var costPurchaseBuildSettleTotal = $("input[name='costPurchaseBuildSettleTotal']"); if(costPurchaseBuildFormerSettleTotal && costPurchaseBuild){ - costPurchaseBuildSettleTotal.val(parseFloat(costPurchaseBuildFormerSettleTotal)+parseFloat(costPurchaseBuild)); + costPurchaseBuildSettleTotal.val((parseFloat(costPurchaseBuildFormerSettleTotal)+parseFloat(costPurchaseBuild)).toFixed(2)); }else { costPurchaseBuildSettleTotal.val(""); } @@ -336,7 +336,7 @@ function calCostPurchaseServiceSettleTotal() { var costPurchaseServiceSettleTotal = $("input[name='costPurchaseServiceSettleTotal']"); if(costPurchaseServiceFormerSettleTotal && costPurchaseService){ - costPurchaseServiceSettleTotal.val(parseFloat(costPurchaseServiceFormerSettleTotal)+parseFloat(costPurchaseService)); + costPurchaseServiceSettleTotal.val((parseFloat(costPurchaseServiceFormerSettleTotal)+parseFloat(costPurchaseService)).toFixed(2)); }else { costPurchaseServiceSettleTotal.val(""); } @@ -352,7 +352,7 @@ function calCostPurchaseOtherSettleTotal() { var costPurchaseOtherSettleTotal = $("input[name='costPurchaseOtherSettleTotal']"); if(costPurchaseOtherFormerSettleTotal && costPurchaseOther){ - costPurchaseOtherSettleTotal.val(parseFloat(costPurchaseOtherFormerSettleTotal)+parseFloat(costPurchaseOther)); + costPurchaseOtherSettleTotal.val((parseFloat(costPurchaseOtherFormerSettleTotal)+parseFloat(costPurchaseOther)).toFixed(2)); }else { costPurchaseOtherSettleTotal.val(""); } @@ -368,7 +368,7 @@ function calCostProjectManageSettleTotal() { var costProjectManageSettleTotal = $("input[name='costProjectManageSettleTotal']"); if(costProjectManageFormerSettleTotal && costProjectManage){ - costProjectManageSettleTotal.val(parseFloat(costProjectManageFormerSettleTotal)+parseFloat(costProjectManage)); + costProjectManageSettleTotal.val((parseFloat(costProjectManageFormerSettleTotal)+parseFloat(costProjectManage)).toFixed(2)); }else { costProjectManageSettleTotal.val(""); } @@ -384,7 +384,7 @@ function calCostOtherSettleTotal() { var costOtherSettleTotal = $("input[name='costOtherSettleTotal']"); if(costOtherFormerSettleTotal && costOther){ - costOtherSettleTotal.val(parseFloat(costOtherFormerSettleTotal)+parseFloat(costOther)); + costOtherSettleTotal.val((parseFloat(costOtherFormerSettleTotal)+parseFloat(costOther)).toFixed(2)); }else { costOtherSettleTotal.val(""); } @@ -404,7 +404,7 @@ function calCostTotal() { var costTotal = $("input[name='costTotal']"); if(costPurchaseDevice && costPurchaseBuild && costPurchaseService && costPurchaseOther && costProjectManage && costOther){ - costTotal.val(parseFloat(costPurchaseDevice)+parseFloat(costPurchaseBuild)+parseFloat(costPurchaseService)+parseFloat(costPurchaseOther)+parseFloat(costProjectManage)+parseFloat(costOther)); + costTotal.val((parseFloat(costPurchaseDevice)+parseFloat(costPurchaseBuild)+parseFloat(costPurchaseService)+parseFloat(costPurchaseOther)+parseFloat(costProjectManage)+parseFloat(costOther)).toFixed(2)); }else { costTotal.val(""); } @@ -425,8 +425,8 @@ function calCostSettleTotal() { if(costPurchaseDeviceSettleTotal && costPurchaseBuildSettleTotal && costPurchaseServiceSettleTotal && costPurchaseOtherSettleTotal && costProjectManageSettleTotal && costOtherSettleTotal){ - costSettleTotal.val(parseFloat(costPurchaseDeviceSettleTotal)+parseFloat(costPurchaseBuildSettleTotal)+parseFloat(costPurchaseServiceSettleTotal)+ - parseFloat(costPurchaseOtherSettleTotal)+parseFloat(costProjectManageSettleTotal)+parseFloat(costOtherSettleTotal)); + costSettleTotal.val((parseFloat(costPurchaseDeviceSettleTotal)+parseFloat(costPurchaseBuildSettleTotal)+parseFloat(costPurchaseServiceSettleTotal)+ + parseFloat(costPurchaseOtherSettleTotal)+parseFloat(costProjectManageSettleTotal)+parseFloat(costOtherSettleTotal)).toFixed(2)); }else { costSettleTotal.val(""); } @@ -442,7 +442,7 @@ function calCostExpropriationSettleTotal() { var costExpropriationSettleTotal = $("input[name='costExpropriationSettleTotal']"); if(costExpropriationFormerSettleTotal && costExpropriation){ - costExpropriationSettleTotal.val(parseFloat(costExpropriationFormerSettleTotal)+parseFloat(costExpropriation)); + costExpropriationSettleTotal.val((parseFloat(costExpropriationFormerSettleTotal)+parseFloat(costExpropriation)).toFixed(2)); }else { costExpropriationSettleTotal.val(""); } @@ -458,7 +458,7 @@ function calCostCompanyManageSettleTotal() { var costCompanyManageSettleTotal = $("input[name='costCompanyManageSettleTotal']"); if(costCompanyManageFormerSettleTotal && costCompanyManage){ - costCompanyManageSettleTotal.val(parseFloat(costCompanyManageFormerSettleTotal)+parseFloat(costCompanyManage)); + costCompanyManageSettleTotal.val((parseFloat(costCompanyManageFormerSettleTotal)+parseFloat(costCompanyManage)).toFixed(2)); }else { costCompanyManageSettleTotal.val(""); } @@ -474,7 +474,7 @@ function calCostIncomeTaxSettleTotal() { var costIncomeTaxSettleTotal = $("input[name='costIncomeTaxSettleTotal']"); if(costIncomeTaxFormerSettleTotal && costIncomeTax){ - costIncomeTaxSettleTotal.val(parseFloat(costIncomeTaxFormerSettleTotal)+parseFloat(costIncomeTax)); + costIncomeTaxSettleTotal.val((parseFloat(costIncomeTaxFormerSettleTotal)+parseFloat(costIncomeTax)).toFixed(2)); }else { costIncomeTaxSettleTotal.val(""); } @@ -491,7 +491,7 @@ function calCostManageTotal() { var costManageTotal = $("input[name='costManageTotal']"); if(costExpropriation && costCompanyManage && costIncomeTax){ - costManageTotal.val(parseFloat(costExpropriation)+parseFloat(costCompanyManage)+parseFloat(costIncomeTax)); + costManageTotal.val((parseFloat(costExpropriation)+parseFloat(costCompanyManage)+parseFloat(costIncomeTax)).toFixed(2)); }else { costManageTotal.val(""); } @@ -508,7 +508,7 @@ function calCostManageSettleTotal() { var costManageSettleTotal = $("input[name='costManageSettleTotal']"); if(costExpropriationSettleTotal && costCompanyManageSettleTotal && costIncomeTaxSettleTotal){ - costManageSettleTotal.val(parseFloat(costExpropriationSettleTotal)+parseFloat(costCompanyManageSettleTotal)+parseFloat(costIncomeTaxSettleTotal)); + costManageSettleTotal.val((parseFloat(costExpropriationSettleTotal)+parseFloat(costCompanyManageSettleTotal)+parseFloat(costIncomeTaxSettleTotal)).toFixed(2)); }else { costManageSettleTotal.val(""); } @@ -525,7 +525,7 @@ function calGrossProfit() { var grossProfit = $("input[name='grossProfit']"); if(incomeTotal && costTotal && costExpropriation){ - grossProfit.val(parseFloat(incomeTotal)-parseFloat(costTotal)-parseFloat(costExpropriation)); + grossProfit.val((parseFloat(incomeTotal)-parseFloat(costTotal)-parseFloat(costExpropriation)).toFixed(2)); }else { grossProfit.val(""); } @@ -541,7 +541,7 @@ function calGrossProfitSettleTotal() { var grossProfitSettleTotal = $("input[name='grossProfitSettleTotal']"); if(grossProfitFormerSettleTotal && grossProfit){ - grossProfitSettleTotal.val(parseFloat(grossProfitFormerSettleTotal)+parseFloat(grossProfit)); + grossProfitSettleTotal.val((parseFloat(grossProfitFormerSettleTotal)+parseFloat(grossProfit)).toFixed(2)); }else { grossProfitSettleTotal.val(""); } @@ -573,7 +573,7 @@ function calContributionProfit() { var contributionProfit = $("input[name='contributionProfit']"); if(grossProfit && costCompanyManage){ - contributionProfit.val(parseFloat(grossProfit)-parseFloat(costCompanyManage)); + contributionProfit.val((parseFloat(grossProfit)-parseFloat(costCompanyManage)).toFixed(2)); }else { contributionProfit.val(""); } @@ -589,7 +589,7 @@ function calContributionProfitSettleTotal() { var contributionProfitSettleTotal = $("input[name='contributionProfitSettleTotal']"); if(contributionProfitFormerSettleTotal && contributionProfit){ - contributionProfitSettleTotal.val(parseFloat(contributionProfitFormerSettleTotal)+parseFloat(contributionProfit)); + contributionProfitSettleTotal.val((parseFloat(contributionProfitFormerSettleTotal)+parseFloat(contributionProfit)).toFixed(2)); }else { contributionProfitSettleTotal.val(""); } @@ -621,7 +621,7 @@ function calNetProfit() { var netProfit = $("input[name='netProfit']"); if(contributionProfit && costIncomeTax){ - netProfit.val(parseFloat(contributionProfit)-parseFloat(costIncomeTax)); + netProfit.val((parseFloat(contributionProfit)-parseFloat(costIncomeTax)).toFixed(2)); }else { netProfit.val(""); } @@ -637,7 +637,7 @@ function calNetProfitSettleTotal() { var netProfitSettleTotal = $("input[name='netProfitSettleTotal']"); if(netProfitFormerSettleTotal && netProfit){ - netProfitSettleTotal.val(parseFloat(netProfitFormerSettleTotal)+parseFloat(netProfit)); + netProfitSettleTotal.val((parseFloat(netProfitFormerSettleTotal)+parseFloat(netProfit)).toFixed(2)); }else { netProfitSettleTotal.val(""); } @@ -669,7 +669,7 @@ function calSaleIncomeCashSettle() { var saleIncomeCashSettle = $("input[name='saleIncomeCashSettle']"); if(saleIncomeCashFormerSettle && saleIncomeCash){ - saleIncomeCashSettle.val(parseFloat(saleIncomeCashFormerSettle)+parseFloat(saleIncomeCash)); + saleIncomeCashSettle.val((parseFloat(saleIncomeCashFormerSettle)+parseFloat(saleIncomeCash)).toFixed(2)); }else { saleIncomeCashSettle.val(""); } @@ -685,7 +685,7 @@ function calTaxReturnSettle() { var taxReturnSettle = $("input[name='taxReturnSettle']"); if(taxReturnFormerSettle && taxReturn){ - taxReturnSettle.val(parseFloat(taxReturnFormerSettle)+parseFloat(taxReturn)); + taxReturnSettle.val((parseFloat(taxReturnFormerSettle)+parseFloat(taxReturn)).toFixed(2)); }else { taxReturnSettle.val(""); } @@ -701,7 +701,7 @@ function calEarnestMoneyIncomeSettle() { var earnestMoneyIncomeSettle = $("input[name='earnestMoneyIncomeSettle']"); if(earnestMoneyIncomeFormerSettle && earnestMoneyIncome){ - earnestMoneyIncomeSettle.val(parseFloat(earnestMoneyIncomeFormerSettle)+parseFloat(earnestMoneyIncome)); + earnestMoneyIncomeSettle.val((parseFloat(earnestMoneyIncomeFormerSettle)+parseFloat(earnestMoneyIncome)).toFixed(2)); }else { earnestMoneyIncomeSettle.val(""); } @@ -717,7 +717,7 @@ function calPurchaseCostSettle() { var purchaseCostSettle = $("input[name='purchaseCostSettle']"); if(purchaseCostFormerSettle && purchaseCost){ - purchaseCostSettle.val(parseFloat(purchaseCostFormerSettle)+parseFloat(purchaseCost)); + purchaseCostSettle.val((parseFloat(purchaseCostFormerSettle)+parseFloat(purchaseCost)).toFixed(2)); }else { purchaseCostSettle.val(""); } @@ -733,7 +733,7 @@ function calTaxCostSettle() { var taxCostSettle = $("input[name='taxCostSettle']"); if(taxCostFormerSettle && taxCost){ - taxCostSettle.val(parseFloat(taxCostFormerSettle)+parseFloat(taxCost)); + taxCostSettle.val((parseFloat(taxCostFormerSettle)+parseFloat(taxCost)).toFixed(2)); }else { taxCostSettle.val(""); } @@ -750,7 +750,7 @@ function calEarnestMoneyCostSettle() { var earnestMoneyCostSettle = $("input[name='earnestMoneyCostSettle']"); if(earnestMoneyCostFormerSettle && earnestMoneyCost){ - earnestMoneyCostSettle.val(parseFloat(earnestMoneyCostFormerSettle)+parseFloat(earnestMoneyCost)); + earnestMoneyCostSettle.val((parseFloat(earnestMoneyCostFormerSettle)+parseFloat(earnestMoneyCost)).toFixed(2)); }else { earnestMoneyCostSettle.val(""); } @@ -766,7 +766,7 @@ function calNetCashFlowSettle() { var netCashFlowSettle = $("input[name='netCashFlowSettle']"); if(netCashFlowFormerSettle && netCashFlow){ - netCashFlowSettle.val(parseFloat(netCashFlowFormerSettle)+parseFloat(netCashFlow)); + netCashFlowSettle.val((parseFloat(netCashFlowFormerSettle)+parseFloat(netCashFlow)).toFixed(2)); }else { netCashFlowSettle.val(""); } @@ -782,7 +782,7 @@ function calCashInflowFromInvestingActivitiesSettle() { var cashInflowFromInvestingActivitiesSettle = $("input[name='cashInflowFromInvestingActivitiesSettle']"); if(cashInflowFromInvestingActivitiesFormerSettle && cashInflowFromInvestingActivities){ - cashInflowFromInvestingActivitiesSettle.val(parseFloat(cashInflowFromInvestingActivitiesFormerSettle)+parseFloat(cashInflowFromInvestingActivities)); + cashInflowFromInvestingActivitiesSettle.val((parseFloat(cashInflowFromInvestingActivitiesFormerSettle)+parseFloat(cashInflowFromInvestingActivities)).toFixed(2)); }else { cashInflowFromInvestingActivitiesSettle.val(""); } @@ -798,7 +798,7 @@ function calCashOutflowFromInvestingActivitiesSettle() { var cashOutflowFromInvestingActivitiesSettle = $("input[name='cashOutflowFromInvestingActivitiesSettle']"); if(cashOutflowFromInvestingActivitiesFormerSettle && cashOutflowFromInvestingActivities){ - cashOutflowFromInvestingActivitiesSettle.val(parseFloat(cashOutflowFromInvestingActivitiesFormerSettle)+parseFloat(cashOutflowFromInvestingActivities)); + cashOutflowFromInvestingActivitiesSettle.val((parseFloat(cashOutflowFromInvestingActivitiesFormerSettle)+parseFloat(cashOutflowFromInvestingActivities)).toFixed(2)); }else { cashOutflowFromInvestingActivitiesSettle.val(""); } @@ -814,7 +814,7 @@ function calNetCashFromInvestingActivitiesSettle() { var netCashFromInvestingActivitiesSettle = $("input[name='netCashFromInvestingActivitiesSettle']"); if(netCashFromInvestingActivitiesFormerSettle && netCashFromInvestingActivities){ - netCashFromInvestingActivitiesSettle.val(parseFloat(netCashFromInvestingActivitiesFormerSettle)+parseFloat(netCashFromInvestingActivities)); + netCashFromInvestingActivitiesSettle.val((parseFloat(netCashFromInvestingActivitiesFormerSettle)+parseFloat(netCashFromInvestingActivities)).toFixed(2)); }else { netCashFromInvestingActivitiesSettle.val(""); } @@ -830,7 +830,7 @@ function calFinancingCapitalInflowSettle() { var financingCapitalInflowSettle = $("input[name='financingCapitalInflowSettle']"); if(financingCapitalInflowFormerSettle && financingCapitalInflow){ - financingCapitalInflowSettle.val(parseFloat(financingCapitalInflowFormerSettle)+parseFloat(financingCapitalInflow)); + financingCapitalInflowSettle.val((parseFloat(financingCapitalInflowFormerSettle)+parseFloat(financingCapitalInflow)).toFixed(2)); }else { financingCapitalInflowSettle.val(""); } @@ -846,7 +846,7 @@ function calFinancingCapitalOutflowSettle() { var financingCapitalOutflowSettle = $("input[name='financingCapitalOutflowSettle']"); if(financingCapitalOutflowFormerSettle && financingCapitalOutflow){ - financingCapitalOutflowSettle.val(parseFloat(financingCapitalOutflowFormerSettle)+parseFloat(financingCapitalOutflow)); + financingCapitalOutflowSettle.val((parseFloat(financingCapitalOutflowFormerSettle)+parseFloat(financingCapitalOutflow)).toFixed(2)); }else { financingCapitalOutflowSettle.val(""); } @@ -862,7 +862,7 @@ function calFinancingCapitalCashflowSettle() { var financingCapitalCashflowSettle = $("input[name='financingCapitalCashflowSettle']"); if(financingCapitalCashflowFormerSettle && financingCapitalCashflow){ - financingCapitalCashflowSettle.val(parseFloat(financingCapitalCashflowFormerSettle)+parseFloat(financingCapitalCashflow)); + financingCapitalCashflowSettle.val((parseFloat(financingCapitalCashflowFormerSettle)+parseFloat(financingCapitalCashflow)).toFixed(2)); }else { financingCapitalCashflowSettle.val(""); } @@ -878,7 +878,7 @@ function calNetIncreaseMonetaryFundsSettle() { var netIncreaseMonetaryFundsSettle = $("input[name='netIncreaseMonetaryFundsSettle']"); if(netIncreaseMonetaryFundsFormerSettle && netIncreaseMonetaryFunds){ - netIncreaseMonetaryFundsSettle.val(parseFloat(netIncreaseMonetaryFundsFormerSettle)+parseFloat(netIncreaseMonetaryFunds)); + netIncreaseMonetaryFundsSettle.val((parseFloat(netIncreaseMonetaryFundsFormerSettle)+parseFloat(netIncreaseMonetaryFunds)).toFixed(2)); }else { netIncreaseMonetaryFundsSettle.val(""); } @@ -899,8 +899,8 @@ function calNetCashFlow() { if(saleIncomeCash && taxReturn && earnestMoneyIncome && purchaseCost && taxCost && earnestMoneyCost) { - netCashFlow.val(parseFloat(saleIncomeCash)+parseFloat(taxReturn)+parseFloat(earnestMoneyIncome)- - parseFloat(purchaseCost)-parseFloat(taxCost)-parseFloat(earnestMoneyCost)); + netCashFlow.val((parseFloat(saleIncomeCash)+parseFloat(taxReturn)+parseFloat(earnestMoneyIncome)- + parseFloat(purchaseCost)-parseFloat(taxCost)-parseFloat(earnestMoneyCost)).toFixed(2)); }else { netCashFlow.val(""); } @@ -916,7 +916,7 @@ function calNetCashFromInvestingActivities() { var netCashFromInvestingActivities = $("input[name='netCashFromInvestingActivities']"); if(cashInflowFromInvestingActivities && cashOutflowFromInvestingActivities){ - netCashFromInvestingActivities.val(parseFloat(cashInflowFromInvestingActivities)-parseFloat(cashOutflowFromInvestingActivities)); + netCashFromInvestingActivities.val((parseFloat(cashInflowFromInvestingActivities)-parseFloat(cashOutflowFromInvestingActivities)).toFixed(2)); }else { netCashFromInvestingActivities.val(""); } @@ -932,7 +932,7 @@ function calFinancingCapitalCashflow() { var financingCapitalCashflow = $("input[name='financingCapitalCashflow']"); if(financingCapitalInflow && financingCapitalOutflow){ - financingCapitalCashflow.val(parseFloat(financingCapitalInflow)-parseFloat(financingCapitalOutflow)); + financingCapitalCashflow.val((parseFloat(financingCapitalInflow)-parseFloat(financingCapitalOutflow)).toFixed(2)); }else { financingCapitalCashflow.val(""); } @@ -949,7 +949,7 @@ function calNetIncreaseMonetaryFunds() { var netIncreaseMonetaryFunds = $("input[name='netIncreaseMonetaryFunds']"); if(netCashFlow && netCashFromInvestingActivities && financingCapitalCashflow){ - netIncreaseMonetaryFunds.val(parseFloat(netCashFlow)+parseFloat(netCashFromInvestingActivities)+parseFloat(financingCapitalCashflow)); + netIncreaseMonetaryFunds.val((parseFloat(netCashFlow)+parseFloat(netCashFromInvestingActivities)+parseFloat(financingCapitalCashflow)).toFixed(2)); }else { netIncreaseMonetaryFunds.val(""); }