From 98ce08f2891795d4cd8b8fbcb33a1ca6d854141b Mon Sep 17 00:00:00 2001
From: xxssyyyyssxx <xxssyyyyssxx@126.com>
Date: Sat, 6 Nov 2021 21:49:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E7=95=99=E4=B8=A4=E4=BD=8D=E5=B0=8F?=
=?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../static/assets/js/project_budget_cost.js | 16 ++++++++--------
.../js/project_budget_cost_project_manage.js | 2 +-
.../static/assets/js/project_budget_income.js | 12 ++++++------
.../static/assets/js/project_budget_plan.js | 10 +++++-----
4 files changed, 20 insertions(+), 20 deletions(-)
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 c351f10..c3f7808 100644
--- a/src/main/resources/static/assets/js/project_budget_cost.js
+++ b/src/main/resources/static/assets/js/project_budget_cost.js
@@ -91,14 +91,14 @@ function updateCostData(details) {
otherTaxExclude += f2(t["totalTaxExclude"]);
}
});
- $("input[name='costPurchaseDeviceTaxInclude']").val(deviceTaxInclude);
- $("input[name='costPurchaseDeviceTaxExclude']").val(deviceTaxExclude);
- $("input[name='costPurchaseBuildTaxInclude']").val(buildTaxInclude);
- $("input[name='costPurchaseBuildTaxExclude']").val(buildTaxExclude);
- $("input[name='costPurchaseServiceTaxInclude']").val(serviceTaxInclude);
- $("input[name='costPurchaseServiceTaxExclude']").val(serviceTaxExclude);
- $("input[name='costPurchaseOtherTaxInclude']").val(otherTaxInclude);
- $("input[name='costPurchaseOtherTaxExclude']").val(otherTaxExclude);
+ $("input[name='costPurchaseDeviceTaxInclude']").val(f2(deviceTaxInclude));
+ $("input[name='costPurchaseDeviceTaxExclude']").val(f2(deviceTaxExclude));
+ $("input[name='costPurchaseBuildTaxInclude']").val(f2(buildTaxInclude));
+ $("input[name='costPurchaseBuildTaxExclude']").val(f2(buildTaxExclude));
+ $("input[name='costPurchaseServiceTaxInclude']").val(f2(serviceTaxInclude));
+ $("input[name='costPurchaseServiceTaxExclude']").val(f2(serviceTaxExclude));
+ $("input[name='costPurchaseOtherTaxInclude']").val(f2(otherTaxInclude));
+ $("input[name='costPurchaseOtherTaxExclude']").val(f2(otherTaxExclude));
var costOtherOtherTaxInclude = parseFloat($("input[name='costOtherOtherTaxInclude']").val());
var costOtherOtherTaxExclude = parseFloat($("input[name='costOtherOtherTaxExclude']").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 d74dfbb..202c09d 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
@@ -89,7 +89,7 @@ function updateCostProjectManageData(details) {
var costOtherOtherTaxExclude = f2($("input[name='costOtherOtherTaxExclude']").val());
- $("input[name='costTotalTaxExclude']").val(costPurchaseDeviceTaxExclude+costPurchaseBuildTaxExclude+costPurchaseServiceTaxExclude+costPurchaseOtherTaxExclude+total+costOtherOtherTaxExclude);
+ $("input[name='costTotalTaxExclude']").val(f2(costPurchaseDeviceTaxExclude+costPurchaseBuildTaxExclude+costPurchaseServiceTaxExclude+costPurchaseOtherTaxExclude+total+costOtherOtherTaxExclude));
updateProjectContributionProfitRate();
}
\ No newline at end of file
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 5334476..1d3ca8d 100644
--- a/src/main/resources/static/assets/js/project_budget_income.js
+++ b/src/main/resources/static/assets/js/project_budget_income.js
@@ -48,12 +48,12 @@ function updateIncomeData(incomeDetails) {
serviceTaxExclude += f2(t["totalTaxExclude"]);
}
});
- $("input[name='incomeDeviceTaxInclude']").val(deviceTaxInclude);
- $("input[name='incomeDeviceTaxExclude']").val(deviceTaxExclude);
- $("input[name='incomeEngineerTaxInclude']").val(engineerTaxInclude);
- $("input[name='incomeEngineerTaxExclude']").val(engineerTaxExclude);
- $("input[name='incomeServiceTaxInclude']").val(serviceTaxInclude);
- $("input[name='incomeServiceTaxExclude']").val(serviceTaxExclude);
+ $("input[name='incomeDeviceTaxInclude']").val(f2(deviceTaxInclude));
+ $("input[name='incomeDeviceTaxExclude']").val(f2(deviceTaxExclude));
+ $("input[name='incomeEngineerTaxInclude']").val(f2(engineerTaxInclude));
+ $("input[name='incomeEngineerTaxExclude']").val(f2(engineerTaxExclude));
+ $("input[name='incomeServiceTaxInclude']").val(f2(serviceTaxInclude));
+ $("input[name='incomeServiceTaxExclude']").val(f2(serviceTaxExclude));
$("input[name='incomeTotalTaxInclude']").val(f2(deviceTaxInclude+engineerTaxInclude+serviceTaxInclude));
$("input[name='incomeTotalTaxExclude']").val(f2(deviceTaxExclude+engineerTaxExclude+serviceTaxExclude));
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 a557a17..8de3a31 100644
--- a/src/main/resources/static/assets/js/project_budget_plan.js
+++ b/src/main/resources/static/assets/js/project_budget_plan.js
@@ -508,11 +508,11 @@ function updateCashFlow() {
var underwrittenPlan = $(".input-total-underwritten-plan-budget-plan").val();
var repaymentPlan = $(".input-total-repayment-plan-budget-plan").val();
- var d = f2(deviceCost)+f2(engineerCost);
- var f = f2(projectManageCost)+f2(earnestMoneyCost)+f2(capitalInterest);
- var g = f2(saleIncome)+0+f2(earnestMoneyIncome)-d-0-f;
- var m = f2(underwrittenPlan)-f2(repaymentPlan);
- var n = g+0+m;
+ var d = f2(f2(deviceCost)+f2(engineerCost));
+ var f = f2(f2(projectManageCost)+f2(earnestMoneyCost)+f2(capitalInterest));
+ var g = f2(f2(saleIncome)+0+f2(earnestMoneyIncome)-d-0-f);
+ var m = f2(f2(underwrittenPlan)-f2(repaymentPlan));
+ var n = f2(g+0+m);
console.log(saleIncome,earnestMoneyIncome,deviceCost,
engineerCost,projectManageCost,earnestMoneyCost,