垫资计划和回款计划公式提取

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

@@ -297,6 +297,24 @@ function updateEachUnderwrittenPlan() {
             prevFundBalance = 0;
         }
 
+        var underwrittenPlan = calUnderwrittenPlan(income, cost, prevFundBalance);
+
+        total += underwrittenPlan;
+
+        $(this).val(underwrittenPlan);
+    });
+
+    //总垫资计划=所有月累加
+    $(".input-total-underwritten-plan-budget-plan").val(total);
+}
+
+/**
+ * 计算垫资计划
+ * @param income 收入
+ * @param cost 支出
+ * @param prevFundBalance 上月余额
+ */
+function calUnderwrittenPlan(income, cost, prevFundBalance) {
     var underwrittenPlan = 0;
 
     if(!income || !cost){
@@ -319,14 +337,9 @@ function updateEachUnderwrittenPlan() {
         }
     }
 
-        total += underwrittenPlan;
+    return underwrittenPlan;
-
-        $(this).val(underwrittenPlan);
-    });
-
-    //总垫资计划=所有月累加
-    $(".input-total-underwritten-plan-budget-plan").val(total);
 }
+
 /**
  * 更新每一行【即每个月】的还款计划
  */
@@ -344,6 +357,26 @@ function updateEachRepaymentPlan() {
             prevFundBalance = 0;
         }
 
+
+        var repaymentPlan = calRepaymentPlan(income, cost, prevFundBalance);
+
+        total += repaymentPlan;
+
+        $(this).val(repaymentPlan);
+
+    });
+
+    //总回款计划=所有月累加
+    $(".input-total-repayment-plan-budget-plan").val(total);
+}
+
+/**
+ * 计算回款计划
+ * @param income 收入
+ * @param cost 支出
+ * @param prevFundBalance 上月余额
+ */
+function calRepaymentPlan(income, cost, prevFundBalance) {
     var repaymentPlan = 0;
 
     if(!income || !cost){
@@ -365,16 +398,9 @@ function updateEachRepaymentPlan() {
         }
     }
 
-
+    return repaymentPlan;
-        total += repaymentPlan;
-
-        $(this).val(repaymentPlan);
-
-    });
-
-    //总回款计划=所有月累加
-    $(".input-total-repayment-plan-budget-plan").val(total);
 }
+
 /**
  * 更新每一行【即每个月】的资金利息
  */