From 22fb09f755bd9ab1f636150580c3879f95c04ed2 Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Tue, 16 Aug 2022 18:09:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=8F=B8=E7=AE=A1=E7=90=86=E8=B4=B9?=
 =?UTF-8?q?=E7=94=A8=E9=A1=B5=E9=9D=A2=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/static/assets/js/project_budget_income.js | 1 +
 src/main/resources/templates/admin/project_estimate_edit.ftl | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

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 bc31616..46549b4 100644
--- a/src/main/resources/static/assets/js/project_budget_income.js
+++ b/src/main/resources/static/assets/js/project_budget_income.js
@@ -123,6 +123,7 @@ function updateIncomeData(data,returnData) {
     $("input[name='incomeTotalTaxInclude']").val(f2Fixed(deviceTaxInclude+engineerTaxInclude+serviceTaxInclude));
     $("input[name='incomeTotalTaxExclude']").val(f2Fixed(deviceTaxExclude+engineerTaxExclude+serviceTaxExclude));
     $("input[name='incomeTotalTax']").val(f2Fixed(deviceTax+engineerTax+serviceTax));
+    $("input[name='costCompanyManageTaxExclude']").val(f2Fixed(0.028*(deviceTaxInclude+engineerTaxInclude+serviceTaxInclude)));
 
 
     $(".input-total-title-sale-income-budget-plan").val($("input[name='incomeTotalTaxInclude']").val());
diff --git a/src/main/resources/templates/admin/project_estimate_edit.ftl b/src/main/resources/templates/admin/project_estimate_edit.ftl
index d46e287..f14f552 100644
--- a/src/main/resources/templates/admin/project_estimate_edit.ftl
+++ b/src/main/resources/templates/admin/project_estimate_edit.ftl
@@ -376,7 +376,7 @@
                 <div class="am-g am-form-group am-margin-top">
                     <div class="am-u-sm-4 am-u-md-2 am-text-right">计收计划</div>
                     <div class="am-u-sm-6 am-u-md-6">
-                                <textarea rows="3" cols="20" id="CalculationCollection" name="CalculationCollection" maxlength="1000"
+                                <textarea rows="3" cols="20" id="calculationCollection" name="calculationCollection" maxlength="1000"
                                           class="am-input" data-validate-async data-validation-message="按照开票金额及时间罗列计收计划"
                                           placeholder="按照开票金额及时间罗列计收计划"
                                 >${project.calculationCollection!}</textarea>