diff --git a/src/main/resources/static/assets/js/project_budget_cost.js b/src/main/resources/static/assets/js/project_budget_cost.js index 71f78ce..992c14d 100644 --- a/src/main/resources/static/assets/js/project_budget_cost.js +++ b/src/main/resources/static/assets/js/project_budget_cost.js @@ -187,9 +187,9 @@ function updateCostData(data, returnData) { //资金计划表中的 - $(".input-total-title-device-cost-budget-plan").val(f2(deviceTaxExclude)); - $(".input-total-title-engineer-cost-budget-plan").val(f2(f2(buildTaxExclude)+f2(serviceTaxExclude)+f2(otherTaxExclude))); - $(".input-total-title-total-cost-budget-plan").val(f2(f2(deviceTaxExclude)+f2(buildTaxExclude)+f2(serviceTaxExclude)+f2(otherTaxExclude) + $(".input-total-title-device-cost-budget-plan").val(f2(deviceTaxInclude)); + $(".input-total-title-engineer-cost-budget-plan").val(f2(f2(deviceTaxInclude)+f2(serviceTaxInclude)+f2(otherTaxInclude))); + $(".input-total-title-total-cost-budget-plan").val(f2(f2(deviceTaxInclude)+f2(buildTaxInclude)+f2(serviceTaxInclude)+f2(otherTaxInclude) +f2($(".input-total-title-project-manage-cost-budget-plan").val()) +f2($(".input-total-title-earnest-money-cost-budget-plan").val()))); diff --git a/src/main/resources/static/assets/js/project_budget_cost_project_manage.js b/src/main/resources/static/assets/js/project_budget_cost_project_manage.js index 91866b3..6a61c93 100644 --- a/src/main/resources/static/assets/js/project_budget_cost_project_manage.js +++ b/src/main/resources/static/assets/js/project_budget_cost_project_manage.js @@ -96,7 +96,15 @@ function updateCostProjectManageData(data,returnData) { var buildTaxExclude = $("input[name='costPurchaseBuildTaxExclude']").val(); var serviceTaxExclude = $("input[name='costPurchaseServiceTaxExclude']").val(); var otherTaxExclude = $("input[name='costPurchaseOtherTaxExclude']").val(); - $(".input-total-title-total-cost-budget-plan").val(f2(f2(deviceTaxExclude)+f2(buildTaxExclude)+f2(serviceTaxExclude)+f2(otherTaxExclude) + // $(".input-total-title-total-cost-budget-plan").val(f2(f2(deviceTaxExclude)+f2(buildTaxExclude)+f2(serviceTaxExclude)+f2(otherTaxExclude) + // +total + // +f2($(".input-total-title-earnest-money-cost-budget-plan").val()))); + + var deviceTaxInclude = $("input[name='costPurchaseDeviceTaxInclude']").val(); + var buildTaxInclude = $("input[name='costPurchaseBuildTaxInclude']").val(); + var serviceTaxInclude = $("input[name='costPurchaseServiceTaxInclude']").val(); + var otherTaxInclude = $("input[name='costPurchaseOtherTaxInclude']").val(); + $(".input-total-title-total-cost-budget-plan").val(f2(f2(deviceTaxInclude)+f2(buildTaxInclude)+f2(serviceTaxInclude)+f2(otherTaxInclude) +total +f2($(".input-total-title-earnest-money-cost-budget-plan").val()))); diff --git a/src/main/resources/static/assets/js/project_budget_income.js b/src/main/resources/static/assets/js/project_budget_income.js index 75b758f..b718a04 100644 --- a/src/main/resources/static/assets/js/project_budget_income.js +++ b/src/main/resources/static/assets/js/project_budget_income.js @@ -60,8 +60,8 @@ function updateIncomeData(data,returnData) { $("input[name='incomeTotalTaxExclude']").val(f2(deviceTaxExclude+engineerTaxExclude+serviceTaxExclude)); - $(".input-total-title-sale-income-budget-plan").val($("input[name='incomeTotalTaxExclude']").val()); - $(".input-total-title-total-income-budget-plan").val(f2($("input[name='incomeTotalTaxExclude']").val()) + $(".input-total-title-sale-income-budget-plan").val($("input[name='incomeTotalTaxInclude']").val()); + $(".input-total-title-total-income-budget-plan").val(f2($("input[name='incomeTotalTaxInclude']").val()) +f2($(".input-total-title-earnest-money-income-budget-plan").val()));