From f5c1a994fe3a71dff4f60d29176826ef8ac6b34b Mon Sep 17 00:00:00 2001 From: xxssyyyyssxx Date: Thu, 4 Nov 2021 16:55:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=99=E9=A2=9D=E7=9A=84=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E9=94=99=E8=AF=AF=EF=BC=8C=E5=85=88=E6=B3=A8?= =?UTF-8?q?=E9=87=8A=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../work/service/ProjectBudgetService.java | 5 ++- .../static/assets/js/project_budget_plan.js | 38 ++++++++++++++----- 2 files changed, 32 insertions(+), 11 deletions(-) diff --git a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java index 6750a93..b4637d3 100644 --- a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java +++ b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java @@ -376,13 +376,16 @@ public class ProjectBudgetService { saleIncome = saleIncome.add(budgetPlan.getSaleIncome()); earnestMoneyIncome = earnestMoneyIncome.add(budgetPlan.getEarnestMoneyIncome()); totalIncome = totalIncome.add(budgetPlan.getTotalIncome()); - fundBalance = fundBalance.add(budgetPlan.getFundBalance()); + /*fundBalance = fundBalance.add(budgetPlan.getFundBalance());*/ capitalInterest = capitalInterest.add(budgetPlan.getCapitalInterest()); underwrittenPlan = underwrittenPlan.add(budgetPlan.getUnderwrittenPlan()); repaymentPlan = repaymentPlan.add(budgetPlan.getRepaymentPlan()); } } + //总余额等于总收入-总支出 + fundBalance = totalIncome.subtract(fundBalance); + projectBudgetPlanDetail.setMonth("合计"); projectBudgetPlanDetail.setDeviceCost(deviceCost); diff --git a/src/main/resources/static/assets/js/project_budget_plan.js b/src/main/resources/static/assets/js/project_budget_plan.js index 729da2c..e4b6774 100644 --- a/src/main/resources/static/assets/js/project_budget_plan.js +++ b/src/main/resources/static/assets/js/project_budget_plan.js @@ -62,10 +62,14 @@ function bindBudgetPlanDeleteBtn() { updateBudgetPlanTotal("input-changeable-sale-income-budget-plan","input-total-sale-income-budget-plan"); updateBudgetPlanTotal("input-changeable-earnest-money-income-budget-plan","input-total-earnest-money-income-budget-plan"); updateBudgetPlanTotal("input-changeable-total-income-budget-plan","input-total-total-income-budget-plan"); - updateBudgetPlanTotal("input-changeable-fund-balance-budget-plan","input-total-fund-balance-budget-plan"); updateBudgetPlanTotal("input-changeable-capital-interest-budget-plan","input-total-capital-interest-budget-plan"); updateBudgetPlanTotal("input-changeable-underwritten-plan-budget-plan","input-total-underwritten-plan-budget-plan"); updateBudgetPlanTotal("input-changeable-repayment-plan-budget-plan","input-total-repayment-plan-budget-plan"); + /*updateBudgetPlanTotal("input-changeable-fund-balance-budget-plan","input-total-fund-balance-budget-plan");*/ + + //每个月的余额=本月收入-支出+上月余额 + + }); } @@ -79,10 +83,11 @@ function bindChangeableInputBudgetPlanDetail() { var earnestMoneyCost = parseFloat($(this).parent().parent().find(".input-changeable-earnest-money-cost-budget-plan").val()); console.log(deviceCost,engineerCost,projectManageCost,earnestMoneyCost); + //更新本月所有项支出 $(this).parent().parent().find(".input-changeable-total-cost-budget-plan").val(deviceCost+engineerCost+projectManageCost+earnestMoneyCost); - - + //更新所有月设备支出总额 updateBudgetPlanTotal("input-changeable-device-cost-budget-plan","input-total-device-cost-budget-plan"); + //更新所有月支出总额 updateBudgetPlanTotal("input-changeable-total-cost-budget-plan","input-total-total-cost-budget-plan"); }); //工程支出改变 @@ -94,9 +99,11 @@ function bindChangeableInputBudgetPlanDetail() { var earnestMoneyCost = parseFloat($(this).parent().parent().find(".input-changeable-earnest-money-cost-budget-plan").val()); console.log(deviceCost,engineerCost,projectManageCost,earnestMoneyCost); + //更新本月所有项支出 $(this).parent().parent().find(".input-changeable-total-cost-budget-plan").val(deviceCost+engineerCost+projectManageCost+earnestMoneyCost); - + //更新所有月工程支出总额 updateBudgetPlanTotal("input-changeable-engineer-cost-budget-plan","input-total-engineer-cost-budget-plan"); + //更新所有月支出总额 updateBudgetPlanTotal("input-changeable-total-cost-budget-plan","input-total-total-cost-budget-plan"); }); //经营性支出改变 @@ -108,9 +115,11 @@ function bindChangeableInputBudgetPlanDetail() { var earnestMoneyCost = parseFloat($(this).parent().parent().find(".input-changeable-earnest-money-cost-budget-plan").val()); console.log(deviceCost,engineerCost,projectManageCost,earnestMoneyCost); + //更新本月所有项支出 $(this).parent().parent().find(".input-changeable-total-cost-budget-plan").val(deviceCost+engineerCost+projectManageCost+earnestMoneyCost); - + //更新所有月经营性支出总额 updateBudgetPlanTotal("input-changeable-project-manage-cost-budget-plan","input-total-project-manage-cost-budget-plan"); + //更新所有月支出总额 updateBudgetPlanTotal("input-changeable-total-cost-budget-plan","input-total-total-cost-budget-plan"); }); //保证金改变 @@ -122,9 +131,11 @@ function bindChangeableInputBudgetPlanDetail() { var projectManageCost = parseFloat($(this).parent().parent().find(".input-changeable-project-manage-cost-budget-plan").val()); console.log(deviceCost,engineerCost,projectManageCost,earnestMoneyCost); + //更新本月所有项支出 $(this).parent().parent().find(".input-changeable-total-cost-budget-plan").val(deviceCost+engineerCost+projectManageCost+earnestMoneyCost); - + //更新所有月保证金支出总额 updateBudgetPlanTotal("input-changeable-earnest-money-cost-budget-plan","input-total-earnest-money-cost-budget-plan"); + //更新所有月支出总额 updateBudgetPlanTotal("input-changeable-total-cost-budget-plan","input-total-total-cost-budget-plan"); }); @@ -135,9 +146,11 @@ function bindChangeableInputBudgetPlanDetail() { var earnestMoneyIncome = parseFloat($(this).parent().parent().find(".input-changeable-earnest-money-income-budget-plan").val()); console.log(saleIncome, earnestMoneyIncome); + //更新本月所有项收入 $(this).parent().parent().find(".input-changeable-total-income-budget-plan").val(saleIncome+earnestMoneyIncome); - + //更新所有月销售收款总额 updateBudgetPlanTotal("input-changeable-sale-income-budget-plan","input-total-sale-income-budget-plan"); + //更新所有月收入总额 updateBudgetPlanTotal("input-changeable-total-income-budget-plan","input-total-total-income-budget-plan"); }); //保证金收款改变 @@ -147,17 +160,19 @@ function bindChangeableInputBudgetPlanDetail() { var saleIncome = parseFloat($(this).parent().parent().find(".input-changeable-sale-income-budget-plan").val()); console.log(saleIncome, earnestMoneyIncome); + //更新本月所有项收入 $(this).parent().parent().find(".input-changeable-total-income-budget-plan").val(saleIncome+earnestMoneyIncome); - + //更新所有月保证金收款总额 updateBudgetPlanTotal("input-changeable-earnest-money-income-budget-plan","input-total-earnest-money-income-budget-plan"); + //更新所有月收入总额 updateBudgetPlanTotal("input-changeable-total-income-budget-plan","input-total-total-income-budget-plan"); }); - //资金余额改变 + /*//资金余额改变 $(".input-changeable-fund-balance-budget-plan").change(function () { updateBudgetPlanTotal("input-changeable-fund-balance-budget-plan","input-total-fund-balance-budget-plan"); - }); + });*/ //资金利息改变 $(".input-changeable-capital-interest-budget-plan").change(function () { updateBudgetPlanTotal("input-changeable-capital-interest-budget-plan","input-total-capital-interest-budget-plan"); @@ -185,6 +200,9 @@ function updateBudgetPlanTotal(className, totalClassName) { $("."+totalClassName).val(total); } + + + /** * 更新页面收入的数据 */