From 9feb829aee8f03d5a3a61fe26a41f1fbae855d17 Mon Sep 17 00:00:00 2001
From: xxssyyyyssxx <xxssyyyyssxx@126.com>
Date: Wed, 3 Nov 2021 17:07:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A6=82=E7=AE=97=E4=B9=9F=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=E6=88=90=E6=9C=AC=E5=90=AB?=
 =?UTF-8?q?=E7=A8=8E=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/static/assets/js/project_estimate.js     | 10 +++++-----
 .../templates/admin/project_estimate_edit.ftl          |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/static/assets/js/project_estimate.js b/src/main/resources/static/assets/js/project_estimate.js
index 148baa6..76d2d6b 100644
--- a/src/main/resources/static/assets/js/project_estimate.js
+++ b/src/main/resources/static/assets/js/project_estimate.js
@@ -43,10 +43,10 @@ function calIncomeAndCost() {
         calCostInclude();
         calIncomeCost();
     });
-    $("input[name='costProjectManageTaxInclude']").change(function () {
+    /*$("input[name='costProjectManageTaxInclude']").change(function () {
         calCostInclude();
         calIncomeCost();
-    });
+    });*/
     $("input[name='costOtherOtherTaxInclude']").change(function () {
         calCostInclude();
         calIncomeCost();
@@ -127,14 +127,14 @@ function calCostInclude() {
     var costPurchaseBuildTaxInclude = $("input[name='costPurchaseBuildTaxInclude']").val();
     var costPurchaseServiceTaxInclude = $("input[name='costPurchaseServiceTaxInclude']").val();
     var costPurchaseOtherTaxInclude = $("input[name='costPurchaseOtherTaxInclude']").val();
-    var costProjectManageTaxInclude = $("input[name='costProjectManageTaxInclude']").val();
+    //var costProjectManageTaxInclude = $("input[name='costProjectManageTaxInclude']").val();
     var costOtherOtherTaxInclude = $("input[name='costOtherOtherTaxInclude']").val();
 
 
     var costTotalTaxInclude = $("input[name='costTotalTaxInclude']");
 
-    if(costPurchaseDeviceTaxInclude && costPurchaseBuildTaxInclude && costPurchaseServiceTaxInclude && costPurchaseOtherTaxInclude && costProjectManageTaxInclude && costOtherOtherTaxInclude){
-        costTotalTaxInclude.val(parseFloat(costPurchaseDeviceTaxInclude)+parseFloat(costPurchaseBuildTaxInclude)+parseFloat(costPurchaseServiceTaxInclude)+parseFloat(costPurchaseOtherTaxInclude)+parseFloat(costProjectManageTaxInclude)+parseFloat(costOtherOtherTaxInclude));
+    if(costPurchaseDeviceTaxInclude && costPurchaseBuildTaxInclude && costPurchaseServiceTaxInclude && costPurchaseOtherTaxInclude /*&& costProjectManageTaxInclude*/ && costOtherOtherTaxInclude){
+        costTotalTaxInclude.val(parseFloat(costPurchaseDeviceTaxInclude)+parseFloat(costPurchaseBuildTaxInclude)+parseFloat(costPurchaseServiceTaxInclude)+parseFloat(costPurchaseOtherTaxInclude)/*+parseFloat(costProjectManageTaxInclude)*/+parseFloat(costOtherOtherTaxInclude));
     }else {
         costTotalTaxInclude.val("");
     }
diff --git a/src/main/resources/templates/admin/project_estimate_edit.ftl b/src/main/resources/templates/admin/project_estimate_edit.ftl
index fd7dd39..1b9e865 100644
--- a/src/main/resources/templates/admin/project_estimate_edit.ftl
+++ b/src/main/resources/templates/admin/project_estimate_edit.ftl
@@ -255,7 +255,7 @@
                             <td>成本</td>
                             <td>项目管理成本</td>
                             <td>项目管理成本</td>
-                            <td><input name="costProjectManageTaxInclude" value="${estimateBean.costProjectManageTaxInclude}" required></td>
+                            <td><#--<input name="costProjectManageTaxInclude" value="${estimateBean.costProjectManageTaxInclude}" required>-->/</td>
                             <td><input name="costProjectManageTaxExclude" value="${estimateBean.costProjectManageTaxExclude}" required></td>
                         </tr>
                         <tr>