Merge remote-tracking branch 'origin/master'

src/main/resources/static/assets/js/project_budget_plan.js

@@ -130,16 +130,7 @@ function bindBudgetPlanDeleteBtn() {
         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");
 
-        //更新余额
+        updatePageData();
-        updateEachFundBalance();
-        //更新垫资计划
-        updateEachUnderwrittenPlan();
-        //更新回款计划
-        updateEachRepaymentPlan();
-        //更新资金利息
-        updateEachCapitalInterest();
-        //更新垫资峰值月
-        updateUnderwrittenInfo();
 
     });
 }
@@ -159,16 +150,8 @@ function bindChangeableInputBudgetPlanDetail() {
         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");
-        //更新余额
+
-        updateEachFundBalance();
+        updatePageData();
-        //更新垫资计划
-        updateEachUnderwrittenPlan();
-        //更新回款计划
-        updateEachRepaymentPlan();
-        //更新资金利息
-        updateEachCapitalInterest();
-        //更新垫资峰值月
-        updateUnderwrittenInfo();
     });
     //工程支出改变
     $(".input-changeable-engineer-cost-budget-plan").change(function () {
@@ -184,16 +167,8 @@ function bindChangeableInputBudgetPlanDetail() {
         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");
-        //更新余额
+
-        updateEachFundBalance();
+        updatePageData();
-        //更新垫资计划
-        updateEachUnderwrittenPlan();
-        //更新回款计划
-        updateEachRepaymentPlan();
-        //更新资金利息
-        updateEachCapitalInterest();
-        //更新垫资峰值月
-        updateUnderwrittenInfo();
     });
     //经营性支出改变
     $(".input-changeable-project-manage-cost-budget-plan").change(function () {
@@ -209,16 +184,8 @@ function bindChangeableInputBudgetPlanDetail() {
         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");
-        //更新余额
+
-        updateEachFundBalance();
+        updatePageData();
-        //更新垫资计划
-        updateEachUnderwrittenPlan();
-        //更新回款计划
-        updateEachRepaymentPlan();
-        //更新资金利息
-        updateEachCapitalInterest();
-        //更新垫资峰值月
-        updateUnderwrittenInfo();
     });
     //保证金改变
     $(".input-changeable-earnest-money-cost-budget-plan").change(function () {
@@ -234,16 +201,8 @@ function bindChangeableInputBudgetPlanDetail() {
         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");
-        //更新余额
+
-        updateEachFundBalance();
+        updatePageData();
-        //更新垫资计划
-        updateEachUnderwrittenPlan();
-        //更新回款计划
-        updateEachRepaymentPlan();
-        //更新资金利息
-        updateEachCapitalInterest();
-        //更新垫资峰值月
-        updateUnderwrittenInfo();
     });
 
     //销售收款改变
@@ -258,16 +217,8 @@ function bindChangeableInputBudgetPlanDetail() {
         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");
-        //更新余额
+
-        updateEachFundBalance();
+        updatePageData();
-        //更新垫资计划
-        updateEachUnderwrittenPlan();
-        //更新回款计划
-        updateEachRepaymentPlan();
-        //更新资金利息
-        updateEachCapitalInterest();
-        //更新垫资峰值月
-        updateUnderwrittenInfo();
     });
     //保证金收款改变
     $(".input-changeable-earnest-money-income-budget-plan").change(function () {
@@ -281,16 +232,8 @@ function bindChangeableInputBudgetPlanDetail() {
         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");
-        //更新余额
+
-        updateEachFundBalance();
+        updatePageData();
-        //更新垫资计划
-        updateEachUnderwrittenPlan();
-        //更新回款计划
-        updateEachRepaymentPlan();
-        //更新资金利息
-        updateEachCapitalInterest();
-        //更新垫资峰值月
-        updateUnderwrittenInfo();
     });
 
 
@@ -312,6 +255,20 @@ function bindChangeableInputBudgetPlanDetail() {
     });
 }
 
+
+function updatePageData() {
+    //更新余额
+    updateEachFundBalance();
+    //更新垫资计划
+    updateEachUnderwrittenPlan();
+    //更新回款计划
+    updateEachRepaymentPlan();
+    //更新资金利息
+    updateEachCapitalInterest();
+    //更新垫资峰值月
+    updateUnderwrittenInfo();
+}
+
 /**
  * 更新每列的总计
  */
@@ -614,10 +571,10 @@ function updateCashFlow() {
     var m = f2(f2(underwrittenPlan)-f2(repaymentPlan));
     var n = f2(g+0+m);
 
-    console.log(saleIncome,earnestMoneyIncome,deviceCost,
+    /*console.log(saleIncome,earnestMoneyIncome,deviceCost,
         engineerCost,projectManageCost,earnestMoneyCost,
         capitalInterest,underwrittenPlan,repaymentPlan,
-        d,f,g,m,m);
+        d,f,g,m,m);*/
 
 
     $("input[name='saleIncomeCash']").val(saleIncome);