From 97a7875bad2fcffdde688801525e9d3b3248556a Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Thu, 2 Dec 2021 16:54:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=84=E7=AE=97?=
 =?UTF-8?q?=E8=B5=84=E9=87=91=E8=AE=A1=E5=88=92=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/assets/js/project_budget_plan.js   | 45 +++++++++----------
 1 file changed, 22 insertions(+), 23 deletions(-)

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 0a383ef..4a9bcc9 100644
--- a/src/main/resources/static/assets/js/project_budget_plan.js
+++ b/src/main/resources/static/assets/js/project_budget_plan.js
@@ -355,20 +355,19 @@ function updateEachUnderwrittenPlan() {
     //找到每个月的垫资计划输入框
     $(".input-changeable-underwritten-plan-budget-plan").each(function (t) {
         //找到当前月的收入和支出
-        var income = f2($(this).parent().parent().find(".input-changeable-total-income-budget-plan").val());
-        var cost = f2($(this).parent().parent().find(".input-changeable-total-cost-budget-plan").val());
+        var income = $(this).parent().parent().find(".input-changeable-total-income-budget-plan").val();
+        var cost = $(this).parent().parent().find(".input-changeable-total-cost-budget-plan").val();
         //我的上月余额
-        var prevFundBalance = f2($(this).parent().parent().prev("tr").find(".input-changeable-fund-balance-budget-plan").val());
+        var prevFundBalance = $(this).parent().parent().prev("tr").find(".input-changeable-fund-balance-budget-plan").val();
         if(!prevFundBalance){
             //第一个月的话，上月余额就为0
             prevFundBalance = 0;
         }
-
         var underwrittenPlan = calUnderwrittenPlan(income, cost, prevFundBalance);
 
         total += underwrittenPlan;
 
-        $(this).val(f2(underwrittenPlan));
+        $(this).val(underwrittenPlan);
     });
 
     //总垫资计划=所有月累加
@@ -390,15 +389,15 @@ function calUnderwrittenPlan(income, cost, prevFundBalance) {
         //数据还不全的时候
         underwrittenPlan = NaN;
     }else {
-
-        if (income - cost >= 0) {
+        ;
+        if (f2(income) - f2(cost) >= 0) {
             underwrittenPlan = 0;
         } else {
-            if (prevFundBalance < 0) {
-                underwrittenPlan = cost - income;
+            if (f2(prevFundBalance) < 0) {
+                underwrittenPlan = f2(f2(cost) - f2(income));
             } else {
-                if (prevFundBalance <= cost - income) {
-                    underwrittenPlan = cost - income - prevFundBalance;
+                if (f2(prevFundBalance) <= f2(cost) - f2(income)) {
+                    underwrittenPlan = f2(f2(cost) - f2(income) - f2(prevFundBalance));
                 } else {
                     underwrittenPlan = 0;
                 }
@@ -417,10 +416,10 @@ function updateEachRepaymentPlan() {
     //找到每个月的回款计划输入框
     $(".input-changeable-repayment-plan-budget-plan").each(function (t) {
         //找到当前月的收入和支出
-        var income = f2($(this).parent().parent().find(".input-changeable-total-income-budget-plan").val());
-        var cost = f2($(this).parent().parent().find(".input-changeable-total-cost-budget-plan").val());
+        var income = $(this).parent().parent().find(".input-changeable-total-income-budget-plan").val();
+        var cost = $(this).parent().parent().find(".input-changeable-total-cost-budget-plan").val();
         //我的上月余额
-        var prevFundBalance = f2($(this).parent().parent().prev("tr").find(".input-changeable-fund-balance-budget-plan").val());
+        var prevFundBalance = $(this).parent().parent().prev("tr").find(".input-changeable-fund-balance-budget-plan").val();
         if(!prevFundBalance){
             //第一个月的话，上月余额就为0
             prevFundBalance = 0;
@@ -431,7 +430,7 @@ function updateEachRepaymentPlan() {
 
         total += repaymentPlan;
 
-        $(this).val(f2(repaymentPlan));
+        $(this).val(repaymentPlan);
 
     });
 
@@ -452,16 +451,16 @@ function calRepaymentPlan(income, cost, prevFundBalance) {
         //数据还不全的时候
         repaymentPlan = NaN;
     }else {
-        if(income - cost <= 0){
+        if (f2(income) - f2(cost) <= 0) {
             repaymentPlan = 0;
-        }else {
-            if(prevFundBalance >= 0){
+        } else {
+            if (f2(prevFundBalance) >= 0) {
                 repaymentPlan = 0;
-            }else {
-                if(income - cost <= -prevFundBalance){
-                    repaymentPlan = income - cost;
-                }else {
-                    repaymentPlan = -prevFundBalance;
+            } else {
+                if (f2(-prevFundBalance) >= f2(income) - f2(cost)) {
+                    repaymentPlan = f2(f2(income) - f2(cost));
+                } else {
+                    repaymentPlan = f2(-prevFundBalance);
                 }
             }
         }

From c389f04674383b9f189d6107354c7d25015aec88 Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Thu, 2 Dec 2021 16:56:07 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=A0=87=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/static/assets/js/project_budget_plan.js | 1 -
 1 file changed, 1 deletion(-)

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 4a9bcc9..9acb190 100644
--- a/src/main/resources/static/assets/js/project_budget_plan.js
+++ b/src/main/resources/static/assets/js/project_budget_plan.js
@@ -389,7 +389,6 @@ function calUnderwrittenPlan(income, cost, prevFundBalance) {
         //数据还不全的时候
         underwrittenPlan = NaN;
     }else {
-        ;
         if (f2(income) - f2(cost) >= 0) {
             underwrittenPlan = 0;
         } else {