From 91e45a8cef9addbd47acdb61ed27f4741ed39b06 Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Fri, 13 May 2022 10:29:40 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=AE=97=E5=88=A0=E9=99=A4=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9A=E6=80=BB=E8=AE=A1=E4=BA=8B=E4=BB=B6=EF=BC=8C=E7=BB=93?=
 =?UTF-8?q?=E7=AE=970=E5=8F=98=E6=88=900.00?=
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  |  15 +-
 .../static/assets/js/project_budget_income.js |  16 +-
 .../templates/admin/project_settle_add.ftl    | 144 +++++++++---------
 4 files changed, 116 insertions(+), 75 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 0ba7a52..2cee0df 100644
--- a/src/main/resources/static/assets/js/project_budget_cost.js
+++ b/src/main/resources/static/assets/js/project_budget_cost.js
@@ -200,7 +200,7 @@ function appendTrCost() {
 
     $("#costTotal").before(template);
     //重新绑定删除事件和input修改事件
-    bindDeleteBtn();
+    bindDeleteBtnCost();
     //绑定序号
     bindNum();
     //重新绑定
@@ -213,6 +213,20 @@ function appendTrCost() {
     bindNumberInput();
 }
 
+/**
+ * 绑定每一行的删除事件，删除当前的一行tr，修改总计值
+ */
+function bindDeleteBtnCost() {
+    $(".am-modal-line-delete").click(function () {
+        //删除自己对应的tr
+        $(this).parent().parent().remove();
+        bindNum();
+        updateAmount("input-changeable-amount-cost", "input-changeable-total-amount-cost");
+        updateTotal("input-changeable-total-tax-include-cost", "input-changeable-total-total-tax-include-cost");
+        updateTotal("input-changeable-total-tax-exclude-cost", "input-changeable-total-total-tax-exclude-cost");
+    });
+}
+
 /**
  * 绑定每个可改变的输入框，修改后改变对应输入框的值
  */
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 54270cd..38e7654 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
@@ -131,7 +131,7 @@ function appendTrCostProjectManage() {
         '    </tr>';
     $("#manageTotal").before(template);
     //重新绑定删除事件和input修改事件
-    bindDeleteBtn();
+    bindDeleteBtnCostManage();
     //绑定序号
     bindNum();
     bindChangeableInputProjectManage();
@@ -142,6 +142,19 @@ function appendTrCostProjectManage() {
     bindNumberInput();
 }
 
+/**
+ * 绑定每一行的删除事件，删除当前的一行tr，修改总计值
+ */
+function bindDeleteBtnCostManage() {
+    $(".am-modal-line-delete").click(function () {
+        //删除自己对应的tr
+        $(this).parent().parent().remove();
+        bindNum();
+        updateAmount("input-changeable-amount-project-manage", "input-changeable-total-amount-project-manage");
+        updateTotal("input-changeable-total-project-manage", "input-changeable-total-total-project-manage");
+    });
+}
+
 /**
  * 绑定每个可改变的输入框，修改后改变对应输入框的值
  */
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 11729f5..229da4e 100644
--- a/src/main/resources/static/assets/js/project_budget_income.js
+++ b/src/main/resources/static/assets/js/project_budget_income.js
@@ -147,7 +147,7 @@ function appendTrIncome() {
         '                    </tr>';
     $("#incomeTotal").before(template);
     //重新绑定删除事件和input修改事件
-    bindDeleteBtn();
+    bindDeleteBtnIncome();
     bindNum();
     bindChangeableInput();
     bindIncomeTotal();
@@ -155,6 +155,20 @@ function appendTrIncome() {
     bindNumberInput();
 }
 
+/**
+ * 绑定每一行的删除事件，删除当前的一行tr，修改总计值
+ */
+function bindDeleteBtnIncome() {
+    $(".am-modal-line-delete").click(function () {
+        //删除自己对应的tr
+        $(this).parent().parent().remove();
+        bindNum();
+        updateAmount("input-changeable-amount-income", "input-changeable-total-amount-income");
+        updateTotal("input-changeable-total-tax-include-income", "input-changeable-total-total-tax-include-income");
+        updateTotal("input-changeable-total-tax-exclude-income", "input-changeable-total-total-tax-exclude-income");
+    });
+}
+
 /**
  * 绑定每个可改变的输入框，修改后改变对应输入框的值
  */
diff --git a/src/main/resources/templates/admin/project_settle_add.ftl b/src/main/resources/templates/admin/project_settle_add.ftl
index e98ff84..841d8b2 100644
--- a/src/main/resources/templates/admin/project_settle_add.ftl
+++ b/src/main/resources/templates/admin/project_settle_add.ftl
@@ -34,7 +34,7 @@
         <div class="am-tabs-bd">
             <div class="am-tab-panel am-fade am-in am-active" id="tab1">
                 <input name="id" id="id" type="hidden" value="${project.id}" />
-                <input name="salary" id="salary" type="hidden" value="${Utils.format(salary,'0')}" />
+                <input name="salary" id="salary" type="hidden" value="${Utils.format(salary,'0.00')}" />
 
                 <div class="am-u-sm-10">
                     <div class="am-form am-form-inline">
@@ -60,36 +60,36 @@
                     <tr>
                         <td>收入</td>
                         <td>设备类</td>
-                        <td><input name="incomeDeviceEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类概算总额"></td>
-                        <td><input name="incomeDeviceBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类预算总额"></td>
-                        <td><input name="incomeDeviceFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类上月结算总额"></td>
+                        <td><input name="incomeDeviceEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.incomeDeviceTaxExclude,'0.00')}" required readonly title="设备类概算总额"></td>
+                        <td><input name="incomeDeviceBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.incomeDeviceTaxExclude,'0.00')}" required readonly title="设备类预算总额"></td>
+                        <td><input name="incomeDeviceFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.incomeDeviceTaxExclude,'0.00')}" required readonly title="设备类上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="incomeDevice" required title="本月结算金额"></td>
                         <td><input type="text" class="number" name="incomeDeviceSettleTotal" readonly title="设备类结算总额" data-validate-async data-validation-message="结算总额不能大于预算总额" ></td>
                     </tr>
                     <tr>
                         <td>收入</td>
                         <td>工程类</td>
-                        <td><input name="incomeEngineerEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类概算总额"></td>
-                        <td><input name="incomeEngineerBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类预算总额"></td>
-                        <td><input name="incomeEngineerFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类上月结算总额"></td>
+                        <td><input name="incomeEngineerEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.incomeEngineerTaxExclude,'0.00')}" required readonly title="工程类概算总额"></td>
+                        <td><input name="incomeEngineerBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.incomeEngineerTaxExclude,'0.00')}" required readonly title="工程类预算总额"></td>
+                        <td><input name="incomeEngineerFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.incomeEngineerTaxExclude,'0.00')}" required readonly title="工程类上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="incomeEngineer" required title="工程类本月结算金额"></td>
                         <td><input type="text" class="number" name="incomeEngineerSettleTotal" readonly title="工程类结算总额"></td>
                     </tr>
                     <tr>
                         <td>收入</td>
                         <td>服务类</td>
-                        <td><input name="incomeServiceEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类概算总额"></td>
-                        <td><input name="incomeServiceBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类预算总额"></td>
-                        <td><input name="incomeServiceFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类上月结算总额"></td>
+                        <td><input name="incomeServiceEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.incomeServiceTaxExclude,'0.00')}" required readonly title="服务类概算总额"></td>
+                        <td><input name="incomeServiceBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.incomeServiceTaxExclude,'0.00')}" required readonly title="服务类预算总额"></td>
+                        <td><input name="incomeServiceFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.incomeServiceTaxExclude,'0.00')}" required readonly title="服务类上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="incomeService" required title="服务类本月结算金额"></td>
                         <td><input type="text" class="number" name="incomeServiceSettleTotal" readonly title="服务类结算总额"></td>
                     </tr>
                     <tr>
                         <td>合计</td>
                         <td></td>
-                        <td><input name="incomeEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.getIncomeTotalTaxExclude(),'0')}" readonly required title="此列累计"></td>
-                        <td><input name="incomeBudgetTotal" type="text" class="number"  value="${Utils.format(budgetBean.getIncomeTotalTaxExclude(),'0')}" readonly required title="此列累计"></td>
-                        <td><input name="incomeFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.getIncomeTotalTaxExclude(),'0')}" required readonly title="此列累计"></td>
+                        <td><input name="incomeEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.getIncomeTotalTaxExclude(),'0.00')}" readonly required title="此列累计"></td>
+                        <td><input name="incomeBudgetTotal" type="text" class="number"  value="${Utils.format(budgetBean.getIncomeTotalTaxExclude(),'0.00')}" readonly required title="此列累计"></td>
+                        <td><input name="incomeFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.getIncomeTotalTaxExclude(),'0.00')}" required readonly title="此列累计"></td>
                         <td><input type="text" class="number" name="incomeTotal" readonly title="此列累计"></td>
                         <td><input type="text" class="number" name="incomeSettleTotal" readonly title="此列累计"></td>
                     </tr>
@@ -112,9 +112,9 @@
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>设备</td>
-                        <td><input name="costPurchaseDeviceEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseDeviceTaxExclude,'0')}" readonly required title="购买设备概算总额"></td>
-                        <td><input name="costPurchaseDeviceBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseDeviceTaxExclude,'0')}" readonly required title="购买设备预算总额"></td>
-                        <td><input name="costPurchaseDeviceFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costPurchaseDeviceTaxExclude,'0')}" required readonly title="购买设备上月结算总额"></td>
+                        <td><input name="costPurchaseDeviceEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseDeviceTaxExclude,'0.00')}" readonly required title="购买设备概算总额"></td>
+                        <td><input name="costPurchaseDeviceBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseDeviceTaxExclude,'0.00')}" readonly required title="购买设备预算总额"></td>
+                        <td><input name="costPurchaseDeviceFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costPurchaseDeviceTaxExclude,'0.00')}" required readonly title="购买设备上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="costPurchaseDevice" required title="购买设备本月结算总额"></td>
                         <td><input type="text" class="number" name="costPurchaseDeviceSettleTotal" readonly title="购买设备结算总额"></td>
                     </tr>
@@ -122,9 +122,9 @@
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>施工</td>
-                        <td><input name="costPurchaseBuildEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseBuildTaxExclude,'0')}" readonly required title="施工采购成本概算总额"></td>
-                        <td><input name="costPurchaseBuildBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseBuildTaxExclude,'0')}" readonly required title="施工采购成本预算总额"></td>
-                        <td><input name="costPurchaseBuildFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costPurchaseBuildTaxExclude,'0')}" required readonly title="施工采购成本上月结算总额"></td>
+                        <td><input name="costPurchaseBuildEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseBuildTaxExclude,'0.00')}" readonly required title="施工采购成本概算总额"></td>
+                        <td><input name="costPurchaseBuildBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseBuildTaxExclude,'0.00')}" readonly required title="施工采购成本预算总额"></td>
+                        <td><input name="costPurchaseBuildFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costPurchaseBuildTaxExclude,'0.00')}" required readonly title="施工采购成本上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="costPurchaseBuild" required title="施工采购成本本月结算金额"></td>
                         <td><input type="text" class="number" name="costPurchaseBuildSettleTotal" readonly title="施工采购成本结算总额"></td>
                     </tr>
@@ -132,9 +132,9 @@
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>服务</td>
-                        <td><input name="costPurchaseServiceEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseServiceTaxExclude,'0')}" readonly required title="服务采购成本概算总额"></td>
-                        <td><input name="costPurchaseServiceBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseServiceTaxExclude,'0')}" readonly required title="服务采购成本预算总额"></td>
-                        <td><input name="costPurchaseServiceFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costPurchaseServiceTaxExclude,'0')}" required readonly title="服务采购成本上月结算总额"></td>
+                        <td><input name="costPurchaseServiceEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseServiceTaxExclude,'0.00')}" readonly required title="服务采购成本概算总额"></td>
+                        <td><input name="costPurchaseServiceBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseServiceTaxExclude,'0.00')}" readonly required title="服务采购成本预算总额"></td>
+                        <td><input name="costPurchaseServiceFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costPurchaseServiceTaxExclude,'0.00')}" required readonly title="服务采购成本上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="costPurchaseService" required title="服务采购成本本月结算金额"></td>
                         <td><input type="text" class="number" name="costPurchaseServiceSettleTotal" readonly title="服务采购成本结算总额"></td>
                     </tr>
@@ -142,9 +142,9 @@
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>其他</td>
-                        <td><input name="costPurchaseOtherEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseOtherTaxExclude,'0')}" readonly required title="其他采购成本概算总额"></td>
-                        <td><input name="costPurchaseOtherBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseOtherTaxExclude,'0')}" readonly required title="其他采购成本预算总额"></td>
-                        <td><input name="costPurchaseOtherFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costPurchaseOtherTaxExclude,'0')}" required readonly title="其他采购成本上月结算总额"></td>
+                        <td><input name="costPurchaseOtherEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseOtherTaxExclude,'0.00')}" readonly required title="其他采购成本概算总额"></td>
+                        <td><input name="costPurchaseOtherBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseOtherTaxExclude,'0.00')}" readonly required title="其他采购成本预算总额"></td>
+                        <td><input name="costPurchaseOtherFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costPurchaseOtherTaxExclude,'0.00')}" required readonly title="其他采购成本上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="costPurchaseOther" required title="其他采购成本本月结算金额"></td>
                         <td><input type="text" class="number" name="costPurchaseOtherSettleTotal" readonly title="其他采购成本结算总额"></td>
                     </tr>
@@ -152,11 +152,11 @@
                         <td>成本</td>
                         <td>项目管理成本</td>
                         <td>项目管理成本</td>
-                        <td><input name="costProjectManageEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costProjectManageTaxExclude,'0')}" readonly required title="项目管理成本概算总额"></td>
-                        <td><input name="costProjectManageBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0')}" readonly required title="项目管理成本预算总额"></td>
-                        <td><input name="costProjectManageFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costProjectManageTaxExclude,'0')}" required readonly title="项目管理成本上月结算总额"></td>
+                        <td><input name="costProjectManageEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costProjectManageTaxExclude,'0.00')}" readonly required title="项目管理成本概算总额"></td>
+                        <td><input name="costProjectManageBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0.00')}" readonly required title="项目管理成本预算总额"></td>
+                        <td><input name="costProjectManageFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costProjectManageTaxExclude,'0.00')}" required readonly title="项目管理成本上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="costProjectManage" required title="项目管理成本本月结算金额">
-                            <span>人力成本：${Utils.format(salary,'0')} 元</span>
+                            <span>人力成本：${Utils.format(salary,'0.00')} 元</span>
                         </td>
                         <td><input type="text" class="number" name="costProjectManageSettleTotal" readonly title="项目管理成本结算总额"></td>
                     </tr>
@@ -175,9 +175,9 @@
                         <td>合计</td>
                         <td></td>
                         <td></td>
-                        <td><input name="costEstimateTotal" value="${Utils.format(estimateBean.getCostTotalTaxExclude(),'0')}" type="text" class="number" readonly required title="此列累计"></td>
-                        <td><input name="costBudgetTotal" value="${Utils.format(budgetBean.getCostTotalTaxExclude(),'0')}" type="text" class="number" readonly required title="此列累计"></td>
-                        <td><input name="costFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.getCostTotalTaxExclude(),'0')}" required readonly title="此列累计"></td>
+                        <td><input name="costEstimateTotal" value="${Utils.format(estimateBean.getCostTotalTaxExclude(),'0.00')}" type="text" class="number" readonly required title="此列累计"></td>
+                        <td><input name="costBudgetTotal" value="${Utils.format(budgetBean.getCostTotalTaxExclude(),'0.00')}" type="text" class="number" readonly required title="此列累计"></td>
+                        <td><input name="costFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.getCostTotalTaxExclude(),'0.00')}" required readonly title="此列累计"></td>
                         <td><input type="text" class="number" name="costTotal" readonly title="此列累计"></td>
                         <td><input type="text" class="number" name="costSettleTotal" readonly title="此列累计"></td>
                     </tr>
@@ -198,18 +198,18 @@
                     <tr>
                         <td>财务费用</td>
                         <td>资金占用成本</td>
-                        <td><input name="costExpropriationEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本概算总额"></td>
-                        <td><input name="costExpropriationBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本预算总额"></td>
-                        <td><input name="costExpropriationFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本上月结算总额"></td>
+                        <td><input name="costExpropriationEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costExpropriationTaxExclude,'0.00')}" required readonly title="资金占用成本概算总额"></td>
+                        <td><input name="costExpropriationBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.costExpropriationTaxExclude,'0.00')}" required readonly title="资金占用成本预算总额"></td>
+                        <td><input name="costExpropriationFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costExpropriationTaxExclude,'0.00')}" required readonly title="资金占用成本上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="costExpropriation" required title="资金占用成本本月结算金额"></td>
                         <td><input type="text" class="number" name="costExpropriationSettleTotal" readonly title="资金占用成本结算总额"></td>
                     </tr>
                     <tr>
                         <td>公司管理费用</td>
                         <td></td>
-                        <td><input name="costCompanyManageEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costCompanyManageTaxExclude,'0')}" required readonly title="公司管理费用概算总额"></td>
-                        <td><input name="costCompanyManageBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.costCompanyManageTaxExclude,'0')}" required readonly title="公司管理费用预算总额"></td>
-                        <td><input name="costCompanyManageFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costCompanyManageTaxExclude,'0')}" required readonly title="公司管理费用上月结算总额"></td>
+                        <td><input name="costCompanyManageEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costCompanyManageTaxExclude,'0.00')}" required readonly title="公司管理费用概算总额"></td>
+                        <td><input name="costCompanyManageBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.costCompanyManageTaxExclude,'0.00')}" required readonly title="公司管理费用预算总额"></td>
+                        <td><input name="costCompanyManageFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costCompanyManageTaxExclude,'0.00')}" required readonly title="公司管理费用上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="costCompanyManage" required title="公司管理费用本月结算金额"></td>
                         <td><input type="text" class="number" name="costCompanyManageSettleTotal" readonly title="公司管理费用结算总额"></td>
                     </tr>
@@ -218,16 +218,16 @@
                         <td></td>
                         <td>/</td>
                         <td>/</td>
-                        <td><input name="costIncomeTaxFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costIncomeTax,'0')}" required readonly title="公司管理费用上月结算总额"></td>
+                        <td><input name="costIncomeTaxFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costIncomeTax,'0.00')}" required readonly title="公司管理费用上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="costIncomeTax" required title="公司管理费用本月结算金额"></td>
                         <td><input type="text" class="number" name="costIncomeTaxSettleTotal" readonly title="公司管理费用结算总额"></td>
                     </tr>
                     <tr>
                         <td>合计</td>
                         <td></td>
-                        <td><input name="costManageEstimateTotal" value="${Utils.format(estimateBean.costExpropriationTaxExclude + estimateBean.costCompanyManageTaxExclude,'0')}" type="text" class="number" readonly required title="此列累计"></td>
-                        <td><input name="costManageBudgetTotal" value="${Utils.format(budgetBean.costExpropriationTaxExclude + budgetBean.costCompanyManageTaxExclude,'0')}" type="text" class="number" readonly required title="此列累计"></td>
-                        <td><input name="costManageFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costManageTotal,'0')}" required readonly title="此列累计"></td>
+                        <td><input name="costManageEstimateTotal" value="${Utils.format(estimateBean.costExpropriationTaxExclude + estimateBean.costCompanyManageTaxExclude,'0.00')}" type="text" class="number" readonly required title="此列累计"></td>
+                        <td><input name="costManageBudgetTotal" value="${Utils.format(budgetBean.costExpropriationTaxExclude + budgetBean.costCompanyManageTaxExclude,'0.00')}" type="text" class="number" readonly required title="此列累计"></td>
+                        <td><input name="costManageFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costManageTotal,'0.00')}" required readonly title="此列累计"></td>
                         <td><input type="text" class="number" name="costManageTotal" readonly title="此列累计"></td>
                         <td><input type="text" class="number" name="costManageSettleTotal" readonly title="此列累计"></td>
                     </tr>
@@ -248,18 +248,18 @@
                     </tr>
                     <tr>
                         <td>项目毛利</td>
-                        <td><input name="grossProfitEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.getProjectGrossProfit(),'0')}" required readonly title="项目毛利概算总额"></td>
-                        <td><input name="grossProfitBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.getProjectGrossProfit(),'0')}" required readonly title="项目毛利预算总额"></td>
-                        <td><input name="grossProfitFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.grossProfit,'0')}" required readonly title="项目毛利上月结算总额"></td>
+                        <td><input name="grossProfitEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.getProjectGrossProfit(),'0.00')}" required readonly title="项目毛利概算总额"></td>
+                        <td><input name="grossProfitBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.getProjectGrossProfit(),'0.00')}" required readonly title="项目毛利预算总额"></td>
+                        <td><input name="grossProfitFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.grossProfit,'0.00')}" required readonly title="项目毛利上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="grossProfit" readonly required title="项目毛利本月结算金额"></td>
                         <td><input type="text" class="number" name="grossProfitSettleTotal" readonly title="项目毛利结算总额"></td>
                         <td><input name="grossProfitProfitMargin" type="text" class="number" readonly title="项目毛利利润率"></td>
                     </tr>
                     <tr>
                         <td>项目贡献利润</td>
-                        <td><input name="contributionProfitEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.getProjectContributionProfit(),'0')}" required readonly title="项目贡献利润概算总额"></td>
-                        <td><input name="contributionProfitBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.getProjectContributionProfit(),'0')}" required readonly title="项目贡献利润预算总额"></td>
-                        <td><input name="contributionProfitFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.contributionProfit,'0')}" required readonly title="项目贡献利润上月结算总额"></td>
+                        <td><input name="contributionProfitEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.getProjectContributionProfit(),'0.00')}" required readonly title="项目贡献利润概算总额"></td>
+                        <td><input name="contributionProfitBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.getProjectContributionProfit(),'0.00')}" required readonly title="项目贡献利润预算总额"></td>
+                        <td><input name="contributionProfitFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.contributionProfit,'0.00')}" required readonly title="项目贡献利润上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="contributionProfit" readonly required title="项目贡献利润本月结算金额"></td>
                         <td><input type="text" class="number" name="contributionProfitSettleTotal" readonly title="项目贡献利润结算总额"></td>
                         <td><input name="contributionProfitProfitMargin" type="text" class="number" readonly title="项目贡献利润利润率"></td>
@@ -268,7 +268,7 @@
                         <td>项目净利润</td>
                         <td>/</td>
                         <td>/</td>
-                        <td><input name="netProfitFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.netProfit,'0')}" required readonly title="项目净利润上月结算总额"></td>
+                        <td><input name="netProfitFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.netProfit,'0.00')}" required readonly title="项目净利润上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="netProfit" readonly required title="项目净利润本月结算金额"></td>
                         <td><input type="text" class="number" name="netProfitSettleTotal" readonly title="项目净利润结算总额"></td>
                         <td><input name="netProfitProfitMargin" type="text" class="number" readonly title="项目净利润利润率"></td>
@@ -288,99 +288,99 @@
                     </tr>
                     <tr>
                         <td>销售商品、提供劳务收到的现金</td>
-                        <td><input name="saleIncomeCashBudget" type="text" class="number" value="${Utils.format(cashFlowBean.saleIncomeCash,'0')}" readonly required title="预算总额"></td>
-                        <td><input name="saleIncomeCashFormerSettle" type="text" class="number" value="${Utils.format(formerBean.saleIncomeCash,'0')}" required readonly title="上月结算总额"></td>
+                        <td><input name="saleIncomeCashBudget" type="text" class="number" value="${Utils.format(cashFlowBean.saleIncomeCash,'0.00')}" readonly required title="预算总额"></td>
+                        <td><input name="saleIncomeCashFormerSettle" type="text" class="number" value="${Utils.format(formerBean.saleIncomeCash,'0.00')}" required readonly title="上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="saleIncomeCash" required title="本月结算金额"></td>
                         <td><input name="saleIncomeCashSettle" type="text" class="number" readonly title="结算总额"></td>
                     </tr>
                     <tr>
                         <td>收到的税费返还</td>
                         <td>/</td>
-                        <td><input name="taxReturnFormerSettle" type="text" class="number" value="${Utils.format(formerBean.taxReturn,'0')}" required readonly title="上月结算总额"></td>
+                        <td><input name="taxReturnFormerSettle" type="text" class="number" value="${Utils.format(formerBean.taxReturn,'0.00')}" required readonly title="上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="taxReturn" required title="本月结算金额"></td>
                         <td><input name="taxReturnSettle" type="text" class="number" readonly title="结算总额"></td>
                     </tr>
                     <tr>
                         <td>收到其他与经营活动有关的现金</td>
-                        <td><input name="earnestMoneyIncomeBudget" type="text" class="number" value="${Utils.format(cashFlowBean.earnestMoneyIncome,'0')}" readonly required title="预算总额"></td>
-                        <td><input name="earnestMoneyIncomeFormerSettle" type="text" class="number" value="${Utils.format(formerBean.earnestMoneyIncome,'0')}" required readonly title="上月结算总额"></td>
+                        <td><input name="earnestMoneyIncomeBudget" type="text" class="number" value="${Utils.format(cashFlowBean.earnestMoneyIncome,'0.00')}" readonly required title="预算总额"></td>
+                        <td><input name="earnestMoneyIncomeFormerSettle" type="text" class="number" value="${Utils.format(formerBean.earnestMoneyIncome,'0.00')}" required readonly title="上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="earnestMoneyIncome" required title="本月结算金额"></td>
                         <td><input name="earnestMoneyIncomeSettle" type="text" class="number" readonly title="结算总额"></td>
                     </tr>
                     <tr>
                         <td>购买商品、接受劳务支付的现金</td>
-                        <td><input name="purchaseCostBudget" type="text" class="number" value="${Utils.format(cashFlowBean.purchaseCost,'0')}" readonly required title="预算总额"></td>
-                        <td><input name="purchaseCostFormerSettle" type="text" class="number" value="${Utils.format(formerBean.purchaseCost,'0')}" required readonly title="上月结算总额"></td>
+                        <td><input name="purchaseCostBudget" type="text" class="number" value="${Utils.format(cashFlowBean.purchaseCost,'0.00')}" readonly required title="预算总额"></td>
+                        <td><input name="purchaseCostFormerSettle" type="text" class="number" value="${Utils.format(formerBean.purchaseCost,'0.00')}" required readonly title="上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="purchaseCost" required title="本月结算金额"></td>
                         <td><input name="purchaseCostSettle" type="text" class="number" readonly title="结算总额"></td>
                     </tr>
                     <tr>
                         <td>支付的各项税费</td>
                         <td>/</td>
-                        <td><input name="taxCostFormerSettle" type="text" class="number" value="${Utils.format(formerBean.taxCost,'0')}" required readonly title="上月结算总额"></td>
+                        <td><input name="taxCostFormerSettle" type="text" class="number" value="${Utils.format(formerBean.taxCost,'0.00')}" required readonly title="上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="taxCost" required title="本月结算金额"></td>
                         <td><input name="taxCostSettle" type="text" class="number" readonly title="结算总额"></td>
                     </tr>
                     <tr>
                         <td>支付其他与经营活动有关的现金</td>
-                        <td><input name="earnestMoneyCostBudget" type="text" class="number" value="${Utils.format(cashFlowBean.earnestMoneyCost,'0')}" readonly required title="预算总额"></td>
-                        <td><input name="earnestMoneyCostFormerSettle" type="text" class="number" value="${Utils.format(formerBean.earnestMoneyCost,'0')}" required readonly title="上月结算总额"></td>
+                        <td><input name="earnestMoneyCostBudget" type="text" class="number" value="${Utils.format(cashFlowBean.earnestMoneyCost,'0.00')}" readonly required title="预算总额"></td>
+                        <td><input name="earnestMoneyCostFormerSettle" type="text" class="number" value="${Utils.format(formerBean.earnestMoneyCost,'0.00')}" required readonly title="上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="earnestMoneyCost" required title="本月结算金额"></td>
                         <td><input name="earnestMoneyCostSettle" type="text" class="number" readonly title="结算总额"></td>
                     </tr>
                     <tr>
                         <td>经营活动产生的现金流量净额</td>
-                        <td><input name="netCashFlowBudget" type="text" class="number" value="${Utils.format(cashFlowBean.getNetCashFlow(),'0')}" readonly required title="预算总额"></td>
-                        <td><input name="netCashFlowFormerSettle" type="text" class="number" value="${Utils.format(formerBean.netCashFlow,'0')}" required readonly title="上月结算总额"></td>
+                        <td><input name="netCashFlowBudget" type="text" class="number" value="${Utils.format(cashFlowBean.getNetCashFlow(),'0.00')}" readonly required title="预算总额"></td>
+                        <td><input name="netCashFlowFormerSettle" type="text" class="number" value="${Utils.format(formerBean.netCashFlow,'0.00')}" required readonly title="上月结算总额"></td>
                         <td><input type="text" class="number" name="netCashFlow" readonly required title="本月结算金额"></td>
                         <td><input name="netCashFlowSettle" type="text" class="number" readonly title="结算总额"></td>
                     </tr>
                     <tr>
                         <td>投资活动现金流入</td>
                         <td>/</td>
-                        <td><input name="cashInflowFromInvestingActivitiesFormerSettle" type="text" class="number" value="${Utils.format(formerBean.cashInflowFromInvestingActivities,'0')}" required readonly title="上月结算总额"></td>
+                        <td><input name="cashInflowFromInvestingActivitiesFormerSettle" type="text" class="number" value="${Utils.format(formerBean.cashInflowFromInvestingActivities,'0.00')}" required readonly title="上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="cashInflowFromInvestingActivities" required title="本月结算金额"></td>
                         <td><input name="cashInflowFromInvestingActivitiesSettle" type="text" class="number" readonly title="结算总额"></td>
                     </tr>
                     <tr>
                         <td>投资活动现金流出</td>
                         <td>/</td>
-                        <td><input name="cashOutflowFromInvestingActivitiesFormerSettle" type="text" class="number" value="${Utils.format(formerBean.cashOutflowFromInvestingActivities,'0')}" required readonly title="上月结算总额"></td>
+                        <td><input name="cashOutflowFromInvestingActivitiesFormerSettle" type="text" class="number" value="${Utils.format(formerBean.cashOutflowFromInvestingActivities,'0.00')}" required readonly title="上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="cashOutflowFromInvestingActivities" required title="本月结算金额"></td>
                         <td><input name="cashOutflowFromInvestingActivitiesSettle" type="text" class="number" readonly title="结算总额"></td>
                     </tr>
                     <tr>
                         <td>投资活动产生的现金流量净额</td>
                         <td>/</td>
-                        <td><input name="netCashFromInvestingActivitiesFormerSettle" type="text" class="number" value="${Utils.format(formerBean.netCashFromInvestingActivities,'0')}" required readonly title="上月结算总额"></td>
+                        <td><input name="netCashFromInvestingActivitiesFormerSettle" type="text" class="number" value="${Utils.format(formerBean.netCashFromInvestingActivities,'0.00')}" required readonly title="上月结算总额"></td>
                         <td><input type="text" class="number" name="netCashFromInvestingActivities" readonly required title="本月结算金额"></td>
                         <td><input name="netCashFromInvestingActivitiesSettle" type="text" class="number" readonly title="结算总额"></td>
                     </tr>
                     <tr>
                         <td>融资资金流入</td>
-                        <td><input name="financingCapitalInflowBudget" type="text" class="number" value="${Utils.format(cashFlowBean.financingCapitalInflow,'0')}" readonly required title="预算总额"></td>
-                        <td><input name="financingCapitalInflowFormerSettle" type="text" class="number" value="${Utils.format(formerBean.financingCapitalInflow,'0')}" required readonly title="上月结算总额"></td>
+                        <td><input name="financingCapitalInflowBudget" type="text" class="number" value="${Utils.format(cashFlowBean.financingCapitalInflow,'0.00')}" readonly required title="预算总额"></td>
+                        <td><input name="financingCapitalInflowFormerSettle" type="text" class="number" value="${Utils.format(formerBean.financingCapitalInflow,'0.00')}" required readonly title="上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="financingCapitalInflow" required title="本月结算金额"></td>
                         <td><input name="financingCapitalInflowSettle" type="text" class="number" readonly title="结算总额"></td>
                     </tr>
                     <tr>
                         <td>还款资金流出</td>
-                        <td><input name="financingCapitalOutflowBudget" type="text" class="number" value="${Utils.format(cashFlowBean.financingCapitalOutflow,'0')}" readonly required title="预算总额"></td>
-                        <td><input name="financingCapitalOutflowFormerSettle" type="text" class="number" value="${Utils.format(formerBean.financingCapitalOutflow,'0')}" required readonly title="上月结算总额"></td>
+                        <td><input name="financingCapitalOutflowBudget" type="text" class="number" value="${Utils.format(cashFlowBean.financingCapitalOutflow,'0.00')}" readonly required title="预算总额"></td>
+                        <td><input name="financingCapitalOutflowFormerSettle" type="text" class="number" value="${Utils.format(formerBean.financingCapitalOutflow,'0.00')}" required readonly title="上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="financingCapitalOutflow" required title="本月结算金额"></td>
                         <td><input name="financingCapitalOutflowSettle" type="text" class="number" readonly title="结算总额"></td>
                     </tr>
                     <tr>
                         <td>筹资活动产生的现金流量净额</td>
-                        <td><input name="financingCapitalCashflowBudget" type="text" class="number" value="${Utils.format(cashFlowBean.getFinancingCapitalCashflow(),'0')}" readonly required title="预算总额"></td>
-                        <td><input name="financingCapitalCashflowFormerSettle" type="text" class="number" value="${Utils.format(formerBean.financingCapitalCashflow,'0')}" required readonly title="上月结算总额"></td>
+                        <td><input name="financingCapitalCashflowBudget" type="text" class="number" value="${Utils.format(cashFlowBean.getFinancingCapitalCashflow(),'0.00')}" readonly required title="预算总额"></td>
+                        <td><input name="financingCapitalCashflowFormerSettle" type="text" class="number" value="${Utils.format(formerBean.financingCapitalCashflow,'0.00')}" required readonly title="上月结算总额"></td>
                         <td><input type="text" class="number" name="financingCapitalCashflow" readonly required title="本月结算金额"></td>
                         <td><input name="financingCapitalCashflowSettle" type="text" class="number" readonly title="结算总额"></td>
                     </tr>
                     <tr>
                         <td>货币资金净增加额</td>
-                        <td><input name="netIncreaseMonetaryFundsBudget" type="text" class="number" value="${Utils.format(cashFlowBean.getNetIncreaseMonetaryFunds(),'0')}" readonly required title="预算总额"></td>
-                        <td><input name="netIncreaseMonetaryFundsFormerSettle" type="text" class="number" value="${Utils.format(formerBean.netIncreaseMonetaryFunds,'0')}" required readonly title="上月结算总额"></td>
+                        <td><input name="netIncreaseMonetaryFundsBudget" type="text" class="number" value="${Utils.format(cashFlowBean.getNetIncreaseMonetaryFunds(),'0.00')}" readonly required title="预算总额"></td>
+                        <td><input name="netIncreaseMonetaryFundsFormerSettle" type="text" class="number" value="${Utils.format(formerBean.netIncreaseMonetaryFunds,'0.00')}" required readonly title="上月结算总额"></td>
                         <td><input type="text" class="number" name="netIncreaseMonetaryFunds" readonly required title="本月结算金额"></td>
                         <td><input name="netIncreaseMonetaryFundsSettle" type="text" class="number" readonly title="结算总额"></td>
                     </tr>