From 4441ded7ad52c742bfa3f7426e907f0d4c326d10 Mon Sep 17 00:00:00 2001
From: hanbo <2608504783@qq.com>
Date: Tue, 30 Nov 2021 15:00:00 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/common/header.ftl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/templates/common/header.ftl b/src/main/resources/templates/common/header.ftl
index a5fa8da..2b06f17 100644
--- a/src/main/resources/templates/common/header.ftl
+++ b/src/main/resources/templates/common/header.ftl
@@ -26,7 +26,7 @@
                     </marquee>
                 </li>
 
-                <li style="margin-top: 15px"><span style="color: red;">${message!""}</span></li>
+                <#--<li style="margin-top: 15px"><span style="color: red;">${message!""}</span></li>-->
                 <li class="am-dropdown" data-am-dropdown>
                     <a class="am-dropdown-toggle" data-am-dropdown-toggle href="javascript:;">
                         <span class="am-icon-user"></span>&nbsp您好, ${userName!""}&nbsp<span class="am-icon-caret-down"></span>

From 659c911436fd60d06936f8d46edb70f5eef0788a Mon Sep 17 00:00:00 2001
From: hanbo <2608504783@qq.com>
Date: Tue, 30 Nov 2021 15:26:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=B0=8F=E6=95=B0?=
 =?UTF-8?q?=E4=BD=8D=E6=95=B0=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/assets/js/project_final.js         | 17 +++++--
 .../static/assets/js/project_settle.js        | 17 +++++--
 .../templates/admin/project_final_add.ftl     | 44 +++++++++----------
 .../templates/admin/project_final_edit.ftl    | 44 +++++++++----------
 4 files changed, 72 insertions(+), 50 deletions(-)

