From 16dac35feb21d129eeb045945f4b6983ab7caad1 Mon Sep 17 00:00:00 2001
From: hanbo <2608504783@qq.com>
Date: Wed, 12 Jan 2022 10:21:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=B5=B7=E5=86=B3=E7=AE=97=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/assets/js/project_final.js         | 38 ++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/static/assets/js/project_final.js b/src/main/resources/static/assets/js/project_final.js
index 11c4846..c866607 100644
--- a/src/main/resources/static/assets/js/project_final.js
+++ b/src/main/resources/static/assets/js/project_final.js
@@ -2,18 +2,30 @@ function calculateFinal() {
 
     $("input[name='incomeDeviceFinalTotal']").change(function () {
         calIncomeFinalTotal();
+        calGrossProfitFinalTotal();
+        calGrossProfitProfitMargin();
+        calContributionMarginFinalTotal();
+        calContributionMarginProfitMargin();
         calNetMarginFinalTotal();
         calNetMarginProfitMargin();
         digitalSelf("incomeDeviceFinalTotal", "input[name='incomeDeviceFinalTotal']");
     });
     $("input[name='incomeEngineerFinalTotal']").change(function () {
         calIncomeFinalTotal();
+        calGrossProfitFinalTotal();
+        calGrossProfitProfitMargin();
+        calContributionMarginFinalTotal();
+        calContributionMarginProfitMargin();
         calNetMarginFinalTotal();
         calNetMarginProfitMargin();
         digitalSelf("incomeEngineerFinalTotal", "input[name='incomeEngineerFinalTotal']");
     });
     $("input[name='incomeServiceFinalTotal']").change(function () {
         calIncomeFinalTotal();
+        calGrossProfitFinalTotal();
+        calGrossProfitProfitMargin();
+        calContributionMarginFinalTotal();
+        calContributionMarginProfitMargin();
         calNetMarginFinalTotal();
         calNetMarginProfitMargin();
         digitalSelf("incomeServiceFinalTotal", "input[name='incomeServiceFinalTotal']");
@@ -22,36 +34,60 @@ function calculateFinal() {
 
     $("input[name='costPurchaseDeviceFinalTotal']").change(function () {
         calCostFinalTotal();
+        calGrossProfitFinalTotal();
+        calGrossProfitProfitMargin();
+        calContributionMarginFinalTotal();
+        calContributionMarginProfitMargin();
         calNetMarginFinalTotal();
         calNetMarginProfitMargin();
         digitalSelf("costPurchaseDeviceFinalTotal", "input[name='costPurchaseDeviceFinalTotal']");
     });
     $("input[name='costPurchaseBuildFinalTotal']").change(function () {
         calCostFinalTotal();
+        calGrossProfitFinalTotal();
+        calGrossProfitProfitMargin();
+        calContributionMarginFinalTotal();
+        calContributionMarginProfitMargin();
         calNetMarginFinalTotal();
         calNetMarginProfitMargin();
         digitalSelf("costPurchaseBuildFinalTotal", "input[name='costPurchaseBuildFinalTotal']");
     });
     $("input[name='costPurchaseServiceFinalTotal']").change(function () {
         calCostFinalTotal();
+        calGrossProfitFinalTotal();
+        calGrossProfitProfitMargin();
+        calContributionMarginFinalTotal();
+        calContributionMarginProfitMargin();
         calNetMarginFinalTotal();
         calNetMarginProfitMargin();
         digitalSelf("costPurchaseServiceFinalTotal", "input[name='costPurchaseServiceFinalTotal']");
     });
     $("input[name='costPurchaseOtherFinalTotal']").change(function () {
         calCostFinalTotal();
+        calGrossProfitFinalTotal();
+        calGrossProfitProfitMargin();
+        calContributionMarginFinalTotal();
+        calContributionMarginProfitMargin();
         calNetMarginFinalTotal();
         calNetMarginProfitMargin();
         digitalSelf("costPurchaseOtherFinalTotal", "input[name='costPurchaseOtherFinalTotal']");
     });
     $("input[name='costProjectManageFinalTotal']").change(function () {
         calCostFinalTotal();
+        calGrossProfitFinalTotal();
+        calGrossProfitProfitMargin();
+        calContributionMarginFinalTotal();
+        calContributionMarginProfitMargin();
         calNetMarginFinalTotal();
         calNetMarginProfitMargin();
         digitalSelf("costProjectManageFinalTotal", "input[name='costProjectManageFinalTotal']");
     });
     $("input[name='costOtherFinalTotal']").change(function () {
         calCostFinalTotal();
+        calGrossProfitFinalTotal();
+        calGrossProfitProfitMargin();
+        calContributionMarginFinalTotal();
+        calContributionMarginProfitMargin();
         calNetMarginFinalTotal();
         calNetMarginProfitMargin();
         digitalSelf("costOtherFinalTotal", "input[name='costOtherFinalTotal']");
@@ -77,7 +113,7 @@ function calculateFinal() {
         digitalSelf("costIncomeTaxFinalTotal", "input[name='costIncomeTaxFinalTotal']");
     });
 
-
+    //现金流量表
     $("input[name='saleIncomeCash']").change(function () {
         //calCashFluxFinalTotal();
         calNetCashFlow();