diff --git a/src/main/resources/static/assets/js/project_final.js b/src/main/resources/static/assets/js/project_final.js
index 5b8ad68..931ec0b 100644
--- a/src/main/resources/static/assets/js/project_final.js
+++ b/src/main/resources/static/assets/js/project_final.js
@@ -320,7 +320,7 @@ function calGrossProfitProfitMargin() {
 
     var grossProfitProfitMargin = $("input[name='grossProfitProfitMargin']");
     if (grossProfitFinalTotal && incomeFinalTotal) {
-        grossProfitProfitMargin.val(100 * grossProfitFinalTotal / incomeFinalTotal);
+        grossProfitProfitMargin.val(f2(100 * grossProfitFinalTotal / incomeFinalTotal));
     } else {
         grossProfitProfitMargin.val("");
     }
@@ -352,7 +352,7 @@ function calContributionMarginProfitMargin() {
 
     var contributionMarginProfitMargin = $("input[name='contributionMarginProfitMargin']");
     if (contributionMarginFinalTotal && incomeFinalTotal) {
-        contributionMarginProfitMargin.val(100 * contributionMarginFinalTotal / incomeFinalTotal);
+        contributionMarginProfitMargin.val(f2(100 * contributionMarginFinalTotal / incomeFinalTotal));
     } else {
         contributionMarginProfitMargin.val("");
     }
@@ -384,12 +384,23 @@ function calNetMarginProfitMargin() {
 
     var netMarginProfitMargin = $("input[name='netMarginProfitMargin']");
     if (netMarginFinalTotal && incomeFinalTotal) {
-        netMarginProfitMargin.val(100 * netMarginFinalTotal / incomeFinalTotal);
+        netMarginProfitMargin.val(f2(100 * netMarginFinalTotal / incomeFinalTotal));
     } else {
         netMarginProfitMargin.val("");
     }
 }
 
+function f2(x) {
+    if(!x){
+        return 0;
+    }
+    var f = parseFloat(x);
+    if (isNaN(f)) {
+        return 0;
+    }
+    return Math.round(x*100)/100;
+}
+
 
 
 
diff --git a/src/main/resources/static/assets/js/project_settle.js b/src/main/resources/static/assets/js/project_settle.js
index 9efb385..3c72c17 100644
--- a/src/main/resources/static/assets/js/project_settle.js
+++ b/src/main/resources/static/assets/js/project_settle.js
@@ -557,7 +557,7 @@ function calGrossProfitProfitMargin() {
     var grossProfitProfitMargin = $("input[name='grossProfitProfitMargin']");
 
     if(grossProfitSettleTotal && incomeSettleTotal){
-        grossProfitProfitMargin.val(100*(parseFloat(grossProfitSettleTotal)/parseFloat(incomeSettleTotal)));
+        grossProfitProfitMargin.val(f2(100*(parseFloat(grossProfitSettleTotal)/parseFloat(incomeSettleTotal))));
     }else {
         grossProfitProfitMargin.val("");
     }
@@ -605,7 +605,7 @@ function calContributionProfitProfitMargin() {
     var contributionProfitProfitMargin = $("input[name='contributionProfitProfitMargin']");
 
     if(contributionProfitSettleTotal && incomeSettleTotal){
-        contributionProfitProfitMargin.val(100*(parseFloat(contributionProfitSettleTotal)/parseFloat(incomeSettleTotal)));
+        contributionProfitProfitMargin.val(f2(100*(parseFloat(contributionProfitSettleTotal)/parseFloat(incomeSettleTotal))));
     }else {
         contributionProfitProfitMargin.val("");
     }
@@ -653,7 +653,7 @@ function calNetProfitProfitMargin() {
     var netProfitProfitMargin = $("input[name='netProfitProfitMargin']");
 
     if(netProfitSettleTotal && incomeSettleTotal){
-        netProfitProfitMargin.val(100*(parseFloat(netProfitSettleTotal)/parseFloat(incomeSettleTotal)));
+        netProfitProfitMargin.val(f2(100*(parseFloat(netProfitSettleTotal)/parseFloat(incomeSettleTotal))));
     }else {
         netProfitProfitMargin.val("");
     }
@@ -955,6 +955,17 @@ function calNetIncreaseMonetaryFunds() {
     }
 }
 
+function f2(x) {
+    if(!x){
+        return 0;
+    }
+    var f = parseFloat(x);
+    if (isNaN(f)) {
+        return 0;
+    }
+    return Math.round(x*100)/100;
+}
+
 
 
 
diff --git a/src/main/resources/templates/admin/project_final_add.ftl b/src/main/resources/templates/admin/project_final_add.ftl
index 2a24e9e..1d5436d 100644
--- a/src/main/resources/templates/admin/project_final_add.ftl
+++ b/src/main/resources/templates/admin/project_final_add.ftl
@@ -51,7 +51,7 @@
                         <td><input name="incomeDeviceTaxExclude" type="number" value="${Utils.format(estimateBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类概算总额"></td>
                         <td><input name="incomeDeviceTaxExclude" type="number" value="${Utils.format(budgetBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类预算总额"></td>
                         <td><input type="number" value="${Utils.format(settleBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类结算总额"></td>
-                        <td><input name="incomeDeviceFinalTotal" type="number" min="0.00" max="99999999.99" step="0.01" required title="设备类决算总额"></td>
+                        <td><input name="incomeDeviceFinalTotal" type="number" min="0.00" max="999999999.99" step="0.01" required title="设备类决算总额"></td>
                     </tr>
                     <tr>
                         <td>收入</td>
@@ -59,7 +59,7 @@
                         <td><input name="incomeEngineerTaxExclude" type="number" value="${Utils.format(estimateBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类概算总额"></td>
                         <td><input name="incomeEngineerTaxExclude" type="number" value="${Utils.format(budgetBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类预算总额"></td>
                         <td><input type="number" value="${Utils.format(settleBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类结算总额"></td>
-                        <td><input name="incomeEngineerFinalTotal" type="number" min="0.00" max="99999999.99" step="0.01"  required title="工程类决算总额"></td>
+                        <td><input name="incomeEngineerFinalTotal" type="number" min="0.00" max="999999999.99" step="0.01"  required title="工程类决算总额"></td>
                     </tr>
                     <tr>
                         <td>收入</td>
@@ -67,7 +67,7 @@
                         <td><input name="incomeServiceTaxExclude" type="number" value="${Utils.format(estimateBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类概算总额"></td>
                         <td><input name="incomeServiceTaxExclude" type="number" value="${Utils.format(budgetBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类预算总额"></td>
                         <td><input type="number" value="${Utils.format(settleBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类结算总额"></td>
-                        <td><input name="incomeServiceFinalTotal" type="number" min="0.00" max="99999999.99" step="0.01" required title="服务类决算总额"></td>
+                        <td><input name="incomeServiceFinalTotal" type="number" min="0.00" max="999999999.99" step="0.01" required title="服务类决算总额"></td>
                     </tr>
                     <tr>
                         <td>合计</td>
@@ -98,7 +98,7 @@
                         <td><input name="costPurchaseDeviceTaxExclude" type="number" value="${Utils.format(estimateBean.costPurchaseDeviceTaxExclude,'0')}" readonly required title="购买设备概算总额"></td>
                         <td><input name="costPurchaseDeviceTaxExclude" type="number" value="${Utils.format(budgetBean.costPurchaseDeviceTaxExclude,'0')}" readonly required title="购买设备预算总额"></td>
                         <td><input  type="number" value="${Utils.format(settleBean.costPurchaseDeviceTaxExclude,'0')}" readonly required title="购买设备结算总额"></td>
-                        <td><input name="costPurchaseDeviceFinalTotal" type="number" min="0.00" max="99999999.99" step="0.01" required title="购买设备决算总额"></td>
+                        <td><input name="costPurchaseDeviceFinalTotal" type="number" min="0.00" max="999999999.99" step="0.01" required title="购买设备决算总额"></td>
                     </tr>
                     <tr>
                         <td>成本</td>
@@ -107,7 +107,7 @@
                         <td><input name="costPurchaseBuildTaxExclude" type="number" value="${Utils.format(estimateBean.costPurchaseBuildTaxExclude,'0')}" readonly required title="施工采购成本概算总额"></td>
                         <td><input name="costPurchaseBuildTaxExclude" type="number" value="${Utils.format(budgetBean.costPurchaseBuildTaxExclude,'0')}" readonly required title="施工采购成本预算总额"></td>
                         <td><input type="number" value="${Utils.format(settleBean.costPurchaseBuildTaxExclude,'0')}" readonly required title="施工采购成本结算总额"></td>
-                        <td><input name="costPurchaseBuildFinalTotal" type="number" min="0.00" max="99999999.99" step="0.01" required title="施工采购成本决算总额"></td>
+                        <td><input name="costPurchaseBuildFinalTotal" type="number" min="0.00" max="999999999.99" step="0.01" required title="施工采购成本决算总额"></td>
                     </tr>
                     <tr>
                         <td>成本</td>
@@ -116,7 +116,7 @@
                         <td><input name="costPurchaseServiceTaxExclude" type="number" value="${Utils.format(estimateBean.costPurchaseServiceTaxExclude,'0')}" readonly required title="服务采购成本概算总额"></td>
                         <td><input name="costPurchaseServiceTaxExclude" type="number" value="${Utils.format(budgetBean.costPurchaseServiceTaxExclude,'0')}" readonly required title="服务采购成本预算总额"></td>
                         <td><input type="number" value="${Utils.format(settleBean.costPurchaseServiceTaxExclude,'0')}" readonly required title="服务采购成本结算总额"></td>
-                        <td><input name="costPurchaseServiceFinalTotal" type="number" min="0.00" max="99999999.99" step="0.01" required title="服务采购成本决算总额"></td>
+                        <td><input name="costPurchaseServiceFinalTotal" type="number" min="0.00" max="999999999.99" step="0.01" required title="服务采购成本决算总额"></td>
                     </tr>
                     <tr>
                         <td>成本</td>
@@ -125,7 +125,7 @@
                         <td><input name="costPurchaseOtherTaxInclude" type="number" value="${Utils.format(estimateBean.costPurchaseOtherTaxInclude,'0')}" readonly required title="其他采购成本概算总额"></td>
                         <td><input name="costPurchaseOtherTaxInclude" type="number" value="${Utils.format(budgetBean.costPurchaseOtherTaxInclude,'0')}" readonly required title="其他采购成本预算总额"></td>
                         <td><input name="costPurchaseOtherSettleTotal" value="${Utils.format(settleBean.costPurchaseOtherTaxExclude,'0')}" type="number" readonly required title="其他采购成本结算总额"></td>
-                        <td><input name="costPurchaseOtherFinalTotal" type="number" min="0.00" max="99999999.99" step="0.01" required title="其他采购成本决算总额"></td>
+                        <td><input name="costPurchaseOtherFinalTotal" type="number" min="0.00" max="999999999.99" step="0.01" required title="其他采购成本决算总额"></td>
                     </tr>
                     <tr>
                         <td>成本</td>
@@ -134,7 +134,7 @@
                         <td><input name="costProjectManageTaxExclude" type="number" value="${Utils.format(estimateBean.costProjectManageTaxExclude,'0')}" readonly required title="项目管理成本概算总额"></td>
                         <td><input name="costProjectManageTaxExclude" type="number" value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0')}" readonly required title="项目管理成本预算总额"></td>
                         <td><input name="costProjectManageSettleTotal" value="${Utils.format(settleBean.costProjectManageTaxExclude,'0')}" type="number" readonly required title="项目管理成本结算总额"></td>
-                        <td><input name="costProjectManageFinalTotal" type="number" min="0.00" max="99999999.99" step="0.01" required title="项目管理成本决算总额"></td>
+                        <td><input name="costProjectManageFinalTotal" type="number" min="0.00" max="999999999.99" step="0.01" required title="项目管理成本决算总额"></td>
                     </tr>
                     <tr>
                         <td>成本</td>
@@ -143,7 +143,7 @@
                         <td><input name="costOtherOtherTaxExclude" type="number" value="${Utils.format(estimateBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本概算总额"></td>
                         <td><input name="costOtherOtherTaxExclude" type="number" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本预算总额"></td>
                         <td><input name="costOtherSettleTotal" value="${Utils.format(settleBean.costOtherOtherTaxExclude,'0')}" type="number" type="number"readonly required title="其他成本结算总额"></td>
-                        <td><input name="costOtherFinalTotal" type="number" min="0.00" max="99999999.99" step="0.01" required title="其他成本决算总额"></td>
+                        <td><input name="costOtherFinalTotal" type="number" min="0.00" max="999999999.99" step="0.01" required title="其他成本决算总额"></td>
                     </tr>
                     <tr>
                         <td>合计</td>
@@ -173,7 +173,7 @@
                         <td><input name="costExpropriationTaxExclude" type="number" value="${Utils.format(estimateBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本概算总额"></td>
                         <td><input name="costExpropriationTaxExclude" type="number" value="${Utils.format(budgetBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本预算总额"></td>
                         <td><input type="number"  value="${Utils.format(settleBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本结算总额"></td>
-                        <td><input name="costExpropriationFinalTotal" type="number" min="0.00" max="99999999.99" step="0.01" required title="资金占用成本决算总额"></td>
+                        <td><input name="costExpropriationFinalTotal" type="number" min="0.00" max="999999999.99" step="0.01" required title="资金占用成本决算总额"></td>
                     </tr>
                     <tr>
                         <td>公司管理费用</td>
@@ -181,7 +181,7 @@
                         <td><input name="costCompanyManageTaxExclude" type="number" value="${Utils.format(estimateBean.costCompanyManageTaxExclude,'0')}" required readonly title="公司管理费用概算总额"></td>
                         <td><input name="costCompanyManageTaxExclude" type="number" value="${Utils.format(budgetBean.costCompanyManageTaxExclude,'0')}" required readonly title="公司管理费用预算总额"></td>
                         <td><input type="number" value="${Utils.format(settleBean.costCompanyManageTaxExclude,'0')}" required readonly title="公司管理费用结算总额"></td>
-                        <td><input name="costCompanyManageFinalTotal" type="number" min="0.00" max="99999999.99" step="0.01" required title="公司管理费用决算总额"></td>
+                        <td><input name="costCompanyManageFinalTotal" type="number" min="0.00" max="999999999.99" step="0.01" required title="公司管理费用决算总额"></td>
                     </tr>
                     <tr>
                         <td>所得税费用</td>
@@ -189,7 +189,7 @@
                         <td>/</td>
                         <td>/</td>
                         <td><input name="costIncomeTaxSettleTotal" value="${Utils.format(settleBean.costIncomeTax,'0')}" type="number" required readonly title="所得税费用结算总额"></td>
-                        <td><input name="costIncomeTaxFinalTotal" type="number" min="0.00" max="99999999.99" step="0.01" required title="所得税费用决算总额"></td>
+                        <td><input name="costIncomeTaxFinalTotal" type="number" min="0.00" max="999999999.99" step="0.01" required title="所得税费用决算总额"></td>
                     </tr>
                     <tr>
                         <td>合计</td>
@@ -253,37 +253,37 @@
                         <td>销售商品、提供劳务收到的现金</td>
                         <td><input name="budgetSaleIncomeCash" type="number" value="${Utils.format(cashFlowBean.saleIncomeCash,'0')}" readonly required title="预算总额"></td>
                         <td><input type="number" value="${Utils.format(settleBean.saleIncomeCash,'0')}" readonly required title="结算总额"></td>
-                        <td><input name="saleIncomeCash" type="number" min="0.00" max="99999999.99" step="0.01" required title="决算总额"></td>
+                        <td><input name="saleIncomeCash" type="number" min="0.00" max="999999999.99" step="0.01" required title="决算总额"></td>
                     </tr>
                     <tr>
                         <td>收到的税费返还</td>
                         <td>/</td>
                         <td><input type="number" value="${Utils.format(settleBean.taxReturn,'0')}" readonly required title="结算总额"></td>
-                        <td><input name="taxReturn" type="number" min="0.00" max="99999999.99" step="0.01" required title="决算总额"></td>
+                        <td><input name="taxReturn" type="number" min="0.00" max="999999999.99" step="0.01" required title="决算总额"></td>
                     </tr>
                     <tr>
                         <td>收到其他与经营活动有关的现金</td>
                         <td><input name="budgetEarnestMoneyIncome" type="number" value="${Utils.format(cashFlowBean.earnestMoneyIncome,'0')}" readonly required title="预算总额"></td>
                         <td><input type="number" value="${Utils.format(settleBean.earnestMoneyIncome,'0')}" readonly required title="结算总额"></td>
-                        <td><input name="earnestMoneyIncome" type="number" min="0.00" max="99999999.99" step="0.01" required title="决算总额"></td>
+                        <td><input name="earnestMoneyIncome" type="number" min="0.00" max="999999999.99" step="0.01" required title="决算总额"></td>
                     </tr>
                     <tr>
                         <td>购买商品、接受劳务支付的现金</td>
                         <td><input name="budgetPurchaseCost" type="number" value="${Utils.format(cashFlowBean.purchaseCost,'0')}" readonly required title="预算总额"></td>
                         <td><input type="number" value="${Utils.format(settleBean.purchaseCost,'0')}" readonly required title="结算总额"></td>
-                        <td><input name="purchaseCost" type="number" min="0.00" max="99999999.99" step="0.01" required title="决算总额"></td>
+                        <td><input name="purchaseCost" type="number" min="0.00" max="999999999.99" step="0.01" required title="决算总额"></td>
                     </tr>
                     <tr>
                         <td>支付的各项税费</td>
                         <td>/</td>
                         <td><input type="number" value="${Utils.format(settleBean.taxCost,'0')}" readonly required title="结算总额"></td>
-                        <td><input name="taxCost" type="number" min="0.00" max="99999999.99" step="0.01" required title="决算总额"></td>
+                        <td><input name="taxCost" type="number" min="0.00" max="999999999.99" step="0.01" required title="决算总额"></td>
                     </tr>
                     <tr>
                         <td>支付其他与经营活动有关的现金</td>
                         <td><input name="budgetEarnestMoneyCost" type="number" value="${Utils.format(cashFlowBean.earnestMoneyCost,'0')}" readonly required title="预算总额"></td>
                         <td><input type="number" value="${Utils.format(settleBean.earnestMoneyCost,'0')}" readonly required title="结算总额"></td>
-                        <td><input name="earnestMoneyCost" type="number" min="0.00" max="99999999.99" step="0.01" required title="决算总额"></td>
+                        <td><input name="earnestMoneyCost" type="number" min="0.00" max="999999999.99" step="0.01" required title="决算总额"></td>
                     </tr>
                     <tr>
                         <td>经营活动产生的现金流量净额</td>
@@ -295,13 +295,13 @@
                         <td>投资活动现金流入</td>
                         <td>/</td>
                         <td><input type="number" value="${Utils.format(settleBean.cashInflowFromInvestingActivities,'0')}" readonly required title="结算总额"></td>
-                        <td><input name="cashInflowFromInvestingActivities"  type="number" min="0.00" max="99999999.99" step="0.01" required title="决算总额"></td>
+                        <td><input name="cashInflowFromInvestingActivities"  type="number" min="0.00" max="999999999.99" step="0.01" required title="决算总额"></td>
                     </tr>
                     <tr>
                         <td>投资活动现金流出</td>
                         <td>/</td>
                         <td><input type="number" value="${Utils.format(settleBean.cashOutflowFromInvestingActivities,'0')}" readonly required title="结算总额"></td>
-                        <td><input name="cashOutflowFromInvestingActivities" type="number" min="0.00" max="99999999.99" step="0.01" required title="决算总额"></td>
+                        <td><input name="cashOutflowFromInvestingActivities" type="number" min="0.00" max="999999999.99" step="0.01" required title="决算总额"></td>
                     </tr>
                     <tr>
                         <td>投资活动产生的现金流量净额</td>
@@ -313,13 +313,13 @@
                         <td>融资资金流入</td>
                         <td><input name="budgetFinancingCapitalInflow" type="number" value="${Utils.format(cashFlowBean.financingCapitalInflow,'0')}" readonly required title="预算总额"></td>
                         <td><input type="number" value="${Utils.format(settleBean.financingCapitalInflow,'0')}" readonly required title="结算总额"></td>
-                        <td><input name="financingCapitalInflow" type="number" min="0.00" max="99999999.99" step="0.01" required title="决算总额"></td>
+                        <td><input name="financingCapitalInflow" type="number" min="0.00" max="999999999.99" step="0.01" required title="决算总额"></td>
                     </tr>
                     <tr>
                         <td>还款资金流出</td>
                         <td><input name="budgetFinancingCapitalOutflow" type="number" value="${Utils.format(cashFlowBean.financingCapitalOutflow,'0')}" readonly required title="预算总额"></td>
                         <td><input type="number" value="${Utils.format(settleBean.financingCapitalOutflow,'0')}" readonly required title="结算总额"></td>
-                        <td><input name="financingCapitalOutflow" type="number" min="0.00" max="99999999.99" step="0.01" required title="决算总额"></td>
+                        <td><input name="financingCapitalOutflow" type="number" min="0.00" max="999999999.99" step="0.01" required title="决算总额"></td>
                     </tr>
                     <tr>
                         <td>筹资活动产生的现金流量净额</td>
diff --git a/src/main/resources/templates/admin/project_final_edit.ftl b/src/main/resources/templates/admin/project_final_edit.ftl
index 5525dd8..42f71c7 100644
--- a/src/main/resources/templates/admin/project_final_edit.ftl
+++ b/src/main/resources/templates/admin/project_final_edit.ftl
@@ -51,7 +51,7 @@
                         <td><input name="incomeDeviceTaxExclude" type="number" value="${Utils.format(estimateBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类概算总额"></td>
                         <td><input name="incomeDeviceTaxExclude" type="number" value="${Utils.format(budgetBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类预算总额"></td>
                         <td><input type="number" value="${Utils.format(settleBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类结算总额"></td>
-                        <td><input name="incomeDeviceFinalTotal" min="0.00" max="99999999.99" step="0.01" type="number" value="${Utils.format(finalBean.incomeDeviceFinalTotal,'0')}" required title="设备类决算总额"></td>
+                        <td><input name="incomeDeviceFinalTotal" min="0.00" max="999999999.99" step="0.01" type="number" value="${Utils.format(finalBean.incomeDeviceFinalTotal,'0')}" required title="设备类决算总额"></td>
                     </tr>
                     <tr>
                         <td>收入</td>
@@ -59,7 +59,7 @@
                         <td><input name="incomeEngineerTaxExclude" type="number" value="${Utils.format(estimateBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类概算总额"></td>
                         <td><input name="incomeEngineerTaxExclude" type="number" value="${Utils.format(budgetBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类预算总额"></td>
                         <td><input type="number" value="${Utils.format(settleBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类结算总额"></td>
-                        <td><input name="incomeEngineerFinalTotal" type="number" min="0.00" max="99999999.99" step="0.01" value="${Utils.format(finalBean.incomeEngineerFinalTotal,'0')}" required title="工程类决算总额"></td>
+                        <td><input name="incomeEngineerFinalTotal" type="number" min="0.00" max="999999999.99" step="0.01" value="${Utils.format(finalBean.incomeEngineerFinalTotal,'0')}" required title="工程类决算总额"></td>
                     </tr>
                     <tr>
                         <td>收入</td>
@@ -67,7 +67,7 @@
                         <td><input name="incomeServiceTaxExclude" type="number" value="${Utils.format(estimateBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类概算总额"></td>
                         <td><input name="incomeServiceTaxExclude" type="number" value="${Utils.format(budgetBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类预算总额"></td>
                         <td><input type="number" value="${Utils.format(settleBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类结算总额"></td>
-                        <td><input name="incomeServiceFinalTotal" type="number" min="0.00" max="99999999.99" step="0.01" value="${Utils.format(finalBean.incomeServiceFinalTotal,'0')}" required title="服务类决算总额"></td>
+                        <td><input name="incomeServiceFinalTotal" type="number" min="0.00" max="999999999.99" step="0.01" value="${Utils.format(finalBean.incomeServiceFinalTotal,'0')}" required title="服务类决算总额"></td>
                     </tr>
                     <tr>
                         <td>合计</td>
@@ -98,7 +98,7 @@
                         <td><input name="costPurchaseDeviceTaxExclude" type="number" value="${Utils.format(estimateBean.costPurchaseDeviceTaxExclude,'0')}" readonly required title="购买设备概算总额"></td>
                         <td><input name="costPurchaseDeviceTaxExclude" type="number" value="${Utils.format(budgetBean.costPurchaseDeviceTaxExclude,'0')}" readonly required title="购买设备预算总额"></td>
                         <td><input  type="number" value="${Utils.format(settleBean.costPurchaseDeviceTaxExclude,'0')}" readonly required title="购买设备结算总额"></td>
-                        <td><input name="costPurchaseDeviceFinalTotal" type="number" min="0.00" max="99999999.99" step="0.01" value="${Utils.format(finalBean.costPurchaseDeviceFinalTotal,'0')}" required title="购买设备决算总额"></td>
+                        <td><input name="costPurchaseDeviceFinalTotal" type="number" min="0.00" max="999999999.99" step="0.01" value="${Utils.format(finalBean.costPurchaseDeviceFinalTotal,'0')}" required title="购买设备决算总额"></td>
                     </tr>
                     <tr>
                         <td>成本</td>
@@ -107,7 +107,7 @@
                         <td><input name="costPurchaseBuildTaxExclude" type="number" value="${Utils.format(estimateBean.costPurchaseBuildTaxExclude,'0')}" readonly required title="施工采购成本概算总额"></td>
                         <td><input name="costPurchaseBuildTaxExclude" type="number" value="${Utils.format(budgetBean.costPurchaseBuildTaxExclude,'0')}" readonly required title="施工采购成本预算总额"></td>
                         <td><input type="number" value="${Utils.format(settleBean.costPurchaseBuildTaxExclude,'0')}" readonly required title="施工采购成本结算总额"></td>
-                        <td><input name="costPurchaseBuildFinalTotal" type="number" min="0.00" max="99999999.99" step="0.01" value="${Utils.format(finalBean.costPurchaseBuildFinalTotal,'0')}" required title="施工采购成本决算总额"></td>
+                        <td><input name="costPurchaseBuildFinalTotal" type="number" min="0.00" max="999999999.99" step="0.01" value="${Utils.format(finalBean.costPurchaseBuildFinalTotal,'0')}" required title="施工采购成本决算总额"></td>
                     </tr>
                     <tr>
                         <td>成本</td>
@@ -116,7 +116,7 @@
                         <td><input name="costPurchaseServiceTaxExclude" type="number" value="${Utils.format(estimateBean.costPurchaseServiceTaxExclude,'0')}" readonly required title="服务采购成本概算总额"></td>
                         <td><input name="costPurchaseServiceTaxExclude" type="number" value="${Utils.format(budgetBean.costPurchaseServiceTaxExclude,'0')}" readonly required title="服务采购成本预算总额"></td>
                         <td><input type="number" value="${Utils.format(settleBean.costPurchaseServiceTaxExclude,'0')}" readonly required title="服务采购成本结算总额"></td>
-                        <td><input name="costPurchaseServiceFinalTotal" type="number" min="0.00" max="99999999.99" step="0.01" value="${Utils.format(finalBean.costPurchaseServiceFinalTotal,'0')}" required title="服务采购成本决算总额"></td>
+                        <td><input name="costPurchaseServiceFinalTotal" type="number" min="0.00" max="999999999.99" step="0.01" value="${Utils.format(finalBean.costPurchaseServiceFinalTotal,'0')}" required title="服务采购成本决算总额"></td>
                     </tr>
                     <tr>
                         <td>成本</td>
@@ -125,7 +125,7 @@
                         <td><input name="costPurchaseOtherTaxInclude" type="number" value="${Utils.format(estimateBean.costPurchaseOtherTaxInclude,'0')}" readonly required title="其他采购成本概算总额"></td>
                         <td><input name="costPurchaseOtherTaxInclude" type="number" value="${Utils.format(budgetBean.costPurchaseOtherTaxInclude,'0')}" readonly required title="其他采购成本预算总额"></td>
                         <td><input name="costPurchaseOtherSettleTotal" value="${Utils.format(settleBean.costPurchaseOtherTaxExclude,'0')}" type="number" readonly required title="其他采购成本结算总额"></td>
-                        <td><input name="costPurchaseOtherFinalTotal" type="number" min="0.00" max="99999999.99" step="0.01" value="${Utils.format(finalBean.costPurchaseOtherFinalTotal,'0')}" required title="其他采购成本决算总额"></td>
+                        <td><input name="costPurchaseOtherFinalTotal" type="number" min="0.00" max="999999999.99" step="0.01" value="${Utils.format(finalBean.costPurchaseOtherFinalTotal,'0')}" required title="其他采购成本决算总额"></td>
                     </tr>
                     <tr>
                         <td>成本</td>
@@ -134,7 +134,7 @@
                         <td><input name="costProjectManageTaxExclude" type="number" value="${Utils.format(estimateBean.costProjectManageTaxExclude,'0')}" readonly required title="项目管理成本概算总额"></td>
                         <td><input name="costProjectManageTaxExclude" type="number" value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0')}" readonly required title="项目管理成本预算总额"></td>
                         <td><input name="costProjectManageSettleTotal" value="${Utils.format(settleBean.costProjectManageTaxExclude,'0')}" type="number" readonly required title="项目管理成本结算总额"></td>
-                        <td><input name="costProjectManageFinalTotal" type="number" min="0.00" max="99999999.99" step="0.01" value="${Utils.format(finalBean.costProjectManageFinalTotal,'0')}" required title="项目管理成本决算总额"></td>
+                        <td><input name="costProjectManageFinalTotal" type="number" min="0.00" max="999999999.99" step="0.01" value="${Utils.format(finalBean.costProjectManageFinalTotal,'0')}" required title="项目管理成本决算总额"></td>
                     </tr>
                     <tr>
                         <td>成本</td>
@@ -143,7 +143,7 @@
                         <td><input name="costOtherOtherTaxExclude" type="number" value="${Utils.format(estimateBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本概算总额"></td>
                         <td><input name="costOtherOtherTaxExclude" type="number" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本预算总额"></td>
                         <td><input name="costOtherSettleTotal" value="${Utils.format(settleBean.costOtherOtherTaxExclude,'0')}" type="number" type="number"readonly required title="其他成本结算总额"></td>
-                        <td><input name="costOtherFinalTotal" type="number" min="0.00" max="99999999.99" step="0.01" value="${Utils.format(finalBean.costOtherFinalTotal,'0')}" required title="其他成本决算总额"></td>
+                        <td><input name="costOtherFinalTotal" type="number" min="0.00" max="999999999.99" step="0.01" value="${Utils.format(finalBean.costOtherFinalTotal,'0')}" required title="其他成本决算总额"></td>
                     </tr>
                     <tr>
                         <td>合计</td>
@@ -173,7 +173,7 @@
                         <td><input name="costExpropriationTaxExclude" type="number" value="${Utils.format(estimateBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本概算总额"></td>
                         <td><input name="costExpropriationTaxExclude" type="number" value="${Utils.format(budgetBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本预算总额"></td>
                         <td><input type="number"  value="${Utils.format(settleBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本结算总额"></td>
-                        <td><input name="costExpropriationFinalTotal" type="number" min="0.00" max="99999999.99" step="0.01" value="${Utils.format(finalBean.costExpropriationFinalTotal,'0')}" required title="资金占用成本决算总额"></td>
+                        <td><input name="costExpropriationFinalTotal" type="number" min="0.00" max="999999999.99" step="0.01" value="${Utils.format(finalBean.costExpropriationFinalTotal,'0')}" required title="资金占用成本决算总额"></td>
                     </tr>
                     <tr>
                         <td>公司管理费用</td>
@@ -181,7 +181,7 @@
                         <td><input name="costCompanyManageTaxExclude" type="number" value="${Utils.format(estimateBean.costCompanyManageTaxExclude,'0')}" required readonly title="公司管理费用概算总额"></td>
                         <td><input name="costCompanyManageTaxExclude" type="number" value="${Utils.format(budgetBean.costCompanyManageTaxExclude,'0')}" required readonly title="公司管理费用预算总额"></td>
                         <td><input type="number" value="${Utils.format(settleBean.costCompanyManageTaxExclude,'0')}" required readonly title="公司管理费用结算总额"></td>
-                        <td><input name="costCompanyManageFinalTotal" type="number" min="0.00" max="99999999.99" step="0.01" value="${Utils.format(finalBean.costCompanyManageFinalTotal,'0')}" required title="公司管理费用决算总额"></td>
+                        <td><input name="costCompanyManageFinalTotal" type="number" min="0.00" max="999999999.99" step="0.01" value="${Utils.format(finalBean.costCompanyManageFinalTotal,'0')}" required title="公司管理费用决算总额"></td>
                     </tr>
                     <tr>
                         <td>所得税费用</td>
@@ -189,7 +189,7 @@
                         <td>/</td>
                         <td>/</td>
                         <td><input name="costIncomeTaxSettleTotal" value="${Utils.format(settleBean.costIncomeTax,'0')}" type="number" required readonly title="所得税费用结算总额"></td>
-                        <td><input name="costIncomeTaxFinalTotal" type="number" min="0.00" max="99999999.99" step="0.01" value="${Utils.format(finalBean.costIncomeTaxFinalTotal,'0')}" required title="所得税费用决算总额"></td>
+                        <td><input name="costIncomeTaxFinalTotal" type="number" min="0.00" max="999999999.99" step="0.01" value="${Utils.format(finalBean.costIncomeTaxFinalTotal,'0')}" required title="所得税费用决算总额"></td>
                     </tr>
                     <tr>
                         <td>合计</td>
@@ -253,37 +253,37 @@
                         <td>销售商品、提供劳务收到的现金</td>
                         <td><input name="budgetSaleIncomeCash" type="number" value="${Utils.format(cashFlowBean.saleIncomeCash,'0')}" readonly required title="预算总额"></td>
                         <td><input type="number" value="${Utils.format(settleBean.saleIncomeCash,'0')}" readonly required title="结算总额"></td>
-                        <td><input name="saleIncomeCash" type="number" min="0.00" max="99999999.99" step="0.01" value="${Utils.format(finalBean.saleIncomeCash,'0')}" required title="决算总额"></td>
+                        <td><input name="saleIncomeCash" type="number" min="0.00" max="999999999.99" step="0.01" value="${Utils.format(finalBean.saleIncomeCash,'0')}" required title="决算总额"></td>
                     </tr>
                     <tr>
                         <td>收到的税费返还</td>
                         <td>/</td>
                         <td><input type="number" value="${Utils.format(settleBean.taxReturn,'0')}" readonly required title="结算总额"></td>
-                        <td><input name="taxReturn" type="number" min="0.00" max="99999999.99" step="0.01" value="${Utils.format(finalBean.taxReturn,'0')}" required title="决算总额"></td>
+                        <td><input name="taxReturn" type="number" min="0.00" max="999999999.99" step="0.01" value="${Utils.format(finalBean.taxReturn,'0')}" required title="决算总额"></td>
                     </tr>
                     <tr>
                         <td>收到其他与经营活动有关的现金</td>
                         <td><input name="budgetEarnestMoneyIncome" type="number" value="${Utils.format(cashFlowBean.earnestMoneyIncome,'0')}" readonly required title="预算总额"></td>
                         <td><input type="number" value="${Utils.format(settleBean.earnestMoneyIncome,'0')}" readonly required title="结算总额"></td>
-                        <td><input name="earnestMoneyIncome" type="number" min="0.00" max="99999999.99" step="0.01" value="${Utils.format(finalBean.earnestMoneyIncome,'0')}" required title="决算总额"></td>
+                        <td><input name="earnestMoneyIncome" type="number" min="0.00" max="999999999.99" step="0.01" value="${Utils.format(finalBean.earnestMoneyIncome,'0')}" required title="决算总额"></td>
                     </tr>
                     <tr>
                         <td>购买商品、接受劳务支付的现金</td>
                         <td><input name="budgetPurchaseCost" type="number" value="${Utils.format(cashFlowBean.purchaseCost,'0')}" readonly required title="预算总额"></td>
                         <td><input type="number" value="${Utils.format(settleBean.purchaseCost,'0')}" readonly required title="结算总额"></td>
-                        <td><input name="purchaseCost" type="number" min="0.00" max="99999999.99" step="0.01" value="${Utils.format(finalBean.purchaseCost,'0')}" required title="决算总额"></td>
+                        <td><input name="purchaseCost" type="number" min="0.00" max="999999999.99" step="0.01" value="${Utils.format(finalBean.purchaseCost,'0')}" required title="决算总额"></td>
                     </tr>
                     <tr>
                         <td>支付的各项税费</td>
                         <td>/</td>
                         <td><input type="number" value="${Utils.format(settleBean.taxCost,'0')}" readonly required title="结算总额"></td>
-                        <td><input name="taxCost" type="number" min="0.00" max="99999999.99" step="0.01" value="${Utils.format(finalBean.taxCost,'0')}" required title="决算总额"></td>
+                        <td><input name="taxCost" type="number" min="0.00" max="999999999.99" step="0.01" value="${Utils.format(finalBean.taxCost,'0')}" required title="决算总额"></td>
                     </tr>
                     <tr>
                         <td>支付其他与经营活动有关的现金</td>
                         <td><input name="budgetEarnestMoneyCost" type="number" value="${Utils.format(cashFlowBean.earnestMoneyCost,'0')}" readonly required title="预算总额"></td>
                         <td><input type="number" value="${Utils.format(settleBean.earnestMoneyCost,'0')}" readonly required title="结算总额"></td>
-                        <td><input name="earnestMoneyCost" type="number" min="0.00" max="99999999.99" step="0.01" value="${Utils.format(finalBean.earnestMoneyCost,'0')}" required title="决算总额"></td>
+                        <td><input name="earnestMoneyCost" type="number" min="0.00" max="999999999.99" step="0.01" value="${Utils.format(finalBean.earnestMoneyCost,'0')}" required title="决算总额"></td>
                     </tr>
                     <tr>
                         <td>经营活动产生的现金流量净额</td>
@@ -295,13 +295,13 @@
                         <td>投资活动现金流入</td>
                         <td>/</td>
                         <td><input type="number" value="${Utils.format(settleBean.cashInflowFromInvestingActivities,'0')}" readonly required title="结算总额"></td>
-                        <td><input name="cashInflowFromInvestingActivities" value="${Utils.format(finalBean.cashInflowFromInvestingActivities,'0')}"  type="number" min="0.00" max="99999999.99" step="0.01" required title="决算总额"></td>
+                        <td><input name="cashInflowFromInvestingActivities" value="${Utils.format(finalBean.cashInflowFromInvestingActivities,'0')}"  type="number" min="0.00" max="999999999.99" step="0.01" required title="决算总额"></td>
                     </tr>
                     <tr>
                         <td>投资活动现金流出</td>
                         <td>/</td>
                         <td><input type="number" value="${Utils.format(settleBean.cashOutflowFromInvestingActivities,'0')}" readonly required title="结算总额"></td>
-                        <td><input name="cashOutflowFromInvestingActivities" type="number" value="${Utils.format(finalBean.cashOutflowFromInvestingActivities,'0')}" required min="0.00" max="99999999.99" step="0.01" title="决算总额"></td>
+                        <td><input name="cashOutflowFromInvestingActivities" type="number" value="${Utils.format(finalBean.cashOutflowFromInvestingActivities,'0')}" required min="0.00" max="999999999.99" step="0.01" title="决算总额"></td>
                     </tr>
                     <tr>
                         <td>投资活动产生的现金流量净额</td>
@@ -313,13 +313,13 @@
                         <td>融资资金流入</td>
                         <td><input name="budgetFinancingCapitalInflow" type="number" value="${Utils.format(cashFlowBean.financingCapitalInflow,'0')}" readonly required title="预算总额"></td>
                         <td><input type="number" value="${Utils.format(settleBean.financingCapitalInflow,'0')}" readonly required title="结算总额"></td>
-                        <td><input name="financingCapitalInflow" type="number" min="0.00" max="99999999.99" step="0.01" value="${Utils.format(finalBean.financingCapitalInflow,'0')}" required title="决算总额"></td>
+                        <td><input name="financingCapitalInflow" type="number" min="0.00" max="999999999.99" step="0.01" value="${Utils.format(finalBean.financingCapitalInflow,'0')}" required title="决算总额"></td>
                     </tr>
                     <tr>
                         <td>还款资金流出</td>
                         <td><input name="budgetFinancingCapitalOutflow" type="number" value="${Utils.format(cashFlowBean.financingCapitalOutflow,'0')}" readonly required title="预算总额"></td>
                         <td><input type="number" value="${Utils.format(settleBean.financingCapitalOutflow,'0')}" readonly required title="结算总额"></td>
-                        <td><input name="financingCapitalOutflow" type="number" min="0.00" max="99999999.99" step="0.01" value="${Utils.format(finalBean.financingCapitalOutflow,'0')}" required title="决算总额"></td>
+                        <td><input name="financingCapitalOutflow" type="number" min="0.00" max="999999999.99" step="0.01" value="${Utils.format(finalBean.financingCapitalOutflow,'0')}" required title="决算总额"></td>
                     </tr>
                     <tr>
                         <td>筹资活动产生的现金流量净额</td>