From 1537063c246fac26d2bc413ca57903f518d6dc17 Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Thu, 6 Jan 2022 11:07:34 +0800
Subject: [PATCH 01/35] =?UTF-8?q?=E7=BB=93=E7=AE=97=E5=86=B3=E7=AE=97?=
 =?UTF-8?q?=E5=88=86=E9=9A=94=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backend/ProjectFinalController.java       |  11 +-
 .../backend/ProjectSettleController.java      |  15 +-
 .../static/assets/js/project_final.js         |  75 +-
 .../static/assets/js/project_settle.js        | 127 ++--
 .../templates/admin/project_approve.ftl       | 708 +++++++++---------
 .../templates/admin/project_final_add.ftl     | 224 +++---
 .../templates/admin/project_final_edit.ftl    | 224 +++---
 .../templates/admin/project_settle_add.ftl    | 280 +++----
 .../templates/admin/project_settle_edit.ftl   | 280 +++----
 9 files changed, 994 insertions(+), 950 deletions(-)

diff --git a/src/main/java/cn/palmte/work/controller/backend/ProjectFinalController.java b/src/main/java/cn/palmte/work/controller/backend/ProjectFinalController.java
index 6ba4cd3..8eef146 100644
--- a/src/main/java/cn/palmte/work/controller/backend/ProjectFinalController.java
+++ b/src/main/java/cn/palmte/work/controller/backend/ProjectFinalController.java
@@ -1,6 +1,6 @@
 package cn.palmte.work.controller.backend;
 
-import cn.palmte.work.bean.*;
+import cn.palmte.work.bean.FinalBean;
 import cn.palmte.work.model.Project;
 import cn.palmte.work.model.ProjectBudgetPlanDetail;
 import cn.palmte.work.model.ProjectSettleIncome;
@@ -8,7 +8,11 @@ import cn.palmte.work.model.ProjectSettleIncomeRepository;
 import cn.palmte.work.service.*;
 import cn.palmte.work.utils.FreeMarkerUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.datetime.DateFormatter;
+import org.springframework.format.number.NumberStyleFormatter;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.WebDataBinder;
+import org.springframework.web.bind.annotation.InitBinder;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
@@ -98,4 +102,9 @@ public class ProjectFinalController extends BaseController{
         return "redirect:/project/list";
     }
 
+    @InitBinder
+    public void initBinder(WebDataBinder webDataBinder) {
+        webDataBinder.addCustomFormatter(new DateFormatter("yyyy-MM-dd"));
+        webDataBinder.addCustomFormatter(new NumberStyleFormatter());
+    }
 }
diff --git a/src/main/java/cn/palmte/work/controller/backend/ProjectSettleController.java b/src/main/java/cn/palmte/work/controller/backend/ProjectSettleController.java
index dbb8c4e..88e6b37 100644
--- a/src/main/java/cn/palmte/work/controller/backend/ProjectSettleController.java
+++ b/src/main/java/cn/palmte/work/controller/backend/ProjectSettleController.java
@@ -1,6 +1,9 @@
 package cn.palmte.work.controller.backend;
 
-import cn.palmte.work.bean.*;
+import cn.palmte.work.bean.BudgetSettleBean;
+import cn.palmte.work.bean.EstimateSettleBean;
+import cn.palmte.work.bean.FormerBean;
+import cn.palmte.work.bean.SettleBean;
 import cn.palmte.work.model.*;
 import cn.palmte.work.service.ProjectBudgetService;
 import cn.palmte.work.service.ProjectEstimateService;
@@ -9,7 +12,11 @@ import cn.palmte.work.service.ProjectSettleService;
 import cn.palmte.work.utils.DateKit;
 import cn.palmte.work.utils.FreeMarkerUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.datetime.DateFormatter;
+import org.springframework.format.number.NumberStyleFormatter;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.WebDataBinder;
+import org.springframework.web.bind.annotation.InitBinder;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import top.jfunc.common.utils.CollectionUtil;
@@ -135,4 +142,10 @@ public class ProjectSettleController extends BaseController{
         projectSettleService.saveAndApprove(project, settleBean, budgetBean, estimateBean, time);
         return "redirect:/project/list";
     }
+
+    @InitBinder
+    public void initBinder(WebDataBinder webDataBinder) {
+        webDataBinder.addCustomFormatter(new DateFormatter("yyyy-MM-dd"));
+        webDataBinder.addCustomFormatter(new NumberStyleFormatter());
+    }
 }
diff --git a/src/main/resources/static/assets/js/project_final.js b/src/main/resources/static/assets/js/project_final.js
index 4bdf666..11c4846 100644
--- a/src/main/resources/static/assets/js/project_final.js
+++ b/src/main/resources/static/assets/js/project_final.js
@@ -4,16 +4,19 @@ function calculateFinal() {
         calIncomeFinalTotal();
         calNetMarginFinalTotal();
         calNetMarginProfitMargin();
+        digitalSelf("incomeDeviceFinalTotal", "input[name='incomeDeviceFinalTotal']");
     });
     $("input[name='incomeEngineerFinalTotal']").change(function () {
         calIncomeFinalTotal();
         calNetMarginFinalTotal();
         calNetMarginProfitMargin();
+        digitalSelf("incomeEngineerFinalTotal", "input[name='incomeEngineerFinalTotal']");
     });
     $("input[name='incomeServiceFinalTotal']").change(function () {
         calIncomeFinalTotal();
         calNetMarginFinalTotal();
         calNetMarginProfitMargin();
+        digitalSelf("incomeServiceFinalTotal", "input[name='incomeServiceFinalTotal']");
     });
 
 
@@ -21,31 +24,37 @@ function calculateFinal() {
         calCostFinalTotal();
         calNetMarginFinalTotal();
         calNetMarginProfitMargin();
+        digitalSelf("costPurchaseDeviceFinalTotal", "input[name='costPurchaseDeviceFinalTotal']");
     });
     $("input[name='costPurchaseBuildFinalTotal']").change(function () {
         calCostFinalTotal();
         calNetMarginFinalTotal();
         calNetMarginProfitMargin();
+        digitalSelf("costPurchaseBuildFinalTotal", "input[name='costPurchaseBuildFinalTotal']");
     });
     $("input[name='costPurchaseServiceFinalTotal']").change(function () {
         calCostFinalTotal();
         calNetMarginFinalTotal();
         calNetMarginProfitMargin();
+        digitalSelf("costPurchaseServiceFinalTotal", "input[name='costPurchaseServiceFinalTotal']");
     });
     $("input[name='costPurchaseOtherFinalTotal']").change(function () {
         calCostFinalTotal();
         calNetMarginFinalTotal();
         calNetMarginProfitMargin();
+        digitalSelf("costPurchaseOtherFinalTotal", "input[name='costPurchaseOtherFinalTotal']");
     });
     $("input[name='costProjectManageFinalTotal']").change(function () {
         calCostFinalTotal();
         calNetMarginFinalTotal();
         calNetMarginProfitMargin();
+        digitalSelf("costProjectManageFinalTotal", "input[name='costProjectManageFinalTotal']");
     });
     $("input[name='costOtherFinalTotal']").change(function () {
         calCostFinalTotal();
         calNetMarginFinalTotal();
         calNetMarginProfitMargin();
+        digitalSelf("costOtherFinalTotal", "input[name='costOtherFinalTotal']");
     });
 
 
@@ -53,16 +62,19 @@ function calculateFinal() {
         calManageFinalTotal();
         calGrossProfitFinalTotal();
         calGrossProfitProfitMargin();
+        digitalSelf("costExpropriationFinalTotal", "input[name='costExpropriationFinalTotal']");
     });
     $("input[name='costCompanyManageFinalTotal']").change(function () {
         calManageFinalTotal();
         calContributionMarginFinalTotal();
         calContributionMarginProfitMargin();
+        digitalSelf("costCompanyManageFinalTotal", "input[name='costCompanyManageFinalTotal']");
     });
     $("input[name='costIncomeTaxFinalTotal']").change(function () {
         calManageFinalTotal();
         calNetMarginFinalTotal();
         calNetMarginProfitMargin();
+        digitalSelf("costIncomeTaxFinalTotal", "input[name='costIncomeTaxFinalTotal']");
     });
 
 
@@ -70,31 +82,37 @@ function calculateFinal() {
         //calCashFluxFinalTotal();
         calNetCashFlow();
         calNetIncreaseMonetaryFunds();
+        digitalSelf("saleIncomeCash", "input[name='saleIncomeCash']");
     });
     $("input[name='taxReturn']").change(function () {
         //calCashFluxFinalTotal();
         calNetCashFlow();
         calNetIncreaseMonetaryFunds();
+        digitalSelf("taxReturn", "input[name='taxReturn']");
     });
     $("input[name='earnestMoneyIncome']").change(function () {
         //calCashFluxFinalTotal();
         calNetCashFlow();
         calNetIncreaseMonetaryFunds();
+        digitalSelf("earnestMoneyIncome", "input[name='earnestMoneyIncome']");
     });
     $("input[name='purchaseCost']").change(function () {
         calCashFluxFinalTotal();
         calNetCashFlow();
         calNetIncreaseMonetaryFunds();
+        digitalSelf("purchaseCost", "input[name='purchaseCost']");
     });
     $("input[name='taxCost']").change(function () {
         // calCashFluxFinalTotal();
         calNetCashFlow();
         calNetIncreaseMonetaryFunds();
+        digitalSelf("taxCost", "input[name='taxCost']");
     });
     $("input[name='earnestMoneyCost']").change(function () {
         //calCashFluxFinalTotal();
         calNetCashFlow();
         calNetIncreaseMonetaryFunds();
+        digitalSelf("earnestMoneyCost", "input[name='earnestMoneyCost']");
     });
     $("input[name='netCashFlow']").change(function () {
         // calCashFluxFinalTotal();
@@ -103,11 +121,13 @@ function calculateFinal() {
         // calCashFluxFinalTotal();
         calNetCashFromInvestingActivities();
         calNetIncreaseMonetaryFunds();
-    })
+        digitalSelf("cashInflowFromInvestingActivities", "input[name='cashInflowFromInvestingActivities']");
+    });
     $("input[name='cashOutflowFromInvestingActivities']").change(function () {
         //calCashFluxFinalTotal();
         calNetCashFromInvestingActivities();
         calNetIncreaseMonetaryFunds();
+        digitalSelf("cashOutflowFromInvestingActivities", "input[name='cashOutflowFromInvestingActivities']");
     });
     $("input[name='netCashFromInvestingActivities']").change(function () {
         // calCashFluxFinalTotal();
@@ -116,11 +136,13 @@ function calculateFinal() {
         //calCashFluxFinalTotal();
         calFinancingCapitalCashflow();
         calNetIncreaseMonetaryFunds();
+        digitalSelf("financingCapitalInflow", "input[name='financingCapitalInflow']");
     });
     $("input[name='financingCapitalOutflow']").change(function () {
         //calCashFluxFinalTotal();
         calFinancingCapitalCashflow();
         calNetIncreaseMonetaryFunds();
+        digitalSelf("financingCapitalOutflow", "input[name='financingCapitalOutflow']");
     });
     $("input[name='financingCapitalCashflow']").change(function () {
         //calCashFluxFinalTotal();
@@ -148,8 +170,8 @@ function calNetCashFlow() {
 
     if (saleIncomeCash && taxReturn && earnestMoneyIncome
         && purchaseCost && taxCost && earnestMoneyCost) {
-        netCashFlow.val(f2(parseFloat(saleIncomeCash) + parseFloat(taxReturn) + parseFloat(earnestMoneyIncome)
-            - parseFloat(purchaseCost) - parseFloat(taxCost) - parseFloat(earnestMoneyCost)));
+        netCashFlow.val(f2Fixed(f2(saleIncomeCash) + f2(taxReturn) + f2(earnestMoneyIncome)
+            - f2(purchaseCost) - f2(taxCost) - f2(earnestMoneyCost)));
     } else {
         netCashFlow.val("");
     }
@@ -165,7 +187,7 @@ function calNetCashFromInvestingActivities() {
     var netCashFromInvestingActivities = $("input[name='netCashFromInvestingActivities']");
 
     if (cashInflowFromInvestingActivities && cashOutflowFromInvestingActivities) {
-        netCashFromInvestingActivities.val(f2(parseFloat(cashInflowFromInvestingActivities) - parseFloat(cashOutflowFromInvestingActivities)));
+        netCashFromInvestingActivities.val(f2Fixed(f2(cashInflowFromInvestingActivities) - f2(cashOutflowFromInvestingActivities)));
     } else {
         netCashFromInvestingActivities.val("");
     }
@@ -181,7 +203,7 @@ function calFinancingCapitalCashflow() {
     var financingCapitalCashflow = $("input[name='financingCapitalCashflow']");
 
     if (financingCapitalInflow && financingCapitalOutflow) {
-        financingCapitalCashflow.val(f2(parseFloat(financingCapitalInflow) - parseFloat(financingCapitalOutflow)));
+        financingCapitalCashflow.val(f2Fixed(f2(financingCapitalInflow) - f2(financingCapitalOutflow)));
     } else {
         financingCapitalCashflow.val("");
     }
@@ -195,7 +217,7 @@ function calNetIncreaseMonetaryFunds() {
     var netIncreaseMonetaryFunds = $("input[name='netIncreaseMonetaryFunds']");
 
     if (netCashFlow && netCashFromInvestingActivities && financingCapitalCashflow) {
-        netIncreaseMonetaryFunds.val(f2(parseFloat(netCashFlow) + parseFloat(netCashFromInvestingActivities) + parseFloat(financingCapitalCashflow)));
+        netIncreaseMonetaryFunds.val(f2Fixed(f2(netCashFlow) + f2(netCashFromInvestingActivities) + f2(financingCapitalCashflow)));
     } else {
         netIncreaseMonetaryFunds.val("");
     }
@@ -212,7 +234,7 @@ function calIncomeFinalTotal() {
     var incomeFinalTotal = $("input[name='incomeFinalTotal']");
 
     if (incomeDeviceFinalTotal && incomeEngineerFinalTotal && incomeServiceFinalTotal) {
-        incomeFinalTotal.val(f2(parseFloat(incomeDeviceFinalTotal) + parseFloat(incomeEngineerFinalTotal) + parseFloat(incomeServiceFinalTotal)));
+        incomeFinalTotal.val(f2Fixed(f2(incomeDeviceFinalTotal) + f2(incomeEngineerFinalTotal) + f2(incomeServiceFinalTotal)));
     } else {
         incomeFinalTotal.val("");
     }
@@ -233,8 +255,8 @@ function calCostFinalTotal() {
 
     if (costPurchaseDeviceFinalTotal && costPurchaseBuildFinalTotal && costPurchaseServiceFinalTotal &&
         costPurchaseOtherFinalTotal && costProjectManageFinalTotal && costOtherFinalTotal) {
-        costFinalTotal.val(f2(parseFloat(costPurchaseDeviceFinalTotal) + parseFloat(costPurchaseBuildFinalTotal) + parseFloat(costPurchaseServiceFinalTotal) +
-            parseFloat(costPurchaseOtherFinalTotal) + parseFloat(costProjectManageFinalTotal) + parseFloat(costOtherFinalTotal)));
+        costFinalTotal.val(f2Fixed(f2(costPurchaseDeviceFinalTotal) + f2(costPurchaseBuildFinalTotal) + f2(costPurchaseServiceFinalTotal) +
+            f2(costPurchaseOtherFinalTotal) + f2(costProjectManageFinalTotal) + f2(costOtherFinalTotal)));
     } else {
         costFinalTotal.val("");
     }
@@ -252,7 +274,7 @@ function calManageFinalTotal() {
     var manageFinalTotal = $("input[name='manageFinalTotal']");
 
     if (costExpropriationFinalTotal && costCompanyManageFinalTotal && costIncomeTaxFinalTotal) {
-        manageFinalTotal.val(f2(parseFloat(costExpropriationFinalTotal) + parseFloat(costCompanyManageFinalTotal) + parseFloat(costIncomeTaxFinalTotal)));
+        manageFinalTotal.val(f2Fixed(f2(costExpropriationFinalTotal) + f2(costCompanyManageFinalTotal) + f2(costIncomeTaxFinalTotal)));
     } else {
         manageFinalTotal.val("");
     }
@@ -284,11 +306,11 @@ function calCashFluxFinalTotal() {
         netCashFlow && cashInflowFromInvestingActivities && cashOutflowFromInvestingActivities &&
         netCashFromInvestingActivities && financingCapitalInflow && financingCapitalOutflow
         && financingCapitalCashflow && netIncreaseMonetaryFunds) {
-        cashFluxFinalTotal.val(f2(parseFloat(saleIncomeCash) + parseFloat(taxReturn) + parseFloat(earnestMoneyIncome) +
-            parseFloat(purchaseCost) + parseFloat(taxCost) + parseFloat(earnestMoneyCost) +
-            parseFloat(netCashFlow) + parseFloat(cashInflowFromInvestingActivities) + parseFloat(cashOutflowFromInvestingActivities) +
-            parseFloat(netCashFromInvestingActivities) + parseFloat(financingCapitalInflow) + parseFloat(financingCapitalOutflow) +
-            parseFloat(financingCapitalCashflow) + parseFloat(netIncreaseMonetaryFunds)));
+        cashFluxFinalTotal.val(f2Fixed(f2(saleIncomeCash) + f2(taxReturn) + f2(earnestMoneyIncome) +
+            f2(purchaseCost) + f2(taxCost) + f2(earnestMoneyCost) +
+            f2(netCashFlow) + f2(cashInflowFromInvestingActivities) + f2(cashOutflowFromInvestingActivities) +
+            f2(netCashFromInvestingActivities) + f2(financingCapitalInflow) + f2(financingCapitalOutflow) +
+            f2(financingCapitalCashflow) + f2(netIncreaseMonetaryFunds)));
     } else {
         cashFluxFinalTotal.val("");
     }
@@ -305,7 +327,7 @@ function calGrossProfitFinalTotal() {
     var grossProfitFinalTotal = $("input[name='grossProfitFinalTotal']");
 
     if (incomeFinalTotal && costFinalTotal && costExpropriationFinalTotal) {
-        grossProfitFinalTotal.val(f2(parseFloat(incomeFinalTotal) - parseFloat(costFinalTotal) - parseFloat(costExpropriationFinalTotal)));
+        grossProfitFinalTotal.val(f2Fixed(f2(incomeFinalTotal) - f2(costFinalTotal) - f2(costExpropriationFinalTotal)));
     } else {
         grossProfitFinalTotal.val("");
     }
@@ -320,7 +342,7 @@ function calGrossProfitProfitMargin() {
 
     var grossProfitProfitMargin = $("input[name='grossProfitProfitMargin']");
     if (grossProfitFinalTotal && incomeFinalTotal) {
-        grossProfitProfitMargin.val(f2(100 * parseFloat(grossProfitFinalTotal) / parseFloat(incomeFinalTotal)));
+        grossProfitProfitMargin.val(f2Fixed(100 * f2(grossProfitFinalTotal) / f2(incomeFinalTotal)));
     } else {
         grossProfitProfitMargin.val("");
     }
@@ -337,7 +359,7 @@ function calContributionMarginFinalTotal() {
     var contributionMarginFinalTotal = $("input[name='contributionMarginFinalTotal']");
 
     if (grossProfitFinalTotal && costCompanyManageFinalTotal) {
-        contributionMarginFinalTotal.val(f2(parseFloat(grossProfitFinalTotal) - parseFloat(costCompanyManageFinalTotal)));
+        contributionMarginFinalTotal.val(f2Fixed(f2(grossProfitFinalTotal) - f2(costCompanyManageFinalTotal)));
     } else {
         contributionMarginFinalTotal.val("");
     }
@@ -352,7 +374,7 @@ function calContributionMarginProfitMargin() {
 
     var contributionMarginProfitMargin = $("input[name='contributionMarginProfitMargin']");
     if (contributionMarginFinalTotal && incomeFinalTotal) {
-        contributionMarginProfitMargin.val(f2(100 * parseFloat(contributionMarginFinalTotal) / parseFloat(incomeFinalTotal)));
+        contributionMarginProfitMargin.val(f2Fixed(100 * f2(contributionMarginFinalTotal) / f2(incomeFinalTotal)));
     } else {
         contributionMarginProfitMargin.val("");
     }
@@ -369,7 +391,7 @@ function calNetMarginFinalTotal() {
     var netMarginFinalTotal = $("input[name='netMarginFinalTotal']");
 
     if (contributionMarginFinalTotal && costIncomeTaxFinalTotal) {
-        netMarginFinalTotal.val(f2(parseFloat(contributionMarginFinalTotal) - parseFloat(costIncomeTaxFinalTotal)));
+        netMarginFinalTotal.val(f2Fixed(f2(contributionMarginFinalTotal) - f2(costIncomeTaxFinalTotal)));
     } else {
         netMarginFinalTotal.val("");
     }
@@ -384,23 +406,12 @@ function calNetMarginProfitMargin() {
 
     var netMarginProfitMargin = $("input[name='netMarginProfitMargin']");
     if (netMarginFinalTotal && incomeFinalTotal) {
-        netMarginProfitMargin.val(f2(100 * parseFloat(netMarginFinalTotal) / parseFloat(incomeFinalTotal)));
+        netMarginProfitMargin.val(f2Fixed(100 * f2(netMarginFinalTotal) / f2(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 a3023a5..e568638 100644
--- a/src/main/resources/static/assets/js/project_settle.js
+++ b/src/main/resources/static/assets/js/project_settle.js
@@ -5,18 +5,21 @@ function calculateSettle() {
         calIncomeTotal();
         calIncomeSettleTotal();
         calProfit();
+        digitalSelf("incomeDevice", "input[name='incomeDevice']");
     });
     $("input[name='incomeEngineer']").change(function () {
         calIncomeEngineerSettleTotal();
         calIncomeTotal();
         calIncomeSettleTotal();
         calProfit();
+        digitalSelf("incomeEngineer", "input[name='incomeEngineer']");
     });
     $("input[name='incomeService']").change(function () {
         calIncomeServiceSettleTotal();
         calIncomeTotal();
         calIncomeSettleTotal();
         calProfit();
+        digitalSelf("incomeService", "input[name='incomeService']");
     });
 
 
@@ -25,36 +28,42 @@ function calculateSettle() {
         calCostTotal();
         calCostSettleTotal();
         calProfit();
+        digitalSelf("costPurchaseDevice", "input[name='costPurchaseDevice']");
     });
     $("input[name='costPurchaseBuild']").change(function () {
         calCostPurchaseBuildSettleTotal();
         calCostTotal();
         calCostSettleTotal();
         calProfit();
+        digitalSelf("costPurchaseBuild", "input[name='costPurchaseBuild']");
     });
     $("input[name='costPurchaseService']").change(function () {
         calCostPurchaseServiceSettleTotal();
         calCostTotal();
         calCostSettleTotal();
         calProfit();
+        digitalSelf("costPurchaseService", "input[name='costPurchaseService']");
     });
     $("input[name='costPurchaseOther']").change(function () {
         calCostPurchaseOtherSettleTotal();
         calCostTotal();
         calCostSettleTotal();
         calProfit();
+        digitalSelf("costPurchaseOther", "input[name='costPurchaseOther']");
     });
     $("input[name='costProjectManage']").change(function () {
         calCostProjectManageSettleTotal();
         calCostTotal();
         calCostSettleTotal();
         calProfit();
+        digitalSelf("costProjectManage", "input[name='costProjectManage']");
     });
     $("input[name='costOther']").change(function () {
         calCostOtherSettleTotal();
         calCostTotal();
         calCostSettleTotal();
         calProfit();
+        digitalSelf("costOther", "input[name='costOther']");
     });
 
 
@@ -63,6 +72,7 @@ function calculateSettle() {
         calCostManageTotal();
         calCostManageSettleTotal();
         calProfit();
+        digitalSelf("costExpropriation", "input[name='costExpropriation']");
     });
     $("input[name='costCompanyManage']").change(function () {
         calCostCompanyManageSettleTotal();
@@ -75,6 +85,7 @@ function calculateSettle() {
         calNetProfit();
         calNetProfitSettleTotal();
         calNetProfitProfitMargin();
+        digitalSelf("costCompanyManage", "input[name='costCompanyManage']");
     });
     $("input[name='costIncomeTax']").change(function () {
         calCostIncomeTaxSettleTotal();
@@ -84,6 +95,7 @@ function calculateSettle() {
         calNetProfit();
         calNetProfitSettleTotal();
         calNetProfitProfitMargin();
+        digitalSelf("costIncomeTax", "input[name='costIncomeTax']");
     });
 
 
@@ -107,6 +119,7 @@ function calculateSettle() {
         calNetCashFlowSettle();
         calNetIncreaseMonetaryFunds();
         calNetIncreaseMonetaryFundsSettle();
+        digitalSelf("saleIncomeCash", "input[name='saleIncomeCash']");
     });
     $("input[name='taxReturn']").change(function () {
         calTaxReturnSettle();
@@ -114,6 +127,7 @@ function calculateSettle() {
         calNetCashFlowSettle();
         calNetIncreaseMonetaryFunds();
         calNetIncreaseMonetaryFundsSettle();
+        digitalSelf("taxReturn", "input[name='taxReturn']");
     });
     $("input[name='earnestMoneyIncome']").change(function () {
         calEarnestMoneyIncomeSettle();
@@ -121,6 +135,7 @@ function calculateSettle() {
         calNetCashFlowSettle();
         calNetIncreaseMonetaryFunds();
         calNetIncreaseMonetaryFundsSettle();
+        digitalSelf("earnestMoneyIncome", "input[name='earnestMoneyIncome']");
     });
     $("input[name='purchaseCost']").change(function () {
         calPurchaseCostSettle();
@@ -128,6 +143,7 @@ function calculateSettle() {
         calNetCashFlowSettle();
         calNetIncreaseMonetaryFunds();
         calNetIncreaseMonetaryFundsSettle();
+        digitalSelf("purchaseCost", "input[name='purchaseCost']");
     });
     $("input[name='taxCost']").change(function () {
         calTaxCostSettle();
@@ -135,6 +151,7 @@ function calculateSettle() {
         calNetCashFlowSettle();
         calNetIncreaseMonetaryFunds();
         calNetIncreaseMonetaryFundsSettle();
+        digitalSelf("taxCost", "input[name='taxCost']");
     });
     $("input[name='earnestMoneyCost']").change(function () {
         calEarnestMoneyCostSettle();
@@ -142,6 +159,7 @@ function calculateSettle() {
         calNetCashFlowSettle();
         calNetIncreaseMonetaryFunds();
         calNetIncreaseMonetaryFundsSettle();
+        digitalSelf("earnestMoneyCost", "input[name='earnestMoneyCost']");
     });
     // $("input[name='netCashFlow']").change(function () {
     //     calNetCashFlowSettle();
@@ -155,6 +173,7 @@ function calculateSettle() {
         calNetCashFromInvestingActivitiesSettle();
         calNetIncreaseMonetaryFunds();
         calNetIncreaseMonetaryFundsSettle();
+        digitalSelf("cashInflowFromInvestingActivities", "input[name='cashInflowFromInvestingActivities']");
     });
     $("input[name='cashOutflowFromInvestingActivities']").change(function () {
         calCashOutflowFromInvestingActivitiesSettle();
@@ -162,6 +181,7 @@ function calculateSettle() {
         calNetCashFromInvestingActivitiesSettle();
         calNetIncreaseMonetaryFunds();
         calNetIncreaseMonetaryFundsSettle();
+        digitalSelf("cashOutflowFromInvestingActivities", "input[name='cashOutflowFromInvestingActivities']");
     });
     // $("input[name='netCashFromInvestingActivities']").change(function () {
     //     calNetCashFromInvestingActivitiesSettle();
@@ -175,6 +195,7 @@ function calculateSettle() {
         calFinancingCapitalCashflowSettle();
         calNetIncreaseMonetaryFunds();
         calNetIncreaseMonetaryFundsSettle();
+        digitalSelf("financingCapitalInflow", "input[name='financingCapitalInflow']");
     });
     $("input[name='financingCapitalOutflow']").change(function () {
         calFinancingCapitalOutflowSettle();
@@ -182,6 +203,7 @@ function calculateSettle() {
         calFinancingCapitalCashflowSettle();
         calNetIncreaseMonetaryFunds();
         calNetIncreaseMonetaryFundsSettle();
+        digitalSelf("financingCapitalOutflow", "input[name='financingCapitalOutflow']");
     });
     // $("input[name='financingCapitalCashflow']").change(function () {
     //     calFinancingCapitalCashflowSettle();
@@ -222,7 +244,7 @@ function calIncomeDeviceSettleTotal() {
     var incomeDeviceSettleTotal = $("input[name='incomeDeviceSettleTotal']");
 
     if(incomeDeviceFormerSettleTotal && incomeDevice){
-        incomeDeviceSettleTotal.val(f2(parseFloat(incomeDeviceFormerSettleTotal)+parseFloat(incomeDevice)));
+        incomeDeviceSettleTotal.val(f2Fixed(f2(incomeDeviceFormerSettleTotal)+f2(incomeDevice)));
     }else {
         incomeDeviceSettleTotal.val("");
     }
@@ -238,7 +260,7 @@ function calIncomeEngineerSettleTotal() {
     var incomeEngineerSettleTotal = $("input[name='incomeEngineerSettleTotal']");
 
     if(incomeEngineerFormerSettleTotal && incomeEngineer){
-        incomeEngineerSettleTotal.val(f2(parseFloat(incomeEngineerFormerSettleTotal)+parseFloat(incomeEngineer)));
+        incomeEngineerSettleTotal.val(f2Fixed(f2(incomeEngineerFormerSettleTotal)+f2(incomeEngineer)));
     }else {
         incomeEngineerSettleTotal.val("");
     }
@@ -254,7 +276,7 @@ function calIncomeServiceSettleTotal() {
     var incomeServiceSettleTotal = $("input[name='incomeServiceSettleTotal']");
 
     if(incomeServiceFormerSettleTotal && incomeService){
-        incomeServiceSettleTotal.val(f2(parseFloat(incomeServiceFormerSettleTotal)+parseFloat(incomeService)));
+        incomeServiceSettleTotal.val(f2Fixed(f2(incomeServiceFormerSettleTotal)+f2(incomeService)));
     }else {
         incomeServiceSettleTotal.val("");
     }
@@ -271,7 +293,7 @@ function calIncomeTotal() {
     var incomeTotal = $("input[name='incomeTotal']");
 
     if(incomeDevice && incomeEngineer && incomeService){
-        incomeTotal.val(f2(parseFloat(incomeDevice)+parseFloat(incomeEngineer)+parseFloat(incomeService)));
+        incomeTotal.val(f2Fixed(f2(incomeDevice)+f2(incomeEngineer)+f2(incomeService)));
     }else {
         incomeTotal.val("");
     }
@@ -288,7 +310,7 @@ function calIncomeSettleTotal() {
     var incomeSettleTotal = $("input[name='incomeSettleTotal']");
 
     if(incomeDeviceSettleTotal && incomeEngineerSettleTotal && incomeServiceSettleTotal){
-        incomeSettleTotal.val(f2(parseFloat(incomeDeviceSettleTotal)+parseFloat(incomeEngineerSettleTotal)+parseFloat(incomeServiceSettleTotal)));
+        incomeSettleTotal.val(f2Fixed(f2(incomeDeviceSettleTotal)+f2(incomeEngineerSettleTotal)+f2(incomeServiceSettleTotal)));
     }else {
         incomeSettleTotal.val("");
     }
@@ -304,7 +326,7 @@ function calCostPurchaseDeviceSettleTotal() {
     var costPurchaseDeviceSettleTotal = $("input[name='costPurchaseDeviceSettleTotal']");
 
     if(costPurchaseDeviceFormerSettleTotal && costPurchaseDevice){
-        costPurchaseDeviceSettleTotal.val(f2(parseFloat(costPurchaseDeviceFormerSettleTotal)+parseFloat(costPurchaseDevice)));
+        costPurchaseDeviceSettleTotal.val(f2Fixed(f2(costPurchaseDeviceFormerSettleTotal)+f2(costPurchaseDevice)));
     }else {
         costPurchaseDeviceSettleTotal.val("");
     }
@@ -320,7 +342,7 @@ function calCostPurchaseBuildSettleTotal() {
     var costPurchaseBuildSettleTotal = $("input[name='costPurchaseBuildSettleTotal']");
 
     if(costPurchaseBuildFormerSettleTotal && costPurchaseBuild){
-        costPurchaseBuildSettleTotal.val(f2(parseFloat(costPurchaseBuildFormerSettleTotal)+parseFloat(costPurchaseBuild)));
+        costPurchaseBuildSettleTotal.val(f2Fixed(f2(costPurchaseBuildFormerSettleTotal)+f2(costPurchaseBuild)));
     }else {
         costPurchaseBuildSettleTotal.val("");
     }
@@ -336,7 +358,7 @@ function calCostPurchaseServiceSettleTotal() {
     var costPurchaseServiceSettleTotal = $("input[name='costPurchaseServiceSettleTotal']");
 
     if(costPurchaseServiceFormerSettleTotal && costPurchaseService){
-        costPurchaseServiceSettleTotal.val(f2(parseFloat(costPurchaseServiceFormerSettleTotal)+parseFloat(costPurchaseService)));
+        costPurchaseServiceSettleTotal.val(f2Fixed(f2(costPurchaseServiceFormerSettleTotal)+f2(costPurchaseService)));
     }else {
         costPurchaseServiceSettleTotal.val("");
     }
@@ -352,7 +374,7 @@ function calCostPurchaseOtherSettleTotal() {
     var costPurchaseOtherSettleTotal = $("input[name='costPurchaseOtherSettleTotal']");
 
     if(costPurchaseOtherFormerSettleTotal && costPurchaseOther){
-        costPurchaseOtherSettleTotal.val(f2(parseFloat(costPurchaseOtherFormerSettleTotal)+parseFloat(costPurchaseOther)));
+        costPurchaseOtherSettleTotal.val(f2Fixed(f2(costPurchaseOtherFormerSettleTotal)+f2(costPurchaseOther)));
     }else {
         costPurchaseOtherSettleTotal.val("");
     }
@@ -368,7 +390,7 @@ function calCostProjectManageSettleTotal() {
     var costProjectManageSettleTotal = $("input[name='costProjectManageSettleTotal']");
 
     if(costProjectManageFormerSettleTotal && costProjectManage){
-        costProjectManageSettleTotal.val(f2(parseFloat(costProjectManageFormerSettleTotal)+parseFloat(costProjectManage)));
+        costProjectManageSettleTotal.val(f2Fixed(f2(costProjectManageFormerSettleTotal)+f2(costProjectManage)));
     }else {
         costProjectManageSettleTotal.val("");
     }
@@ -384,7 +406,7 @@ function calCostOtherSettleTotal() {
     var costOtherSettleTotal = $("input[name='costOtherSettleTotal']");
 
     if(costOtherFormerSettleTotal && costOther){
-        costOtherSettleTotal.val(f2(parseFloat(costOtherFormerSettleTotal)+parseFloat(costOther)));
+        costOtherSettleTotal.val(f2Fixed(f2(costOtherFormerSettleTotal)+f2(costOther)));
     }else {
         costOtherSettleTotal.val("");
     }
@@ -404,7 +426,7 @@ function calCostTotal() {
     var costTotal = $("input[name='costTotal']");
 
     if(costPurchaseDevice && costPurchaseBuild && costPurchaseService && costPurchaseOther && costProjectManage && costOther){
-        costTotal.val(f2(parseFloat(costPurchaseDevice)+parseFloat(costPurchaseBuild)+parseFloat(costPurchaseService)+parseFloat(costPurchaseOther)+parseFloat(costProjectManage)+parseFloat(costOther)));
+        costTotal.val(f2Fixed(f2(costPurchaseDevice)+f2(costPurchaseBuild)+f2(costPurchaseService)+f2(costPurchaseOther)+f2(costProjectManage)+f2(costOther)));
     }else {
         costTotal.val("");
     }
@@ -425,8 +447,8 @@ function calCostSettleTotal() {
 
     if(costPurchaseDeviceSettleTotal && costPurchaseBuildSettleTotal && costPurchaseServiceSettleTotal &&
         costPurchaseOtherSettleTotal && costProjectManageSettleTotal && costOtherSettleTotal){
-        costSettleTotal.val(f2(parseFloat(costPurchaseDeviceSettleTotal)+parseFloat(costPurchaseBuildSettleTotal)+parseFloat(costPurchaseServiceSettleTotal)+
-            parseFloat(costPurchaseOtherSettleTotal)+parseFloat(costProjectManageSettleTotal)+parseFloat(costOtherSettleTotal)));
+        costSettleTotal.val(f2Fixed(f2(costPurchaseDeviceSettleTotal)+f2(costPurchaseBuildSettleTotal)+f2(costPurchaseServiceSettleTotal)+
+            f2(costPurchaseOtherSettleTotal)+f2(costProjectManageSettleTotal)+f2(costOtherSettleTotal)));
     }else {
         costSettleTotal.val("");
     }
@@ -442,7 +464,7 @@ function calCostExpropriationSettleTotal() {
     var costExpropriationSettleTotal = $("input[name='costExpropriationSettleTotal']");
 
     if(costExpropriationFormerSettleTotal && costExpropriation){
-        costExpropriationSettleTotal.val(f2(parseFloat(costExpropriationFormerSettleTotal)+parseFloat(costExpropriation)));
+        costExpropriationSettleTotal.val(f2Fixed(f2(costExpropriationFormerSettleTotal)+f2(costExpropriation)));
     }else {
         costExpropriationSettleTotal.val("");
     }
@@ -458,7 +480,7 @@ function calCostCompanyManageSettleTotal() {
     var costCompanyManageSettleTotal = $("input[name='costCompanyManageSettleTotal']");
 
     if(costCompanyManageFormerSettleTotal && costCompanyManage){
-        costCompanyManageSettleTotal.val(f2(parseFloat(costCompanyManageFormerSettleTotal)+parseFloat(costCompanyManage)));
+        costCompanyManageSettleTotal.val(f2Fixed(f2(costCompanyManageFormerSettleTotal)+f2(costCompanyManage)));
     }else {
         costCompanyManageSettleTotal.val("");
     }
@@ -474,7 +496,7 @@ function calCostIncomeTaxSettleTotal() {
     var costIncomeTaxSettleTotal = $("input[name='costIncomeTaxSettleTotal']");
 
     if(costIncomeTaxFormerSettleTotal && costIncomeTax){
-        costIncomeTaxSettleTotal.val(f2(parseFloat(costIncomeTaxFormerSettleTotal)+parseFloat(costIncomeTax)));
+        costIncomeTaxSettleTotal.val(f2Fixed(f2(costIncomeTaxFormerSettleTotal)+f2(costIncomeTax)));
     }else {
         costIncomeTaxSettleTotal.val("");
     }
@@ -491,7 +513,7 @@ function calCostManageTotal() {
     var costManageTotal = $("input[name='costManageTotal']");
 
     if(costExpropriation && costCompanyManage && costIncomeTax){
-        costManageTotal.val(f2(parseFloat(costExpropriation)+parseFloat(costCompanyManage)+parseFloat(costIncomeTax)));
+        costManageTotal.val(f2Fixed(f2(costExpropriation)+f2(costCompanyManage)+f2(costIncomeTax)));
     }else {
         costManageTotal.val("");
     }
@@ -508,7 +530,7 @@ function calCostManageSettleTotal() {
     var costManageSettleTotal = $("input[name='costManageSettleTotal']");
 
     if(costExpropriationSettleTotal && costCompanyManageSettleTotal && costIncomeTaxSettleTotal){
-        costManageSettleTotal.val(f2(parseFloat(costExpropriationSettleTotal)+parseFloat(costCompanyManageSettleTotal)+parseFloat(costIncomeTaxSettleTotal)));
+        costManageSettleTotal.val(f2Fixed(f2(costExpropriationSettleTotal)+f2(costCompanyManageSettleTotal)+f2(costIncomeTaxSettleTotal)));
     }else {
         costManageSettleTotal.val("");
     }
@@ -525,7 +547,7 @@ function calGrossProfit() {
     var grossProfit = $("input[name='grossProfit']");
 
     if(incomeTotal && costTotal && costExpropriation){
-        grossProfit.val(f2(parseFloat(incomeTotal)-parseFloat(costTotal)-parseFloat(costExpropriation)));
+        grossProfit.val(f2Fixed(f2(incomeTotal)-f2(costTotal)-f2(costExpropriation)));
     }else {
         grossProfit.val("");
     }
@@ -541,7 +563,7 @@ function calGrossProfitSettleTotal() {
     var grossProfitSettleTotal = $("input[name='grossProfitSettleTotal']");
 
     if(grossProfitFormerSettleTotal && grossProfit){
-        grossProfitSettleTotal.val(f2(parseFloat(grossProfitFormerSettleTotal)+parseFloat(grossProfit)));
+        grossProfitSettleTotal.val(f2Fixed(f2(grossProfitFormerSettleTotal)+f2(grossProfit)));
     }else {
         grossProfitSettleTotal.val("");
     }
@@ -557,7 +579,7 @@ function calGrossProfitProfitMargin() {
     var grossProfitProfitMargin = $("input[name='grossProfitProfitMargin']");
 
     if(grossProfitSettleTotal && incomeSettleTotal){
-        grossProfitProfitMargin.val(f2(100*(parseFloat(grossProfitSettleTotal)/parseFloat(incomeSettleTotal))));
+        grossProfitProfitMargin.val(f2Fixed(100*(f2(grossProfitSettleTotal)/f2(incomeSettleTotal))));
     }else {
         grossProfitProfitMargin.val("");
     }
@@ -573,7 +595,7 @@ function calContributionProfit() {
     var contributionProfit = $("input[name='contributionProfit']");
 
     if(grossProfit && costCompanyManage){
-        contributionProfit.val(f2(parseFloat(grossProfit)-parseFloat(costCompanyManage)));
+        contributionProfit.val(f2Fixed(f2(grossProfit)-f2(costCompanyManage)));
     }else {
         contributionProfit.val("");
     }
@@ -589,7 +611,7 @@ function calContributionProfitSettleTotal() {
     var contributionProfitSettleTotal = $("input[name='contributionProfitSettleTotal']");
 
     if(contributionProfitFormerSettleTotal && contributionProfit){
-        contributionProfitSettleTotal.val(f2(parseFloat(contributionProfitFormerSettleTotal)+parseFloat(contributionProfit)));
+        contributionProfitSettleTotal.val(f2Fixed(f2(contributionProfitFormerSettleTotal)+f2(contributionProfit)));
     }else {
         contributionProfitSettleTotal.val("");
     }
@@ -605,7 +627,7 @@ function calContributionProfitProfitMargin() {
     var contributionProfitProfitMargin = $("input[name='contributionProfitProfitMargin']");
 
     if(contributionProfitSettleTotal && incomeSettleTotal){
-        contributionProfitProfitMargin.val(f2(100*(parseFloat(contributionProfitSettleTotal)/parseFloat(incomeSettleTotal))));
+        contributionProfitProfitMargin.val(f2Fixed(100*(f2(contributionProfitSettleTotal)/f2(incomeSettleTotal))));
     }else {
         contributionProfitProfitMargin.val("");
     }
@@ -621,7 +643,7 @@ function calNetProfit() {
     var netProfit = $("input[name='netProfit']");
 
     if(contributionProfit && costIncomeTax){
-        netProfit.val(f2(parseFloat(contributionProfit)-parseFloat(costIncomeTax)));
+        netProfit.val(f2Fixed(f2(contributionProfit)-f2(costIncomeTax)));
     }else {
         netProfit.val("");
     }
@@ -637,7 +659,7 @@ function calNetProfitSettleTotal() {
     var netProfitSettleTotal = $("input[name='netProfitSettleTotal']");
 
     if(netProfitFormerSettleTotal && netProfit){
-        netProfitSettleTotal.val(f2(parseFloat(netProfitFormerSettleTotal)+parseFloat(netProfit)));
+        netProfitSettleTotal.val(f2Fixed(f2(netProfitFormerSettleTotal)+f2(netProfit)));
     }else {
         netProfitSettleTotal.val("");
     }
@@ -653,7 +675,7 @@ function calNetProfitProfitMargin() {
     var netProfitProfitMargin = $("input[name='netProfitProfitMargin']");
 
     if(netProfitSettleTotal && incomeSettleTotal){
-        netProfitProfitMargin.val(f2(100*(parseFloat(netProfitSettleTotal)/parseFloat(incomeSettleTotal))));
+        netProfitProfitMargin.val(f2Fixed(100*(f2(netProfitSettleTotal)/f2(incomeSettleTotal))));
     }else {
         netProfitProfitMargin.val("");
     }
@@ -669,7 +691,7 @@ function calSaleIncomeCashSettle() {
     var saleIncomeCashSettle = $("input[name='saleIncomeCashSettle']");
 
     if(saleIncomeCashFormerSettle && saleIncomeCash){
-        saleIncomeCashSettle.val(f2(parseFloat(saleIncomeCashFormerSettle)+parseFloat(saleIncomeCash)));
+        saleIncomeCashSettle.val(f2Fixed(f2(saleIncomeCashFormerSettle)+f2(saleIncomeCash)));
     }else {
         saleIncomeCashSettle.val("");
     }
@@ -685,7 +707,7 @@ function calTaxReturnSettle() {
     var taxReturnSettle = $("input[name='taxReturnSettle']");
 
     if(taxReturnFormerSettle && taxReturn){
-        taxReturnSettle.val(f2(parseFloat(taxReturnFormerSettle)+parseFloat(taxReturn)));
+        taxReturnSettle.val(f2Fixed(f2(taxReturnFormerSettle)+f2(taxReturn)));
     }else {
         taxReturnSettle.val("");
     }
@@ -701,7 +723,7 @@ function calEarnestMoneyIncomeSettle() {
     var earnestMoneyIncomeSettle = $("input[name='earnestMoneyIncomeSettle']");
 
     if(earnestMoneyIncomeFormerSettle && earnestMoneyIncome){
-        earnestMoneyIncomeSettle.val(f2(parseFloat(earnestMoneyIncomeFormerSettle)+parseFloat(earnestMoneyIncome)));
+        earnestMoneyIncomeSettle.val(f2Fixed(f2(earnestMoneyIncomeFormerSettle)+f2(earnestMoneyIncome)));
     }else {
         earnestMoneyIncomeSettle.val("");
     }
@@ -717,7 +739,7 @@ function calPurchaseCostSettle() {
     var purchaseCostSettle = $("input[name='purchaseCostSettle']");
 
     if(purchaseCostFormerSettle && purchaseCost){
-        purchaseCostSettle.val(f2(parseFloat(purchaseCostFormerSettle)+parseFloat(purchaseCost)));
+        purchaseCostSettle.val(f2Fixed(f2(purchaseCostFormerSettle)+f2(purchaseCost)));
     }else {
         purchaseCostSettle.val("");
     }
@@ -733,7 +755,7 @@ function calTaxCostSettle() {
     var taxCostSettle = $("input[name='taxCostSettle']");
 
     if(taxCostFormerSettle && taxCost){
-        taxCostSettle.val(f2(parseFloat(taxCostFormerSettle)+parseFloat(taxCost)));
+        taxCostSettle.val(f2Fixed(f2(taxCostFormerSettle)+f2(taxCost)));
     }else {
         taxCostSettle.val("");
     }
@@ -750,7 +772,7 @@ function calEarnestMoneyCostSettle() {
     var earnestMoneyCostSettle = $("input[name='earnestMoneyCostSettle']");
 
     if(earnestMoneyCostFormerSettle && earnestMoneyCost){
-        earnestMoneyCostSettle.val(f2(parseFloat(earnestMoneyCostFormerSettle)+parseFloat(earnestMoneyCost)));
+        earnestMoneyCostSettle.val(f2Fixed(f2(earnestMoneyCostFormerSettle)+f2(earnestMoneyCost)));
     }else {
         earnestMoneyCostSettle.val("");
     }
@@ -766,7 +788,7 @@ function calNetCashFlowSettle() {
     var netCashFlowSettle = $("input[name='netCashFlowSettle']");
 
     if(netCashFlowFormerSettle && netCashFlow){
-        netCashFlowSettle.val(f2(parseFloat(netCashFlowFormerSettle)+parseFloat(netCashFlow)));
+        netCashFlowSettle.val(f2Fixed(f2(netCashFlowFormerSettle)+f2(netCashFlow)));
     }else {
         netCashFlowSettle.val("");
     }
@@ -782,7 +804,7 @@ function calCashInflowFromInvestingActivitiesSettle() {
     var cashInflowFromInvestingActivitiesSettle = $("input[name='cashInflowFromInvestingActivitiesSettle']");
 
     if(cashInflowFromInvestingActivitiesFormerSettle && cashInflowFromInvestingActivities){
-        cashInflowFromInvestingActivitiesSettle.val(f2(parseFloat(cashInflowFromInvestingActivitiesFormerSettle)+parseFloat(cashInflowFromInvestingActivities)));
+        cashInflowFromInvestingActivitiesSettle.val(f2Fixed(f2(cashInflowFromInvestingActivitiesFormerSettle)+f2(cashInflowFromInvestingActivities)));
     }else {
         cashInflowFromInvestingActivitiesSettle.val("");
     }
@@ -798,7 +820,7 @@ function calCashOutflowFromInvestingActivitiesSettle() {
     var cashOutflowFromInvestingActivitiesSettle = $("input[name='cashOutflowFromInvestingActivitiesSettle']");
 
     if(cashOutflowFromInvestingActivitiesFormerSettle && cashOutflowFromInvestingActivities){
-        cashOutflowFromInvestingActivitiesSettle.val(f2(parseFloat(cashOutflowFromInvestingActivitiesFormerSettle)+parseFloat(cashOutflowFromInvestingActivities)));
+        cashOutflowFromInvestingActivitiesSettle.val(f2Fixed(f2(cashOutflowFromInvestingActivitiesFormerSettle)+f2(cashOutflowFromInvestingActivities)));
     }else {
         cashOutflowFromInvestingActivitiesSettle.val("");
     }
@@ -814,7 +836,7 @@ function calNetCashFromInvestingActivitiesSettle() {
     var netCashFromInvestingActivitiesSettle = $("input[name='netCashFromInvestingActivitiesSettle']");
 
     if(netCashFromInvestingActivitiesFormerSettle && netCashFromInvestingActivities){
-        netCashFromInvestingActivitiesSettle.val(f2(parseFloat(netCashFromInvestingActivitiesFormerSettle)+parseFloat(netCashFromInvestingActivities)));
+        netCashFromInvestingActivitiesSettle.val(f2Fixed(f2(netCashFromInvestingActivitiesFormerSettle)+f2(netCashFromInvestingActivities)));
     }else {
         netCashFromInvestingActivitiesSettle.val("");
     }
@@ -830,7 +852,7 @@ function calFinancingCapitalInflowSettle() {
     var financingCapitalInflowSettle = $("input[name='financingCapitalInflowSettle']");
 
     if(financingCapitalInflowFormerSettle && financingCapitalInflow){
-        financingCapitalInflowSettle.val(f2(parseFloat(financingCapitalInflowFormerSettle)+parseFloat(financingCapitalInflow)));
+        financingCapitalInflowSettle.val(f2Fixed(f2(financingCapitalInflowFormerSettle)+f2(financingCapitalInflow)));
     }else {
         financingCapitalInflowSettle.val("");
     }
@@ -846,7 +868,7 @@ function calFinancingCapitalOutflowSettle() {
     var financingCapitalOutflowSettle = $("input[name='financingCapitalOutflowSettle']");
 
     if(financingCapitalOutflowFormerSettle && financingCapitalOutflow){
-        financingCapitalOutflowSettle.val(f2(parseFloat(financingCapitalOutflowFormerSettle)+parseFloat(financingCapitalOutflow)));
+        financingCapitalOutflowSettle.val(f2Fixed(f2(financingCapitalOutflowFormerSettle)+f2(financingCapitalOutflow)));
     }else {
         financingCapitalOutflowSettle.val("");
     }
@@ -862,7 +884,7 @@ function calFinancingCapitalCashflowSettle() {
     var financingCapitalCashflowSettle = $("input[name='financingCapitalCashflowSettle']");
 
     if(financingCapitalCashflowFormerSettle && financingCapitalCashflow){
-        financingCapitalCashflowSettle.val(f2(parseFloat(financingCapitalCashflowFormerSettle)+parseFloat(financingCapitalCashflow)));
+        financingCapitalCashflowSettle.val(f2Fixed(f2(financingCapitalCashflowFormerSettle)+f2(financingCapitalCashflow)));
     }else {
         financingCapitalCashflowSettle.val("");
     }
@@ -878,7 +900,7 @@ function calNetIncreaseMonetaryFundsSettle() {
     var netIncreaseMonetaryFundsSettle = $("input[name='netIncreaseMonetaryFundsSettle']");
 
     if(netIncreaseMonetaryFundsFormerSettle && netIncreaseMonetaryFunds){
-        netIncreaseMonetaryFundsSettle.val(f2(parseFloat(netIncreaseMonetaryFundsFormerSettle)+parseFloat(netIncreaseMonetaryFunds)));
+        netIncreaseMonetaryFundsSettle.val(f2Fixed(f2(netIncreaseMonetaryFundsFormerSettle)+f2(netIncreaseMonetaryFunds)));
     }else {
         netIncreaseMonetaryFundsSettle.val("");
     }
@@ -899,8 +921,8 @@ function calNetCashFlow() {
 
     if(saleIncomeCash && taxReturn && earnestMoneyIncome &&
         purchaseCost && taxCost && earnestMoneyCost) {
-        netCashFlow.val(f2(parseFloat(saleIncomeCash)+parseFloat(taxReturn)+parseFloat(earnestMoneyIncome)-
-            parseFloat(purchaseCost)-parseFloat(taxCost)-parseFloat(earnestMoneyCost)));
+        netCashFlow.val(f2Fixed(f2(saleIncomeCash)+f2(taxReturn)+f2(earnestMoneyIncome)-
+            f2(purchaseCost)-f2(taxCost)-f2(earnestMoneyCost)));
     }else {
         netCashFlow.val("");
     }
@@ -916,7 +938,7 @@ function calNetCashFromInvestingActivities() {
     var netCashFromInvestingActivities = $("input[name='netCashFromInvestingActivities']");
 
     if(cashInflowFromInvestingActivities && cashOutflowFromInvestingActivities){
-        netCashFromInvestingActivities.val(f2(parseFloat(cashInflowFromInvestingActivities)-parseFloat(cashOutflowFromInvestingActivities)));
+        netCashFromInvestingActivities.val(f2Fixed(f2(cashInflowFromInvestingActivities)-f2(cashOutflowFromInvestingActivities)));
     }else {
         netCashFromInvestingActivities.val("");
     }
@@ -932,7 +954,7 @@ function calFinancingCapitalCashflow() {
     var financingCapitalCashflow = $("input[name='financingCapitalCashflow']");
 
     if(financingCapitalInflow && financingCapitalOutflow){
-        financingCapitalCashflow.val(f2(parseFloat(financingCapitalInflow)-parseFloat(financingCapitalOutflow)));
+        financingCapitalCashflow.val(f2Fixed(f2(financingCapitalInflow)-f2(financingCapitalOutflow)));
     }else {
         financingCapitalCashflow.val("");
     }
@@ -949,23 +971,12 @@ function calNetIncreaseMonetaryFunds() {
     var netIncreaseMonetaryFunds = $("input[name='netIncreaseMonetaryFunds']");
 
     if(netCashFlow && netCashFromInvestingActivities && financingCapitalCashflow){
-        netIncreaseMonetaryFunds.val(f2(parseFloat(netCashFlow)+parseFloat(netCashFromInvestingActivities)+parseFloat(financingCapitalCashflow)));
+        netIncreaseMonetaryFunds.val(f2Fixed(f2(netCashFlow)+f2(netCashFromInvestingActivities)+f2(financingCapitalCashflow)));
     }else {
         netIncreaseMonetaryFunds.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/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index e82c6b6..56c91e9 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -283,26 +283,26 @@
                                 <tr>
                                     <td>收入</td>
                                     <td>设备类</td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeDeviceTaxInclude" value="${Utils.format(estimateBean.incomeDeviceTaxInclude)}" required readonly></td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeDeviceTaxExclude" value="${Utils.format(estimateBean.incomeDeviceTaxExclude)}" required readonly></td>
+                                    <td><input type="text" class="number" name="incomeDeviceTaxInclude" value="${Utils.format(estimateBean.incomeDeviceTaxInclude)}" required readonly></td>
+                                    <td><input type="text" class="number" name="incomeDeviceTaxExclude" value="${Utils.format(estimateBean.incomeDeviceTaxExclude)}" required readonly></td>
                                 </tr>
                                 <tr>
                                     <td>收入</td>
                                     <td>工程类</td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeEngineerTaxInclude" value="${Utils.format(estimateBean.incomeEngineerTaxInclude)}" required readonly></td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeEngineerTaxExclude" value="${Utils.format(estimateBean.incomeEngineerTaxExclude)}" required readonly></td>
+                                    <td><input type="text" class="number" name="incomeEngineerTaxInclude" value="${Utils.format(estimateBean.incomeEngineerTaxInclude)}" required readonly></td>
+                                    <td><input type="text" class="number" name="incomeEngineerTaxExclude" value="${Utils.format(estimateBean.incomeEngineerTaxExclude)}" required readonly></td>
                                 </tr>
                                 <tr>
                                     <td>收入</td>
                                     <td>服务类</td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeServiceTaxInclude" value="${Utils.format(estimateBean.incomeServiceTaxInclude)}" required readonly></td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeServiceTaxExclude" value="${Utils.format(estimateBean.incomeServiceTaxExclude)}" required readonly></td>
+                                    <td><input type="text" class="number" name="incomeServiceTaxInclude" value="${Utils.format(estimateBean.incomeServiceTaxInclude)}" required readonly></td>
+                                    <td><input type="text" class="number" name="incomeServiceTaxExclude" value="${Utils.format(estimateBean.incomeServiceTaxExclude)}" required readonly></td>
                                 </tr>
                                 <tr>
                                     <td>合计</td>
                                     <td></td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeTotalTaxInclude" value="${Utils.format(estimateBean.incomeTotalTaxInclude)}" readonly readonly title="此列累计"></td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeTotalTaxExclude" value="${Utils.format(estimateBean.incomeTotalTaxExclude)}" readonly readonly title="此列累计"></td>
+                                    <td><input type="text" class="number" name="incomeTotalTaxInclude" value="${Utils.format(estimateBean.incomeTotalTaxInclude)}" readonly readonly title="此列累计"></td>
+                                    <td><input type="text" class="number" name="incomeTotalTaxExclude" value="${Utils.format(estimateBean.incomeTotalTaxExclude)}" readonly readonly title="此列累计"></td>
                                 </tr>
                                 </tbody>
                             </table>
@@ -320,50 +320,50 @@
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>设备</td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseDeviceTaxInclude" value="${Utils.format(estimateBean.costPurchaseDeviceTaxInclude)}" required readonly></td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseDeviceTaxExclude" value="${Utils.format(estimateBean.costPurchaseDeviceTaxExclude)}" required readonly></td>
+                                    <td><input type="text" class="number" name="costPurchaseDeviceTaxInclude" value="${Utils.format(estimateBean.costPurchaseDeviceTaxInclude)}" required readonly></td>
+                                    <td><input type="text" class="number" name="costPurchaseDeviceTaxExclude" value="${Utils.format(estimateBean.costPurchaseDeviceTaxExclude)}" required readonly></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>施工</td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseBuildTaxInclude" value="${Utils.format(estimateBean.costPurchaseBuildTaxInclude)}" required readonly></td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseBuildTaxExclude" value="${Utils.format(estimateBean.costPurchaseBuildTaxExclude)}" required readonly></td>
+                                    <td><input type="text" class="number" name="costPurchaseBuildTaxInclude" value="${Utils.format(estimateBean.costPurchaseBuildTaxInclude)}" required readonly></td>
+                                    <td><input type="text" class="number" name="costPurchaseBuildTaxExclude" value="${Utils.format(estimateBean.costPurchaseBuildTaxExclude)}" required readonly></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>服务</td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseServiceTaxInclude" value="${Utils.format(estimateBean.costPurchaseServiceTaxInclude)}" required readonly></td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseServiceTaxExclude" value="${Utils.format(estimateBean.costPurchaseServiceTaxExclude)}" required readonly></td>
+                                    <td><input type="text" class="number" name="costPurchaseServiceTaxInclude" value="${Utils.format(estimateBean.costPurchaseServiceTaxInclude)}" required readonly></td>
+                                    <td><input type="text" class="number" name="costPurchaseServiceTaxExclude" value="${Utils.format(estimateBean.costPurchaseServiceTaxExclude)}" required readonly></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>其他</td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseOtherTaxInclude" value="${Utils.format(estimateBean.costPurchaseOtherTaxInclude)}" required readonly></td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseOtherTaxExclude" value="${Utils.format(estimateBean.costPurchaseOtherTaxExclude)}" required readonly></td>
+                                    <td><input type="text" class="number" name="costPurchaseOtherTaxInclude" value="${Utils.format(estimateBean.costPurchaseOtherTaxInclude)}" required readonly></td>
+                                    <td><input type="text" class="number" name="costPurchaseOtherTaxExclude" value="${Utils.format(estimateBean.costPurchaseOtherTaxExclude)}" required readonly></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
                                     <td>项目管理成本</td>
                                     <td>项目管理成本</td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costProjectManageTaxInclude" value="${Utils.format(estimateBean.costProjectManageTaxExclude)}" required readonly></td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costProjectManageTaxExclude" value="${Utils.format(estimateBean.costProjectManageTaxExclude)}" required readonly></td>
+                                    <td><input type="text" class="number" name="costProjectManageTaxInclude" value="${Utils.format(estimateBean.costProjectManageTaxExclude)}" required readonly></td>
+                                    <td><input type="text" class="number" name="costProjectManageTaxExclude" value="${Utils.format(estimateBean.costProjectManageTaxExclude)}" required readonly></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
                                     <td>其他</td>
                                     <td>${project.otherName!}</td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costOtherOtherTaxInclude" value="${Utils.format(estimateBean.costOtherOtherTaxInclude)}" required readonly></td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costOtherOtherTaxExclude" value="${Utils.format(estimateBean.costOtherOtherTaxExclude)}" required readonly></td>
+                                    <td><input type="text" class="number" name="costOtherOtherTaxInclude" value="${Utils.format(estimateBean.costOtherOtherTaxInclude)}" required readonly></td>
+                                    <td><input type="text" class="number" name="costOtherOtherTaxExclude" value="${Utils.format(estimateBean.costOtherOtherTaxExclude)}" required readonly></td>
                                 </tr>
                                 <tr>
                                     <td>合计</td>
                                     <td></td>
                                     <td></td>
-                                    <td><input type="number" name="costTotalTaxInclude" value="${Utils.format(estimateBean.costTotalTaxInclude)}" readonly readonly title="此列累计"></td>
-                                    <td><input type="number" name="costTotalTaxExclude" value="${Utils.format(estimateBean.costTotalTaxExclude)}" readonly readonly title="此列累计"></td>
+                                    <td><input type="text" class="number" name="costTotalTaxInclude" value="${Utils.format(estimateBean.costTotalTaxInclude)}" readonly readonly title="此列累计"></td>
+                                    <td><input type="text" class="number" name="costTotalTaxExclude" value="${Utils.format(estimateBean.costTotalTaxExclude)}" readonly readonly title="此列累计"></td>
                                 </tr>
                                 </tbody>
                             </table>
@@ -378,12 +378,12 @@
                                 <tr>
                                     <td>财务费用</td>
                                     <td>资金占用成本</td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costExpropriationTaxExclude" value="${Utils.format(estimateBean.costExpropriationTaxExclude)}" required readonly></td>
+                                    <td><input type="text" class="number" name="costExpropriationTaxExclude" value="${Utils.format(estimateBean.costExpropriationTaxExclude)}" required readonly></td>
                                 </tr>
                                 <tr>
                                     <td>公司管理费用</td>
                                     <td></td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costCompanyManageTaxExclude" value="${Utils.format(estimateBean.costCompanyManageTaxExclude)}" required readonly></td>
+                                    <td><input type="text" class="number" name="costCompanyManageTaxExclude" value="${Utils.format(estimateBean.costCompanyManageTaxExclude)}" required readonly></td>
                                 </tr>
                                 </tbody>
                             </table>
@@ -397,19 +397,19 @@
                                 </tr>
                                 <tr>
                                     <td>项目毛利（元）</td>
-                                    <td><input type="number" name="projectGrossProfit" value="${Utils.format(estimateBean.projectGrossProfit)}" readonly title="收入总计（不含税）-成本总计（不含税）-财务费用总计（不含税）"></td>
+                                    <td><input type="text" class="number" name="projectGrossProfit" value="${Utils.format(estimateBean.projectGrossProfit)}" readonly title="收入总计（不含税）-成本总计（不含税）-财务费用总计（不含税）"></td>
                                 </tr>
                                 <tr>
                                     <td>项目毛利率（%）</td>
-                                    <td><input type="number" name="projectGrossProfitRate" value="${Utils.format(estimateBean.projectGrossProfitRate)}" readonly title="毛利（不含税）/收入总计（不含税）"></td>
+                                    <td><input type="text" class="number" name="projectGrossProfitRate" value="${Utils.format(estimateBean.projectGrossProfitRate)}" readonly title="毛利（不含税）/收入总计（不含税）"></td>
                                 </tr>
                                 <tr>
                                     <td>项目贡献利润（元）</td>
-                                    <td><input type="number" name="projectContributionProfit" value="${Utils.format(estimateBean.projectContributionProfit)}" readonly title="项目毛利（不含税）-公司管理费用总计（不含税）"></td>
+                                    <td><input type="text" class="number" name="projectContributionProfit" value="${Utils.format(estimateBean.projectContributionProfit)}" readonly title="项目毛利（不含税）-公司管理费用总计（不含税）"></td>
                                 </tr>
                                 <tr>
                                     <td>项目贡献利润率（%）</td>
-                                    <td><input type="number" name="projectContributionProfitRate" value="${Utils.format(estimateBean.projectContributionProfitRate)}" readonly title="贡献利润（不含税）/收入总计（不含税）"></td>
+                                    <td><input type="text" class="number" name="projectContributionProfitRate" value="${Utils.format(estimateBean.projectContributionProfitRate)}" readonly title="贡献利润（不含税）/收入总计（不含税）"></td>
                                 </tr>
                                 </tbody>
                             </table>
@@ -444,26 +444,26 @@
                                 <tr>
                                     <td>收入</td>
                                     <td>设备类</td>
-                                    <td><input type="number" name="incomeDeviceTaxInclude" value="${Utils.format(budgetBean.incomeDeviceTaxInclude,'0')}" required readonly title="设备类含税总额"></td>
-                                    <td><input type="number" name="incomeDeviceTaxExclude" value="${Utils.format(budgetBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类不含税总额"></td>
+                                    <td><input type="text" class="number" name="incomeDeviceTaxInclude" value="${Utils.format(budgetBean.incomeDeviceTaxInclude,'0')}" required readonly title="设备类含税总额"></td>
+                                    <td><input type="text" class="number" name="incomeDeviceTaxExclude" value="${Utils.format(budgetBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类不含税总额"></td>
                                 </tr>
                                 <tr>
                                     <td>收入</td>
                                     <td>工程类</td>
-                                    <td><input type="number" name="incomeEngineerTaxInclude" value="${Utils.format(budgetBean.incomeEngineerTaxInclude,'0')}" required readonly title="工程类含税总额"></td>
-                                    <td><input type="number" name="incomeEngineerTaxExclude" value="${Utils.format(budgetBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类不含税总额"></td>
+                                    <td><input type="text" class="number" name="incomeEngineerTaxInclude" value="${Utils.format(budgetBean.incomeEngineerTaxInclude,'0')}" required readonly title="工程类含税总额"></td>
+                                    <td><input type="text" class="number" name="incomeEngineerTaxExclude" value="${Utils.format(budgetBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类不含税总额"></td>
                                 </tr>
                                 <tr>
                                     <td>收入</td>
                                     <td>服务类</td>
-                                    <td><input type="number" name="incomeServiceTaxInclude" value="${Utils.format(budgetBean.incomeServiceTaxInclude,'0')}" required readonly title="服务类含税总额"></td>
-                                    <td><input type="number" name="incomeServiceTaxExclude" value="${Utils.format(budgetBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类不含税总额"></td>
+                                    <td><input type="text" class="number" name="incomeServiceTaxInclude" value="${Utils.format(budgetBean.incomeServiceTaxInclude,'0')}" required readonly title="服务类含税总额"></td>
+                                    <td><input type="text" class="number" name="incomeServiceTaxExclude" value="${Utils.format(budgetBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类不含税总额"></td>
                                 </tr>
                                 <tr>
                                     <td>合计</td>
                                     <td></td>
-                                    <td><input type="number" name="incomeTotalTaxInclude" value="${Utils.format(budgetBean.incomeTotalTaxInclude,'0')}" readonly required title="此列累计"></td>
-                                    <td><input type="number" name="incomeTotalTaxExclude" value="${Utils.format(budgetBean.incomeTotalTaxExclude,'0')}" readonly required title="此列累计"></td>
+                                    <td><input type="text" class="number" name="incomeTotalTaxInclude" value="${Utils.format(budgetBean.incomeTotalTaxInclude,'0')}" readonly required title="此列累计"></td>
+                                    <td><input type="text" class="number" name="incomeTotalTaxExclude" value="${Utils.format(budgetBean.incomeTotalTaxExclude,'0')}" readonly required title="此列累计"></td>
                                 </tr>
                                 </tbody>
                             </table>
@@ -483,50 +483,50 @@
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>设备</td>
-                                    <td><input type="number" name="costPurchaseDeviceTaxInclude" value="${Utils.format(budgetBean.costPurchaseDeviceTaxInclude,'0')}" readonly required title="购买设备含税总额"></td>
-                                    <td><input type="number" name="costPurchaseDeviceTaxExclude" value="${Utils.format(budgetBean.costPurchaseDeviceTaxExclude,'0')}" readonly required title="购买设备不含税总额"></td>
+                                    <td><input type="text" class="number" name="costPurchaseDeviceTaxInclude" value="${Utils.format(budgetBean.costPurchaseDeviceTaxInclude,'0')}" readonly required title="购买设备含税总额"></td>
+                                    <td><input type="text" class="number" name="costPurchaseDeviceTaxExclude" value="${Utils.format(budgetBean.costPurchaseDeviceTaxExclude,'0')}" readonly required title="购买设备不含税总额"></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>施工</td>
-                                    <td><input type="number" name="costPurchaseBuildTaxInclude" value="${Utils.format(budgetBean.costPurchaseBuildTaxInclude,'0')}" readonly required title="购买施工含税总额"></td>
-                                    <td><input type="number" name="costPurchaseBuildTaxExclude" value="${Utils.format(budgetBean.costPurchaseBuildTaxExclude,'0')}" readonly required title="购买施工不含税总额"></td>
+                                    <td><input type="text" class="number" name="costPurchaseBuildTaxInclude" value="${Utils.format(budgetBean.costPurchaseBuildTaxInclude,'0')}" readonly required title="购买施工含税总额"></td>
+                                    <td><input type="text" class="number" name="costPurchaseBuildTaxExclude" value="${Utils.format(budgetBean.costPurchaseBuildTaxExclude,'0')}" readonly required title="购买施工不含税总额"></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>服务</td>
-                                    <td><input type="number" name="costPurchaseServiceTaxInclude" value="${Utils.format(budgetBean.costPurchaseServiceTaxInclude,'0')}" readonly required title="购买服务含税总额"></td>
-                                    <td><input type="number" name="costPurchaseServiceTaxExclude" value="${Utils.format(budgetBean.costPurchaseServiceTaxExclude,'0')}" readonly required title="购买服务不含税总额"></td>
+                                    <td><input type="text" class="number" name="costPurchaseServiceTaxInclude" value="${Utils.format(budgetBean.costPurchaseServiceTaxInclude,'0')}" readonly required title="购买服务含税总额"></td>
+                                    <td><input type="text" class="number" name="costPurchaseServiceTaxExclude" value="${Utils.format(budgetBean.costPurchaseServiceTaxExclude,'0')}" readonly required title="购买服务不含税总额"></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>其他</td>
-                                    <td><input type="number" name="costPurchaseOtherTaxInclude" value="${Utils.format(budgetBean.costPurchaseOtherTaxInclude,'0')}" readonly required title="购买其他含税总额"></td>
-                                    <td><input type="number" name="costPurchaseOtherTaxExclude" value="${Utils.format(budgetBean.costPurchaseOtherTaxExclude,'0')}" readonly required title="购买其他不含税总额"></td>
+                                    <td><input type="text" class="number" name="costPurchaseOtherTaxInclude" value="${Utils.format(budgetBean.costPurchaseOtherTaxInclude,'0')}" readonly required title="购买其他含税总额"></td>
+                                    <td><input type="text" class="number" name="costPurchaseOtherTaxExclude" value="${Utils.format(budgetBean.costPurchaseOtherTaxExclude,'0')}" readonly required title="购买其他不含税总额"></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
                                     <td>项目管理成本</td>
                                     <td>项目管理成本</td>
-                                    <td><input type="number" name="costProjectManageTaxInclude" value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0')}" readonly required title="项目管理成本总额"></td>
-                                    <td><input type="number" name="costProjectManageTaxExclude" value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0')}" readonly required title="项目管理成本总额"></td>
+                                    <td><input type="text" class="number" name="costProjectManageTaxInclude" value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0')}" readonly required title="项目管理成本总额"></td>
+                                    <td><input type="text" class="number" name="costProjectManageTaxExclude" value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0')}" readonly required title="项目管理成本总额"></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
                                     <td>其他</td>
                                     <td>${project.otherName!}</td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costOtherOtherTaxInclude" value="${Utils.format(budgetBean.costOtherOtherTaxInclude,'0')}" required readonly title="其他含税总额（填入）"></td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costOtherOtherTaxExclude" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0')}" required readonly title="其他不含税总额（填入）"></td>
+                                    <td><input type="text" class="number" name="costOtherOtherTaxInclude" value="${Utils.format(budgetBean.costOtherOtherTaxInclude,'0')}" required readonly title="其他含税总额（填入）"></td>
+                                    <td><input type="text" class="number" name="costOtherOtherTaxExclude" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0')}" required readonly title="其他不含税总额（填入）"></td>
                                 </tr>
                                 <tr>
                                     <td>合计</td>
                                     <td></td>
                                     <td></td>
-                                    <td><input type="number" name="costTotalTaxInclude" value="${Utils.format(budgetBean.costTotalTaxInclude,'0')}" readonly required title="此列累计"></td>
-                                    <td><input type="number" name="costTotalTaxExclude" value="${Utils.format(budgetBean.costTotalTaxExclude,'0')}" readonly required title="此列累计"></td>
+                                    <td><input type="text" class="number" name="costTotalTaxInclude" value="${Utils.format(budgetBean.costTotalTaxInclude,'0')}" readonly required title="此列累计"></td>
+                                    <td><input type="text" class="number" name="costTotalTaxExclude" value="${Utils.format(budgetBean.costTotalTaxExclude,'0')}" readonly required title="此列累计"></td>
                                 </tr>
                                 </tbody>
                             </table>
@@ -542,12 +542,12 @@
                                 <tr>
                                     <td>财务费用</td>
                                     <td>资金占用成本</td>
-                                    <td><input type="number" name="costExpropriationTaxExclude" value="${Utils.format(budgetBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本不含税总额"></td>
+                                    <td><input type="text" class="number" name="costExpropriationTaxExclude" value="${Utils.format(budgetBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本不含税总额"></td>
                                 </tr>
                                 <tr>
                                     <td>公司管理费用</td>
                                     <td></td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costCompanyManageTaxExclude" value="${Utils.format(budgetBean.costCompanyManageTaxExclude,'0')}" required readonly title="公司管理费用不含税总额"></td>
+                                    <td><input type="text" class="number" name="costCompanyManageTaxExclude" value="${Utils.format(budgetBean.costCompanyManageTaxExclude,'0')}" required readonly title="公司管理费用不含税总额"></td>
                                 </tr>
                                 </tbody>
                             </table>
@@ -561,19 +561,19 @@
                                 </tr>
                                 <tr>
                                     <td>项目毛利（元）</td>
-                                    <td><input type="number" name="projectGrossProfit" value="${Utils.format(budgetBean.projectGrossProfit,'0')}" readonly required title="收入总计（不含税）-成本总计（不含税）-财务费用总计（不含税）"></td>
+                                    <td><input type="text" class="number" name="projectGrossProfit" value="${Utils.format(budgetBean.projectGrossProfit,'0')}" readonly required title="收入总计（不含税）-成本总计（不含税）-财务费用总计（不含税）"></td>
                                 </tr>
                                 <tr>
                                     <td>项目毛利率（%）</td>
-                                    <td><input type="number" name="projectGrossProfitRate" value="${Utils.format(budgetBean.projectGrossProfitRate,'0')}" readonly required title="毛利（不含税）/收入总计（不含税）"></td>
+                                    <td><input type="text" class="number" name="projectGrossProfitRate" value="${Utils.format(budgetBean.projectGrossProfitRate,'0')}" readonly required title="毛利（不含税）/收入总计（不含税）"></td>
                                 </tr>
                                 <tr>
                                     <td>项目贡献利润（元）</td>
-                                    <td><input type="number" name="projectContributionProfit" value="${Utils.format(budgetBean.projectContributionProfit,'0')}" readonly required title="项目毛利（不含税）-公司管理费用总计（不含税）"></td>
+                                    <td><input type="text" class="number" name="projectContributionProfit" value="${Utils.format(budgetBean.projectContributionProfit,'0')}" readonly required title="项目毛利（不含税）-公司管理费用总计（不含税）"></td>
                                 </tr>
                                 <tr>
                                     <td>项目贡献利润率（%）</td>
-                                    <td><input type="number" name="projectContributionProfitRate" value="${Utils.format(budgetBean.projectContributionProfitRate,'0')}" readonly required title="贡献利润（不含税）/收入总计（不含税）"></td>
+                                    <td><input type="text" class="number" name="projectContributionProfitRate" value="${Utils.format(budgetBean.projectContributionProfitRate,'0')}" readonly required title="贡献利润（不含税）/收入总计（不含税）"></td>
                                 </tr>
                                 </tbody>
                             </table>
@@ -588,7 +588,7 @@
                                 </tr>
                                 <tr>
                                     <td>销售商品、提供劳务收到的现金</td>
-                                    <td><input type="number" name="saleIncomeCash" value="${Utils.format(cashFlowBean.saleIncomeCash,'0')}" readonly required title="取自资金计划表（销售收款）"></td>
+                                    <td><input type="text" class="number" name="saleIncomeCash" value="${Utils.format(cashFlowBean.saleIncomeCash,'0')}" readonly required title="取自资金计划表（销售收款）"></td>
                                 </tr>
                                 <tr>
                                     <td>收到的税费返还</td>
@@ -596,11 +596,11 @@
                                 </tr>
                                 <tr>
                                     <td>收到其他与经营活动有关的现金</td>
-                                    <td><input type="number" name="earnestMoneyIncome" value="${Utils.format(cashFlowBean.earnestMoneyIncome,'0')}" readonly required title="取自资金计划表（保证金收款）"></td>
+                                    <td><input type="text" class="number" name="earnestMoneyIncome" value="${Utils.format(cashFlowBean.earnestMoneyIncome,'0')}" readonly required title="取自资金计划表（保证金收款）"></td>
                                 </tr>
                                 <tr>
                                     <td>购买商品、接受劳务支付的现金</td>
-                                    <td><input type="number" name="purchaseCost" value="${Utils.format(cashFlowBean.purchaseCost,'0')}" readonly required title="取自资金计划表（设备支出+工程支出）"></td>
+                                    <td><input type="text" class="number" name="purchaseCost" value="${Utils.format(cashFlowBean.purchaseCost,'0')}" readonly required title="取自资金计划表（设备支出+工程支出）"></td>
                                 </tr>
                                 <tr>
                                     <td>支付的各项税费</td>
@@ -608,11 +608,11 @@
                                 </tr>
                                 <tr>
                                     <td>支付其他与经营活动有关的现金</td>
-                                    <td><input type="number" name="earnestMoneyCost" value="${Utils.format(cashFlowBean.earnestMoneyCost,'0')}" readonly required title="取自资金计划表（经营性开支+保证金支出+资金利息）"></td>
+                                    <td><input type="text" class="number" name="earnestMoneyCost" value="${Utils.format(cashFlowBean.earnestMoneyCost,'0')}" readonly required title="取自资金计划表（经营性开支+保证金支出+资金利息）"></td>
                                 </tr>
                                 <tr>
                                     <td>经营活动产生的现金流量净额</td>
-                                    <td><input type="number" name="netCashFlow" value="${Utils.format(cashFlowBean.netCashFlow,'0')}" readonly required title="g=a+c+b-d-f-e"></td>
+                                    <td><input type="text" class="number" name="netCashFlow" value="${Utils.format(cashFlowBean.netCashFlow,'0')}" readonly required title="g=a+c+b-d-f-e"></td>
                                 </tr>
                                 <tr>
                                     <td>投资活动现金流入</td>
@@ -628,19 +628,19 @@
                                 </tr>
                                 <tr>
                                     <td>融资资金流入</td>
-                                    <td><input type="number" name="financingCapitalInflow" value="${Utils.format(cashFlowBean.financingCapitalInflow,'0')}" readonly required title="从资金计划表查（垫资计划）"></td>
+                                    <td><input type="text" class="number" name="financingCapitalInflow" value="${Utils.format(cashFlowBean.financingCapitalInflow,'0')}" readonly required title="从资金计划表查（垫资计划）"></td>
                                 </tr>
                                 <tr>
                                     <td>还款资金流出</td>
-                                    <td><input type="number" name="financingCapitalOutflow" value="${Utils.format(cashFlowBean.financingCapitalOutflow,'0')}" readonly required title="从资金计划表查（还款计划）"></td>
+                                    <td><input type="text" class="number" name="financingCapitalOutflow" value="${Utils.format(cashFlowBean.financingCapitalOutflow,'0')}" readonly required title="从资金计划表查（还款计划）"></td>
                                 </tr>
                                 <tr>
                                     <td>筹资活动产生的现金流量净额</td>
-                                    <td><input type="number" name="financingCapitalCashflow" value="${Utils.format(cashFlowBean.financingCapitalCashflow,'0')}" readonly required title="m=k-l"></td>
+                                    <td><input type="text" class="number" name="financingCapitalCashflow" value="${Utils.format(cashFlowBean.financingCapitalCashflow,'0')}" readonly required title="m=k-l"></td>
                                 </tr>
                                 <tr>
                                     <td>货币资金净增加额</td>
-                                    <td><input type="number" name="netIncreaseMonetaryFunds" value="${Utils.format(cashFlowBean.netIncreaseMonetaryFunds,'0')}" readonly required title="n=g+j+m"></td>
+                                    <td><input type="text" class="number" name="netIncreaseMonetaryFunds" value="${Utils.format(cashFlowBean.netIncreaseMonetaryFunds,'0')}" readonly required title="n=g+j+m"></td>
                                 </tr>
                                 </tbody>
                             </table>
@@ -684,38 +684,38 @@
                                 <tr>
                                     <td>收入</td>
                                     <td>设备类</td>
-                                    <td><input name="incomeDeviceEstimateTotal" type="number" value="${Utils.format(monthBean.estimateIncomeDevice,'0')}" required readonly title="设备类概算总额"></td>
-                                    <td><input name="incomeDeviceBudgetTotal" type="number" value="${Utils.format(monthBean.budgetIncomeDevice,'0')}" required readonly title="设备类预算总额"></td>
-                                    <td><input name="incomeDeviceFormerSettleTotal" type="number" value="${Utils.format(formerBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类上月结算总额"></td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeDevice" value="${Utils.format(monthBean.incomeDevice,'0')}" readonly required title="本月结算金额"></td>
-                                    <td><input type="number" name="incomeDeviceSettleTotal" value="${Utils.format(currentBean.incomeDeviceTaxExclude,'0')}" readonly title="设备类结算总额"></td>
+                                    <td><input name="incomeDeviceEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateIncomeDevice,'0')}" required readonly title="设备类概算总额"></td>
+                                    <td><input name="incomeDeviceBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetIncomeDevice,'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 type="text" class="number" name="incomeDevice" value="${Utils.format(monthBean.incomeDevice,'0')}" readonly required title="本月结算金额"></td>
+                                    <td><input type="text" class="number" name="incomeDeviceSettleTotal" value="${Utils.format(currentBean.incomeDeviceTaxExclude,'0')}" readonly title="设备类结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>收入</td>
                                     <td>工程类</td>
-                                    <td><input name="incomeEngineerEstimateTotal" type="number" value="${Utils.format(monthBean.estimateIncomeEngineer,'0')}" required readonly title="工程类概算总额"></td>
-                                    <td><input name="incomeEngineerBudgetTotal" type="number" value="${Utils.format(monthBean.budgetIncomeEngineer,'0')}" required readonly title="工程类预算总额"></td>
-                                    <td><input name="incomeEngineerFormerSettleTotal" type="number" value="${Utils.format(formerBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类上月结算总额"></td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeEngineer" value="${Utils.format(monthBean.incomeEngineer,'0')}" readonly required title="工程类本月结算金额"></td>
-                                    <td><input type="number" name="incomeEngineerSettleTotal" value="${Utils.format(currentBean.incomeEngineerTaxExclude,'0')}" readonly title="工程类结算总额"></td>
+                                    <td><input name="incomeEngineerEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateIncomeEngineer,'0')}" required readonly title="工程类概算总额"></td>
+                                    <td><input name="incomeEngineerBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetIncomeEngineer,'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 type="text" class="number" name="incomeEngineer" value="${Utils.format(monthBean.incomeEngineer,'0')}" readonly required title="工程类本月结算金额"></td>
+                                    <td><input type="text" class="number" name="incomeEngineerSettleTotal" value="${Utils.format(currentBean.incomeEngineerTaxExclude,'0')}" readonly title="工程类结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>收入</td>
                                     <td>服务类</td>
-                                    <td><input name="incomeServiceEstimateTotal" type="number" value="${Utils.format(monthBean.estimateIncomeService,'0')}" required readonly title="服务类概算总额"></td>
-                                    <td><input name="incomeServiceBudgetTotal" type="number" value="${Utils.format(monthBean.budgetIncomeService,'0')}" required readonly title="服务类预算总额"></td>
-                                    <td><input name="incomeServiceFormerSettleTotal" type="number" value="${Utils.format(formerBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类上月结算总额"></td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeService" value="${Utils.format(monthBean.incomeService,'0')}" readonly required title="服务类本月结算金额"></td>
-                                    <td><input type="number" name="incomeServiceSettleTotal" value="${Utils.format(currentBean.incomeServiceTaxExclude,'0')}" readonly title="服务类结算总额"></td>
+                                    <td><input name="incomeServiceEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateIncomeService,'0')}" required readonly title="服务类概算总额"></td>
+                                    <td><input name="incomeServiceBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetIncomeService,'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 type="text" class="number" name="incomeService" value="${Utils.format(monthBean.incomeService,'0')}" readonly required title="服务类本月结算金额"></td>
+                                    <td><input type="text" class="number" name="incomeServiceSettleTotal" value="${Utils.format(currentBean.incomeServiceTaxExclude,'0')}" readonly title="服务类结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>合计</td>
                                     <td></td>
-                                    <td><input name="incomeEstimateTotal" type="number" value="${Utils.format(monthBean.getEstimateIncomeTotal(),'0')}" readonly required title="此列累计"></td>
-                                    <td><input name="incomeBudgetTotal" type="number"  value="${Utils.format(monthBean.getBudgetIncomeTotal(),'0')}" readonly required title="此列累计"></td>
-                                    <td><input name="incomeFormerSettleTotal" type="number" value="${Utils.format(formerBean.getIncomeTotalTaxExclude(),'0')}" required readonly title="此列累计"></td>
-                                    <td><input type="number" name="incomeTotal" value="${Utils.format(monthBean.getIncomeTotal(),'0')}" readonly title="此列累计"></td>
-                                    <td><input type="number" name="incomeSettleTotal" value="${Utils.format(currentBean.getIncomeTotalTaxExclude(),'0')}" readonly title="此列累计"></td>
+                                    <td><input name="incomeEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.getEstimateIncomeTotal(),'0')}" readonly required title="此列累计"></td>
+                                    <td><input name="incomeBudgetTotal" type="text" class="number"  value="${Utils.format(monthBean.getBudgetIncomeTotal(),'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 type="text" class="number" name="incomeTotal" value="${Utils.format(monthBean.getIncomeTotal(),'0')}" readonly title="此列累计"></td>
+                                    <td><input type="text" class="number" name="incomeSettleTotal" value="${Utils.format(currentBean.getIncomeTotalTaxExclude(),'0')}" readonly title="此列累计"></td>
                                 </tr>
                                 </tbody>
                             </table>
@@ -736,71 +736,71 @@
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>设备</td>
-                                    <td><input name="costPurchaseDeviceEstimateTotal" type="number" value="${Utils.format(monthBean.estimateCostPurchaseDevice,'0')}" readonly required title="购买设备概算总额"></td>
-                                    <td><input name="costPurchaseDeviceBudgetTotal" type="number" value="${Utils.format(monthBean.budgetCostPurchaseDevice,'0')}" readonly required title="购买设备预算总额"></td>
-                                    <td><input name="costPurchaseDeviceFormerSettleTotal" type="number" value="${Utils.format(formerBean.costPurchaseDeviceTaxExclude,'0')}" required readonly title="购买设备上月结算总额"></td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseDevice" value="${Utils.format(monthBean.costPurchaseDevice,'0')}" readonly required title="购买设备本月结算总额"></td>
-                                    <td><input type="number" name="costPurchaseDeviceSettleTotal" value="${Utils.format(currentBean.costPurchaseDeviceTaxExclude,'0')}" readonly title="购买设备结算总额"></td>
+                                    <td><input name="costPurchaseDeviceEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateCostPurchaseDevice,'0')}" readonly required title="购买设备概算总额"></td>
+                                    <td><input name="costPurchaseDeviceBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetCostPurchaseDevice,'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 type="text" class="number" name="costPurchaseDevice" value="${Utils.format(monthBean.costPurchaseDevice,'0')}" readonly required title="购买设备本月结算总额"></td>
+                                    <td><input type="text" class="number" name="costPurchaseDeviceSettleTotal" value="${Utils.format(currentBean.costPurchaseDeviceTaxExclude,'0')}" readonly title="购买设备结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>施工</td>
-                                    <td><input name="costPurchaseBuildEstimateTotal" type="number" value="${Utils.format(monthBean.estimateCostPurchaseBuild,'0')}" readonly required title="施工采购成本概算总额"></td>
-                                    <td><input name="costPurchaseBuildBudgetTotal" type="number" value="${Utils.format(monthBean.budgetCostPurchaseBuild,'0')}" readonly required title="施工采购成本预算总额"></td>
-                                    <td><input name="costPurchaseBuildFormerSettleTotal" type="number" value="${Utils.format(formerBean.costPurchaseBuildTaxExclude,'0')}" required readonly title="施工采购成本上月结算总额"></td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseBuild" value="${Utils.format(monthBean.costPurchaseBuild,'0')}" readonly required title="施工采购成本本月结算金额"></td>
-                                    <td><input type="number" name="costPurchaseBuildSettleTotal" value="${Utils.format(currentBean.costPurchaseBuildTaxExclude,'0')}" readonly title="施工采购成本结算总额"></td>
+                                    <td><input name="costPurchaseBuildEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateCostPurchaseBuild,'0')}" readonly required title="施工采购成本概算总额"></td>
+                                    <td><input name="costPurchaseBuildBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetCostPurchaseBuild,'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 type="text" class="number" name="costPurchaseBuild" value="${Utils.format(monthBean.costPurchaseBuild,'0')}" readonly required title="施工采购成本本月结算金额"></td>
+                                    <td><input type="text" class="number" name="costPurchaseBuildSettleTotal" value="${Utils.format(currentBean.costPurchaseBuildTaxExclude,'0')}" readonly title="施工采购成本结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>服务</td>
-                                    <td><input name="costPurchaseServiceEstimateTotal" type="number" value="${Utils.format(monthBean.estimateCostPurchaseService,'0')}" readonly required title="服务采购成本概算总额"></td>
-                                    <td><input name="costPurchaseServiceBudgetTotal" type="number" value="${Utils.format(monthBean.budgetCostPurchaseService,'0')}" readonly required title="服务采购成本预算总额"></td>
-                                    <td><input name="costPurchaseServiceFormerSettleTotal" type="number" value="${Utils.format(formerBean.costPurchaseServiceTaxExclude,'0')}" required readonly title="服务采购成本上月结算总额"></td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseService" value="${Utils.format(monthBean.costPurchaseService,'0')}" readonly required title="服务采购成本本月结算金额"></td>
-                                    <td><input type="number" name="costPurchaseServiceSettleTotal" value="${Utils.format(currentBean.costPurchaseServiceTaxExclude,'0')}" readonly title="服务采购成本结算总额"></td>
+                                    <td><input name="costPurchaseServiceEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateCostPurchaseService,'0')}" readonly required title="服务采购成本概算总额"></td>
+                                    <td><input name="costPurchaseServiceBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetCostPurchaseService,'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 type="text" class="number" name="costPurchaseService" value="${Utils.format(monthBean.costPurchaseService,'0')}" readonly required title="服务采购成本本月结算金额"></td>
+                                    <td><input type="text" class="number" name="costPurchaseServiceSettleTotal" value="${Utils.format(currentBean.costPurchaseServiceTaxExclude,'0')}" readonly title="服务采购成本结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>其他</td>
-                                    <td><input name="costPurchaseOtherEstimateTotal" type="number" value="${Utils.format(monthBean.estimateCostPurchaseOther,'0')}" readonly required title="其他采购成本概算总额"></td>
-                                    <td><input name="costPurchaseOtherBudgetTotal" type="number" value="${Utils.format(monthBean.budgetCostPurchaseOther,'0')}" readonly required title="其他采购成本预算总额"></td>
-                                    <td><input name="costPurchaseOtherFormerSettleTotal" type="number" value="${Utils.format(formerBean.costPurchaseOtherTaxExclude,'0')}" required readonly title="其他采购成本上月结算总额"></td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseOther" value="${Utils.format(monthBean.costPurchaseOther,'0')}" readonly required title="其他采购成本本月结算金额"></td>
-                                    <td><input type="number" name="costPurchaseOtherSettleTotal" value="${Utils.format(currentBean.costPurchaseOtherTaxExclude,'0')}" readonly title="其他采购成本结算总额"></td>
+                                    <td><input name="costPurchaseOtherEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateCostPurchaseOther,'0')}" readonly required title="其他采购成本概算总额"></td>
+                                    <td><input name="costPurchaseOtherBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetCostPurchaseOther,'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 type="text" class="number" name="costPurchaseOther" value="${Utils.format(monthBean.costPurchaseOther,'0')}" readonly required title="其他采购成本本月结算金额"></td>
+                                    <td><input type="text" class="number" name="costPurchaseOtherSettleTotal" value="${Utils.format(currentBean.costPurchaseOtherTaxExclude,'0')}" readonly title="其他采购成本结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
                                     <td>项目管理成本</td>
                                     <td>项目管理成本</td>
-                                    <td><input name="costProjectManageEstimateTotal" type="number" value="${Utils.format(monthBean.estimateCostProjectManage,'0')}" readonly required title="项目管理成本概算总额"></td>
-                                    <td><input name="costProjectManageBudgetTotal" type="number" value="${Utils.format(monthBean.budgetCostProjectManage,'0')}" readonly required title="项目管理成本预算总额"></td>
-                                    <td><input name="costProjectManageFormerSettleTotal" type="number" value="${Utils.format(formerBean.costProjectManageTaxExclude,'0')}" required readonly title="项目管理成本上月结算总额"></td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costProjectManage" value="${Utils.format(monthBean.costProjectManage,'0')}" readonly required title="项目管理成本本月结算金额"></td>
-                                    <td><input type="number" name="costProjectManageSettleTotal" value="${Utils.format(currentBean.costProjectManageTaxExclude,'0')}" readonly title="项目管理成本结算总额"></td>
+                                    <td><input name="costProjectManageEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateCostProjectManage,'0')}" readonly required title="项目管理成本概算总额"></td>
+                                    <td><input name="costProjectManageBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetCostProjectManage,'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 type="text" class="number" name="costProjectManage" value="${Utils.format(monthBean.costProjectManage,'0')}" readonly required title="项目管理成本本月结算金额"></td>
+                                    <td><input type="text" class="number" name="costProjectManageSettleTotal" value="${Utils.format(currentBean.costProjectManageTaxExclude,'0')}" readonly title="项目管理成本结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
                                     <td>其他</td>
                                     <td>${project.otherName!}</td>
-                                    <td><input name="costOtherEstimateTotal" type="number" value="${Utils.format(monthBean.estimateCostOther,'0')}" readonly required title="其他成本概算总额"></td>
-                                    <td><input name="costOtherBudgetTotal" type="number" value="${Utils.format(monthBean.budgetCostOther,'0')}" readonly required title="其他成本预算总额"></td>
-                                    <td><input name="costOtherFormerSettleTotal" type="number" value="${Utils.format(formerBean.costOtherOtherTaxExclude,'0')}" required readonly title="其他成本上月结算总额"></td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costOther" value="${Utils.format(monthBean.costOther,'0')}" required readonly title="其他成本本月结算金额"></td>
-                                    <td><input type="number" name="costOtherSettleTotal" value="${Utils.format(currentBean.costOtherOtherTaxExclude,'0')}" readonly title="其他成本结算总额"></td>
+                                    <td><input name="costOtherEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateCostOther,'0')}" readonly required title="其他成本概算总额"></td>
+                                    <td><input name="costOtherBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetCostOther,'0')}" readonly required title="其他成本预算总额"></td>
+                                    <td><input name="costOtherFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costOtherOtherTaxExclude,'0')}" required readonly title="其他成本上月结算总额"></td>
+                                    <td><input type="text" class="number" name="costOther" value="${Utils.format(monthBean.costOther,'0')}" required readonly title="其他成本本月结算金额"></td>
+                                    <td><input type="text" class="number" name="costOtherSettleTotal" value="${Utils.format(currentBean.costOtherOtherTaxExclude,'0')}" readonly title="其他成本结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>合计</td>
                                     <td></td>
                                     <td></td>
-                                    <td><input name="costEstimateTotal" value="${Utils.format(monthBean.getEstimateCostTotal(),'0')}" type="number" readonly required title="此列累计"></td>
-                                    <td><input name="costBudgetTotal" value="${Utils.format(monthBean.getBudgetCostTotal(),'0')}" type="number" readonly required title="此列累计"></td>
-                                    <td><input name="costFormerSettleTotal" type="number" value="${Utils.format(formerBean.getCostTotalTaxExclude(),'0')}" required readonly title="此列累计"></td>
-                                    <td><input type="number" name="costTotal" value="${Utils.format(monthBean.getCostTotal(),'0')}" readonly title="此列累计"></td>
-                                    <td><input type="number" name="costSettleTotal" value="${Utils.format(currentBean.getCostTotalTaxExclude(),'0')}" readonly title="此列累计"></td>
+                                    <td><input name="costEstimateTotal" value="${Utils.format(monthBean.getEstimateCostTotal(),'0')}" type="text" class="number" readonly required title="此列累计"></td>
+                                    <td><input name="costBudgetTotal" value="${Utils.format(monthBean.getBudgetCostTotal(),'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 type="text" class="number" name="costTotal" value="${Utils.format(monthBean.getCostTotal(),'0')}" readonly title="此列累计"></td>
+                                    <td><input type="text" class="number" name="costSettleTotal" value="${Utils.format(currentBean.getCostTotalTaxExclude(),'0')}" readonly title="此列累计"></td>
                                 </tr>
                                 </tbody>
                             </table>
@@ -819,38 +819,38 @@
                                 <tr>
                                     <td>财务费用</td>
                                     <td>资金占用成本</td>
-                                    <td><input name="costExpropriationEstimateTotal" type="number" value="${Utils.format(monthBean.estimateCostExpropriation,'0')}" required readonly title="资金占用成本概算总额"></td>
-                                    <td><input name="costExpropriationBudgetTotal" type="number" value="${Utils.format(monthBean.budgetCostExpropriation,'0')}" required readonly title="资金占用成本预算总额"></td>
-                                    <td><input name="costExpropriationFormerSettleTotal" type="number" value="${Utils.format(formerBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本上月结算总额"></td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costExpropriation" value="${Utils.format(monthBean.costExpropriation,'0')}" readonly required title="资金占用成本本月结算金额"></td>
-                                    <td><input type="number" name="costExpropriationSettleTotal" value="${Utils.format(currentBean.costExpropriationTaxExclude,'0')}" readonly title="资金占用成本结算总额"></td>
+                                    <td><input name="costExpropriationEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateCostExpropriation,'0')}" required readonly title="资金占用成本概算总额"></td>
+                                    <td><input name="costExpropriationBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetCostExpropriation,'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 type="text" class="number" name="costExpropriation" value="${Utils.format(monthBean.costExpropriation,'0')}" readonly required title="资金占用成本本月结算金额"></td>
+                                    <td><input type="text" class="number" name="costExpropriationSettleTotal" value="${Utils.format(currentBean.costExpropriationTaxExclude,'0')}" readonly title="资金占用成本结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>公司管理费用</td>
                                     <td></td>
-                                    <td><input name="costCompanyManageEstimateTotal" type="number" value="${Utils.format(monthBean.estimateCostCompanyManage,'0')}" required readonly title="公司管理费用概算总额"></td>
-                                    <td><input name="costCompanyManageBudgetTotal" type="number" value="${Utils.format(monthBean.budgetCostCompanyManage,'0')}" required readonly title="公司管理费用预算总额"></td>
-                                    <td><input name="costCompanyManageFormerSettleTotal" type="number" value="${Utils.format(formerBean.costCompanyManageTaxExclude,'0')}" required readonly title="公司管理费用上月结算总额"></td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costCompanyManage" value="${Utils.format(monthBean.costCompanyManage,'0')}" readonly required title="公司管理费用本月结算金额"></td>
-                                    <td><input type="number" name="costCompanyManageSettleTotal" value="${Utils.format(currentBean.costCompanyManageTaxExclude,'0')}" readonly title="公司管理费用结算总额"></td>
+                                    <td><input name="costCompanyManageEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateCostCompanyManage,'0')}" required readonly title="公司管理费用概算总额"></td>
+                                    <td><input name="costCompanyManageBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetCostCompanyManage,'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 type="text" class="number" name="costCompanyManage" value="${Utils.format(monthBean.costCompanyManage,'0')}" readonly required title="公司管理费用本月结算金额"></td>
+                                    <td><input type="text" class="number" name="costCompanyManageSettleTotal" value="${Utils.format(currentBean.costCompanyManageTaxExclude,'0')}" readonly title="公司管理费用结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>所得税费用</td>
                                     <td></td>
                                     <td>/</td>
                                     <td>/</td>
-                                    <td><input name="costIncomeTaxFormerSettleTotal" type="number" value="${Utils.format(formerBean.costIncomeTax,'0')}" required readonly title="公司管理费用上月结算总额"></td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costIncomeTax" value="${Utils.format(monthBean.costIncomeTax,'0')}" readonly required title="公司管理费用本月结算金额"></td>
-                                    <td><input type="number" name="costIncomeTaxSettleTotal" value="${Utils.format(currentBean.costIncomeTax,'0')}" readonly title="公司管理费用结算总额"></td>
+                                    <td><input name="costIncomeTaxFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costIncomeTax,'0')}" required readonly title="公司管理费用上月结算总额"></td>
+                                    <td><input type="text" class="number" name="costIncomeTax" value="${Utils.format(monthBean.costIncomeTax,'0')}" readonly required title="公司管理费用本月结算金额"></td>
+                                    <td><input type="text" class="number" name="costIncomeTaxSettleTotal" value="${Utils.format(currentBean.costIncomeTax,'0')}" readonly title="公司管理费用结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>合计</td>
                                     <td></td>
-                                    <td><input name="costManageEstimateTotal" value="${Utils.format(monthBean.getEstimateCostManageTotal(),'0')}" type="number" readonly required title="此列累计"></td>
-                                    <td><input name="costManageBudgetTotal" value="${Utils.format(monthBean.getBudgetCostManageTotal(),'0')}" type="number" readonly required title="此列累计"></td>
-                                    <td><input name="costManageFormerSettleTotal" type="number" value="${Utils.format(formerBean.getCostManageTotal(),'0')}" required readonly title="此列累计"></td>
-                                    <td><input type="number" name="costManageTotal" value="${Utils.format(monthBean.getCostManageTotal(),'0')}" readonly title="此列累计"></td>
-                                    <td><input type="number" name="costManageSettleTotal" value="${Utils.format(currentBean.getCostManageTotal(),'0')}" readonly title="此列累计"></td>
+                                    <td><input name="costManageEstimateTotal" value="${Utils.format(monthBean.getEstimateCostManageTotal(),'0')}" type="text" class="number" readonly required title="此列累计"></td>
+                                    <td><input name="costManageBudgetTotal" value="${Utils.format(monthBean.getBudgetCostManageTotal(),'0')}" type="text" class="number" readonly required title="此列累计"></td>
+                                    <td><input name="costManageFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.getCostManageTotal(),'0')}" required readonly title="此列累计"></td>
+                                    <td><input type="text" class="number" name="costManageTotal" value="${Utils.format(monthBean.getCostManageTotal(),'0')}" readonly title="此列累计"></td>
+                                    <td><input type="text" class="number" name="costManageSettleTotal" value="${Utils.format(currentBean.getCostManageTotal(),'0')}" readonly title="此列累计"></td>
                                 </tr>
                                 </tbody>
                             </table>
@@ -869,30 +869,30 @@
                                 </tr>
                                 <tr>
                                     <td>项目毛利</td>
-                                    <td><input name="grossProfitEstimateTotal" type="number" value="${Utils.format(monthBean.estimateGrossProfit,'0')}" required readonly title="项目毛利概算总额"></td>
-                                    <td><input name="grossProfitBudgetTotal" type="number" value="${Utils.format(monthBean.budgetGrossProfit,'0')}" required readonly title="项目毛利预算总额"></td>
-                                    <td><input name="grossProfitFormerSettleTotal" type="number" value="${Utils.format(formerBean.grossProfit,'0')}" required readonly title="项目毛利上月结算总额"></td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="grossProfit" value="${Utils.format(monthBean.grossProfit,'0')}" readonly required title="项目毛利本月结算金额"></td>
-                                    <td><input type="number" name="grossProfitSettleTotal" value="${Utils.format(currentBean.grossProfit,'0')}" readonly title="项目毛利结算总额"></td>
-                                    <td><input name="grossProfitProfitMargin" type="number" value="${Utils.format(currentBean.getGrossProfitProfitMargin(),'0')}" readonly title="项目毛利利润率"></td>
+                                    <td><input name="grossProfitEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateGrossProfit,'0')}" required readonly title="项目毛利概算总额"></td>
+                                    <td><input name="grossProfitBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetGrossProfit,'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 type="text" class="number" name="grossProfit" value="${Utils.format(monthBean.grossProfit,'0')}" readonly required title="项目毛利本月结算金额"></td>
+                                    <td><input type="text" class="number" name="grossProfitSettleTotal" value="${Utils.format(currentBean.grossProfit,'0')}" readonly title="项目毛利结算总额"></td>
+                                    <td><input name="grossProfitProfitMargin" type="text" class="number" value="${Utils.format(currentBean.getGrossProfitProfitMargin(),'0')}" readonly title="项目毛利利润率"></td>
                                 </tr>
                                 <tr>
                                     <td>项目贡献利润</td>
-                                    <td><input name="contributionProfitEstimateTotal" type="number" value="${Utils.format(monthBean.estimateContributionProfit,'0')}" required readonly title="项目贡献利润概算总额"></td>
-                                    <td><input name="contributionProfitBudgetTotal" type="number" value="${Utils.format(monthBean.budgetContributionProfit,'0')}" required readonly title="项目贡献利润预算总额"></td>
-                                    <td><input name="contributionProfitFormerSettleTotal" type="number" value="${Utils.format(formerBean.contributionProfit,'0')}" required readonly title="项目贡献利润上月结算总额"></td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="contributionProfit" value="${Utils.format(monthBean.contributionProfit,'0')}" required readonly title="项目贡献利润本月结算金额"></td>
-                                    <td><input type="number" name="contributionProfitSettleTotal" value="${Utils.format(currentBean.contributionProfit,'0')}" readonly title="项目贡献利润结算总额"></td>
-                                    <td><input name="contributionProfitProfitMargin" type="number" value="${Utils.format(currentBean.getContributionProfitProfitMargin(),'0')}" readonly title="项目贡献利润利润率"></td>
+                                    <td><input name="contributionProfitEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateContributionProfit,'0')}" required readonly title="项目贡献利润概算总额"></td>
+                                    <td><input name="contributionProfitBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetContributionProfit,'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 type="text" class="number" name="contributionProfit" value="${Utils.format(monthBean.contributionProfit,'0')}" required readonly title="项目贡献利润本月结算金额"></td>
+                                    <td><input type="text" class="number" name="contributionProfitSettleTotal" value="${Utils.format(currentBean.contributionProfit,'0')}" readonly title="项目贡献利润结算总额"></td>
+                                    <td><input name="contributionProfitProfitMargin" type="text" class="number" value="${Utils.format(currentBean.getContributionProfitProfitMargin(),'0')}" readonly title="项目贡献利润利润率"></td>
                                 </tr>
                                 <tr>
                                     <td>项目净利润</td>
                                     <td>/</td>
-                                    <td>/<#--<input name="netProfitBudgetTotal" type="number" value="${Utils.format(budgetBean.getProjectContributionProfit(),'0')}" required readonly title="项目净利润预算总额">--></td>
-                                    <td><input name="netProfitFormerSettleTotal" type="number" value="${Utils.format(formerBean.netProfit,'0')}" required readonly title="项目净利润上月结算总额"></td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="netProfit" value="${Utils.format(monthBean.netProfit,'0')}" required readonly title="项目净利润本月结算金额"></td>
-                                    <td><input type="number" name="netProfitSettleTotal" value="${Utils.format(currentBean.netProfit,'0')}" readonly title="项目净利润结算总额"></td>
-                                    <td><input name="netProfitProfitMargin" type="number" value="${Utils.format(currentBean.getNetProfitProfitMargin(),'0')}" readonly title="项目净利润利润率"></td>
+                                    <td>/<#--<input name="netProfitBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.getProjectContributionProfit(),'0')}" required readonly title="项目净利润预算总额">--></td>
+                                    <td><input name="netProfitFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.netProfit,'0')}" required readonly title="项目净利润上月结算总额"></td>
+                                    <td><input type="text" class="number" name="netProfit" value="${Utils.format(monthBean.netProfit,'0')}" required readonly title="项目净利润本月结算金额"></td>
+                                    <td><input type="text" class="number" name="netProfitSettleTotal" value="${Utils.format(currentBean.netProfit,'0')}" readonly title="项目净利润结算总额"></td>
+                                    <td><input name="netProfitProfitMargin" type="text" class="number" value="${Utils.format(currentBean.getNetProfitProfitMargin(),'0')}" readonly title="项目净利润利润率"></td>
                                 </tr>
                                 </tbody>
                             </table>
@@ -909,109 +909,109 @@
                                 </tr>
                                 <tr>
                                     <td>销售商品、提供劳务收到的现金</td>
-                                    <td><input name="saleIncomeCashBudget" type="number" value="${Utils.format(monthBean.budgetSaleIncomeCash,'0')}" readonly required title="预算总额"></td>
-                                    <td><input name="saleIncomeCashFormerSettle" type="number" value="${Utils.format(formerBean.saleIncomeCash,'0')}" required readonly title="上月结算总额"></td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="saleIncomeCash" value="${Utils.format(monthBean.saleIncomeCash,'0')}" required readonly title="本月结算金额"></td>
-                                    <td><input name="saleIncomeCashSettle" type="number" value="${Utils.format(currentBean.saleIncomeCash,'0')}" readonly title="结算总额"></td>
+                                    <td><input name="saleIncomeCashBudget" type="text" class="number" value="${Utils.format(monthBean.budgetSaleIncomeCash,'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 type="text" class="number" name="saleIncomeCash" value="${Utils.format(monthBean.saleIncomeCash,'0')}" required readonly title="本月结算金额"></td>
+                                    <td><input name="saleIncomeCashSettle" type="text" class="number" value="${Utils.format(currentBean.saleIncomeCash,'0')}" readonly title="结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>收到的税费返还</td>
                                     <td>/</td>
-                                    <td><input name="taxReturnFormerSettle" type="number" value="${Utils.format(formerBean.taxReturn,'0')}" required readonly title="上月结算总额"></td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="taxReturn" value="${Utils.format(monthBean.taxReturn,'0')}" required readonly title="本月结算金额"></td>
-                                    <td><input name="taxReturnSettle" type="number" value="${Utils.format(currentBean.taxReturn,'0')}" readonly title="结算总额"></td>
+                                    <td><input name="taxReturnFormerSettle" type="text" class="number" value="${Utils.format(formerBean.taxReturn,'0')}" required readonly title="上月结算总额"></td>
+                                    <td><input type="text" class="number" name="taxReturn" value="${Utils.format(monthBean.taxReturn,'0')}" required readonly title="本月结算金额"></td>
+                                    <td><input name="taxReturnSettle" type="text" class="number" value="${Utils.format(currentBean.taxReturn,'0')}" readonly title="结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>收到其他与经营活动有关的现金</td>
-                                    <td><input name="earnestMoneyIncomeBudget" type="number" value="${Utils.format(monthBean.budgetEarnestMoneyIncome,'0')}" readonly required title="预算总额"></td>
-                                    <td><input name="earnestMoneyIncomeFormerSettle" type="number" value="${Utils.format(formerBean.earnestMoneyIncome,'0')}" required readonly title="上月结算总额"></td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="earnestMoneyIncome" value="${Utils.format(monthBean.earnestMoneyIncome,'0')}" readonly required title="本月结算金额"></td>
-                                    <td><input name="earnestMoneyIncomeSettle" type="number" value="${Utils.format(currentBean.earnestMoneyIncome,'0')}" readonly title="结算总额"></td>
+                                    <td><input name="earnestMoneyIncomeBudget" type="text" class="number" value="${Utils.format(monthBean.budgetEarnestMoneyIncome,'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 type="text" class="number" name="earnestMoneyIncome" value="${Utils.format(monthBean.earnestMoneyIncome,'0')}" readonly required title="本月结算金额"></td>
+                                    <td><input name="earnestMoneyIncomeSettle" type="text" class="number" value="${Utils.format(currentBean.earnestMoneyIncome,'0')}" readonly title="结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>购买商品、接受劳务支付的现金</td>
-                                    <td><input name="purchaseCostBudget" type="number" value="${Utils.format(monthBean.budgetPurchaseCost,'0')}" readonly required title="预算总额"></td>
-                                    <td><input name="purchaseCostFormerSettle" type="number" value="${Utils.format(formerBean.purchaseCost,'0')}" required readonly title="上月结算总额"></td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="purchaseCost" value="${Utils.format(monthBean.purchaseCost,'0')}" required readonly title="本月结算金额"></td>
-                                    <td><input name="purchaseCostSettle" type="number" value="${Utils.format(currentBean.purchaseCost,'0')}" readonly title="结算总额"></td>
+                                    <td><input name="purchaseCostBudget" type="text" class="number" value="${Utils.format(monthBean.budgetPurchaseCost,'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 type="text" class="number" name="purchaseCost" value="${Utils.format(monthBean.purchaseCost,'0')}" required readonly title="本月结算金额"></td>
+                                    <td><input name="purchaseCostSettle" type="text" class="number" value="${Utils.format(currentBean.purchaseCost,'0')}" readonly title="结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>支付的各项税费</td>
                                     <td>/</td>
-                                    <td><input name="taxCostFormerSettle" type="number" value="${Utils.format(formerBean.taxCost,'0')}" required readonly title="上月结算总额"></td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="taxCost" value="${Utils.format(monthBean.taxCost,'0')}" required readonly title="本月结算金额"></td>
-                                    <td><input name="taxCostSettle" type="number" value="${Utils.format(currentBean.taxCost,'0')}" readonly title="结算总额"></td>
+                                    <td><input name="taxCostFormerSettle" type="text" class="number" value="${Utils.format(formerBean.taxCost,'0')}" required readonly title="上月结算总额"></td>
+                                    <td><input type="text" class="number" name="taxCost" value="${Utils.format(monthBean.taxCost,'0')}" required readonly title="本月结算金额"></td>
+                                    <td><input name="taxCostSettle" type="text" class="number" value="${Utils.format(currentBean.taxCost,'0')}" readonly title="结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>支付其他与经营活动有关的现金</td>
-                                    <td><input name="earnestMoneyCostBudget" type="number" value="${Utils.format(monthBean.budgetEarnestMoneyCost,'0')}" readonly required title="预算总额"></td>
-                                    <td><input name="earnestMoneyCostFormerSettle" type="number" value="${Utils.format(formerBean.earnestMoneyCost,'0')}" required readonly title="上月结算总额"></td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="earnestMoneyCost" value="${Utils.format(monthBean.earnestMoneyCost,'0')}" readonly required title="本月结算金额"></td>
-                                    <td><input name="earnestMoneyCostSettle" type="number" value="${Utils.format(currentBean.earnestMoneyCost,'0')}" readonly title="结算总额"></td>
+                                    <td><input name="earnestMoneyCostBudget" type="text" class="number" value="${Utils.format(monthBean.budgetEarnestMoneyCost,'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 type="text" class="number" name="earnestMoneyCost" value="${Utils.format(monthBean.earnestMoneyCost,'0')}" readonly required title="本月结算金额"></td>
+                                    <td><input name="earnestMoneyCostSettle" type="text" class="number" value="${Utils.format(currentBean.earnestMoneyCost,'0')}" readonly title="结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>经营活动产生的现金流量净额</td>
-                                    <td><input name="netCashFlowBudget" type="number" value="${Utils.format(monthBean.budgetNetCashFlow,'0')}" readonly required title="预算总额"></td>
-                                    <td><input name="netCashFlowFormerSettle" type="number" value="${Utils.format(formerBean.netCashFlow,'0')}" required readonly title="上月结算总额"></td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="netCashFlow" value="${Utils.format(monthBean.netCashFlow,'0')}" required readonly title="本月结算金额"></td>
-                                    <td><input name="netCashFlowSettle" type="number" value="${Utils.format(currentBean.netCashFlow,'0')}" readonly title="结算总额"></td>
+                                    <td><input name="netCashFlowBudget" type="text" class="number" value="${Utils.format(monthBean.budgetNetCashFlow,'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 type="text" class="number" name="netCashFlow" value="${Utils.format(monthBean.netCashFlow,'0')}" required readonly title="本月结算金额"></td>
+                                    <td><input name="netCashFlowSettle" type="text" class="number" value="${Utils.format(currentBean.netCashFlow,'0')}" readonly title="结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>投资活动现金流入</td>
                                     <td>/</td>
-                                    <td><input name="cashInflowFromInvestingActivitiesFormerSettle" type="number" value="${Utils.format(formerBean.cashInflowFromInvestingActivities,'0')}" required readonly title="上月结算总额"></td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="cashInflowFromInvestingActivities" value="${Utils.format(monthBean.cashInflowFromInvestingActivities,'0')}" required readonly title="本月结算金额"></td>
-                                    <td><input name="cashInflowFromInvestingActivitiesSettle" value="${Utils.format(currentBean.cashInflowFromInvestingActivities,'0')}" type="number" readonly title="结算总额"></td>
+                                    <td><input name="cashInflowFromInvestingActivitiesFormerSettle" type="text" class="number" value="${Utils.format(formerBean.cashInflowFromInvestingActivities,'0')}" required readonly title="上月结算总额"></td>
+                                    <td><input type="text" class="number" name="cashInflowFromInvestingActivities" value="${Utils.format(monthBean.cashInflowFromInvestingActivities,'0')}" required readonly title="本月结算金额"></td>
+                                    <td><input name="cashInflowFromInvestingActivitiesSettle" value="${Utils.format(currentBean.cashInflowFromInvestingActivities,'0')}" type="text" class="number" readonly title="结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>投资活动现金流出</td>
                                     <td>/</td>
-                                    <td><input name="cashOutflowFromInvestingActivitiesFormerSettle" type="number" value="${Utils.format(formerBean.cashOutflowFromInvestingActivities,'0')}" required readonly title="上月结算总额"></td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="cashOutflowFromInvestingActivities" value="${Utils.format(monthBean.cashOutflowFromInvestingActivities,'0')}" required readonly title="本月结算金额"></td>
-                                    <td><input name="cashOutflowFromInvestingActivitiesSettle" value="${Utils.format(currentBean.cashOutflowFromInvestingActivities,'0')}" type="number" readonly title="结算总额"></td>
+                                    <td><input name="cashOutflowFromInvestingActivitiesFormerSettle" type="text" class="number" value="${Utils.format(formerBean.cashOutflowFromInvestingActivities,'0')}" required readonly title="上月结算总额"></td>
+                                    <td><input type="text" class="number" name="cashOutflowFromInvestingActivities" value="${Utils.format(monthBean.cashOutflowFromInvestingActivities,'0')}" required readonly title="本月结算金额"></td>
+                                    <td><input name="cashOutflowFromInvestingActivitiesSettle" value="${Utils.format(currentBean.cashOutflowFromInvestingActivities,'0')}" type="text" class="number" readonly title="结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>投资活动产生的现金流量净额</td>
                                     <td>/</td>
-                                    <td><input name="netCashFromInvestingActivitiesFormerSettle" type="number" value="${Utils.format(formerBean.netCashFromInvestingActivities,'0')}" required readonly title="上月结算总额"></td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="netCashFromInvestingActivities" value="${Utils.format(monthBean.netCashFromInvestingActivities,'0')}" readonly required title="本月结算金额"></td>
-                                    <td><input name="netCashFromInvestingActivitiesSettle" type="number" value="${Utils.format(currentBean.netCashFromInvestingActivities,'0')}" readonly title="结算总额"></td>
+                                    <td><input name="netCashFromInvestingActivitiesFormerSettle" type="text" class="number" value="${Utils.format(formerBean.netCashFromInvestingActivities,'0')}" required readonly title="上月结算总额"></td>
+                                    <td><input type="text" class="number" name="netCashFromInvestingActivities" value="${Utils.format(monthBean.netCashFromInvestingActivities,'0')}" readonly required title="本月结算金额"></td>
+                                    <td><input name="netCashFromInvestingActivitiesSettle" type="text" class="number" value="${Utils.format(currentBean.netCashFromInvestingActivities,'0')}" readonly title="结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>融资资金流入</td>
-                                    <td><input name="financingCapitalInflowBudget" type="number" value="${Utils.format(monthBean.budgetFinancingCapitalInflow,'0')}" readonly required title="预算总额"></td>
-                                    <td><input name="financingCapitalInflowFormerSettle" type="number" value="${Utils.format(formerBean.financingCapitalInflow,'0')}" required readonly title="上月结算总额"></td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="financingCapitalInflow" value="${Utils.format(monthBean.financingCapitalInflow,'0')}" required readonly title="本月结算金额"></td>
-                                    <td><input name="financingCapitalInflowSettle" type="number" value="${Utils.format(currentBean.financingCapitalInflow,'0')}" readonly title="结算总额"></td>
+                                    <td><input name="financingCapitalInflowBudget" type="text" class="number" value="${Utils.format(monthBean.budgetFinancingCapitalInflow,'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 type="text" class="number" name="financingCapitalInflow" value="${Utils.format(monthBean.financingCapitalInflow,'0')}" required readonly title="本月结算金额"></td>
+                                    <td><input name="financingCapitalInflowSettle" type="text" class="number" value="${Utils.format(currentBean.financingCapitalInflow,'0')}" readonly title="结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>还款资金流出</td>
-                                    <td><input name="financingCapitalOutflowBudget" type="number" value="${Utils.format(monthBean.budgetFinancingCapitalOutflow,'0')}" readonly required title="预算总额"></td>
-                                    <td><input name="financingCapitalOutflowFormerSettle" type="number" value="${Utils.format(formerBean.financingCapitalOutflow,'0')}" required readonly title="上月结算总额"></td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="financingCapitalOutflow" value="${Utils.format(monthBean.financingCapitalOutflow,'0')}" required readonly title="本月结算金额"></td>
-                                    <td><input name="financingCapitalOutflowSettle" type="number" value="${Utils.format(currentBean.financingCapitalOutflow,'0')}" readonly title="结算总额"></td>
+                                    <td><input name="financingCapitalOutflowBudget" type="text" class="number" value="${Utils.format(monthBean.budgetFinancingCapitalOutflow,'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 type="text" class="number" name="financingCapitalOutflow" value="${Utils.format(monthBean.financingCapitalOutflow,'0')}" required readonly title="本月结算金额"></td>
+                                    <td><input name="financingCapitalOutflowSettle" type="text" class="number" value="${Utils.format(currentBean.financingCapitalOutflow,'0')}" readonly title="结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>筹资活动产生的现金流量净额</td>
-                                    <td><input name="financingCapitalCashflowBudget" type="number" value="${Utils.format(monthBean.budgetFinancingCapitalCashflow,'0')}" readonly required title="预算总额"></td>
-                                    <td><input name="financingCapitalCashflowFormerSettle" type="number" value="${Utils.format(formerBean.financingCapitalCashflow,'0')}" required readonly title="上月结算总额"></td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="financingCapitalCashflow" value="${Utils.format(monthBean.financingCapitalCashflow,'0')}" required readonly title="本月结算金额"></td>
-                                    <td><input name="financingCapitalCashflowSettle" type="number" value="${Utils.format(currentBean.financingCapitalCashflow,'0')}" readonly title="结算总额"></td>
+                                    <td><input name="financingCapitalCashflowBudget" type="text" class="number" value="${Utils.format(monthBean.budgetFinancingCapitalCashflow,'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 type="text" class="number" name="financingCapitalCashflow" value="${Utils.format(monthBean.financingCapitalCashflow,'0')}" required readonly title="本月结算金额"></td>
+                                    <td><input name="financingCapitalCashflowSettle" type="text" class="number" value="${Utils.format(currentBean.financingCapitalCashflow,'0')}" readonly title="结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>货币资金净增加额</td>
-                                    <td><input name="netIncreaseMonetaryFundsBudget" type="number" value="${Utils.format(monthBean.budgetNetIncreaseMonetaryFunds,'0')}" readonly required title="预算总额"></td>
-                                    <td><input name="netIncreaseMonetaryFundsFormerSettle" type="number" value="${Utils.format(formerBean.netIncreaseMonetaryFunds,'0')}" required readonly title="上月结算总额"></td>
-                                    <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="netIncreaseMonetaryFunds" value="${Utils.format(monthBean.netIncreaseMonetaryFunds,'0')}" required readonly title="本月结算金额"></td>
-                                    <td><input name="netIncreaseMonetaryFundsSettle" type="number" value="${Utils.format(currentBean.netIncreaseMonetaryFunds,'0')}" readonly title="结算总额"></td>
+                                    <td><input name="netIncreaseMonetaryFundsBudget" type="text" class="number" value="${Utils.format(monthBean.budgetNetIncreaseMonetaryFunds,'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 type="text" class="number" name="netIncreaseMonetaryFunds" value="${Utils.format(monthBean.netIncreaseMonetaryFunds,'0')}" required readonly title="本月结算金额"></td>
+                                    <td><input name="netIncreaseMonetaryFundsSettle" type="text" class="number" value="${Utils.format(currentBean.netIncreaseMonetaryFunds,'0')}" readonly title="结算总额"></td>
                                 </tr>
                                 <#--<tr>
                                     <td>合计</td>
-                                    <td><input name="cashFlowBudgetTotal" type="number" value="${Utils.format(cashFlowBean.saleIncomeCash + cashFlowBean.earnestMoneyIncome + cashFlowBean.purchaseCost + cashFlowBean.earnestMoneyCost + cashFlowBean.getNetCashFlow() +
+                                    <td><input name="cashFlowBudgetTotal" type="text" class="number" value="${Utils.format(cashFlowBean.saleIncomeCash + cashFlowBean.earnestMoneyIncome + cashFlowBean.purchaseCost + cashFlowBean.earnestMoneyCost + cashFlowBean.getNetCashFlow() +
                                         cashFlowBean.financingCapitalInflow + cashFlowBean.financingCapitalOutflow + cashFlowBean.getFinancingCapitalCashflow() + cashFlowBean.getNetIncreaseMonetaryFunds(),'0')}" readonly required title="此列累计"></td>
-                                    <td><input name="cashFlowFormerSettleTotal" type="number" value="${Utils.format(formerBean.getCashFlowTotal(),'0')}" readonly required title="此列累计"></td>
-                                    <td><input name="cashFlowTotal" type="number" value="${Utils.format(monthBean.getCashFlowTotal(),'0')}" readonly required title="此列累计"></td>
-                                    <td><input name="cashFlowSettleTotal" type="number" value="${Utils.format(currentBean.getCashFlowTotal(),'0')}" readonly required title="此列累计"></td>
+                                    <td><input name="cashFlowFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.getCashFlowTotal(),'0')}" readonly required title="此列累计"></td>
+                                    <td><input name="cashFlowTotal" type="text" class="number" value="${Utils.format(monthBean.getCashFlowTotal(),'0')}" readonly required title="此列累计"></td>
+                                    <td><input name="cashFlowSettleTotal" type="text" class="number" value="${Utils.format(currentBean.getCashFlowTotal(),'0')}" readonly required title="此列累计"></td>
                                 </tr>-->
                                 </tbody>
                             </table>
@@ -1046,34 +1046,34 @@
                                 <tr>
                                     <td>收入</td>
                                     <td>设备类</td>
-                                    <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(currentBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类结算总额"></td>
-                                    <td><input name="incomeDeviceFinalTotal" type="number" value="${Utils.format(finalBean.incomeDeviceFinalTotal,'0')}" required readonly title="设备类决算总额"></td>
+                                    <td><input name="incomeDeviceTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类概算总额"></td>
+                                    <td><input name="incomeDeviceTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类预算总额"></td>
+                                    <td><input type="text" class="number" value="${Utils.format(currentBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类结算总额"></td>
+                                    <td><input name="incomeDeviceFinalTotal" type="text" class="number" value="${Utils.format(finalBean.incomeDeviceFinalTotal,'0')}" required readonly title="设备类决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>收入</td>
                                     <td>工程类</td>
-                                    <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(currentBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类结算总额"></td>
-                                    <td><input name="incomeEngineerFinalTotal" type="number" value="${Utils.format(finalBean.incomeEngineerFinalTotal,'0')}" required readonly title="工程类决算总额"></td>
+                                    <td><input name="incomeEngineerTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类概算总额"></td>
+                                    <td><input name="incomeEngineerTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类预算总额"></td>
+                                    <td><input type="text" class="number" value="${Utils.format(currentBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类结算总额"></td>
+                                    <td><input name="incomeEngineerFinalTotal" type="text" class="number" value="${Utils.format(finalBean.incomeEngineerFinalTotal,'0')}" required readonly title="工程类决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>收入</td>
                                     <td>服务类</td>
-                                    <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(currentBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类结算总额"></td>
-                                    <td><input name="incomeServiceFinalTotal" type="number" value="${Utils.format(finalBean.incomeServiceFinalTotal,'0')}" required readonly title="服务类决算总额"></td>
+                                    <td><input name="incomeServiceTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类概算总额"></td>
+                                    <td><input name="incomeServiceTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类预算总额"></td>
+                                    <td><input type="text" class="number" value="${Utils.format(currentBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类结算总额"></td>
+                                    <td><input name="incomeServiceFinalTotal" type="text" class="number" value="${Utils.format(finalBean.incomeServiceFinalTotal,'0')}" required readonly title="服务类决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>合计</td>
                                     <td></td>
-                                    <td><input name="estimateIncomeTotalTaxExclude" type="number" value="${Utils.format(estimateBean.getIncomeTotalTaxExclude(),'0')}" readonly required title="此列累计"></td>
-                                    <td><input name="budgetIncomeTotalTaxExclude" type="number"  value="${Utils.format(budgetBean.getIncomeTotalTaxExclude(),'0')}" readonly required title="此列累计"></td>
-                                    <td><input type="number" value="${Utils.format(currentBean.getIncomeTotalTaxExclude(),'0')}" readonly required title="此列累计"></td>
-                                    <td><input name="incomeFinalTotal" type="number" value="${Utils.format(finalBean.getIncomeTotal(),'0')}" readonly required title="此列累计"></td>
+                                    <td><input name="estimateIncomeTotalTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.getIncomeTotalTaxExclude(),'0')}" readonly required title="此列累计"></td>
+                                    <td><input name="budgetIncomeTotalTaxExclude" type="text" class="number"  value="${Utils.format(budgetBean.getIncomeTotalTaxExclude(),'0')}" readonly required title="此列累计"></td>
+                                    <td><input type="text" class="number" value="${Utils.format(currentBean.getIncomeTotalTaxExclude(),'0')}" readonly required title="此列累计"></td>
+                                    <td><input name="incomeFinalTotal" type="text" class="number" value="${Utils.format(finalBean.getIncomeTotal(),'0')}" readonly required title="此列累计"></td>
                                 </tr>
                                 </tbody>
                             </table>
@@ -1093,64 +1093,64 @@
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>设备</td>
-                                    <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(currentBean.costPurchaseDeviceTaxExclude,'0')}" readonly required title="购买设备结算总额"></td>
-                                    <td><input name="costPurchaseDeviceFinalTotal" type="number" value="${Utils.format(finalBean.costPurchaseDeviceFinalTotal,'0')}" readonly required title="购买设备决算总额"></td>
+                                    <td><input name="costPurchaseDeviceTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseDeviceTaxExclude,'0')}" readonly required title="购买设备概算总额"></td>
+                                    <td><input name="costPurchaseDeviceTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseDeviceTaxExclude,'0')}" readonly required title="购买设备预算总额"></td>
+                                    <td><input  type="text" class="number" value="${Utils.format(currentBean.costPurchaseDeviceTaxExclude,'0')}" readonly required title="购买设备结算总额"></td>
+                                    <td><input name="costPurchaseDeviceFinalTotal" type="text" class="number" value="${Utils.format(finalBean.costPurchaseDeviceFinalTotal,'0')}" readonly required title="购买设备决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>施工</td>
-                                    <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(currentBean.costPurchaseBuildTaxExclude,'0')}" readonly required title="施工采购成本结算总额"></td>
-                                    <td><input name="costPurchaseBuildFinalTotal" type="number" value="${Utils.format(finalBean.costPurchaseBuildFinalTotal,'0')}" required readonly title="施工采购成本决算总额"></td>
+                                    <td><input name="costPurchaseBuildTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseBuildTaxExclude,'0')}" readonly required title="施工采购成本概算总额"></td>
+                                    <td><input name="costPurchaseBuildTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseBuildTaxExclude,'0')}" readonly required title="施工采购成本预算总额"></td>
+                                    <td><input type="text" class="number" value="${Utils.format(currentBean.costPurchaseBuildTaxExclude,'0')}" readonly required title="施工采购成本结算总额"></td>
+                                    <td><input name="costPurchaseBuildFinalTotal" type="text" class="number" value="${Utils.format(finalBean.costPurchaseBuildFinalTotal,'0')}" required readonly title="施工采购成本决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>服务</td>
-                                    <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(currentBean.costPurchaseServiceTaxExclude,'0')}" readonly required title="服务采购成本结算总额"></td>
-                                    <td><input name="costPurchaseServiceFinalTotal" type="number" value="${Utils.format(finalBean.costPurchaseServiceFinalTotal,'0')}" required readonly title="服务采购成本决算总额"></td>
+                                    <td><input name="costPurchaseServiceTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseServiceTaxExclude,'0')}" readonly required title="服务采购成本概算总额"></td>
+                                    <td><input name="costPurchaseServiceTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseServiceTaxExclude,'0')}" readonly required title="服务采购成本预算总额"></td>
+                                    <td><input type="text" class="number" value="${Utils.format(currentBean.costPurchaseServiceTaxExclude,'0')}" readonly required title="服务采购成本结算总额"></td>
+                                    <td><input name="costPurchaseServiceFinalTotal" type="text" class="number" value="${Utils.format(finalBean.costPurchaseServiceFinalTotal,'0')}" required readonly title="服务采购成本决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>其他</td>
-                                    <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(currentBean.costPurchaseOtherTaxExclude,'0')}" type="number" readonly required title="其他采购成本结算总额"></td>
-                                    <td><input name="costPurchaseOtherFinalTotal" type="number" value="${Utils.format(finalBean.costPurchaseOtherFinalTotal,'0')}" required readonly title="其他采购成本决算总额"></td>
+                                    <td><input name="costPurchaseOtherTaxInclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseOtherTaxInclude,'0')}" readonly required title="其他采购成本概算总额"></td>
+                                    <td><input name="costPurchaseOtherTaxInclude" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseOtherTaxInclude,'0')}" readonly required title="其他采购成本预算总额"></td>
+                                    <td><input name="costPurchaseOtherSettleTotal" value="${Utils.format(currentBean.costPurchaseOtherTaxExclude,'0')}" type="text" class="number" readonly required title="其他采购成本结算总额"></td>
+                                    <td><input name="costPurchaseOtherFinalTotal" type="text" class="number" value="${Utils.format(finalBean.costPurchaseOtherFinalTotal,'0')}" required readonly title="其他采购成本决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
                                     <td>项目管理成本</td>
                                     <td>项目管理成本</td>
-                                    <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(currentBean.costProjectManageTaxExclude,'0')}" type="number" readonly required title="项目管理成本结算总额"></td>
-                                    <td><input name="costProjectManageFinalTotal" type="number" value="${Utils.format(finalBean.costProjectManageFinalTotal,'0')}" required readonly title="项目管理成本决算总额"></td>
+                                    <td><input name="costProjectManageTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costProjectManageTaxExclude,'0')}" readonly required title="项目管理成本概算总额"></td>
+                                    <td><input name="costProjectManageTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0')}" readonly required title="项目管理成本预算总额"></td>
+                                    <td><input name="costProjectManageSettleTotal" value="${Utils.format(currentBean.costProjectManageTaxExclude,'0')}" type="text" class="number" readonly required title="项目管理成本结算总额"></td>
+                                    <td><input name="costProjectManageFinalTotal" type="text" class="number" value="${Utils.format(finalBean.costProjectManageFinalTotal,'0')}" required readonly title="项目管理成本决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
                                     <td>其他</td>
                                     <td>${project.otherName!}</td>
-                                    <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(currentBean.costOtherOtherTaxExclude,'0')}" type="number" type="number"readonly required title="其他成本结算总额"></td>
-                                    <td><input name="costOtherFinalTotal" type="number" value="${Utils.format(finalBean.costOtherFinalTotal,'0')}" required readonly title="其他成本决算总额"></td>
+                                    <td><input name="costOtherOtherTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本概算总额"></td>
+                                    <td><input name="costOtherOtherTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本预算总额"></td>
+                                    <td><input name="costOtherSettleTotal" value="${Utils.format(currentBean.costOtherOtherTaxExclude,'0')}" type="text" class="number" type="text" class="number"readonly required title="其他成本结算总额"></td>
+                                    <td><input name="costOtherFinalTotal" type="text" class="number" value="${Utils.format(finalBean.costOtherFinalTotal,'0')}" required readonly title="其他成本决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>合计</td>
                                     <td></td>
                                     <td></td>
-                                    <td><input name="incomeTotalTaxExclude" value="${Utils.format(estimateBean.getCostTotalTaxExclude(),'0')}" type="number" readonly required title="此列累计"></td>
-                                    <td><input name="costTotalTaxExclude" value="${Utils.format(budgetBean.getCostTotalTaxExclude(),'0')}" type="number" readonly required title="此列累计"></td>
-                                    <td><input name="costSettleTotal" value="${Utils.format(currentBean.getCostTotalTaxExclude(),'0')}" type="number" readonly required title="此列累计"></td>
-                                    <td><input name="costFinalTotal" type="number" value="${Utils.format(finalBean.getCostTotal(),'0')}" readonly required title="此列累计"></td>
+                                    <td><input name="incomeTotalTaxExclude" value="${Utils.format(estimateBean.getCostTotalTaxExclude(),'0')}" type="text" class="number" readonly required title="此列累计"></td>
+                                    <td><input name="costTotalTaxExclude" value="${Utils.format(budgetBean.getCostTotalTaxExclude(),'0')}" type="text" class="number" readonly required title="此列累计"></td>
+                                    <td><input name="costSettleTotal" value="${Utils.format(currentBean.getCostTotalTaxExclude(),'0')}" type="text" class="number" readonly required title="此列累计"></td>
+                                    <td><input name="costFinalTotal" type="text" class="number" value="${Utils.format(finalBean.getCostTotal(),'0')}" readonly required title="此列累计"></td>
                                 </tr>
                                 </tbody>
                             </table>
@@ -1168,34 +1168,34 @@
                                 <tr>
                                     <td>财务费用</td>
                                     <td>资金占用成本</td>
-                                    <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(currentBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本结算总额"></td>
-                                    <td><input name="costExpropriationFinalTotal" type="number" value="${Utils.format(finalBean.costExpropriationFinalTotal,'0')}" required readonly title="资金占用成本决算总额"></td>
+                                    <td><input name="costExpropriationTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本概算总额"></td>
+                                    <td><input name="costExpropriationTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本预算总额"></td>
+                                    <td><input type="text" class="number"  value="${Utils.format(currentBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本结算总额"></td>
+                                    <td><input name="costExpropriationFinalTotal" type="text" class="number" value="${Utils.format(finalBean.costExpropriationFinalTotal,'0')}" required readonly title="资金占用成本决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>公司管理费用</td>
                                     <td></td>
-                                    <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(currentBean.costCompanyManageTaxExclude,'0')}" required readonly title="公司管理费用结算总额"></td>
-                                    <td><input name="costCompanyManageFinalTotal" type="number" value="${Utils.format(finalBean.costCompanyManageFinalTotal,'0')}" required readonly title="公司管理费用决算总额"></td>
+                                    <td><input name="costCompanyManageTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costCompanyManageTaxExclude,'0')}" required readonly title="公司管理费用概算总额"></td>
+                                    <td><input name="costCompanyManageTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costCompanyManageTaxExclude,'0')}" required readonly title="公司管理费用预算总额"></td>
+                                    <td><input type="text" class="number" value="${Utils.format(currentBean.costCompanyManageTaxExclude,'0')}" required readonly title="公司管理费用结算总额"></td>
+                                    <td><input name="costCompanyManageFinalTotal" type="text" class="number" value="${Utils.format(finalBean.costCompanyManageFinalTotal,'0')}" required readonly title="公司管理费用决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>所得税费用</td>
                                     <td></td>
                                     <td>/</td>
                                     <td>/</td>
-                                    <td><input name="costIncomeTaxSettleTotal" value="${Utils.format(currentBean.costIncomeTax,'0')}" type="number" required readonly title="所得税费用结算总额"></td>
-                                    <td><input name="costIncomeTaxFinalTotal" type="number" value="${Utils.format(finalBean.costIncomeTaxFinalTotal,'0')}" required readonly title="所得税费用决算总额"></td>
+                                    <td><input name="costIncomeTaxSettleTotal" value="${Utils.format(currentBean.costIncomeTax,'0')}" type="text" class="number" required readonly title="所得税费用结算总额"></td>
+                                    <td><input name="costIncomeTaxFinalTotal" type="text" class="number" value="${Utils.format(finalBean.costIncomeTaxFinalTotal,'0')}" required readonly title="所得税费用决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>合计</td>
                                     <td></td>
-                                    <td><input name="manageEstimateTotal" value="${Utils.format(estimateBean.getCostManageExclude(),'0')}" type="number" readonly required title="此列累计"></td>
-                                    <td><input name="manageBudgetTotal" value="${Utils.format(budgetBean.getCostManageExclude(),'0')}" type="number" readonly required title="此列累计"></td>
-                                    <td><input name="manageSettleTotal" value="${Utils.format(currentBean.getCostManageTotal(),'0')}" type="number" readonly required title="此列累计"></td>
-                                    <td><input name="manageFinalTotal" type="number" value="${Utils.format(finalBean.getCostManageTotal(),'0')}" readonly required title="此列累计"></td>
+                                    <td><input name="manageEstimateTotal" value="${Utils.format(estimateBean.getCostManageExclude(),'0')}" type="text" class="number" readonly required title="此列累计"></td>
+                                    <td><input name="manageBudgetTotal" value="${Utils.format(budgetBean.getCostManageExclude(),'0')}" type="text" class="number" readonly required title="此列累计"></td>
+                                    <td><input name="manageSettleTotal" value="${Utils.format(currentBean.getCostManageTotal(),'0')}" type="text" class="number" readonly required title="此列累计"></td>
+                                    <td><input name="manageFinalTotal" type="text" class="number" value="${Utils.format(finalBean.getCostManageTotal(),'0')}" readonly required title="此列累计"></td>
                                 </tr>
                                 </tbody>
                             </table>
@@ -1213,27 +1213,27 @@
                                 </tr>
                                 <tr>
                                     <td>项目毛利</td>
-                                    <td><input name="projectGrossProfit" type="number" value="${Utils.format(estimateBean.getProjectGrossProfit(),'0')}" readonly required title="项目毛利概算总额"></td>
-                                    <td><input name="projectGrossProfit" type="number" value="${Utils.format(budgetBean.getProjectGrossProfit(),'0')}" readonly required title="项目毛利预算总额"></td>
-                                    <td><input name="grossProfitSettleTotal" type="number" value="${Utils.format(finalBean.grossProfitSettleTotal,'0')}" readonly required title="项目毛利结算总额"></td>
-                                    <td><input name="grossProfitFinalTotal" type="number" value="${Utils.format(finalBean.grossProfitFinalTotal,'0')}" required readonly title="项目毛利决算总额"></td>
-                                    <td><input name="grossProfitProfitMargin" type="number" value="${Utils.format(finalBean.grossProfitProfitMargin,'0')}" required readonly title="项目毛利利润率"></td>
+                                    <td><input name="projectGrossProfit" type="text" class="number" value="${Utils.format(estimateBean.getProjectGrossProfit(),'0')}" readonly required title="项目毛利概算总额"></td>
+                                    <td><input name="projectGrossProfit" type="text" class="number" value="${Utils.format(budgetBean.getProjectGrossProfit(),'0')}" readonly required title="项目毛利预算总额"></td>
+                                    <td><input name="grossProfitSettleTotal" type="text" class="number" value="${Utils.format(finalBean.grossProfitSettleTotal,'0')}" readonly required title="项目毛利结算总额"></td>
+                                    <td><input name="grossProfitFinalTotal" type="text" class="number" value="${Utils.format(finalBean.grossProfitFinalTotal,'0')}" required readonly title="项目毛利决算总额"></td>
+                                    <td><input name="grossProfitProfitMargin" type="text" class="number" value="${Utils.format(finalBean.grossProfitProfitMargin,'0')}" required readonly title="项目毛利利润率"></td>
                                 </tr>
                                 <tr>
                                     <td>项目贡献利润</td>
-                                    <td><input name="projectContributionProfit" type="number" value="${Utils.format(estimateBean.getProjectContributionProfit(),'0')}" readonly required title="项目贡献利润概算总额"></td>
-                                    <td><input name="projectContributionProfit" type="number" value="${Utils.format(budgetBean.getProjectContributionProfit(),'0')}" readonly required title="项目贡献利润预算总额"></td>
-                                    <td><input name="contributionMarginSettleTotal" type="number" value="${Utils.format(currentBean.contributionProfit,'0')}" readonly required title="项目贡献利润结算总额"></td>
-                                    <td><input name="contributionMarginFinalTotal" type="number" value="${Utils.format(finalBean.contributionMarginFinalTotal,'0')}" required readonly title="项目贡献利润决算总额"></td>
-                                    <td><input name="contributionMarginProfitMargin" type="number" value="${Utils.format(finalBean.contributionMarginProfitMargin,'0')}" required readonly title="项目贡献利润利润率"></td>
+                                    <td><input name="projectContributionProfit" type="text" class="number" value="${Utils.format(estimateBean.getProjectContributionProfit(),'0')}" readonly required title="项目贡献利润概算总额"></td>
+                                    <td><input name="projectContributionProfit" type="text" class="number" value="${Utils.format(budgetBean.getProjectContributionProfit(),'0')}" readonly required title="项目贡献利润预算总额"></td>
+                                    <td><input name="contributionMarginSettleTotal" type="text" class="number" value="${Utils.format(currentBean.contributionProfit,'0')}" readonly required title="项目贡献利润结算总额"></td>
+                                    <td><input name="contributionMarginFinalTotal" type="text" class="number" value="${Utils.format(finalBean.contributionMarginFinalTotal,'0')}" required readonly title="项目贡献利润决算总额"></td>
+                                    <td><input name="contributionMarginProfitMargin" type="text" class="number" value="${Utils.format(finalBean.contributionMarginProfitMargin,'0')}" required readonly title="项目贡献利润利润率"></td>
                                 </tr>
                                 <tr>
                                     <td>项目净利润</td>
                                     <td>/</td>
-                                    <td><#--<input name="netMarginBudgetTotal" type="number" value="${Utils.format(finalBean.netMarginBudgetTotal,'0')}" readonly required title="项目净利润预算总额">-->/</td>
-                                    <td><input name="netMarginSettleTotal" type="number" value="${Utils.format(currentBean.netProfit,'0')}" readonly required title="项目净利润结算总额"></td>
-                                    <td><input name="netMarginFinalTotal" type="number" value="${Utils.format(finalBean.netMarginFinalTotal,'0')}" required readonly title="项目净利润决算总额"></td>
-                                    <td><input name="netMarginProfitMargin" type="number" value="${Utils.format(finalBean.netMarginProfitMargin,'0')}" required readonly title="项目净利润利润率"></td>
+                                    <td><#--<input name="netMarginBudgetTotal" type="text" class="number" value="${Utils.format(finalBean.netMarginBudgetTotal,'0')}" readonly required title="项目净利润预算总额">-->/</td>
+                                    <td><input name="netMarginSettleTotal" type="text" class="number" value="${Utils.format(currentBean.netProfit,'0')}" readonly required title="项目净利润结算总额"></td>
+                                    <td><input name="netMarginFinalTotal" type="text" class="number" value="${Utils.format(finalBean.netMarginFinalTotal,'0')}" required readonly title="项目净利润决算总额"></td>
+                                    <td><input name="netMarginProfitMargin" type="text" class="number" value="${Utils.format(finalBean.netMarginProfitMargin,'0')}" required readonly title="项目净利润利润率"></td>
                                 </tr>
                                 </tbody>
                             </table>
@@ -1249,93 +1249,93 @@
                                 </tr>
                                 <tr>
                                     <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(currentBean.saleIncomeCash,'0')}" readonly required title="结算总额"></td>
-                                    <td><input name="saleIncomeCash" type="number" value="${Utils.format(finalBean.saleIncomeCash,'0')}" readonly required title="决算总额"></td>
+                                    <td><input name="budgetSaleIncomeCash" type="text" class="number" value="${Utils.format(cashFlowBean.saleIncomeCash,'0')}" readonly required title="预算总额"></td>
+                                    <td><input type="text" class="number" value="${Utils.format(currentBean.saleIncomeCash,'0')}" readonly required title="结算总额"></td>
+                                    <td><input name="saleIncomeCash" type="text" class="number" value="${Utils.format(finalBean.saleIncomeCash,'0')}" readonly required title="决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>收到的税费返还</td>
                                     <td>/</td>
-                                    <td><input type="number" value="${Utils.format(currentBean.taxReturn,'0')}" readonly required title="结算总额"></td>
-                                    <td><input name="taxReturn" type="number" value="${Utils.format(finalBean.taxReturn,'0')}" readonly required title="决算总额"></td>
+                                    <td><input type="text" class="number" value="${Utils.format(currentBean.taxReturn,'0')}" readonly required title="结算总额"></td>
+                                    <td><input name="taxReturn" type="text" class="number" value="${Utils.format(finalBean.taxReturn,'0')}" readonly 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(currentBean.earnestMoneyIncome,'0')}" readonly required title="结算总额"></td>
-                                    <td><input name="earnestMoneyIncome" type="number" value="${Utils.format(finalBean.earnestMoneyIncome,'0')}" readonly required title="决算总额"></td>
+                                    <td><input name="budgetEarnestMoneyIncome" type="text" class="number" value="${Utils.format(cashFlowBean.earnestMoneyIncome,'0')}" readonly required title="预算总额"></td>
+                                    <td><input type="text" class="number" value="${Utils.format(currentBean.earnestMoneyIncome,'0')}" readonly required title="结算总额"></td>
+                                    <td><input name="earnestMoneyIncome" type="text" class="number" value="${Utils.format(finalBean.earnestMoneyIncome,'0')}" readonly 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(currentBean.purchaseCost,'0')}" readonly required title="结算总额"></td>
-                                    <td><input name="purchaseCost" type="number" value="${Utils.format(finalBean.purchaseCost,'0')}" readonly required title="决算总额"></td>
+                                    <td><input name="budgetPurchaseCost" type="text" class="number" value="${Utils.format(cashFlowBean.purchaseCost,'0')}" readonly required title="预算总额"></td>
+                                    <td><input type="text" class="number" value="${Utils.format(currentBean.purchaseCost,'0')}" readonly required title="结算总额"></td>
+                                    <td><input name="purchaseCost" type="text" class="number" value="${Utils.format(finalBean.purchaseCost,'0')}" readonly required title="决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>支付的各项税费</td>
                                     <td>/</td>
-                                    <td><input type="number" value="${Utils.format(currentBean.taxCost,'0')}" readonly required title="结算总额"></td>
-                                    <td><input name="taxCost" type="number" value="${Utils.format(finalBean.taxCost,'0')}" readonly required title="决算总额"></td>
+                                    <td><input type="text" class="number" value="${Utils.format(currentBean.taxCost,'0')}" readonly required title="结算总额"></td>
+                                    <td><input name="taxCost" type="text" class="number" value="${Utils.format(finalBean.taxCost,'0')}" readonly 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(currentBean.earnestMoneyCost,'0')}" readonly required title="结算总额"></td>
-                                    <td><input name="earnestMoneyCost" type="number" value="${Utils.format(finalBean.earnestMoneyCost,'0')}" readonly required title="决算总额"></td>
+                                    <td><input name="budgetEarnestMoneyCost" type="text" class="number" value="${Utils.format(cashFlowBean.earnestMoneyCost,'0')}" readonly required title="预算总额"></td>
+                                    <td><input type="text" class="number" value="${Utils.format(currentBean.earnestMoneyCost,'0')}" readonly required title="结算总额"></td>
+                                    <td><input name="earnestMoneyCost" type="text" class="number" value="${Utils.format(finalBean.earnestMoneyCost,'0')}" readonly required title="决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>经营活动产生的现金流量净额</td>
-                                    <td><input name="budgetNetCashFlow" type="number" value="${Utils.format(cashFlowBean.getNetCashFlow(),'0')}" readonly required title="预算总额"></td>
-                                    <td><input type="number" value="${Utils.format(currentBean.netCashFlow,'0')}" readonly required title="结算总额"></td>
-                                    <td><input name="netCashFlow" type="number" value="${Utils.format(finalBean.netCashFlow,'0')}" readonly required title="决算总额"></td>
+                                    <td><input name="budgetNetCashFlow" type="text" class="number" value="${Utils.format(cashFlowBean.getNetCashFlow(),'0')}" readonly required title="预算总额"></td>
+                                    <td><input type="text" class="number" value="${Utils.format(currentBean.netCashFlow,'0')}" readonly required title="结算总额"></td>
+                                    <td><input name="netCashFlow" type="text" class="number" value="${Utils.format(finalBean.netCashFlow,'0')}" readonly required title="决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>投资活动现金流入</td>
                                     <td>/</td>
-                                    <td><input type="number" value="${Utils.format(currentBean.cashInflowFromInvestingActivities,'0')}" readonly required title="结算总额"></td>
-                                    <td><input name="cashInflowFromInvestingActivities" value="${Utils.format(finalBean.cashInflowFromInvestingActivities,'0')}" type="number" readonly required title="决算总额"></td>
+                                    <td><input type="text" class="number" value="${Utils.format(currentBean.cashInflowFromInvestingActivities,'0')}" readonly required title="结算总额"></td>
+                                    <td><input name="cashInflowFromInvestingActivities" value="${Utils.format(finalBean.cashInflowFromInvestingActivities,'0')}" type="text" class="number" readonly required title="决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>投资活动现金流出</td>
                                     <td>/</td>
-                                    <td><input type="number" value="${Utils.format(currentBean.cashOutflowFromInvestingActivities,'0')}" readonly required title="结算总额"></td>
-                                    <td><input name="cashOutflowFromInvestingActivities" type="number" value="${Utils.format(finalBean.cashOutflowFromInvestingActivities,'0')}" readonly required title="决算总额"></td>
+                                    <td><input type="text" class="number" value="${Utils.format(currentBean.cashOutflowFromInvestingActivities,'0')}" readonly required title="结算总额"></td>
+                                    <td><input name="cashOutflowFromInvestingActivities" type="text" class="number" value="${Utils.format(finalBean.cashOutflowFromInvestingActivities,'0')}" readonly required title="决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>投资活动产生的现金流量净额</td>
                                     <td>/</td>
-                                    <td><input type="number" value="${Utils.format(currentBean.netCashFromInvestingActivities,'0')}" readonly required title="结算总额"></td>
-                                    <td><input name="netCashFromInvestingActivities" type="number" value="${Utils.format(finalBean.netCashFromInvestingActivities,'0')}" readonly required title="决算总额"></td>
+                                    <td><input type="text" class="number" value="${Utils.format(currentBean.netCashFromInvestingActivities,'0')}" readonly required title="结算总额"></td>
+                                    <td><input name="netCashFromInvestingActivities" type="text" class="number" value="${Utils.format(finalBean.netCashFromInvestingActivities,'0')}" readonly required title="决算总额"></td>
                                 </tr>
                                 <tr>
                                     <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(currentBean.financingCapitalInflow,'0')}" readonly required title="结算总额"></td>
-                                    <td><input name="financingCapitalInflow" type="number" value="${Utils.format(finalBean.financingCapitalInflow,'0')}" required readonly title="决算总额"></td>
+                                    <td><input name="budgetFinancingCapitalInflow" type="text" class="number" value="${Utils.format(cashFlowBean.financingCapitalInflow,'0')}" readonly required title="预算总额"></td>
+                                    <td><input type="text" class="number" value="${Utils.format(currentBean.financingCapitalInflow,'0')}" readonly required title="结算总额"></td>
+                                    <td><input name="financingCapitalInflow" type="text" class="number" value="${Utils.format(finalBean.financingCapitalInflow,'0')}" required readonly 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(currentBean.financingCapitalOutflow,'0')}" readonly required title="结算总额"></td>
-                                    <td><input name="financingCapitalOutflow" type="number" value="${Utils.format(finalBean.financingCapitalOutflow,'0')}" required readonly title="决算总额"></td>
+                                    <td><input name="budgetFinancingCapitalOutflow" type="text" class="number" value="${Utils.format(cashFlowBean.financingCapitalOutflow,'0')}" readonly required title="预算总额"></td>
+                                    <td><input type="text" class="number" value="${Utils.format(currentBean.financingCapitalOutflow,'0')}" readonly required title="结算总额"></td>
+                                    <td><input name="financingCapitalOutflow" type="text" class="number" value="${Utils.format(finalBean.financingCapitalOutflow,'0')}" required readonly title="决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>筹资活动产生的现金流量净额</td>
-                                    <td><input name="budgetFinancingCapitalCashflow" type="number" value="${Utils.format(cashFlowBean.getFinancingCapitalCashflow(),'0')}" readonly required title="预算总额"></td>
-                                    <td><input type="number" value="${Utils.format(currentBean.financingCapitalCashflow,'0')}" readonly required title="结算总额"></td>
-                                    <td><input name="financingCapitalCashflow" type="number" value="${Utils.format(finalBean.financingCapitalCashflow,'0')}" required readonly title="决算总额"></td>
+                                    <td><input name="budgetFinancingCapitalCashflow" type="text" class="number" value="${Utils.format(cashFlowBean.getFinancingCapitalCashflow(),'0')}" readonly required title="预算总额"></td>
+                                    <td><input type="text" class="number" value="${Utils.format(currentBean.financingCapitalCashflow,'0')}" readonly required title="结算总额"></td>
+                                    <td><input name="financingCapitalCashflow" type="text" class="number" value="${Utils.format(finalBean.financingCapitalCashflow,'0')}" required readonly title="决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>货币资金净增加额</td>
-                                    <td><input name="budgetNetIncreaseMonetaryFunds" type="number" value="${Utils.format(cashFlowBean.getNetIncreaseMonetaryFunds(),'0')}" readonly required title="预算总额"></td>
-                                    <td><input name="type14SettleTotal" type="number" value="${Utils.format(currentBean.netIncreaseMonetaryFunds,'0')}" readonly required title="结算总额"></td>
-                                    <td><input name="netIncreaseMonetaryFunds" type="number" value="${Utils.format(finalBean.netIncreaseMonetaryFunds,'0')}" required readonly title="决算总额"></td>
+                                    <td><input name="budgetNetIncreaseMonetaryFunds" type="text" class="number" value="${Utils.format(cashFlowBean.getNetIncreaseMonetaryFunds(),'0')}" readonly required title="预算总额"></td>
+                                    <td><input name="type14SettleTotal" type="text" class="number" value="${Utils.format(currentBean.netIncreaseMonetaryFunds,'0')}" readonly required title="结算总额"></td>
+                                    <td><input name="netIncreaseMonetaryFunds" type="text" class="number" value="${Utils.format(finalBean.netIncreaseMonetaryFunds,'0')}" required readonly title="决算总额"></td>
                                 </tr>
                                 <#--<tr>
                                     <td>合计</td>
-                                    <td><input name="cashFluxBudgetTotal" type="number" value="${Utils.format(cashFlowBean.getCashFluxTotal(),'0')}" readonly required title="此列累计"></td>
-                                    <td><input name="cashFluxSettleTotal" type="number" value="${Utils.format(currentBean.getCashFlowTotal(),'0')}" readonly required title="此列累计"></td>
-                                    <td><input name="cashFluxFinalTotal" type="number" value="${Utils.format(finalBean.getCashFluxTotal(),'0')}" readonly required title="此列累计"></td>
+                                    <td><input name="cashFluxBudgetTotal" type="text" class="number" value="${Utils.format(cashFlowBean.getCashFluxTotal(),'0')}" readonly required title="此列累计"></td>
+                                    <td><input name="cashFluxSettleTotal" type="text" class="number" value="${Utils.format(currentBean.getCashFlowTotal(),'0')}" readonly required title="此列累计"></td>
+                                    <td><input name="cashFluxFinalTotal" type="text" class="number" value="${Utils.format(finalBean.getCashFluxTotal(),'0')}" readonly required title="此列累计"></td>
                                 </tr>-->
                                 </tbody>
                             </table>
@@ -1424,13 +1424,13 @@
                                             <td><input type="text" readonly
                                                        class="am-modal-prompt-input am-modal-prompt-input-income"
                                                        value="${incomeDetail.unit!}"></td>
-                                            <td><input type="number" min="0" max="99999999" step="1" readonly
+                                            <td><input type="text" readonly
                                                        class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-amount"
                                                        value="${incomeDetail.amount!0}"></td>
-                                            <td><input type="number" min="0.00" max="99999999.99" step="0.01" readonly
+                                            <td><input type="text" readonly
                                                        class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-price"
                                                        value="${Utils.format(incomeDetail.price,'0')}"></td>
-                                            <td><input type="number" min="0.00" max="99.99" step="0.01" readonly
+                                            <td><input type="text" readonly
                                                        class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-tax-rate"
                                                        value="${Utils.format(incomeDetail.taxRate,'0')}"></td>
                                             <td><input type="text"
@@ -1519,13 +1519,13 @@
                                             <td><input type="text" readonly
                                                        class="am-modal-prompt-input am-modal-prompt-input-cost"
                                                        value="${costDetail.unit!}"></td>
-                                            <td><input type="number" min="0" max="99999999" step="1" readonly
+                                            <td><input type="text" readonly
                                                        class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-amount"
                                                        value="${costDetail.amount!0}"></td>
-                                            <td><input type="number" min="0.00" max="99999999.99" step="0.01" readonly
+                                            <td><input type="text" readonly
                                                        class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-price"
                                                        value="${Utils.format(costDetail.price,'0')}"></td>
-                                            <td><input type="number" min="0.00" max="99.99" step="0.01" readonly
+                                            <td><input type="text" min="0.00" max="99.99" step="0.01" readonly
                                                        class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-tax-rate"
                                                        value="${Utils.format(costDetail.taxRate,'0')}"></td>
                                             <td><input type="text"
@@ -1614,10 +1614,10 @@
                                             <td><input type="text" readonly
                                                        class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
                                                        value="${costProjectManageDetail.unit!}"></td>
-                                            <td><input type="number" min="0" max="99999999" step="1" readonly
+                                            <td><input type="text" readonly
                                                        class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-amount-project-manage"
                                                        value="${costProjectManageDetail.amount!0}"></td>
-                                            <td><input type="number" min="0.00" max="99999999.99" step="0.01" readonly
+                                            <td><input type="text" readonly
                                                        class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-price-project-manage"
                                                        value="${Utils.format(costProjectManageDetail.price,'0')}"></td>
                                             <td><input type="text"
@@ -1685,51 +1685,51 @@
                                 <tr>
                                     <td><#--<input type="text" class="am-modal-prompt-input input-total-month-budget-plan"
                                                value="${projectBudgetPlanDetailTotal.month}" readonly/>-->${projectBudgetPlanDetailTotal.month}</td>
-                                    <td><input type="number"
+                                    <td><input type="text"
                                                class="am-modal-prompt-input input-total-device-cost-budget-plan"
                                                value="${Utils.format(projectBudgetPlanDetailTotal.deviceCost)}"
                                                readonly/></td>
-                                    <td><input type="number"
+                                    <td><input type="text"
                                                class="am-modal-prompt-input input-total-engineer-cost-budget-plan"
                                                value="${Utils.format(projectBudgetPlanDetailTotal.engineerCost)}"
                                                readonly/></td>
-                                    <td><input type="number"
+                                    <td><input type="text"
                                                class="am-modal-prompt-input input-total-project-manage-cost-budget-plan"
                                                value="${Utils.format(projectBudgetPlanDetailTotal.projectManageCost)}"
                                                readonly/></td>
-                                    <td><input type="number"
+                                    <td><input type="text"
                                                class="am-modal-prompt-input input-total-earnest-money-cost-budget-plan"
                                                value="${Utils.format(projectBudgetPlanDetailTotal.earnestMoneyCost)}"
                                                readonly/></td>
-                                    <td><input type="number"
+                                    <td><input type="text"
                                                class="am-modal-prompt-input input-total-total-cost-budget-plan"
                                                value="${Utils.format(projectBudgetPlanDetailTotal.totalCost)}"
                                                readonly/></td>
-                                    <td><input type="number"
+                                    <td><input type="text"
                                                class="am-modal-prompt-input input-total-sale-income-budget-plan"
                                                value="${Utils.format(projectBudgetPlanDetailTotal.saleIncome)}"
                                                readonly/></td>
-                                    <td><input type="number"
+                                    <td><input type="text"
                                                class="am-modal-prompt-input input-total-earnest-money-income-budget-plan"
                                                value="${Utils.format(projectBudgetPlanDetailTotal.earnestMoneyIncome)}"
                                                readonly/></td>
-                                    <td><input type="number"
+                                    <td><input type="text"
                                                class="am-modal-prompt-input input-total-total-income-budget-plan"
                                                value="${Utils.format(projectBudgetPlanDetailTotal.totalIncome)}"
                                                readonly/></td>
-                                    <td><input type="number"
+                                    <td><input type="text"
                                                class="am-modal-prompt-input input-total-fund-balance-budget-plan"
                                                value="${Utils.format(projectBudgetPlanDetailTotal.fundBalance)}"
                                                readonly/></td>
-                                    <td><input type="number"
+                                    <td><input type="text"
                                                class="am-modal-prompt-input input-total-capital-interest-budget-plan"
                                                value="${Utils.format(projectBudgetPlanDetailTotal.capitalInterest)}"
                                                readonly/></td>
-                                    <td><input type="number"
+                                    <td><input type="text"
                                                class="am-modal-prompt-input input-total-underwritten-plan-budget-plan"
                                                value="${Utils.format(projectBudgetPlanDetailTotal.underwrittenPlan)}"
                                                readonly/></td>
-                                    <td><input type="number"
+                                    <td><input type="text"
                                                class="am-modal-prompt-input input-total-repayment-plan-budget-plan"
                                                value="${Utils.format(projectBudgetPlanDetailTotal.repaymentPlan)}"
                                                readonly/></td>
@@ -1742,49 +1742,49 @@
                                             <td><#--<input type="text" readonly
                                                        class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-month-budget-plan"
                                                        value="${projectBudgetPlanDetail.month!}">-->${projectBudgetPlanDetail.month!}</td>
-                                            <td><input type="number" min="0.00" max="99999999.99" step="0.01" readonly
+                                            <td><input type="text" readonly
                                                        class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-device-cost-budget-plan"
                                                        value="${Utils.format(projectBudgetPlanDetail.deviceCost)}"></td>
-                                            <td><input type="number" min="0.00" max="99999999.99" step="0.01" readonly
+                                            <td><input type="text" readonly
                                                        class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-engineer-cost-budget-plan"
                                                        value="${Utils.format(projectBudgetPlanDetail.engineerCost)}">
                                             </td>
-                                            <td><input type="number" min="0.00" max="99999999.99" step="0.01" readonly
+                                            <td><input type="text" readonly
                                                        class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-project-manage-cost-budget-plan"
                                                        value="${Utils.format(projectBudgetPlanDetail.projectManageCost)}">
                                             </td>
-                                            <td><input type="number" min="0.00" max="99999999.99" step="0.01" readonly
+                                            <td><input type="text" readonly
                                                        class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-earnest-money-cost-budget-plan"
                                                        value="${Utils.format(projectBudgetPlanDetail.earnestMoneyCost)}">
                                             </td>
-                                            <td><input type="number"
+                                            <td><input type="text"
                                                        class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-total-cost-budget-plan"
                                                        value="${Utils.format(projectBudgetPlanDetail.totalCost)}"
                                                        readonly></td>
-                                            <td><input type="number" min="0.00" max="99999999.99" step="0.01" readonly
+                                            <td><input type="text" readonly
                                                        class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-sale-income-budget-plan"
                                                        value="${Utils.format(projectBudgetPlanDetail.saleIncome)}"></td>
-                                            <td><input type="number" min="0.00" max="99999999.99" step="0.01" readonly
+                                            <td><input type="text" readonly
                                                        class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-earnest-money-income-budget-plan"
                                                        value="${Utils.format(projectBudgetPlanDetail.earnestMoneyIncome)}">
                                             </td>
-                                            <td><input type="number"
+                                            <td><input type="text"
                                                        class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-total-income-budget-plan"
                                                        value="${Utils.format(projectBudgetPlanDetail.totalIncome)}"
                                                        readonly></td>
-                                            <td><input type="number"
+                                            <td><input type="text"
                                                        class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-fund-balance-budget-plan"
                                                        value="${Utils.format(projectBudgetPlanDetail.fundBalance)}"
                                                        readonly></td>
-                                            <td><input type="number"
+                                            <td><input type="text"
                                                        class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-capital-interest-budget-plan"
                                                        value="${Utils.format(projectBudgetPlanDetail.capitalInterest)}"
                                                        readonly></td>
-                                            <td><input type="number"
+                                            <td><input type="text"
                                                        class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-underwritten-plan-budget-plan"
                                                        value="${Utils.format(projectBudgetPlanDetail.underwrittenPlan)}"
                                                        readonly></td>
-                                            <td><input type="number"
+                                            <td><input type="text"
                                                        class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-repayment-plan-budget-plan"
                                                        value="${Utils.format(projectBudgetPlanDetail.repaymentPlan)}"
                                                        readonly></td>
diff --git a/src/main/resources/templates/admin/project_final_add.ftl b/src/main/resources/templates/admin/project_final_add.ftl
index 8e38f46..92caaa4 100644
--- a/src/main/resources/templates/admin/project_final_add.ftl
+++ b/src/main/resources/templates/admin/project_final_add.ftl
@@ -48,34 +48,34 @@
                     <tr>
                         <td>收入</td>
                         <td>设备类</td>
-                        <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="999999999.99" step="0.01" required title="设备类决算总额"></td>
+                        <td><input name="incomeDeviceTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类概算总额"></td>
+                        <td><input name="incomeDeviceTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类预算总额"></td>
+                        <td><input type="text" class="number" value="${Utils.format(settleBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类结算总额"></td>
+                        <td><input name="incomeDeviceFinalTotal" type="text" class="number" maxlength="16" required title="设备类决算总额"></td>
                     </tr>
                     <tr>
                         <td>收入</td>
                         <td>工程类</td>
-                        <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="999999999.99" step="0.01"  required title="工程类决算总额"></td>
+                        <td><input name="incomeEngineerTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类概算总额"></td>
+                        <td><input name="incomeEngineerTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类预算总额"></td>
+                        <td><input type="text" class="number" value="${Utils.format(settleBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类结算总额"></td>
+                        <td><input name="incomeEngineerFinalTotal" type="text" class="number" maxlength="16"  required title="工程类决算总额"></td>
                     </tr>
                     <tr>
                         <td>收入</td>
                         <td>服务类</td>
-                        <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="999999999.99" step="0.01" required title="服务类决算总额"></td>
+                        <td><input name="incomeServiceTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类概算总额"></td>
+                        <td><input name="incomeServiceTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类预算总额"></td>
+                        <td><input type="text" class="number" value="${Utils.format(settleBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类结算总额"></td>
+                        <td><input name="incomeServiceFinalTotal" type="text" class="number" maxlength="16" required title="服务类决算总额"></td>
                     </tr>
                     <tr>
                         <td>合计</td>
                         <td></td>
-                        <td><input name="estimateIncomeTotalTaxExclude" type="number" value="${Utils.format(estimateBean.getIncomeTotalTaxExclude(),'0')}" readonly required title="此列累计"></td>
-                        <td><input name="budgetIncomeTotalTaxExclude" type="number"  value="${Utils.format(budgetBean.getIncomeTotalTaxExclude(),'0')}" readonly required title="此列累计"></td>
-                        <td><input type="number" value="${Utils.format(settleBean.getIncomeTotalTaxExclude(),'0')}" readonly required title="此列累计"></td>
-                        <td><input name="incomeFinalTotal" type="number" readonly required title="此列累计"></td>
+                        <td><input name="estimateIncomeTotalTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.getIncomeTotalTaxExclude(),'0')}" readonly required title="此列累计"></td>
+                        <td><input name="budgetIncomeTotalTaxExclude" type="text" class="number"  value="${Utils.format(budgetBean.getIncomeTotalTaxExclude(),'0')}" readonly required title="此列累计"></td>
+                        <td><input type="text" class="number" value="${Utils.format(settleBean.getIncomeTotalTaxExclude(),'0')}" readonly required title="此列累计"></td>
+                        <td><input name="incomeFinalTotal" type="text" class="number" readonly required title="此列累计"></td>
                     </tr>
                     </tbody>
                 </table>
@@ -95,65 +95,65 @@
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>设备</td>
-                        <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="999999999.99" step="0.01" required title="购买设备决算总额"></td>
+                        <td><input name="costPurchaseDeviceTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseDeviceTaxExclude,'0')}" readonly required title="购买设备概算总额"></td>
+                        <td><input name="costPurchaseDeviceTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseDeviceTaxExclude,'0')}" readonly required title="购买设备预算总额"></td>
+                        <td><input  type="text" class="number" value="${Utils.format(settleBean.costPurchaseDeviceTaxExclude,'0')}" readonly required title="购买设备结算总额"></td>
+                        <td><input name="costPurchaseDeviceFinalTotal" type="text" class="number" maxlength="16" required title="购买设备决算总额"></td>
                     </tr>
                     <tr>
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>施工</td>
-                        <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="999999999.99" step="0.01" required title="施工采购成本决算总额"></td>
+                        <td><input name="costPurchaseBuildTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseBuildTaxExclude,'0')}" readonly required title="施工采购成本概算总额"></td>
+                        <td><input name="costPurchaseBuildTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseBuildTaxExclude,'0')}" readonly required title="施工采购成本预算总额"></td>
+                        <td><input type="text" class="number" value="${Utils.format(settleBean.costPurchaseBuildTaxExclude,'0')}" readonly required title="施工采购成本结算总额"></td>
+                        <td><input name="costPurchaseBuildFinalTotal" type="text" class="number" maxlength="16" required title="施工采购成本决算总额"></td>
                     </tr>
                     <tr>
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>服务</td>
-                        <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="999999999.99" step="0.01" required title="服务采购成本决算总额"></td>
+                        <td><input name="costPurchaseServiceTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseServiceTaxExclude,'0')}" readonly required title="服务采购成本概算总额"></td>
+                        <td><input name="costPurchaseServiceTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseServiceTaxExclude,'0')}" readonly required title="服务采购成本预算总额"></td>
+                        <td><input type="text" class="number" value="${Utils.format(settleBean.costPurchaseServiceTaxExclude,'0')}" readonly required title="服务采购成本结算总额"></td>
+                        <td><input name="costPurchaseServiceFinalTotal" type="text" class="number" maxlength="16" required title="服务采购成本决算总额"></td>
                     </tr>
                     <tr>
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>其他</td>
-                        <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="999999999.99" step="0.01" required title="其他采购成本决算总额"></td>
+                        <td><input name="costPurchaseOtherTaxInclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseOtherTaxInclude,'0')}" readonly required title="其他采购成本概算总额"></td>
+                        <td><input name="costPurchaseOtherTaxInclude" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseOtherTaxInclude,'0')}" readonly required title="其他采购成本预算总额"></td>
+                        <td><input name="costPurchaseOtherSettleTotal" value="${Utils.format(settleBean.costPurchaseOtherTaxExclude,'0')}" type="text" class="number" readonly required title="其他采购成本结算总额"></td>
+                        <td><input name="costPurchaseOtherFinalTotal" type="text" class="number" maxlength="16" required title="其他采购成本决算总额"></td>
                     </tr>
                     <tr>
                         <td>成本</td>
                         <td>项目管理成本</td>
                         <td>项目管理成本</td>
-                        <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="999999999.99" step="0.01" required title="项目管理成本决算总额"></td>
+                        <td><input name="costProjectManageTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costProjectManageTaxExclude,'0')}" readonly required title="项目管理成本概算总额"></td>
+                        <td><input name="costProjectManageTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0')}" readonly required title="项目管理成本预算总额"></td>
+                        <td><input name="costProjectManageSettleTotal" value="${Utils.format(settleBean.costProjectManageTaxExclude,'0')}" type="text" class="number" readonly required title="项目管理成本结算总额"></td>
+                        <td><input name="costProjectManageFinalTotal" type="text" class="number" maxlength="16" required title="项目管理成本决算总额"></td>
                     </tr>
                     <tr>
                         <td>成本</td>
                         <td>其他</td>
                         <td><input type="text" id="otherName" maxlength="10" data-validate-async data-validation-message="请输入其他中的小类名称（10字符以内）"
                                    value="${project.otherName!}" name="otherName" placeholder="请输入其他中的小类名称（10字符以内）" readonly required/> </td>
-                        <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="999999999.99" step="0.01" required title="其他成本决算总额"></td>
+                        <td><input name="costOtherOtherTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本概算总额"></td>
+                        <td><input name="costOtherOtherTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本预算总额"></td>
+                        <td><input name="costOtherSettleTotal" value="${Utils.format(settleBean.costOtherOtherTaxExclude,'0')}" type="text" class="number" type="text" class="number"readonly required title="其他成本结算总额"></td>
+                        <td><input name="costOtherFinalTotal" type="text" class="number" maxlength="16" required title="其他成本决算总额"></td>
                     </tr>
                     <tr>
                         <td>合计</td>
                         <td></td>
                         <td></td>
-                        <td><input name="incomeTotalTaxExclude" value="${Utils.format(estimateBean.getCostTotalTaxExclude(),'0')}" type="number" readonly required title="此列累计"></td>
-                        <td><input name="costTotalTaxExclude" value="${Utils.format(budgetBean.getCostTotalTaxExclude(),'0')}" type="number" readonly required title="此列累计"></td>
-                        <td><input name="costSettleTotal" value="${Utils.format(settleBean.getCostTotalTaxExclude(),'0')}" type="number" readonly required title="此列累计"></td>
-                        <td><input name="costFinalTotal" type="number" readonly required title="此列累计"></td>
+                        <td><input name="incomeTotalTaxExclude" value="${Utils.format(estimateBean.getCostTotalTaxExclude(),'0')}" type="text" class="number" readonly required title="此列累计"></td>
+                        <td><input name="costTotalTaxExclude" value="${Utils.format(budgetBean.getCostTotalTaxExclude(),'0')}" type="text" class="number" readonly required title="此列累计"></td>
+                        <td><input name="costSettleTotal" value="${Utils.format(settleBean.getCostTotalTaxExclude(),'0')}" type="text" class="number" readonly required title="此列累计"></td>
+                        <td><input name="costFinalTotal" type="text" class="number" readonly required title="此列累计"></td>
                     </tr>
                     </tbody>
                 </table>
@@ -171,34 +171,34 @@
                     <tr>
                         <td>财务费用</td>
                         <td>资金占用成本</td>
-                        <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="999999999.99" step="0.01" required title="资金占用成本决算总额"></td>
+                        <td><input name="costExpropriationTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本概算总额"></td>
+                        <td><input name="costExpropriationTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本预算总额"></td>
+                        <td><input type="text" class="number"  value="${Utils.format(settleBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本结算总额"></td>
+                        <td><input name="costExpropriationFinalTotal" type="text" class="number" maxlength="16" required title="资金占用成本决算总额"></td>
                     </tr>
                     <tr>
                         <td>公司管理费用</td>
                         <td></td>
-                        <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="999999999.99" step="0.01" required title="公司管理费用决算总额"></td>
+                        <td><input name="costCompanyManageTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costCompanyManageTaxExclude,'0')}" required readonly title="公司管理费用概算总额"></td>
+                        <td><input name="costCompanyManageTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costCompanyManageTaxExclude,'0')}" required readonly title="公司管理费用预算总额"></td>
+                        <td><input type="text" class="number" value="${Utils.format(settleBean.costCompanyManageTaxExclude,'0')}" required readonly title="公司管理费用结算总额"></td>
+                        <td><input name="costCompanyManageFinalTotal" type="text" class="number" maxlength="16" required title="公司管理费用决算总额"></td>
                     </tr>
                     <tr>
                         <td>所得税费用</td>
                         <td></td>
                         <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="999999999.99" step="0.01" required title="所得税费用决算总额"></td>
+                        <td><input name="costIncomeTaxSettleTotal" value="${Utils.format(settleBean.costIncomeTax,'0')}" type="text" class="number" required readonly title="所得税费用结算总额"></td>
+                        <td><input name="costIncomeTaxFinalTotal" type="text" class="number" maxlength="16" required title="所得税费用决算总额"></td>
                     </tr>
                     <tr>
                         <td>合计</td>
                         <td></td>
-                        <td><input name="manageEstimateTotal" value="${Utils.format(estimateBean.getCostManageExclude(),'0')}" type="number" readonly required title="此列累计"></td>
-                        <td><input name="manageBudgetTotal" value="${Utils.format(budgetBean.getCostManageExclude(),'0')}" type="number" readonly required title="此列累计"></td>
-                        <td><input name="manageSettleTotal" value="${Utils.format(settleBean.getCostManageTotal(),'0')}" type="number" readonly required title="此列累计"></td>
-                        <td><input name="manageFinalTotal" type="number" readonly required title="此列累计"></td>
+                        <td><input name="manageEstimateTotal" value="${Utils.format(estimateBean.getCostManageExclude(),'0')}" type="text" class="number" readonly required title="此列累计"></td>
+                        <td><input name="manageBudgetTotal" value="${Utils.format(budgetBean.getCostManageExclude(),'0')}" type="text" class="number" readonly required title="此列累计"></td>
+                        <td><input name="manageSettleTotal" value="${Utils.format(settleBean.getCostManageTotal(),'0')}" type="text" class="number" readonly required title="此列累计"></td>
+                        <td><input name="manageFinalTotal" type="text" class="number" readonly required title="此列累计"></td>
                     </tr>
                     </tbody>
                 </table>
@@ -216,27 +216,27 @@
                     </tr>
                     <tr>
                         <td>项目毛利</td>
-                        <td><input name="projectGrossProfit" type="number" value="${Utils.format(estimateBean.getProjectGrossProfit(),'0')}" readonly required title="项目毛利概算总额"></td>
-                        <td><input name="projectGrossProfit" type="number" value="${Utils.format(budgetBean.getProjectGrossProfit(),'0')}" readonly required title="项目毛利预算总额"></td>
-                        <td><input name="grossProfitSettleTotal" type="number" value="${Utils.format(settleBean.grossProfit,'0')}" readonly required title="项目毛利结算总额"></td>
-                        <td><input name="grossProfitFinalTotal" required readonly type="number" title="项目毛利决算总额"></td>
-                        <td><input name="grossProfitProfitMargin" type="number" required readonly title="项目毛利利润率"></td>
+                        <td><input name="projectGrossProfit" type="text" class="number" value="${Utils.format(estimateBean.getProjectGrossProfit(),'0')}" readonly required title="项目毛利概算总额"></td>
+                        <td><input name="projectGrossProfit" type="text" class="number" value="${Utils.format(budgetBean.getProjectGrossProfit(),'0')}" readonly required title="项目毛利预算总额"></td>
+                        <td><input name="grossProfitSettleTotal" type="text" class="number" value="${Utils.format(settleBean.grossProfit,'0')}" readonly required title="项目毛利结算总额"></td>
+                        <td><input name="grossProfitFinalTotal" required readonly type="text" class="number" title="项目毛利决算总额"></td>
+                        <td><input name="grossProfitProfitMargin" type="text" class="number" required readonly title="项目毛利利润率"></td>
                     </tr>
                     <tr>
                         <td>项目贡献利润</td>
-                        <td><input name="projectContributionProfit" type="number" value="${Utils.format(estimateBean.getProjectContributionProfit(),'0')}" readonly required title="项目贡献利润概算总额"></td>
-                        <td><input name="projectContributionProfit" type="number" value="${Utils.format(budgetBean.getProjectContributionProfit(),'0')}" readonly required title="项目贡献利润预算总额"></td>
-                        <td><input name="contributionMarginSettleTotal" type="number" value="${Utils.format(settleBean.contributionProfit,'0')}" readonly required title="项目贡献利润结算总额"></td>
-                        <td><input name="contributionMarginFinalTotal" type="number" required readonly title="项目贡献利润决算总额"></td>
-                        <td><input name="contributionMarginProfitMargin" type="number" required readonly title="项目贡献利润利润率"></td>
+                        <td><input name="projectContributionProfit" type="text" class="number" value="${Utils.format(estimateBean.getProjectContributionProfit(),'0')}" readonly required title="项目贡献利润概算总额"></td>
+                        <td><input name="projectContributionProfit" type="text" class="number" value="${Utils.format(budgetBean.getProjectContributionProfit(),'0')}" readonly required title="项目贡献利润预算总额"></td>
+                        <td><input name="contributionMarginSettleTotal" type="text" class="number" value="${Utils.format(settleBean.contributionProfit,'0')}" readonly required title="项目贡献利润结算总额"></td>
+                        <td><input name="contributionMarginFinalTotal" type="text" class="number" required readonly title="项目贡献利润决算总额"></td>
+                        <td><input name="contributionMarginProfitMargin" type="text" class="number" required readonly title="项目贡献利润利润率"></td>
                     </tr>
                     <tr>
                         <td>项目净利润</td>
                         <td>/</td>
-                        <td><input name="netMarginBudgetTotal" type="number" value="${Utils.format(finalBean.netMarginBudgetTotal,'0')}" readonly required title="项目净利润预算总额"></td>
-                        <td><input name="netMarginSettleTotal" type="number" value="${Utils.format(settleBean.netProfit,'0')}" readonly required title="项目净利润结算总额"></td>
-                        <td><input name="netMarginFinalTotal" type="number" required readonly title="项目净利润决算总额"></td>
-                        <td><input name="netMarginProfitMargin" type="number" required readonly title="项目净利润利润率"></td>
+                        <td><input name="netMarginBudgetTotal" type="text" class="number" value="${Utils.format(finalBean.netMarginBudgetTotal,'0')}" readonly required title="项目净利润预算总额"></td>
+                        <td><input name="netMarginSettleTotal" type="text" class="number" value="${Utils.format(settleBean.netProfit,'0')}" readonly required title="项目净利润结算总额"></td>
+                        <td><input name="netMarginFinalTotal" type="text" class="number" required readonly title="项目净利润决算总额"></td>
+                        <td><input name="netMarginProfitMargin" type="text" class="number" required readonly title="项目净利润利润率"></td>
                     </tr>
                     </tbody>
                 </table>
@@ -252,93 +252,93 @@
                     </tr>
                     <tr>
                         <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="999999999.99" step="0.01" required title="决算总额"></td>
+                        <td><input name="budgetSaleIncomeCash" type="text" class="number" value="${Utils.format(cashFlowBean.saleIncomeCash,'0')}" readonly required title="预算总额"></td>
+                        <td><input type="text" class="number" value="${Utils.format(settleBean.saleIncomeCash,'0')}" readonly required title="结算总额"></td>
+                        <td><input name="saleIncomeCash" type="text" class="number" maxlength="16" 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="999999999.99" step="0.01" required title="决算总额"></td>
+                        <td><input type="text" class="number" value="${Utils.format(settleBean.taxReturn,'0')}" readonly required title="结算总额"></td>
+                        <td><input name="taxReturn" type="text" class="number" maxlength="16" 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="999999999.99" step="0.01" required title="决算总额"></td>
+                        <td><input name="budgetEarnestMoneyIncome" type="text" class="number" value="${Utils.format(cashFlowBean.earnestMoneyIncome,'0')}" readonly required title="预算总额"></td>
+                        <td><input type="text" class="number" value="${Utils.format(settleBean.earnestMoneyIncome,'0')}" readonly required title="结算总额"></td>
+                        <td><input name="earnestMoneyIncome" type="text" class="number" maxlength="16" 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="999999999.99" step="0.01" required title="决算总额"></td>
+                        <td><input name="budgetPurchaseCost" type="text" class="number" value="${Utils.format(cashFlowBean.purchaseCost,'0')}" readonly required title="预算总额"></td>
+                        <td><input type="text" class="number" value="${Utils.format(settleBean.purchaseCost,'0')}" readonly required title="结算总额"></td>
+                        <td><input name="purchaseCost" type="text" class="number" maxlength="16" 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="999999999.99" step="0.01" required title="决算总额"></td>
+                        <td><input type="text" class="number" value="${Utils.format(settleBean.taxCost,'0')}" readonly required title="结算总额"></td>
+                        <td><input name="taxCost" type="text" class="number" maxlength="16" 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="999999999.99" step="0.01" required title="决算总额"></td>
+                        <td><input name="budgetEarnestMoneyCost" type="text" class="number" value="${Utils.format(cashFlowBean.earnestMoneyCost,'0')}" readonly required title="预算总额"></td>
+                        <td><input type="text" class="number" value="${Utils.format(settleBean.earnestMoneyCost,'0')}" readonly required title="结算总额"></td>
+                        <td><input name="earnestMoneyCost" type="text" class="number" maxlength="16" required title="决算总额"></td>
                     </tr>
                     <tr>
                         <td>经营活动产生的现金流量净额</td>
-                        <td><input name="budgetNetCashFlow" type="number" value="${Utils.format(cashFlowBean.getNetCashFlow(),'0')}" readonly required title="预算总额"></td>
-                        <td><input type="number" value="${Utils.format(settleBean.netCashFlow,'0')}" readonly required title="结算总额"></td>
-                        <td><input name="netCashFlow" type="number" readonly required title="决算总额"></td>
+                        <td><input name="budgetNetCashFlow" type="text" class="number" value="${Utils.format(cashFlowBean.getNetCashFlow(),'0')}" readonly required title="预算总额"></td>
+                        <td><input type="text" class="number" value="${Utils.format(settleBean.netCashFlow,'0')}" readonly required title="结算总额"></td>
+                        <td><input name="netCashFlow" type="text" class="number" readonly required title="决算总额"></td>
                     </tr>
                     <tr>
                         <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="999999999.99" step="0.01" required title="决算总额"></td>
+                        <td><input type="text" class="number" value="${Utils.format(settleBean.cashInflowFromInvestingActivities,'0')}" readonly required title="结算总额"></td>
+                        <td><input name="cashInflowFromInvestingActivities"  type="text" class="number" maxlength="16" 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="999999999.99" step="0.01" required title="决算总额"></td>
+                        <td><input type="text" class="number" value="${Utils.format(settleBean.cashOutflowFromInvestingActivities,'0')}" readonly required title="结算总额"></td>
+                        <td><input name="cashOutflowFromInvestingActivities" type="text" class="number" maxlength="16" required title="决算总额"></td>
                     </tr>
                     <tr>
                         <td>投资活动产生的现金流量净额</td>
                         <td>/</td>
-                        <td><input type="number" value="${Utils.format(settleBean.netCashFromInvestingActivities,'0')}" readonly required title="结算总额"></td>
-                        <td><input name="netCashFromInvestingActivities" type="number" required readonly title="决算总额"></td>
+                        <td><input type="text" class="number" value="${Utils.format(settleBean.netCashFromInvestingActivities,'0')}" readonly required title="结算总额"></td>
+                        <td><input name="netCashFromInvestingActivities" type="text" class="number" required readonly title="决算总额"></td>
                     </tr>
                     <tr>
                         <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="999999999.99" step="0.01" required title="决算总额"></td>
+                        <td><input name="budgetFinancingCapitalInflow" type="text" class="number" value="${Utils.format(cashFlowBean.financingCapitalInflow,'0')}" readonly required title="预算总额"></td>
+                        <td><input type="text" class="number" value="${Utils.format(settleBean.financingCapitalInflow,'0')}" readonly required title="结算总额"></td>
+                        <td><input name="financingCapitalInflow" type="text" class="number" maxlength="16" 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="999999999.99" step="0.01" required title="决算总额"></td>
+                        <td><input name="budgetFinancingCapitalOutflow" type="text" class="number" value="${Utils.format(cashFlowBean.financingCapitalOutflow,'0')}" readonly required title="预算总额"></td>
+                        <td><input type="text" class="number" value="${Utils.format(settleBean.financingCapitalOutflow,'0')}" readonly required title="结算总额"></td>
+                        <td><input name="financingCapitalOutflow" type="text" class="number" maxlength="16" required title="决算总额"></td>
                     </tr>
                     <tr>
                         <td>筹资活动产生的现金流量净额</td>
-                        <td><input name="budgetFinancingCapitalCashflow" type="number" value="${Utils.format(cashFlowBean.getFinancingCapitalCashflow(),'0')}" readonly required title="预算总额"></td>
-                        <td><input type="number" value="${Utils.format(settleBean.financingCapitalCashflow,'0')}" readonly required title="结算总额"></td>
-                        <td><input name="financingCapitalCashflow" type="number" required readonly title="决算总额"></td>
+                        <td><input name="budgetFinancingCapitalCashflow" type="text" class="number" value="${Utils.format(cashFlowBean.getFinancingCapitalCashflow(),'0')}" readonly required title="预算总额"></td>
+                        <td><input type="text" class="number" value="${Utils.format(settleBean.financingCapitalCashflow,'0')}" readonly required title="结算总额"></td>
+                        <td><input name="financingCapitalCashflow" type="text" class="number" required readonly title="决算总额"></td>
                     </tr>
                     <tr>
                         <td>货币资金净增加额</td>
-                        <td><input name="budgetNetIncreaseMonetaryFunds" type="number" value="${Utils.format(cashFlowBean.getNetIncreaseMonetaryFunds(),'0')}" readonly required title="预算总额"></td>
-                        <td><input name="type14SettleTotal" type="number" value="${Utils.format(settleBean.netIncreaseMonetaryFunds,'0')}" readonly required title="结算总额"></td>
-                        <td><input name="netIncreaseMonetaryFunds" type="number" readonly required title="决算总额"></td>
+                        <td><input name="budgetNetIncreaseMonetaryFunds" type="text" class="number" value="${Utils.format(cashFlowBean.getNetIncreaseMonetaryFunds(),'0')}" readonly required title="预算总额"></td>
+                        <td><input name="type14SettleTotal" type="text" class="number" value="${Utils.format(settleBean.netIncreaseMonetaryFunds,'0')}" readonly required title="结算总额"></td>
+                        <td><input name="netIncreaseMonetaryFunds" type="text" class="number" readonly required title="决算总额"></td>
                     </tr>
                     <#--<tr>
                         <td>合计</td>
-                        <td><input name="cashFluxBudgetTotal" type="number" value="${Utils.format(cashFlowBean.getCashFluxTotal(),'0')}" readonly required title="此列累计"></td>
-                        <td><input name="cashFluxSettleTotal" type="number" value="${Utils.format(settleBean.getCashFlowTotal(),'0')}" readonly required title="此列累计"></td>
-                        <td><input name="cashFluxFinalTotal" type="number" readonly required title="此列累计"></td>
+                        <td><input name="cashFluxBudgetTotal" type="text" class="number" value="${Utils.format(cashFlowBean.getCashFluxTotal(),'0')}" readonly required title="此列累计"></td>
+                        <td><input name="cashFluxSettleTotal" type="text" class="number" value="${Utils.format(settleBean.getCashFlowTotal(),'0')}" readonly required title="此列累计"></td>
+                        <td><input name="cashFluxFinalTotal" type="text" class="number" readonly required title="此列累计"></td>
                     </tr>-->
                     </tbody>
                 </table>
diff --git a/src/main/resources/templates/admin/project_final_edit.ftl b/src/main/resources/templates/admin/project_final_edit.ftl
index 3228136..1ddf0ca 100644
--- a/src/main/resources/templates/admin/project_final_edit.ftl
+++ b/src/main/resources/templates/admin/project_final_edit.ftl
@@ -48,34 +48,34 @@
                     <tr>
                         <td>收入</td>
                         <td>设备类</td>
-                        <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="999999999.99" step="0.01" type="number" value="${Utils.format(finalBean.incomeDeviceFinalTotal,'0')}" required title="设备类决算总额"></td>
+                        <td><input name="incomeDeviceTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类概算总额"></td>
+                        <td><input name="incomeDeviceTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类预算总额"></td>
+                        <td><input type="text" class="number" value="${Utils.format(settleBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类结算总额"></td>
+                        <td><input name="incomeDeviceFinalTotal" maxlength="16" type="text" class="number" value="${Utils.format(finalBean.incomeDeviceFinalTotal,'0')}" required title="设备类决算总额"></td>
                     </tr>
                     <tr>
                         <td>收入</td>
                         <td>工程类</td>
-                        <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="999999999.99" step="0.01" value="${Utils.format(finalBean.incomeEngineerFinalTotal,'0')}" required title="工程类决算总额"></td>
+                        <td><input name="incomeEngineerTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类概算总额"></td>
+                        <td><input name="incomeEngineerTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类预算总额"></td>
+                        <td><input type="text" class="number" value="${Utils.format(settleBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类结算总额"></td>
+                        <td><input name="incomeEngineerFinalTotal" type="text" class="number" maxlength="16" value="${Utils.format(finalBean.incomeEngineerFinalTotal,'0')}" required title="工程类决算总额"></td>
                     </tr>
                     <tr>
                         <td>收入</td>
                         <td>服务类</td>
-                        <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="999999999.99" step="0.01" value="${Utils.format(finalBean.incomeServiceFinalTotal,'0')}" required title="服务类决算总额"></td>
+                        <td><input name="incomeServiceTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类概算总额"></td>
+                        <td><input name="incomeServiceTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类预算总额"></td>
+                        <td><input type="text" class="number" value="${Utils.format(settleBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类结算总额"></td>
+                        <td><input name="incomeServiceFinalTotal" type="text" class="number" maxlength="16" value="${Utils.format(finalBean.incomeServiceFinalTotal,'0')}" required title="服务类决算总额"></td>
                     </tr>
                     <tr>
                         <td>合计</td>
                         <td></td>
-                        <td><input name="estimateIncomeTotalTaxExclude" type="number" value="${Utils.format(estimateBean.getIncomeTotalTaxExclude(),'0')}" readonly required title="此列累计"></td>
-                        <td><input name="budgetIncomeTotalTaxExclude" type="number"  value="${Utils.format(budgetBean.getIncomeTotalTaxExclude(),'0')}" readonly required title="此列累计"></td>
-                        <td><input type="number" value="${Utils.format(settleBean.getIncomeTotalTaxExclude(),'0')}" readonly required title="此列累计"></td>
-                        <td><input name="incomeFinalTotal" type="number" value="${Utils.format(finalBean.getIncomeTotal(),'0')}" readonly required title="此列累计"></td>
+                        <td><input name="estimateIncomeTotalTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.getIncomeTotalTaxExclude(),'0')}" readonly required title="此列累计"></td>
+                        <td><input name="budgetIncomeTotalTaxExclude" type="text" class="number"  value="${Utils.format(budgetBean.getIncomeTotalTaxExclude(),'0')}" readonly required title="此列累计"></td>
+                        <td><input type="text" class="number" value="${Utils.format(settleBean.getIncomeTotalTaxExclude(),'0')}" readonly required title="此列累计"></td>
+                        <td><input name="incomeFinalTotal" type="text" class="number" value="${Utils.format(finalBean.getIncomeTotal(),'0')}" readonly required title="此列累计"></td>
                     </tr>
                     </tbody>
                 </table>
@@ -95,65 +95,65 @@
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>设备</td>
-                        <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="999999999.99" step="0.01" value="${Utils.format(finalBean.costPurchaseDeviceFinalTotal,'0')}" required title="购买设备决算总额"></td>
+                        <td><input name="costPurchaseDeviceTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseDeviceTaxExclude,'0')}" readonly required title="购买设备概算总额"></td>
+                        <td><input name="costPurchaseDeviceTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseDeviceTaxExclude,'0')}" readonly required title="购买设备预算总额"></td>
+                        <td><input  type="text" class="number" value="${Utils.format(settleBean.costPurchaseDeviceTaxExclude,'0')}" readonly required title="购买设备结算总额"></td>
+                        <td><input name="costPurchaseDeviceFinalTotal" type="text" class="number" maxlength="16" value="${Utils.format(finalBean.costPurchaseDeviceFinalTotal,'0')}" required title="购买设备决算总额"></td>
                     </tr>
                     <tr>
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>施工</td>
-                        <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="999999999.99" step="0.01" value="${Utils.format(finalBean.costPurchaseBuildFinalTotal,'0')}" required title="施工采购成本决算总额"></td>
+                        <td><input name="costPurchaseBuildTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseBuildTaxExclude,'0')}" readonly required title="施工采购成本概算总额"></td>
+                        <td><input name="costPurchaseBuildTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseBuildTaxExclude,'0')}" readonly required title="施工采购成本预算总额"></td>
+                        <td><input type="text" class="number" value="${Utils.format(settleBean.costPurchaseBuildTaxExclude,'0')}" readonly required title="施工采购成本结算总额"></td>
+                        <td><input name="costPurchaseBuildFinalTotal" type="text" class="number" maxlength="16" value="${Utils.format(finalBean.costPurchaseBuildFinalTotal,'0')}" required title="施工采购成本决算总额"></td>
                     </tr>
                     <tr>
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>服务</td>
-                        <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="999999999.99" step="0.01" value="${Utils.format(finalBean.costPurchaseServiceFinalTotal,'0')}" required title="服务采购成本决算总额"></td>
+                        <td><input name="costPurchaseServiceTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseServiceTaxExclude,'0')}" readonly required title="服务采购成本概算总额"></td>
+                        <td><input name="costPurchaseServiceTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseServiceTaxExclude,'0')}" readonly required title="服务采购成本预算总额"></td>
+                        <td><input type="text" class="number" value="${Utils.format(settleBean.costPurchaseServiceTaxExclude,'0')}" readonly required title="服务采购成本结算总额"></td>
+                        <td><input name="costPurchaseServiceFinalTotal" type="text" class="number" maxlength="16" value="${Utils.format(finalBean.costPurchaseServiceFinalTotal,'0')}" required title="服务采购成本决算总额"></td>
                     </tr>
                     <tr>
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>其他</td>
-                        <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="999999999.99" step="0.01" value="${Utils.format(finalBean.costPurchaseOtherFinalTotal,'0')}" required title="其他采购成本决算总额"></td>
+                        <td><input name="costPurchaseOtherTaxInclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseOtherTaxInclude,'0')}" readonly required title="其他采购成本概算总额"></td>
+                        <td><input name="costPurchaseOtherTaxInclude" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseOtherTaxInclude,'0')}" readonly required title="其他采购成本预算总额"></td>
+                        <td><input name="costPurchaseOtherSettleTotal" value="${Utils.format(settleBean.costPurchaseOtherTaxExclude,'0')}" type="text" class="number" readonly required title="其他采购成本结算总额"></td>
+                        <td><input name="costPurchaseOtherFinalTotal" type="text" class="number" maxlength="16" value="${Utils.format(finalBean.costPurchaseOtherFinalTotal,'0')}" required title="其他采购成本决算总额"></td>
                     </tr>
                     <tr>
                         <td>成本</td>
                         <td>项目管理成本</td>
                         <td>项目管理成本</td>
-                        <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="999999999.99" step="0.01" value="${Utils.format(finalBean.costProjectManageFinalTotal,'0')}" required title="项目管理成本决算总额"></td>
+                        <td><input name="costProjectManageTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costProjectManageTaxExclude,'0')}" readonly required title="项目管理成本概算总额"></td>
+                        <td><input name="costProjectManageTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0')}" readonly required title="项目管理成本预算总额"></td>
+                        <td><input name="costProjectManageSettleTotal" value="${Utils.format(settleBean.costProjectManageTaxExclude,'0')}" type="text" class="number" readonly required title="项目管理成本结算总额"></td>
+                        <td><input name="costProjectManageFinalTotal" type="text" class="number" maxlength="16" value="${Utils.format(finalBean.costProjectManageFinalTotal,'0')}" required title="项目管理成本决算总额"></td>
                     </tr>
                     <tr>
                         <td>成本</td>
                         <td>其他</td>
                         <td><input type="text" id="otherName" maxlength="10" data-validate-async data-validation-message="请输入其他中的小类名称（10字符以内）"
                                    value="${project.otherName!}" name="otherName" placeholder="请输入其他中的小类名称（10字符以内）" readonly required/> </td>
-                        <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="999999999.99" step="0.01" value="${Utils.format(finalBean.costOtherFinalTotal,'0')}" required title="其他成本决算总额"></td>
+                        <td><input name="costOtherOtherTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本概算总额"></td>
+                        <td><input name="costOtherOtherTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本预算总额"></td>
+                        <td><input name="costOtherSettleTotal" value="${Utils.format(settleBean.costOtherOtherTaxExclude,'0')}" type="text" class="number" type="text" class="number"readonly required title="其他成本结算总额"></td>
+                        <td><input name="costOtherFinalTotal" type="text" class="number" maxlength="16" value="${Utils.format(finalBean.costOtherFinalTotal,'0')}" required title="其他成本决算总额"></td>
                     </tr>
                     <tr>
                         <td>合计</td>
                         <td></td>
                         <td></td>
-                        <td><input name="incomeTotalTaxExclude" value="${Utils.format(estimateBean.getCostTotalTaxExclude(),'0')}" type="number" readonly required title="此列累计"></td>
-                        <td><input name="costTotalTaxExclude" value="${Utils.format(budgetBean.getCostTotalTaxExclude(),'0')}" type="number" readonly required title="此列累计"></td>
-                        <td><input name="costSettleTotal" value="${Utils.format(settleBean.getCostTotalTaxExclude(),'0')}" type="number" readonly required title="此列累计"></td>
-                        <td><input name="costFinalTotal" type="number" value="${Utils.format(finalBean.getCostTotal(),'0')}" readonly required title="此列累计"></td>
+                        <td><input name="incomeTotalTaxExclude" value="${Utils.format(estimateBean.getCostTotalTaxExclude(),'0')}" type="text" class="number" readonly required title="此列累计"></td>
+                        <td><input name="costTotalTaxExclude" value="${Utils.format(budgetBean.getCostTotalTaxExclude(),'0')}" type="text" class="number" readonly required title="此列累计"></td>
+                        <td><input name="costSettleTotal" value="${Utils.format(settleBean.getCostTotalTaxExclude(),'0')}" type="text" class="number" readonly required title="此列累计"></td>
+                        <td><input name="costFinalTotal" type="text" class="number" value="${Utils.format(finalBean.getCostTotal(),'0')}" readonly required title="此列累计"></td>
                     </tr>
                     </tbody>
                 </table>
@@ -171,34 +171,34 @@
                     <tr>
                         <td>财务费用</td>
                         <td>资金占用成本</td>
-                        <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="999999999.99" step="0.01" value="${Utils.format(finalBean.costExpropriationFinalTotal,'0')}" required title="资金占用成本决算总额"></td>
+                        <td><input name="costExpropriationTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本概算总额"></td>
+                        <td><input name="costExpropriationTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本预算总额"></td>
+                        <td><input type="text" class="number"  value="${Utils.format(settleBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本结算总额"></td>
+                        <td><input name="costExpropriationFinalTotal" type="text" class="number" maxlength="16" value="${Utils.format(finalBean.costExpropriationFinalTotal,'0')}" required title="资金占用成本决算总额"></td>
                     </tr>
                     <tr>
                         <td>公司管理费用</td>
                         <td></td>
-                        <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="999999999.99" step="0.01" value="${Utils.format(finalBean.costCompanyManageFinalTotal,'0')}" required title="公司管理费用决算总额"></td>
+                        <td><input name="costCompanyManageTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costCompanyManageTaxExclude,'0')}" required readonly title="公司管理费用概算总额"></td>
+                        <td><input name="costCompanyManageTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costCompanyManageTaxExclude,'0')}" required readonly title="公司管理费用预算总额"></td>
+                        <td><input type="text" class="number" value="${Utils.format(settleBean.costCompanyManageTaxExclude,'0')}" required readonly title="公司管理费用结算总额"></td>
+                        <td><input name="costCompanyManageFinalTotal" type="text" class="number" maxlength="16" value="${Utils.format(finalBean.costCompanyManageFinalTotal,'0')}" required title="公司管理费用决算总额"></td>
                     </tr>
                     <tr>
                         <td>所得税费用</td>
                         <td></td>
                         <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="999999999.99" step="0.01" value="${Utils.format(finalBean.costIncomeTaxFinalTotal,'0')}" required title="所得税费用决算总额"></td>
+                        <td><input name="costIncomeTaxSettleTotal" value="${Utils.format(settleBean.costIncomeTax,'0')}" type="text" class="number" required readonly title="所得税费用结算总额"></td>
+                        <td><input name="costIncomeTaxFinalTotal" type="text" class="number" maxlength="16" value="${Utils.format(finalBean.costIncomeTaxFinalTotal,'0')}" required title="所得税费用决算总额"></td>
                     </tr>
                     <tr>
                         <td>合计</td>
                         <td></td>
-                        <td><input name="manageEstimateTotal" value="${Utils.format(estimateBean.getCostManageExclude(),'0')}" type="number" readonly required title="此列累计"></td>
-                        <td><input name="manageBudgetTotal" value="${Utils.format(budgetBean.getCostManageExclude(),'0')}" type="number" readonly required title="此列累计"></td>
-                        <td><input name="manageSettleTotal" value="${Utils.format(settleBean.getCostManageTotal(),'0')}" type="number" readonly required title="此列累计"></td>
-                        <td><input name="manageFinalTotal" type="number" value="${Utils.format(finalBean.getCostManageTotal(),'0')}" readonly required title="此列累计"></td>
+                        <td><input name="manageEstimateTotal" value="${Utils.format(estimateBean.getCostManageExclude(),'0')}" type="text" class="number" readonly required title="此列累计"></td>
+                        <td><input name="manageBudgetTotal" value="${Utils.format(budgetBean.getCostManageExclude(),'0')}" type="text" class="number" readonly required title="此列累计"></td>
+                        <td><input name="manageSettleTotal" value="${Utils.format(settleBean.getCostManageTotal(),'0')}" type="text" class="number" readonly required title="此列累计"></td>
+                        <td><input name="manageFinalTotal" type="text" class="number" value="${Utils.format(finalBean.getCostManageTotal(),'0')}" readonly required title="此列累计"></td>
                     </tr>
                     </tbody>
                 </table>
@@ -216,27 +216,27 @@
                     </tr>
                     <tr>
                         <td>项目毛利</td>
-                        <td><input name="projectGrossProfit" type="number" value="${Utils.format(estimateBean.getProjectGrossProfit(),'0')}" readonly required title="项目毛利概算总额"></td>
-                        <td><input name="projectGrossProfit" type="number" value="${Utils.format(budgetBean.getProjectGrossProfit(),'0')}" readonly required title="项目毛利预算总额"></td>
-                        <td><input name="grossProfitSettleTotal" type="number" value="${Utils.format(finalBean.grossProfitSettleTotal,'0')}" readonly required title="项目毛利结算总额"></td>
-                        <td><input name="grossProfitFinalTotal" type="number" value="${Utils.format(finalBean.grossProfitFinalTotal,'0')}" readonly required title="项目毛利决算总额"></td>
-                        <td><input name="grossProfitProfitMargin" type="number" value="${Utils.format(finalBean.grossProfitProfitMargin,'0')}" required readonly title="项目毛利利润率"></td>
+                        <td><input name="projectGrossProfit" type="text" class="number" value="${Utils.format(estimateBean.getProjectGrossProfit(),'0')}" readonly required title="项目毛利概算总额"></td>
+                        <td><input name="projectGrossProfit" type="text" class="number" value="${Utils.format(budgetBean.getProjectGrossProfit(),'0')}" readonly required title="项目毛利预算总额"></td>
+                        <td><input name="grossProfitSettleTotal" type="text" class="number" value="${Utils.format(finalBean.grossProfitSettleTotal,'0')}" readonly required title="项目毛利结算总额"></td>
+                        <td><input name="grossProfitFinalTotal" type="text" class="number" value="${Utils.format(finalBean.grossProfitFinalTotal,'0')}" readonly required title="项目毛利决算总额"></td>
+                        <td><input name="grossProfitProfitMargin" type="text" class="number" value="${Utils.format(finalBean.grossProfitProfitMargin,'0')}" required readonly title="项目毛利利润率"></td>
                     </tr>
                     <tr>
                         <td>项目贡献利润</td>
-                        <td><input name="projectContributionProfit" type="number" value="${Utils.format(estimateBean.getProjectContributionProfit(),'0')}" readonly required title="项目贡献利润概算总额"></td>
-                        <td><input name="projectContributionProfit" type="number" value="${Utils.format(budgetBean.getProjectContributionProfit(),'0')}" readonly required title="项目贡献利润预算总额"></td>
-                        <td><input name="contributionMarginSettleTotal" type="number" value="${Utils.format(settleBean.contributionProfit,'0')}" readonly required title="项目贡献利润结算总额"></td>
-                        <td><input name="contributionMarginFinalTotal" type="number" value="${Utils.format(finalBean.contributionMarginFinalTotal,'0')}" readonly required title="项目贡献利润决算总额"></td>
-                        <td><input name="contributionMarginProfitMargin" type="number" value="${Utils.format(finalBean.contributionMarginProfitMargin,'0')}" required readonly title="项目贡献利润利润率"></td>
+                        <td><input name="projectContributionProfit" type="text" class="number" value="${Utils.format(estimateBean.getProjectContributionProfit(),'0')}" readonly required title="项目贡献利润概算总额"></td>
+                        <td><input name="projectContributionProfit" type="text" class="number" value="${Utils.format(budgetBean.getProjectContributionProfit(),'0')}" readonly required title="项目贡献利润预算总额"></td>
+                        <td><input name="contributionMarginSettleTotal" type="text" class="number" value="${Utils.format(settleBean.contributionProfit,'0')}" readonly required title="项目贡献利润结算总额"></td>
+                        <td><input name="contributionMarginFinalTotal" type="text" class="number" value="${Utils.format(finalBean.contributionMarginFinalTotal,'0')}" readonly required title="项目贡献利润决算总额"></td>
+                        <td><input name="contributionMarginProfitMargin" type="text" class="number" value="${Utils.format(finalBean.contributionMarginProfitMargin,'0')}" required readonly title="项目贡献利润利润率"></td>
                     </tr>
                     <tr>
                         <td>项目净利润</td>
                         <td>/</td>
-                        <td>/<#--<input name="netMarginBudgetTotal" type="number" value="${Utils.format(budgetBean.netProfit,'0')}" readonly required title="项目净利润预算总额">--></td>
-                        <td><input name="netMarginSettleTotal" type="number" value="${Utils.format(settleBean.netProfit,'0')}" readonly required title="项目净利润结算总额"></td>
-                        <td><input name="netMarginFinalTotal" type="number" value="${Utils.format(finalBean.netMarginFinalTotal,'0')}" readonly required title="项目净利润决算总额"></td>
-                        <td><input name="netMarginProfitMargin" type="number" value="${Utils.format(finalBean.netMarginProfitMargin,'0')}" required readonly title="项目净利润利润率"></td>
+                        <td>/<#--<input name="netMarginBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.netProfit,'0')}" readonly required title="项目净利润预算总额">--></td>
+                        <td><input name="netMarginSettleTotal" type="text" class="number" value="${Utils.format(settleBean.netProfit,'0')}" readonly required title="项目净利润结算总额"></td>
+                        <td><input name="netMarginFinalTotal" type="text" class="number" value="${Utils.format(finalBean.netMarginFinalTotal,'0')}" readonly required title="项目净利润决算总额"></td>
+                        <td><input name="netMarginProfitMargin" type="text" class="number" value="${Utils.format(finalBean.netMarginProfitMargin,'0')}" required readonly title="项目净利润利润率"></td>
                     </tr>
                     </tbody>
                 </table>
@@ -252,93 +252,93 @@
                     </tr>
                     <tr>
                         <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="999999999.99" step="0.01" value="${Utils.format(finalBean.saleIncomeCash,'0')}" required title="决算总额"></td>
+                        <td><input name="budgetSaleIncomeCash" type="text" class="number" value="${Utils.format(cashFlowBean.saleIncomeCash,'0')}" readonly required title="预算总额"></td>
+                        <td><input type="text" class="number" value="${Utils.format(settleBean.saleIncomeCash,'0')}" readonly required title="结算总额"></td>
+                        <td><input name="saleIncomeCash" type="text" class="number" maxlength="16" 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="999999999.99" step="0.01" value="${Utils.format(finalBean.taxReturn,'0')}" required title="决算总额"></td>
+                        <td><input type="text" class="number" value="${Utils.format(settleBean.taxReturn,'0')}" readonly required title="结算总额"></td>
+                        <td><input name="taxReturn" type="text" class="number" maxlength="16" 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="999999999.99" step="0.01" value="${Utils.format(finalBean.earnestMoneyIncome,'0')}" required title="决算总额"></td>
+                        <td><input name="budgetEarnestMoneyIncome" type="text" class="number" value="${Utils.format(cashFlowBean.earnestMoneyIncome,'0')}" readonly required title="预算总额"></td>
+                        <td><input type="text" class="number" value="${Utils.format(settleBean.earnestMoneyIncome,'0')}" readonly required title="结算总额"></td>
+                        <td><input name="earnestMoneyIncome" type="text" class="number" maxlength="16" 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="999999999.99" step="0.01" value="${Utils.format(finalBean.purchaseCost,'0')}" required title="决算总额"></td>
+                        <td><input name="budgetPurchaseCost" type="text" class="number" value="${Utils.format(cashFlowBean.purchaseCost,'0')}" readonly required title="预算总额"></td>
+                        <td><input type="text" class="number" value="${Utils.format(settleBean.purchaseCost,'0')}" readonly required title="结算总额"></td>
+                        <td><input name="purchaseCost" type="text" class="number" maxlength="16" 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="999999999.99" step="0.01" value="${Utils.format(finalBean.taxCost,'0')}" required title="决算总额"></td>
+                        <td><input type="text" class="number" value="${Utils.format(settleBean.taxCost,'0')}" readonly required title="结算总额"></td>
+                        <td><input name="taxCost" type="text" class="number" maxlength="16" 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="999999999.99" step="0.01" value="${Utils.format(finalBean.earnestMoneyCost,'0')}" required title="决算总额"></td>
+                        <td><input name="budgetEarnestMoneyCost" type="text" class="number" value="${Utils.format(cashFlowBean.earnestMoneyCost,'0')}" readonly required title="预算总额"></td>
+                        <td><input type="text" class="number" value="${Utils.format(settleBean.earnestMoneyCost,'0')}" readonly required title="结算总额"></td>
+                        <td><input name="earnestMoneyCost" type="text" class="number" maxlength="16" value="${Utils.format(finalBean.earnestMoneyCost,'0')}" required title="决算总额"></td>
                     </tr>
                     <tr>
                         <td>经营活动产生的现金流量净额</td>
-                        <td><input name="budgetNetCashFlow" type="number" value="${Utils.format(cashFlowBean.getNetCashFlow(),'0')}" readonly required title="预算总额"></td>
-                        <td><input type="number" value="${Utils.format(settleBean.netCashFlow,'0')}" readonly required title="结算总额"></td>
-                        <td><input name="netCashFlow" type="number" value="${Utils.format(finalBean.netCashFlow,'0')}" readonly required title="决算总额"></td>
+                        <td><input name="budgetNetCashFlow" type="text" class="number" value="${Utils.format(cashFlowBean.getNetCashFlow(),'0')}" readonly required title="预算总额"></td>
+                        <td><input type="text" class="number" value="${Utils.format(settleBean.netCashFlow,'0')}" readonly required title="结算总额"></td>
+                        <td><input name="netCashFlow" type="text" class="number" value="${Utils.format(finalBean.netCashFlow,'0')}" readonly required title="决算总额"></td>
                     </tr>
                     <tr>
                         <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="999999999.99" step="0.01" required title="决算总额"></td>
+                        <td><input type="text" class="number" value="${Utils.format(settleBean.cashInflowFromInvestingActivities,'0')}" readonly required title="结算总额"></td>
+                        <td><input name="cashInflowFromInvestingActivities" value="${Utils.format(finalBean.cashInflowFromInvestingActivities,'0')}"  type="text" class="number" maxlength="16" 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="999999999.99" step="0.01" title="决算总额"></td>
+                        <td><input type="text" class="number" value="${Utils.format(settleBean.cashOutflowFromInvestingActivities,'0')}" readonly required title="结算总额"></td>
+                        <td><input name="cashOutflowFromInvestingActivities" type="text" class="number" value="${Utils.format(finalBean.cashOutflowFromInvestingActivities,'0')}" required maxlength="16" title="决算总额"></td>
                     </tr>
                     <tr>
                         <td>投资活动产生的现金流量净额</td>
                         <td>/</td>
-                        <td><input type="number" value="${Utils.format(settleBean.netCashFromInvestingActivities,'0')}" readonly required title="结算总额"></td>
-                        <td><input name="netCashFromInvestingActivities" type="number" value="${Utils.format(finalBean.netCashFromInvestingActivities,'0')}" readonly required title="决算总额"></td>
+                        <td><input type="text" class="number" value="${Utils.format(settleBean.netCashFromInvestingActivities,'0')}" readonly required title="结算总额"></td>
+                        <td><input name="netCashFromInvestingActivities" type="text" class="number" value="${Utils.format(finalBean.netCashFromInvestingActivities,'0')}" readonly required title="决算总额"></td>
                     </tr>
                     <tr>
                         <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="999999999.99" step="0.01" value="${Utils.format(finalBean.financingCapitalInflow,'0')}" required title="决算总额"></td>
+                        <td><input name="budgetFinancingCapitalInflow" type="text" class="number" value="${Utils.format(cashFlowBean.financingCapitalInflow,'0')}" readonly required title="预算总额"></td>
+                        <td><input type="text" class="number" value="${Utils.format(settleBean.financingCapitalInflow,'0')}" readonly required title="结算总额"></td>
+                        <td><input name="financingCapitalInflow" type="text" class="number" maxlength="16" 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="999999999.99" step="0.01" value="${Utils.format(finalBean.financingCapitalOutflow,'0')}" required title="决算总额"></td>
+                        <td><input name="budgetFinancingCapitalOutflow" type="text" class="number" value="${Utils.format(cashFlowBean.financingCapitalOutflow,'0')}" readonly required title="预算总额"></td>
+                        <td><input type="text" class="number" value="${Utils.format(settleBean.financingCapitalOutflow,'0')}" readonly required title="结算总额"></td>
+                        <td><input name="financingCapitalOutflow" type="text" class="number" maxlength="16" value="${Utils.format(finalBean.financingCapitalOutflow,'0')}" required title="决算总额"></td>
                     </tr>
                     <tr>
                         <td>筹资活动产生的现金流量净额</td>
-                        <td><input name="budgetFinancingCapitalCashflow" type="number" value="${Utils.format(cashFlowBean.getFinancingCapitalCashflow(),'0')}" readonly required title="预算总额"></td>
-                        <td><input type="number" value="${Utils.format(settleBean.financingCapitalCashflow,'0')}" readonly required title="结算总额"></td>
-                        <td><input name="financingCapitalCashflow" type="number" value="${Utils.format(finalBean.financingCapitalCashflow,'0')}" readonly required title="决算总额"></td>
+                        <td><input name="budgetFinancingCapitalCashflow" type="text" class="number" value="${Utils.format(cashFlowBean.getFinancingCapitalCashflow(),'0')}" readonly required title="预算总额"></td>
+                        <td><input type="text" class="number" value="${Utils.format(settleBean.financingCapitalCashflow,'0')}" readonly required title="结算总额"></td>
+                        <td><input name="financingCapitalCashflow" type="text" class="number" value="${Utils.format(finalBean.financingCapitalCashflow,'0')}" readonly required title="决算总额"></td>
                     </tr>
                     <tr>
                         <td>货币资金净增加额</td>
-                        <td><input name="budgetNetIncreaseMonetaryFunds" type="number" value="${Utils.format(cashFlowBean.getNetIncreaseMonetaryFunds(),'0')}" readonly required title="预算总额"></td>
-                        <td><input name="type14SettleTotal" type="number" value="${Utils.format(settleBean.netIncreaseMonetaryFunds,'0')}" readonly required title="结算总额"></td>
-                        <td><input name="netIncreaseMonetaryFunds" type="number" value="${Utils.format(finalBean.netIncreaseMonetaryFunds,'0')}" readonly required title="决算总额"></td>
+                        <td><input name="budgetNetIncreaseMonetaryFunds" type="text" class="number" value="${Utils.format(cashFlowBean.getNetIncreaseMonetaryFunds(),'0')}" readonly required title="预算总额"></td>
+                        <td><input name="type14SettleTotal" type="text" class="number" value="${Utils.format(settleBean.netIncreaseMonetaryFunds,'0')}" readonly required title="结算总额"></td>
+                        <td><input name="netIncreaseMonetaryFunds" type="text" class="number" value="${Utils.format(finalBean.netIncreaseMonetaryFunds,'0')}" readonly required title="决算总额"></td>
                     </tr>
                     <#--<tr>
                         <td>合计</td>
-                        <td><input name="cashFluxBudgetTotal" type="number" value="${Utils.format(cashFlowBean.getCashFluxTotal(),'0')}" readonly required title="此列累计"></td>
-                        <td><input name="cashFluxSettleTotal" type="number" value="${Utils.format(settleBean.getCashFlowTotal(),'0')}" readonly required title="此列累计"></td>
-                        <td><input name="cashFluxFinalTotal" type="number" value="${Utils.format(finalBean.getCashFluxTotal(),'0')}" readonly required title="此列累计"></td>
+                        <td><input name="cashFluxBudgetTotal" type="text" class="number" value="${Utils.format(cashFlowBean.getCashFluxTotal(),'0')}" readonly required title="此列累计"></td>
+                        <td><input name="cashFluxSettleTotal" type="text" class="number" value="${Utils.format(settleBean.getCashFlowTotal(),'0')}" readonly required title="此列累计"></td>
+                        <td><input name="cashFluxFinalTotal" type="text" class="number" value="${Utils.format(finalBean.getCashFluxTotal(),'0')}" readonly required title="此列累计"></td>
                     </tr>-->
                     </tbody>
                 </table>
diff --git a/src/main/resources/templates/admin/project_settle_add.ftl b/src/main/resources/templates/admin/project_settle_add.ftl
index be6601d..39c3611 100644
--- a/src/main/resources/templates/admin/project_settle_add.ftl
+++ b/src/main/resources/templates/admin/project_settle_add.ftl
@@ -60,38 +60,38 @@
                     <tr>
                         <td>收入</td>
                         <td>设备类</td>
-                        <td><input name="incomeDeviceEstimateTotal" type="number" value="${Utils.format(estimateBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类概算总额"></td>
-                        <td><input name="incomeDeviceBudgetTotal" type="number" value="${Utils.format(budgetBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类预算总额"></td>
-                        <td><input name="incomeDeviceFormerSettleTotal" type="number" value="${Utils.format(formerBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类上月结算总额"></td>
-                        <td><input type="number" min="0.00" max="999999999.99" step="0.01" name="incomeDevice" required title="本月结算金额"></td>
-                        <td><input type="number" name="incomeDeviceSettleTotal" readonly title="设备类结算总额" data-validate-async data-validation-message="结算总额不能大于预算总额" ></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 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="number" value="${Utils.format(estimateBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类概算总额"></td>
-                        <td><input name="incomeEngineerBudgetTotal" type="number" value="${Utils.format(budgetBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类预算总额"></td>
-                        <td><input name="incomeEngineerFormerSettleTotal" type="number" value="${Utils.format(formerBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类上月结算总额"></td>
-                        <td><input type="number" min="0.00" max="999999999.99" step="0.01" name="incomeEngineer" required title="工程类本月结算金额"></td>
-                        <td><input type="number" name="incomeEngineerSettleTotal" readonly title="工程类结算总额"></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 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="number" value="${Utils.format(estimateBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类概算总额"></td>
-                        <td><input name="incomeServiceBudgetTotal" type="number" value="${Utils.format(budgetBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类预算总额"></td>
-                        <td><input name="incomeServiceFormerSettleTotal" type="number" value="${Utils.format(formerBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类上月结算总额"></td>
-                        <td><input type="number" min="0.00" max="999999999.99" step="0.01" name="incomeService" required title="服务类本月结算金额"></td>
-                        <td><input type="number" name="incomeServiceSettleTotal" readonly title="服务类结算总额"></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 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="number" value="${Utils.format(estimateBean.getIncomeTotalTaxExclude(),'0')}" readonly required title="此列累计"></td>
-                        <td><input name="incomeBudgetTotal" type="number"  value="${Utils.format(budgetBean.getIncomeTotalTaxExclude(),'0')}" readonly required title="此列累计"></td>
-                        <td><input name="incomeFormerSettleTotal" type="number" value="${Utils.format(formerBean.getIncomeTotalTaxExclude(),'0')}" required readonly title="此列累计"></td>
-                        <td><input type="number" name="incomeTotal" readonly title="此列累计"></td>
-                        <td><input type="number" name="incomeSettleTotal" readonly title="此列累计"></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 type="text" class="number" name="incomeTotal" readonly title="此列累计"></td>
+                        <td><input type="text" class="number" name="incomeSettleTotal" readonly title="此列累计"></td>
                     </tr>
                     </tbody>
                 </table>
@@ -112,74 +112,74 @@
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>设备</td>
-                        <td><input name="costPurchaseDeviceEstimateTotal" type="number" value="${Utils.format(estimateBean.costPurchaseDeviceTaxExclude,'0')}" readonly required title="购买设备概算总额"></td>
-                        <td><input name="costPurchaseDeviceBudgetTotal" type="number" value="${Utils.format(budgetBean.costPurchaseDeviceTaxExclude,'0')}" readonly required title="购买设备预算总额"></td>
-                        <td><input name="costPurchaseDeviceFormerSettleTotal" type="number" value="${Utils.format(formerBean.costPurchaseDeviceTaxExclude,'0')}" required readonly title="购买设备上月结算总额"></td>
-                        <td><input type="number" min="0.00" max="999999999.99" step="0.01" name="costPurchaseDevice" required title="购买设备本月结算总额"></td>
-                        <td><input type="number" name="costPurchaseDeviceSettleTotal" readonly title="购买设备结算总额"></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 type="text" class="number" maxlength="16" name="costPurchaseDevice" required title="购买设备本月结算总额"></td>
+                        <td><input type="text" class="number" name="costPurchaseDeviceSettleTotal" readonly title="购买设备结算总额"></td>
                     </tr>
                     <tr>
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>施工</td>
-                        <td><input name="costPurchaseBuildEstimateTotal" type="number" value="${Utils.format(estimateBean.costPurchaseBuildTaxExclude,'0')}" readonly required title="施工采购成本概算总额"></td>
-                        <td><input name="costPurchaseBuildBudgetTotal" type="number" value="${Utils.format(budgetBean.costPurchaseBuildTaxExclude,'0')}" readonly required title="施工采购成本预算总额"></td>
-                        <td><input name="costPurchaseBuildFormerSettleTotal" type="number" value="${Utils.format(formerBean.costPurchaseBuildTaxExclude,'0')}" required readonly title="施工采购成本上月结算总额"></td>
-                        <td><input type="number" min="0.00" max="999999999.99" step="0.01" name="costPurchaseBuild" required title="施工采购成本本月结算金额"></td>
-                        <td><input type="number" name="costPurchaseBuildSettleTotal" readonly title="施工采购成本结算总额"></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 type="text" class="number" maxlength="16" name="costPurchaseBuild" required title="施工采购成本本月结算金额"></td>
+                        <td><input type="text" class="number" name="costPurchaseBuildSettleTotal" readonly title="施工采购成本结算总额"></td>
                     </tr>
                     <tr>
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>服务</td>
-                        <td><input name="costPurchaseServiceEstimateTotal" type="number" value="${Utils.format(estimateBean.costPurchaseServiceTaxExclude,'0')}" readonly required title="服务采购成本概算总额"></td>
-                        <td><input name="costPurchaseServiceBudgetTotal" type="number" value="${Utils.format(budgetBean.costPurchaseServiceTaxExclude,'0')}" readonly required title="服务采购成本预算总额"></td>
-                        <td><input name="costPurchaseServiceFormerSettleTotal" type="number" value="${Utils.format(formerBean.costPurchaseServiceTaxExclude,'0')}" required readonly title="服务采购成本上月结算总额"></td>
-                        <td><input type="number" min="0.00" max="999999999.99" step="0.01" name="costPurchaseService" required title="服务采购成本本月结算金额"></td>
-                        <td><input type="number" name="costPurchaseServiceSettleTotal" readonly title="服务采购成本结算总额"></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 type="text" class="number" maxlength="16" name="costPurchaseService" required title="服务采购成本本月结算金额"></td>
+                        <td><input type="text" class="number" name="costPurchaseServiceSettleTotal" readonly title="服务采购成本结算总额"></td>
                     </tr>
                     <tr>
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>其他</td>
-                        <td><input name="costPurchaseOtherEstimateTotal" type="number" value="${Utils.format(estimateBean.costPurchaseOtherTaxExclude,'0')}" readonly required title="其他采购成本概算总额"></td>
-                        <td><input name="costPurchaseOtherBudgetTotal" type="number" value="${Utils.format(budgetBean.costPurchaseOtherTaxExclude,'0')}" readonly required title="其他采购成本预算总额"></td>
-                        <td><input name="costPurchaseOtherFormerSettleTotal" type="number" value="${Utils.format(formerBean.costPurchaseOtherTaxExclude,'0')}" required readonly title="其他采购成本上月结算总额"></td>
-                        <td><input type="number" min="0.00" max="999999999.99" step="0.01" name="costPurchaseOther" required title="其他采购成本本月结算金额"></td>
-                        <td><input type="number" name="costPurchaseOtherSettleTotal" readonly title="其他采购成本结算总额"></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 type="text" class="number" maxlength="16" name="costPurchaseOther" required title="其他采购成本本月结算金额"></td>
+                        <td><input type="text" class="number" name="costPurchaseOtherSettleTotal" readonly title="其他采购成本结算总额"></td>
                     </tr>
                     <tr>
                         <td>成本</td>
                         <td>项目管理成本</td>
                         <td>项目管理成本</td>
-                        <td><input name="costProjectManageEstimateTotal" type="number" value="${Utils.format(estimateBean.costProjectManageTaxExclude,'0')}" readonly required title="项目管理成本概算总额"></td>
-                        <td><input name="costProjectManageBudgetTotal" type="number" value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0')}" readonly required title="项目管理成本预算总额"></td>
-                        <td><input name="costProjectManageFormerSettleTotal" type="number" value="${Utils.format(formerBean.costProjectManageTaxExclude,'0')}" required readonly title="项目管理成本上月结算总额"></td>
-                        <td><input type="number" min="0.00" max="999999999.99" step="0.01" name="costProjectManage" required title="项目管理成本本月结算金额">
+                        <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 type="text" class="number" maxlength="16" name="costProjectManage" required title="项目管理成本本月结算金额">
                             <span>人力成本：${Utils.format(salary,'0')} 元</span>
                         </td>
-                        <td><input type="number" name="costProjectManageSettleTotal" readonly title="项目管理成本结算总额"></td>
+                        <td><input type="text" class="number" name="costProjectManageSettleTotal" readonly title="项目管理成本结算总额"></td>
                     </tr>
                     <tr>
                         <td>成本</td>
                         <td>其他</td>
                         <td><input type="text" id="otherName" maxlength="10" data-validate-async data-validation-message="请输入其他中的小类名称（10字符以内）"
                                    value="${project.otherName!}" name="otherName" placeholder="请输入其他中的小类名称（10字符以内）" readonly required/> </td>
-                        <td><input name="costOtherEstimateTotal" type="number" value="${Utils.format(estimateBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本概算总额"></td>
-                        <td><input name="costOtherBudgetTotal" type="number" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本预算总额"></td>
-                        <td><input name="costOtherFormerSettleTotal" type="number" value="${Utils.format(formerBean.costOtherOtherTaxExclude,'0')}" required readonly title="其他成本上月结算总额"></td>
-                        <td><input type="number" min="0.00" max="999999999.99" step="0.01" name="costOther" required title="其他成本本月结算金额"></td>
-                        <td><input type="number" name="costOtherSettleTotal" readonly title="其他成本结算总额"></td>
+                        <td><input name="costOtherEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本概算总额"></td>
+                        <td><input name="costOtherBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本预算总额"></td>
+                        <td><input name="costOtherFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costOtherOtherTaxExclude,'0')}" required readonly title="其他成本上月结算总额"></td>
+                        <td><input type="text" class="number" maxlength="16" name="costOther" required title="其他成本本月结算金额"></td>
+                        <td><input type="text" class="number" name="costOtherSettleTotal" readonly title="其他成本结算总额"></td>
                     </tr>
                     <tr>
                         <td>合计</td>
                         <td></td>
                         <td></td>
-                        <td><input name="costEstimateTotal" value="${Utils.format(estimateBean.getCostTotalTaxExclude(),'0')}" type="number" readonly required title="此列累计"></td>
-                        <td><input name="costBudgetTotal" value="${Utils.format(budgetBean.getCostTotalTaxExclude(),'0')}" type="number" readonly required title="此列累计"></td>
-                        <td><input name="costFormerSettleTotal" type="number" value="${Utils.format(formerBean.getCostTotalTaxExclude(),'0')}" required readonly title="此列累计"></td>
-                        <td><input type="number" name="costTotal" readonly title="此列累计"></td>
-                        <td><input type="number" name="costSettleTotal" readonly title="此列累计"></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 type="text" class="number" name="costTotal" readonly title="此列累计"></td>
+                        <td><input type="text" class="number" name="costSettleTotal" readonly title="此列累计"></td>
                     </tr>
                     </tbody>
                 </table>
@@ -198,38 +198,38 @@
                     <tr>
                         <td>财务费用</td>
                         <td>资金占用成本</td>
-                        <td><input name="costExpropriationEstimateTotal" type="number" value="${Utils.format(estimateBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本概算总额"></td>
-                        <td><input name="costExpropriationBudgetTotal" type="number" value="${Utils.format(budgetBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本预算总额"></td>
-                        <td><input name="costExpropriationFormerSettleTotal" type="number" value="${Utils.format(formerBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本上月结算总额"></td>
-                        <td><input type="number" min="0.00" max="999999999.99" step="0.01" name="costExpropriation" required title="资金占用成本本月结算金额"></td>
-                        <td><input type="number" name="costExpropriationSettleTotal" readonly title="资金占用成本结算总额"></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 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="number" value="${Utils.format(estimateBean.costCompanyManageTaxExclude,'0')}" required readonly title="公司管理费用概算总额"></td>
-                        <td><input name="costCompanyManageBudgetTotal" type="number" value="${Utils.format(budgetBean.costCompanyManageTaxExclude,'0')}" required readonly title="公司管理费用预算总额"></td>
-                        <td><input name="costCompanyManageFormerSettleTotal" type="number" value="${Utils.format(formerBean.costCompanyManageTaxExclude,'0')}" required readonly title="公司管理费用上月结算总额"></td>
-                        <td><input type="number" min="0.00" max="999999999.99" step="0.01" name="costCompanyManage" required title="公司管理费用本月结算金额"></td>
-                        <td><input type="number" name="costCompanyManageSettleTotal" readonly title="公司管理费用结算总额"></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 type="text" class="number" maxlength="16" name="costCompanyManage" required title="公司管理费用本月结算金额"></td>
+                        <td><input type="text" class="number" name="costCompanyManageSettleTotal" readonly title="公司管理费用结算总额"></td>
                     </tr>
                     <tr>
                         <td>所得税费用</td>
                         <td></td>
                         <td>/</td>
                         <td>/</td>
-                        <td><input name="costIncomeTaxFormerSettleTotal" type="number" value="${Utils.format(formerBean.costIncomeTax,'0')}" required readonly title="公司管理费用上月结算总额"></td>
-                        <td><input type="number" min="0.00" max="999999999.99" step="0.01" name="costIncomeTax" required title="公司管理费用本月结算金额"></td>
-                        <td><input type="number" name="costIncomeTaxSettleTotal" readonly title="公司管理费用结算总额"></td>
+                        <td><input name="costIncomeTaxFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costIncomeTax,'0')}" 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="number" readonly required title="此列累计"></td>
-                        <td><input name="costManageBudgetTotal" value="${Utils.format(budgetBean.costExpropriationTaxExclude + budgetBean.costCompanyManageTaxExclude,'0')}" type="number" readonly required title="此列累计"></td>
-                        <td><input name="costManageFormerSettleTotal" type="number" value="${Utils.format(formerBean.costManageTotal,'0')}" required readonly title="此列累计"></td>
-                        <td><input type="number" name="costManageTotal" readonly title="此列累计"></td>
-                        <td><input type="number" name="costManageSettleTotal" readonly title="此列累计"></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 type="text" class="number" name="costManageTotal" readonly title="此列累计"></td>
+                        <td><input type="text" class="number" name="costManageSettleTotal" readonly title="此列累计"></td>
                     </tr>
                     </tbody>
                 </table>
@@ -248,30 +248,30 @@
                     </tr>
                     <tr>
                         <td>项目毛利</td>
-                        <td><input name="grossProfitEstimateTotal" type="number" value="${Utils.format(estimateBean.getProjectGrossProfit(),'0')}" required readonly title="项目毛利概算总额"></td>
-                        <td><input name="grossProfitBudgetTotal" type="number" value="${Utils.format(budgetBean.getProjectGrossProfit(),'0')}" required readonly title="项目毛利预算总额"></td>
-                        <td><input name="grossProfitFormerSettleTotal" type="number" value="${Utils.format(formerBean.grossProfit,'0')}" required readonly title="项目毛利上月结算总额"></td>
-                        <td><input type="number" max="999999999.99" step="0.01" name="grossProfit" readonly required title="项目毛利本月结算金额"></td>
-                        <td><input type="number" name="grossProfitSettleTotal" readonly title="项目毛利结算总额"></td>
-                        <td><input name="grossProfitProfitMargin" type="number" readonly title="项目毛利利润率"></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 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="number" value="${Utils.format(estimateBean.getProjectContributionProfit(),'0')}" required readonly title="项目贡献利润概算总额"></td>
-                        <td><input name="contributionProfitBudgetTotal" type="number" value="${Utils.format(budgetBean.getProjectContributionProfit(),'0')}" required readonly title="项目贡献利润预算总额"></td>
-                        <td><input name="contributionProfitFormerSettleTotal" type="number" value="${Utils.format(formerBean.contributionProfit,'0')}" required readonly title="项目贡献利润上月结算总额"></td>
-                        <td><input type="number" max="999999999.99" step="0.01" name="contributionProfit" readonly required title="项目贡献利润本月结算金额"></td>
-                        <td><input type="number" name="contributionProfitSettleTotal" readonly title="项目贡献利润结算总额"></td>
-                        <td><input name="contributionProfitProfitMargin" type="number" readonly title="项目贡献利润利润率"></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 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>
                     </tr>
                     <tr>
                         <td>项目净利润</td>
                         <td>/</td>
                         <td>/</td>
-                        <td><input name="netProfitFormerSettleTotal" type="number" value="${Utils.format(formerBean.netProfit,'0')}" required readonly title="项目净利润上月结算总额"></td>
-                        <td><input type="number" max="999999999.99" step="0.01" name="netProfit" readonly required title="项目净利润本月结算金额"></td>
-                        <td><input type="number" name="netProfitSettleTotal" readonly title="项目净利润结算总额"></td>
-                        <td><input name="netProfitProfitMargin" type="number" readonly title="项目净利润利润率"></td>
+                        <td><input name="netProfitFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.netProfit,'0')}" 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>
                     </tr>
                     </tbody>
                 </table>
@@ -288,101 +288,101 @@
                     </tr>
                     <tr>
                         <td>销售商品、提供劳务收到的现金</td>
-                        <td><input name="saleIncomeCashBudget" type="number" value="${Utils.format(cashFlowBean.saleIncomeCash,'0')}" readonly required title="预算总额"></td>
-                        <td><input name="saleIncomeCashFormerSettle" type="number" value="${Utils.format(formerBean.saleIncomeCash,'0')}" required readonly title="上月结算总额"></td>
-                        <td><input type="number" min="0.00" max="999999999.99" step="0.01" name="saleIncomeCash" required title="本月结算金额"></td>
-                        <td><input name="saleIncomeCashSettle" type="number" readonly title="结算总额"></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 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="number" value="${Utils.format(formerBean.taxReturn,'0')}" required readonly title="上月结算总额"></td>
-                        <td><input type="number" min="0.00" max="999999999.99" step="0.01" name="taxReturn" required title="本月结算金额"></td>
-                        <td><input name="taxReturnSettle" type="number" readonly title="结算总额"></td>
+                        <td><input name="taxReturnFormerSettle" type="text" class="number" value="${Utils.format(formerBean.taxReturn,'0')}" 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="number" value="${Utils.format(cashFlowBean.earnestMoneyIncome,'0')}" readonly required title="预算总额"></td>
-                        <td><input name="earnestMoneyIncomeFormerSettle" type="number" value="${Utils.format(formerBean.earnestMoneyIncome,'0')}" required readonly title="上月结算总额"></td>
-                        <td><input type="number" min="0.00" max="999999999.99" step="0.01" name="earnestMoneyIncome" required title="本月结算金额"></td>
-                        <td><input name="earnestMoneyIncomeSettle" type="number" readonly title="结算总额"></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 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="number" value="${Utils.format(cashFlowBean.purchaseCost,'0')}" readonly required title="预算总额"></td>
-                        <td><input name="purchaseCostFormerSettle" type="number" value="${Utils.format(formerBean.purchaseCost,'0')}" required readonly title="上月结算总额"></td>
-                        <td><input type="number" min="0.00" max="999999999.99" step="0.01" name="purchaseCost" required title="本月结算金额"></td>
-                        <td><input name="purchaseCostSettle" type="number" readonly title="结算总额"></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 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="number" value="${Utils.format(formerBean.taxCost,'0')}" required readonly title="上月结算总额"></td>
-                        <td><input type="number" min="0.00" max="999999999.99" step="0.01" name="taxCost" required title="本月结算金额"></td>
-                        <td><input name="taxCostSettle" type="number" readonly title="结算总额"></td>
+                        <td><input name="taxCostFormerSettle" type="text" class="number" value="${Utils.format(formerBean.taxCost,'0')}" 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="number" value="${Utils.format(cashFlowBean.earnestMoneyCost,'0')}" readonly required title="预算总额"></td>
-                        <td><input name="earnestMoneyCostFormerSettle" type="number" value="${Utils.format(formerBean.earnestMoneyCost,'0')}" required readonly title="上月结算总额"></td>
-                        <td><input type="number" min="0.00" max="999999999.99" step="0.01" name="earnestMoneyCost" required title="本月结算金额"></td>
-                        <td><input name="earnestMoneyCostSettle" type="number" readonly title="结算总额"></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 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="number" value="${Utils.format(cashFlowBean.getNetCashFlow(),'0')}" readonly required title="预算总额"></td>
-                        <td><input name="netCashFlowFormerSettle" type="number" value="${Utils.format(formerBean.netCashFlow,'0')}" required readonly title="上月结算总额"></td>
-                        <td><input type="number" max="999999999.99" step="0.01" name="netCashFlow" readonly required title="本月结算金额"></td>
-                        <td><input name="netCashFlowSettle" type="number" readonly title="结算总额"></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 type="text" class="number" maxlength="16" 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="number" value="${Utils.format(formerBean.cashInflowFromInvestingActivities,'0')}" required readonly title="上月结算总额"></td>
-                        <td><input type="number" min="0.00" max="999999999.99" step="0.01" name="cashInflowFromInvestingActivities" required title="本月结算金额"></td>
-                        <td><input name="cashInflowFromInvestingActivitiesSettle" type="number" readonly title="结算总额"></td>
+                        <td><input name="cashInflowFromInvestingActivitiesFormerSettle" type="text" class="number" value="${Utils.format(formerBean.cashInflowFromInvestingActivities,'0')}" 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="number" value="${Utils.format(formerBean.cashOutflowFromInvestingActivities,'0')}" required readonly title="上月结算总额"></td>
-                        <td><input type="number" min="0.00" max="999999999.99" step="0.01" name="cashOutflowFromInvestingActivities" required title="本月结算金额"></td>
-                        <td><input name="cashOutflowFromInvestingActivitiesSettle" type="number" readonly title="结算总额"></td>
+                        <td><input name="cashOutflowFromInvestingActivitiesFormerSettle" type="text" class="number" value="${Utils.format(formerBean.cashOutflowFromInvestingActivities,'0')}" 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="number" value="${Utils.format(formerBean.netCashFromInvestingActivities,'0')}" required readonly title="上月结算总额"></td>
-                        <td><input type="number" max="999999999.99" step="0.01" name="netCashFromInvestingActivities" readonly required title="本月结算金额"></td>
-                        <td><input name="netCashFromInvestingActivitiesSettle" type="number" readonly title="结算总额"></td>
+                        <td><input name="netCashFromInvestingActivitiesFormerSettle" type="text" class="number" value="${Utils.format(formerBean.netCashFromInvestingActivities,'0')}" required readonly title="上月结算总额"></td>
+                        <td><input type="text" class="number" maxlength="16" 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="number" value="${Utils.format(cashFlowBean.financingCapitalInflow,'0')}" readonly required title="预算总额"></td>
-                        <td><input name="financingCapitalInflowFormerSettle" type="number" value="${Utils.format(formerBean.financingCapitalInflow,'0')}" required readonly title="上月结算总额"></td>
-                        <td><input type="number" min="0.00" max="999999999.99" step="0.01" name="financingCapitalInflow" required title="本月结算金额"></td>
-                        <td><input name="financingCapitalInflowSettle" type="number" readonly title="结算总额"></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 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="number" value="${Utils.format(cashFlowBean.financingCapitalOutflow,'0')}" readonly required title="预算总额"></td>
-                        <td><input name="financingCapitalOutflowFormerSettle" type="number" value="${Utils.format(formerBean.financingCapitalOutflow,'0')}" required readonly title="上月结算总额"></td>
-                        <td><input type="number" min="0.00" max="999999999.99" step="0.01" name="financingCapitalOutflow" required title="本月结算金额"></td>
-                        <td><input name="financingCapitalOutflowSettle" type="number" readonly title="结算总额"></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 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="number" value="${Utils.format(cashFlowBean.getFinancingCapitalCashflow(),'0')}" readonly required title="预算总额"></td>
-                        <td><input name="financingCapitalCashflowFormerSettle" type="number" value="${Utils.format(formerBean.financingCapitalCashflow,'0')}" required readonly title="上月结算总额"></td>
-                        <td><input type="number" max="999999999.99" step="0.01" name="financingCapitalCashflow" readonly required title="本月结算金额"></td>
-                        <td><input name="financingCapitalCashflowSettle" type="number" readonly title="结算总额"></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 type="text" class="number" maxlength="16" 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="number" value="${Utils.format(cashFlowBean.getNetIncreaseMonetaryFunds(),'0')}" readonly required title="预算总额"></td>
-                        <td><input name="netIncreaseMonetaryFundsFormerSettle" type="number" value="${Utils.format(formerBean.netIncreaseMonetaryFunds,'0')}" required readonly title="上月结算总额"></td>
-                        <td><input type="number" max="999999999.99" step="0.01" name="netIncreaseMonetaryFunds" readonly required title="本月结算金额"></td>
-                        <td><input name="netIncreaseMonetaryFundsSettle" type="number" readonly title="结算总额"></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 type="text" class="number" maxlength="16" name="netIncreaseMonetaryFunds" readonly required title="本月结算金额"></td>
+                        <td><input name="netIncreaseMonetaryFundsSettle" type="text" class="number" readonly title="结算总额"></td>
                     </tr>
                     </tbody>
                 </table>
diff --git a/src/main/resources/templates/admin/project_settle_edit.ftl b/src/main/resources/templates/admin/project_settle_edit.ftl
index 1c639b2..c305e76 100644
--- a/src/main/resources/templates/admin/project_settle_edit.ftl
+++ b/src/main/resources/templates/admin/project_settle_edit.ftl
@@ -59,38 +59,38 @@
                     <tr>
                         <td>收入</td>
                         <td>设备类</td>
-                        <td><input name="incomeDeviceEstimateTotal" type="number" value="${Utils.format(estimateBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类概算总额"></td>
-                        <td><input name="incomeDeviceBudgetTotal" type="number" value="${Utils.format(budgetBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类预算总额"></td>
-                        <td><input name="incomeDeviceFormerSettleTotal" type="number" value="${Utils.format(formerBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类上月结算总额"></td>
-                        <td><input type="number" min="0.00" max="999999999.99" step="0.01" name="incomeDevice" value="${Utils.format(monthBean.incomeDevice,'0')}" required title="本月结算金额"></td>
-                        <td><input type="number" name="incomeDeviceSettleTotal" value="${Utils.format(currentBean.incomeDeviceTaxExclude,'0')}" readonly title="设备类结算总额" data-validate-async data-validation-message="结算总额不能大于预算总额"></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 type="text" class="number" maxlength="16" name="incomeDevice" value="${Utils.format(monthBean.incomeDevice,'0')}" required title="本月结算金额"></td>
+                        <td><input type="text" class="number" name="incomeDeviceSettleTotal" value="${Utils.format(currentBean.incomeDeviceTaxExclude,'0')}" readonly title="设备类结算总额" data-validate-async data-validation-message="结算总额不能大于预算总额"></td>
                     </tr>
                     <tr>
                         <td>收入</td>
                         <td>工程类</td>
-                        <td><input name="incomeEngineerEstimateTotal" type="number" value="${Utils.format(estimateBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类概算总额"></td>
-                        <td><input name="incomeEngineerBudgetTotal" type="number" value="${Utils.format(budgetBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类预算总额"></td>
-                        <td><input name="incomeEngineerFormerSettleTotal" type="number" value="${Utils.format(formerBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类上月结算总额"></td>
-                        <td><input type="number" min="0.00" max="999999999.99" step="0.01" name="incomeEngineer" value="${Utils.format(monthBean.incomeEngineer,'0')}" required title="工程类本月结算金额"></td>
-                        <td><input type="number" name="incomeEngineerSettleTotal" value="${Utils.format(currentBean.incomeEngineerTaxExclude,'0')}" readonly title="工程类结算总额"></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 type="text" class="number" maxlength="16" name="incomeEngineer" value="${Utils.format(monthBean.incomeEngineer,'0')}" required title="工程类本月结算金额"></td>
+                        <td><input type="text" class="number" name="incomeEngineerSettleTotal" value="${Utils.format(currentBean.incomeEngineerTaxExclude,'0')}" readonly title="工程类结算总额"></td>
                     </tr>
                     <tr>
                         <td>收入</td>
                         <td>服务类</td>
-                        <td><input name="incomeServiceEstimateTotal" type="number" value="${Utils.format(estimateBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类概算总额"></td>
-                        <td><input name="incomeServiceBudgetTotal" type="number" value="${Utils.format(budgetBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类预算总额"></td>
-                        <td><input name="incomeServiceFormerSettleTotal" type="number" value="${Utils.format(formerBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类上月结算总额"></td>
-                        <td><input type="number" min="0.00" max="999999999.99" step="0.01" name="incomeService" value="${Utils.format(monthBean.incomeService,'0')}" required title="服务类本月结算金额"></td>
-                        <td><input type="number" name="incomeServiceSettleTotal" value="${Utils.format(currentBean.incomeServiceTaxExclude,'0')}" readonly title="服务类结算总额"></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 type="text" class="number" maxlength="16" name="incomeService" value="${Utils.format(monthBean.incomeService,'0')}" required title="服务类本月结算金额"></td>
+                        <td><input type="text" class="number" name="incomeServiceSettleTotal" value="${Utils.format(currentBean.incomeServiceTaxExclude,'0')}" readonly title="服务类结算总额"></td>
                     </tr>
                     <tr>
                         <td>合计</td>
                         <td></td>
-                        <td><input name="incomeEstimateTotal" type="number" value="${Utils.format(estimateBean.getIncomeTotalTaxExclude(),'0')}" readonly required title="此列累计"></td>
-                        <td><input name="incomeBudgetTotal" type="number"  value="${Utils.format(budgetBean.getIncomeTotalTaxExclude(),'0')}" readonly required title="此列累计"></td>
-                        <td><input name="incomeFormerSettleTotal" type="number" value="${Utils.format(formerBean.getIncomeTotalTaxExclude(),'0')}" required readonly title="此列累计"></td>
-                        <td><input type="number" name="incomeTotal" value="${Utils.format(monthBean.getIncomeTotal(),'0')}" readonly title="此列累计"></td>
-                        <td><input type="number" name="incomeSettleTotal" value="${Utils.format(currentBean.getIncomeTotalTaxExclude(),'0')}" readonly title="此列累计"></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 type="text" class="number" name="incomeTotal" value="${Utils.format(monthBean.getIncomeTotal(),'0')}" readonly title="此列累计"></td>
+                        <td><input type="text" class="number" name="incomeSettleTotal" value="${Utils.format(currentBean.getIncomeTotalTaxExclude(),'0')}" readonly title="此列累计"></td>
                     </tr>
                     </tbody>
                 </table>
@@ -111,73 +111,73 @@
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>设备</td>
-                        <td><input name="costPurchaseDeviceEstimateTotal" type="number" value="${Utils.format(estimateBean.costPurchaseDeviceTaxExclude,'0')}" readonly required title="购买设备概算总额"></td>
-                        <td><input name="costPurchaseDeviceBudgetTotal" type="number" value="${Utils.format(budgetBean.costPurchaseDeviceTaxExclude,'0')}" readonly required title="购买设备预算总额"></td>
-                        <td><input name="costPurchaseDeviceFormerSettleTotal" type="number" value="${Utils.format(formerBean.costPurchaseDeviceTaxExclude,'0')}" required readonly title="购买设备上月结算总额"></td>
-                        <td><input type="number" min="0.00" max="999999999.99" step="0.01" name="costPurchaseDevice" value="${Utils.format(monthBean.costPurchaseDevice,'0')}" required title="购买设备本月结算总额"></td>
-                        <td><input type="number" name="costPurchaseDeviceSettleTotal" value="${Utils.format(currentBean.costPurchaseDeviceTaxExclude,'0')}" readonly title="购买设备结算总额"></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 type="text" class="number" maxlength="16" name="costPurchaseDevice" value="${Utils.format(monthBean.costPurchaseDevice,'0')}" required title="购买设备本月结算总额"></td>
+                        <td><input type="text" class="number" name="costPurchaseDeviceSettleTotal" value="${Utils.format(currentBean.costPurchaseDeviceTaxExclude,'0')}" readonly title="购买设备结算总额"></td>
                     </tr>
                     <tr>
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>施工</td>
-                        <td><input name="costPurchaseBuildEstimateTotal" type="number" value="${Utils.format(estimateBean.costPurchaseBuildTaxExclude,'0')}" readonly required title="施工采购成本概算总额"></td>
-                        <td><input name="costPurchaseBuildBudgetTotal" type="number" value="${Utils.format(budgetBean.costPurchaseBuildTaxExclude,'0')}" readonly required title="施工采购成本预算总额"></td>
-                        <td><input name="costPurchaseBuildFormerSettleTotal" type="number" value="${Utils.format(formerBean.costPurchaseBuildTaxExclude,'0')}" required readonly title="施工采购成本上月结算总额"></td>
-                        <td><input type="number" min="0.00" max="999999999.99" step="0.01" name="costPurchaseBuild" value="${Utils.format(monthBean.costPurchaseBuild,'0')}" required title="施工采购成本本月结算金额"></td>
-                        <td><input type="number" name="costPurchaseBuildSettleTotal" value="${Utils.format(currentBean.costPurchaseBuildTaxExclude,'0')}" readonly title="施工采购成本结算总额"></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 type="text" class="number" maxlength="16" name="costPurchaseBuild" value="${Utils.format(monthBean.costPurchaseBuild,'0')}" required title="施工采购成本本月结算金额"></td>
+                        <td><input type="text" class="number" name="costPurchaseBuildSettleTotal" value="${Utils.format(currentBean.costPurchaseBuildTaxExclude,'0')}" readonly title="施工采购成本结算总额"></td>
                     </tr>
                     <tr>
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>服务</td>
-                        <td><input name="costPurchaseServiceEstimateTotal" type="number" value="${Utils.format(estimateBean.costPurchaseServiceTaxExclude,'0')}" readonly required title="服务采购成本概算总额"></td>
-                        <td><input name="costPurchaseServiceBudgetTotal" type="number" value="${Utils.format(budgetBean.costPurchaseServiceTaxExclude,'0')}" readonly required title="服务采购成本预算总额"></td>
-                        <td><input name="costPurchaseServiceFormerSettleTotal" type="number" value="${Utils.format(formerBean.costPurchaseServiceTaxExclude,'0')}" required readonly title="服务采购成本上月结算总额"></td>
-                        <td><input type="number" min="0.00" max="999999999.99" step="0.01" name="costPurchaseService" value="${Utils.format(monthBean.costPurchaseService,'0')}" required title="服务采购成本本月结算金额"></td>
-                        <td><input type="number" name="costPurchaseServiceSettleTotal" value="${Utils.format(currentBean.costPurchaseServiceTaxExclude,'0')}" readonly title="服务采购成本结算总额"></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 type="text" class="number" maxlength="16" name="costPurchaseService" value="${Utils.format(monthBean.costPurchaseService,'0')}" required title="服务采购成本本月结算金额"></td>
+                        <td><input type="text" class="number" name="costPurchaseServiceSettleTotal" value="${Utils.format(currentBean.costPurchaseServiceTaxExclude,'0')}" readonly title="服务采购成本结算总额"></td>
                     </tr>
                     <tr>
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>其他</td>
-                        <td><input name="costPurchaseOtherEstimateTotal" type="number" value="${Utils.format(estimateBean.costPurchaseOtherTaxExclude,'0')}" readonly required title="其他采购成本概算总额"></td>
-                        <td><input name="costPurchaseOtherBudgetTotal" type="number" value="${Utils.format(budgetBean.costPurchaseOtherTaxExclude,'0')}" readonly required title="其他采购成本预算总额"></td>
-                        <td><input name="costPurchaseOtherFormerSettleTotal" type="number" value="${Utils.format(formerBean.costPurchaseOtherTaxExclude,'0')}" required readonly title="其他采购成本上月结算总额"></td>
-                        <td><input type="number" min="0.00" max="999999999.99" step="0.01" name="costPurchaseOther" value="${Utils.format(monthBean.costPurchaseOther,'0')}" required title="其他采购成本本月结算金额"></td>
-                        <td><input type="number" name="costPurchaseOtherSettleTotal" value="${Utils.format(currentBean.costPurchaseOtherTaxExclude,'0')}" readonly title="其他采购成本结算总额"></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 type="text" class="number" maxlength="16" name="costPurchaseOther" value="${Utils.format(monthBean.costPurchaseOther,'0')}" required title="其他采购成本本月结算金额"></td>
+                        <td><input type="text" class="number" name="costPurchaseOtherSettleTotal" value="${Utils.format(currentBean.costPurchaseOtherTaxExclude,'0')}" readonly title="其他采购成本结算总额"></td>
                     </tr>
                     <tr>
                         <td>成本</td>
                         <td>项目管理成本</td>
                         <td>项目管理成本</td>
-                        <td><input name="costProjectManageEstimateTotal" type="number" value="${Utils.format(estimateBean.costProjectManageTaxExclude,'0')}" readonly required title="项目管理成本概算总额"></td>
-                        <td><input name="costProjectManageBudgetTotal" type="number" value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0')}" readonly required title="项目管理成本预算总额"></td>
-                        <td><input name="costProjectManageFormerSettleTotal" type="number" value="${Utils.format(formerBean.costProjectManageTaxExclude,'0')}" required readonly title="项目管理成本上月结算总额"></td>
-                        <td><input type="number" min="0.00" max="999999999.99" step="0.01" name="costProjectManage" value="${Utils.format(monthBean.costProjectManage,'0')}" required title="项目管理成本本月结算金额">
+                        <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 type="text" class="number" maxlength="16" name="costProjectManage" value="${Utils.format(monthBean.costProjectManage,'0')}" required title="项目管理成本本月结算金额">
                             <span>人力成本：${Utils.format(salary,'0')} 元</span>
-                        <td><input type="number" name="costProjectManageSettleTotal" value="${Utils.format(currentBean.costProjectManageTaxExclude,'0')}" readonly title="项目管理成本结算总额"></td>
+                        <td><input type="text" class="number" name="costProjectManageSettleTotal" value="${Utils.format(currentBean.costProjectManageTaxExclude,'0')}" readonly title="项目管理成本结算总额"></td>
                     </tr>
                     <tr>
                         <td>成本</td>
                         <td>其他</td>
                         <td><input type="text" id="otherName" maxlength="10" data-validate-async data-validation-message="请输入其他中的小类名称（10字符以内）"
                                    value="${project.otherName!}" name="otherName" placeholder="请输入其他中的小类名称（10字符以内）" readonly required/> </td>
-                        <td><input name="costOtherEstimateTotal" type="number" value="${Utils.format(estimateBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本概算总额"></td>
-                        <td><input name="costOtherBudgetTotal" type="number" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本预算总额"></td>
-                        <td><input name="costOtherFormerSettleTotal" type="number" value="${Utils.format(formerBean.costOtherOtherTaxExclude,'0')}" required readonly title="其他成本上月结算总额"></td>
-                        <td><input type="number" min="0.00" max="999999999.99" step="0.01" name="costOther" value="${Utils.format(monthBean.costOther,'0')}" required title="其他成本本月结算金额"></td>
-                        <td><input type="number" name="costOtherSettleTotal" value="${Utils.format(currentBean.costOtherOtherTaxExclude,'0')}" readonly title="其他成本结算总额"></td>
+                        <td><input name="costOtherEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本概算总额"></td>
+                        <td><input name="costOtherBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本预算总额"></td>
+                        <td><input name="costOtherFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costOtherOtherTaxExclude,'0')}" required readonly title="其他成本上月结算总额"></td>
+                        <td><input type="text" class="number" maxlength="16" name="costOther" value="${Utils.format(monthBean.costOther,'0')}" required title="其他成本本月结算金额"></td>
+                        <td><input type="text" class="number" name="costOtherSettleTotal" value="${Utils.format(currentBean.costOtherOtherTaxExclude,'0')}" readonly title="其他成本结算总额"></td>
                     </tr>
                     <tr>
                         <td>合计</td>
                         <td></td>
                         <td></td>
-                        <td><input name="costEstimateTotal" value="${Utils.format(estimateBean.getCostTotalTaxExclude(),'0')}" type="number" readonly required title="此列累计"></td>
-                        <td><input name="costBudgetTotal" value="${Utils.format(budgetBean.getCostTotalTaxExclude(),'0')}" type="number" readonly required title="此列累计"></td>
-                        <td><input name="costFormerSettleTotal" type="number" value="${Utils.format(formerBean.getCostTotalTaxExclude(),'0')}" required readonly title="此列累计"></td>
-                        <td><input type="number" name="costTotal" value="${Utils.format(monthBean.getCostTotal(),'0')}" readonly title="此列累计"></td>
-                        <td><input type="number" name="costSettleTotal" value="${Utils.format(currentBean.getCostTotalTaxExclude(),'0')}" readonly title="此列累计"></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 type="text" class="number" name="costTotal" value="${Utils.format(monthBean.getCostTotal(),'0')}" readonly title="此列累计"></td>
+                        <td><input type="text" class="number" name="costSettleTotal" value="${Utils.format(currentBean.getCostTotalTaxExclude(),'0')}" readonly title="此列累计"></td>
                     </tr>
                     </tbody>
                 </table>
@@ -196,38 +196,38 @@
                     <tr>
                         <td>财务费用</td>
                         <td>资金占用成本</td>
-                        <td><input name="costExpropriationEstimateTotal" type="number" value="${Utils.format(estimateBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本概算总额"></td>
-                        <td><input name="costExpropriationBudgetTotal" type="number" value="${Utils.format(budgetBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本预算总额"></td>
-                        <td><input name="costExpropriationFormerSettleTotal" type="number" value="${Utils.format(formerBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本上月结算总额"></td>
-                        <td><input type="number" min="0.00" max="999999999.99" step="0.01" name="costExpropriation" value="${Utils.format(monthBean.costExpropriation,'0')}" required title="资金占用成本本月结算金额"></td>
-                        <td><input type="number" name="costExpropriationSettleTotal" value="${Utils.format(currentBean.costExpropriationTaxExclude,'0')}" readonly title="资金占用成本结算总额"></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 type="text" class="number" maxlength="16" name="costExpropriation" value="${Utils.format(monthBean.costExpropriation,'0')}" required title="资金占用成本本月结算金额"></td>
+                        <td><input type="text" class="number" name="costExpropriationSettleTotal" value="${Utils.format(currentBean.costExpropriationTaxExclude,'0')}" readonly title="资金占用成本结算总额"></td>
                     </tr>
                     <tr>
                         <td>公司管理费用</td>
                         <td></td>
-                        <td><input name="costCompanyManageEstimateTotal" type="number" value="${Utils.format(estimateBean.costCompanyManageTaxExclude,'0')}" required readonly title="公司管理费用概算总额"></td>
-                        <td><input name="costCompanyManageBudgetTotal" type="number" value="${Utils.format(budgetBean.costCompanyManageTaxExclude,'0')}" required readonly title="公司管理费用预算总额"></td>
-                        <td><input name="costCompanyManageFormerSettleTotal" type="number" value="${Utils.format(formerBean.costCompanyManageTaxExclude,'0')}" required readonly title="公司管理费用上月结算总额"></td>
-                        <td><input type="number" min="0.00" max="999999999.99" step="0.01" name="costCompanyManage" value="${Utils.format(monthBean.costCompanyManage,'0')}" required title="公司管理费用本月结算金额"></td>
-                        <td><input type="number" name="costCompanyManageSettleTotal" value="${Utils.format(currentBean.costCompanyManageTaxExclude,'0')}" readonly title="公司管理费用结算总额"></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 type="text" class="number" maxlength="16" name="costCompanyManage" value="${Utils.format(monthBean.costCompanyManage,'0')}" required title="公司管理费用本月结算金额"></td>
+                        <td><input type="text" class="number" name="costCompanyManageSettleTotal" value="${Utils.format(currentBean.costCompanyManageTaxExclude,'0')}" readonly title="公司管理费用结算总额"></td>
                     </tr>
                     <tr>
                         <td>所得税费用</td>
                         <td></td>
                         <td>/</td>
                         <td>/</td>
-                        <td><input name="costIncomeTaxFormerSettleTotal" type="number" value="${Utils.format(formerBean.costIncomeTax,'0')}" required readonly title="公司管理费用上月结算总额"></td>
-                        <td><input type="number" min="0.00" max="999999999.99" step="0.01" name="costIncomeTax" value="${Utils.format(monthBean.costIncomeTax,'0')}" required title="公司管理费用本月结算金额"></td>
-                        <td><input type="number" name="costIncomeTaxSettleTotal" value="${Utils.format(currentBean.costIncomeTax,'0')}" readonly title="公司管理费用结算总额"></td>
+                        <td><input name="costIncomeTaxFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costIncomeTax,'0')}" required readonly title="公司管理费用上月结算总额"></td>
+                        <td><input type="text" class="number" maxlength="16" name="costIncomeTax" value="${Utils.format(monthBean.costIncomeTax,'0')}" required title="公司管理费用本月结算金额"></td>
+                        <td><input type="text" class="number" name="costIncomeTaxSettleTotal" value="${Utils.format(currentBean.costIncomeTax,'0')}" readonly title="公司管理费用结算总额"></td>
                     </tr>
                     <tr>
                         <td>合计</td>
                         <td></td>
-                        <td><input name="costManageEstimateTotal" value="${Utils.format(estimateBean.costExpropriationTaxExclude + estimateBean.costCompanyManageTaxExclude,'0')}" type="number" readonly required title="此列累计"></td>
-                        <td><input name="costManageBudgetTotal" value="${Utils.format(budgetBean.costExpropriationTaxExclude + budgetBean.costCompanyManageTaxExclude,'0')}" type="number" readonly required title="此列累计"></td>
-                        <td><input name="costManageFormerSettleTotal" type="number" value="${Utils.format(formerBean.getCostManageTotal(),'0')}" required readonly title="此列累计"></td>
-                        <td><input type="number" name="costManageTotal" value="${Utils.format(monthBean.getCostManageTotal(),'0')}" readonly title="此列累计"></td>
-                        <td><input type="number" name="costManageSettleTotal" value="${Utils.format(currentBean.getCostManageTotal(),'0')}" readonly title="此列累计"></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.getCostManageTotal(),'0')}" required readonly title="此列累计"></td>
+                        <td><input type="text" class="number" name="costManageTotal" value="${Utils.format(monthBean.getCostManageTotal(),'0')}" readonly title="此列累计"></td>
+                        <td><input type="text" class="number" name="costManageSettleTotal" value="${Utils.format(currentBean.getCostManageTotal(),'0')}" readonly title="此列累计"></td>
                     </tr>
                     </tbody>
                 </table>
@@ -246,30 +246,30 @@
                     </tr>
                     <tr>
                         <td>项目毛利</td>
-                        <td><input name="grossProfitEstimateTotal" type="number" value="${Utils.format(estimateBean.getProjectGrossProfit(),'0')}" required readonly title="项目毛利概算总额"></td>
-                        <td><input name="grossProfitBudgetTotal" type="number" value="${Utils.format(budgetBean.getProjectGrossProfit(),'0')}" required readonly title="项目毛利预算总额"></td>
-                        <td><input name="grossProfitFormerSettleTotal" type="number" value="${Utils.format(formerBean.grossProfit,'0')}" required readonly title="项目毛利上月结算总额"></td>
-                        <td><input type="number" max="999999999.99" step="0.01" name="grossProfit" value="${Utils.format(monthBean.grossProfit,'0')}" readonly required title="项目毛利本月结算金额"></td>
-                        <td><input type="number" name="grossProfitSettleTotal" value="${Utils.format(currentBean.grossProfit,'0')}" readonly title="项目毛利结算总额"></td>
-                        <td><input name="grossProfitProfitMargin" type="number" <#if currentBean.getIncomeTotalTaxExclude() lt 0.01>value="${Utils.format(100 * currentBean.grossProfit,'0')}"<#else>value="${Utils.format(100 * currentBean.grossProfit / currentBean.getIncomeTotalTaxExclude(),'0')}"</#if> readonly title="项目毛利利润率"></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 type="text" class="number" maxlength="16" name="grossProfit" value="${Utils.format(monthBean.grossProfit,'0')}" readonly required title="项目毛利本月结算金额"></td>
+                        <td><input type="text" class="number" name="grossProfitSettleTotal" value="${Utils.format(currentBean.grossProfit,'0')}" readonly title="项目毛利结算总额"></td>
+                        <td><input name="grossProfitProfitMargin" type="text" class="number" <#if currentBean.getIncomeTotalTaxExclude() lt 0.01>value="${Utils.format(100 * currentBean.grossProfit,'0')}"<#else>value="${Utils.format(100 * currentBean.grossProfit / currentBean.getIncomeTotalTaxExclude(),'0')}"</#if> readonly title="项目毛利利润率"></td>
                     </tr>
                     <tr>
                         <td>项目贡献利润</td>
-                        <td><input name="contributionProfitEstimateTotal" type="number" value="${Utils.format(estimateBean.getProjectContributionProfit(),'0')}" required readonly title="项目贡献利润概算总额"></td>
-                        <td><input name="contributionProfitBudgetTotal" type="number" value="${Utils.format(budgetBean.getProjectContributionProfit(),'0')}" required readonly title="项目贡献利润预算总额"></td>
-                        <td><input name="contributionProfitFormerSettleTotal" type="number" value="${Utils.format(formerBean.contributionProfit,'0')}" required readonly title="项目贡献利润上月结算总额"></td>
-                        <td><input type="number" max="999999999.99" step="0.01" name="contributionProfit" value="${Utils.format(monthBean.contributionProfit,'0')}" readonly required title="项目贡献利润本月结算金额"></td>
-                        <td><input type="number" name="contributionProfitSettleTotal" value="${Utils.format(currentBean.contributionProfit,'0')}" readonly title="项目贡献利润结算总额"></td>
-                        <td><input name="contributionProfitProfitMargin" type="number" <#if currentBean.getIncomeTotalTaxExclude() lt 0.01>value="${Utils.format(100 * currentBean.grossProfit,'0')}"<#else>value="${Utils.format(100 * currentBean.grossProfit / currentBean.getIncomeTotalTaxExclude(),'0')}"</#if> readonly title="项目贡献利润利润率"></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 type="text" class="number" maxlength="16" name="contributionProfit" value="${Utils.format(monthBean.contributionProfit,'0')}" readonly required title="项目贡献利润本月结算金额"></td>
+                        <td><input type="text" class="number" name="contributionProfitSettleTotal" value="${Utils.format(currentBean.contributionProfit,'0')}" readonly title="项目贡献利润结算总额"></td>
+                        <td><input name="contributionProfitProfitMargin" type="text" class="number" <#if currentBean.getIncomeTotalTaxExclude() lt 0.01>value="${Utils.format(100 * currentBean.grossProfit,'0')}"<#else>value="${Utils.format(100 * currentBean.grossProfit / currentBean.getIncomeTotalTaxExclude(),'0')}"</#if> readonly title="项目贡献利润利润率"></td>
                     </tr>
                     <tr>
                         <td>项目净利润</td>
                         <td>/</td>
                         <td>/</td>
-                        <td><input name="netProfitFormerSettleTotal" type="number" value="${Utils.format(formerBean.netProfit,'0')}" required readonly title="项目净利润上月结算总额"></td>
-                        <td><input type="number" max="999999999.99" step="0.01" name="netProfit" value="${Utils.format(monthBean.netProfit,'0')}" readonly required title="项目净利润本月结算金额"></td>
-                        <td><input type="number" name="netProfitSettleTotal" value="${Utils.format(currentBean.netProfit,'0')}" readonly title="项目净利润结算总额"></td>
-                        <td><input name="netProfitProfitMargin" type="number" <#if currentBean.getIncomeTotalTaxExclude() lt 0.01>value="${Utils.format(100 * currentBean.grossProfit,'0')}"<#else>value="${Utils.format(100 * currentBean.grossProfit / currentBean.getIncomeTotalTaxExclude(),'0')}"</#if> readonly title="项目净利润利润率"></td>
+                        <td><input name="netProfitFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.netProfit,'0')}" required readonly title="项目净利润上月结算总额"></td>
+                        <td><input type="text" class="number" maxlength="16" name="netProfit" value="${Utils.format(monthBean.netProfit,'0')}" readonly required title="项目净利润本月结算金额"></td>
+                        <td><input type="text" class="number" name="netProfitSettleTotal" value="${Utils.format(currentBean.netProfit,'0')}" readonly title="项目净利润结算总额"></td>
+                        <td><input name="netProfitProfitMargin" type="text" class="number" <#if currentBean.getIncomeTotalTaxExclude() lt 0.01>value="${Utils.format(100 * currentBean.grossProfit,'0')}"<#else>value="${Utils.format(100 * currentBean.grossProfit / currentBean.getIncomeTotalTaxExclude(),'0')}"</#if> readonly title="项目净利润利润率"></td>
                     </tr>
                     </tbody>
                 </table>
@@ -286,101 +286,101 @@
                     </tr>
                     <tr>
                         <td>销售商品、提供劳务收到的现金</td>
-                        <td><input name="saleIncomeCashBudget" type="number" value="${Utils.format(cashFlowBean.saleIncomeCash,'0')}" readonly required title="预算总额"></td>
-                        <td><input name="saleIncomeCashFormerSettle" type="number" value="${Utils.format(formerBean.saleIncomeCash,'0')}" required readonly title="上月结算总额"></td>
-                        <td><input type="number" min="0.00" max="999999999.99" step="0.01" name="saleIncomeCash" value="${Utils.format(monthBean.saleIncomeCash,'0')}" required title="本月结算金额"></td>
-                        <td><input name="saleIncomeCashSettle" type="number" value="${Utils.format(currentBean.saleIncomeCash,'0')}" readonly title="结算总额"></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 type="text" class="number" maxlength="16" name="saleIncomeCash" value="${Utils.format(monthBean.saleIncomeCash,'0')}" required title="本月结算金额"></td>
+                        <td><input name="saleIncomeCashSettle" type="text" class="number" value="${Utils.format(currentBean.saleIncomeCash,'0')}" readonly title="结算总额"></td>
                     </tr>
                     <tr>
                         <td>收到的税费返还</td>
                         <td>/</td>
-                        <td><input name="taxReturnFormerSettle" type="number" value="${Utils.format(formerBean.taxReturn,'0')}" required readonly title="上月结算总额"></td>
-                        <td><input type="number" min="0.00" max="999999999.99" step="0.01" name="taxReturn" value="${Utils.format(monthBean.taxReturn,'0')}" required title="本月结算金额"></td>
-                        <td><input name="taxReturnSettle" type="number" value="${Utils.format(currentBean.taxReturn,'0')}" readonly title="结算总额"></td>
+                        <td><input name="taxReturnFormerSettle" type="text" class="number" value="${Utils.format(formerBean.taxReturn,'0')}" required readonly title="上月结算总额"></td>
+                        <td><input type="text" class="number" maxlength="16" name="taxReturn" value="${Utils.format(monthBean.taxReturn,'0')}" required title="本月结算金额"></td>
+                        <td><input name="taxReturnSettle" type="text" class="number" value="${Utils.format(currentBean.taxReturn,'0')}" readonly title="结算总额"></td>
                     </tr>
                     <tr>
                         <td>收到其他与经营活动有关的现金</td>
-                        <td><input name="earnestMoneyIncomeBudget" type="number" value="${Utils.format(cashFlowBean.earnestMoneyIncome,'0')}" readonly required title="预算总额"></td>
-                        <td><input name="earnestMoneyIncomeFormerSettle" type="number" value="${Utils.format(formerBean.earnestMoneyIncome,'0')}" required readonly title="上月结算总额"></td>
-                        <td><input type="number" min="0.00" max="999999999.99" step="0.01" name="earnestMoneyIncome" value="${Utils.format(monthBean.earnestMoneyIncome,'0')}" required title="本月结算金额"></td>
-                        <td><input name="earnestMoneyIncomeSettle" type="number" value="${Utils.format(currentBean.earnestMoneyIncome,'0')}" readonly title="结算总额"></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 type="text" class="number" maxlength="16" name="earnestMoneyIncome" value="${Utils.format(monthBean.earnestMoneyIncome,'0')}" required title="本月结算金额"></td>
+                        <td><input name="earnestMoneyIncomeSettle" type="text" class="number" value="${Utils.format(currentBean.earnestMoneyIncome,'0')}" readonly title="结算总额"></td>
                     </tr>
                     <tr>
                         <td>购买商品、接受劳务支付的现金</td>
-                        <td><input name="purchaseCostBudget" type="number" value="${Utils.format(cashFlowBean.purchaseCost,'0')}" readonly required title="预算总额"></td>
-                        <td><input name="purchaseCostFormerSettle" type="number" value="${Utils.format(formerBean.purchaseCost,'0')}" required readonly title="上月结算总额"></td>
-                        <td><input type="number" min="0.00" max="999999999.99" step="0.01" name="purchaseCost" value="${Utils.format(monthBean.purchaseCost,'0')}" required title="本月结算金额"></td>
-                        <td><input name="purchaseCostSettle" type="number" value="${Utils.format(currentBean.purchaseCost,'0')}" readonly title="结算总额"></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 type="text" class="number" maxlength="16" name="purchaseCost" value="${Utils.format(monthBean.purchaseCost,'0')}" required title="本月结算金额"></td>
+                        <td><input name="purchaseCostSettle" type="text" class="number" value="${Utils.format(currentBean.purchaseCost,'0')}" readonly title="结算总额"></td>
                     </tr>
                     <tr>
                         <td>支付的各项税费</td>
                         <td>/</td>
-                        <td><input name="taxCostFormerSettle" type="number" value="${Utils.format(formerBean.taxCost,'0')}" required readonly title="上月结算总额"></td>
-                        <td><input type="number" min="0.00" max="999999999.99" step="0.01" name="taxCost" value="${Utils.format(monthBean.taxCost,'0')}" required title="本月结算金额"></td>
-                        <td><input name="taxCostSettle" type="number" value="${Utils.format(currentBean.taxCost,'0')}" readonly title="结算总额"></td>
+                        <td><input name="taxCostFormerSettle" type="text" class="number" value="${Utils.format(formerBean.taxCost,'0')}" required readonly title="上月结算总额"></td>
+                        <td><input type="text" class="number" maxlength="16" name="taxCost" value="${Utils.format(monthBean.taxCost,'0')}" required title="本月结算金额"></td>
+                        <td><input name="taxCostSettle" type="text" class="number" value="${Utils.format(currentBean.taxCost,'0')}" readonly title="结算总额"></td>
                     </tr>
                     <tr>
                         <td>支付其他与经营活动有关的现金</td>
-                        <td><input name="earnestMoneyCostBudget" type="number" value="${Utils.format(cashFlowBean.earnestMoneyCost,'0')}" readonly required title="预算总额"></td>
-                        <td><input name="earnestMoneyCostFormerSettle" type="number" value="${Utils.format(formerBean.earnestMoneyCost,'0')}" required readonly title="上月结算总额"></td>
-                        <td><input type="number" min="0.00" max="999999999.99" step="0.01" name="earnestMoneyCost" value="${Utils.format(monthBean.earnestMoneyCost,'0')}" required title="本月结算金额"></td>
-                        <td><input name="earnestMoneyCostSettle" type="number" value="${Utils.format(currentBean.earnestMoneyCost,'0')}" readonly title="结算总额"></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 type="text" class="number" maxlength="16" name="earnestMoneyCost" value="${Utils.format(monthBean.earnestMoneyCost,'0')}" required title="本月结算金额"></td>
+                        <td><input name="earnestMoneyCostSettle" type="text" class="number" value="${Utils.format(currentBean.earnestMoneyCost,'0')}" readonly title="结算总额"></td>
                     </tr>
                     <tr>
                         <td>经营活动产生的现金流量净额</td>
-                        <td><input name="netCashFlowBudget" type="number" value="${Utils.format(cashFlowBean.getNetCashFlow(),'0')}" readonly required title="预算总额"></td>
-                        <td><input name="netCashFlowFormerSettle" type="number" value="${Utils.format(formerBean.netCashFlow,'0')}" required readonly title="上月结算总额"></td>
-                        <td><input type="number" max="999999999.99" step="0.01" name="netCashFlow" value="${Utils.format(monthBean.netCashFlow,'0')}" readonly required title="本月结算金额"></td>
-                        <td><input name="netCashFlowSettle" type="number" value="${Utils.format(currentBean.netCashFlow,'0')}" readonly title="结算总额"></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 type="text" class="number" maxlength="16" name="netCashFlow" value="${Utils.format(monthBean.netCashFlow,'0')}" readonly required title="本月结算金额"></td>
+                        <td><input name="netCashFlowSettle" type="text" class="number" value="${Utils.format(currentBean.netCashFlow,'0')}" readonly title="结算总额"></td>
                     </tr>
                     <tr>
                         <td>投资活动现金流入</td>
                         <td>/</td>
-                        <td><input name="cashInflowFromInvestingActivitiesFormerSettle" type="number" value="${Utils.format(formerBean.cashInflowFromInvestingActivities,'0')}" required readonly title="上月结算总额"></td>
-                        <td><input type="number" min="0.00" max="999999999.99" step="0.01" name="cashInflowFromInvestingActivities" value="${Utils.format(monthBean.cashInflowFromInvestingActivities,'0')}" required title="本月结算金额"></td>
-                        <td><input name="cashInflowFromInvestingActivitiesSettle" value="${Utils.format(currentBean.cashInflowFromInvestingActivities,'0')}" type="number" readonly title="结算总额"></td>
+                        <td><input name="cashInflowFromInvestingActivitiesFormerSettle" type="text" class="number" value="${Utils.format(formerBean.cashInflowFromInvestingActivities,'0')}" required readonly title="上月结算总额"></td>
+                        <td><input type="text" class="number" maxlength="16" name="cashInflowFromInvestingActivities" value="${Utils.format(monthBean.cashInflowFromInvestingActivities,'0')}" required title="本月结算金额"></td>
+                        <td><input name="cashInflowFromInvestingActivitiesSettle" value="${Utils.format(currentBean.cashInflowFromInvestingActivities,'0')}" type="text" class="number" readonly title="结算总额"></td>
                     </tr>
                     <tr>
                         <td>投资活动现金流出</td>
                         <td>/</td>
-                        <td><input name="cashOutflowFromInvestingActivitiesFormerSettle" type="number" value="${Utils.format(formerBean.cashOutflowFromInvestingActivities,'0')}" required readonly title="上月结算总额"></td>
-                        <td><input type="number" min="0.00" max="999999999.99" step="0.01" name="cashOutflowFromInvestingActivities" value="${Utils.format(monthBean.cashOutflowFromInvestingActivities,'0')}" required title="本月结算金额"></td>
-                        <td><input name="cashOutflowFromInvestingActivitiesSettle" value="${Utils.format(currentBean.cashOutflowFromInvestingActivities,'0')}" type="number" readonly title="结算总额"></td>
+                        <td><input name="cashOutflowFromInvestingActivitiesFormerSettle" type="text" class="number" value="${Utils.format(formerBean.cashOutflowFromInvestingActivities,'0')}" required readonly title="上月结算总额"></td>
+                        <td><input type="text" class="number" maxlength="16" name="cashOutflowFromInvestingActivities" value="${Utils.format(monthBean.cashOutflowFromInvestingActivities,'0')}" required title="本月结算金额"></td>
+                        <td><input name="cashOutflowFromInvestingActivitiesSettle" value="${Utils.format(currentBean.cashOutflowFromInvestingActivities,'0')}" type="text" class="number" readonly title="结算总额"></td>
                     </tr>
                     <tr>
                         <td>投资活动产生的现金流量净额</td>
                         <td>/</td>
-                        <td><input name="netCashFromInvestingActivitiesFormerSettle" type="number" value="${Utils.format(formerBean.netCashFromInvestingActivities,'0')}" required readonly title="上月结算总额"></td>
-                        <td><input type="number" max="999999999.99" step="0.01" name="netCashFromInvestingActivities" value="${Utils.format(monthBean.netCashFromInvestingActivities,'0')}" readonly required title="本月结算金额"></td>
-                        <td><input name="netCashFromInvestingActivitiesSettle" type="number" value="${Utils.format(currentBean.netCashFromInvestingActivities,'0')}" readonly title="结算总额"></td>
+                        <td><input name="netCashFromInvestingActivitiesFormerSettle" type="text" class="number" value="${Utils.format(formerBean.netCashFromInvestingActivities,'0')}" required readonly title="上月结算总额"></td>
+                        <td><input type="text" class="number" maxlength="16" name="netCashFromInvestingActivities" value="${Utils.format(monthBean.netCashFromInvestingActivities,'0')}" readonly required title="本月结算金额"></td>
+                        <td><input name="netCashFromInvestingActivitiesSettle" type="text" class="number" value="${Utils.format(currentBean.netCashFromInvestingActivities,'0')}" readonly title="结算总额"></td>
                     </tr>
                     <tr>
                         <td>融资资金流入</td>
-                        <td><input name="financingCapitalInflowBudget" type="number" value="${Utils.format(cashFlowBean.financingCapitalInflow,'0')}" readonly required title="预算总额"></td>
-                        <td><input name="financingCapitalInflowFormerSettle" type="number" value="${Utils.format(formerBean.financingCapitalInflow,'0')}" required readonly title="上月结算总额"></td>
-                        <td><input type="number" min="0.00" max="999999999.99" step="0.01" name="financingCapitalInflow" value="${Utils.format(monthBean.financingCapitalInflow,'0')}" required title="本月结算金额"></td>
-                        <td><input name="financingCapitalInflowSettle" type="number" value="${Utils.format(currentBean.financingCapitalInflow,'0')}" readonly title="结算总额"></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 type="text" class="number" maxlength="16" name="financingCapitalInflow" value="${Utils.format(monthBean.financingCapitalInflow,'0')}" required title="本月结算金额"></td>
+                        <td><input name="financingCapitalInflowSettle" type="text" class="number" value="${Utils.format(currentBean.financingCapitalInflow,'0')}" readonly title="结算总额"></td>
                     </tr>
                     <tr>
                         <td>还款资金流出</td>
-                        <td><input name="financingCapitalOutflowBudget" type="number" value="${Utils.format(cashFlowBean.financingCapitalOutflow,'0')}" readonly required title="预算总额"></td>
-                        <td><input name="financingCapitalOutflowFormerSettle" type="number" value="${Utils.format(formerBean.financingCapitalOutflow,'0')}" required readonly title="上月结算总额"></td>
-                        <td><input type="number" min="0.00" max="999999999.99" step="0.01" name="financingCapitalOutflow" value="${Utils.format(monthBean.financingCapitalOutflow,'0')}" required title="本月结算金额"></td>
-                        <td><input name="financingCapitalOutflowSettle" type="number" value="${Utils.format(currentBean.financingCapitalOutflow,'0')}" readonly title="结算总额"></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 type="text" class="number" maxlength="16" name="financingCapitalOutflow" value="${Utils.format(monthBean.financingCapitalOutflow,'0')}" required title="本月结算金额"></td>
+                        <td><input name="financingCapitalOutflowSettle" type="text" class="number" value="${Utils.format(currentBean.financingCapitalOutflow,'0')}" readonly title="结算总额"></td>
                     </tr>
                     <tr>
                         <td>筹资活动产生的现金流量净额</td>
-                        <td><input name="financingCapitalCashflowBudget" type="number" value="${Utils.format(cashFlowBean.getFinancingCapitalCashflow(),'0')}" readonly required title="预算总额"></td>
-                        <td><input name="financingCapitalCashflowFormerSettle" type="number" value="${Utils.format(formerBean.financingCapitalCashflow,'0')}" required readonly title="上月结算总额"></td>
-                        <td><input type="number" max="999999999.99" step="0.01" name="financingCapitalCashflow" value="${Utils.format(monthBean.financingCapitalCashflow,'0')}" readonly required title="本月结算金额"></td>
-                        <td><input name="financingCapitalCashflowSettle" type="number" value="${Utils.format(currentBean.financingCapitalCashflow,'0')}" readonly title="结算总额"></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 type="text" class="number" maxlength="16" name="financingCapitalCashflow" value="${Utils.format(monthBean.financingCapitalCashflow,'0')}" readonly required title="本月结算金额"></td>
+                        <td><input name="financingCapitalCashflowSettle" type="text" class="number" value="${Utils.format(currentBean.financingCapitalCashflow,'0')}" readonly title="结算总额"></td>
                     </tr>
                     <tr>
                         <td>货币资金净增加额</td>
-                        <td><input name="netIncreaseMonetaryFundsBudget" type="number" value="${Utils.format(cashFlowBean.getNetIncreaseMonetaryFunds(),'0')}" readonly required title="预算总额"></td>
-                        <td><input name="netIncreaseMonetaryFundsFormerSettle" type="number" value="${Utils.format(formerBean.netIncreaseMonetaryFunds,'0')}" required readonly title="上月结算总额"></td>
-                        <td><input type="number" max="999999999.99" step="0.01" name="netIncreaseMonetaryFunds" value="${Utils.format(monthBean.netIncreaseMonetaryFunds,'0')}" readonly required title="本月结算金额"></td>
-                        <td><input name="netIncreaseMonetaryFundsSettle" type="number" value="${Utils.format(currentBean.netIncreaseMonetaryFunds,'0')}" readonly title="结算总额"></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 type="text" class="number" maxlength="16" name="netIncreaseMonetaryFunds" value="${Utils.format(monthBean.netIncreaseMonetaryFunds,'0')}" readonly required title="本月结算金额"></td>
+                        <td><input name="netIncreaseMonetaryFundsSettle" type="text" class="number" value="${Utils.format(currentBean.netIncreaseMonetaryFunds,'0')}" readonly title="结算总额"></td>
                     </tr>
                     </tbody>
                 </table>

From cc13161a0130a00888e1489c1c32295f37a420f4 Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Thu, 6 Jan 2022 14:11:26 +0800
Subject: [PATCH 02/35] =?UTF-8?q?=E9=A2=84=E7=AE=97=E5=88=86=E9=9A=94?=
 =?UTF-8?q?=E7=AC=A6=E7=94=9F=E6=88=90=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/assets/js/project_budget.js        |   7 +-
 .../static/assets/js/project_budget_cost.js   |  24 +-
 .../js/project_budget_cost_project_manage.js  |  32 +--
 .../static/assets/js/project_budget_income.js |  22 +-
 .../static/assets/js/project_budget_plan.js   |  48 ++--
 .../templates/admin/project_budget_edit.ftl   | 218 +++++++++---------
 6 files changed, 178 insertions(+), 173 deletions(-)

diff --git a/src/main/resources/static/assets/js/project_budget.js b/src/main/resources/static/assets/js/project_budget.js
index 2068b26..b5bdf15 100644
--- a/src/main/resources/static/assets/js/project_budget.js
+++ b/src/main/resources/static/assets/js/project_budget.js
@@ -309,7 +309,12 @@ function arr2ObjectVerify(line, arr, detailPropertyArr, detailProperty) {
             layuiAlert("第 " + (line + 1) + " 行的 " + o[1] + " 不允许为空");
             return null;
         }
-        obj[detailPropertyArr[i]] = arr[i];
+        //如果要求是数字类型的，进行转换
+        var v = arr[i];
+        if(o[2] === 'number' ){
+            v = f2(v);
+        }
+        obj[detailPropertyArr[i]]=v;
     }
     return obj;
 }
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 27fb2f7..c35890e 100644
--- a/src/main/resources/static/assets/js/project_budget_cost.js
+++ b/src/main/resources/static/assets/js/project_budget_cost.js
@@ -3,15 +3,15 @@
  */
 //COST_DETAIL_ARR=["type","category","name","unit","amount","price","taxRate","totalTaxInclude","totalTaxExclude"];
 COST_DETAIL={
-    "type":[true,"大类"],
-    "category":[true,"类别"],
-    "name":[true,"名称"],
-    "unit":[true,"单位"],
-    "amount":[true,"数量"],
-    "price":[true,"单价"],
-    "taxRate":[true,"税率"],
-    "totalTaxInclude":[true,"含税总金额"],
-    "totalTaxExclude":[true,"不含税金额"]
+    "type":[true,"大类","string"],
+    "category":[true,"类别","string"],
+    "name":[true,"名称","string"],
+    "unit":[true,"单位","string"],
+    "amount":[true,"数量","string"],
+    "price":[true,"单价","number"],
+    "taxRate":[true,"税率","number"],
+    "totalTaxInclude":[true,"含税总金额","number"],
+    "totalTaxExclude":[true,"不含税金额","number"]
 };
 /*
 [
@@ -187,9 +187,9 @@ function appendTrCost() {
         '</td>'+
         '<td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost"></td>'+
         '<td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost""></td>'+
-        '<td><input type="number" min="0" max="99999999" step="1" maxlength="8" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-amount"></td>'+
-        '<td><input type="number" min="0.00" max="9999999999.99" step="0.01" maxlength="13" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-price"></td>'+
-        '<td><input type="number" min="0.00" max="99.99" step="0.01" maxlength="5" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-tax-rate"></td>'+
+        '<td><input type="text" min="0" max="99999999" step="1" maxlength="8" class="number am-modal-prompt-input am-modal-prompt-input-cost input-changeable-amount"></td>'+
+        '<td><input type="text" min="0.00" max="9999999999.99" step="0.01" maxlength="13" class="number am-modal-prompt-input am-modal-prompt-input-cost input-changeable-price"></td>'+
+        '<td><input type="text" min="0.00" max="99.99" step="0.01" maxlength="5" class="number am-modal-prompt-input am-modal-prompt-input-cost input-changeable-tax-rate"></td>'+
         '<td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-tax-include" readonly></td>'+
         '<td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-tax-exclude" readonly></td>'+
         '<td><button type="button" class="am-btn am-btn-danger am-btn-xs am-round am-modal-line-delete"><span class="am-icon-minus"></span></button></td>'+
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 89cd281..cd10199 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
@@ -3,18 +3,18 @@
  */
 //COST_PROJECT_MANAGE_DETAIL_ARR=["type","name","detail","unit","amount","price","total","predictMethod","predictWhy","remark","deletable"];
 COST_PROJECT_MANAGE_DETAIL={
-    "type":[true,"财务费用类别"],
-    "name1":[false,"业务项目"],
-    "name2":[false,"业务项目"],
-    "detail":[true,"项目明细"],
-    "unit":[true,"单位"],
-    "amount":[true,"数量"],
-    "price":[true,"单价"],
-    "total":[true,"总金额"],
-    "predictMethod":[false,"预估计算方法"],
-    "predictWhy":[false,"预估依据"],
-    "remark":[false,"备注"],
-    "deletable":[true,"是否可删除"]
+    "type":[true,"财务费用类别","string"],
+    "name1":[false,"业务项目","string"],
+    "name2":[false,"业务项目","string"],
+    "detail":[true,"项目明细","string"],
+    "unit":[true,"单位","string"],
+    "amount":[true,"数量","string"],
+    "price":[true,"单价","number"],
+    "total":[true,"总金额","number"],
+    "predictMethod":[false,"预估计算方法","string"],
+    "predictWhy":[false,"预估依据","string"],
+    "remark":[false,"备注","string"],
+    "deletable":[true,"是否可删除","string"]
 };
 
 SELECT_TYPE_CATEGORY_MAP_DATA_MANAGER={};
@@ -118,8 +118,8 @@ function appendTrCostProjectManage() {
         '        </td>\n' +
         '        <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"></td>\n' +
         '        <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"></td>\n' +
-        '        <td><input type="number" min="0" max="99999999" step="1" maxlength="8" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-amount-project-manage"></td>\n' +
-        '        <td><input type="number" min="0.00" max="9999999999.99" step="0.01" maxlength="13" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-price-project-manage"></td>\n' +
+        '        <td><input type="text" min="0" max="99999999" step="1" maxlength="8" class="number am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-amount-project-manage"></td>\n' +
+        '        <td><input type="text" min="0.00" max="9999999999.99" step="0.01" maxlength="13" class="number am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-price-project-manage"></td>\n' +
         '        <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-total-project-manage" readonly></td>\n' +
         '        <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"></td>\n' +
         '        <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"></td>\n' +
@@ -226,7 +226,7 @@ function bindChangeableInputProjectManage() {
         //找到对应的单价
         var price = f2($(this).parent().parent().find(".input-changeable-price-project-manage").val());
 
-        $(this).parent().parent().find(".input-changeable-total-project-manage").val(f2(amount*price));
+        $(this).parent().parent().find(".input-changeable-total-project-manage").val(f2Fixed(amount*price));
     });
     //单价改变
     $(".input-changeable-price-project-manage").change(function () {
@@ -234,7 +234,7 @@ function bindChangeableInputProjectManage() {
         //找到对应的数量
         var amount = parseInt($(this).parent().parent().find(".input-changeable-amount-project-manage").val());
 
-        $(this).parent().parent().find(".input-changeable-total-project-manage").val(f2(amount*price));
+        $(this).parent().parent().find(".input-changeable-total-project-manage").val(f2Fixed(amount*price));
     });
 }
 /**
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 c7cda2f..fb01c41 100644
--- a/src/main/resources/static/assets/js/project_budget_income.js
+++ b/src/main/resources/static/assets/js/project_budget_income.js
@@ -3,14 +3,14 @@
  */
 //INCOME_DETAIL_ARR=["type","name","unit","amount","price","taxRate","totalTaxInclude","totalTaxExclude"];
 INCOME_DETAIL={
-    "type":[true,"类别"],
-    "name":[true,"名称"],
-    "unit":[true,"单位"],
-    "amount":[true,"数量"],
-    "price":[true,"单价"],
-    "taxRate":[true,"税率"],
-    "totalTaxInclude":[true,"含税总金额"],
-    "totalTaxExclude":[true,"不含税金额"]
+    "type":[true,"类别","string"],
+    "name":[true,"名称","string"],
+    "unit":[true,"单位","string"],
+    "amount":[true,"数量","string"],
+    "price":[true,"单价","number"],
+    "taxRate":[true,"税率","number"],
+    "totalTaxInclude":[true,"含税总金额","number"],
+    "totalTaxExclude":[true,"不含税金额","number"]
 };
 
 /*$(function () {
@@ -136,9 +136,9 @@ function appendTrIncome() {
         '                        </td>\n' +
         '                        <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income"></td>\n' +
         '                        <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income"></td>\n' +
-        '                        <td><input type="number" min="0" max="99999999" step="1" maxlength="8" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-amount"></td>\n' +
-        '                        <td><input type="number" min="0.00" max="9999999999.99" step="0.01" maxlength="13" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-price"></td>\n' +
-        '                        <td><input type="number" min="0.00" max="99.99" step="0.01" maxlength="5" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-tax-rate"></td>\n' +
+        '                        <td><input type="text" min="0" max="99999999" step="1" maxlength="8" class="number am-modal-prompt-input am-modal-prompt-input-income input-changeable-amount"></td>\n' +
+        '                        <td><input type="text" min="0.00" max="9999999999.99" step="0.01" maxlength="13" class="number am-modal-prompt-input am-modal-prompt-input-income input-changeable-price"></td>\n' +
+        '                        <td><input type="text" min="0.00" max="99.99" step="0.01" maxlength="5" class="number am-modal-prompt-input am-modal-prompt-input-income input-changeable-tax-rate"></td>\n' +
         '                        <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-tax-include" readonly></td>\n' +
         '                        <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-tax-exclude" readonly></td>\n' +
         '                        <td><button type="button" class="am-btn am-btn-danger am-btn-xs am-round am-modal-line-delete"><span class="am-icon-minus"></span></button></td>\n' +
diff --git a/src/main/resources/static/assets/js/project_budget_plan.js b/src/main/resources/static/assets/js/project_budget_plan.js
index 0270cbe..206edd7 100644
--- a/src/main/resources/static/assets/js/project_budget_plan.js
+++ b/src/main/resources/static/assets/js/project_budget_plan.js
@@ -4,18 +4,18 @@
 BUDGET_PLAN_DETAIL_ARR=["month","deviceCost","engineerCost","projectManageCost","earnestMoneyCost","totalCost","saleIncome","earnestMoneyIncome","totalIncome","fundBalance","capitalInterest","underwrittenPlan","repaymentPlan"];
 BUDGET_PLAN_DETAIL={
     "month":[true,"月份"],
-    "deviceCost":[true,"设备支出"],
-    "engineerCost":[true,"工程支出"],
-    "projectManageCost":[true,"经营性开支"],
-    "earnestMoneyCost":[true,"保证金支出"],
-    "totalCost":[true,"支出合计"],
-    "saleIncome":[true,"销售收款"],
-    "earnestMoneyIncome":[true,"保证金收款"],
-    "totalIncome":[true,"收款合计"],
-    "fundBalance":[true,"资金余额"],
-    "capitalInterest":[true,"资金利息"],
-    "underwrittenPlan":[true,"垫资计划"],
-    "repaymentPlan":[true,"还款计划"]
+    "deviceCost":[true,"设备支出","number"],
+    "engineerCost":[true,"工程支出","number"],
+    "projectManageCost":[true,"经营性开支","number"],
+    "earnestMoneyCost":[true,"保证金支出","number"],
+    "totalCost":[true,"支出合计","number"],
+    "saleIncome":[true,"销售收款","number"],
+    "earnestMoneyIncome":[true,"保证金收款","number"],
+    "totalIncome":[true,"收款合计","number"],
+    "fundBalance":[true,"资金余额","number"],
+    "capitalInterest":[true,"资金利息","number"],
+    "underwrittenPlan":[true,"垫资计划","number"],
+    "repaymentPlan":[true,"还款计划","number"]
 };
 
 
@@ -189,18 +189,18 @@ function verifyBudgetPlan(){
 function appendTrBudgetPlan() {
     var template = '<tr>\n' +
         '        <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-month-budget-plan" readonly></td>\n' +
-        '        <td><input type="number" min="0.00" max="9999999999.99" step="0.01" maxlength="13" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-device-cost-budget-plan"></td>\n' +
-        '        <td><input type="number" min="0.00" max="9999999999.99" step="0.01" maxlength="13" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-engineer-cost-budget-plan"></td>\n' +
-        '        <td><input type="number" min="0.00" max="9999999999.99" step="0.01" maxlength="13" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-project-manage-cost-budget-plan"></td>\n' +
-        '        <td><input type="number" min="0.00" max="9999999999.99" step="0.01" maxlength="13" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-earnest-money-cost-budget-plan"></td>\n' +
-        '        <td><input type="number" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-total-cost-budget-plan" readonly></td>\n' +
-        '        <td><input type="number" min="0.00" max="9999999999.99" step="0.01" maxlength="13" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-sale-income-budget-plan"></td>\n' +
-        '        <td><input type="number" min="0.00" max="9999999999.99" step="0.01" maxlength="13" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-earnest-money-income-budget-plan"></td>\n' +
-        '        <td><input type="number" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-total-income-budget-plan" readonly></td>\n' +
-        '        <td><input type="number" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-fund-balance-budget-plan" readonly></td>\n' +
-        '        <td><input type="number" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-capital-interest-budget-plan" readonly></td>\n' +
-        '        <td><input type="number" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-underwritten-plan-budget-plan" readonly></td>\n' +
-        '        <td><input type="number" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-repayment-plan-budget-plan" readonly></td>\n' +
+        '        <td><input type="text" maxlength="16" class="number am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-device-cost-budget-plan"></td>\n' +
+        '        <td><input type="text" maxlength="16" class="number am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-engineer-cost-budget-plan"></td>\n' +
+        '        <td><input type="text" maxlength="16" class="number am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-project-manage-cost-budget-plan"></td>\n' +
+        '        <td><input type="text" maxlength="16" class="number am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-earnest-money-cost-budget-plan"></td>\n' +
+        '        <td><input type="text" class="number am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-total-cost-budget-plan" readonly></td>\n' +
+        '        <td><input type="text" maxlength="16" class="number am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-sale-income-budget-plan"></td>\n' +
+        '        <td><input type="text" maxlength="16" class="number am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-earnest-money-income-budget-plan"></td>\n' +
+        '        <td><input type="text" class="number am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-total-income-budget-plan" readonly></td>\n' +
+        '        <td><input type="text" class="number am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-fund-balance-budget-plan" readonly></td>\n' +
+        '        <td><input type="text" class="number am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-capital-interest-budget-plan" readonly></td>\n' +
+        '        <td><input type="text" class="number am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-underwritten-plan-budget-plan" readonly></td>\n' +
+        '        <td><input type="text" class="number am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-repayment-plan-budget-plan" readonly></td>\n' +
         '        <td><button type="button" class="am-btn am-btn-danger am-btn-xs am-round am-modal-line-delete-budget-plan"><span class="am-icon-minus"></span></button></td>\n' +
         '    </tr>';
     $("#budgetPlanDetailTable").append(template);
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index 8ca94ed..c2e7729 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -228,26 +228,26 @@
                     <tr>
                         <td>收入</td>
                         <td>设备类</td>
-                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeDeviceTaxInclude1" value="${Utils.format(estimateBean.incomeDeviceTaxInclude)}" required readonly></td>
-                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeDeviceTaxExclude1" value="${Utils.format(estimateBean.incomeDeviceTaxExclude)}" required readonly></td>
+                        <td><input type="text" class="number" name="incomeDeviceTaxInclude1" value="${Utils.format(estimateBean.incomeDeviceTaxInclude)}" required readonly></td>
+                        <td><input type="text" class="number" name="incomeDeviceTaxExclude1" value="${Utils.format(estimateBean.incomeDeviceTaxExclude)}" required readonly></td>
                     </tr>
                     <tr>
                         <td>收入</td>
                         <td>工程类</td>
-                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeEngineerTaxInclude1" value="${Utils.format(estimateBean.incomeEngineerTaxInclude)}" required readonly></td>
-                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeEngineerTaxExclude1" value="${Utils.format(estimateBean.incomeEngineerTaxExclude)}" required readonly></td>
+                        <td><input type="text" class="number" name="incomeEngineerTaxInclude1" value="${Utils.format(estimateBean.incomeEngineerTaxInclude)}" required readonly></td>
+                        <td><input type="text" class="number" name="incomeEngineerTaxExclude1" value="${Utils.format(estimateBean.incomeEngineerTaxExclude)}" required readonly></td>
                     </tr>
                     <tr>
                         <td>收入</td>
                         <td>服务类</td>
-                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeServiceTaxInclude1" value="${Utils.format(estimateBean.incomeServiceTaxInclude)}" required readonly></td>
-                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeServiceTaxExclude1" value="${Utils.format(estimateBean.incomeServiceTaxExclude)}" required readonly></td>
+                        <td><input type="text" class="number" name="incomeServiceTaxInclude1" value="${Utils.format(estimateBean.incomeServiceTaxInclude)}" required readonly></td>
+                        <td><input type="text" class="number" name="incomeServiceTaxExclude1" value="${Utils.format(estimateBean.incomeServiceTaxExclude)}" required readonly></td>
                     </tr>
                     <tr>
                         <td>合计</td>
                         <td></td>
-                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeTotalTaxInclude1" value="${Utils.format(estimateBean.incomeTotalTaxInclude)}" readonly readonly title="此列累计"></td>
-                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeTotalTaxExclude1" value="${Utils.format(estimateBean.incomeTotalTaxExclude)}" readonly readonly title="此列累计"></td>
+                        <td><input type="text" class="number" name="incomeTotalTaxInclude1" value="${Utils.format(estimateBean.incomeTotalTaxInclude)}" readonly readonly title="此列累计"></td>
+                        <td><input type="text" class="number" name="incomeTotalTaxExclude1" value="${Utils.format(estimateBean.incomeTotalTaxExclude)}" readonly readonly title="此列累计"></td>
                     </tr>
                     </tbody>
                 </table>
@@ -265,50 +265,50 @@
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>设备</td>
-                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseDeviceTaxInclude1" value="${Utils.format(estimateBean.costPurchaseDeviceTaxInclude)}" required readonly></td>
-                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseDeviceTaxExclude1" value="${Utils.format(estimateBean.costPurchaseDeviceTaxExclude)}" required readonly></td>
+                        <td><input type="text" class="number" name="costPurchaseDeviceTaxInclude1" value="${Utils.format(estimateBean.costPurchaseDeviceTaxInclude)}" required readonly></td>
+                        <td><input type="text" class="number" name="costPurchaseDeviceTaxExclude1" value="${Utils.format(estimateBean.costPurchaseDeviceTaxExclude)}" required readonly></td>
                     </tr>
                     <tr>
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>施工</td>
-                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseBuildTaxInclude1" value="${Utils.format(estimateBean.costPurchaseBuildTaxInclude)}" required readonly></td>
-                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseBuildTaxExclude1" value="${Utils.format(estimateBean.costPurchaseBuildTaxExclude)}" required readonly></td>
+                        <td><input type="text" class="number" name="costPurchaseBuildTaxInclude1" value="${Utils.format(estimateBean.costPurchaseBuildTaxInclude)}" required readonly></td>
+                        <td><input type="text" class="number" name="costPurchaseBuildTaxExclude1" value="${Utils.format(estimateBean.costPurchaseBuildTaxExclude)}" required readonly></td>
                     </tr>
                     <tr>
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>服务</td>
-                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseServiceTaxInclude1" value="${Utils.format(estimateBean.costPurchaseServiceTaxInclude)}" required readonly></td>
-                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseServiceTaxExclude1" value="${Utils.format(estimateBean.costPurchaseServiceTaxExclude)}" required readonly></td>
+                        <td><input type="text" class="number" name="costPurchaseServiceTaxInclude1" value="${Utils.format(estimateBean.costPurchaseServiceTaxInclude)}" required readonly></td>
+                        <td><input type="text" class="number" name="costPurchaseServiceTaxExclude1" value="${Utils.format(estimateBean.costPurchaseServiceTaxExclude)}" required readonly></td>
                     </tr>
                     <tr>
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>其他</td>
-                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseOtherTaxInclude1" value="${Utils.format(estimateBean.costPurchaseOtherTaxInclude)}" required readonly></td>
-                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseOtherTaxExclude1" value="${Utils.format(estimateBean.costPurchaseOtherTaxExclude)}" required readonly></td>
+                        <td><input type="text" class="number" name="costPurchaseOtherTaxInclude1" value="${Utils.format(estimateBean.costPurchaseOtherTaxInclude)}" required readonly></td>
+                        <td><input type="text" class="number" name="costPurchaseOtherTaxExclude1" value="${Utils.format(estimateBean.costPurchaseOtherTaxExclude)}" required readonly></td>
                     </tr>
                     <tr>
                         <td>成本</td>
                         <td>项目管理成本</td>
                         <td>项目管理成本</td>
-                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costProjectManageTaxInclude1" value="${Utils.format(estimateBean.costProjectManageTaxExclude)}" required readonly></td>
-                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costProjectManageTaxExclude1" value="${Utils.format(estimateBean.costProjectManageTaxExclude)}" required readonly></td>
+                        <td><input type="text" class="number" name="costProjectManageTaxInclude1" value="${Utils.format(estimateBean.costProjectManageTaxExclude)}" required readonly></td>
+                        <td><input type="text" class="number" name="costProjectManageTaxExclude1" value="${Utils.format(estimateBean.costProjectManageTaxExclude)}" required readonly></td>
                     </tr>
                     <tr>
                         <td>成本</td>
                         <td>其他</td>
                         <td>${project.otherName!}</td>
-                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costOtherOtherTaxInclude1" value="${Utils.format(estimateBean.costOtherOtherTaxInclude)}" required readonly></td>
-                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costOtherOtherTaxExclude1" value="${Utils.format(estimateBean.costOtherOtherTaxExclude)}" required readonly></td>
+                        <td><input type="text" class="number" name="costOtherOtherTaxInclude1" value="${Utils.format(estimateBean.costOtherOtherTaxInclude)}" required readonly></td>
+                        <td><input type="text" class="number" name="costOtherOtherTaxExclude1" value="${Utils.format(estimateBean.costOtherOtherTaxExclude)}" required readonly></td>
                     </tr>
                     <tr>
                         <td>合计</td>
                         <td></td>
                         <td></td>
-                        <td><input type="number" name="costTotalTaxInclude1" value="${Utils.format(estimateBean.costTotalTaxInclude)}" readonly readonly title="此列累计"></td>
-                        <td><input type="number" name="costTotalTaxExclude1" value="${Utils.format(estimateBean.costTotalTaxExclude)}" readonly readonly title="此列累计"></td>
+                        <td><input type="text" class="number" name="costTotalTaxInclude1" value="${Utils.format(estimateBean.costTotalTaxInclude)}" readonly readonly title="此列累计"></td>
+                        <td><input type="text" class="number" name="costTotalTaxExclude1" value="${Utils.format(estimateBean.costTotalTaxExclude)}" readonly readonly title="此列累计"></td>
                     </tr>
                     </tbody>
                 </table>
@@ -323,12 +323,12 @@
                     <tr>
                         <td>财务费用</td>
                         <td>资金占用成本</td>
-                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costExpropriationTaxExclude1" value="${Utils.format(estimateBean.costExpropriationTaxExclude)}" required readonly></td>
+                        <td><input type="text" class="number" name="costExpropriationTaxExclude1" value="${Utils.format(estimateBean.costExpropriationTaxExclude)}" required readonly></td>
                     </tr>
                     <tr>
                         <td>公司管理费用</td>
                         <td></td>
-                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costCompanyManageTaxExclude1" value="${Utils.format(estimateBean.costCompanyManageTaxExclude)}" required readonly></td>
+                        <td><input type="text" class="number" name="costCompanyManageTaxExclude1" value="${Utils.format(estimateBean.costCompanyManageTaxExclude)}" required readonly></td>
                     </tr>
                     </tbody>
                 </table>
@@ -342,19 +342,19 @@
                     </tr>
                     <tr>
                         <td>项目毛利（元）</td>
-                        <td><input type="number" name="projectGrossProfit1" value="${Utils.format(estimateBean.projectGrossProfit)}" readonly title="收入总计（不含税）-成本总计（不含税）-财务费用总计（不含税）"></td>
+                        <td><input type="text" class="number" name="projectGrossProfit1" value="${Utils.format(estimateBean.projectGrossProfit)}" readonly title="收入总计（不含税）-成本总计（不含税）-财务费用总计（不含税）"></td>
                     </tr>
                     <tr>
                         <td>项目毛利率（%）</td>
-                        <td><input type="number" name="projectGrossProfitRate1" value="${Utils.format(estimateBean.projectGrossProfitRate)}" readonly title="毛利（不含税）/收入总计（不含税）"></td>
+                        <td><input type="text" class="number" name="projectGrossProfitRate1" value="${Utils.format(estimateBean.projectGrossProfitRate)}" readonly title="毛利（不含税）/收入总计（不含税）"></td>
                     </tr>
                     <tr>
                         <td>项目贡献利润（元）</td>
-                        <td><input type="number" name="projectContributionProfit1" value="${Utils.format(estimateBean.projectContributionProfit)}" readonly title="项目毛利（不含税）-公司管理费用总计（不含税）"></td>
+                        <td><input type="text" class="number" name="projectContributionProfit1" value="${Utils.format(estimateBean.projectContributionProfit)}" readonly title="项目毛利（不含税）-公司管理费用总计（不含税）"></td>
                     </tr>
                     <tr>
                         <td>项目贡献利润率（%）</td>
-                        <td><input type="number" name="projectContributionProfitRate1" value="${Utils.format(estimateBean.projectContributionProfitRate)}" readonly title="贡献利润（不含税）/收入总计（不含税）"></td>
+                        <td><input type="text" class="number" name="projectContributionProfitRate1" value="${Utils.format(estimateBean.projectContributionProfitRate)}" readonly title="贡献利润（不含税）/收入总计（不含税）"></td>
                     </tr>
                     </tbody>
                 </table>
@@ -391,9 +391,9 @@
                                     </td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income" value="${incomeDetail.name!}"></td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income" value="${incomeDetail.unit!}"></td>
-                                    <td><input type="number" min="0" max="99999999" step="1" maxlength="8" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-amount" value="${incomeDetail.amount!0}" oninput="if(value.length>8)value=value.slice(0,8)" <#--onkeyup="integerNumber(this)"-->></td>
-                                    <td><input type="number" min="0.00" max="9999999999.99" step="0.01" maxlength="13" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-price" value="${Utils.format(incomeDetail.price,'0')}" oninput="if(value.length>13)value=value.slice(0,13)"></td>
-                                    <td><input type="number" min="0.00" max="99.99" step="0.01" maxlength="5" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-tax-rate" value="${Utils.format(incomeDetail.taxRate,'0')}" oninput="if(value.length>5)value=value.slice(0,5)"></td>
+                                    <td><input type="text" maxlength="8" class="number am-modal-prompt-input am-modal-prompt-input-income input-changeable-amount" value="${incomeDetail.amount!0}" oninput="if(value.length>8)value=value.slice(0,8)" <#--onkeyup="integerNumber(this)"-->></td>
+                                    <td><input type="text" maxlength="16" class="number am-modal-prompt-input am-modal-prompt-input-income input-changeable-price" value="${Utils.format(incomeDetail.price,'0')}" oninput="if(value.length>16)value=value.slice(0,16)"></td>
+                                    <td><input type="text" maxlength="5" class="number am-modal-prompt-input am-modal-prompt-input-income input-changeable-tax-rate" value="${Utils.format(incomeDetail.taxRate,'0')}" oninput="if(value.length>5)value=value.slice(0,5)"></td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-tax-include" value="${Utils.format(incomeDetail.totalTaxInclude,'0')}" readonly></td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-tax-exclude" value="${Utils.format(incomeDetail.totalTaxExclude,'0')}" readonly></td>
                                     <td><button type="button" class="am-btn am-btn-danger am-btn-xs am-round am-modal-line-delete"><span class="am-icon-minus"></span></button></td>
@@ -458,9 +458,9 @@
                                     </td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost" value="${costDetail.name!}"></td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost" value="${costDetail.unit!}"></td>
-                                    <td><input type="number" min="0" max="99999999" step="1" maxlength="8" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-amount" value="${costDetail.amount!0}" oninput="if(value.length>8)value=value.slice(0,8)" <#--onkeyup="integerNumber(this)"-->></td>
-                                    <td><input type="number" min="0.00" max="9999999999.99" step="0.01" maxlength="13" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-price" value="${Utils.format(costDetail.price,'0')}" oninput="if(value.length>13)value=value.slice(0,13)"></td>
-                                    <td><input type="number" min="0.00" max="99.99" step="0.01" maxlength="5" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-tax-rate" value="${Utils.format(costDetail.taxRate,'0')}" oninput="if(value.length>5)value=value.slice(0,5)"></td>
+                                    <td><input type="text" maxlength="8" class="number am-modal-prompt-input am-modal-prompt-input-cost input-changeable-amount" value="${costDetail.amount!0}" oninput="if(value.length>8)value=value.slice(0,8)" <#--onkeyup="integerNumber(this)"-->></td>
+                                    <td><input type="text" maxlength="16" class="number am-modal-prompt-input am-modal-prompt-input-cost input-changeable-price" value="${Utils.format(costDetail.price,'0')}" oninput="if(value.length>16)value=value.slice(0,16)"></td>
+                                    <td><input type="text" maxlength="5" class="number am-modal-prompt-input am-modal-prompt-input-cost input-changeable-tax-rate" value="${Utils.format(costDetail.taxRate,'0')}" oninput="if(value.length>5)value=value.slice(0,5)"></td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-tax-include" value="${Utils.format(costDetail.totalTaxInclude,'0')}" readonly></td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-tax-exclude" value="${Utils.format(costDetail.totalTaxExclude,'0')}" readonly></td>
                                     <td><button type="button" class="am-btn am-btn-danger am-btn-xs am-round am-modal-line-delete"><span class="am-icon-minus"></span></button></td>
@@ -526,8 +526,8 @@
                                     </td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="${costProjectManageDetail.detail!}"></td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="${costProjectManageDetail.unit!}"></td>
-                                    <td><input type="number" min="0" max="99999999" step="1" maxlength="8" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-amount-project-manage" value="${costProjectManageDetail.amount!0}" <#--onkeyup="integerNumber(this)"--> oninput="if(value.length>8)value=value.slice(0,8)"></td>
-                                    <td><input type="number" min="0.00" max="9999999999.99" step="0.01" maxlength="13" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-price-project-manage" value="${Utils.format(costProjectManageDetail.price,'0')}" oninput="if(value.length>13)value=value.slice(0,13)"></td>
+                                    <td><input type="text" maxlength="8" class="number am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-amount-project-manage" value="${costProjectManageDetail.amount!0}" <#--onkeyup="integerNumber(this)"--> oninput="if(value.length>8)value=value.slice(0,8)"></td>
+                                    <td><input type="text" maxlength="16" class="number am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-price-project-manage" value="${Utils.format(costProjectManageDetail.price,'0')}" oninput="if(value.length>16)value=value.slice(0,16)"></td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-total-project-manage" value="${Utils.format(costProjectManageDetail.total,'0')}" readonly></td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="${costProjectManageDetail.predictMethod!}"></td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="${costProjectManageDetail.predictWhy!}"></td>
@@ -573,34 +573,34 @@
                         </tr>
                         <tr>
                             <td><input type="text" class="am-modal-prompt-input input-total-title-month-budget-plan" value="${projectBudgetPlanDetailTotalTitle.month}" readonly/></td>
-                            <td><input type="number"  class="am-modal-prompt-input input-total-title-device-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotalTitle.deviceCost)}" readonly/></td>
-                            <td><input type="number" class="am-modal-prompt-input input-total-title-engineer-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotalTitle.engineerCost)}" readonly/></td>
-                            <td><input type="number" class="am-modal-prompt-input input-total-title-project-manage-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotalTitle.projectManageCost)}" readonly/></td>
-                            <td><input type="number" class="am-modal-prompt-input input-total-title-earnest-money-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotalTitle.earnestMoneyCost)}" readonly/></td>
-                            <td><input type="number" class="am-modal-prompt-input input-total-title-total-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotalTitle.totalCost)}" readonly/></td>
-                            <td><input type="number" class="am-modal-prompt-input input-total-title-sale-income-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotalTitle.saleIncome)}" readonly/></td>
-                            <td><input type="number" class="am-modal-prompt-input input-total-title-earnest-money-income-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotalTitle.earnestMoneyIncome)}" readonly/></td>
-                            <td><input type="number" class="am-modal-prompt-input input-total-title-total-income-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotalTitle.totalIncome)}" readonly/></td>
-                            <td><input type="number" class="am-modal-prompt-input input-total-title-fund-balance-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotalTitle.fundBalance)}" readonly/></td>
-                            <td><input type="number" class="am-modal-prompt-input input-total-title-capital-interest-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotalTitle.capitalInterest)}" readonly/></td>
-                            <td><input type="number" class="am-modal-prompt-input input-total-title-underwritten-plan-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotalTitle.underwrittenPlan)}" readonly/></td>
-                            <td><input type="number" class="am-modal-prompt-input input-total-title-repayment-plan-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotalTitle.repaymentPlan)}" readonly/></td>
+                            <td><input type="text" class="number am-modal-prompt-input input-total-title-device-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotalTitle.deviceCost)}" readonly/></td>
+                            <td><input type="text" class="number am-modal-prompt-input input-total-title-engineer-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotalTitle.engineerCost)}" readonly/></td>
+                            <td><input type="text" class="number am-modal-prompt-input input-total-title-project-manage-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotalTitle.projectManageCost)}" readonly/></td>
+                            <td><input type="text" class="number am-modal-prompt-input input-total-title-earnest-money-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotalTitle.earnestMoneyCost)}" readonly/></td>
+                            <td><input type="text" class="number am-modal-prompt-input input-total-title-total-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotalTitle.totalCost)}" readonly/></td>
+                            <td><input type="text" class="number am-modal-prompt-input input-total-title-sale-income-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotalTitle.saleIncome)}" readonly/></td>
+                            <td><input type="text" class="number am-modal-prompt-input input-total-title-earnest-money-income-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotalTitle.earnestMoneyIncome)}" readonly/></td>
+                            <td><input type="text" class="number am-modal-prompt-input input-total-title-total-income-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotalTitle.totalIncome)}" readonly/></td>
+                            <td><input type="text" class="number am-modal-prompt-input input-total-title-fund-balance-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotalTitle.fundBalance)}" readonly/></td>
+                            <td><input type="text" class="number am-modal-prompt-input input-total-title-capital-interest-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotalTitle.capitalInterest)}" readonly/></td>
+                            <td><input type="text" class="number am-modal-prompt-input input-total-title-underwritten-plan-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotalTitle.underwrittenPlan)}" readonly/></td>
+                            <td><input type="text" class="number am-modal-prompt-input input-total-title-repayment-plan-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotalTitle.repaymentPlan)}" readonly/></td>
                             <td></td>
                         </tr>
                         <tr class="am-hide">
                             <td><input type="text" class="am-modal-prompt-input input-total-month-budget-plan" value="${projectBudgetPlanDetailTotal.month}" readonly/></td>
-                            <td><input type="number" class="am-modal-prompt-input input-total-device-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.deviceCost)}" readonly/></td>
-                            <td><input type="number" class="am-modal-prompt-input input-total-engineer-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.engineerCost)}" readonly/></td>
-                            <td><input type="number" class="am-modal-prompt-input input-total-project-manage-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.projectManageCost)}" readonly/></td>
-                            <td><input type="number" class="am-modal-prompt-input input-total-earnest-money-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.earnestMoneyCost)}" readonly/></td>
-                            <td><input type="number" class="am-modal-prompt-input input-total-total-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.totalCost)}" readonly/></td>
-                            <td><input type="number" class="am-modal-prompt-input input-total-sale-income-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.saleIncome)}" readonly/></td>
-                            <td><input type="number" class="am-modal-prompt-input input-total-earnest-money-income-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.earnestMoneyIncome)}" readonly/></td>
-                            <td><input type="number" class="am-modal-prompt-input input-total-total-income-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.totalIncome)}" readonly/></td>
-                            <td><input type="number" class="am-modal-prompt-input input-total-fund-balance-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.fundBalance)}" readonly/></td>
-                            <td><input type="number" class="am-modal-prompt-input input-total-capital-interest-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.capitalInterest)}" readonly/></td>
-                            <td><input type="number" class="am-modal-prompt-input input-total-underwritten-plan-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.underwrittenPlan)}" readonly/></td>
-                            <td><input type="number" class="am-modal-prompt-input input-total-repayment-plan-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.repaymentPlan)}" readonly/></td>
+                            <td><input type="text" class="number am-modal-prompt-input input-total-device-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.deviceCost)}" readonly/></td>
+                            <td><input type="text" class="number am-modal-prompt-input input-total-engineer-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.engineerCost)}" readonly/></td>
+                            <td><input type="text" class="number am-modal-prompt-input input-total-project-manage-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.projectManageCost)}" readonly/></td>
+                            <td><input type="text" class="number am-modal-prompt-input input-total-earnest-money-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.earnestMoneyCost)}" readonly/></td>
+                            <td><input type="text" class="number am-modal-prompt-input input-total-total-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.totalCost)}" readonly/></td>
+                            <td><input type="text" class="number am-modal-prompt-input input-total-sale-income-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.saleIncome)}" readonly/></td>
+                            <td><input type="text" class="number am-modal-prompt-input input-total-earnest-money-income-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.earnestMoneyIncome)}" readonly/></td>
+                            <td><input type="text" class="number am-modal-prompt-input input-total-total-income-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.totalIncome)}" readonly/></td>
+                            <td><input type="text" class="number am-modal-prompt-input input-total-fund-balance-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.fundBalance)}" readonly/></td>
+                            <td><input type="text" class="number am-modal-prompt-input input-total-capital-interest-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.capitalInterest)}" readonly/></td>
+                            <td><input type="text" class="number am-modal-prompt-input input-total-underwritten-plan-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.underwrittenPlan)}" readonly/></td>
+                            <td><input type="text" class="number am-modal-prompt-input input-total-repayment-plan-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.repaymentPlan)}" readonly/></td>
                             <td></td>
                         </tr>
 
@@ -608,18 +608,18 @@
                             <#list projectBudgetPlanDetails as projectBudgetPlanDetail>
                                 <tr>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-month-budget-plan" value="${projectBudgetPlanDetail.month!}" readonly></td>
-                                    <td><input type="number" oninput="if(value.length>13)value=value.slice(0,13)" min="0.00" max="9999999999.99" step="0.01" maxlength="13" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-device-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetail.deviceCost)}"></td>
-                                    <td><input type="number" oninput="if(value.length>13)value=value.slice(0,13)" min="0.00" max="9999999999.99" step="0.01" maxlength="13" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-engineer-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetail.engineerCost)}"></td>
-                                    <td><input type="number" oninput="if(value.length>13)value=value.slice(0,13)" min="0.00" max="9999999999.99" step="0.01" maxlength="13" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-project-manage-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetail.projectManageCost)}"></td>
-                                    <td><input type="number" oninput="if(value.length>13)value=value.slice(0,13)" min="0.00" max="9999999999.99" step="0.01" maxlength="13" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-earnest-money-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetail.earnestMoneyCost)}"></td>
-                                    <td><input type="number" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-total-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetail.totalCost)}" readonly></td>
-                                    <td><input type="number" oninput="if(value.length>13)value=value.slice(0,13)" min="0.00" max="9999999999.99" step="0.01" maxlength="13" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-sale-income-budget-plan" value="${Utils.format(projectBudgetPlanDetail.saleIncome)}"></td>
-                                    <td><input type="number" oninput="if(value.length>13)value=value.slice(0,13)" min="0.00" max="9999999999.99" step="0.01" maxlength="13" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-earnest-money-income-budget-plan" value="${Utils.format(projectBudgetPlanDetail.earnestMoneyIncome)}"></td>
-                                    <td><input type="number" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-total-income-budget-plan" value="${Utils.format(projectBudgetPlanDetail.totalIncome)}" readonly></td>
-                                    <td><input type="number" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-fund-balance-budget-plan" value="${Utils.format(projectBudgetPlanDetail.fundBalance)}" readonly></td>
-                                    <td><input type="number" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-capital-interest-budget-plan" value="${Utils.format(projectBudgetPlanDetail.capitalInterest)}" readonly></td>
-                                    <td><input type="number" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-underwritten-plan-budget-plan" value="${Utils.format(projectBudgetPlanDetail.underwrittenPlan)}" readonly></td>
-                                    <td><input type="number" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-repayment-plan-budget-plan" value="${Utils.format(projectBudgetPlanDetail.repaymentPlan)}" readonly></td>
+                                    <td><input type="text" oninput="if(value.length>16)value=value.slice(0,16)" maxlength="16" class="number am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-device-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetail.deviceCost)}"></td>
+                                    <td><input type="text" oninput="if(value.length>16)value=value.slice(0,16)" maxlength="16" class="number am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-engineer-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetail.engineerCost)}"></td>
+                                    <td><input type="text" oninput="if(value.length>16)value=value.slice(0,16)" maxlength="16" class="number am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-project-manage-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetail.projectManageCost)}"></td>
+                                    <td><input type="text" oninput="if(value.length>16)value=value.slice(0,16)" maxlength="16" class="number am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-earnest-money-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetail.earnestMoneyCost)}"></td>
+                                    <td><input type="text" class="number am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-total-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetail.totalCost)}" readonly></td>
+                                    <td><input type="text" oninput="if(value.length>16)value=value.slice(0,16)" maxlength="16" class="number am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-sale-income-budget-plan" value="${Utils.format(projectBudgetPlanDetail.saleIncome)}"></td>
+                                    <td><input type="text" oninput="if(value.length>16)value=value.slice(0,16)" maxlength="16" class="number am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-earnest-money-income-budget-plan" value="${Utils.format(projectBudgetPlanDetail.earnestMoneyIncome)}"></td>
+                                    <td><input type="text" class="number am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-total-income-budget-plan" value="${Utils.format(projectBudgetPlanDetail.totalIncome)}" readonly></td>
+                                    <td><input type="text" class="number am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-fund-balance-budget-plan" value="${Utils.format(projectBudgetPlanDetail.fundBalance)}" readonly></td>
+                                    <td><input type="text" class="number am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-capital-interest-budget-plan" value="${Utils.format(projectBudgetPlanDetail.capitalInterest)}" readonly></td>
+                                    <td><input type="text" class="number am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-underwritten-plan-budget-plan" value="${Utils.format(projectBudgetPlanDetail.underwrittenPlan)}" readonly></td>
+                                    <td><input type="text" class="number am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-repayment-plan-budget-plan" value="${Utils.format(projectBudgetPlanDetail.repaymentPlan)}" readonly></td>
                                     <td><button type="button" class="am-btn am-btn-danger am-btn-xs am-round am-modal-line-delete-budget-plan"><span class="am-icon-minus"></span></button></td>
                                 </tr>
                             </#list>
@@ -669,26 +669,26 @@
                     <tr>
                         <td>收入</td>
                         <td>设备类</td>
-                        <td><input type="number" name="incomeDeviceTaxInclude" value="${Utils.format(budgetBean.incomeDeviceTaxInclude,'0')}" required readonly title="设备类含税总额"></td>
-                        <td><input type="number" name="incomeDeviceTaxExclude" value="${Utils.format(budgetBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类不含税总额"></td>
+                        <td><input type="text" class="number" name="incomeDeviceTaxInclude" value="${Utils.format(budgetBean.incomeDeviceTaxInclude,'0')}" required readonly title="设备类含税总额"></td>
+                        <td><input type="text" class="number" name="incomeDeviceTaxExclude" value="${Utils.format(budgetBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类不含税总额"></td>
                     </tr>
                     <tr>
                         <td>收入</td>
                         <td>工程类</td>
-                        <td><input type="number" name="incomeEngineerTaxInclude" value="${Utils.format(budgetBean.incomeEngineerTaxInclude,'0')}" required readonly title="工程类含税总额"></td>
-                        <td><input type="number" name="incomeEngineerTaxExclude" value="${Utils.format(budgetBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类不含税总额"></td>
+                        <td><input type="text" class="number" name="incomeEngineerTaxInclude" value="${Utils.format(budgetBean.incomeEngineerTaxInclude,'0')}" required readonly title="工程类含税总额"></td>
+                        <td><input type="text" class="number" name="incomeEngineerTaxExclude" value="${Utils.format(budgetBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类不含税总额"></td>
                     </tr>
                     <tr>
                         <td>收入</td>
                         <td>服务类</td>
-                        <td><input type="number" name="incomeServiceTaxInclude" value="${Utils.format(budgetBean.incomeServiceTaxInclude,'0')}" required readonly title="服务类含税总额"></td>
-                        <td><input type="number" name="incomeServiceTaxExclude" value="${Utils.format(budgetBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类不含税总额"></td>
+                        <td><input type="text" class="number" name="incomeServiceTaxInclude" value="${Utils.format(budgetBean.incomeServiceTaxInclude,'0')}" required readonly title="服务类含税总额"></td>
+                        <td><input type="text" class="number" name="incomeServiceTaxExclude" value="${Utils.format(budgetBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类不含税总额"></td>
                     </tr>
                     <tr>
                         <td>合计</td>
                         <td></td>
-                        <td><input type="number" name="incomeTotalTaxInclude" value="${Utils.format(budgetBean.incomeTotalTaxInclude,'0')}" readonly required title="此列累计"></td>
-                        <td><input type="number" name="incomeTotalTaxExclude" value="${Utils.format(budgetBean.incomeTotalTaxExclude,'0')}" readonly required title="此列累计"></td>
+                        <td><input type="text" class="number" name="incomeTotalTaxInclude" value="${Utils.format(budgetBean.incomeTotalTaxInclude,'0')}" readonly required title="此列累计"></td>
+                        <td><input type="text" class="number" name="incomeTotalTaxExclude" value="${Utils.format(budgetBean.incomeTotalTaxExclude,'0')}" readonly required title="此列累计"></td>
                     </tr>
                     </tbody>
                 </table>
@@ -708,51 +708,51 @@
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>设备</td>
-                        <td><input type="number" name="costPurchaseDeviceTaxInclude" value="${Utils.format(budgetBean.costPurchaseDeviceTaxInclude,'0')}" readonly required title="购买设备含税总额"></td>
-                        <td><input type="number" name="costPurchaseDeviceTaxExclude" value="${Utils.format(budgetBean.costPurchaseDeviceTaxExclude,'0')}" readonly required title="购买设备不含税总额"></td>
+                        <td><input type="text" class="number" name="costPurchaseDeviceTaxInclude" value="${Utils.format(budgetBean.costPurchaseDeviceTaxInclude,'0')}" readonly required title="购买设备含税总额"></td>
+                        <td><input type="text" class="number" name="costPurchaseDeviceTaxExclude" value="${Utils.format(budgetBean.costPurchaseDeviceTaxExclude,'0')}" readonly required title="购买设备不含税总额"></td>
                     </tr>
                     <tr>
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>施工</td>
-                        <td><input type="number" name="costPurchaseBuildTaxInclude" value="${Utils.format(budgetBean.costPurchaseBuildTaxInclude,'0')}" readonly required title="购买施工含税总额"></td>
-                        <td><input type="number" name="costPurchaseBuildTaxExclude" value="${Utils.format(budgetBean.costPurchaseBuildTaxExclude,'0')}" readonly required title="购买施工不含税总额"></td>
+                        <td><input type="text" class="number" name="costPurchaseBuildTaxInclude" value="${Utils.format(budgetBean.costPurchaseBuildTaxInclude,'0')}" readonly required title="购买施工含税总额"></td>
+                        <td><input type="text" class="number" name="costPurchaseBuildTaxExclude" value="${Utils.format(budgetBean.costPurchaseBuildTaxExclude,'0')}" readonly required title="购买施工不含税总额"></td>
                     </tr>
                     <tr>
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>服务</td>
-                        <td><input type="number" name="costPurchaseServiceTaxInclude" value="${Utils.format(budgetBean.costPurchaseServiceTaxInclude,'0')}" readonly required title="购买服务含税总额"></td>
-                        <td><input type="number" name="costPurchaseServiceTaxExclude" value="${Utils.format(budgetBean.costPurchaseServiceTaxExclude,'0')}" readonly required title="购买服务不含税总额"></td>
+                        <td><input type="text" class="number" name="costPurchaseServiceTaxInclude" value="${Utils.format(budgetBean.costPurchaseServiceTaxInclude,'0')}" readonly required title="购买服务含税总额"></td>
+                        <td><input type="text" class="number" name="costPurchaseServiceTaxExclude" value="${Utils.format(budgetBean.costPurchaseServiceTaxExclude,'0')}" readonly required title="购买服务不含税总额"></td>
                     </tr>
                     <tr>
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>其他</td>
-                        <td><input type="number" name="costPurchaseOtherTaxInclude" value="${Utils.format(budgetBean.costPurchaseOtherTaxInclude,'0')}" readonly required title="购买其他含税总额"></td>
-                        <td><input type="number" name="costPurchaseOtherTaxExclude" value="${Utils.format(budgetBean.costPurchaseOtherTaxExclude,'0')}" readonly required title="购买其他不含税总额"></td>
+                        <td><input type="text" class="number" name="costPurchaseOtherTaxInclude" value="${Utils.format(budgetBean.costPurchaseOtherTaxInclude,'0')}" readonly required title="购买其他含税总额"></td>
+                        <td><input type="text" class="number" name="costPurchaseOtherTaxExclude" value="${Utils.format(budgetBean.costPurchaseOtherTaxExclude,'0')}" readonly required title="购买其他不含税总额"></td>
                     </tr>
                     <tr>
                         <td>成本</td>
                         <td>项目管理成本</td>
                         <td>项目管理成本</td>
-                        <td><input type="number" name="costProjectManageTaxInclude" value="${Utils.format(budgetBean.costProjectManageTaxInclude,'0')}" readonly required title="项目管理成本总额含税"></td>
-                        <td><input type="number" name="costProjectManageTaxExclude" value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0')}" readonly required title="项目管理成本总额不含税"></td>
+                        <td><input type="text" class="number" name="costProjectManageTaxInclude" value="${Utils.format(budgetBean.costProjectManageTaxInclude,'0')}" readonly required title="项目管理成本总额含税"></td>
+                        <td><input type="text" class="number" name="costProjectManageTaxExclude" value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0')}" readonly required title="项目管理成本总额不含税"></td>
                     </tr>
                     <tr>
                         <td>成本</td>
                         <td>其他</td>
                         <td><input type="text" id="otherName" maxlength="6" data-validate-async data-validation-message="请输入其他中的小类名称（10字符以内）"
                                    value="${project.otherName!}" name="otherName" placeholder="请输入其他中的小类名称（10字符以内）" readonly required/> </td>
-                        <td><input type="number" min="0.00" max="9999999999.99" step="0.01" maxlength="13" name="costOtherOtherTaxInclude" value="${Utils.format(budgetBean.costOtherOtherTaxInclude,'0')}" required title="其他含税总额（填入）"></td>
-                        <td><input type="number" min="0.00" max="9999999999.99" step="0.01" maxlength="13" name="costOtherOtherTaxExclude" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0')}" required title="其他不含税总额（填入）"></td>
+                        <td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxInclude" value="${Utils.format(budgetBean.costOtherOtherTaxInclude,'0')}" required title="其他含税总额（填入）"></td>
+                        <td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxExclude" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0')}" required title="其他不含税总额（填入）"></td>
                     </tr>
                     <tr>
                         <td>合计</td>
                         <td></td>
                         <td></td>
-                        <td><input type="number" name="costTotalTaxInclude" value="${Utils.format(budgetBean.costTotalTaxInclude,'0')}" readonly required title="此列累计"></td>
-                        <td><input type="number" name="costTotalTaxExclude" value="${Utils.format(budgetBean.costTotalTaxExclude,'0')}" readonly required title="此列累计"></td>
+                        <td><input type="text" class="number" name="costTotalTaxInclude" value="${Utils.format(budgetBean.costTotalTaxInclude,'0')}" readonly required title="此列累计"></td>
+                        <td><input type="text" class="number" name="costTotalTaxExclude" value="${Utils.format(budgetBean.costTotalTaxExclude,'0')}" readonly required title="此列累计"></td>
                     </tr>
                     </tbody>
                 </table>
@@ -768,12 +768,12 @@
                     <tr>
                         <td>财务费用</td>
                         <td>资金占用成本</td>
-                        <td><input type="number" name="costExpropriationTaxExclude" value="${Utils.format(budgetBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本不含税总额"></td>
+                        <td><input type="text" class="number" name="costExpropriationTaxExclude" value="${Utils.format(budgetBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本不含税总额"></td>
                     </tr>
                     <tr>
                         <td>公司管理费用</td>
                         <td></td>
-                        <td><input type="number" min="0.00" max="9999999999.99" step="0.01" maxlength="13" name="costCompanyManageTaxExclude" value="${Utils.format(budgetBean.costCompanyManageTaxExclude,'0')}" required title="公司管理费用不含税总额"></td>
+                        <td><input type="text" class="number" maxlength="16" name="costCompanyManageTaxExclude" value="${Utils.format(budgetBean.costCompanyManageTaxExclude,'0')}" required title="公司管理费用不含税总额"></td>
                     </tr>
                     </tbody>
                 </table>
@@ -787,19 +787,19 @@
                     </tr>
                     <tr>
                         <td>项目毛利（元）</td>
-                        <td><input type="number" name="projectGrossProfit" value="${Utils.format(budgetBean.projectGrossProfit,'0')}" readonly required title="收入总计（不含税）-成本总计（不含税）-财务费用总计（不含税）"></td>
+                        <td><input type="text" class="number" name="projectGrossProfit" value="${Utils.format(budgetBean.projectGrossProfit,'0')}" readonly required title="收入总计（不含税）-成本总计（不含税）-财务费用总计（不含税）"></td>
                     </tr>
                     <tr>
                         <td>项目毛利率（%）</td>
-                        <td><input type="number" name="projectGrossProfitRate" value="${Utils.format(budgetBean.projectGrossProfitRate,'0')}" readonly required title="毛利（不含税）/收入总计（不含税）"></td>
+                        <td><input type="text" class="number" name="projectGrossProfitRate" value="${Utils.format(budgetBean.projectGrossProfitRate,'0')}" readonly required title="毛利（不含税）/收入总计（不含税）"></td>
                     </tr>
                     <tr>
                         <td>项目贡献利润（元）</td>
-                        <td><input type="number" name="projectContributionProfit" value="${Utils.format(budgetBean.projectContributionProfit,'0')}" readonly required title="项目毛利（不含税）-公司管理费用总计（不含税）"></td>
+                        <td><input type="text" class="number" name="projectContributionProfit" value="${Utils.format(budgetBean.projectContributionProfit,'0')}" readonly required title="项目毛利（不含税）-公司管理费用总计（不含税）"></td>
                     </tr>
                     <tr>
                         <td>项目贡献利润率（%）</td>
-                        <td><input type="number" name="projectContributionProfitRate" value="${Utils.format(budgetBean.projectContributionProfitRate,'0')}" readonly required title="贡献利润（不含税）/收入总计（不含税）"></td>
+                        <td><input type="text" class="number" name="projectContributionProfitRate" value="${Utils.format(budgetBean.projectContributionProfitRate,'0')}" readonly required title="贡献利润（不含税）/收入总计（不含税）"></td>
                     </tr>
                     </tbody>
                 </table>
@@ -814,7 +814,7 @@
                     </tr>
                     <tr>
                         <td>销售商品、提供劳务收到的现金<#--a--></td>
-                        <td><input type="number" name="saleIncomeCash" value="${Utils.format(cashFlowBean.saleIncomeCash,'0')}" readonly required title="取自资金计划表（销售收款）"></td>
+                        <td><input type="text" class="number" name="saleIncomeCash" value="${Utils.format(cashFlowBean.saleIncomeCash,'0')}" readonly required title="取自资金计划表（销售收款）"></td>
                     </tr>
                     <tr>
                         <td>收到的税费返还<#--b--></td>
@@ -822,11 +822,11 @@
                     </tr>
                     <tr>
                         <td>收到其他与经营活动有关的现金<#--c--></td>
-                        <td><input type="number" name="earnestMoneyIncome" value="${Utils.format(cashFlowBean.earnestMoneyIncome,'0')}" readonly required title="取自资金计划表（保证金收款）"></td>
+                        <td><input type="text" class="number" name="earnestMoneyIncome" value="${Utils.format(cashFlowBean.earnestMoneyIncome,'0')}" readonly required title="取自资金计划表（保证金收款）"></td>
                     </tr>
                     <tr>
                         <td>购买商品、接受劳务支付的现金<#--d--></td>
-                        <td><input type="number" name="purchaseCost" value="${Utils.format(cashFlowBean.purchaseCost,'0')}" readonly required title="取自资金计划表（设备支出+工程支出）"></td>
+                        <td><input type="text" class="number" name="purchaseCost" value="${Utils.format(cashFlowBean.purchaseCost,'0')}" readonly required title="取自资金计划表（设备支出+工程支出）"></td>
                     </tr>
                     <tr>
                         <td>支付的各项税费<#--e--></td>
@@ -834,11 +834,11 @@
                     </tr>
                     <tr>
                         <td>支付其他与经营活动有关的现金<#--f--></td>
-                        <td><input type="number" name="earnestMoneyCost" value="${Utils.format(cashFlowBean.earnestMoneyCost,'0')}" readonly required title="取自资金计划表（经营性开支+保证金支出+资金利息）"></td>
+                        <td><input type="text" class="number" name="earnestMoneyCost" value="${Utils.format(cashFlowBean.earnestMoneyCost,'0')}" readonly required title="取自资金计划表（经营性开支+保证金支出+资金利息）"></td>
                     </tr>
                     <tr>
                         <td>经营活动产生的现金流量净额<#--g--></td>
-                        <td><input type="number" name="netCashFlow" value="${Utils.format(cashFlowBean.netCashFlow,'0')}" readonly required title="g=a+c+b-d-f-e"></td>
+                        <td><input type="text" class="number" name="netCashFlow" value="${Utils.format(cashFlowBean.netCashFlow,'0')}" readonly required title="g=a+c+b-d-f-e"></td>
                     </tr>
                     <tr>
                         <td>投资活动现金流入<#--h--></td>
@@ -854,19 +854,19 @@
                     </tr>
                     <tr>
                         <td>融资资金流入<#--k--></td>
-                        <td><input type="number" name="financingCapitalInflow" value="${Utils.format(cashFlowBean.financingCapitalInflow,'0')}" readonly required title="从资金计划表查（垫资计划）"></td>
+                        <td><input type="text" class="number" name="financingCapitalInflow" value="${Utils.format(cashFlowBean.financingCapitalInflow,'0')}" readonly required title="从资金计划表查（垫资计划）"></td>
                     </tr>
                     <tr>
                         <td>还款资金流出<#--l--></td>
-                        <td><input type="number" name="financingCapitalOutflow" value="${Utils.format(cashFlowBean.financingCapitalOutflow,'0')}" readonly required title="从资金计划表查（还款计划）"></td>
+                        <td><input type="text" class="number" name="financingCapitalOutflow" value="${Utils.format(cashFlowBean.financingCapitalOutflow,'0')}" readonly required title="从资金计划表查（还款计划）"></td>
                     </tr>
                     <tr>
                         <td>筹资活动产生的现金流量净额<#--m--></td>
-                        <td><input type="number" name="financingCapitalCashflow" value="${Utils.format(cashFlowBean.financingCapitalCashflow,'0')}" readonly required title="m=k-l"></td>
+                        <td><input type="text" class="number" name="financingCapitalCashflow" value="${Utils.format(cashFlowBean.financingCapitalCashflow,'0')}" readonly required title="m=k-l"></td>
                     </tr>
                     <tr>
                         <td>货币资金净增加额<#--n--></td>
-                        <td><input type="number" name="netIncreaseMonetaryFunds" value="${Utils.format(cashFlowBean.netIncreaseMonetaryFunds,'0')}" readonly required title="n=g+j+m"></td>
+                        <td><input type="text" class="number" name="netIncreaseMonetaryFunds" value="${Utils.format(cashFlowBean.netIncreaseMonetaryFunds,'0')}" readonly required title="n=g+j+m"></td>
                     </tr>
                     </tbody>
                 </table>

From 2e53f2f4c6cff35afd804dd2e4facaf42766c3e8 Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Fri, 7 Jan 2022 09:57:34 +0800
Subject: [PATCH 03/35] =?UTF-8?q?=E9=A2=84=E7=AE=97=E5=88=86=E9=9A=94?=
 =?UTF-8?q?=E7=AC=A6=E7=94=9F=E6=88=90=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/assets/js/project_budget.js        |  12 +-
 .../static/assets/js/project_budget_cost.js   |   3 +-
 .../js/project_budget_cost_project_manage.js  |   1 +
 .../static/assets/js/project_common.js        |   1 -
 .../templates/admin/project_budget_edit.ftl   | 299 ------------------
 5 files changed, 14 insertions(+), 302 deletions(-)

diff --git a/src/main/resources/static/assets/js/project_budget.js b/src/main/resources/static/assets/js/project_budget.js
index b5bdf15..50a0109 100644
--- a/src/main/resources/static/assets/js/project_budget.js
+++ b/src/main/resources/static/assets/js/project_budget.js
@@ -53,6 +53,17 @@ BUDGET_PLAN_DETAIL={
 };
 
 $(function () {
+    $("input[name='costCompanyManageTaxExclude']").change(function () {
+        digitalSelf("costCompanyManageTaxExclude", "input[name='costCompanyManageTaxExclude']");
+    });
+    $("input[name='costOtherOtherTaxInclude']").change(function () {
+        console.log("budget.js:costOtherOtherTaxInclude");
+        digitalSelf("costOtherOtherTaxInclude", "input[name='costOtherOtherTaxInclude']");
+    });
+    $("input[name='costOtherOtherTaxExclude']").change(function () {
+        console.log("budget.js:costOtherOtherTaxExclude");
+        digitalSelf("costOtherOtherTaxExclude", "input[name='costOtherOtherTaxExclude']");
+    });
     //绑定删除按钮删除当前行
     bindDeleteBtn();
     //绑定收入和采购成本的输入框【都有税率】
@@ -341,7 +352,6 @@ function arr2ObjectVerifyCheck(line, arr, detailPropertyArr, detailProperty, s)
 function collectData(className) {
     var a = [];
     $("." + className).each(function (t) {
-        console.log("收集：" + className + "," + $(this).val())
         a.push($(this).val());
     });
     return a;
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 c35890e..43bf09c 100644
--- a/src/main/resources/static/assets/js/project_budget_cost.js
+++ b/src/main/resources/static/assets/js/project_budget_cost.js
@@ -288,7 +288,7 @@ function bindOtherOtherChangeable() {
         calCostInclude();
 
         updateProjectContributionProfitRate();
-
+        digitalSelf("costOtherOtherTaxInclude", "input[name='costOtherOtherTaxInclude']");
     });
 
     $("input[name='costOtherOtherTaxExclude']").change(function () {
@@ -306,6 +306,7 @@ function bindOtherOtherChangeable() {
         calCostExclude();
 
         updateProjectContributionProfitRate();
+        digitalSelf("costOtherOtherTaxExclude", "input[name='costOtherOtherTaxExclude']");
     });
 }
 
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 cd10199..971558c 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
@@ -297,6 +297,7 @@ function updateCostProjectManageData(data,returnData) {
 
     calCostExclude();
     calCostInclude();
+    console.log("51");
 
     updateProjectContributionProfitRate();
 
diff --git a/src/main/resources/static/assets/js/project_common.js b/src/main/resources/static/assets/js/project_common.js
index c61cd3c..fdd8dfb 100644
--- a/src/main/resources/static/assets/js/project_common.js
+++ b/src/main/resources/static/assets/js/project_common.js
@@ -179,7 +179,6 @@ function calCostInclude() {
     var costProjectManageTaxInclude = inputVal("costProjectManageTaxInclude");
     var costOtherOtherTaxInclude = inputVal("costOtherOtherTaxInclude");
 
-
     var $costTotalTaxInclude = $("input[name='costTotalTaxInclude']");
 
     $costTotalTaxInclude.val(f2Fixed(f2(costPurchaseDeviceTaxInclude) +f2(costPurchaseBuildTaxInclude)
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index c2e7729..b3f3dbe 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -876,305 +876,6 @@
     </div>
     </div>
 
-
-    <#--收入明细表弹窗-->
-    <#--<div class="am-modal am-modal-prompt" style="width: 1200px;max-height:600px;overflow-y:auto;" tabindex="-1" id="my-prompt-income-detail">
-        <div class="am-modal-dialog">
-            <div class="am-modal-hd">新增销售收入明细表——${project.name}<a href="javascript: void(0)" class="am-close&lt;#&ndash; am-close-spin&ndash;&gt;" data-am-modal-close>&times;</a></div>
-            <div class="am-modal-bd">
-                <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;" id="incomeTable">
-                    <tbody>
-                    <tr>
-                        <td>类别</td>
-                        <td>名称</td>
-                        <td>单位</td>
-                        <td>数量</td>
-                        <td>单价</td>
-                        <td>税率（%）</td>
-                        <td>含税总金额（元）</td>
-                        <td>不含税金额（元）</td>
-                        <td>操作</td>
-                    </tr>
-
-                    <#if incomeDetails??>
-                        <#list incomeDetails as incomeDetail>+
-                        <tr>
-                            <td>
-                                <select style="width: 80px;float: left;" class="am-modal-prompt-input am-modal-prompt-input-income">
-                                    <option value="1" <#if incomeDetail.type == 1>selected</#if>>设备类</option>
-                                    <option value="2" <#if incomeDetail.type == 2>selected</#if>>工程类</option>
-                                    <option value="3" <#if incomeDetail.type == 3>selected</#if>>服务类</option>
-                                </select>
-                            </td>
-                            <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income" value="${incomeDetail.name!}"></td>
-                            <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income" value="${incomeDetail.unit!}"></td>
-                            <td><input type="number" min="0" max="99999999" step="1" maxlength="8" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-amount" value="${incomeDetail.amount!0}" oninput="if(value.length>8)value=value.slice(0,8)" &lt;#&ndash;onkeyup="integerNumber(this)"&ndash;&gt;></td>
-                            <td><input type="number" min="0.00" max="9999999999.99" step="0.01" maxlength="13" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-price" value="${Utils.format(incomeDetail.price,'0')}" oninput="if(value.length>13)value=value.slice(0,13)"></td>
-                            <td><input type="number" min="0.00" max="99.99" step="0.01" maxlength="5" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-tax-rate" value="${Utils.format(incomeDetail.taxRate,'0')}" oninput="if(value.length>5)value=value.slice(0,5)"></td>
-                            <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-tax-include" value="${Utils.format(incomeDetail.totalTaxInclude,'0')}" readonly></td>
-                            <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-tax-exclude" value="${Utils.format(incomeDetail.totalTaxExclude,'0')}" readonly></td>
-                            <td><button type="button" class="am-btn am-btn-danger am-btn-xs am-round am-modal-line-delete"><span class="am-icon-minus"></span></button></td>
-                        </tr>
-                        </#list>
-                    </#if>
-
-                    </tbody>
-                </table>
-                <button type="button" id="incomeAddBtn" class="am-btn am-btn-primary am-btn-xs am-round"><span class="am-icon-plus"></span></button>
-            </div>
-            <div class="am-modal-footer">
-                <span class="am-modal-btn" data-am-modal-cancel>取消</span>
-                <span class="am-modal-btn" data-am-modal-confirm>保存</span>
-            </div>
-        </div>
-    </div>-->
-    <#--采购成本明细弹窗-->
-    <#--<div class="am-modal am-modal-prompt" style="width: 1200px;max-height:600px;overflow-y:auto;" tabindex="-1" id="my-prompt-cost-detail">
-        <div class="am-modal-dialog">
-            <div class="am-modal-hd">新增采购成本明细表——${project.name}<a href="javascript: void(0)" class="am-close&lt;#&ndash; am-close-spin&ndash;&gt;" data-am-modal-close>&times;</a></div>
-            <div class="am-modal-bd">
-                <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;" id="costTable">
-                    <tbody>
-                    <tr>
-                        <td>大类</td>
-                        <td>类别</td>
-                        <td>名称</td>
-                        <td>单位</td>
-                        <td>数量</td>
-                        <td>单价</td>
-                        <td>税率（%）</td>
-                        <td>含税总金额（元）</td>
-                        <td>不含税金额（元）</td>
-                        <td>操作</td>
-                    </tr>
-
-                    <#if costDetails??>
-                        <#list costDetails as costDetail>
-                        <tr>
-                            <td>
-                                <select style="width: 80px;float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-type">
-                                    <option value="1" <#if costDetail.type == 1>selected</#if>>设备</option>
-                                    <option value="2" <#if costDetail.type == 2>selected</#if>>服务</option>
-                                    <option value="3" <#if costDetail.type == 3>selected</#if>>施工</option>
-                                    <option value="4" <#if costDetail.type == 4>selected</#if>>其他</option>
-                                </select>
-                            </td>
-                            <td>
-                                <select style="width: 80px;float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-category">
-                                    &lt;#&ndash;<option value="1" <#if costDetail.category == 1>selected</#if>>华智产品</option>
-                                    <option value="2" <#if costDetail.category == 2>selected</#if>>紫光其他产品</option>
-                                    <option value="3" <#if costDetail.category == 3>selected</#if>>外购产品</option>
-                                    <option value="4" <#if costDetail.category == 4>selected</#if>>外购工程</option>
-                                    <option value="5" <#if costDetail.category == 5>selected</#if>>华智服务</option>
-                                    <option value="6" <#if costDetail.category == 6>selected</#if>>紫光其他服务</option>
-                                    <option value="7" <#if costDetail.category == 7>selected</#if>>外购服务</option>
-                                    <option value="8" <#if costDetail.category == 8>selected</#if>>其他</option>&ndash;&gt;
-                                    <#list procurementTypes as procurementType>
-                                        <option value="${procurementType.id}" <#if costDetail.category == procurementType.id>selected</#if>>${procurementType.name}</option>
-                                    </#list>
-                                </select>
-                            </td>
-                            <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost" value="${costDetail.name!}"></td>
-                            <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost" value="${costDetail.unit!}"></td>
-                            <td><input type="number" min="0" max="99999999" step="1" maxlength="8" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-amount" value="${costDetail.amount!0}" oninput="if(value.length>8)value=value.slice(0,8)" &lt;#&ndash;onkeyup="integerNumber(this)"&ndash;&gt;></td>
-                            <td><input type="number" min="0.00" max="9999999999.99" step="0.01" maxlength="13" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-price" value="${Utils.format(costDetail.price,'0')}" oninput="if(value.length>13)value=value.slice(0,13)"></td>
-                            <td><input type="number" min="0.00" max="99.99" step="0.01" maxlength="5" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-tax-rate" value="${Utils.format(costDetail.taxRate,'0')}" oninput="if(value.length>5)value=value.slice(0,5)"></td>
-                            <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-tax-include" value="${Utils.format(costDetail.totalTaxInclude,'0')}" readonly></td>
-                            <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-tax-exclude" value="${Utils.format(costDetail.totalTaxExclude,'0')}" readonly></td>
-                            <td><button type="button" class="am-btn am-btn-danger am-btn-xs am-round am-modal-line-delete"><span class="am-icon-minus"></span></button></td>
-                        </tr>
-                        </#list>
-                    </#if>
-
-                    </tbody>
-                </table>
-                <button type="button" id="costAddBtn" class="am-btn am-btn-primary am-btn-xs am-round"><span class="am-icon-plus"></span></button>
-            </div>
-            <div class="am-modal-footer">
-                <span class="am-modal-btn" data-am-modal-cancel>取消</span>
-                <span class="am-modal-btn" data-am-modal-confirm>保存</span>
-            </div>
-        </div>
-    </div>-->
-    <#--项目管理明细表弹窗-->
-    <#--<div class="am-modal am-modal-prompt" style="width: 1200px;max-height:600px;overflow-y:auto;" tabindex="-1" id="my-prompt-cost-project-manage-detail">
-        <div class="am-modal-dialog">
-            <div class="am-modal-hd">新增项目管理成本明细表——${project.name}<a href="javascript: void(0)" class="am-close&lt;#&ndash; am-close-spin&ndash;&gt;" data-am-modal-close>&times;</a></div>
-            <div class="am-modal-bd">
-                <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;" id="costProjectManageTable">
-                    <tbody>
-                    <tr>
-                        <td>财务费用类别</td>
-                        <td>业务项目</td>
-                        <td>项目明细</td>
-                        <td>单位</td>
-                        <td>数量</td>
-                        <td>单价</td>
-                        <td>总金额（元）</td>
-                        <td>预估计算方法</td>
-                        <td>预估依据</td>
-                        <td>备注</td>
-                        <td>操作</td>
-                    </tr>
-                        <#if costProjectManageDetails??>
-                            <#list costProjectManageDetails as costProjectManageDetail>
-                            <tr>
-                                <td>
-                                    <select style="width: 80px;float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage am-modal-prompt-input-cost-project-manage-type">
-                                        <option value="1" <#if costProjectManageDetail.type == 1>selected</#if>>人工成本</option>
-                                        <option value="2" <#if costProjectManageDetail.type == 2>selected</#if>>业务费用</option>
-                                        <option value="3" <#if costProjectManageDetail.type == 3>selected</#if>>其他费用</option>
-                                    </select>
-                                </td>
-                                <td>
-                                    <select style="width: 80px;float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage am-modal-prompt-input-cost-project-manage-category">
-                                        <option value="1" <#if costProjectManageDetail.name == "人工费">selected</#if>>人工费</option>
-                                        <option value="2" <#if costProjectManageDetail.name == "总部支撑人力费用">selected</#if>>总部支撑人力费用</option>
-                                        <option value="4" <#if costProjectManageDetail.name == "人员差旅费">selected</#if>>人员差旅费</option>
-                                        <option value="5" <#if costProjectManageDetail.name == "业务费用">selected</#if>>业务费用</option>
-                                        <option value="6" <#if costProjectManageDetail.name == "商务及专项验收费用">selected</#if>>商务及专项验收费用</option>
-                                        <option value="7" <#if costProjectManageDetail.name == "办公费用">selected</#if>>办公费用</option>
-                                    </select>
-&lt;#&ndash;                                    <input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="${costProjectManageDetail.name!}"  <#if costProjectManageDetail.deletable==0>readonly</#if>>&ndash;&gt;
-                                </td>
-                                <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="${costProjectManageDetail.detail!}"></td>
-                                <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="${costProjectManageDetail.unit!}"></td>
-                                <td><input type="number" min="0" max="99999999" step="1" maxlength="8" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-amount-project-manage" value="${costProjectManageDetail.amount!0}" &lt;#&ndash;onkeyup="integerNumber(this)"&ndash;&gt; oninput="if(value.length>8)value=value.slice(0,8)"></td>
-                                <td><input type="number" min="0.00" max="9999999999.99" step="0.01" maxlength="13" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-price-project-manage" value="${Utils.format(costProjectManageDetail.price,'0')}" oninput="if(value.length>13)value=value.slice(0,13)"></td>
-                                <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-total-project-manage" value="${Utils.format(costProjectManageDetail.total,'0')}" readonly></td>
-                                <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="${costProjectManageDetail.predictMethod!}"></td>
-                                <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="${costProjectManageDetail.predictWhy!}"></td>
-                                <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="${costProjectManageDetail.remark!}"></td>
-                                <td><button type="button" class="am-btn am-btn-danger am-btn-xs am-round am-modal-line-delete"><span class="am-icon-minus"></span></button>
-                                    <input type="hidden" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="${costProjectManageDetail.deletable!}">
-                                </td>
-                            </tr>
-                            </#list>
-                        </#if>
-
-                    </tbody>
-                </table>
-                <button type="button" id="costProjectManageAddBtn" class="am-btn am-btn-primary am-btn-xs am-round"><span class="am-icon-plus"></span></button>
-            </div>
-            <div class="am-modal-footer">
-                <span class="am-modal-btn" data-am-modal-cancel>取消</span>
-                <span class="am-modal-btn" data-am-modal-confirm>保存</span>
-            </div>
-        </div>
-    </div>-->
-    <#--资金计划明细表弹窗-->
-    <#--<div class="am-modal am-modal-prompt" style="width: 1500px;max-height:600px;overflow-y:auto;" tabindex="-1" id="my-prompt-budget-plan-detail">
-        <div class="am-modal-dialog">
-            <div class="am-modal-hd">新增资金计划明细表——${project.name}<a href="javascript: void(0)" class="am-close&lt;#&ndash; am-close-spin&ndash;&gt;" data-am-modal-close>&times;</a></div>
-            <div class="am-modal-bd">
-                <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;" id="budgetPlanDetailTable">
-                    <tbody>
-                    <tr>
-                        <td>月份</td>
-                        <td>设备支出</td>
-                        <td>工程支出</td>
-                        <td>经营性开支</td>
-                        <td>保证金支出</td>
-                        <td>支出合计</td>
-                        <td>销售收款</td>
-                        <td>保证金收款</td>
-                        <td>收款合计</td>
-                        <td>资金余额</td>
-                        <td>资金利息</td>
-                        <td>垫资计划</td>
-                        <td>还款计划</td>
-                        <td>操作</td>
-                    </tr>
-                    <tr>
-                        <td><input type="text" class="am-modal-prompt-input input-total-title-month-budget-plan" value="${projectBudgetPlanDetailTotalTitle.month}" readonly/></td>
-                        <td><input type="number"  class="am-modal-prompt-input input-total-title-device-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotalTitle.deviceCost)}" readonly/></td>
-                        <td><input type="number" class="am-modal-prompt-input input-total-title-engineer-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotalTitle.engineerCost)}" readonly/></td>
-                        <td><input type="number" class="am-modal-prompt-input input-total-title-project-manage-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotalTitle.projectManageCost)}" readonly/></td>
-                        <td><input type="number" class="am-modal-prompt-input input-total-title-earnest-money-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotalTitle.earnestMoneyCost)}" readonly/></td>
-                        <td><input type="number" class="am-modal-prompt-input input-total-title-total-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotalTitle.totalCost)}" readonly/></td>
-                        <td><input type="number" class="am-modal-prompt-input input-total-title-sale-income-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotalTitle.saleIncome)}" readonly/></td>
-                        <td><input type="number" class="am-modal-prompt-input input-total-title-earnest-money-income-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotalTitle.earnestMoneyIncome)}" readonly/></td>
-                        <td><input type="number" class="am-modal-prompt-input input-total-title-total-income-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotalTitle.totalIncome)}" readonly/></td>
-                        <td><input type="number" class="am-modal-prompt-input input-total-title-fund-balance-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotalTitle.fundBalance)}" readonly/></td>
-                        <td><input type="number" class="am-modal-prompt-input input-total-title-capital-interest-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotalTitle.capitalInterest)}" readonly/></td>
-                        <td><input type="number" class="am-modal-prompt-input input-total-title-underwritten-plan-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotalTitle.underwrittenPlan)}" readonly/></td>
-                        <td><input type="number" class="am-modal-prompt-input input-total-title-repayment-plan-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotalTitle.repaymentPlan)}" readonly/></td>
-                        <td></td>
-                    </tr>
-                    <tr class="am-hide">
-                        <td><input type="text" class="am-modal-prompt-input input-total-month-budget-plan" value="${projectBudgetPlanDetailTotal.month}" readonly/></td>
-                        <td><input type="number" class="am-modal-prompt-input input-total-device-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.deviceCost)}" readonly/></td>
-                        <td><input type="number" class="am-modal-prompt-input input-total-engineer-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.engineerCost)}" readonly/></td>
-                        <td><input type="number" class="am-modal-prompt-input input-total-project-manage-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.projectManageCost)}" readonly/></td>
-                        <td><input type="number" class="am-modal-prompt-input input-total-earnest-money-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.earnestMoneyCost)}" readonly/></td>
-                        <td><input type="number" class="am-modal-prompt-input input-total-total-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.totalCost)}" readonly/></td>
-                        <td><input type="number" class="am-modal-prompt-input input-total-sale-income-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.saleIncome)}" readonly/></td>
-                        <td><input type="number" class="am-modal-prompt-input input-total-earnest-money-income-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.earnestMoneyIncome)}" readonly/></td>
-                        <td><input type="number" class="am-modal-prompt-input input-total-total-income-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.totalIncome)}" readonly/></td>
-                        <td><input type="number" class="am-modal-prompt-input input-total-fund-balance-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.fundBalance)}" readonly/></td>
-                        <td><input type="number" class="am-modal-prompt-input input-total-capital-interest-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.capitalInterest)}" readonly/></td>
-                        <td><input type="number" class="am-modal-prompt-input input-total-underwritten-plan-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.underwrittenPlan)}" readonly/></td>
-                        <td><input type="number" class="am-modal-prompt-input input-total-repayment-plan-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.repaymentPlan)}" readonly/></td>
-                        <td></td>
-                    </tr>
-
-                        <#if projectBudgetPlanDetails??>
-                            <#list projectBudgetPlanDetails as projectBudgetPlanDetail>
-                            <tr>
-                                <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-month-budget-plan" value="${projectBudgetPlanDetail.month!}" readonly></td>
-                                <td><input type="number" oninput="if(value.length>13)value=value.slice(0,13)" min="0.00" max="9999999999.99" step="0.01" maxlength="13" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-device-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetail.deviceCost)}"></td>
-                                <td><input type="number" oninput="if(value.length>13)value=value.slice(0,13)" min="0.00" max="9999999999.99" step="0.01" maxlength="13" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-engineer-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetail.engineerCost)}"></td>
-                                <td><input type="number" oninput="if(value.length>13)value=value.slice(0,13)" min="0.00" max="9999999999.99" step="0.01" maxlength="13" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-project-manage-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetail.projectManageCost)}"></td>
-                                <td><input type="number" oninput="if(value.length>13)value=value.slice(0,13)" min="0.00" max="9999999999.99" step="0.01" maxlength="13" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-earnest-money-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetail.earnestMoneyCost)}"></td>
-                                <td><input type="number" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-total-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetail.totalCost)}" readonly></td>
-                                <td><input type="number" oninput="if(value.length>13)value=value.slice(0,13)" min="0.00" max="9999999999.99" step="0.01" maxlength="13" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-sale-income-budget-plan" value="${Utils.format(projectBudgetPlanDetail.saleIncome)}"></td>
-                                <td><input type="number" oninput="if(value.length>13)value=value.slice(0,13)" min="0.00" max="9999999999.99" step="0.01" maxlength="13" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-earnest-money-income-budget-plan" value="${Utils.format(projectBudgetPlanDetail.earnestMoneyIncome)}"></td>
-                                <td><input type="number" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-total-income-budget-plan" value="${Utils.format(projectBudgetPlanDetail.totalIncome)}" readonly></td>
-                                <td><input type="number" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-fund-balance-budget-plan" value="${Utils.format(projectBudgetPlanDetail.fundBalance)}" readonly></td>
-                                <td><input type="number" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-capital-interest-budget-plan" value="${Utils.format(projectBudgetPlanDetail.capitalInterest)}" readonly></td>
-                                <td><input type="number" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-underwritten-plan-budget-plan" value="${Utils.format(projectBudgetPlanDetail.underwrittenPlan)}" readonly></td>
-                                <td><input type="number" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-repayment-plan-budget-plan" value="${Utils.format(projectBudgetPlanDetail.repaymentPlan)}" readonly></td>
-                                <td><button type="button" class="am-btn am-btn-danger am-btn-xs am-round am-modal-line-delete-budget-plan"><span class="am-icon-minus"></span></button></td>
-                            </tr>
-                            </#list>
-                        </#if>
-
-                    </tbody>
-                </table>
-                <button type="button" id="budgetPlanDetailAddBtn" class="am-btn am-btn-primary am-btn-xs am-round"><span class="am-icon-plus"></span></button>
-
-                <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;">
-                    <tbody>
-                    <tr>
-                        <td>垫资峰值时间</td>
-                        <td>垫资峰值金额</td>
-                        <td>利率</td>
-                        <td>资金利息</td>
-                    </tr>
-                    <tr>
-                        <td><input type="text" class="am-modal-prompt-input input-underwritten-plan-statistic-max-month-budget-plan" value="${underwrittenPlanStatistic.maxMonth!}" readonly/></td>
-                        <td><input type="text" class="am-modal-prompt-input input-underwritten-plan-statistic-amount-budget-plan" value="${Utils.format(underwrittenPlanStatistic.amount,'')}" readonly/></td>
-                        <td><input type="text" class="am-modal-prompt-input input-underwritten-plan-statistic-tax-rate-budget-plan" value="${Utils.format(project.underwrittenTaxRate,'')}" readonly/></td>
-                        <td><input type="text" class="am-modal-prompt-input input-underwritten-plan-statistic-capital-interest-budget-plan" value="${Utils.format(underwrittenPlanStatistic.capitalInterest,'')}" readonly/></td>
-                    </tr>
-                    </tbody>
-                </table>
-
-
-            </div>
-            <div class="am-modal-footer">
-                <span class="am-modal-btn" data-am-modal-cancel>取消</span>
-                <span class="am-modal-btn" data-am-modal-confirm>保存</span>
-            </div>
-        </div>
-    </div>-->
-
-
-
-
-
-
-
     <!--选项卡（tabs）end-->
     <div class="am-margin">
         <button type="button" class="am-btn am-btn-warning am-btn-xs" onclick="javascript:history.go(-1);">返回上一级</button>

From 5fc40bcb2fa77c26448abc82225598ff81753d75 Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Fri, 7 Jan 2022 10:42:32 +0800
Subject: [PATCH 04/35] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=88=86=E9=9A=94=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/assets/js/project_estimate.js      | 41 +++++++++++--------
 .../templates/admin/project_budget_edit.ftl   |  6 +--
 .../templates/admin/project_estimate_add.ftl  |  6 +--
 .../templates/admin/project_estimate_edit.ftl |  6 +--
 4 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/src/main/resources/static/assets/js/project_estimate.js b/src/main/resources/static/assets/js/project_estimate.js
index 19af6c8..aa0842f 100644
--- a/src/main/resources/static/assets/js/project_estimate.js
+++ b/src/main/resources/static/assets/js/project_estimate.js
@@ -1,4 +1,13 @@
 function calIncomeAndCost() {
+    $("input[name='contractAmount']").change(function () {
+        digitalSelf("contractAmount", "input[name='contractAmount']");
+    });
+    $("input[name='huazhiProductAmount']").change(function () {
+        digitalSelf("huazhiProductAmount", "input[name='huazhiProductAmount']");
+    });
+    $("input[name='ziguangOtherAmount']").change(function () {
+        digitalSelf("ziguangOtherAmount", "input[name='ziguangOtherAmount']");
+    });
     $("input[name='incomeDeviceTaxInclude']").change(function () {
         calIncomeInclude();
         calIncomeCost();
@@ -139,7 +148,7 @@ function calIncomeAndCost() {
         } else {
             $("input[name='incomeDeviceTaxExclude']").attr('readonly',true);
             var incomeDeviceTaxInclude = inputVal("incomeDeviceTaxInclude");
-            $incomeDeviceTaxExclude.val(f2Fixed(incomeDeviceTaxInclude/(1+Number(val))));
+            $incomeDeviceTaxExclude.val(f2Fixed(f2(incomeDeviceTaxInclude)/(1+Number(val))));
         }
         calIncomeExclude();
         calIncomeCost();
@@ -154,7 +163,7 @@ function calIncomeAndCost() {
         }else if(val == "请选择税率"){
             return;
         } else {
-            $incomeDeviceTaxExclude.val(f2Fixed(incomeDeviceTaxInclude/(1+Number(val))));
+            $incomeDeviceTaxExclude.val(f2Fixed(f2(incomeDeviceTaxInclude)/(1+Number(val))));
         }
         calIncomeExclude();
         calIncomeCost();
@@ -172,7 +181,7 @@ function calIncomeAndCost() {
         } else {
             $("input[name='incomeEngineerTaxExclude']").attr('readonly',true);
             var incomeEngineerTaxInclude = inputVal("incomeEngineerTaxInclude");
-            $incomeEngineerTaxExclude.val(f2Fixed(incomeEngineerTaxInclude/(1+Number(val))));
+            $incomeEngineerTaxExclude.val(f2Fixed(f2(incomeEngineerTaxInclude)/(1+Number(val))));
         }
         calIncomeExclude();
         calIncomeCost();
@@ -187,7 +196,7 @@ function calIncomeAndCost() {
            return;
         } else {
             var incomeEngineerTaxInclude = inputVal("incomeEngineerTaxInclude");
-            $incomeEngineerTaxExclude.val(f2Fixed(incomeEngineerTaxInclude/(1+Number(val))));
+            $incomeEngineerTaxExclude.val(f2Fixed(f2(incomeEngineerTaxInclude)/(1+Number(val))));
         }
         calIncomeExclude();
         calIncomeCost();
@@ -205,7 +214,7 @@ function calIncomeAndCost() {
         } else {
             $("input[name='incomeServiceTaxExclude']").attr('readonly',true);
             var incomeServiceTaxInclude = inputVal("incomeServiceTaxInclude");
-            $incomeServiceTaxExclude.val(f2Fixed(incomeServiceTaxInclude/(1+Number(val))));
+            $incomeServiceTaxExclude.val(f2Fixed(f2(incomeServiceTaxInclude)/(1+Number(val))));
         }
         calIncomeExclude();
         calIncomeCost();
@@ -220,7 +229,7 @@ function calIncomeAndCost() {
            return;
         } else {
             var incomeServiceTaxInclude = inputVal("incomeServiceTaxInclude");
-            $incomeServiceTaxExclude.val(f2Fixed(incomeServiceTaxInclude/(1+Number(val))));
+            $incomeServiceTaxExclude.val(f2Fixed(f2(incomeServiceTaxInclude)/(1+Number(val))));
         }
         calIncomeExclude();
         calIncomeCost();
@@ -238,7 +247,7 @@ function calIncomeAndCost() {
         } else {
             $("input[name='costPurchaseDeviceTaxExclude']").attr('readonly',true);
             var costPurchaseDeviceTaxInclude = inputVal("costPurchaseDeviceTaxInclude");
-            $costPurchaseDeviceTaxExclude.val(f2Fixed(costPurchaseDeviceTaxInclude/(1+Number(val))));
+            $costPurchaseDeviceTaxExclude.val(f2Fixed(f2(costPurchaseDeviceTaxInclude)/(1+Number(val))));
         }
         calCostExclude();
         calIncomeCost();
@@ -253,7 +262,7 @@ function calIncomeAndCost() {
             return;
         } else {
             var costPurchaseDeviceTaxInclude = inputVal("costPurchaseDeviceTaxInclude");
-            $costPurchaseDeviceTaxExclude.val(f2Fixed(costPurchaseDeviceTaxInclude/(1+Number(val))));
+            $costPurchaseDeviceTaxExclude.val(f2Fixed(f2(costPurchaseDeviceTaxInclude)/(1+Number(val))));
         }
         calCostExclude();
         calIncomeCost();
@@ -271,7 +280,7 @@ function calIncomeAndCost() {
         } else {
             $("input[name='costPurchaseBuildTaxExclude']").attr('readonly',true);
             var costPurchaseBuildTaxInclude = inputVal("costPurchaseBuildTaxInclude");
-            $costPurchaseBuildTaxExclude.val(f2Fixed(costPurchaseBuildTaxInclude/(1+Number(val))));
+            $costPurchaseBuildTaxExclude.val(f2Fixed(f2(costPurchaseBuildTaxInclude)/(1+Number(val))));
         }
         calCostExclude();
         calIncomeCost();
@@ -286,7 +295,7 @@ function calIncomeAndCost() {
            return;
         } else {
             var costPurchaseBuildTaxInclude = inputVal("costPurchaseBuildTaxInclude");
-            $costPurchaseBuildTaxExclude.val(f2Fixed(costPurchaseBuildTaxInclude/(1+Number(val))));
+            $costPurchaseBuildTaxExclude.val(f2Fixed(f2(costPurchaseBuildTaxInclude)/(1+Number(val))));
         }
         calCostExclude();
         calIncomeCost();
@@ -304,7 +313,7 @@ function calIncomeAndCost() {
         } else {
             $("input[name='costPurchaseServiceTaxExclude']").attr('readonly',true);
             var costPurchaseServiceTaxInclude = inputVal("costPurchaseServiceTaxInclude");
-            $costPurchaseServiceTaxExclude.val(f2Fixed(costPurchaseServiceTaxInclude/(1+Number(val))));
+            $costPurchaseServiceTaxExclude.val(f2Fixed(f2(costPurchaseServiceTaxInclude)/(1+Number(val))));
         }
         calCostExclude();
         calIncomeCost();
@@ -319,7 +328,7 @@ function calIncomeAndCost() {
             return;
         } else {
             var costPurchaseServiceTaxInclude = inputVal("costPurchaseServiceTaxInclude");
-            $costPurchaseServiceTaxExclude.val(f2Fixed(costPurchaseServiceTaxInclude/(1+Number(val))));
+            $costPurchaseServiceTaxExclude.val(f2Fixed(f2(costPurchaseServiceTaxInclude)/(1+Number(val))));
         }
         calCostExclude();
         calIncomeCost();
@@ -337,7 +346,7 @@ function calIncomeAndCost() {
         } else {
             $("input[name='costOtherOtherTaxExclude']").attr('readonly',true);
             var costOtherOtherTaxInclude = inputVal("costOtherOtherTaxInclude");
-            $costOtherOtherTaxExclude.val(f2Fixed(costOtherOtherTaxInclude/(1+Number(val))));
+            $costOtherOtherTaxExclude.val(f2Fixed(f2(costOtherOtherTaxInclude)/(1+Number(val))));
         }
         calCostExclude();
         calIncomeCost();
@@ -352,7 +361,7 @@ function calIncomeAndCost() {
            return;
         } else {
             var costOtherOtherTaxInclude = inputVal("costOtherOtherTaxInclude");
-            $costOtherOtherTaxExclude.val(f2Fixed(costOtherOtherTaxInclude/(1+Number(val))));
+            $costOtherOtherTaxExclude.val(f2Fixed(f2(costOtherOtherTaxInclude)/(1+Number(val))));
         }
         calCostExclude();
         calIncomeCost();
@@ -370,7 +379,7 @@ function calIncomeAndCost() {
         } else {
             $("input[name='costPurchaseOtherTaxExclude']").attr('readonly',true);
             var costPurchaseOtherTaxInclude = inputVal("costPurchaseOtherTaxInclude");
-            $costPurchaseOtherTaxExclude.val(f2Fixed(costPurchaseOtherTaxInclude/(1+Number(val))));
+            $costPurchaseOtherTaxExclude.val(f2Fixed(f2(costPurchaseOtherTaxInclude)/(1+Number(val))));
         }
         calCostExclude();
         calIncomeCost();
@@ -385,7 +394,7 @@ function calIncomeAndCost() {
             return;
         } else {
             var costPurchaseOtherTaxInclude = inputVal("costPurchaseOtherTaxInclude");
-            $costPurchaseOtherTaxExclude.val(f2Fixed(costPurchaseOtherTaxInclude/(1+Number(val))));
+            $costPurchaseOtherTaxExclude.val(f2Fixed(f2(costPurchaseOtherTaxInclude)/(1+Number(val))));
         }
         calCostExclude();
         calIncomeCost();
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index b3f3dbe..7043e23 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -156,7 +156,7 @@
                 <div class="am-g am-form-group am-margin-top">
                     <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>合同金额</div>
                     <div class="am-u-sm-6 am-u-md-6">
-                        <input type="number" class="am-input" data-validate-async data-validation-message="请输入合同金额"
+                        <input type="text" class="number am-input" data-validate-async data-validation-message="请输入合同金额"
                                name="contractAmount" placeholder="单位（元）" maxlength="20"
                                value="${Utils.format(project.contractAmount)}" required />
                     </div>
@@ -174,7 +174,7 @@
                 <div class="am-g am-form-group am-margin-top">
                     <div class="am-u-sm-4 am-u-md-2 am-text-right">华智产品金额</div>
                     <div class="am-u-sm-6 am-u-md-6">
-                        <input type="number" class="am-input" data-validation-message="华智产品金额"
+                        <input type="text" class="number am-input" data-validation-message="华智产品金额"
                                name="huazhiProductAmount" placeholder="单位（元）" maxlength="20"
                                value="${Utils.format(project.huazhiProductAmount)}"  />
                     </div>
@@ -183,7 +183,7 @@
                 <div class="am-g am-form-group am-margin-top">
                     <div class="am-u-sm-4 am-u-md-2 am-text-right">其他产品金额</div>
                     <div class="am-u-sm-6 am-u-md-6">
-                        <input type="number" class="am-input" data-validation-message="请输入其他产品金额"
+                        <input type="text" class="number am-input" data-validation-message="请输入其他产品金额"
                                name="ziguangOtherAmount" placeholder="单位（元）" maxlength="20"
                                value="${Utils.format(project.ziguangOtherAmount)}" />
                     </div>
diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl
index 5f8a91a..d6f07d2 100644
--- a/src/main/resources/templates/admin/project_estimate_add.ftl
+++ b/src/main/resources/templates/admin/project_estimate_add.ftl
@@ -130,7 +130,7 @@
                         <div class="am-g am-form-group am-margin-top">
                             <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>合同金额</div>
                             <div class="am-u-sm-6 am-u-md-6">
-                                <input type="number" class="am-input" data-validate-async data-validation-message="请输入合同金额"
+                                <input type="text" class="number am-input" data-validate-async data-validation-message="请输入合同金额"
                                        name="contractAmount" placeholder="单位（元）" maxlength="16"
                                        value="" required />
                             </div>
@@ -148,7 +148,7 @@
                         <div class="am-g am-form-group am-margin-top">
                             <div class="am-u-sm-4 am-u-md-2 am-text-right">华智产品金额</div>
                             <div class="am-u-sm-6 am-u-md-6">
-                                <input type="number" class="am-input" data-validation-message="华智产品金额"
+                                <input type="text" class="number am-input" data-validation-message="华智产品金额"
                                        name="huazhiProductAmount" placeholder="单位（元）" maxlength="16" value="" />
                             </div>
                             <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
@@ -156,7 +156,7 @@
                         <div class="am-g am-form-group am-margin-top">
                             <div class="am-u-sm-4 am-u-md-2 am-text-right">其他产品金额</div>
                             <div class="am-u-sm-6 am-u-md-6">
-                                <input type="number" class="am-input" data-validation-message="请输入其他产品金额"
+                                <input type="text" class="number am-input" data-validation-message="请输入其他产品金额"
                                        name="ziguangOtherAmount" placeholder="单位（元）" maxlength="16" value="" />
                             </div>
                             <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
diff --git a/src/main/resources/templates/admin/project_estimate_edit.ftl b/src/main/resources/templates/admin/project_estimate_edit.ftl
index f80d8ab..8221384 100644
--- a/src/main/resources/templates/admin/project_estimate_edit.ftl
+++ b/src/main/resources/templates/admin/project_estimate_edit.ftl
@@ -137,7 +137,7 @@
                 <div class="am-g am-form-group am-margin-top">
                     <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>合同金额</div>
                     <div class="am-u-sm-6 am-u-md-6">
-                        <input type="number" class="am-input" data-validate-async data-validation-message="请输入合同金额"
+                        <input type="text" class="number am-input" data-validate-async data-validation-message="请输入合同金额"
                                name="contractAmount" placeholder="单位（元）" maxlength="16"
                                value="${Utils.format(project.contractAmount)}" required />
                     </div>
@@ -155,7 +155,7 @@
                 <div class="am-g am-form-group am-margin-top">
                     <div class="am-u-sm-4 am-u-md-2 am-text-right"><#--<span style="color: red;">*</span>-->华智产品金额</div>
                     <div class="am-u-sm-6 am-u-md-6">
-                        <input type="number" class="am-input" data-validation-message="华智产品金额"
+                        <input type="text" class="number am-input" data-validation-message="华智产品金额"
                                name="huazhiProductAmount" placeholder="单位（元）" maxlength="16" value="${Utils.format(project.huazhiProductAmount)}"  />
                     </div>
                     <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
@@ -163,7 +163,7 @@
                 <div class="am-g am-form-group am-margin-top">
                     <div class="am-u-sm-4 am-u-md-2 am-text-right"><#--<span style="color: red;">*</span>-->其他产品金额</div>
                     <div class="am-u-sm-6 am-u-md-6">
-                        <input type="number" class="am-input" data-validation-message="请输入其他产品金额"
+                        <input type="text" class="number am-input" data-validation-message="请输入其他产品金额"
                                name="ziguangOtherAmount" placeholder="单位（元）" maxlength="16" value="${Utils.format(project.ziguangOtherAmount)}" />
                     </div>
                     <div class="am-u-sm-2 am-u-md-4 input-msg"></div>

From d0f43cb4a1beb562279babf26be94a7946c7b29a Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Fri, 7 Jan 2022 11:23:21 +0800
Subject: [PATCH 05/35] =?UTF-8?q?=E9=A2=84=E7=AE=97=E5=88=86=E9=9A=94?=
 =?UTF-8?q?=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/static/assets/js/project_budget.js   |  2 ++
 .../static/assets/js/project_budget_cost.js        |  4 ++--
 .../js/project_budget_cost_project_manage.js       |  4 ++--
 .../static/assets/js/project_budget_income.js      |  4 ++--
 .../resources/static/assets/js/project_common.js   | 14 +++++++-------
 .../templates/admin/project_budget_edit.ftl        |  6 +++---
 6 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/main/resources/static/assets/js/project_budget.js b/src/main/resources/static/assets/js/project_budget.js
index 50a0109..100f592 100644
--- a/src/main/resources/static/assets/js/project_budget.js
+++ b/src/main/resources/static/assets/js/project_budget.js
@@ -459,6 +459,8 @@ function bindChangeableInput() {
 
         $(this).parent().parent().find(".input-changeable-total-tax-include").val(f2Fixed(amount * price));
         $(this).parent().parent().find(".input-changeable-total-tax-exclude").val(f2Fixed(amount * price / (1 + taxRate / 100)));
+        $(this).val(f2Fixed(price));
+        console.log("单价：" + $(this).val());
     });
     //税率改变
     $(".input-changeable-tax-rate").change(function () {
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 43bf09c..e41d91b 100644
--- a/src/main/resources/static/assets/js/project_budget_cost.js
+++ b/src/main/resources/static/assets/js/project_budget_cost.js
@@ -187,8 +187,8 @@ function appendTrCost() {
         '</td>'+
         '<td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost"></td>'+
         '<td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost""></td>'+
-        '<td><input type="text" min="0" max="99999999" step="1" maxlength="8" class="number am-modal-prompt-input am-modal-prompt-input-cost input-changeable-amount"></td>'+
-        '<td><input type="text" min="0.00" max="9999999999.99" step="0.01" maxlength="13" class="number am-modal-prompt-input am-modal-prompt-input-cost input-changeable-price"></td>'+
+        '<td><input type="number" min="0" max="99999999" step="1" maxlength="8" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-amount"></td>'+
+        '<td><input type="text" min="0.00" max="9999999999.99" step="0.01" maxlength="16" class="number am-modal-prompt-input am-modal-prompt-input-cost input-changeable-price"></td>'+
         '<td><input type="text" min="0.00" max="99.99" step="0.01" maxlength="5" class="number am-modal-prompt-input am-modal-prompt-input-cost input-changeable-tax-rate"></td>'+
         '<td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-tax-include" readonly></td>'+
         '<td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-tax-exclude" readonly></td>'+
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 971558c..cba7f19 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
@@ -118,8 +118,8 @@ function appendTrCostProjectManage() {
         '        </td>\n' +
         '        <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"></td>\n' +
         '        <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"></td>\n' +
-        '        <td><input type="text" min="0" max="99999999" step="1" maxlength="8" class="number am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-amount-project-manage"></td>\n' +
-        '        <td><input type="text" min="0.00" max="9999999999.99" step="0.01" maxlength="13" class="number am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-price-project-manage"></td>\n' +
+        '        <td><input type="number" min="0" max="99999999" step="1" maxlength="8" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-amount-project-manage"></td>\n' +
+        '        <td><input type="text" min="0.00" max="9999999999.99" step="0.01" maxlength="16" class="number am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-price-project-manage"></td>\n' +
         '        <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-total-project-manage" readonly></td>\n' +
         '        <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"></td>\n' +
         '        <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"></td>\n' +
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 fb01c41..43b93a7 100644
--- a/src/main/resources/static/assets/js/project_budget_income.js
+++ b/src/main/resources/static/assets/js/project_budget_income.js
@@ -136,8 +136,8 @@ function appendTrIncome() {
         '                        </td>\n' +
         '                        <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income"></td>\n' +
         '                        <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income"></td>\n' +
-        '                        <td><input type="text" min="0" max="99999999" step="1" maxlength="8" class="number am-modal-prompt-input am-modal-prompt-input-income input-changeable-amount"></td>\n' +
-        '                        <td><input type="text" min="0.00" max="9999999999.99" step="0.01" maxlength="13" class="number am-modal-prompt-input am-modal-prompt-input-income input-changeable-price"></td>\n' +
+        '                        <td><input type="number" min="0" max="99999999" step="1" maxlength="8" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-amount"></td>\n' +
+        '                        <td><input type="text" min="0.00" max="9999999999.99" step="0.01" maxlength="16" class="number am-modal-prompt-input am-modal-prompt-input-income input-changeable-price"></td>\n' +
         '                        <td><input type="text" min="0.00" max="99.99" step="0.01" maxlength="5" class="number am-modal-prompt-input am-modal-prompt-input-income input-changeable-tax-rate"></td>\n' +
         '                        <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-tax-include" readonly></td>\n' +
         '                        <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-tax-exclude" readonly></td>\n' +
diff --git a/src/main/resources/static/assets/js/project_common.js b/src/main/resources/static/assets/js/project_common.js
index fdd8dfb..5161d73 100644
--- a/src/main/resources/static/assets/js/project_common.js
+++ b/src/main/resources/static/assets/js/project_common.js
@@ -70,8 +70,8 @@ function rate(r1,r2) {
  */
 function bindNumberInput() {
     //所有的数字类型输入框
-    var $numberTypeInputs = $("input[type='number']");
-    inputKeepDigital($numberTypeInputs);
+    // var $numberTypeInputs = $("input[type='number']");
+    // inputKeepDigital($numberTypeInputs);
 
     //所有的number类的输入框
     var $numberClassInputs = $("input.number");
@@ -79,10 +79,10 @@ function bindNumberInput() {
 }
 
 function inputKeepDigital($inputs) {
-    //键盘键弹起的时候
-    $inputs.keyup(function () {
-        keepDigital($(this));
-    });
+    //键盘键弹起的时候，会在每次输入一位数的时候就格式化，先行去除
+    // $inputs.keyup(function () {
+    //     keepDigital($(this));
+    // });
     //失去焦点时再校验一遍
     $inputs.blur(function() {
         keepDigital($(this));
@@ -106,7 +106,7 @@ function keepDigitalVal(value) {
         value = parseFloat(value);
     }
 
-    return value;
+    return f2Fixed(f2(value));
 }
 
 /**
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index 7043e23..0d02769 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -391,7 +391,7 @@
                                     </td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income" value="${incomeDetail.name!}"></td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income" value="${incomeDetail.unit!}"></td>
-                                    <td><input type="text" maxlength="8" class="number am-modal-prompt-input am-modal-prompt-input-income input-changeable-amount" value="${incomeDetail.amount!0}" oninput="if(value.length>8)value=value.slice(0,8)" <#--onkeyup="integerNumber(this)"-->></td>
+                                    <td><input type="number" min="0" max="99999999" step="1" maxlength="8" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-amount" value="${incomeDetail.amount!0}" oninput="if(value.length>8)value=value.slice(0,8)" <#--onkeyup="integerNumber(this)"-->></td>
                                     <td><input type="text" maxlength="16" class="number am-modal-prompt-input am-modal-prompt-input-income input-changeable-price" value="${Utils.format(incomeDetail.price,'0')}" oninput="if(value.length>16)value=value.slice(0,16)"></td>
                                     <td><input type="text" maxlength="5" class="number am-modal-prompt-input am-modal-prompt-input-income input-changeable-tax-rate" value="${Utils.format(incomeDetail.taxRate,'0')}" oninput="if(value.length>5)value=value.slice(0,5)"></td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-tax-include" value="${Utils.format(incomeDetail.totalTaxInclude,'0')}" readonly></td>
@@ -458,7 +458,7 @@
                                     </td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost" value="${costDetail.name!}"></td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost" value="${costDetail.unit!}"></td>
-                                    <td><input type="text" maxlength="8" class="number am-modal-prompt-input am-modal-prompt-input-cost input-changeable-amount" value="${costDetail.amount!0}" oninput="if(value.length>8)value=value.slice(0,8)" <#--onkeyup="integerNumber(this)"-->></td>
+                                    <td><input type="number" min="0" max="99999999" step="1" maxlength="8" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-amount" value="${costDetail.amount!0}" oninput="if(value.length>8)value=value.slice(0,8)" <#--onkeyup="integerNumber(this)"-->></td>
                                     <td><input type="text" maxlength="16" class="number am-modal-prompt-input am-modal-prompt-input-cost input-changeable-price" value="${Utils.format(costDetail.price,'0')}" oninput="if(value.length>16)value=value.slice(0,16)"></td>
                                     <td><input type="text" maxlength="5" class="number am-modal-prompt-input am-modal-prompt-input-cost input-changeable-tax-rate" value="${Utils.format(costDetail.taxRate,'0')}" oninput="if(value.length>5)value=value.slice(0,5)"></td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-tax-include" value="${Utils.format(costDetail.totalTaxInclude,'0')}" readonly></td>
@@ -526,7 +526,7 @@
                                     </td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="${costProjectManageDetail.detail!}"></td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="${costProjectManageDetail.unit!}"></td>
-                                    <td><input type="text" maxlength="8" class="number am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-amount-project-manage" value="${costProjectManageDetail.amount!0}" <#--onkeyup="integerNumber(this)"--> oninput="if(value.length>8)value=value.slice(0,8)"></td>
+                                    <td><input type="number" min="0" max="99999999" step="1" maxlength="8" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-amount-project-manage" value="${costProjectManageDetail.amount!0}" <#--onkeyup="integerNumber(this)"--> oninput="if(value.length>8)value=value.slice(0,8)"></td>
                                     <td><input type="text" maxlength="16" class="number am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-price-project-manage" value="${Utils.format(costProjectManageDetail.price,'0')}" oninput="if(value.length>16)value=value.slice(0,16)"></td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-total-project-manage" value="${Utils.format(costProjectManageDetail.total,'0')}" readonly></td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="${costProjectManageDetail.predictMethod!}"></td>

From 57fe59478e37b06d087851b14ac8554156f9685e Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Fri, 7 Jan 2022 15:39:27 +0800
Subject: [PATCH 06/35] =?UTF-8?q?=E9=9D=9E=E5=A1=AB=E5=85=A5=E6=A1=86?=
 =?UTF-8?q?=E4=B8=8D=E9=A2=9D=E5=A4=96=E9=99=90=E5=88=B6=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E5=AD=97=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/admin/project_estimate_edit.ftl   | 4 ++--
 src/main/resources/templates/admin/project_settle_add.ftl | 8 ++++----
 .../resources/templates/admin/project_settle_edit.ftl     | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/resources/templates/admin/project_estimate_edit.ftl b/src/main/resources/templates/admin/project_estimate_edit.ftl
index 8221384..a1c6dfb 100644
--- a/src/main/resources/templates/admin/project_estimate_edit.ftl
+++ b/src/main/resources/templates/admin/project_estimate_edit.ftl
@@ -260,8 +260,8 @@
                         <tr>
                             <td>合计</td>
                             <td></td>
-                            <td><input type="text" class="number" maxlength="16" name="incomeTotalTaxInclude" value="${Utils.format(estimateBean.incomeTotalTaxInclude)}" readonly title="此列累计"></td>
-                            <td><input type="text" class="number" maxlength="16" name="incomeTotalTaxExclude" value="${Utils.format(estimateBean.incomeTotalTaxExclude)}" readonly title="此列累计"></td>
+                            <td><input type="text" class="number" name="incomeTotalTaxInclude" value="${Utils.format(estimateBean.incomeTotalTaxInclude)}" readonly title="此列累计"></td>
+                            <td><input type="text" class="number" name="incomeTotalTaxExclude" value="${Utils.format(estimateBean.incomeTotalTaxExclude)}" readonly title="此列累计"></td>
                             <td>/</td>
                         </tr>
                     </tbody>
diff --git a/src/main/resources/templates/admin/project_settle_add.ftl b/src/main/resources/templates/admin/project_settle_add.ftl
index 39c3611..38c8ef0 100644
--- a/src/main/resources/templates/admin/project_settle_add.ftl
+++ b/src/main/resources/templates/admin/project_settle_add.ftl
@@ -332,7 +332,7 @@
                         <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 type="text" class="number" maxlength="16" name="netCashFlow" readonly required 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>
@@ -353,7 +353,7 @@
                         <td>投资活动产生的现金流量净额</td>
                         <td>/</td>
                         <td><input name="netCashFromInvestingActivitiesFormerSettle" type="text" class="number" value="${Utils.format(formerBean.netCashFromInvestingActivities,'0')}" required readonly title="上月结算总额"></td>
-                        <td><input type="text" class="number" maxlength="16" name="netCashFromInvestingActivities" readonly required 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>
@@ -374,14 +374,14 @@
                         <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 type="text" class="number" maxlength="16" name="financingCapitalCashflow" readonly required 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 type="text" class="number" maxlength="16" name="netIncreaseMonetaryFunds" readonly required 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>
                     </tbody>
diff --git a/src/main/resources/templates/admin/project_settle_edit.ftl b/src/main/resources/templates/admin/project_settle_edit.ftl
index c305e76..f78d525 100644
--- a/src/main/resources/templates/admin/project_settle_edit.ftl
+++ b/src/main/resources/templates/admin/project_settle_edit.ftl
@@ -330,7 +330,7 @@
                         <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 type="text" class="number" maxlength="16" name="netCashFlow" value="${Utils.format(monthBean.netCashFlow,'0')}" readonly required title="本月结算金额"></td>
+                        <td><input type="text" class="number" name="netCashFlow" value="${Utils.format(monthBean.netCashFlow,'0')}" readonly required title="本月结算金额"></td>
                         <td><input name="netCashFlowSettle" type="text" class="number" value="${Utils.format(currentBean.netCashFlow,'0')}" readonly title="结算总额"></td>
                     </tr>
                     <tr>
@@ -351,7 +351,7 @@
                         <td>投资活动产生的现金流量净额</td>
                         <td>/</td>
                         <td><input name="netCashFromInvestingActivitiesFormerSettle" type="text" class="number" value="${Utils.format(formerBean.netCashFromInvestingActivities,'0')}" required readonly title="上月结算总额"></td>
-                        <td><input type="text" class="number" maxlength="16" name="netCashFromInvestingActivities" value="${Utils.format(monthBean.netCashFromInvestingActivities,'0')}" readonly required title="本月结算金额"></td>
+                        <td><input type="text" class="number" name="netCashFromInvestingActivities" value="${Utils.format(monthBean.netCashFromInvestingActivities,'0')}" readonly required title="本月结算金额"></td>
                         <td><input name="netCashFromInvestingActivitiesSettle" type="text" class="number" value="${Utils.format(currentBean.netCashFromInvestingActivities,'0')}" readonly title="结算总额"></td>
                     </tr>
                     <tr>
@@ -372,14 +372,14 @@
                         <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 type="text" class="number" maxlength="16" name="financingCapitalCashflow" value="${Utils.format(monthBean.financingCapitalCashflow,'0')}" readonly required title="本月结算金额"></td>
+                        <td><input type="text" class="number" name="financingCapitalCashflow" value="${Utils.format(monthBean.financingCapitalCashflow,'0')}" readonly required title="本月结算金额"></td>
                         <td><input name="financingCapitalCashflowSettle" type="text" class="number" value="${Utils.format(currentBean.financingCapitalCashflow,'0')}" 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 type="text" class="number" maxlength="16" name="netIncreaseMonetaryFunds" value="${Utils.format(monthBean.netIncreaseMonetaryFunds,'0')}" readonly required title="本月结算金额"></td>
+                        <td><input type="text" class="number" name="netIncreaseMonetaryFunds" value="${Utils.format(monthBean.netIncreaseMonetaryFunds,'0')}" readonly required title="本月结算金额"></td>
                         <td><input name="netIncreaseMonetaryFundsSettle" type="text" class="number" value="${Utils.format(currentBean.netIncreaseMonetaryFunds,'0')}" readonly title="结算总额"></td>
                     </tr>
                     </tbody>

From efd4519ed54bcb4b34fddd7f08623cc85d16d4fe Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Mon, 10 Jan 2022 15:38:07 +0800
Subject: [PATCH 07/35] =?UTF-8?q?=E5=8D=95=E4=BB=B7=E9=99=90=E5=88=B65?=
 =?UTF-8?q?=E4=BD=8D=E5=B0=8F=E6=95=B0=EF=BC=8C=E7=BB=93=E7=AE=97=E8=A1=A8?=
 =?UTF-8?q?=E4=B8=8D=E6=A0=A1=E9=AA=8C=E5=B0=8F=E4=BA=8E0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/assets/js/project_budget.js        |   4 +-
 .../static/assets/js/project_budget_cost.js   |   2 +-
 .../js/project_budget_cost_project_manage.js  |   2 +-
 .../static/assets/js/project_budget_income.js |   2 +-
 .../static/assets/js/project_common.js        |  57 +++++++
 .../static/assets/js/project_settle_valid.js  | 154 ------------------
 .../templates/admin/project_budget_edit.ftl   |   6 +-
 7 files changed, 65 insertions(+), 162 deletions(-)

diff --git a/src/main/resources/static/assets/js/project_budget.js b/src/main/resources/static/assets/js/project_budget.js
index 100f592..25b46e2 100644
--- a/src/main/resources/static/assets/js/project_budget.js
+++ b/src/main/resources/static/assets/js/project_budget.js
@@ -451,7 +451,7 @@ function bindChangeableInput() {
     });
     //单价改变
     $(".input-changeable-price").change(function () {
-        var price = f2($(this).val());
+        var price = f5($(this).val());
         //找到对应的数量和税率
         var amount = parseInt($(this).parent().parent().find(".input-changeable-amount").val());
         var taxRate = f2($(this).parent().parent().find(".input-changeable-tax-rate").val());
@@ -459,7 +459,7 @@ function bindChangeableInput() {
 
         $(this).parent().parent().find(".input-changeable-total-tax-include").val(f2Fixed(amount * price));
         $(this).parent().parent().find(".input-changeable-total-tax-exclude").val(f2Fixed(amount * price / (1 + taxRate / 100)));
-        $(this).val(f2Fixed(price));
+        $(this).val(f5Price(price));
         console.log("单价：" + $(this).val());
     });
     //税率改变
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 e41d91b..78fed1b 100644
--- a/src/main/resources/static/assets/js/project_budget_cost.js
+++ b/src/main/resources/static/assets/js/project_budget_cost.js
@@ -188,7 +188,7 @@ function appendTrCost() {
         '<td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost"></td>'+
         '<td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost""></td>'+
         '<td><input type="number" min="0" max="99999999" step="1" maxlength="8" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-amount"></td>'+
-        '<td><input type="text" min="0.00" max="9999999999.99" step="0.01" maxlength="16" class="number am-modal-prompt-input am-modal-prompt-input-cost input-changeable-price"></td>'+
+        '<td><input type="text" min="0.00" max="9999999999.99" step="0.01" maxlength="19" class="price am-modal-prompt-input am-modal-prompt-input-cost input-changeable-price"></td>'+
         '<td><input type="text" min="0.00" max="99.99" step="0.01" maxlength="5" class="number am-modal-prompt-input am-modal-prompt-input-cost input-changeable-tax-rate"></td>'+
         '<td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-tax-include" readonly></td>'+
         '<td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-tax-exclude" readonly></td>'+
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 cba7f19..22058b1 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
@@ -119,7 +119,7 @@ function appendTrCostProjectManage() {
         '        <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"></td>\n' +
         '        <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"></td>\n' +
         '        <td><input type="number" min="0" max="99999999" step="1" maxlength="8" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-amount-project-manage"></td>\n' +
-        '        <td><input type="text" min="0.00" max="9999999999.99" step="0.01" maxlength="16" class="number am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-price-project-manage"></td>\n' +
+        '        <td><input type="text" min="0.00" max="9999999999.99" step="0.01" maxlength="19" class="price am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-price-project-manage"></td>\n' +
         '        <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-total-project-manage" readonly></td>\n' +
         '        <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"></td>\n' +
         '        <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"></td>\n' +
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 43b93a7..9f29d11 100644
--- a/src/main/resources/static/assets/js/project_budget_income.js
+++ b/src/main/resources/static/assets/js/project_budget_income.js
@@ -137,7 +137,7 @@ function appendTrIncome() {
         '                        <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income"></td>\n' +
         '                        <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income"></td>\n' +
         '                        <td><input type="number" min="0" max="99999999" step="1" maxlength="8" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-amount"></td>\n' +
-        '                        <td><input type="text" min="0.00" max="9999999999.99" step="0.01" maxlength="16" class="number am-modal-prompt-input am-modal-prompt-input-income input-changeable-price"></td>\n' +
+        '                        <td><input type="text" min="0.00" max="9999999999.99" step="0.01" maxlength="19" class="price am-modal-prompt-input am-modal-prompt-input-income input-changeable-price"></td>\n' +
         '                        <td><input type="text" min="0.00" max="99.99" step="0.01" maxlength="5" class="number am-modal-prompt-input am-modal-prompt-input-income input-changeable-tax-rate"></td>\n' +
         '                        <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-tax-include" readonly></td>\n' +
         '                        <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-tax-exclude" readonly></td>\n' +
diff --git a/src/main/resources/static/assets/js/project_common.js b/src/main/resources/static/assets/js/project_common.js
index 5161d73..ac9a87a 100644
--- a/src/main/resources/static/assets/js/project_common.js
+++ b/src/main/resources/static/assets/js/project_common.js
@@ -42,6 +42,34 @@ function f2Fixed(f) {
     return f;
 }
 
+/**
+ * 适配单价
+ */
+function f5Price(f) {
+    //return Number(f).toFixed(2);
+    //格式化413,423,423.24
+    f = Number(f).toLocaleString('en-US',{minimumFractionDigits: 2, maximumFractionDigits: 5, useGrouping: true});
+    return f;
+}
+
+/**
+ * 适配单价
+ */
+function f5(x) {
+    if(!x){
+        return 0;
+    }
+    if(typeof x === 'string'){
+        //这一步因为数字格式化为了包含分隔符，获取的时候就去掉这个分隔符
+        x = x.replaceAll(",","");
+    }
+    var f = parseFloat(x);
+    if (isNaN(f)) {
+        return 0;
+    }
+    return Math.round(f*100000)/100000;
+}
+
 function digitalSelf(name, action) {
     var self = inputVal(name);
 
@@ -76,6 +104,10 @@ function bindNumberInput() {
     //所有的number类的输入框
     var $numberClassInputs = $("input.number");
     inputKeepDigital($numberClassInputs);
+
+    //所有的price类的输入框，根据单价要求单独设置
+    var $priceClassInputs = $("input.price");
+    inputKeepDigitalPrice($priceClassInputs);
 }
 
 function inputKeepDigital($inputs) {
@@ -93,6 +125,15 @@ function keepDigital($input) {
     $input.val(keepDigitalVal($input.val()));
 }
 
+function inputKeepDigitalPrice($inputs) {
+    console.log("1");
+
+    //失去焦点时再校验一遍
+    $inputs.blur(function() {
+        $(this).val(keepDigitalValPrice($(this).val()));
+    });
+}
+
 /**
  * 只保留数字
  */
@@ -109,6 +150,22 @@ function keepDigitalVal(value) {
     return f2Fixed(f2(value));
 }
 
+/**
+ * 只保留数字
+ */
+function keepDigitalValPrice(value) {
+    value = value.replace(/[^\-\d.]/g, ""); //清除“-”、“数字”和“.”以外的字符
+    value = value.replace(/\.{2,}/g, "."); //只保留第一个. 清除多余的
+    value = value.replace(".", "$#$").replace(/\./g, "").replace("$#$", ".");
+    value = value.replace(/^(\-)?(\d+)\.(\d\d\d\d\d).*$/, '$1$2.$3'); //只能输入两个小数
+    if (value.indexOf(".") < 0 && value != "") {
+        //以上已经过滤，此处控制的是如果没有小数点，首位不能为类似于 01、02的金额
+        value = parseFloat(value);
+    }
+
+    return f5Price(f5(value));
+}
+
 /**
  * 保留整数
  */
diff --git a/src/main/resources/static/assets/js/project_settle_valid.js b/src/main/resources/static/assets/js/project_settle_valid.js
index 63bddfb..096ad17 100644
--- a/src/main/resources/static/assets/js/project_settle_valid.js
+++ b/src/main/resources/static/assets/js/project_settle_valid.js
@@ -17,13 +17,6 @@ var incomeDeviceValid = function() {
         });
         return false;
     }
-    if (parseFloat(month) < 0) {
-        layui.use('layer', function(){
-            var layer = layui.layer;
-            layer.alert("本月收入设备类数据不能小于0");
-        });
-        return false;
-    }
     return true;
 };
 
@@ -36,13 +29,6 @@ var incomeEngineerValid = function() {
         });
         return false;
     }
-    if (parseFloat(month) < 0) {
-        layui.use('layer', function(){
-            var layer = layui.layer;
-            layer.alert("本月收入工程类数据不能小于0");
-        });
-        return false;
-    }
     return true;
 };
 
@@ -55,13 +41,6 @@ var incomeServiceValid = function() {
         });
         return false;
     }
-    if (parseFloat(month) < 0) {
-        layui.use('layer', function(){
-            var layer = layui.layer;
-            layer.alert("本月收入服务类数据不能小于0");
-        });
-        return false;
-    }
     return true;
 };
 
@@ -87,13 +66,6 @@ var costPurchaseDeviceValid = function() {
         });
         return false;
     }
-    if (parseFloat(month) < 0) {
-        layui.use('layer', function(){
-            var layer = layui.layer;
-            layer.alert("本月采购成本设备类数据不能小于0");
-        });
-        return false;
-    }
     return true;
 };
 
@@ -106,13 +78,6 @@ var costPurchaseBuildValid = function() {
         });
         return false;
     }
-    if (parseFloat(month) < 0) {
-        layui.use('layer', function(){
-            var layer = layui.layer;
-            layer.alert("本月采购成本施工类数据不能小于0");
-        });
-        return false;
-    }
     return true;
 };
 
@@ -125,13 +90,6 @@ var costPurchaseServiceValid = function() {
         });
         return false;
     }
-    if (parseFloat(month) < 0) {
-        layui.use('layer', function(){
-            var layer = layui.layer;
-            layer.alert("本月采购成本服务类数据不能小于0");
-        });
-        return false;
-    }
     return true;
 };
 
@@ -144,13 +102,6 @@ var costPurchaseOtherValid = function() {
         });
         return false;
     }
-    if (parseFloat(month) < 0) {
-        layui.use('layer', function(){
-            var layer = layui.layer;
-            layer.alert("本月采购成本其他类数据不能小于0");
-        });
-        return false;
-    }
     return true;
 };
 
@@ -164,13 +115,6 @@ var costProjectManageValid = function() {
         });
         return false;
     }
-    if (parseFloat(month) < 0) {
-        layui.use('layer', function(){
-            var layer = layui.layer;
-            layer.alert("本月项目管理成本数据不能小于0");
-        });
-        return false;
-    }
     if (parseFloat(salary) > parseFloat(month)) {
         layui.use('layer', function(){
             var layer = layui.layer;
@@ -190,13 +134,6 @@ var costOtherValid = function() {
         });
         return false;
     }
-    if (parseFloat(month) < 0) {
-        layui.use('layer', function(){
-            var layer = layui.layer;
-            layer.alert("本月其他成本数据不能小于0");
-        });
-        return false;
-    }
     return true;
 };
 
@@ -224,13 +161,6 @@ var costExpropriationValid = function() {
         });
         return false;
     }
-    if (parseFloat(month) < 0) {
-        layui.use('layer', function(){
-            var layer = layui.layer;
-            layer.alert("本月财务费用数据不能小于0");
-        });
-        return false;
-    }
     if (parseFloat(settle) > parseFloat(budget)) {
         layui.use('layer', function(){
             var layer = layui.layer;
@@ -250,13 +180,6 @@ var costCompanyManageValid = function() {
         });
         return false;
     }
-    if (parseFloat(month) < 0) {
-        layui.use('layer', function(){
-            var layer = layui.layer;
-            layer.alert("本月公司管理费用数据不能小于0");
-        });
-        return false;
-    }
     return true;
 };
 
@@ -269,13 +192,6 @@ var costIncomeTaxValid = function() {
         });
         return false;
     }
-    if (parseFloat(month) < 0) {
-        layui.use('layer', function(){
-            var layer = layui.layer;
-            layer.alert("本月所得税费用数据不能小于0");
-        });
-        return false;
-    }
     return true;
 };
 
@@ -288,13 +204,6 @@ var saleIncomeCashValid = function() {
         });
         return false;
     }
-    if (parseFloat(month) < 0) {
-        layui.use('layer', function(){
-            var layer = layui.layer;
-            layer.alert("本月本月销售商品、提供劳务收到的现金数据不能小于0");
-        });
-        return false;
-    }
     return true;
 };
 
@@ -307,13 +216,6 @@ var taxReturnValid = function() {
         });
         return false;
     }
-    if (parseFloat(month) < 0) {
-        layui.use('layer', function(){
-            var layer = layui.layer;
-            layer.alert("本月收到的税费返还数据不能小于0");
-        });
-        return false;
-    }
     return true;
 };
 
@@ -326,13 +228,6 @@ var earnestMoneyIncomeValid = function() {
         });
         return false;
     }
-    if (parseFloat(month) < 0) {
-        layui.use('layer', function(){
-            var layer = layui.layer;
-            layer.alert("本月收到其他与经营活动有关的现金数据不能小于0");
-        });
-        return false;
-    }
     return true;
 };
 
@@ -345,13 +240,6 @@ var purchaseCostValid = function() {
         });
         return false;
     }
-    if (parseFloat(month) < 0) {
-        layui.use('layer', function(){
-            var layer = layui.layer;
-            layer.alert("本月购买商品、接受劳务支付的现金数据不能小于0");
-        });
-        return false;
-    }
     return true;
 };
 
@@ -364,13 +252,6 @@ var taxCostValid = function() {
         });
         return false;
     }
-    if (parseFloat(month) < 0) {
-        layui.use('layer', function(){
-            var layer = layui.layer;
-            layer.alert("本月支付的各项税费数据不能小于0");
-        });
-        return false;
-    }
     return true;
 };
 
@@ -383,13 +264,6 @@ var earnestMoneyCostValid = function() {
         });
         return false;
     }
-    if (parseFloat(month) < 0) {
-        layui.use('layer', function(){
-            var layer = layui.layer;
-            layer.alert("本月支付其他与经营活动有关的现金数据不能小于0");
-        });
-        return false;
-    }
     return true;
 };
 
@@ -402,13 +276,6 @@ var cashInflowFromInvestingActivitiesValid = function() {
         });
         return false;
     }
-    if (parseFloat(month) < 0) {
-        layui.use('layer', function(){
-            var layer = layui.layer;
-            layer.alert("本月投资活动现金流入数据不能小于0");
-        });
-        return false;
-    }
     return true;
 };
 
@@ -421,13 +288,6 @@ var cashOutflowFromInvestingActivitiesValid = function() {
         });
         return false;
     }
-    if (parseFloat(month) < 0) {
-        layui.use('layer', function(){
-            var layer = layui.layer;
-            layer.alert("本月投资活动现金流出数据不能小于0");
-        });
-        return false;
-    }
     return true;
 };
 
@@ -440,13 +300,6 @@ var financingCapitalInflowValid = function() {
         });
         return false;
     }
-    if (parseFloat(month) < 0) {
-        layui.use('layer', function(){
-            var layer = layui.layer;
-            layer.alert("本月融资资金流入数据不能小于0");
-        });
-        return false;
-    }
     return true;
 };
 
@@ -459,13 +312,6 @@ var financingCapitalOutflowValid = function() {
         });
         return false;
     }
-    if (parseFloat(month) < 0) {
-        layui.use('layer', function(){
-            var layer = layui.layer;
-            layer.alert("本月还款资金流出数据不能小于0");
-        });
-        return false;
-    }
     return true;
 };
 
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index 0d02769..b5269b8 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -392,7 +392,7 @@
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income" value="${incomeDetail.name!}"></td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income" value="${incomeDetail.unit!}"></td>
                                     <td><input type="number" min="0" max="99999999" step="1" maxlength="8" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-amount" value="${incomeDetail.amount!0}" oninput="if(value.length>8)value=value.slice(0,8)" <#--onkeyup="integerNumber(this)"-->></td>
-                                    <td><input type="text" maxlength="16" class="number am-modal-prompt-input am-modal-prompt-input-income input-changeable-price" value="${Utils.format(incomeDetail.price,'0')}" oninput="if(value.length>16)value=value.slice(0,16)"></td>
+                                    <td><input type="text" maxlength="19" class="price am-modal-prompt-input am-modal-prompt-input-income input-changeable-price" value="${Utils.format(incomeDetail.price,'0')}" oninput="if(value.length>19)value=value.slice(0,19)"></td>
                                     <td><input type="text" maxlength="5" class="number am-modal-prompt-input am-modal-prompt-input-income input-changeable-tax-rate" value="${Utils.format(incomeDetail.taxRate,'0')}" oninput="if(value.length>5)value=value.slice(0,5)"></td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-tax-include" value="${Utils.format(incomeDetail.totalTaxInclude,'0')}" readonly></td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-tax-exclude" value="${Utils.format(incomeDetail.totalTaxExclude,'0')}" readonly></td>
@@ -459,7 +459,7 @@
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost" value="${costDetail.name!}"></td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost" value="${costDetail.unit!}"></td>
                                     <td><input type="number" min="0" max="99999999" step="1" maxlength="8" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-amount" value="${costDetail.amount!0}" oninput="if(value.length>8)value=value.slice(0,8)" <#--onkeyup="integerNumber(this)"-->></td>
-                                    <td><input type="text" maxlength="16" class="number am-modal-prompt-input am-modal-prompt-input-cost input-changeable-price" value="${Utils.format(costDetail.price,'0')}" oninput="if(value.length>16)value=value.slice(0,16)"></td>
+                                    <td><input type="text" maxlength="19" class="price am-modal-prompt-input am-modal-prompt-input-cost input-changeable-price" value="${Utils.format(costDetail.price,'0')}" oninput="if(value.length>19)value=value.slice(0,19)"></td>
                                     <td><input type="text" maxlength="5" class="number am-modal-prompt-input am-modal-prompt-input-cost input-changeable-tax-rate" value="${Utils.format(costDetail.taxRate,'0')}" oninput="if(value.length>5)value=value.slice(0,5)"></td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-tax-include" value="${Utils.format(costDetail.totalTaxInclude,'0')}" readonly></td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-tax-exclude" value="${Utils.format(costDetail.totalTaxExclude,'0')}" readonly></td>
@@ -527,7 +527,7 @@
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="${costProjectManageDetail.detail!}"></td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="${costProjectManageDetail.unit!}"></td>
                                     <td><input type="number" min="0" max="99999999" step="1" maxlength="8" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-amount-project-manage" value="${costProjectManageDetail.amount!0}" <#--onkeyup="integerNumber(this)"--> oninput="if(value.length>8)value=value.slice(0,8)"></td>
-                                    <td><input type="text" maxlength="16" class="number am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-price-project-manage" value="${Utils.format(costProjectManageDetail.price,'0')}" oninput="if(value.length>16)value=value.slice(0,16)"></td>
+                                    <td><input type="text" maxlength="19" class="price am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-price-project-manage" value="${Utils.format(costProjectManageDetail.price,'0')}" oninput="if(value.length>19)value=value.slice(0,19)"></td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-total-project-manage" value="${Utils.format(costProjectManageDetail.total,'0')}" readonly></td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="${costProjectManageDetail.predictMethod!}"></td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="${costProjectManageDetail.predictWhy!}"></td>

From b102cc214d50b4d58475e1f95a6107a9dcd1ee0f Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Mon, 10 Jan 2022 16:14:06 +0800
Subject: [PATCH 08/35] =?UTF-8?q?=E5=8D=95=E4=BB=B7=E9=99=90=E5=88=B65?=
 =?UTF-8?q?=E4=BD=8D=E5=B0=8F=E6=95=B0=EF=BC=8C=E5=88=86=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/assets/js/project_budget.js        | 92 ++++++++++---------
 .../static/assets/js/project_budget_cost.js   |  2 +-
 .../js/project_budget_cost_project_manage.js  |  2 +-
 .../static/assets/js/project_budget_income.js |  2 +-
 .../static/assets/js/project_budget_plan.js   |  8 +-
 5 files changed, 54 insertions(+), 52 deletions(-)

diff --git a/src/main/resources/static/assets/js/project_budget.js b/src/main/resources/static/assets/js/project_budget.js
index 25b46e2..e9a45ca 100644
--- a/src/main/resources/static/assets/js/project_budget.js
+++ b/src/main/resources/static/assets/js/project_budget.js
@@ -1,55 +1,55 @@
-INCOME_DETAIL = {
-    "type": [true, "类别"],
-    "name": [true, "名称"],
-    "unit": [true, "单位"],
-    "amount": [true, "数量"],
-    "price": [true, "单价"],
-    "taxRate": [true, "税率"],
-    "totalTaxInclude": [true, "含税总金额"],
-    "totalTaxExclude": [true, "不含税金额"]
+INCOME_DETAIL={
+    "type":[true,"类别","string"],
+    "name":[true,"名称","string"],
+    "unit":[true,"单位","string"],
+    "amount":[true,"数量","string"],
+    "price":[true,"单价","price"],
+    "taxRate":[true,"税率","number"],
+    "totalTaxInclude":[true,"含税总金额","number"],
+    "totalTaxExclude":[true,"不含税金额","number"]
 };
 
 COST_DETAIL={
-    "type":[true,"大类"],
-    "category":[true,"类别"],
-    "name":[true,"名称"],
-    "unit":[true,"单位"],
-    "amount":[true,"数量"],
-    "price":[true,"单价"],
-    "taxRate":[true,"税率"],
-    "totalTaxInclude":[true,"含税总金额"],
-    "totalTaxExclude":[true,"不含税金额"]
+    "type":[true,"大类","string"],
+    "category":[true,"类别","string"],
+    "name":[true,"名称","string"],
+    "unit":[true,"单位","string"],
+    "amount":[true,"数量","string"],
+    "price":[true,"单价","price"],
+    "taxRate":[true,"税率","number"],
+    "totalTaxInclude":[true,"含税总金额","number"],
+    "totalTaxExclude":[true,"不含税金额","number"]
 };
 
 COST_PROJECT_MANAGE_DETAIL={
-    "type":[true,"财务费用类别"],
-    "name1":[false,"业务项目"],
-    "name2":[false,"业务项目"],
-    "detail":[true,"项目明细"],
-    "unit":[true,"单位"],
-    "amount":[true,"数量"],
-    "price":[true,"单价"],
-    "total":[true,"总金额"],
-    "predictMethod":[false,"预估计算方法"],
-    "predictWhy":[false,"预估依据"],
-    "remark":[false,"备注"],
-    "deletable":[true,"是否可删除"]
+    "type":[true,"财务费用类别","string"],
+    "name1":[false,"业务项目","string"],
+    "name2":[false,"业务项目","string"],
+    "detail":[true,"项目明细","string"],
+    "unit":[true,"单位","string"],
+    "amount":[true,"数量","string"],
+    "price":[true,"单价","price"],
+    "total":[true,"总金额","number"],
+    "predictMethod":[false,"预估计算方法","string"],
+    "predictWhy":[false,"预估依据","string"],
+    "remark":[false,"备注","string"],
+    "deletable":[true,"是否可删除","string"]
 };
 
 BUDGET_PLAN_DETAIL={
     "month":[true,"月份"],
-    "deviceCost":[true,"设备支出"],
-    "engineerCost":[true,"工程支出"],
-    "projectManageCost":[true,"经营性开支"],
-    "earnestMoneyCost":[true,"保证金支出"],
-    "totalCost":[true,"支出合计"],
-    "saleIncome":[true,"销售收款"],
-    "earnestMoneyIncome":[true,"保证金收款"],
-    "totalIncome":[true,"收款合计"],
-    "fundBalance":[true,"资金余额"],
-    "capitalInterest":[true,"资金利息"],
-    "underwrittenPlan":[true,"垫资计划"],
-    "repaymentPlan":[true,"还款计划"]
+    "deviceCost":[true,"设备支出","number"],
+    "engineerCost":[true,"工程支出","number"],
+    "projectManageCost":[true,"经营性开支","number"],
+    "earnestMoneyCost":[true,"保证金支出","number"],
+    "totalCost":[true,"支出合计","number"],
+    "saleIncome":[true,"销售收款","number"],
+    "earnestMoneyIncome":[true,"保证金收款","number"],
+    "totalIncome":[true,"收款合计","number"],
+    "fundBalance":[true,"资金余额","number"],
+    "capitalInterest":[true,"资金利息","number"],
+    "underwrittenPlan":[true,"垫资计划","number"],
+    "repaymentPlan":[true,"还款计划","number"]
 };
 
 $(function () {
@@ -324,6 +324,8 @@ function arr2ObjectVerify(line, arr, detailPropertyArr, detailProperty) {
         var v = arr[i];
         if(o[2] === 'number' ){
             v = f2(v);
+        } else if(o[2] === 'price' ){
+            v = f5(v);
         }
         obj[detailPropertyArr[i]]=v;
     }
@@ -506,9 +508,9 @@ function updateProjectContributionProfitRate() {
     var costCompanyManageTaxExclude = f2(inputVal("costCompanyManageTaxExclude"));
 
     var projectGrossProfit = f2Fixed(incomeTotalTaxExclude - costTotalTaxExclude - costExpropriationTaxExclude);
-    var projectGrossProfitRate = f2Fixed(rate(projectGrossProfit, incomeTotalTaxExclude));
-    var projectContributionProfit = f2Fixed(projectGrossProfit - costCompanyManageTaxExclude);
-    var projectContributionProfitRate = f2Fixed(rate(projectContributionProfit, incomeTotalTaxExclude));
+    var projectGrossProfitRate = f2Fixed(rate(f2(projectGrossProfit), incomeTotalTaxExclude));
+    var projectContributionProfit = f2Fixed(f2(projectGrossProfit) - costCompanyManageTaxExclude);
+    var projectContributionProfitRate = f2Fixed(rate(f2(projectContributionProfit), incomeTotalTaxExclude));
 
     $("input[name='projectGrossProfit']").val(projectGrossProfit);
     $("input[name='projectGrossProfitRate']").val(projectGrossProfitRate);
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 78fed1b..354971d 100644
--- a/src/main/resources/static/assets/js/project_budget_cost.js
+++ b/src/main/resources/static/assets/js/project_budget_cost.js
@@ -8,7 +8,7 @@ COST_DETAIL={
     "name":[true,"名称","string"],
     "unit":[true,"单位","string"],
     "amount":[true,"数量","string"],
-    "price":[true,"单价","number"],
+    "price":[true,"单价","price"],
     "taxRate":[true,"税率","number"],
     "totalTaxInclude":[true,"含税总金额","number"],
     "totalTaxExclude":[true,"不含税金额","number"]
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 22058b1..e197b85 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
@@ -9,7 +9,7 @@ COST_PROJECT_MANAGE_DETAIL={
     "detail":[true,"项目明细","string"],
     "unit":[true,"单位","string"],
     "amount":[true,"数量","string"],
-    "price":[true,"单价","number"],
+    "price":[true,"单价","price"],
     "total":[true,"总金额","number"],
     "predictMethod":[false,"预估计算方法","string"],
     "predictWhy":[false,"预估依据","string"],
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 9f29d11..be2a664 100644
--- a/src/main/resources/static/assets/js/project_budget_income.js
+++ b/src/main/resources/static/assets/js/project_budget_income.js
@@ -7,7 +7,7 @@ INCOME_DETAIL={
     "name":[true,"名称","string"],
     "unit":[true,"单位","string"],
     "amount":[true,"数量","string"],
-    "price":[true,"单价","number"],
+    "price":[true,"单价","price"],
     "taxRate":[true,"税率","number"],
     "totalTaxInclude":[true,"含税总金额","number"],
     "totalTaxExclude":[true,"不含税金额","number"]
diff --git a/src/main/resources/static/assets/js/project_budget_plan.js b/src/main/resources/static/assets/js/project_budget_plan.js
index 206edd7..c7fce6d 100644
--- a/src/main/resources/static/assets/js/project_budget_plan.js
+++ b/src/main/resources/static/assets/js/project_budget_plan.js
@@ -722,15 +722,15 @@ function updateCashFlow() {
         d,f,g,m,m);*/
 
 
-    $("input[name='saleIncomeCash']").val(f2Fixed(saleIncome));
-    $("input[name='earnestMoneyIncome']").val(f2Fixed(earnestMoneyIncome));
+    $("input[name='saleIncomeCash']").val(f2Fixed(f2(saleIncome)));
+    $("input[name='earnestMoneyIncome']").val(f2Fixed(f2(earnestMoneyIncome)));
     $("input[name='purchaseCost']").val(f2Fixed(d));
     $("input[name='earnestMoneyCost']").val(f2Fixed(f));
 
     $("input[name='netCashFlow']").val(f2Fixed(g));
 
-    $("input[name='financingCapitalInflow']").val(f2Fixed(underwrittenPlan));
-    $("input[name='financingCapitalOutflow']").val(f2Fixed(repaymentPlan));
+    $("input[name='financingCapitalInflow']").val(f2Fixed(f2(underwrittenPlan)));
+    $("input[name='financingCapitalOutflow']").val(f2Fixed(f2(repaymentPlan)));
 
     $("input[name='financingCapitalCashflow']").val(f2Fixed(m));
     $("input[name='netIncreaseMonetaryFunds']").val(f2Fixed(n));

From 443d4c80984587bd822b8661e25398a4548172da Mon Sep 17 00:00:00 2001
From: hanbo <2608504783@qq.com>
Date: Mon, 10 Jan 2022 16:16:26 +0800
Subject: [PATCH 09/35] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E9=A2=84=E7=AE=97=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/admin/project_approve.ftl       | 383 +++++++++++++++++-
 1 file changed, 380 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index 56c91e9..b1022bf 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -428,11 +428,388 @@
                             <#if (project.status==5 || project.status==10 || project.status==15) && project.approveStatusBudget == 3>
                                 <div class="approve-nopass"></div>
                             </#if>
-                            <span class="am-text-lg">收入</span>
-                            <span class="am-text-primary"><a style="cursor: pointer" id="income-detail">收入明细表</a></span>
+
+                            <span class="am-text-lg">收入明细表</span>
+                            <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;"
+                                   id="incomeTable">
+                                <tbody>
+                                <tr>
+                                    <td>类别</td>
+                                    <td>名称</td>
+                                    <td>单位</td>
+                                    <td>数量</td>
+                                    <td>单价</td>
+                                    <td>税率（%）</td>
+                                    <td>含税总金额（元）</td>
+                                    <td>不含税金额（元）</td>
+                                    <#--<td>操作</td>-->
+                                </tr>
+
+                                <#if incomeDetails??>
+                                    <#list incomeDetails as incomeDetail>
+                                        <tr>
+                                            <td>
+                                                <#--<select style="width: auto" readonly
+                                                        class="am-modal-prompt-input am-modal-prompt-input-income">
+                                                    <option value="1" <#if incomeDetail.type == 1>selected</#if>>设备类
+                                                    </option>
+                                                    <option value="2" <#if incomeDetail.type == 2>selected</#if>>工程类
+                                                    </option>
+                                                    <option value="3" <#if incomeDetail.type == 3>selected</#if>>服务类
+                                                    </option>
+                                                </select>-->
+                                                <#if incomeDetail.type ==1 >
+                                                    设备类
+                                                <#elseif incomeDetail.type  ==2>
+                                                    工程类
+                                                <#elseif incomeDetail.type  ==3>
+                                                    服务类
+                                                </#if>
+                                            </td>
+                                            <td><input type="text" readonly
+                                                       class="am-modal-prompt-input am-modal-prompt-input-income"
+                                                       value="${incomeDetail.name!}"></td>
+                                            <td><input type="text" readonly
+                                                       class="am-modal-prompt-input am-modal-prompt-input-income"
+                                                       value="${incomeDetail.unit!}"></td>
+                                            <td><input type="text" readonly
+                                                       class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-amount"
+                                                       value="${incomeDetail.amount!0}"></td>
+                                            <td><input type="text" readonly
+                                                       class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-price"
+                                                       value="${Utils.format(incomeDetail.price,'0')}"></td>
+                                            <td><input type="text" readonly
+                                                       class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-tax-rate"
+                                                       value="${Utils.format(incomeDetail.taxRate,'0')}"></td>
+                                            <td><input type="text"
+                                                       class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-tax-include"
+                                                       value="${Utils.format(incomeDetail.totalTaxInclude,'0')}"
+                                                       readonly></td>
+                                            <td><input type="text"
+                                                       class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-tax-exclude"
+                                                       value="${Utils.format(incomeDetail.totalTaxExclude,'0')}"
+                                                       readonly></td>
+                                            <#--<td>
+                                                <button type="button"
+                                                        class="am-btn am-btn-warning am-btn-xs am-round am-modal-line-delete">
+                                                    <span class="am-icon-minus"></span></button>
+                                            </td>-->
+                                        </tr>
+                                    </#list>
+                                </#if>
+
+                                </tbody>
+                            </table>
+                            <span class="am-text-lg">采购成本明细表</span>
+                            <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;"
+                                   id="costTable">
+                                <tbody>
+                                <tr>
+                                    <td>大类</td>
+                                    <td>类别</td>
+                                    <td>名称</td>
+                                    <td>单位</td>
+                                    <td>数量</td>
+                                    <td>单价</td>
+                                    <td>税率（%）</td>
+                                    <td>含税总金额（元）</td>
+                                    <td>不含税金额（元）</td>
+                                    <#--<td>操作</td>-->
+                                </tr>
+
+                                <#if costDetails??>
+                                    <#list costDetails as costDetail>
+                                        <tr>
+                                            <td>
+                                                <#--<select style="width: auto" readonly
+                                                        class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-type">
+                                                    <option value="1" <#if costDetail.type == 1>selected</#if>>设备
+                                                    </option>
+                                                    <option value="2" <#if costDetail.type == 2>selected</#if>>施工
+                                                    </option>
+                                                    <option value="3" <#if costDetail.type == 3>selected</#if>>服务
+                                                    </option>
+                                                    <option value="4" <#if costDetail.type == 4>selected</#if>>其他
+                                                    </option>
+                                                </select>-->
+                                                <#if costDetail.type ==1 >
+                                                    设备
+                                                <#elseif costDetail.type  ==2>
+                                                    施工
+                                                <#elseif costDetail.type  ==3>
+                                                    服务
+                                                <#elseif costDetail.type  ==4>
+                                                    其他
+                                                </#if>
+                                            </td>
+                                            <td>
+                                                <#list procurementTypes as procurementType>
+                                                    <#if costDetail.category == procurementType.id>${procurementType.name}</#if>
+                                                </#list>
+                                            </td>
+                                            <td><input type="text" readonly
+                                                       class="am-modal-prompt-input am-modal-prompt-input-cost"
+                                                       value="${costDetail.name!}"></td>
+                                            <td><input type="text" readonly
+                                                       class="am-modal-prompt-input am-modal-prompt-input-cost"
+                                                       value="${costDetail.unit!}"></td>
+                                            <td><input type="text" readonly
+                                                       class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-amount"
+                                                       value="${costDetail.amount!0}"></td>
+                                            <td><input type="text" readonly
+                                                       class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-price"
+                                                       value="${Utils.format(costDetail.price,'0')}"></td>
+                                            <td><input type="text" min="0.00" max="99.99" step="0.01" readonly
+                                                       class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-tax-rate"
+                                                       value="${Utils.format(costDetail.taxRate,'0')}"></td>
+                                            <td><input type="text"
+                                                       class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-tax-include"
+                                                       value="${Utils.format(costDetail.totalTaxInclude,'0')}" readonly>
+                                            </td>
+                                            <td><input type="text"
+                                                       class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-tax-exclude"
+                                                       value="${Utils.format(costDetail.totalTaxExclude,'0')}" readonly>
+                                            </td>
+                                            <td>
+                                                <#-- <button type="button"
+                                                         class="am-btn am-btn-warning am-btn-xs am-round am-modal-line-delete">
+                                                     <span class="am-icon-minus"></span></button>-->
+                                            </td>
+                                        </tr>
+                                    </#list>
+                                </#if>
+
+                                </tbody>
+                            </table>
+                            <span class="am-text-lg">项目管理成本表</span>
+                            <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;"
+                                   id="costProjectManageTable">
+                                <tbody>
+                                <tr>
+                                    <td>财务费用类别</td>
+                                    <td>业务项目</td>
+                                    <td>项目明细</td>
+                                    <td>单位</td>
+                                    <td>数量</td>
+                                    <td>单价</td>
+                                    <td>总金额（元）</td>
+                                    <td>预估计算方法</td>
+                                    <td>预估依据</td>
+                                    <td>备注</td>
+                                    <#--<td>操作</td>-->
+                                </tr>
+
+                                <#if costProjectManageDetails??>
+                                    <#list costProjectManageDetails as costProjectManageDetail>
+                                        <tr>
+                                            <td>
+                                                <#--<select style="width: auto"
+                                                        class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
+                                                        <#if costProjectManageDetail.deletable==0>readonly</#if>>
+                                                    <option value="1"
+                                                            <#if costProjectManageDetail.type == 1>selected</#if>>人工成本
+                                                    </option>
+                                                    <option value="2"
+                                                            <#if costProjectManageDetail.type == 2>selected</#if>>业务费用
+                                                    </option>
+                                                    <option value="3"
+                                                            <#if costProjectManageDetail.type == 3>selected</#if>>其他费用
+                                                    </option>
+                                                </select>-->
+                                                <#if costProjectManageDetail.type ==1 >
+                                                    人工成本
+                                                <#elseif costProjectManageDetail.type  ==2>
+                                                    业务费用
+                                                <#elseif costProjectManageDetail.type  ==3>
+                                                    其他费用
+                                                </#if>
+                                            </td>
+                                            <td><input type="text"
+                                                       class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
+                                                       value="${costProjectManageDetail.name!}" readonly
+                                                        <#--<#if costProjectManageDetail.deletable==0>readonly</#if>-->></td>
+                                            <td><input type="text" readonly
+                                                       class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
+                                                       value="${costProjectManageDetail.detail!}"></td>
+                                            <td><input type="text" readonly
+                                                       class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
+                                                       value="${costProjectManageDetail.unit!}"></td>
+                                            <td><input type="text" readonly
+                                                       class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-amount-project-manage"
+                                                       value="${costProjectManageDetail.amount!0}"></td>
+                                            <td><input type="text" readonly
+                                                       class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-price-project-manage"
+                                                       value="${Utils.format(costProjectManageDetail.price,'0')}"></td>
+                                            <td><input type="text"
+                                                       class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-total-project-manage"
+                                                       value="${Utils.format(costProjectManageDetail.total,'0')}"
+                                                       readonly></td>
+                                            <td><input type="text" readonly
+                                                       class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
+                                                       value="${costProjectManageDetail.predictMethod!}"></td>
+                                            <td><input type="text" readonly
+                                                       class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
+                                                       value="${costProjectManageDetail.predictWhy!}"></td>
+                                            <td><input type="text" readonly
+                                                       class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
+                                                       value="${costProjectManageDetail.remark!}"></td>
+                                            <#--<td><#if costProjectManageDetail.deletable==1>
+                                                    <button type="button"
+                                                            class="am-btn am-btn-warning am-btn-xs am-round am-modal-line-delete">
+                                                        <span class="am-icon-minus"></span></button></#if>
+                                                <input type="hidden"
+                                                       class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
+                                                       value="${costProjectManageDetail.deletable!}">
+                                            </td>-->
+                                        </tr>
+                                    </#list>
+                                </#if>
+
+                                </tbody>
+                            </table>
+                            <span class="am-text-lg">资金计划表</span>
+                            <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;"
+                                   id="budgetPlanDetailTable">
+                                <tbody>
+                                <tr>
+                                    <td>月份</td>
+                                    <td>设备支出</td>
+                                    <td>工程支出</td>
+                                    <td>经营性开支</td>
+                                    <td>保证金支出</td>
+                                    <td>支出合计</td>
+                                    <td>销售收款</td>
+                                    <td>保证金收款</td>
+                                    <td>收款合计</td>
+                                    <td>资金余额</td>
+                                    <td>资金利息</td>
+                                    <td>垫资计划</td>
+                                    <td>还款计划</td>
+                                    <#-- <td>操作</td>-->
+                                </tr>
+                                <tr>
+                                    <td><#--<input type="text" class="am-modal-prompt-input input-total-month-budget-plan"
+                                               value="${projectBudgetPlanDetailTotal.month}" readonly/>-->${projectBudgetPlanDetailTotal.month}</td>
+                                    <td><input type="text"
+                                               class="am-modal-prompt-input input-total-device-cost-budget-plan"
+                                               value="${Utils.format(projectBudgetPlanDetailTotal.deviceCost)}"
+                                               readonly/></td>
+                                    <td><input type="text"
+                                               class="am-modal-prompt-input input-total-engineer-cost-budget-plan"
+                                               value="${Utils.format(projectBudgetPlanDetailTotal.engineerCost)}"
+                                               readonly/></td>
+                                    <td><input type="text"
+                                               class="am-modal-prompt-input input-total-project-manage-cost-budget-plan"
+                                               value="${Utils.format(projectBudgetPlanDetailTotal.projectManageCost)}"
+                                               readonly/></td>
+                                    <td><input type="text"
+                                               class="am-modal-prompt-input input-total-earnest-money-cost-budget-plan"
+                                               value="${Utils.format(projectBudgetPlanDetailTotal.earnestMoneyCost)}"
+                                               readonly/></td>
+                                    <td><input type="text"
+                                               class="am-modal-prompt-input input-total-total-cost-budget-plan"
+                                               value="${Utils.format(projectBudgetPlanDetailTotal.totalCost)}"
+                                               readonly/></td>
+                                    <td><input type="text"
+                                               class="am-modal-prompt-input input-total-sale-income-budget-plan"
+                                               value="${Utils.format(projectBudgetPlanDetailTotal.saleIncome)}"
+                                               readonly/></td>
+                                    <td><input type="text"
+                                               class="am-modal-prompt-input input-total-earnest-money-income-budget-plan"
+                                               value="${Utils.format(projectBudgetPlanDetailTotal.earnestMoneyIncome)}"
+                                               readonly/></td>
+                                    <td><input type="text"
+                                               class="am-modal-prompt-input input-total-total-income-budget-plan"
+                                               value="${Utils.format(projectBudgetPlanDetailTotal.totalIncome)}"
+                                               readonly/></td>
+                                    <td><input type="text"
+                                               class="am-modal-prompt-input input-total-fund-balance-budget-plan"
+                                               value="${Utils.format(projectBudgetPlanDetailTotal.fundBalance)}"
+                                               readonly/></td>
+                                    <td><input type="text"
+                                               class="am-modal-prompt-input input-total-capital-interest-budget-plan"
+                                               value="${Utils.format(projectBudgetPlanDetailTotal.capitalInterest)}"
+                                               readonly/></td>
+                                    <td><input type="text"
+                                               class="am-modal-prompt-input input-total-underwritten-plan-budget-plan"
+                                               value="${Utils.format(projectBudgetPlanDetailTotal.underwrittenPlan)}"
+                                               readonly/></td>
+                                    <td><input type="text"
+                                               class="am-modal-prompt-input input-total-repayment-plan-budget-plan"
+                                               value="${Utils.format(projectBudgetPlanDetailTotal.repaymentPlan)}"
+                                               readonly/></td>
+                                    <td></td>
+                                </tr>
+
+                                <#if projectBudgetPlanDetails??>
+                                    <#list projectBudgetPlanDetails as projectBudgetPlanDetail>
+                                        <tr>
+                                            <td><#--<input type="text" readonly
+                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-month-budget-plan"
+                                                       value="${projectBudgetPlanDetail.month!}">-->${projectBudgetPlanDetail.month!}</td>
+                                            <td><input type="text" readonly
+                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-device-cost-budget-plan"
+                                                       value="${Utils.format(projectBudgetPlanDetail.deviceCost)}"></td>
+                                            <td><input type="text" readonly
+                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-engineer-cost-budget-plan"
+                                                       value="${Utils.format(projectBudgetPlanDetail.engineerCost)}">
+                                            </td>
+                                            <td><input type="text" readonly
+                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-project-manage-cost-budget-plan"
+                                                       value="${Utils.format(projectBudgetPlanDetail.projectManageCost)}">
+                                            </td>
+                                            <td><input type="text" readonly
+                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-earnest-money-cost-budget-plan"
+                                                       value="${Utils.format(projectBudgetPlanDetail.earnestMoneyCost)}">
+                                            </td>
+                                            <td><input type="text"
+                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-total-cost-budget-plan"
+                                                       value="${Utils.format(projectBudgetPlanDetail.totalCost)}"
+                                                       readonly></td>
+                                            <td><input type="text" readonly
+                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-sale-income-budget-plan"
+                                                       value="${Utils.format(projectBudgetPlanDetail.saleIncome)}"></td>
+                                            <td><input type="text" readonly
+                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-earnest-money-income-budget-plan"
+                                                       value="${Utils.format(projectBudgetPlanDetail.earnestMoneyIncome)}">
+                                            </td>
+                                            <td><input type="text"
+                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-total-income-budget-plan"
+                                                       value="${Utils.format(projectBudgetPlanDetail.totalIncome)}"
+                                                       readonly></td>
+                                            <td><input type="text"
+                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-fund-balance-budget-plan"
+                                                       value="${Utils.format(projectBudgetPlanDetail.fundBalance)}"
+                                                       readonly></td>
+                                            <td><input type="text"
+                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-capital-interest-budget-plan"
+                                                       value="${Utils.format(projectBudgetPlanDetail.capitalInterest)}"
+                                                       readonly></td>
+                                            <td><input type="text"
+                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-underwritten-plan-budget-plan"
+                                                       value="${Utils.format(projectBudgetPlanDetail.underwrittenPlan)}"
+                                                       readonly></td>
+                                            <td><input type="text"
+                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-repayment-plan-budget-plan"
+                                                       value="${Utils.format(projectBudgetPlanDetail.repaymentPlan)}"
+                                                       readonly></td>
+                                            <#--<td>
+                                                <button type="button"
+                                                        class="am-btn am-btn-warning am-btn-xs am-round am-modal-line-delete-budget-plan">
+                                                    <span class="am-icon-minus"></span></button>
+                                            </td>-->
+                                        </tr>
+                                    </#list>
+                                </#if>
+
+                                </tbody>
+                            </table>
+
+                            <#--<span class="am-text-primary"><a style="cursor: pointer" id="income-detail">收入明细表</a></span>
                             <span class="am-text-primary"><a style="cursor: pointer"  id="cost-detail">采购成本明细表</a></span>
                             <span class="am-text-primary"><a style="cursor: pointer"  id="cost-project-manage-detail">项目管理成本表</a></span>
-                            <span class="am-text-primary budget-plan-detail"><a style="cursor: pointer">资金计划表</a></span>
+                            <span class="am-text-primary budget-plan-detail"><a style="cursor: pointer">资金计划表</a></span>-->
+                            <span class="am-text-lg">收入</span>
                             <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;">
                                 <tbody>
                                 <tr class="am-text-lg">

From f16f263e8fef0bf97669a8404607306aec3babb2 Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Mon, 10 Jan 2022 16:28:22 +0800
Subject: [PATCH 10/35] =?UTF-8?q?=E5=8D=95=E4=BB=B7=E5=8D=95=E7=8B=AC?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/cn/palmte/work/utils/Utils.java      | 14 ++++++++++++++
 .../templates/admin/project_budget_edit.ftl        |  6 +++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/main/java/cn/palmte/work/utils/Utils.java b/src/main/java/cn/palmte/work/utils/Utils.java
index cebf5a1..9eef788 100644
--- a/src/main/java/cn/palmte/work/utils/Utils.java
+++ b/src/main/java/cn/palmte/work/utils/Utils.java
@@ -61,6 +61,20 @@ public class Utils {
         return format(number, "#,##0.00");
     }
 
+    /**
+     * 保留五位小数
+     */
+    public static String format2(Number number, String defaultValue){
+        if (null == number) {
+            return defaultValue;
+        }else {
+            return new java.text.DecimalFormat("#,##0.00###").format(number);
+        }
+    }
+    public static String format2(Number number){
+        return format(number, "#,##0.00###");
+    }
+
 
     public static void main(String[] args) throws Exception {
         AesCrypto aesCrypto = new AesCrypto("CDGXQHCJ-HHYC2021017");
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index b5269b8..6c9f2ee 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -392,7 +392,7 @@
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income" value="${incomeDetail.name!}"></td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income" value="${incomeDetail.unit!}"></td>
                                     <td><input type="number" min="0" max="99999999" step="1" maxlength="8" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-amount" value="${incomeDetail.amount!0}" oninput="if(value.length>8)value=value.slice(0,8)" <#--onkeyup="integerNumber(this)"-->></td>
-                                    <td><input type="text" maxlength="19" class="price am-modal-prompt-input am-modal-prompt-input-income input-changeable-price" value="${Utils.format(incomeDetail.price,'0')}" oninput="if(value.length>19)value=value.slice(0,19)"></td>
+                                    <td><input type="text" maxlength="19" class="price am-modal-prompt-input am-modal-prompt-input-income input-changeable-price" value="${Utils.format2(incomeDetail.price,'0')}" oninput="if(value.length>19)value=value.slice(0,19)"></td>
                                     <td><input type="text" maxlength="5" class="number am-modal-prompt-input am-modal-prompt-input-income input-changeable-tax-rate" value="${Utils.format(incomeDetail.taxRate,'0')}" oninput="if(value.length>5)value=value.slice(0,5)"></td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-tax-include" value="${Utils.format(incomeDetail.totalTaxInclude,'0')}" readonly></td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-tax-exclude" value="${Utils.format(incomeDetail.totalTaxExclude,'0')}" readonly></td>
@@ -459,7 +459,7 @@
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost" value="${costDetail.name!}"></td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost" value="${costDetail.unit!}"></td>
                                     <td><input type="number" min="0" max="99999999" step="1" maxlength="8" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-amount" value="${costDetail.amount!0}" oninput="if(value.length>8)value=value.slice(0,8)" <#--onkeyup="integerNumber(this)"-->></td>
-                                    <td><input type="text" maxlength="19" class="price am-modal-prompt-input am-modal-prompt-input-cost input-changeable-price" value="${Utils.format(costDetail.price,'0')}" oninput="if(value.length>19)value=value.slice(0,19)"></td>
+                                    <td><input type="text" maxlength="19" class="price am-modal-prompt-input am-modal-prompt-input-cost input-changeable-price" value="${Utils.format2(costDetail.price,'0')}" oninput="if(value.length>19)value=value.slice(0,19)"></td>
                                     <td><input type="text" maxlength="5" class="number am-modal-prompt-input am-modal-prompt-input-cost input-changeable-tax-rate" value="${Utils.format(costDetail.taxRate,'0')}" oninput="if(value.length>5)value=value.slice(0,5)"></td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-tax-include" value="${Utils.format(costDetail.totalTaxInclude,'0')}" readonly></td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-tax-exclude" value="${Utils.format(costDetail.totalTaxExclude,'0')}" readonly></td>
@@ -527,7 +527,7 @@
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="${costProjectManageDetail.detail!}"></td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="${costProjectManageDetail.unit!}"></td>
                                     <td><input type="number" min="0" max="99999999" step="1" maxlength="8" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-amount-project-manage" value="${costProjectManageDetail.amount!0}" <#--onkeyup="integerNumber(this)"--> oninput="if(value.length>8)value=value.slice(0,8)"></td>
-                                    <td><input type="text" maxlength="19" class="price am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-price-project-manage" value="${Utils.format(costProjectManageDetail.price,'0')}" oninput="if(value.length>19)value=value.slice(0,19)"></td>
+                                    <td><input type="text" maxlength="19" class="price am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-price-project-manage" value="${Utils.format2(costProjectManageDetail.price,'0')}" oninput="if(value.length>19)value=value.slice(0,19)"></td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-total-project-manage" value="${Utils.format(costProjectManageDetail.total,'0')}" readonly></td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="${costProjectManageDetail.predictMethod!}"></td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="${costProjectManageDetail.predictWhy!}"></td>

From c47632341b8cd5ae44278a63c01111b78334d471 Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Mon, 10 Jan 2022 16:57:21 +0800
Subject: [PATCH 11/35] =?UTF-8?q?=E5=88=86=E9=9A=94=E7=AC=A6=E6=BC=8F?=
 =?UTF-8?q?=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/assets/js/project_budget_plan.js          | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/static/assets/js/project_budget_plan.js b/src/main/resources/static/assets/js/project_budget_plan.js
index c7fce6d..ef4272a 100644
--- a/src/main/resources/static/assets/js/project_budget_plan.js
+++ b/src/main/resources/static/assets/js/project_budget_plan.js
@@ -274,7 +274,7 @@ function bindChangeableInputBudgetPlanDetail() {
         var earnestMoneyCost = f2($(this).parent().parent().find(".input-changeable-earnest-money-cost-budget-plan").val());
 
         //更新本月所有项支出
-        $(this).parent().parent().find(".input-changeable-total-cost-budget-plan").val(deviceCost+engineerCost+projectManageCost+earnestMoneyCost);
+        $(this).parent().parent().find(".input-changeable-total-cost-budget-plan").val(f2Fixed(deviceCost+engineerCost+projectManageCost+earnestMoneyCost));
         //更新所有月设备支出总额
         updateBudgetPlanTotal("input-changeable-device-cost-budget-plan","input-total-device-cost-budget-plan");
         //更新所有月支出总额
@@ -292,7 +292,7 @@ function bindChangeableInputBudgetPlanDetail() {
         var earnestMoneyCost = f2($(this).parent().parent().find(".input-changeable-earnest-money-cost-budget-plan").val());
 
         //更新本月所有项支出
-        $(this).parent().parent().find(".input-changeable-total-cost-budget-plan").val(deviceCost+engineerCost+projectManageCost+earnestMoneyCost);
+        $(this).parent().parent().find(".input-changeable-total-cost-budget-plan").val(f2Fixed(deviceCost+engineerCost+projectManageCost+earnestMoneyCost));
         //更新所有月工程支出总额
         updateBudgetPlanTotal("input-changeable-engineer-cost-budget-plan","input-total-engineer-cost-budget-plan");
         //更新所有月支出总额
@@ -310,7 +310,7 @@ function bindChangeableInputBudgetPlanDetail() {
         var earnestMoneyCost = f2($(this).parent().parent().find(".input-changeable-earnest-money-cost-budget-plan").val());
 
         //更新本月所有项支出
-        $(this).parent().parent().find(".input-changeable-total-cost-budget-plan").val(deviceCost+engineerCost+projectManageCost+earnestMoneyCost);
+        $(this).parent().parent().find(".input-changeable-total-cost-budget-plan").val(f2Fixed(deviceCost+engineerCost+projectManageCost+earnestMoneyCost));
         //更新所有月经营性支出总额
         updateBudgetPlanTotal("input-changeable-project-manage-cost-budget-plan","input-total-project-manage-cost-budget-plan");
         //更新所有月支出总额
@@ -328,7 +328,7 @@ function bindChangeableInputBudgetPlanDetail() {
         var projectManageCost = f2($(this).parent().parent().find(".input-changeable-project-manage-cost-budget-plan").val());
 
         //更新本月所有项支出
-        $(this).parent().parent().find(".input-changeable-total-cost-budget-plan").val(f2(deviceCost+engineerCost+projectManageCost+earnestMoneyCost));
+        $(this).parent().parent().find(".input-changeable-total-cost-budget-plan").val(f2Fixed(deviceCost+engineerCost+projectManageCost+earnestMoneyCost));
         //更新所有月保证金支出总额
         updateBudgetPlanTotal("input-changeable-earnest-money-cost-budget-plan","input-total-earnest-money-cost-budget-plan");
         updateBudgetPlanTotal("input-changeable-earnest-money-cost-budget-plan","input-total-title-earnest-money-cost-budget-plan");
@@ -346,7 +346,7 @@ function bindChangeableInputBudgetPlanDetail() {
         var earnestMoneyIncome = f2($(this).parent().parent().find(".input-changeable-earnest-money-income-budget-plan").val());
 
         //更新本月所有项收入
-        $(this).parent().parent().find(".input-changeable-total-income-budget-plan").val(f2(saleIncome+earnestMoneyIncome));
+        $(this).parent().parent().find(".input-changeable-total-income-budget-plan").val(f2Fixed(saleIncome+earnestMoneyIncome));
         //更新所有月销售收款总额
         updateBudgetPlanTotal("input-changeable-sale-income-budget-plan","input-total-sale-income-budget-plan");
         //更新所有月收入总额
@@ -362,7 +362,7 @@ function bindChangeableInputBudgetPlanDetail() {
         var saleIncome = f2($(this).parent().parent().find(".input-changeable-sale-income-budget-plan").val());
 
         //更新本月所有项收入
-        $(this).parent().parent().find(".input-changeable-total-income-budget-plan").val(f2(saleIncome+earnestMoneyIncome));
+        $(this).parent().parent().find(".input-changeable-total-income-budget-plan").val(f2Fixed(saleIncome+earnestMoneyIncome));
         //更新所有月保证金收款总额
         updateBudgetPlanTotal("input-changeable-earnest-money-income-budget-plan","input-total-earnest-money-income-budget-plan");
         updateBudgetPlanTotal("input-changeable-earnest-money-income-budget-plan","input-total-title-earnest-money-income-budget-plan");

From c75c4eb49ff976c2c077bdd78cab078e35e804c0 Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Mon, 10 Jan 2022 17:07:17 +0800
Subject: [PATCH 12/35] =?UTF-8?q?=E5=88=86=E9=9A=94=E7=AC=A6=E6=BC=8F?=
 =?UTF-8?q?=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/assets/js/project_budget_cost_project_manage.js   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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 e197b85..58a5946 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
@@ -224,13 +224,13 @@ function bindChangeableInputProjectManage() {
     $(".input-changeable-amount-project-manage").change(function () {
         var amount = parseInt($(this).val());
         //找到对应的单价
-        var price = f2($(this).parent().parent().find(".input-changeable-price-project-manage").val());
+        var price = f5($(this).parent().parent().find(".input-changeable-price-project-manage").val());
 
         $(this).parent().parent().find(".input-changeable-total-project-manage").val(f2Fixed(amount*price));
     });
     //单价改变
     $(".input-changeable-price-project-manage").change(function () {
-        var price = f2($(this).val());
+        var price = f5($(this).val());
         //找到对应的数量
         var amount = parseInt($(this).parent().parent().find(".input-changeable-amount-project-manage").val());
 
@@ -297,7 +297,6 @@ function updateCostProjectManageData(data,returnData) {
 
     calCostExclude();
     calCostInclude();
-    console.log("51");
 
     updateProjectContributionProfitRate();
 

From d7b3dcaf61e4a18b0b5d81418f9e887962db13d4 Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Mon, 10 Jan 2022 17:57:21 +0800
Subject: [PATCH 13/35] =?UTF-8?q?=E5=88=A9=E6=B6=A6=E7=8E=87=E5=85=81?=
 =?UTF-8?q?=E8=AE=B8=E8=AE=A1=E7=AE=97=E8=B4=9F=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/cn/palmte/work/bean/FinalBean.java            | 6 +++---
 .../java/cn/palmte/work/service/ProjectSummaryService.java  | 4 ++--
 src/main/java/cn/palmte/work/service/StatisticsService.java | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/cn/palmte/work/bean/FinalBean.java b/src/main/java/cn/palmte/work/bean/FinalBean.java
index dd2da66..afe8d7f 100644
--- a/src/main/java/cn/palmte/work/bean/FinalBean.java
+++ b/src/main/java/cn/palmte/work/bean/FinalBean.java
@@ -161,7 +161,7 @@ public class FinalBean {
         if(null == grossProfitFinalTotal || null == incomeTotal){
             return null;
         }
-        if (incomeTotal.compareTo(BigDecimal.valueOf(0.01)) < 0) {
+        if (incomeTotal.compareTo(BigDecimal.valueOf(0.01)) < 0 && incomeTotal.compareTo(BigDecimal.valueOf(-0.01)) > 0) {
             incomeTotal = BigDecimal.ONE;
         }
         return grossProfitFinalTotal.divide(incomeTotal,4, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
@@ -202,7 +202,7 @@ public class FinalBean {
         if(null == contributionMarginFinalTotal || null == incomeTotal){
             return null;
         }
-        if (incomeTotal.compareTo(BigDecimal.valueOf(0.01)) < 0) {
+        if (incomeTotal.compareTo(BigDecimal.valueOf(0.01)) < 0 && incomeTotal.compareTo(BigDecimal.valueOf(-0.01)) > 0) {
             incomeTotal = BigDecimal.ONE;
         }
         return contributionMarginFinalTotal.divide(incomeTotal,4, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
@@ -242,7 +242,7 @@ public class FinalBean {
         if(null == netMarginFinalTotal || null == incomeTotal){
             return null;
         }
-        if (incomeTotal.compareTo(BigDecimal.valueOf(0.01)) < 0) {
+        if (incomeTotal.compareTo(BigDecimal.valueOf(0.01)) < 0 && incomeTotal.compareTo(BigDecimal.valueOf(-0.01)) > 0) {
             incomeTotal = BigDecimal.ONE;
         }
         return netMarginFinalTotal.divide(incomeTotal,4, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
diff --git a/src/main/java/cn/palmte/work/service/ProjectSummaryService.java b/src/main/java/cn/palmte/work/service/ProjectSummaryService.java
index 646ae03..24f0a96 100644
--- a/src/main/java/cn/palmte/work/service/ProjectSummaryService.java
+++ b/src/main/java/cn/palmte/work/service/ProjectSummaryService.java
@@ -190,8 +190,8 @@ public class ProjectSummaryService {
     private void setProfitMargin(SettleBean monthSettle) {
         BigDecimal divide2 = monthSettle.getIncomeTotal();
         BigDecimal min = BigDecimal.valueOf(0.01);
-        if (divide2.compareTo(min) < 0) {
-            divide2 = BigDecimal.valueOf(1);
+        if (divide2.compareTo(min) < 0 && divide2.compareTo(BigDecimal.valueOf(-0.01)) > 0) {
+            divide2 = BigDecimal.ONE;
         }
         monthSettle.setGrossProfitProfitMargin(monthSettle.getGrossProfit().multiply(new BigDecimal(100)).divide(divide2, 4, BigDecimal.ROUND_HALF_UP));
         monthSettle.setContributionProfitProfitMargin(monthSettle.getContributionProfit().multiply(new BigDecimal(100)).divide(divide2, 4, BigDecimal.ROUND_HALF_UP));
diff --git a/src/main/java/cn/palmte/work/service/StatisticsService.java b/src/main/java/cn/palmte/work/service/StatisticsService.java
index dda3cfc..0a49b32 100644
--- a/src/main/java/cn/palmte/work/service/StatisticsService.java
+++ b/src/main/java/cn/palmte/work/service/StatisticsService.java
@@ -313,8 +313,8 @@ public class StatisticsService {
 
                 BigDecimal divide2 = profitAndLossBean.getIncome();
                 BigDecimal min = BigDecimal.valueOf(0.01);
-                if (divide2.compareTo(min) < 0) {
-                    divide2 = BigDecimal.valueOf(1);
+                if (divide2.compareTo(min) < 0 && divide2.compareTo(BigDecimal.valueOf(-0.01)) > 0) {
+                    divide2 = BigDecimal.ONE;
                 }
                 profitAndLossBean.setGrossProfit(typeGrossProfit);
                 profitAndLossBean.setGrossProfitProfit(profitAndLossBean.getGrossProfit().multiply(new BigDecimal(100)).divide(divide2, 4, BigDecimal.ROUND_HALF_UP));

From 900a133bc7f4374bf676c403fa11fc639b47810a Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Mon, 10 Jan 2022 18:04:32 +0800
Subject: [PATCH 14/35] =?UTF-8?q?=E5=88=A9=E6=B6=A6=E7=8E=87=E5=85=81?=
 =?UTF-8?q?=E8=AE=B8=E8=AE=A1=E7=AE=97=E8=B4=9F=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/admin/project_settle_edit.ftl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/templates/admin/project_settle_edit.ftl b/src/main/resources/templates/admin/project_settle_edit.ftl
index f78d525..3e89520 100644
--- a/src/main/resources/templates/admin/project_settle_edit.ftl
+++ b/src/main/resources/templates/admin/project_settle_edit.ftl
@@ -251,7 +251,7 @@
                         <td><input name="grossProfitFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.grossProfit,'0')}" required readonly title="项目毛利上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="grossProfit" value="${Utils.format(monthBean.grossProfit,'0')}" readonly required title="项目毛利本月结算金额"></td>
                         <td><input type="text" class="number" name="grossProfitSettleTotal" value="${Utils.format(currentBean.grossProfit,'0')}" readonly title="项目毛利结算总额"></td>
-                        <td><input name="grossProfitProfitMargin" type="text" class="number" <#if currentBean.getIncomeTotalTaxExclude() lt 0.01>value="${Utils.format(100 * currentBean.grossProfit,'0')}"<#else>value="${Utils.format(100 * currentBean.grossProfit / currentBean.getIncomeTotalTaxExclude(),'0')}"</#if> readonly title="项目毛利利润率"></td>
+                        <td><input name="grossProfitProfitMargin" type="text" class="number" <#if currentBean.getIncomeTotalTaxExclude() lt 0.01 && currentBean.getIncomeTotalTaxExclude() gt -0.01>value="${Utils.format(100 * currentBean.grossProfit,'0')}"<#else>value="${Utils.format(100 * currentBean.grossProfit / currentBean.getIncomeTotalTaxExclude(),'0')}"</#if> readonly title="项目毛利利润率"></td>
                     </tr>
                     <tr>
                         <td>项目贡献利润</td>
@@ -260,7 +260,7 @@
                         <td><input name="contributionProfitFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.contributionProfit,'0')}" required readonly title="项目贡献利润上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="contributionProfit" value="${Utils.format(monthBean.contributionProfit,'0')}" readonly required title="项目贡献利润本月结算金额"></td>
                         <td><input type="text" class="number" name="contributionProfitSettleTotal" value="${Utils.format(currentBean.contributionProfit,'0')}" readonly title="项目贡献利润结算总额"></td>
-                        <td><input name="contributionProfitProfitMargin" type="text" class="number" <#if currentBean.getIncomeTotalTaxExclude() lt 0.01>value="${Utils.format(100 * currentBean.grossProfit,'0')}"<#else>value="${Utils.format(100 * currentBean.grossProfit / currentBean.getIncomeTotalTaxExclude(),'0')}"</#if> readonly title="项目贡献利润利润率"></td>
+                        <td><input name="contributionProfitProfitMargin" type="text" class="number" <#if currentBean.getIncomeTotalTaxExclude() lt 0.01 && currentBean.getIncomeTotalTaxExclude() gt -0.01>value="${Utils.format(100 * currentBean.grossProfit,'0')}"<#else>value="${Utils.format(100 * currentBean.grossProfit / currentBean.getIncomeTotalTaxExclude(),'0')}"</#if> readonly title="项目贡献利润利润率"></td>
                     </tr>
                     <tr>
                         <td>项目净利润</td>
@@ -269,7 +269,7 @@
                         <td><input name="netProfitFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.netProfit,'0')}" required readonly title="项目净利润上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="netProfit" value="${Utils.format(monthBean.netProfit,'0')}" readonly required title="项目净利润本月结算金额"></td>
                         <td><input type="text" class="number" name="netProfitSettleTotal" value="${Utils.format(currentBean.netProfit,'0')}" readonly title="项目净利润结算总额"></td>
-                        <td><input name="netProfitProfitMargin" type="text" class="number" <#if currentBean.getIncomeTotalTaxExclude() lt 0.01>value="${Utils.format(100 * currentBean.grossProfit,'0')}"<#else>value="${Utils.format(100 * currentBean.grossProfit / currentBean.getIncomeTotalTaxExclude(),'0')}"</#if> readonly title="项目净利润利润率"></td>
+                        <td><input name="netProfitProfitMargin" type="text" class="number" <#if currentBean.getIncomeTotalTaxExclude() lt 0.01 && currentBean.getIncomeTotalTaxExclude() gt -0.01>value="${Utils.format(100 * currentBean.grossProfit,'0')}"<#else>value="${Utils.format(100 * currentBean.grossProfit / currentBean.getIncomeTotalTaxExclude(),'0')}"</#if> readonly title="项目净利润利润率"></td>
                     </tr>
                     </tbody>
                 </table>

From 75b2179b0d263c08d76ef5a162db0be2c43be0e4 Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Tue, 11 Jan 2022 14:23:23 +0800
Subject: [PATCH 15/35] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=8D=95=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/admin/project_approve.ftl    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index b1022bf..6f86f88 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -477,7 +477,7 @@
                                                        value="${incomeDetail.amount!0}"></td>
                                             <td><input type="text" readonly
                                                        class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-price"
-                                                       value="${Utils.format(incomeDetail.price,'0')}"></td>
+                                                       value="${Utils.format2(incomeDetail.price,'0')}"></td>
                                             <td><input type="text" readonly
                                                        class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-tax-rate"
                                                        value="${Utils.format(incomeDetail.taxRate,'0')}"></td>
@@ -558,7 +558,7 @@
                                                        value="${costDetail.amount!0}"></td>
                                             <td><input type="text" readonly
                                                        class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-price"
-                                                       value="${Utils.format(costDetail.price,'0')}"></td>
+                                                       value="${Utils.format2(costDetail.price,'0')}"></td>
                                             <td><input type="text" min="0.00" max="99.99" step="0.01" readonly
                                                        class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-tax-rate"
                                                        value="${Utils.format(costDetail.taxRate,'0')}"></td>
@@ -639,7 +639,7 @@
                                                        value="${costProjectManageDetail.amount!0}"></td>
                                             <td><input type="text" readonly
                                                        class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-price-project-manage"
-                                                       value="${Utils.format(costProjectManageDetail.price,'0')}"></td>
+                                                       value="${Utils.format2(costProjectManageDetail.price,'0')}"></td>
                                             <td><input type="text"
                                                        class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-total-project-manage"
                                                        value="${Utils.format(costProjectManageDetail.total,'0')}"
@@ -1806,7 +1806,7 @@
                                                        value="${incomeDetail.amount!0}"></td>
                                             <td><input type="text" readonly
                                                        class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-price"
-                                                       value="${Utils.format(incomeDetail.price,'0')}"></td>
+                                                       value="${Utils.format2(incomeDetail.price,'0')}"></td>
                                             <td><input type="text" readonly
                                                        class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-tax-rate"
                                                        value="${Utils.format(incomeDetail.taxRate,'0')}"></td>
@@ -1901,7 +1901,7 @@
                                                        value="${costDetail.amount!0}"></td>
                                             <td><input type="text" readonly
                                                        class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-price"
-                                                       value="${Utils.format(costDetail.price,'0')}"></td>
+                                                       value="${Utils.format2(costDetail.price,'0')}"></td>
                                             <td><input type="text" min="0.00" max="99.99" step="0.01" readonly
                                                        class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-tax-rate"
                                                        value="${Utils.format(costDetail.taxRate,'0')}"></td>
@@ -1996,7 +1996,7 @@
                                                        value="${costProjectManageDetail.amount!0}"></td>
                                             <td><input type="text" readonly
                                                        class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-price-project-manage"
-                                                       value="${Utils.format(costProjectManageDetail.price,'0')}"></td>
+                                                       value="${Utils.format2(costProjectManageDetail.price,'0')}"></td>
                                             <td><input type="text"
                                                        class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-total-project-manage"
                                                        value="${Utils.format(costProjectManageDetail.total,'0')}"

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

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

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

From 8030783b7ede58971e493779fbf87a859ce48a6f Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Wed, 12 Jan 2022 10:45:34 +0800
Subject: [PATCH 17/35] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=93=E7=AE=97?=
 =?UTF-8?q?=E5=88=A9=E6=B6=A6=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/assets/js/project_common.js        | 24 +++++++++++++++++++
 .../static/assets/js/project_settle.js        |  6 ++---
 .../templates/admin/project_settle_edit.ftl   |  4 ++--
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/static/assets/js/project_common.js b/src/main/resources/static/assets/js/project_common.js
index ac9a87a..7779882 100644
--- a/src/main/resources/static/assets/js/project_common.js
+++ b/src/main/resources/static/assets/js/project_common.js
@@ -78,6 +78,30 @@ function digitalSelf(name, action) {
     $action.val(f2Fixed(f2(self)));
 }
 
+/**
+ * parse float保留两位小数，四舍五入
+ * 空格或者非数字认为是0
+ * @param x
+ * @returns {*}
+ */
+function f2min(x) {
+    if(!x){
+        return 1;
+    }
+    if(typeof x === 'string'){
+        //这一步因为数字格式化为了包含分隔符，获取的时候就去掉这个分隔符
+        x = x.replaceAll(",","");
+    }
+    var f = parseFloat(x);
+    if (isNaN(f)) {
+        return 1;
+    }
+    if (f < 0.01 && f > -0.01) {
+        return 1;
+    }
+    return Math.round(f*100)/100;
+}
+
 /**
  * 计算利润率
  * @param r1
diff --git a/src/main/resources/static/assets/js/project_settle.js b/src/main/resources/static/assets/js/project_settle.js
index e568638..d73e7a4 100644
--- a/src/main/resources/static/assets/js/project_settle.js
+++ b/src/main/resources/static/assets/js/project_settle.js
@@ -579,7 +579,7 @@ function calGrossProfitProfitMargin() {
     var grossProfitProfitMargin = $("input[name='grossProfitProfitMargin']");
 
     if(grossProfitSettleTotal && incomeSettleTotal){
-        grossProfitProfitMargin.val(f2Fixed(100*(f2(grossProfitSettleTotal)/f2(incomeSettleTotal))));
+        grossProfitProfitMargin.val(f2Fixed(100*(f2(grossProfitSettleTotal)/f2min(incomeSettleTotal))));
     }else {
         grossProfitProfitMargin.val("");
     }
@@ -627,7 +627,7 @@ function calContributionProfitProfitMargin() {
     var contributionProfitProfitMargin = $("input[name='contributionProfitProfitMargin']");
 
     if(contributionProfitSettleTotal && incomeSettleTotal){
-        contributionProfitProfitMargin.val(f2Fixed(100*(f2(contributionProfitSettleTotal)/f2(incomeSettleTotal))));
+        contributionProfitProfitMargin.val(f2Fixed(100*(f2(contributionProfitSettleTotal)/f2min(incomeSettleTotal))));
     }else {
         contributionProfitProfitMargin.val("");
     }
@@ -675,7 +675,7 @@ function calNetProfitProfitMargin() {
     var netProfitProfitMargin = $("input[name='netProfitProfitMargin']");
 
     if(netProfitSettleTotal && incomeSettleTotal){
-        netProfitProfitMargin.val(f2Fixed(100*(f2(netProfitSettleTotal)/f2(incomeSettleTotal))));
+        netProfitProfitMargin.val(f2Fixed(100*(f2(netProfitSettleTotal)/f2min(incomeSettleTotal))));
     }else {
         netProfitProfitMargin.val("");
     }
diff --git a/src/main/resources/templates/admin/project_settle_edit.ftl b/src/main/resources/templates/admin/project_settle_edit.ftl
index 3e89520..7062922 100644
--- a/src/main/resources/templates/admin/project_settle_edit.ftl
+++ b/src/main/resources/templates/admin/project_settle_edit.ftl
@@ -260,7 +260,7 @@
                         <td><input name="contributionProfitFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.contributionProfit,'0')}" required readonly title="项目贡献利润上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="contributionProfit" value="${Utils.format(monthBean.contributionProfit,'0')}" readonly required title="项目贡献利润本月结算金额"></td>
                         <td><input type="text" class="number" name="contributionProfitSettleTotal" value="${Utils.format(currentBean.contributionProfit,'0')}" readonly title="项目贡献利润结算总额"></td>
-                        <td><input name="contributionProfitProfitMargin" type="text" class="number" <#if currentBean.getIncomeTotalTaxExclude() lt 0.01 && currentBean.getIncomeTotalTaxExclude() gt -0.01>value="${Utils.format(100 * currentBean.grossProfit,'0')}"<#else>value="${Utils.format(100 * currentBean.grossProfit / currentBean.getIncomeTotalTaxExclude(),'0')}"</#if> readonly title="项目贡献利润利润率"></td>
+                        <td><input name="contributionProfitProfitMargin" type="text" class="number" <#if currentBean.getIncomeTotalTaxExclude() lt 0.01 && currentBean.getIncomeTotalTaxExclude() gt -0.01>value="${Utils.format(100 * currentBean.contributionProfit,'0')}"<#else>value="${Utils.format(100 * currentBean.contributionProfit / currentBean.getIncomeTotalTaxExclude(),'0')}"</#if> readonly title="项目贡献利润利润率"></td>
                     </tr>
                     <tr>
                         <td>项目净利润</td>
@@ -269,7 +269,7 @@
                         <td><input name="netProfitFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.netProfit,'0')}" required readonly title="项目净利润上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="netProfit" value="${Utils.format(monthBean.netProfit,'0')}" readonly required title="项目净利润本月结算金额"></td>
                         <td><input type="text" class="number" name="netProfitSettleTotal" value="${Utils.format(currentBean.netProfit,'0')}" readonly title="项目净利润结算总额"></td>
-                        <td><input name="netProfitProfitMargin" type="text" class="number" <#if currentBean.getIncomeTotalTaxExclude() lt 0.01 && currentBean.getIncomeTotalTaxExclude() gt -0.01>value="${Utils.format(100 * currentBean.grossProfit,'0')}"<#else>value="${Utils.format(100 * currentBean.grossProfit / currentBean.getIncomeTotalTaxExclude(),'0')}"</#if> readonly title="项目净利润利润率"></td>
+                        <td><input name="netProfitProfitMargin" type="text" class="number" <#if currentBean.getIncomeTotalTaxExclude() lt 0.01 && currentBean.getIncomeTotalTaxExclude() gt -0.01>value="${Utils.format(100 * currentBean.netProfit,'0')}"<#else>value="${Utils.format(100 * currentBean.netProfit / currentBean.getIncomeTotalTaxExclude(),'0')}"</#if> readonly title="项目净利润利润率"></td>
                     </tr>
                     </tbody>
                 </table>

From 1119d20fab65d408185a542a3f87f8b5fd90a305 Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Thu, 13 Jan 2022 11:20:55 +0800
Subject: [PATCH 18/35] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=98=E6=AC=BE?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/static/assets/js/project_budget_plan.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/static/assets/js/project_budget_plan.js b/src/main/resources/static/assets/js/project_budget_plan.js
index ef4272a..d0a8d7a 100644
--- a/src/main/resources/static/assets/js/project_budget_plan.js
+++ b/src/main/resources/static/assets/js/project_budget_plan.js
@@ -515,6 +515,7 @@ function calUnderwrittenPlan(income, cost, prevFundBalance) {
  */
 function updateEachRepaymentPlan() {
     var total = 0;
+    console.log("total: " + total);
     //找到每个月的回款计划输入框
     $(".input-changeable-repayment-plan-budget-plan").each(function (t) {
         //找到当前月的收入和支出
@@ -549,7 +550,6 @@ function updateEachRepaymentPlan() {
  */
 function calRepaymentPlan(income, cost, prevFundBalance) {
     var repaymentPlan = 0;
-
     if(!income || !cost){
         //数据还不全的时候
         repaymentPlan = NaN;
@@ -560,10 +560,10 @@ function calRepaymentPlan(income, cost, prevFundBalance) {
             if (f2(prevFundBalance) >= 0) {
                 repaymentPlan = 0;
             } else {
-                if (f2(-prevFundBalance) >= f2(income) - f2(cost)) {
+                if (-f2(prevFundBalance) >= f2(income) - f2(cost)) {
                     repaymentPlan = f2(f2(income) - f2(cost));
                 } else {
-                    repaymentPlan = f2(-prevFundBalance);
+                    repaymentPlan = -f2(prevFundBalance);
                 }
             }
         }

From c435f0778c856ea23b9aaed5e1a1d9de415b131d Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Thu, 13 Jan 2022 11:54:56 +0800
Subject: [PATCH 19/35] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E5=9C=A8=E5=90=84=E4=B8=AA=E8=A1=A8=E4=B8=AD=E5=8F=AF=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=8F=AF=E4=B8=8D=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/static/assets/js/project_final.js |  2 +-
 .../resources/static/assets/js/project_settle.js     |  4 ++--
 .../static/assets/js/project_settle_valid.js         | 12 ------------
 .../resources/templates/admin/project_approve.ftl    |  4 ++--
 .../templates/admin/project_budget_edit.ftl          | 12 ++++++------
 .../templates/admin/project_estimate_add.ftl         |  6 +++---
 .../templates/admin/project_estimate_edit.ftl        |  6 +++---
 .../resources/templates/admin/project_final_add.ftl  | 10 +++++-----
 .../resources/templates/admin/project_final_edit.ftl | 10 +++++-----
 .../resources/templates/admin/project_settle_add.ftl | 10 +++++-----
 .../templates/admin/project_settle_edit.ftl          | 10 +++++-----
 11 files changed, 37 insertions(+), 49 deletions(-)

diff --git a/src/main/resources/static/assets/js/project_final.js b/src/main/resources/static/assets/js/project_final.js
index c866607..ac54375 100644
--- a/src/main/resources/static/assets/js/project_final.js
+++ b/src/main/resources/static/assets/js/project_final.js
@@ -290,7 +290,7 @@ function calCostFinalTotal() {
     var costFinalTotal = $("input[name='costFinalTotal']");
 
     if (costPurchaseDeviceFinalTotal && costPurchaseBuildFinalTotal && costPurchaseServiceFinalTotal &&
-        costPurchaseOtherFinalTotal && costProjectManageFinalTotal && costOtherFinalTotal) {
+        costPurchaseOtherFinalTotal && costProjectManageFinalTotal) {
         costFinalTotal.val(f2Fixed(f2(costPurchaseDeviceFinalTotal) + f2(costPurchaseBuildFinalTotal) + f2(costPurchaseServiceFinalTotal) +
             f2(costPurchaseOtherFinalTotal) + f2(costProjectManageFinalTotal) + f2(costOtherFinalTotal)));
     } else {
diff --git a/src/main/resources/static/assets/js/project_settle.js b/src/main/resources/static/assets/js/project_settle.js
index d73e7a4..bc7aeed 100644
--- a/src/main/resources/static/assets/js/project_settle.js
+++ b/src/main/resources/static/assets/js/project_settle.js
@@ -405,7 +405,7 @@ function calCostOtherSettleTotal() {
 
     var costOtherSettleTotal = $("input[name='costOtherSettleTotal']");
 
-    if(costOtherFormerSettleTotal && costOther){
+    if(costOtherFormerSettleTotal){
         costOtherSettleTotal.val(f2Fixed(f2(costOtherFormerSettleTotal)+f2(costOther)));
     }else {
         costOtherSettleTotal.val("");
@@ -425,7 +425,7 @@ function calCostTotal() {
 
     var costTotal = $("input[name='costTotal']");
 
-    if(costPurchaseDevice && costPurchaseBuild && costPurchaseService && costPurchaseOther && costProjectManage && costOther){
+    if(costPurchaseDevice && costPurchaseBuild && costPurchaseService && costPurchaseOther && costProjectManage){
         costTotal.val(f2Fixed(f2(costPurchaseDevice)+f2(costPurchaseBuild)+f2(costPurchaseService)+f2(costPurchaseOther)+f2(costProjectManage)+f2(costOther)));
     }else {
         costTotal.val("");
diff --git a/src/main/resources/static/assets/js/project_settle_valid.js b/src/main/resources/static/assets/js/project_settle_valid.js
index 096ad17..175d6a8 100644
--- a/src/main/resources/static/assets/js/project_settle_valid.js
+++ b/src/main/resources/static/assets/js/project_settle_valid.js
@@ -125,18 +125,6 @@ var costProjectManageValid = function() {
     return true;
 };
 
-var costOtherValid = function() {
-    var month = $("input[name='costOther']").val();
-    if (month == "") {
-        layui.use('layer', function(){
-            var layer = layui.layer;
-            layer.alert("请填入本月其他成本数据");
-        });
-        return false;
-    }
-    return true;
-};
-
 var costTotalValid = function() {
     var settle = $("input[name='costSettleTotal']").val();
     var budget = $("input[name='costBudgetTotal']").val();
diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index 6f86f88..fe7089d 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -674,7 +674,7 @@
                                 <tr>
                                     <td>月份</td>
                                     <td>设备支出</td>
-                                    <td>工程支出</td>
+                                    <td>工程支出（含服务+施工+其他）</td>
                                     <td>经营性开支</td>
                                     <td>保证金支出</td>
                                     <td>支出合计</td>
@@ -2046,7 +2046,7 @@
                                 <tr>
                                     <td>月份</td>
                                     <td>设备支出</td>
-                                    <td>工程支出</td>
+                                    <td>工程支出（含服务+施工+其他）</td>
                                     <td>经营性开支</td>
                                     <td>保证金支出</td>
                                     <td>支出合计</td>
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index 6c9f2ee..911b925 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -300,8 +300,8 @@
                         <td>成本</td>
                         <td>其他</td>
                         <td>${project.otherName!}</td>
-                        <td><input type="text" class="number" name="costOtherOtherTaxInclude1" value="${Utils.format(estimateBean.costOtherOtherTaxInclude)}" required readonly></td>
-                        <td><input type="text" class="number" name="costOtherOtherTaxExclude1" value="${Utils.format(estimateBean.costOtherOtherTaxExclude)}" required readonly></td>
+                        <td><input type="text" class="number" name="costOtherOtherTaxInclude1" value="${Utils.format(estimateBean.costOtherOtherTaxInclude)}" readonly></td>
+                        <td><input type="text" class="number" name="costOtherOtherTaxExclude1" value="${Utils.format(estimateBean.costOtherOtherTaxExclude)}" readonly></td>
                     </tr>
                     <tr>
                         <td>合计</td>
@@ -558,7 +558,7 @@
                         <tr>
                             <td>月份</td>
                             <td>设备支出</td>
-                            <td>工程支出</td>
+                            <td>工程支出（含服务+施工+其他）</td>
                             <td>经营性开支</td>
                             <td>保证金支出</td>
                             <td>支出合计</td>
@@ -743,9 +743,9 @@
                         <td>成本</td>
                         <td>其他</td>
                         <td><input type="text" id="otherName" maxlength="6" data-validate-async data-validation-message="请输入其他中的小类名称（10字符以内）"
-                                   value="${project.otherName!}" name="otherName" placeholder="请输入其他中的小类名称（10字符以内）" readonly required/> </td>
-                        <td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxInclude" value="${Utils.format(budgetBean.costOtherOtherTaxInclude,'0')}" required title="其他含税总额（填入）"></td>
-                        <td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxExclude" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0')}" required title="其他不含税总额（填入）"></td>
+                                   value="${project.otherName!}" name="otherName" placeholder="请输入其他中的小类名称（10字符以内）"/> </td>
+                        <td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxInclude" value="${Utils.format(budgetBean.costOtherOtherTaxInclude,'0')}" title="其他含税总额（填入）"></td>
+                        <td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxExclude" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0')}" title="其他不含税总额（填入）"></td>
                     </tr>
                     <tr>
                         <td>合计</td>
diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl
index d6f07d2..62e8506 100644
--- a/src/main/resources/templates/admin/project_estimate_add.ftl
+++ b/src/main/resources/templates/admin/project_estimate_add.ftl
@@ -358,9 +358,9 @@
                                     <td>成本</td>
                                     <td>其他</td>
                                     <td><input type="text" id="otherName" maxlength="10" data-validate-async data-validation-message="请输入其他类的名称（10字符以内）"
-                                               value="" name="otherName" placeholder="请输入其他类的名称（10字符以内）" required/> </td>
-                                    <td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxInclude" required></td>
-                                    <td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxExclude" readonly required></td>
+                                               value="" name="otherName" placeholder="请输入其他类的名称（10字符以内）"/> </td>
+                                    <td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxInclude"></td>
+                                    <td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxExclude" readonly></td>
                                     <td>
                                         <select data-am-selected name="costOtherOtherSelect" id="costOtherOtherSelect">
                                             <option value="请选择税率">请选择税率</option>
diff --git a/src/main/resources/templates/admin/project_estimate_edit.ftl b/src/main/resources/templates/admin/project_estimate_edit.ftl
index a1c6dfb..7516f11 100644
--- a/src/main/resources/templates/admin/project_estimate_edit.ftl
+++ b/src/main/resources/templates/admin/project_estimate_edit.ftl
@@ -364,9 +364,9 @@
                             <td>成本</td>
                             <td>其他</td>
                             <td><input type="text" id="otherName" maxlength="10" data-validate-async data-validation-message="请输入其他类的名称（10字符以内）"
-                                       value="${project.otherName!}" name="otherName" placeholder="请输入其他类的名称（10字符以内）" required/> </td>
-                            <td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxInclude" value="${Utils.format(estimateBean.costOtherOtherTaxInclude)}" required></td>
-                            <td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxExclude" value="${Utils.format(estimateBean.costOtherOtherTaxExclude)}" <#if estimateBean.costOtherOtherSelect! !="自定义">readonly</#if> required></td>
+                                       value="${project.otherName!}" name="otherName" placeholder="请输入其他类的名称（10字符以内）"/> </td>
+                            <td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxInclude" value="${Utils.format(estimateBean.costOtherOtherTaxInclude)}"></td>
+                            <td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxExclude" value="${Utils.format(estimateBean.costOtherOtherTaxExclude)}" <#if estimateBean.costOtherOtherSelect! !="自定义">readonly</#if>></td>
                             <td>
                                 <select data-am-selected name="costOtherOtherSelect" id="costOtherOtherSelect">
                                     <option value="请选择税率">请选择税率</option>
diff --git a/src/main/resources/templates/admin/project_final_add.ftl b/src/main/resources/templates/admin/project_final_add.ftl
index 92caaa4..409fcbc 100644
--- a/src/main/resources/templates/admin/project_final_add.ftl
+++ b/src/main/resources/templates/admin/project_final_add.ftl
@@ -140,11 +140,11 @@
                         <td>成本</td>
                         <td>其他</td>
                         <td><input type="text" id="otherName" maxlength="10" data-validate-async data-validation-message="请输入其他中的小类名称（10字符以内）"
-                                   value="${project.otherName!}" name="otherName" placeholder="请输入其他中的小类名称（10字符以内）" readonly required/> </td>
-                        <td><input name="costOtherOtherTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本概算总额"></td>
-                        <td><input name="costOtherOtherTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本预算总额"></td>
-                        <td><input name="costOtherSettleTotal" value="${Utils.format(settleBean.costOtherOtherTaxExclude,'0')}" type="text" class="number" type="text" class="number"readonly required title="其他成本结算总额"></td>
-                        <td><input name="costOtherFinalTotal" type="text" class="number" maxlength="16" required title="其他成本决算总额"></td>
+                                   value="${project.otherName!}" name="otherName" placeholder="请输入其他中的小类名称（10字符以内）"/> </td>
+                        <td><input name="costOtherOtherTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costOtherOtherTaxExclude,'0.00')}" readonly title="其他成本概算总额"></td>
+                        <td><input name="costOtherOtherTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0.00')}" readonly title="其他成本预算总额"></td>
+                        <td><input name="costOtherSettleTotal" value="${Utils.format(settleBean.costOtherOtherTaxExclude,'0.00')}" type="text" class="number" readonly  title="其他成本结算总额"></td>
+                        <td><input name="costOtherFinalTotal" type="text" class="number" maxlength="16" 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 1ddf0ca..f926a6d 100644
--- a/src/main/resources/templates/admin/project_final_edit.ftl
+++ b/src/main/resources/templates/admin/project_final_edit.ftl
@@ -140,11 +140,11 @@
                         <td>成本</td>
                         <td>其他</td>
                         <td><input type="text" id="otherName" maxlength="10" data-validate-async data-validation-message="请输入其他中的小类名称（10字符以内）"
-                                   value="${project.otherName!}" name="otherName" placeholder="请输入其他中的小类名称（10字符以内）" readonly required/> </td>
-                        <td><input name="costOtherOtherTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本概算总额"></td>
-                        <td><input name="costOtherOtherTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本预算总额"></td>
-                        <td><input name="costOtherSettleTotal" value="${Utils.format(settleBean.costOtherOtherTaxExclude,'0')}" type="text" class="number" type="text" class="number"readonly required title="其他成本结算总额"></td>
-                        <td><input name="costOtherFinalTotal" type="text" class="number" maxlength="16" value="${Utils.format(finalBean.costOtherFinalTotal,'0')}" required title="其他成本决算总额"></td>
+                                   value="${project.otherName!}" name="otherName" placeholder="请输入其他中的小类名称（10字符以内）"/> </td>
+                        <td><input name="costOtherOtherTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costOtherOtherTaxExclude,'0.00')}" readonly title="其他成本概算总额"></td>
+                        <td><input name="costOtherOtherTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0.00')}" readonly title="其他成本预算总额"></td>
+                        <td><input name="costOtherSettleTotal" value="${Utils.format(settleBean.costOtherOtherTaxExclude,'0.00')}" type="text" class="number" readonly title="其他成本结算总额"></td>
+                        <td><input name="costOtherFinalTotal" type="text" class="number" maxlength="16" value="${Utils.format(finalBean.costOtherFinalTotal,'0.00')}" title="其他成本决算总额"></td>
                     </tr>
                     <tr>
                         <td>合计</td>
diff --git a/src/main/resources/templates/admin/project_settle_add.ftl b/src/main/resources/templates/admin/project_settle_add.ftl
index 38c8ef0..02e1ab5 100644
--- a/src/main/resources/templates/admin/project_settle_add.ftl
+++ b/src/main/resources/templates/admin/project_settle_add.ftl
@@ -164,11 +164,11 @@
                         <td>成本</td>
                         <td>其他</td>
                         <td><input type="text" id="otherName" maxlength="10" data-validate-async data-validation-message="请输入其他中的小类名称（10字符以内）"
-                                   value="${project.otherName!}" name="otherName" placeholder="请输入其他中的小类名称（10字符以内）" readonly required/> </td>
-                        <td><input name="costOtherEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本概算总额"></td>
-                        <td><input name="costOtherBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本预算总额"></td>
-                        <td><input name="costOtherFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costOtherOtherTaxExclude,'0')}" required readonly title="其他成本上月结算总额"></td>
-                        <td><input type="text" class="number" maxlength="16" name="costOther" required title="其他成本本月结算金额"></td>
+                                   value="${project.otherName!}" name="otherName" placeholder="请输入其他中的小类名称（10字符以内）"/> </td>
+                        <td><input name="costOtherEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costOtherOtherTaxExclude,'0.00')}" readonly title="其他成本概算总额"></td>
+                        <td><input name="costOtherBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0.00')}" readonly title="其他成本预算总额"></td>
+                        <td><input name="costOtherFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costOtherOtherTaxExclude,'0.00')}" readonly title="其他成本上月结算总额"></td>
+                        <td><input type="text" class="number" maxlength="16" name="costOther" title="其他成本本月结算金额"></td>
                         <td><input type="text" class="number" name="costOtherSettleTotal" readonly title="其他成本结算总额"></td>
                     </tr>
                     <tr>
diff --git a/src/main/resources/templates/admin/project_settle_edit.ftl b/src/main/resources/templates/admin/project_settle_edit.ftl
index 7062922..c5a3434 100644
--- a/src/main/resources/templates/admin/project_settle_edit.ftl
+++ b/src/main/resources/templates/admin/project_settle_edit.ftl
@@ -162,11 +162,11 @@
                         <td>成本</td>
                         <td>其他</td>
                         <td><input type="text" id="otherName" maxlength="10" data-validate-async data-validation-message="请输入其他中的小类名称（10字符以内）"
-                                   value="${project.otherName!}" name="otherName" placeholder="请输入其他中的小类名称（10字符以内）" readonly required/> </td>
-                        <td><input name="costOtherEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本概算总额"></td>
-                        <td><input name="costOtherBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本预算总额"></td>
-                        <td><input name="costOtherFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costOtherOtherTaxExclude,'0')}" required readonly title="其他成本上月结算总额"></td>
-                        <td><input type="text" class="number" maxlength="16" name="costOther" value="${Utils.format(monthBean.costOther,'0')}" required title="其他成本本月结算金额"></td>
+                                   value="${project.otherName!}" name="otherName" placeholder="请输入其他中的小类名称（10字符以内）"/> </td>
+                        <td><input name="costOtherEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costOtherOtherTaxExclude,'0.00')}" readonly title="其他成本概算总额"></td>
+                        <td><input name="costOtherBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0.00')}" readonly title="其他成本预算总额"></td>
+                        <td><input name="costOtherFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costOtherOtherTaxExclude,'0.00')}" readonly title="其他成本上月结算总额"></td>
+                        <td><input type="text" class="number" maxlength="16" name="costOther" value="${Utils.format(monthBean.costOther,'0.00')}" title="其他成本本月结算金额"></td>
                         <td><input type="text" class="number" name="costOtherSettleTotal" value="${Utils.format(currentBean.costOtherOtherTaxExclude,'0')}" readonly title="其他成本结算总额"></td>
                     </tr>
                     <tr>

From a0eb41ea6ae17a5403a4acbce1d51b4646c6c7f0 Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Thu, 13 Jan 2022 15:33:01 +0800
Subject: [PATCH 20/35] =?UTF-8?q?=E9=A2=84=E7=AE=97=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=BA=8F=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/static/assets/js/project_budget.js    | 13 +++++++++++++
 .../static/assets/js/project_budget_cost.js         |  7 ++++++-
 .../assets/js/project_budget_cost_project_manage.js |  4 ++++
 .../static/assets/js/project_budget_income.js       |  3 +++
 .../static/assets/js/project_budget_plan.js         |  1 -
 .../resources/templates/admin/project_approve.ftl   |  6 ++++++
 .../templates/admin/project_budget_edit.ftl         |  8 +++++++-
 7 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/static/assets/js/project_budget.js b/src/main/resources/static/assets/js/project_budget.js
index e9a45ca..3aa96d4 100644
--- a/src/main/resources/static/assets/js/project_budget.js
+++ b/src/main/resources/static/assets/js/project_budget.js
@@ -1,4 +1,5 @@
 INCOME_DETAIL={
+    "num":[false,"序号","string"],
     "type":[true,"类别","string"],
     "name":[true,"名称","string"],
     "unit":[true,"单位","string"],
@@ -10,6 +11,7 @@ INCOME_DETAIL={
 };
 
 COST_DETAIL={
+    "num":[false,"序号","string"],
     "type":[true,"大类","string"],
     "category":[true,"类别","string"],
     "name":[true,"名称","string"],
@@ -22,6 +24,7 @@ COST_DETAIL={
 };
 
 COST_PROJECT_MANAGE_DETAIL={
+    "num":[false,"序号","string"],
     "type":[true,"财务费用类别","string"],
     "name1":[false,"业务项目","string"],
     "name2":[false,"业务项目","string"],
@@ -476,6 +479,16 @@ function bindChangeableInput() {
     });
 }
 
+/**
+ * 绑定序号
+ */
+function bindNum() {
+    $(".input-budget-num").each(function(t) {
+        var prevIndex = $(this).parent().parent().prev("tr").find(".input-budget-num").val();
+        $(this).val(f2(prevIndex) + 1);
+    });
+}
+
 /**
  * 校验项目贡献利润率必须大于阀值
  * 低于阀值就返回提示信息，否则返回""
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 354971d..57a3a1d 100644
--- a/src/main/resources/static/assets/js/project_budget_cost.js
+++ b/src/main/resources/static/assets/js/project_budget_cost.js
@@ -3,6 +3,7 @@
  */
 //COST_DETAIL_ARR=["type","category","name","unit","amount","price","taxRate","totalTaxInclude","totalTaxExclude"];
 COST_DETAIL={
+    "num":[false,"序号","string"],
     "type":[true,"大类","string"],
     "category":[true,"类别","string"],
     "name":[true,"名称","string"],
@@ -161,7 +162,9 @@ function appendTrCost() {
         options+='<option value="'+e.id+'">'+e.name+'</option>\r\n';
     });
 
-    var template = '<tr><td><select style="width: 82px;float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-type">'+
+    var template = '<tr>' +
+        '<td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-budget-num" readonly></td>' +
+        '<td><select style="width: 82px;float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-type">'+
         '<option value="xxxx" disabled selected>--请选择--</option>'+
         '<option value="1">设备</option>'+
         '<option value="2">施工</option>'+
@@ -198,6 +201,8 @@ function appendTrCost() {
     $("#costTable").append(template);
     //重新绑定删除事件和input修改事件
     bindDeleteBtn();
+    //绑定序号
+    bindNum();
     //重新绑定
     bindChangeableInput();
     //绑定采购明细中select联动事件
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 58a5946..99ca14f 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
@@ -3,6 +3,7 @@
  */
 //COST_PROJECT_MANAGE_DETAIL_ARR=["type","name","detail","unit","amount","price","total","predictMethod","predictWhy","remark","deletable"];
 COST_PROJECT_MANAGE_DETAIL={
+    "num":[false,"序号","string"],
     "type":[true,"财务费用类别","string"],
     "name1":[false,"业务项目","string"],
     "name2":[false,"业务项目","string"],
@@ -96,6 +97,7 @@ $(function () {
  */
 function appendTrCostProjectManage() {
     var template = '<tr>\n' +
+        '        <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-budget-num" readonly></td>\n' +
         '        <td>\n' +
         '            <select style="width: 80px;float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage am-modal-prompt-input-cost-project-manage-type">\n' +
         '                <option value="xxxx" disabled selected>--请选择--</option>\n' +
@@ -130,6 +132,8 @@ function appendTrCostProjectManage() {
     $("#costProjectManageTable").append(template);
     //重新绑定删除事件和input修改事件
     bindDeleteBtn();
+    //绑定序号
+    bindNum();
     bindChangeableInputProjectManage();
     bindTypeSelectChangeManager();
     //绑定数字输入框保留两位小数
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 be2a664..a433273 100644
--- a/src/main/resources/static/assets/js/project_budget_income.js
+++ b/src/main/resources/static/assets/js/project_budget_income.js
@@ -3,6 +3,7 @@
  */
 //INCOME_DETAIL_ARR=["type","name","unit","amount","price","taxRate","totalTaxInclude","totalTaxExclude"];
 INCOME_DETAIL={
+    "num":[false,"序号","string"],
     "type":[true,"类别","string"],
     "name":[true,"名称","string"],
     "unit":[true,"单位","string"],
@@ -127,6 +128,7 @@ function updateIncomeData(data,returnData) {
  */
 function appendTrIncome() {
     var template = '<tr>\n' +
+        '                        <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income input-budget-num" readonly></td>\n' +
         '                        <td>\n' +
         '                            <select style="width: 80px;float: left;" class="am-modal-prompt-input am-modal-prompt-input-income">\n' +
         '                                <option value="1">设备类</option>\n' +
@@ -146,6 +148,7 @@ function appendTrIncome() {
     $("#incomeTable").append(template);
     //重新绑定删除事件和input修改事件
     bindDeleteBtn();
+    bindNum();
     bindChangeableInput();
     //绑定数字输入框保留两位小数
     bindNumberInput();
diff --git a/src/main/resources/static/assets/js/project_budget_plan.js b/src/main/resources/static/assets/js/project_budget_plan.js
index d0a8d7a..965db6d 100644
--- a/src/main/resources/static/assets/js/project_budget_plan.js
+++ b/src/main/resources/static/assets/js/project_budget_plan.js
@@ -515,7 +515,6 @@ function calUnderwrittenPlan(income, cost, prevFundBalance) {
  */
 function updateEachRepaymentPlan() {
     var total = 0;
-    console.log("total: " + total);
     //找到每个月的回款计划输入框
     $(".input-changeable-repayment-plan-budget-plan").each(function (t) {
         //找到当前月的收入和支出
diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index fe7089d..86ceb9e 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -434,6 +434,7 @@
                                    id="incomeTable">
                                 <tbody>
                                 <tr>
+                                    <td>序号</td>
                                     <td>类别</td>
                                     <td>名称</td>
                                     <td>单位</td>
@@ -448,6 +449,7 @@
                                 <#if incomeDetails??>
                                     <#list incomeDetails as incomeDetail>
                                         <tr>
+                                            <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income input-budget-num" value="${(incomeDetail_index+1)!}" readonly></td>
                                             <td>
                                                 <#--<select style="width: auto" readonly
                                                         class="am-modal-prompt-input am-modal-prompt-input-income">
@@ -505,6 +507,7 @@
                                    id="costTable">
                                 <tbody>
                                 <tr>
+                                    <td>序号</td>
                                     <td>大类</td>
                                     <td>类别</td>
                                     <td>名称</td>
@@ -520,6 +523,7 @@
                                 <#if costDetails??>
                                     <#list costDetails as costDetail>
                                         <tr>
+                                            <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-budget-num" value="${(costDetail_index+1)!}" readonly></td>
                                             <td>
                                                 <#--<select style="width: auto" readonly
                                                         class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-type">
@@ -586,6 +590,7 @@
                                    id="costProjectManageTable">
                                 <tbody>
                                 <tr>
+                                    <td>序号</td>
                                     <td>财务费用类别</td>
                                     <td>业务项目</td>
                                     <td>项目明细</td>
@@ -602,6 +607,7 @@
                                 <#if costProjectManageDetails??>
                                     <#list costProjectManageDetails as costProjectManageDetail>
                                         <tr>
+                                            <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-budget-num" value="${(costProjectManageDetail_index+1)!}" readonly></td>
                                             <td>
                                                 <#--<select style="width: auto"
                                                         class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index 911b925..93fc774 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -368,6 +368,7 @@
                     <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;" id="incomeTable">
                         <tbody>
                         <tr>
+                            <td>序号</td>
                             <td>类别</td>
                             <td>名称</td>
                             <td>单位</td>
@@ -380,8 +381,9 @@
                         </tr>
 
                         <#if incomeDetails??>
-                            <#list incomeDetails as incomeDetail>+
+                            <#list incomeDetails as incomeDetail>
                                 <tr>
+                                    <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income input-budget-num" value="${(incomeDetail_index+1)!}" readonly></td>
                                     <td>
                                         <select style="width: 80px;float: left;" class="am-modal-prompt-input am-modal-prompt-input-income">
                                             <option value="1" <#if incomeDetail.type == 1>selected</#if>>设备类</option>
@@ -418,6 +420,7 @@
                     <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;" id="costTable">
                         <tbody>
                         <tr>
+                            <td>序号</td>
                             <td>大类</td>
                             <td>类别</td>
                             <td>名称</td>
@@ -433,6 +436,7 @@
                         <#if costDetails??>
                             <#list costDetails as costDetail>
                                 <tr>
+                                    <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-budget-num" value="${(costDetail_index+1)!}" readonly></td>
                                     <td>
                                         <select style="width: 80px;float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-type">
                                             <option value="1" <#if costDetail.type == 1>selected</#if>>设备</option>
@@ -485,6 +489,7 @@
                     <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;" id="costProjectManageTable">
                         <tbody>
                         <tr>
+                            <td>序号</td>
                             <td>财务费用类别</td>
                             <td>业务项目</td>
                             <td>项目明细</td>
@@ -500,6 +505,7 @@
                         <#if costProjectManageDetails??>
                             <#list costProjectManageDetails as costProjectManageDetail>
                                 <tr>
+                                    <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-budget-num" value="${(costProjectManageDetail_index+1)!}" readonly></td>
                                     <td>
                                         <select style="width: 80px;float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage am-modal-prompt-input-cost-project-manage-type">
                                             <option value="1" <#if costProjectManageDetail.type == 1>selected</#if>>人工成本</option>

From 211a306d672ac4a2991286b5da7f5c337b590257 Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Thu, 13 Jan 2022 15:51:34 +0800
Subject: [PATCH 21/35] =?UTF-8?q?=E5=BA=8F=E5=8F=B7=E7=BB=91=E5=AE=9A?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/palmte/work/service/ProjectFinalSevice.java     | 5 ++---
 src/main/java/cn/palmte/work/service/ProjectService.java    | 3 ++-
 .../java/cn/palmte/work/service/ProjectSettleService.java   | 5 ++---
 src/main/resources/static/assets/js/project_budget.js       | 1 +
 src/main/resources/templates/admin/project_approve.ftl      | 6 +++---
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/cn/palmte/work/service/ProjectFinalSevice.java b/src/main/java/cn/palmte/work/service/ProjectFinalSevice.java
index 455eec5..671c5b1 100644
--- a/src/main/java/cn/palmte/work/service/ProjectFinalSevice.java
+++ b/src/main/java/cn/palmte/work/service/ProjectFinalSevice.java
@@ -9,7 +9,6 @@ import org.springframework.transaction.annotation.Transactional;
 import top.jfunc.common.utils.CollectionUtil;
 
 import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -61,14 +60,14 @@ public class ProjectFinalSevice {
     @Transactional
     public void save(Project project, FinalBean finalBean) {
         clearAndSave(project, finalBean);
-        projectService.updateStatusAndApproveStatus(project.getId(), StatusEnum.FINAL_ACCOUNTS, ApproveStatusEnum.APPROVAL_UNCOMMIT);
+        projectService.updateStatusAndApproveStatus(project.getId(), StatusEnum.FINAL_ACCOUNTS, ApproveStatusEnum.APPROVAL_UNCOMMIT, project.getOtherName());
     }
 
     @Transactional
     public void saveAndApprove(Project project, FinalBean finalBean) throws Exception {
         clearAndSave(project, finalBean);
         //更新项目和审批状态
-        projectService.updateStatusAndApproveStatus(project.getId(), StatusEnum.FINAL_ACCOUNTS, ApproveStatusEnum.APPROVAL_PENDING);
+        projectService.updateStatusAndApproveStatus(project.getId(), StatusEnum.FINAL_ACCOUNTS, ApproveStatusEnum.APPROVAL_PENDING, project.getOtherName());
         //发起流程
         projectInstanceService.startFinalProcessInstance(project.getId(), InterfaceUtil.getAdmin());
     }
diff --git a/src/main/java/cn/palmte/work/service/ProjectService.java b/src/main/java/cn/palmte/work/service/ProjectService.java
index d04fc07..c472021 100644
--- a/src/main/java/cn/palmte/work/service/ProjectService.java
+++ b/src/main/java/cn/palmte/work/service/ProjectService.java
@@ -215,10 +215,11 @@ public class ProjectService {
     /**
      * 更新项目状态和审批状态
      */
-    public void updateStatusAndApproveStatus(int projectId, StatusEnum statusEnum, ApproveStatusEnum approveStatusEnum) {
+    public void updateStatusAndApproveStatus(int projectId, StatusEnum statusEnum, ApproveStatusEnum approveStatusEnum, String otherName) {
         Project one = projectRepository.findOne(projectId);
         one.setStatus(statusEnum.getStatus());
         one.setStatusDesc(statusEnum.getStatusDesc());
+        one.setOtherName(otherName);
 
         int approveStatus = approveStatusEnum.getApproveStatus();
         switch (statusEnum) {
diff --git a/src/main/java/cn/palmte/work/service/ProjectSettleService.java b/src/main/java/cn/palmte/work/service/ProjectSettleService.java
index 216c030..5e4ce52 100644
--- a/src/main/java/cn/palmte/work/service/ProjectSettleService.java
+++ b/src/main/java/cn/palmte/work/service/ProjectSettleService.java
@@ -11,7 +11,6 @@ import top.jfunc.common.utils.CollectionUtil;
 
 import java.math.BigDecimal;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -47,13 +46,13 @@ public class ProjectSettleService {
     public void save(Project project, SettleBean settleBean, BudgetSettleBean budgetBean, EstimateSettleBean estimateBean, String time) {
         step(project, settleBean, budgetBean, estimateBean, time);
 
-        projectService.updateStatusAndApproveStatus(project.getId(), StatusEnum.SETTLE_ACCOUNTS, ApproveStatusEnum.APPROVAL_UNCOMMIT);
+        projectService.updateStatusAndApproveStatus(project.getId(), StatusEnum.SETTLE_ACCOUNTS, ApproveStatusEnum.APPROVAL_UNCOMMIT, project.getOtherName());
     }
 
     public void saveAndApprove(Project project, SettleBean settleBean, BudgetSettleBean budgetBean, EstimateSettleBean estimateBean, String time) throws Exception{
         step(project, settleBean, budgetBean, estimateBean, time);
 
-        projectService.updateStatusAndApproveStatus(project.getId(), StatusEnum.SETTLE_ACCOUNTS, ApproveStatusEnum.APPROVAL_PENDING);
+        projectService.updateStatusAndApproveStatus(project.getId(), StatusEnum.SETTLE_ACCOUNTS, ApproveStatusEnum.APPROVAL_PENDING, project.getOtherName());
 
         //发起结算流程
         projectInstanceService.startSettleProcessInstance(project, InterfaceUtil.getAdmin());
diff --git a/src/main/resources/static/assets/js/project_budget.js b/src/main/resources/static/assets/js/project_budget.js
index 3aa96d4..0bc0eec 100644
--- a/src/main/resources/static/assets/js/project_budget.js
+++ b/src/main/resources/static/assets/js/project_budget.js
@@ -369,6 +369,7 @@ function bindDeleteBtn() {
     $(".am-modal-line-delete").click(function () {
         //删除自己对应的tr
         $(this).parent().parent().remove();
+        bindNum();
     });
 }
 
diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index 86ceb9e..49c7f2a 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -449,7 +449,7 @@
                                 <#if incomeDetails??>
                                     <#list incomeDetails as incomeDetail>
                                         <tr>
-                                            <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income input-budget-num" value="${(incomeDetail_index+1)!}" readonly></td>
+                                            <td>${(incomeDetail_index+1)!}</td>
                                             <td>
                                                 <#--<select style="width: auto" readonly
                                                         class="am-modal-prompt-input am-modal-prompt-input-income">
@@ -523,7 +523,7 @@
                                 <#if costDetails??>
                                     <#list costDetails as costDetail>
                                         <tr>
-                                            <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-budget-num" value="${(costDetail_index+1)!}" readonly></td>
+                                            <td>${(costDetail_index+1)!}</td>
                                             <td>
                                                 <#--<select style="width: auto" readonly
                                                         class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-type">
@@ -607,7 +607,7 @@
                                 <#if costProjectManageDetails??>
                                     <#list costProjectManageDetails as costProjectManageDetail>
                                         <tr>
-                                            <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-budget-num" value="${(costProjectManageDetail_index+1)!}" readonly></td>
+                                            <td>${(costProjectManageDetail_index+1)!}</td>
                                             <td>
                                                 <#--<select style="width: auto"
                                                         class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"

From a2c5bac0023e825f65bf7eef4af96d2069dcf991 Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Thu, 13 Jan 2022 16:11:54 +0800
Subject: [PATCH 22/35] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E7=9A=84=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/static/assets/js/project_settle_valid.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/static/assets/js/project_settle_valid.js b/src/main/resources/static/assets/js/project_settle_valid.js
index 175d6a8..bd6771c 100644
--- a/src/main/resources/static/assets/js/project_settle_valid.js
+++ b/src/main/resources/static/assets/js/project_settle_valid.js
@@ -1,7 +1,7 @@
 var valid = function() {
     return incomeDeviceValid() && incomeEngineerValid() && incomeServiceValid() && incomeTotalValid()
         && costPurchaseDeviceValid() && costPurchaseBuildValid() && costPurchaseServiceValid() && costPurchaseOtherValid()
-        && costProjectManageValid() && costOtherValid() && costTotalValid() && costExpropriationValid()
+        && costProjectManageValid() && costTotalValid() && costExpropriationValid()
         && costCompanyManageValid() && costIncomeTaxValid() && saleIncomeCashValid() && taxReturnValid()
         && earnestMoneyIncomeValid() && purchaseCostValid() && taxCostValid() && earnestMoneyCostValid()
         && cashInflowFromInvestingActivitiesValid() && cashOutflowFromInvestingActivitiesValid()

From b403ec48f2e9bfe8f30417edaeff668730670e31 Mon Sep 17 00:00:00 2001
From: hanbo <2608504783@qq.com>
Date: Thu, 13 Jan 2022 16:15:11 +0800
Subject: [PATCH 23/35] =?UTF-8?q?=E6=A6=82=E7=AE=97=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/admin/project_estimate_add.ftl     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl
index 62e8506..52e1ce8 100644
--- a/src/main/resources/templates/admin/project_estimate_add.ftl
+++ b/src/main/resources/templates/admin/project_estimate_add.ftl
@@ -200,7 +200,7 @@
                                     <td>收入</td>
                                     <td>设备类</td>
                                     <td><input type="text" class="number" maxlength="16" name="incomeDeviceTaxInclude" required></td>
-                                    <td><input type="text" class="number" maxlength="16" name="incomeDeviceTaxExclude" readonly required></td>
+                                    <td><input type="text" class="number" maxlength="16" name="incomeDeviceTaxExclude" readonly></td>
                                     <td>
                                         <select data-am-selected name="incomeDeviceSelect" id="incomeDeviceSelect">
                                         <option value="请选择税率">请选择税率</option>
@@ -218,7 +218,7 @@
                                     <td>收入</td>
                                     <td>工程类</td>
                                     <td><input type="text" class="number" maxlength="16" name="incomeEngineerTaxInclude" required></td>
-                                    <td><input type="text" class="number" maxlength="16" name="incomeEngineerTaxExclude" readonly required></td>
+                                    <td><input type="text" class="number" maxlength="16" name="incomeEngineerTaxExclude" readonly></td>
                                     <td>
                                         <select data-am-selected name="incomeEngineerSelect" id="incomeEngineerSelect">
                                             <option value="请选择税率">请选择税率</option>
@@ -236,7 +236,7 @@
                                     <td>收入</td>
                                     <td>服务类</td>
                                     <td><input type="text" class="number" maxlength="16" name="incomeServiceTaxInclude" required></td>
-                                    <td><input type="text" class="number" maxlength="16" name="incomeServiceTaxExclude" readonly required></td>
+                                    <td><input type="text" class="number" maxlength="16" name="incomeServiceTaxExclude" readonly></td>
                                     <td>
                                         <select data-am-selected name="incomeServiceSelect" id="incomeServiceSelect">
                                             <option value="请选择税率">请选择税率</option>
@@ -275,7 +275,7 @@
                                     <td>采购成本</td>
                                     <td>设备</td>
                                     <td><input type="text" class="number" maxlength="16" name="costPurchaseDeviceTaxInclude" required></td>
-                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseDeviceTaxExclude" readonly required></td>
+                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseDeviceTaxExclude" readonly></td>
                                     <td>
                                         <select data-am-selected name="costPurchaseDeviceSelect" id="costPurchaseDeviceSelect">
                                             <option value="请选择税率">请选择税率</option>
@@ -294,7 +294,7 @@
                                     <td>采购成本</td>
                                     <td>施工</td>
                                     <td><input type="text" class="number" maxlength="16" name="costPurchaseBuildTaxInclude" required></td>
-                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseBuildTaxExclude" readonly required></td>
+                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseBuildTaxExclude" readonly></td>
                                     <td>
                                         <select data-am-selected name="costPurchaseBuildSelect" id="costPurchaseBuildSelect">
                                             <option value="请选择税率">请选择税率</option>
@@ -313,7 +313,7 @@
                                     <td>采购成本</td>
                                     <td>服务</td>
                                     <td><input type="text" class="number" maxlength="16" name="costPurchaseServiceTaxInclude" required></td>
-                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseServiceTaxExclude" readonly required></td>
+                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseServiceTaxExclude" readonly></td>
                                     <td>
                                         <select data-am-selected name="costPurchaseServiceSelect" id="costPurchaseServiceSelect">
                                             <option value="请选择税率">请选择税率</option>
@@ -332,7 +332,7 @@
                                     <td>采购成本</td>
                                     <td>其他</td>
                                     <td><input type="text" class="number" maxlength="16" name="costPurchaseOtherTaxInclude" required></td>
-                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseOtherTaxExclude" readonly required></td>
+                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseOtherTaxExclude" readonly></td>
                                     <td>
                                         <select data-am-selected name="costPurchaseOtherSelect" id="costPurchaseOtherSelect">
                                             <option value="请选择税率">请选择税率</option>
@@ -350,7 +350,7 @@
                                     <td>成本</td>
                                     <td>项目管理成本</td>
                                     <td>项目管理成本</td>
-                                    <td><input type="text" class="number" name="costProjectManageTaxInclude" required readonly></td>
+                                    <td><input type="text" class="number" name="costProjectManageTaxInclude" readonly></td>
                                     <td><input type="text" class="number" maxlength="16" name="costProjectManageTaxExclude" required></td>
                                     <td>/</td>
                                 </tr>

From 8ca296b7c0a48cf2df14da1be15856e2094a0c2a Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Thu, 13 Jan 2022 16:35:29 +0800
Subject: [PATCH 24/35] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=AF=B9=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96=E7=9A=84=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/palmte/work/bean/BudgetSettleBean.java |  2 +-
 .../palmte/work/bean/EstimateSettleBean.java  |  2 +-
 .../java/cn/palmte/work/bean/FinalBean.java   |  4 +--
 .../cn/palmte/work/bean/IncomeCostBean.java   |  6 +++++
 .../java/cn/palmte/work/bean/SettleBean.java  |  3 +++
 .../cn/palmte/work/bean/SettleMonthBean.java  |  3 +++
 .../templates/admin/project_approve.ftl       | 26 +++++++++----------
 .../templates/admin/project_estimate_edit.ftl |  4 +--
 .../templates/admin/project_settle_edit.ftl   |  2 +-
 9 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/src/main/java/cn/palmte/work/bean/BudgetSettleBean.java b/src/main/java/cn/palmte/work/bean/BudgetSettleBean.java
index 516c894..86b0747 100644
--- a/src/main/java/cn/palmte/work/bean/BudgetSettleBean.java
+++ b/src/main/java/cn/palmte/work/bean/BudgetSettleBean.java
@@ -232,7 +232,7 @@ public class BudgetSettleBean {
     }
 
     public BigDecimal getCostOtherBudgetTotal() {
-        return costOtherBudgetTotal;
+        return (costOtherBudgetTotal == null)?BigDecimal.ZERO:costOtherBudgetTotal;
     }
 
     public void setCostOtherBudgetTotal(BigDecimal costOtherBudgetTotal) {
diff --git a/src/main/java/cn/palmte/work/bean/EstimateSettleBean.java b/src/main/java/cn/palmte/work/bean/EstimateSettleBean.java
index 9e3b5ec..20d8c04 100644
--- a/src/main/java/cn/palmte/work/bean/EstimateSettleBean.java
+++ b/src/main/java/cn/palmte/work/bean/EstimateSettleBean.java
@@ -169,7 +169,7 @@ public class EstimateSettleBean {
     }
 
     public BigDecimal getCostOtherEstimateTotal() {
-        return costOtherEstimateTotal;
+        return (costOtherEstimateTotal == null)?BigDecimal.ZERO:costOtherEstimateTotal;
     }
 
     public void setCostOtherEstimateTotal(BigDecimal costOtherEstimateTotal) {
diff --git a/src/main/java/cn/palmte/work/bean/FinalBean.java b/src/main/java/cn/palmte/work/bean/FinalBean.java
index afe8d7f..ac80667 100644
--- a/src/main/java/cn/palmte/work/bean/FinalBean.java
+++ b/src/main/java/cn/palmte/work/bean/FinalBean.java
@@ -83,7 +83,7 @@ public class FinalBean {
         BigDecimal costOtherFinalTotal = getCostOtherFinalTotal();
 
         if (null == costPurchaseDeviceFinalTotal || null == costPurchaseBuildFinalTotal || null == costPurchaseServiceFinalTotal
-                || null == costPurchaseOtherFinalTotal || null == costProjectManageFinalTotal || null == costOtherFinalTotal) {
+                || null == costPurchaseOtherFinalTotal || null == costProjectManageFinalTotal) {
             return new BigDecimal(0);
         }
 
@@ -472,7 +472,7 @@ public class FinalBean {
     }
 
     public BigDecimal getCostOtherFinalTotal() {
-        return costOtherFinalTotal;
+        return (costOtherFinalTotal == null)?BigDecimal.ZERO:costOtherFinalTotal;
     }
 
     public void setCostOtherFinalTotal(BigDecimal costOtherFinalTotal) {
diff --git a/src/main/java/cn/palmte/work/bean/IncomeCostBean.java b/src/main/java/cn/palmte/work/bean/IncomeCostBean.java
index addaf3c..f2affd9 100644
--- a/src/main/java/cn/palmte/work/bean/IncomeCostBean.java
+++ b/src/main/java/cn/palmte/work/bean/IncomeCostBean.java
@@ -285,6 +285,9 @@ public abstract class IncomeCostBean {
     }
 
     public BigDecimal getCostOtherOtherTaxInclude() {
+        if (costOtherOtherTaxInclude == null) {
+            return BigDecimal.ZERO;
+        }
         return handleSpecial(costOtherOtherTaxInclude);
     }
 
@@ -333,6 +336,9 @@ public abstract class IncomeCostBean {
     }
 
     public BigDecimal getCostOtherOtherTaxExclude() {
+        if (costOtherOtherTaxExclude == null) {
+            return BigDecimal.ZERO;
+        }
         return handleSpecial(costOtherOtherTaxExclude);
     }
 
diff --git a/src/main/java/cn/palmte/work/bean/SettleBean.java b/src/main/java/cn/palmte/work/bean/SettleBean.java
index 9c30c55..a0f8b11 100644
--- a/src/main/java/cn/palmte/work/bean/SettleBean.java
+++ b/src/main/java/cn/palmte/work/bean/SettleBean.java
@@ -339,6 +339,9 @@ public class SettleBean {
     }
 
     public BigDecimal getCostOther() {
+        if (costOther == null) {
+            return BigDecimal.ZERO;
+        }
         return handleSpecial(costOther);
     }
 
diff --git a/src/main/java/cn/palmte/work/bean/SettleMonthBean.java b/src/main/java/cn/palmte/work/bean/SettleMonthBean.java
index 378bc8a..3b2da38 100644
--- a/src/main/java/cn/palmte/work/bean/SettleMonthBean.java
+++ b/src/main/java/cn/palmte/work/bean/SettleMonthBean.java
@@ -484,6 +484,9 @@ public class SettleMonthBean {
     }
 
     public BigDecimal getCostOther() {
+        if (costOther == null) {
+            return BigDecimal.ZERO;
+        }
         return handleSpecial(costOther);
     }
 
diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index 49c7f2a..b8bb805 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -355,8 +355,8 @@
                                     <td>成本</td>
                                     <td>其他</td>
                                     <td>${project.otherName!}</td>
-                                    <td><input type="text" class="number" name="costOtherOtherTaxInclude" value="${Utils.format(estimateBean.costOtherOtherTaxInclude)}" required readonly></td>
-                                    <td><input type="text" class="number" name="costOtherOtherTaxExclude" value="${Utils.format(estimateBean.costOtherOtherTaxExclude)}" required readonly></td>
+                                    <td><input type="text" class="number" name="costOtherOtherTaxInclude" value="${Utils.format(estimateBean.costOtherOtherTaxInclude, "0.00")}" required readonly></td>
+                                    <td><input type="text" class="number" name="costOtherOtherTaxExclude" value="${Utils.format(estimateBean.costOtherOtherTaxExclude, "0.00")}" required readonly></td>
                                 </tr>
                                 <tr>
                                     <td>合计</td>
@@ -901,8 +901,8 @@
                                     <td>成本</td>
                                     <td>其他</td>
                                     <td>${project.otherName!}</td>
-                                    <td><input type="text" class="number" name="costOtherOtherTaxInclude" value="${Utils.format(budgetBean.costOtherOtherTaxInclude,'0')}" required readonly title="其他含税总额（填入）"></td>
-                                    <td><input type="text" class="number" name="costOtherOtherTaxExclude" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0')}" required readonly title="其他不含税总额（填入）"></td>
+                                    <td><input type="text" class="number" name="costOtherOtherTaxInclude" value="${Utils.format(budgetBean.costOtherOtherTaxInclude,'0.00')}" required readonly title="其他含税总额（填入）"></td>
+                                    <td><input type="text" class="number" name="costOtherOtherTaxExclude" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0.00')}" required readonly title="其他不含税总额（填入）"></td>
                                 </tr>
                                 <tr>
                                     <td>合计</td>
@@ -1169,11 +1169,11 @@
                                     <td>成本</td>
                                     <td>其他</td>
                                     <td>${project.otherName!}</td>
-                                    <td><input name="costOtherEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateCostOther,'0')}" readonly required title="其他成本概算总额"></td>
-                                    <td><input name="costOtherBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetCostOther,'0')}" readonly required title="其他成本预算总额"></td>
-                                    <td><input name="costOtherFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costOtherOtherTaxExclude,'0')}" required readonly title="其他成本上月结算总额"></td>
-                                    <td><input type="text" class="number" name="costOther" value="${Utils.format(monthBean.costOther,'0')}" required readonly title="其他成本本月结算金额"></td>
-                                    <td><input type="text" class="number" name="costOtherSettleTotal" value="${Utils.format(currentBean.costOtherOtherTaxExclude,'0')}" readonly title="其他成本结算总额"></td>
+                                    <td><input name="costOtherEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateCostOther,'0.00')}" readonly required title="其他成本概算总额"></td>
+                                    <td><input name="costOtherBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetCostOther,'0.00')}" readonly required title="其他成本预算总额"></td>
+                                    <td><input name="costOtherFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costOtherOtherTaxExclude,'0.00')}" required readonly title="其他成本上月结算总额"></td>
+                                    <td><input type="text" class="number" name="costOther" value="${Utils.format(monthBean.costOther,'0.00')}" required readonly title="其他成本本月结算金额"></td>
+                                    <td><input type="text" class="number" name="costOtherSettleTotal" value="${Utils.format(currentBean.costOtherOtherTaxExclude,'0.00')}" readonly title="其他成本结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>合计</td>
@@ -1521,10 +1521,10 @@
                                     <td>成本</td>
                                     <td>其他</td>
                                     <td>${project.otherName!}</td>
-                                    <td><input name="costOtherOtherTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本概算总额"></td>
-                                    <td><input name="costOtherOtherTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本预算总额"></td>
-                                    <td><input name="costOtherSettleTotal" value="${Utils.format(currentBean.costOtherOtherTaxExclude,'0')}" type="text" class="number" type="text" class="number"readonly required title="其他成本结算总额"></td>
-                                    <td><input name="costOtherFinalTotal" type="text" class="number" value="${Utils.format(finalBean.costOtherFinalTotal,'0')}" required readonly title="其他成本决算总额"></td>
+                                    <td><input name="costOtherOtherTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costOtherOtherTaxExclude,'0.00')}" readonly required title="其他成本概算总额"></td>
+                                    <td><input name="costOtherOtherTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0.00')}" readonly required title="其他成本预算总额"></td>
+                                    <td><input name="costOtherSettleTotal" value="${Utils.format(currentBean.costOtherOtherTaxExclude,'0.00')}" type="text" class="number" readonly required title="其他成本结算总额"></td>
+                                    <td><input name="costOtherFinalTotal" type="text" class="number" value="${Utils.format(finalBean.costOtherFinalTotal,'0.00')}" required readonly title="其他成本决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>合计</td>
diff --git a/src/main/resources/templates/admin/project_estimate_edit.ftl b/src/main/resources/templates/admin/project_estimate_edit.ftl
index 7516f11..bd25d56 100644
--- a/src/main/resources/templates/admin/project_estimate_edit.ftl
+++ b/src/main/resources/templates/admin/project_estimate_edit.ftl
@@ -365,8 +365,8 @@
                             <td>其他</td>
                             <td><input type="text" id="otherName" maxlength="10" data-validate-async data-validation-message="请输入其他类的名称（10字符以内）"
                                        value="${project.otherName!}" name="otherName" placeholder="请输入其他类的名称（10字符以内）"/> </td>
-                            <td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxInclude" value="${Utils.format(estimateBean.costOtherOtherTaxInclude)}"></td>
-                            <td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxExclude" value="${Utils.format(estimateBean.costOtherOtherTaxExclude)}" <#if estimateBean.costOtherOtherSelect! !="自定义">readonly</#if>></td>
+                            <td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxInclude" value="${Utils.format(estimateBean.costOtherOtherTaxInclude, "0.00")}"></td>
+                            <td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxExclude" value="${Utils.format(estimateBean.costOtherOtherTaxExclude, "0.00")}" <#if estimateBean.costOtherOtherSelect! !="自定义">readonly</#if>></td>
                             <td>
                                 <select data-am-selected name="costOtherOtherSelect" id="costOtherOtherSelect">
                                     <option value="请选择税率">请选择税率</option>
diff --git a/src/main/resources/templates/admin/project_settle_edit.ftl b/src/main/resources/templates/admin/project_settle_edit.ftl
index c5a3434..86c25aa 100644
--- a/src/main/resources/templates/admin/project_settle_edit.ftl
+++ b/src/main/resources/templates/admin/project_settle_edit.ftl
@@ -167,7 +167,7 @@
                         <td><input name="costOtherBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0.00')}" readonly title="其他成本预算总额"></td>
                         <td><input name="costOtherFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costOtherOtherTaxExclude,'0.00')}" readonly title="其他成本上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="costOther" value="${Utils.format(monthBean.costOther,'0.00')}" title="其他成本本月结算金额"></td>
-                        <td><input type="text" class="number" name="costOtherSettleTotal" value="${Utils.format(currentBean.costOtherOtherTaxExclude,'0')}" readonly title="其他成本结算总额"></td>
+                        <td><input type="text" class="number" name="costOtherSettleTotal" value="${Utils.format(currentBean.costOtherOtherTaxExclude,'0.00')}" readonly title="其他成本结算总额"></td>
                     </tr>
                     <tr>
                         <td>合计</td>

From a0a576597a3203743dbbacd7563eb8802d2f8ae0 Mon Sep 17 00:00:00 2001
From: hanbo <2608504783@qq.com>
Date: Thu, 13 Jan 2022 17:26:30 +0800
Subject: [PATCH 25/35] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E9=A2=84=E7=AE=97?=
 =?UTF-8?q?=E8=A1=A8sheet=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/admin/project_approve.ftl       | 2441 +++++++++++------
 1 file changed, 1644 insertions(+), 797 deletions(-)

diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index b8bb805..baddc49 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -22,10 +22,10 @@
         /**
          审核通过
          */
-        .approve-passed{
-            position:absolute;
-            right:10px;
-            top:10px;
+        .approve-passed {
+            position: absolute;
+            right: 10px;
+            top: 10px;
             border-radius: 100%;
             width: 150px;
             height: 150px;
@@ -38,16 +38,18 @@
             transform: rotateZ(20deg);
             font-size: 14px;
         }
+
         .approve-passed:after {
-            content:"审核通过";
+            content: "审核通过";
         }
+
         /**
         待审核
          */
-        .approve-topass{
-            position:absolute;
-            right:10px;
-            top:170px;
+        .approve-topass {
+            position: absolute;
+            right: 10px;
+            top: 170px;
             border-radius: 100%;
             width: 150px;
             height: 150px;
@@ -60,16 +62,18 @@
             transform: rotateZ(20deg);
             font-size: 14px;
         }
+
         .approve-topass:after {
-            content:"待审核";
+            content: "待审核";
         }
+
         /**
         审核不过
          */
-        .approve-nopass{
-            position:absolute;
-            right:10px;
-            top:10px;
+        .approve-nopass {
+            position: absolute;
+            right: 10px;
+            top: 10px;
             border-radius: 100%;
             width: 150px;
             height: 150px;
@@ -82,8 +86,9 @@
             transform: rotateZ(20deg);
             font-size: 14px;
         }
+
         .approve-nopass:after {
-            content:"审核不通过";
+            content: "审核不通过";
         }
     </style>
 
@@ -100,28 +105,32 @@
                 <div class="am-tabs am-margin" data-am-tabs>
                     <ul class="am-tabs-nav am-nav am-nav-tabs">
                         <li id="jiben" <#if check==1>class="am-active"</#if>><a href="#tab1">项目基本信息</a></li>
-                    <#if project.status==1 || project.status==5 || project.status==10 || project.status==15>
-                        <li><a href="#tab2">项目概算信息</a></li>
-                    </#if>
-                    <#if project.status==5 || project.status==10 || project.status==15>
-                        <li><a href="#tab3">项目预算信息</a></li>
-                    </#if>
-                    <#if project.status==10 || project.status==15>
-                        <li id="jiesuan"  <#if check==0>class="am-active"</#if>><a href="#tab4">项目结算信息</a></li>
-                    </#if>
-                    <#if project.status==15>
-                        <li><a href="#tab5">项目决算信息</a></li>
-                    </#if>
+                        <#if project.status==1 || project.status==5 || project.status==10 || project.status==15>
+                            <li><a href="#tab2">项目概算信息</a></li>
+                        </#if>
+                        <#if project.status==5 || project.status==10 || project.status==15>
+                            <li><a href="#tab3">项目预算信息</a></li>
+                        </#if>
+                        <#if project.status==10 || project.status==15>
+                            <li id="jiesuan" <#if check==0>class="am-active"</#if>><a href="#tab4">项目结算信息</a></li>
+                        </#if>
+                        <#if project.status==15>
+                            <li><a href="#tab5">项目决算信息</a></li>
+                        </#if>
                         <li><a href="#tab6">项目审核记录</a></li>
                     </ul>
                     <div class="am-tabs-bd">
-                        <div <#if check==1>class="am-tab-panel am-fade am-in am-active" <#else> class="am-tab-panel am-fade am-in"</#if> id="tab1">
-                            <input name="id" id="id" type="hidden" value="${project.id}" />
-                            <input name="projectContributionProfitRateThreshold" id="projectContributionProfitRateThreshold" type="hidden" value="${project.projectContributionProfitRateThreshold}" />
+                        <div <#if check==1>class="am-tab-panel am-fade am-in am-active" <#else> class="am-tab-panel am-fade am-in"</#if>
+                             id="tab1">
+                            <input name="id" id="id" type="hidden" value="${project.id}"/>
+                            <input name="projectContributionProfitRateThreshold"
+                                   id="projectContributionProfitRateThreshold" type="hidden"
+                                   value="${project.projectContributionProfitRateThreshold}"/>
                             <!--验证表单元素（validate) begin-->
 
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>部门名称</div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>部门名称
+                                </div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <span>${project.deptName}</span>
                                 </div>
@@ -129,14 +138,16 @@
                             </div>
 
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目计划开始时间</div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目计划开始时间
+                                </div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <span>${project.startDate?string("yyyy-MM-dd")}</span>
                                 </div>
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目计划结束时间</div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目计划结束时间
+                                </div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <span>${project.endDate?string("yyyy-MM-dd")}</span>
                                 </div>
@@ -144,7 +155,8 @@
                             </div>
 
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目名称</div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目名称
+                                </div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <span>${project.name}</span>
                                 </div>
@@ -152,7 +164,8 @@
                             </div>
 
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目类型</div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目类型
+                                </div>
                                 <div class="am-u-sm-6 am-u-md-6">
                         <span>
                         <#if (project.type) =1>
@@ -167,7 +180,8 @@
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>垫资模式</div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>垫资模式
+                                </div>
                                 <div class="am-u-sm-6 am-u-md-6">
                         <span>
                         <#if (project.underwrittenMode) =1>
@@ -185,7 +199,8 @@
                             </div>
 
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>客户名称</div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>客户名称
+                                </div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <span>${project.customer}</span>
                                 </div>
@@ -193,35 +208,38 @@
                             </div>
 
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>终端客户名称</div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>终端客户名称
+                                </div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <span>${project.terminalCustomer}</span>
                                 </div>
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
-<#--                            <div class="am-g am-form-group am-margin-top">-->
-<#--                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>垫资利息</div>-->
-<#--                                <div class="am-u-sm-6 am-u-md-6">-->
-<#--                                    <span>${Utils.format(project.advanceInterestAmount)}</span>元-->
-<#--                                </div>-->
-<#--                                <div class="am-u-sm-2 am-u-md-4 input-msg"></div>-->
-<#--                            </div>-->
-<#--                            <div class="am-g am-form-group am-margin-top">-->
-<#--                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>垫资峰值</div>-->
-<#--                                <div class="am-u-sm-6 am-u-md-6">-->
-<#--                                    <span>${Utils.format(project.advancePeakAmount)}</span>元-->
-<#--                                </div>-->
-<#--                                <div class="am-u-sm-2 am-u-md-4 input-msg"></div>-->
-<#--                            </div>-->
+                            <#--                            <div class="am-g am-form-group am-margin-top">-->
+                            <#--                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>垫资利息</div>-->
+                            <#--                                <div class="am-u-sm-6 am-u-md-6">-->
+                            <#--                                    <span>${Utils.format(project.advanceInterestAmount)}</span>元-->
+                            <#--                                </div>-->
+                            <#--                                <div class="am-u-sm-2 am-u-md-4 input-msg"></div>-->
+                            <#--                            </div>-->
+                            <#--                            <div class="am-g am-form-group am-margin-top">-->
+                            <#--                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>垫资峰值</div>-->
+                            <#--                                <div class="am-u-sm-6 am-u-md-6">-->
+                            <#--                                    <span>${Utils.format(project.advancePeakAmount)}</span>元-->
+                            <#--                                </div>-->
+                            <#--                                <div class="am-u-sm-2 am-u-md-4 input-msg"></div>-->
+                            <#--                            </div>-->
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>合同金额</div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>合同金额
+                                </div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <span>${Utils.format(project.contractAmount)}</span>元
                                 </div>
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>行业场景应用</div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>行业场景应用
+                                </div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <span>${project.industryScenario}</span>
                                 </div>
@@ -242,14 +260,16 @@
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>主合同收款条款</div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>主合同收款条款
+                                </div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <div style="width:600px; height:auto; word-wrap:break-word;">${project.mainContractCollectionTerms!}</div>
                                 </div>
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>价值及风险</div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>价值及风险
+                                </div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <div style="width:600px; height:auto; word-wrap:break-word;">${project.valueRisk!}</div>
                                 </div>
@@ -283,26 +303,42 @@
                                 <tr>
                                     <td>收入</td>
                                     <td>设备类</td>
-                                    <td><input type="text" class="number" name="incomeDeviceTaxInclude" value="${Utils.format(estimateBean.incomeDeviceTaxInclude)}" required readonly></td>
-                                    <td><input type="text" class="number" name="incomeDeviceTaxExclude" value="${Utils.format(estimateBean.incomeDeviceTaxExclude)}" required readonly></td>
+                                    <td><input type="text" class="number" name="incomeDeviceTaxInclude"
+                                               value="${Utils.format(estimateBean.incomeDeviceTaxInclude)}" required
+                                               readonly></td>
+                                    <td><input type="text" class="number" name="incomeDeviceTaxExclude"
+                                               value="${Utils.format(estimateBean.incomeDeviceTaxExclude)}" required
+                                               readonly></td>
                                 </tr>
                                 <tr>
                                     <td>收入</td>
                                     <td>工程类</td>
-                                    <td><input type="text" class="number" name="incomeEngineerTaxInclude" value="${Utils.format(estimateBean.incomeEngineerTaxInclude)}" required readonly></td>
-                                    <td><input type="text" class="number" name="incomeEngineerTaxExclude" value="${Utils.format(estimateBean.incomeEngineerTaxExclude)}" required readonly></td>
+                                    <td><input type="text" class="number" name="incomeEngineerTaxInclude"
+                                               value="${Utils.format(estimateBean.incomeEngineerTaxInclude)}" required
+                                               readonly></td>
+                                    <td><input type="text" class="number" name="incomeEngineerTaxExclude"
+                                               value="${Utils.format(estimateBean.incomeEngineerTaxExclude)}" required
+                                               readonly></td>
                                 </tr>
                                 <tr>
                                     <td>收入</td>
                                     <td>服务类</td>
-                                    <td><input type="text" class="number" name="incomeServiceTaxInclude" value="${Utils.format(estimateBean.incomeServiceTaxInclude)}" required readonly></td>
-                                    <td><input type="text" class="number" name="incomeServiceTaxExclude" value="${Utils.format(estimateBean.incomeServiceTaxExclude)}" required readonly></td>
+                                    <td><input type="text" class="number" name="incomeServiceTaxInclude"
+                                               value="${Utils.format(estimateBean.incomeServiceTaxInclude)}" required
+                                               readonly></td>
+                                    <td><input type="text" class="number" name="incomeServiceTaxExclude"
+                                               value="${Utils.format(estimateBean.incomeServiceTaxExclude)}" required
+                                               readonly></td>
                                 </tr>
                                 <tr>
                                     <td>合计</td>
                                     <td></td>
-                                    <td><input type="text" class="number" name="incomeTotalTaxInclude" value="${Utils.format(estimateBean.incomeTotalTaxInclude)}" readonly readonly title="此列累计"></td>
-                                    <td><input type="text" class="number" name="incomeTotalTaxExclude" value="${Utils.format(estimateBean.incomeTotalTaxExclude)}" readonly readonly title="此列累计"></td>
+                                    <td><input type="text" class="number" name="incomeTotalTaxInclude"
+                                               value="${Utils.format(estimateBean.incomeTotalTaxInclude)}" readonly
+                                               readonly title="此列累计"></td>
+                                    <td><input type="text" class="number" name="incomeTotalTaxExclude"
+                                               value="${Utils.format(estimateBean.incomeTotalTaxExclude)}" readonly
+                                               readonly title="此列累计"></td>
                                 </tr>
                                 </tbody>
                             </table>
@@ -320,41 +356,67 @@
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>设备</td>
-                                    <td><input type="text" class="number" name="costPurchaseDeviceTaxInclude" value="${Utils.format(estimateBean.costPurchaseDeviceTaxInclude)}" required readonly></td>
-                                    <td><input type="text" class="number" name="costPurchaseDeviceTaxExclude" value="${Utils.format(estimateBean.costPurchaseDeviceTaxExclude)}" required readonly></td>
+                                    <td><input type="text" class="number" name="costPurchaseDeviceTaxInclude"
+                                               value="${Utils.format(estimateBean.costPurchaseDeviceTaxInclude)}"
+                                               required readonly></td>
+                                    <td><input type="text" class="number" name="costPurchaseDeviceTaxExclude"
+                                               value="${Utils.format(estimateBean.costPurchaseDeviceTaxExclude)}"
+                                               required readonly></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>施工</td>
-                                    <td><input type="text" class="number" name="costPurchaseBuildTaxInclude" value="${Utils.format(estimateBean.costPurchaseBuildTaxInclude)}" required readonly></td>
-                                    <td><input type="text" class="number" name="costPurchaseBuildTaxExclude" value="${Utils.format(estimateBean.costPurchaseBuildTaxExclude)}" required readonly></td>
+                                    <td><input type="text" class="number" name="costPurchaseBuildTaxInclude"
+                                               value="${Utils.format(estimateBean.costPurchaseBuildTaxInclude)}"
+                                               required readonly></td>
+                                    <td><input type="text" class="number" name="costPurchaseBuildTaxExclude"
+                                               value="${Utils.format(estimateBean.costPurchaseBuildTaxExclude)}"
+                                               required readonly></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>服务</td>
-                                    <td><input type="text" class="number" name="costPurchaseServiceTaxInclude" value="${Utils.format(estimateBean.costPurchaseServiceTaxInclude)}" required readonly></td>
-                                    <td><input type="text" class="number" name="costPurchaseServiceTaxExclude" value="${Utils.format(estimateBean.costPurchaseServiceTaxExclude)}" required readonly></td>
+                                    <td><input type="text" class="number" name="costPurchaseServiceTaxInclude"
+                                               value="${Utils.format(estimateBean.costPurchaseServiceTaxInclude)}"
+                                               required readonly></td>
+                                    <td><input type="text" class="number" name="costPurchaseServiceTaxExclude"
+                                               value="${Utils.format(estimateBean.costPurchaseServiceTaxExclude)}"
+                                               required readonly></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>其他</td>
-                                    <td><input type="text" class="number" name="costPurchaseOtherTaxInclude" value="${Utils.format(estimateBean.costPurchaseOtherTaxInclude)}" required readonly></td>
-                                    <td><input type="text" class="number" name="costPurchaseOtherTaxExclude" value="${Utils.format(estimateBean.costPurchaseOtherTaxExclude)}" required readonly></td>
+                                    <td><input type="text" class="number" name="costPurchaseOtherTaxInclude"
+                                               value="${Utils.format(estimateBean.costPurchaseOtherTaxInclude)}"
+                                               required readonly></td>
+                                    <td><input type="text" class="number" name="costPurchaseOtherTaxExclude"
+                                               value="${Utils.format(estimateBean.costPurchaseOtherTaxExclude)}"
+                                               required readonly></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
                                     <td>项目管理成本</td>
                                     <td>项目管理成本</td>
-                                    <td><input type="text" class="number" name="costProjectManageTaxInclude" value="${Utils.format(estimateBean.costProjectManageTaxExclude)}" required readonly></td>
-                                    <td><input type="text" class="number" name="costProjectManageTaxExclude" value="${Utils.format(estimateBean.costProjectManageTaxExclude)}" required readonly></td>
+                                    <td><input type="text" class="number" name="costProjectManageTaxInclude"
+                                               value="${Utils.format(estimateBean.costProjectManageTaxExclude)}"
+                                               required readonly></td>
+                                    <td><input type="text" class="number" name="costProjectManageTaxExclude"
+                                               value="${Utils.format(estimateBean.costProjectManageTaxExclude)}"
+                                               required readonly></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
                                     <td>其他</td>
                                     <td>${project.otherName!}</td>
+                                    <td><input type="text" class="number" name="costOtherOtherTaxInclude"
+                                               value="${Utils.format(estimateBean.costOtherOtherTaxInclude)}" required
+                                               readonly></td>
+                                    <td><input type="text" class="number" name="costOtherOtherTaxExclude"
+                                               value="${Utils.format(estimateBean.costOtherOtherTaxExclude)}" required
+                                               readonly></td>
                                     <td><input type="text" class="number" name="costOtherOtherTaxInclude" value="${Utils.format(estimateBean.costOtherOtherTaxInclude, "0.00")}" required readonly></td>
                                     <td><input type="text" class="number" name="costOtherOtherTaxExclude" value="${Utils.format(estimateBean.costOtherOtherTaxExclude, "0.00")}" required readonly></td>
                                 </tr>
@@ -362,8 +424,12 @@
                                     <td>合计</td>
                                     <td></td>
                                     <td></td>
-                                    <td><input type="text" class="number" name="costTotalTaxInclude" value="${Utils.format(estimateBean.costTotalTaxInclude)}" readonly readonly title="此列累计"></td>
-                                    <td><input type="text" class="number" name="costTotalTaxExclude" value="${Utils.format(estimateBean.costTotalTaxExclude)}" readonly readonly title="此列累计"></td>
+                                    <td><input type="text" class="number" name="costTotalTaxInclude"
+                                               value="${Utils.format(estimateBean.costTotalTaxInclude)}" readonly
+                                               readonly title="此列累计"></td>
+                                    <td><input type="text" class="number" name="costTotalTaxExclude"
+                                               value="${Utils.format(estimateBean.costTotalTaxExclude)}" readonly
+                                               readonly title="此列累计"></td>
                                 </tr>
                                 </tbody>
                             </table>
@@ -378,12 +444,16 @@
                                 <tr>
                                     <td>财务费用</td>
                                     <td>资金占用成本</td>
-                                    <td><input type="text" class="number" name="costExpropriationTaxExclude" value="${Utils.format(estimateBean.costExpropriationTaxExclude)}" required readonly></td>
+                                    <td><input type="text" class="number" name="costExpropriationTaxExclude"
+                                               value="${Utils.format(estimateBean.costExpropriationTaxExclude)}"
+                                               required readonly></td>
                                 </tr>
                                 <tr>
                                     <td>公司管理费用</td>
                                     <td></td>
-                                    <td><input type="text" class="number" name="costCompanyManageTaxExclude" value="${Utils.format(estimateBean.costCompanyManageTaxExclude)}" required readonly></td>
+                                    <td><input type="text" class="number" name="costCompanyManageTaxExclude"
+                                               value="${Utils.format(estimateBean.costCompanyManageTaxExclude)}"
+                                               required readonly></td>
                                 </tr>
                                 </tbody>
                             </table>
@@ -397,19 +467,27 @@
                                 </tr>
                                 <tr>
                                     <td>项目毛利（元）</td>
-                                    <td><input type="text" class="number" name="projectGrossProfit" value="${Utils.format(estimateBean.projectGrossProfit)}" readonly title="收入总计（不含税）-成本总计（不含税）-财务费用总计（不含税）"></td>
+                                    <td><input type="text" class="number" name="projectGrossProfit"
+                                               value="${Utils.format(estimateBean.projectGrossProfit)}" readonly
+                                               title="收入总计（不含税）-成本总计（不含税）-财务费用总计（不含税）"></td>
                                 </tr>
                                 <tr>
                                     <td>项目毛利率（%）</td>
-                                    <td><input type="text" class="number" name="projectGrossProfitRate" value="${Utils.format(estimateBean.projectGrossProfitRate)}" readonly title="毛利（不含税）/收入总计（不含税）"></td>
+                                    <td><input type="text" class="number" name="projectGrossProfitRate"
+                                               value="${Utils.format(estimateBean.projectGrossProfitRate)}" readonly
+                                               title="毛利（不含税）/收入总计（不含税）"></td>
                                 </tr>
                                 <tr>
                                     <td>项目贡献利润（元）</td>
-                                    <td><input type="text" class="number" name="projectContributionProfit" value="${Utils.format(estimateBean.projectContributionProfit)}" readonly title="项目毛利（不含税）-公司管理费用总计（不含税）"></td>
+                                    <td><input type="text" class="number" name="projectContributionProfit"
+                                               value="${Utils.format(estimateBean.projectContributionProfit)}" readonly
+                                               title="项目毛利（不含税）-公司管理费用总计（不含税）"></td>
                                 </tr>
                                 <tr>
                                     <td>项目贡献利润率（%）</td>
-                                    <td><input type="text" class="number" name="projectContributionProfitRate" value="${Utils.format(estimateBean.projectContributionProfitRate)}" readonly title="贡献利润（不含税）/收入总计（不含税）"></td>
+                                    <td><input type="text" class="number" name="projectContributionProfitRate"
+                                               value="${Utils.format(estimateBean.projectContributionProfitRate)}"
+                                               readonly title="贡献利润（不含税）/收入总计（不含税）"></td>
                                 </tr>
                                 </tbody>
                             </table>
@@ -429,385 +507,590 @@
                                 <div class="approve-nopass"></div>
                             </#if>
 
-                            <span class="am-text-lg">收入明细表</span>
-                            <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;"
-                                   id="incomeTable">
-                                <tbody>
-                                <tr>
-                                    <td>序号</td>
-                                    <td>类别</td>
-                                    <td>名称</td>
-                                    <td>单位</td>
-                                    <td>数量</td>
-                                    <td>单价</td>
-                                    <td>税率（%）</td>
-                                    <td>含税总金额（元）</td>
-                                    <td>不含税金额（元）</td>
-                                    <#--<td>操作</td>-->
-                                </tr>
-
-                                <#if incomeDetails??>
-                                    <#list incomeDetails as incomeDetail>
+                            <div class="am-tabs am-margin" data-am-tabs id="subTab">
+                                <ul class="am-tabs-nav am-nav am-nav-tabs">
+                                    <li class="am-active"><a href="#tab31">收入明细表</a></li>
+                                    <li><a href="#tab32">采购成本明细表</a></li>
+                                    <li><a href="#tab33">项目管理成本表</a></li>
+                                    <li><a href="#tab34">资金计划表</a></li>
+                                    <li><a href="#tab35">预算信息</a></li>
+                                </ul>
+                            </div>
+                            <div class="am-tabs-bd">
+                                <div class="am-tab-panel am-fade am-in am-active" id="tab31">
+                                    <span class="am-text-lg">收入明细表</span>
+                                    <table class="am-table am-table-bordered am-table-radius table-main"
+                                           style="padding:0;"
+                                           id="incomeTable">
+                                        <tbody>
                                         <tr>
-                                            <td>${(incomeDetail_index+1)!}</td>
-                                            <td>
-                                                <#--<select style="width: auto" readonly
-                                                        class="am-modal-prompt-input am-modal-prompt-input-income">
-                                                    <option value="1" <#if incomeDetail.type == 1>selected</#if>>设备类
-                                                    </option>
-                                                    <option value="2" <#if incomeDetail.type == 2>selected</#if>>工程类
-                                                    </option>
-                                                    <option value="3" <#if incomeDetail.type == 3>selected</#if>>服务类
-                                                    </option>
-                                                </select>-->
-                                                <#if incomeDetail.type ==1 >
-                                                    设备类
-                                                <#elseif incomeDetail.type  ==2>
-                                                    工程类
-                                                <#elseif incomeDetail.type  ==3>
-                                                    服务类
-                                                </#if>
-                                            </td>
-                                            <td><input type="text" readonly
-                                                       class="am-modal-prompt-input am-modal-prompt-input-income"
-                                                       value="${incomeDetail.name!}"></td>
-                                            <td><input type="text" readonly
-                                                       class="am-modal-prompt-input am-modal-prompt-input-income"
-                                                       value="${incomeDetail.unit!}"></td>
-                                            <td><input type="text" readonly
-                                                       class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-amount"
-                                                       value="${incomeDetail.amount!0}"></td>
-                                            <td><input type="text" readonly
-                                                       class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-price"
-                                                       value="${Utils.format2(incomeDetail.price,'0')}"></td>
-                                            <td><input type="text" readonly
-                                                       class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-tax-rate"
-                                                       value="${Utils.format(incomeDetail.taxRate,'0')}"></td>
-                                            <td><input type="text"
-                                                       class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-tax-include"
-                                                       value="${Utils.format(incomeDetail.totalTaxInclude,'0')}"
-                                                       readonly></td>
-                                            <td><input type="text"
-                                                       class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-tax-exclude"
-                                                       value="${Utils.format(incomeDetail.totalTaxExclude,'0')}"
-                                                       readonly></td>
-                                            <#--<td>
-                                                <button type="button"
-                                                        class="am-btn am-btn-warning am-btn-xs am-round am-modal-line-delete">
-                                                    <span class="am-icon-minus"></span></button>
-                                            </td>-->
+                                            <td>序号</td>
+                                            <td>类别</td>
+                                            <td>名称</td>
+                                            <td>单位</td>
+                                            <td>数量</td>
+                                            <td>单价</td>
+                                            <td>税率（%）</td>
+                                            <td>含税总金额（元）</td>
+                                            <td>不含税金额（元）</td>
+                                            <#--<td>操作</td>-->
                                         </tr>
-                                    </#list>
-                                </#if>
 
-                                </tbody>
-                            </table>
-                            <span class="am-text-lg">采购成本明细表</span>
-                            <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;"
-                                   id="costTable">
-                                <tbody>
-                                <tr>
-                                    <td>序号</td>
-                                    <td>大类</td>
-                                    <td>类别</td>
-                                    <td>名称</td>
-                                    <td>单位</td>
-                                    <td>数量</td>
-                                    <td>单价</td>
-                                    <td>税率（%）</td>
-                                    <td>含税总金额（元）</td>
-                                    <td>不含税金额（元）</td>
-                                    <#--<td>操作</td>-->
-                                </tr>
+                                        <#if incomeDetails??>
+                                            <#list incomeDetails as incomeDetail>
+                                                <tr>
+                                                    <td>${(incomeDetail_index+1)!}</td>
+                                                    <td>
+                                                        <#--<select style="width: auto" readonly
+                                                                class="am-modal-prompt-input am-modal-prompt-input-income">
+                                                            <option value="1" <#if incomeDetail.type == 1>selected</#if>>设备类
+                                                            </option>
+                                                            <option value="2" <#if incomeDetail.type == 2>selected</#if>>工程类
+                                                            </option>
+                                                            <option value="3" <#if incomeDetail.type == 3>selected</#if>>服务类
+                                                            </option>
+                                                        </select>-->
+                                                        <#if incomeDetail.type ==1 >
+                                                            设备类
+                                                        <#elseif incomeDetail.type  ==2>
+                                                            工程类
+                                                        <#elseif incomeDetail.type  ==3>
+                                                            服务类
+                                                        </#if>
+                                                    </td>
+                                                    <td><input type="text" readonly
+                                                               class="am-modal-prompt-input am-modal-prompt-input-income"
+                                                               value="${incomeDetail.name!}"></td>
+                                                    <td><input type="text" readonly
+                                                               class="am-modal-prompt-input am-modal-prompt-input-income"
+                                                               value="${incomeDetail.unit!}"></td>
+                                                    <td><input type="text" readonly
+                                                               class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-amount"
+                                                               value="${incomeDetail.amount!0}"></td>
+                                                    <td><input type="text" readonly
+                                                               class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-price"
+                                                               value="${Utils.format2(incomeDetail.price,'0')}"></td>
+                                                    <td><input type="text" readonly
+                                                               class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-tax-rate"
+                                                               value="${Utils.format(incomeDetail.taxRate,'0')}"></td>
+                                                    <td><input type="text"
+                                                               class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-tax-include"
+                                                               value="${Utils.format(incomeDetail.totalTaxInclude,'0')}"
+                                                               readonly></td>
+                                                    <td><input type="text"
+                                                               class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-tax-exclude"
+                                                               value="${Utils.format(incomeDetail.totalTaxExclude,'0')}"
+                                                               readonly></td>
+                                                    <#--<td>
+                                                        <button type="button"
+                                                                class="am-btn am-btn-warning am-btn-xs am-round am-modal-line-delete">
+                                                            <span class="am-icon-minus"></span></button>
+                                                    </td>-->
+                                                </tr>
+                                            </#list>
+                                        </#if>
 
-                                <#if costDetails??>
-                                    <#list costDetails as costDetail>
+                                        </tbody>
+                                    </table>
+                                </div>
+                                <div class="am-tab-panel am-fade am-in" id="tab32">
+                                    <span class="am-text-lg">采购成本明细表</span>
+                                    <table class="am-table am-table-bordered am-table-radius table-main"
+                                           style="padding:0;"
+                                           id="costTable">
+                                        <tbody>
                                         <tr>
-                                            <td>${(costDetail_index+1)!}</td>
-                                            <td>
-                                                <#--<select style="width: auto" readonly
-                                                        class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-type">
-                                                    <option value="1" <#if costDetail.type == 1>selected</#if>>设备
-                                                    </option>
-                                                    <option value="2" <#if costDetail.type == 2>selected</#if>>施工
-                                                    </option>
-                                                    <option value="3" <#if costDetail.type == 3>selected</#if>>服务
-                                                    </option>
-                                                    <option value="4" <#if costDetail.type == 4>selected</#if>>其他
-                                                    </option>
-                                                </select>-->
-                                                <#if costDetail.type ==1 >
-                                                    设备
-                                                <#elseif costDetail.type  ==2>
-                                                    施工
-                                                <#elseif costDetail.type  ==3>
-                                                    服务
-                                                <#elseif costDetail.type  ==4>
-                                                    其他
-                                                </#if>
-                                            </td>
-                                            <td>
-                                                <#list procurementTypes as procurementType>
-                                                    <#if costDetail.category == procurementType.id>${procurementType.name}</#if>
-                                                </#list>
-                                            </td>
-                                            <td><input type="text" readonly
-                                                       class="am-modal-prompt-input am-modal-prompt-input-cost"
-                                                       value="${costDetail.name!}"></td>
-                                            <td><input type="text" readonly
-                                                       class="am-modal-prompt-input am-modal-prompt-input-cost"
-                                                       value="${costDetail.unit!}"></td>
-                                            <td><input type="text" readonly
-                                                       class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-amount"
-                                                       value="${costDetail.amount!0}"></td>
-                                            <td><input type="text" readonly
-                                                       class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-price"
-                                                       value="${Utils.format2(costDetail.price,'0')}"></td>
-                                            <td><input type="text" min="0.00" max="99.99" step="0.01" readonly
-                                                       class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-tax-rate"
-                                                       value="${Utils.format(costDetail.taxRate,'0')}"></td>
-                                            <td><input type="text"
-                                                       class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-tax-include"
-                                                       value="${Utils.format(costDetail.totalTaxInclude,'0')}" readonly>
-                                            </td>
-                                            <td><input type="text"
-                                                       class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-tax-exclude"
-                                                       value="${Utils.format(costDetail.totalTaxExclude,'0')}" readonly>
-                                            </td>
-                                            <td>
-                                                <#-- <button type="button"
-                                                         class="am-btn am-btn-warning am-btn-xs am-round am-modal-line-delete">
-                                                     <span class="am-icon-minus"></span></button>-->
-                                            </td>
+                                            <td>序号</td>
+                                            <td>大类</td>
+                                            <td>类别</td>
+                                            <td>名称</td>
+                                            <td>单位</td>
+                                            <td>数量</td>
+                                            <td>单价</td>
+                                            <td>税率（%）</td>
+                                            <td>含税总金额（元）</td>
+                                            <td>不含税金额（元）</td>
+                                            <#--<td>操作</td>-->
                                         </tr>
-                                    </#list>
-                                </#if>
 
-                                </tbody>
-                            </table>
-                            <span class="am-text-lg">项目管理成本表</span>
-                            <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;"
-                                   id="costProjectManageTable">
-                                <tbody>
-                                <tr>
-                                    <td>序号</td>
-                                    <td>财务费用类别</td>
-                                    <td>业务项目</td>
-                                    <td>项目明细</td>
-                                    <td>单位</td>
-                                    <td>数量</td>
-                                    <td>单价</td>
-                                    <td>总金额（元）</td>
-                                    <td>预估计算方法</td>
-                                    <td>预估依据</td>
-                                    <td>备注</td>
-                                    <#--<td>操作</td>-->
-                                </tr>
+                                        <#if costDetails??>
+                                            <#list costDetails as costDetail>
+                                                <tr>
+                                                    <td>${(costDetail_index+1)!}</td>
+                                                    <td>
+                                                        <#--<select style="width: auto" readonly
+                                                                class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-type">
+                                                            <option value="1" <#if costDetail.type == 1>selected</#if>>设备
+                                                            </option>
+                                                            <option value="2" <#if costDetail.type == 2>selected</#if>>施工
+                                                            </option>
+                                                            <option value="3" <#if costDetail.type == 3>selected</#if>>服务
+                                                            </option>
+                                                            <option value="4" <#if costDetail.type == 4>selected</#if>>其他
+                                                            </option>
+                                                        </select>-->
+                                                        <#if costDetail.type ==1 >
+                                                            设备
+                                                        <#elseif costDetail.type  ==2>
+                                                            施工
+                                                        <#elseif costDetail.type  ==3>
+                                                            服务
+                                                        <#elseif costDetail.type  ==4>
+                                                            其他
+                                                        </#if>
+                                                    </td>
+                                                    <td>
+                                                        <#list procurementTypes as procurementType>
+                                                            <#if costDetail.category == procurementType.id>${procurementType.name}</#if>
+                                                        </#list>
+                                                    </td>
+                                                    <td><input type="text" readonly
+                                                               class="am-modal-prompt-input am-modal-prompt-input-cost"
+                                                               value="${costDetail.name!}"></td>
+                                                    <td><input type="text" readonly
+                                                               class="am-modal-prompt-input am-modal-prompt-input-cost"
+                                                               value="${costDetail.unit!}"></td>
+                                                    <td><input type="text" readonly
+                                                               class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-amount"
+                                                               value="${costDetail.amount!0}"></td>
+                                                    <td><input type="text" readonly
+                                                               class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-price"
+                                                               value="${Utils.format2(costDetail.price,'0')}"></td>
+                                                    <td><input type="text" min="0.00" max="99.99" step="0.01" readonly
+                                                               class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-tax-rate"
+                                                               value="${Utils.format(costDetail.taxRate,'0')}"></td>
+                                                    <td><input type="text"
+                                                               class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-tax-include"
+                                                               value="${Utils.format(costDetail.totalTaxInclude,'0')}"
+                                                               readonly>
+                                                    </td>
+                                                    <td><input type="text"
+                                                               class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-tax-exclude"
+                                                               value="${Utils.format(costDetail.totalTaxExclude,'0')}"
+                                                               readonly>
+                                                    </td>
+                                                    <td>
+                                                        <#-- <button type="button"
+                                                                 class="am-btn am-btn-warning am-btn-xs am-round am-modal-line-delete">
+                                                             <span class="am-icon-minus"></span></button>-->
+                                                    </td>
+                                                </tr>
+                                            </#list>
+                                        </#if>
 
-                                <#if costProjectManageDetails??>
-                                    <#list costProjectManageDetails as costProjectManageDetail>
+                                        </tbody>
+                                    </table>
+                                </div>
+                                <div class="am-tab-panel am-fade am-in" id="tab33">
+                                    <span class="am-text-lg">项目管理成本表</span>
+                                    <table class="am-table am-table-bordered am-table-radius table-main"
+                                           style="padding:0;"
+                                           id="costProjectManageTable">
+                                        <tbody>
                                         <tr>
-                                            <td>${(costProjectManageDetail_index+1)!}</td>
-                                            <td>
-                                                <#--<select style="width: auto"
-                                                        class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
-                                                        <#if costProjectManageDetail.deletable==0>readonly</#if>>
-                                                    <option value="1"
-                                                            <#if costProjectManageDetail.type == 1>selected</#if>>人工成本
-                                                    </option>
-                                                    <option value="2"
-                                                            <#if costProjectManageDetail.type == 2>selected</#if>>业务费用
-                                                    </option>
-                                                    <option value="3"
-                                                            <#if costProjectManageDetail.type == 3>selected</#if>>其他费用
-                                                    </option>
-                                                </select>-->
-                                                <#if costProjectManageDetail.type ==1 >
-                                                    人工成本
-                                                <#elseif costProjectManageDetail.type  ==2>
-                                                    业务费用
-                                                <#elseif costProjectManageDetail.type  ==3>
-                                                    其他费用
-                                                </#if>
-                                            </td>
-                                            <td><input type="text"
-                                                       class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
-                                                       value="${costProjectManageDetail.name!}" readonly
-                                                        <#--<#if costProjectManageDetail.deletable==0>readonly</#if>-->></td>
-                                            <td><input type="text" readonly
-                                                       class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
-                                                       value="${costProjectManageDetail.detail!}"></td>
-                                            <td><input type="text" readonly
-                                                       class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
-                                                       value="${costProjectManageDetail.unit!}"></td>
-                                            <td><input type="text" readonly
-                                                       class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-amount-project-manage"
-                                                       value="${costProjectManageDetail.amount!0}"></td>
-                                            <td><input type="text" readonly
-                                                       class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-price-project-manage"
-                                                       value="${Utils.format2(costProjectManageDetail.price,'0')}"></td>
-                                            <td><input type="text"
-                                                       class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-total-project-manage"
-                                                       value="${Utils.format(costProjectManageDetail.total,'0')}"
-                                                       readonly></td>
-                                            <td><input type="text" readonly
-                                                       class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
-                                                       value="${costProjectManageDetail.predictMethod!}"></td>
-                                            <td><input type="text" readonly
-                                                       class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
-                                                       value="${costProjectManageDetail.predictWhy!}"></td>
-                                            <td><input type="text" readonly
-                                                       class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
-                                                       value="${costProjectManageDetail.remark!}"></td>
-                                            <#--<td><#if costProjectManageDetail.deletable==1>
-                                                    <button type="button"
-                                                            class="am-btn am-btn-warning am-btn-xs am-round am-modal-line-delete">
-                                                        <span class="am-icon-minus"></span></button></#if>
-                                                <input type="hidden"
-                                                       class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
-                                                       value="${costProjectManageDetail.deletable!}">
-                                            </td>-->
+                                            <td>序号</td>
+                                            <td>财务费用类别</td>
+                                            <td>业务项目</td>
+                                            <td>项目明细</td>
+                                            <td>单位</td>
+                                            <td>数量</td>
+                                            <td>单价</td>
+                                            <td>总金额（元）</td>
+                                            <td>预估计算方法</td>
+                                            <td>预估依据</td>
+                                            <td>备注</td>
+                                            <#--<td>操作</td>-->
                                         </tr>
-                                    </#list>
-                                </#if>
 
-                                </tbody>
-                            </table>
-                            <span class="am-text-lg">资金计划表</span>
-                            <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;"
-                                   id="budgetPlanDetailTable">
-                                <tbody>
-                                <tr>
-                                    <td>月份</td>
-                                    <td>设备支出</td>
-                                    <td>工程支出（含服务+施工+其他）</td>
-                                    <td>经营性开支</td>
-                                    <td>保证金支出</td>
-                                    <td>支出合计</td>
-                                    <td>销售收款</td>
-                                    <td>保证金收款</td>
-                                    <td>收款合计</td>
-                                    <td>资金余额</td>
-                                    <td>资金利息</td>
-                                    <td>垫资计划</td>
-                                    <td>还款计划</td>
-                                    <#-- <td>操作</td>-->
-                                </tr>
-                                <tr>
-                                    <td><#--<input type="text" class="am-modal-prompt-input input-total-month-budget-plan"
+                                        <#if costProjectManageDetails??>
+                                            <#list costProjectManageDetails as costProjectManageDetail>
+                                                <tr>
+                                                    <td>${(costProjectManageDetail_index+1)!}</td>
+                                                    <td>
+                                                        <#--<select style="width: auto"
+                                                                class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
+                                                                <#if costProjectManageDetail.deletable==0>readonly</#if>>
+                                                            <option value="1"
+                                                                    <#if costProjectManageDetail.type == 1>selected</#if>>人工成本
+                                                            </option>
+                                                            <option value="2"
+                                                                    <#if costProjectManageDetail.type == 2>selected</#if>>业务费用
+                                                            </option>
+                                                            <option value="3"
+                                                                    <#if costProjectManageDetail.type == 3>selected</#if>>其他费用
+                                                            </option>
+                                                        </select>-->
+                                                        <#if costProjectManageDetail.type ==1 >
+                                                            人工成本
+                                                        <#elseif costProjectManageDetail.type  ==2>
+                                                            业务费用
+                                                        <#elseif costProjectManageDetail.type  ==3>
+                                                            其他费用
+                                                        </#if>
+                                                    </td>
+                                                    <td><input type="text"
+                                                               class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
+                                                               value="${costProjectManageDetail.name!}" readonly
+                                                                <#--<#if costProjectManageDetail.deletable==0>readonly</#if>-->>
+                                                    </td>
+                                                    <td><input type="text" readonly
+                                                               class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
+                                                               value="${costProjectManageDetail.detail!}"></td>
+                                                    <td><input type="text" readonly
+                                                               class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
+                                                               value="${costProjectManageDetail.unit!}"></td>
+                                                    <td><input type="text" readonly
+                                                               class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-amount-project-manage"
+                                                               value="${costProjectManageDetail.amount!0}"></td>
+                                                    <td><input type="text" readonly
+                                                               class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-price-project-manage"
+                                                               value="${Utils.format2(costProjectManageDetail.price,'0')}">
+                                                    </td>
+                                                    <td><input type="text"
+                                                               class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-total-project-manage"
+                                                               value="${Utils.format(costProjectManageDetail.total,'0')}"
+                                                               readonly></td>
+                                                    <td><input type="text" readonly
+                                                               class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
+                                                               value="${costProjectManageDetail.predictMethod!}"></td>
+                                                    <td><input type="text" readonly
+                                                               class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
+                                                               value="${costProjectManageDetail.predictWhy!}"></td>
+                                                    <td><input type="text" readonly
+                                                               class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
+                                                               value="${costProjectManageDetail.remark!}"></td>
+                                                    <#--<td><#if costProjectManageDetail.deletable==1>
+                                                            <button type="button"
+                                                                    class="am-btn am-btn-warning am-btn-xs am-round am-modal-line-delete">
+                                                                <span class="am-icon-minus"></span></button></#if>
+                                                        <input type="hidden"
+                                                               class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
+                                                               value="${costProjectManageDetail.deletable!}">
+                                                    </td>-->
+                                                </tr>
+                                            </#list>
+                                        </#if>
+
+                                        </tbody>
+                                    </table>
+                                </div>
+                                <div class="am-tab-panel am-fade am-in" id="tab34">
+                                    <span class="am-text-lg">资金计划表</span>
+                                    <table class="am-table am-table-bordered am-table-radius table-main"
+                                           style="padding:0;"
+                                           id="budgetPlanDetailTable">
+                                        <tbody>
+                                        <tr>
+                                            <td>月份</td>
+                                            <td>设备支出</td>
+                                            <td>工程支出（含服务+施工+其他）</td>
+                                            <td>经营性开支</td>
+                                            <td>保证金支出</td>
+                                            <td>支出合计</td>
+                                            <td>销售收款</td>
+                                            <td>保证金收款</td>
+                                            <td>收款合计</td>
+                                            <td>资金余额</td>
+                                            <td>资金利息</td>
+                                            <td>垫资计划</td>
+                                            <td>还款计划</td>
+                                            <#-- <td>操作</td>-->
+                                        </tr>
+                                        <tr>
+                                            <td><#--<input type="text" class="am-modal-prompt-input input-total-month-budget-plan"
                                                value="${projectBudgetPlanDetailTotal.month}" readonly/>-->${projectBudgetPlanDetailTotal.month}</td>
-                                    <td><input type="text"
-                                               class="am-modal-prompt-input input-total-device-cost-budget-plan"
-                                               value="${Utils.format(projectBudgetPlanDetailTotal.deviceCost)}"
-                                               readonly/></td>
-                                    <td><input type="text"
-                                               class="am-modal-prompt-input input-total-engineer-cost-budget-plan"
-                                               value="${Utils.format(projectBudgetPlanDetailTotal.engineerCost)}"
-                                               readonly/></td>
-                                    <td><input type="text"
-                                               class="am-modal-prompt-input input-total-project-manage-cost-budget-plan"
-                                               value="${Utils.format(projectBudgetPlanDetailTotal.projectManageCost)}"
-                                               readonly/></td>
-                                    <td><input type="text"
-                                               class="am-modal-prompt-input input-total-earnest-money-cost-budget-plan"
-                                               value="${Utils.format(projectBudgetPlanDetailTotal.earnestMoneyCost)}"
-                                               readonly/></td>
-                                    <td><input type="text"
-                                               class="am-modal-prompt-input input-total-total-cost-budget-plan"
-                                               value="${Utils.format(projectBudgetPlanDetailTotal.totalCost)}"
-                                               readonly/></td>
-                                    <td><input type="text"
-                                               class="am-modal-prompt-input input-total-sale-income-budget-plan"
-                                               value="${Utils.format(projectBudgetPlanDetailTotal.saleIncome)}"
-                                               readonly/></td>
-                                    <td><input type="text"
-                                               class="am-modal-prompt-input input-total-earnest-money-income-budget-plan"
-                                               value="${Utils.format(projectBudgetPlanDetailTotal.earnestMoneyIncome)}"
-                                               readonly/></td>
-                                    <td><input type="text"
-                                               class="am-modal-prompt-input input-total-total-income-budget-plan"
-                                               value="${Utils.format(projectBudgetPlanDetailTotal.totalIncome)}"
-                                               readonly/></td>
-                                    <td><input type="text"
-                                               class="am-modal-prompt-input input-total-fund-balance-budget-plan"
-                                               value="${Utils.format(projectBudgetPlanDetailTotal.fundBalance)}"
-                                               readonly/></td>
-                                    <td><input type="text"
-                                               class="am-modal-prompt-input input-total-capital-interest-budget-plan"
-                                               value="${Utils.format(projectBudgetPlanDetailTotal.capitalInterest)}"
-                                               readonly/></td>
-                                    <td><input type="text"
-                                               class="am-modal-prompt-input input-total-underwritten-plan-budget-plan"
-                                               value="${Utils.format(projectBudgetPlanDetailTotal.underwrittenPlan)}"
-                                               readonly/></td>
-                                    <td><input type="text"
-                                               class="am-modal-prompt-input input-total-repayment-plan-budget-plan"
-                                               value="${Utils.format(projectBudgetPlanDetailTotal.repaymentPlan)}"
-                                               readonly/></td>
-                                    <td></td>
-                                </tr>
+                                            <td><input type="text"
+                                                       class="am-modal-prompt-input input-total-device-cost-budget-plan"
+                                                       value="${Utils.format(projectBudgetPlanDetailTotal.deviceCost)}"
+                                                       readonly/></td>
+                                            <td><input type="text"
+                                                       class="am-modal-prompt-input input-total-engineer-cost-budget-plan"
+                                                       value="${Utils.format(projectBudgetPlanDetailTotal.engineerCost)}"
+                                                       readonly/></td>
+                                            <td><input type="text"
+                                                       class="am-modal-prompt-input input-total-project-manage-cost-budget-plan"
+                                                       value="${Utils.format(projectBudgetPlanDetailTotal.projectManageCost)}"
+                                                       readonly/></td>
+                                            <td><input type="text"
+                                                       class="am-modal-prompt-input input-total-earnest-money-cost-budget-plan"
+                                                       value="${Utils.format(projectBudgetPlanDetailTotal.earnestMoneyCost)}"
+                                                       readonly/></td>
+                                            <td><input type="text"
+                                                       class="am-modal-prompt-input input-total-total-cost-budget-plan"
+                                                       value="${Utils.format(projectBudgetPlanDetailTotal.totalCost)}"
+                                                       readonly/></td>
+                                            <td><input type="text"
+                                                       class="am-modal-prompt-input input-total-sale-income-budget-plan"
+                                                       value="${Utils.format(projectBudgetPlanDetailTotal.saleIncome)}"
+                                                       readonly/></td>
+                                            <td><input type="text"
+                                                       class="am-modal-prompt-input input-total-earnest-money-income-budget-plan"
+                                                       value="${Utils.format(projectBudgetPlanDetailTotal.earnestMoneyIncome)}"
+                                                       readonly/></td>
+                                            <td><input type="text"
+                                                       class="am-modal-prompt-input input-total-total-income-budget-plan"
+                                                       value="${Utils.format(projectBudgetPlanDetailTotal.totalIncome)}"
+                                                       readonly/></td>
+                                            <td><input type="text"
+                                                       class="am-modal-prompt-input input-total-fund-balance-budget-plan"
+                                                       value="${Utils.format(projectBudgetPlanDetailTotal.fundBalance)}"
+                                                       readonly/></td>
+                                            <td><input type="text"
+                                                       class="am-modal-prompt-input input-total-capital-interest-budget-plan"
+                                                       value="${Utils.format(projectBudgetPlanDetailTotal.capitalInterest)}"
+                                                       readonly/></td>
+                                            <td><input type="text"
+                                                       class="am-modal-prompt-input input-total-underwritten-plan-budget-plan"
+                                                       value="${Utils.format(projectBudgetPlanDetailTotal.underwrittenPlan)}"
+                                                       readonly/></td>
+                                            <td><input type="text"
+                                                       class="am-modal-prompt-input input-total-repayment-plan-budget-plan"
+                                                       value="${Utils.format(projectBudgetPlanDetailTotal.repaymentPlan)}"
+                                                       readonly/></td>
+                                            <td></td>
+                                        </tr>
 
-                                <#if projectBudgetPlanDetails??>
-                                    <#list projectBudgetPlanDetails as projectBudgetPlanDetail>
-                                        <tr>
-                                            <td><#--<input type="text" readonly
+                                        <#if projectBudgetPlanDetails??>
+                                            <#list projectBudgetPlanDetails as projectBudgetPlanDetail>
+                                                <tr>
+                                                    <td><#--<input type="text" readonly
                                                        class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-month-budget-plan"
                                                        value="${projectBudgetPlanDetail.month!}">-->${projectBudgetPlanDetail.month!}</td>
-                                            <td><input type="text" readonly
-                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-device-cost-budget-plan"
-                                                       value="${Utils.format(projectBudgetPlanDetail.deviceCost)}"></td>
-                                            <td><input type="text" readonly
-                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-engineer-cost-budget-plan"
-                                                       value="${Utils.format(projectBudgetPlanDetail.engineerCost)}">
-                                            </td>
-                                            <td><input type="text" readonly
-                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-project-manage-cost-budget-plan"
-                                                       value="${Utils.format(projectBudgetPlanDetail.projectManageCost)}">
-                                            </td>
-                                            <td><input type="text" readonly
-                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-earnest-money-cost-budget-plan"
-                                                       value="${Utils.format(projectBudgetPlanDetail.earnestMoneyCost)}">
-                                            </td>
-                                            <td><input type="text"
-                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-total-cost-budget-plan"
-                                                       value="${Utils.format(projectBudgetPlanDetail.totalCost)}"
-                                                       readonly></td>
-                                            <td><input type="text" readonly
-                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-sale-income-budget-plan"
-                                                       value="${Utils.format(projectBudgetPlanDetail.saleIncome)}"></td>
-                                            <td><input type="text" readonly
-                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-earnest-money-income-budget-plan"
-                                                       value="${Utils.format(projectBudgetPlanDetail.earnestMoneyIncome)}">
-                                            </td>
-                                            <td><input type="text"
-                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-total-income-budget-plan"
-                                                       value="${Utils.format(projectBudgetPlanDetail.totalIncome)}"
-                                                       readonly></td>
-                                            <td><input type="text"
-                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-fund-balance-budget-plan"
-                                                       value="${Utils.format(projectBudgetPlanDetail.fundBalance)}"
-                                                       readonly></td>
-                                            <td><input type="text"
-                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-capital-interest-budget-plan"
-                                                       value="${Utils.format(projectBudgetPlanDetail.capitalInterest)}"
-                                                       readonly></td>
-                                            <td><input type="text"
-                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-underwritten-plan-budget-plan"
-                                                       value="${Utils.format(projectBudgetPlanDetail.underwrittenPlan)}"
-                                                       readonly></td>
-                                            <td><input type="text"
-                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-repayment-plan-budget-plan"
-                                                       value="${Utils.format(projectBudgetPlanDetail.repaymentPlan)}"
-                                                       readonly></td>
-                                            <#--<td>
-                                                <button type="button"
-                                                        class="am-btn am-btn-warning am-btn-xs am-round am-modal-line-delete-budget-plan">
-                                                    <span class="am-icon-minus"></span></button>
-                                            </td>-->
-                                        </tr>
-                                    </#list>
-                                </#if>
+                                                    <td><input type="text" readonly
+                                                               class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-device-cost-budget-plan"
+                                                               value="${Utils.format(projectBudgetPlanDetail.deviceCost)}">
+                                                    </td>
+                                                    <td><input type="text" readonly
+                                                               class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-engineer-cost-budget-plan"
+                                                               value="${Utils.format(projectBudgetPlanDetail.engineerCost)}">
+                                                    </td>
+                                                    <td><input type="text" readonly
+                                                               class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-project-manage-cost-budget-plan"
+                                                               value="${Utils.format(projectBudgetPlanDetail.projectManageCost)}">
+                                                    </td>
+                                                    <td><input type="text" readonly
+                                                               class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-earnest-money-cost-budget-plan"
+                                                               value="${Utils.format(projectBudgetPlanDetail.earnestMoneyCost)}">
+                                                    </td>
+                                                    <td><input type="text"
+                                                               class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-total-cost-budget-plan"
+                                                               value="${Utils.format(projectBudgetPlanDetail.totalCost)}"
+                                                               readonly></td>
+                                                    <td><input type="text" readonly
+                                                               class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-sale-income-budget-plan"
+                                                               value="${Utils.format(projectBudgetPlanDetail.saleIncome)}">
+                                                    </td>
+                                                    <td><input type="text" readonly
+                                                               class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-earnest-money-income-budget-plan"
+                                                               value="${Utils.format(projectBudgetPlanDetail.earnestMoneyIncome)}">
+                                                    </td>
+                                                    <td><input type="text"
+                                                               class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-total-income-budget-plan"
+                                                               value="${Utils.format(projectBudgetPlanDetail.totalIncome)}"
+                                                               readonly></td>
+                                                    <td><input type="text"
+                                                               class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-fund-balance-budget-plan"
+                                                               value="${Utils.format(projectBudgetPlanDetail.fundBalance)}"
+                                                               readonly></td>
+                                                    <td><input type="text"
+                                                               class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-capital-interest-budget-plan"
+                                                               value="${Utils.format(projectBudgetPlanDetail.capitalInterest)}"
+                                                               readonly></td>
+                                                    <td><input type="text"
+                                                               class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-underwritten-plan-budget-plan"
+                                                               value="${Utils.format(projectBudgetPlanDetail.underwrittenPlan)}"
+                                                               readonly></td>
+                                                    <td><input type="text"
+                                                               class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-repayment-plan-budget-plan"
+                                                               value="${Utils.format(projectBudgetPlanDetail.repaymentPlan)}"
+                                                               readonly></td>
+                                                    <#--<td>
+                                                        <button type="button"
+                                                                class="am-btn am-btn-warning am-btn-xs am-round am-modal-line-delete-budget-plan">
+                                                            <span class="am-icon-minus"></span></button>
+                                                    </td>-->
+                                                </tr>
+                                            </#list>
+                                        </#if>
 
+                                        </tbody>
+                                    </table>
+                                </div>
+                                <#--<span class="am-text-primary"><a style="cursor: pointer" id="income-detail">收入明细表</a></span>
+                                <span class="am-text-primary"><a style="cursor: pointer"  id="cost-detail">采购成本明细表</a></span>
+                                <span class="am-text-primary"><a style="cursor: pointer"  id="cost-project-manage-detail">项目管理成本表</a></span>
+                                <span class="am-text-primary budget-plan-detail"><a style="cursor: pointer">资金计划表</a></span>-->
+                                <div class="am-tab-panel am-fade am-in" id="tab35">
+                                    <span class="am-text-lg">收入</span>
+                                    <table class="am-table am-table-bordered am-table-radius table-main"
+                                           style="padding:0;">
+                                        <tbody>
+                                        <tr class="am-text-lg">
+                                            <td>类别</td>
+                                            <td>费用</td>
+                                            <td>含税金额（元）</td>
+                                            <td>不含税金额（元）</td>
+                                        </tr>
+                                        <tr>
+                                            <td>收入</td>
+                                            <td>设备类</td>
+                                            <td><input type="text" class="number" name="incomeDeviceTaxInclude"
+                                                       value="${Utils.format(budgetBean.incomeDeviceTaxInclude,'0')}"
+                                                       required readonly title="设备类含税总额"></td>
+                                            <td><input type="text" class="number" name="incomeDeviceTaxExclude"
+                                                       value="${Utils.format(budgetBean.incomeDeviceTaxExclude,'0')}"
+                                                       required readonly title="设备类不含税总额"></td>
+                                        </tr>
+                                        <tr>
+                                            <td>收入</td>
+                                            <td>工程类</td>
+                                            <td><input type="text" class="number" name="incomeEngineerTaxInclude"
+                                                       value="${Utils.format(budgetBean.incomeEngineerTaxInclude,'0')}"
+                                                       required readonly title="工程类含税总额"></td>
+                                            <td><input type="text" class="number" name="incomeEngineerTaxExclude"
+                                                       value="${Utils.format(budgetBean.incomeEngineerTaxExclude,'0')}"
+                                                       required readonly title="工程类不含税总额"></td>
+                                        </tr>
+                                        <tr>
+                                            <td>收入</td>
+                                            <td>服务类</td>
+                                            <td><input type="text" class="number" name="incomeServiceTaxInclude"
+                                                       value="${Utils.format(budgetBean.incomeServiceTaxInclude,'0')}"
+                                                       required readonly title="服务类含税总额"></td>
+                                            <td><input type="text" class="number" name="incomeServiceTaxExclude"
+                                                       value="${Utils.format(budgetBean.incomeServiceTaxExclude,'0')}"
+                                                       required readonly title="服务类不含税总额"></td>
+                                        </tr>
+                                        <tr>
+                                            <td>合计</td>
+                                            <td></td>
+                                            <td><input type="text" class="number" name="incomeTotalTaxInclude"
+                                                       value="${Utils.format(budgetBean.incomeTotalTaxInclude,'0')}"
+                                                       readonly required title="此列累计"></td>
+                                            <td><input type="text" class="number" name="incomeTotalTaxExclude"
+                                                       value="${Utils.format(budgetBean.incomeTotalTaxExclude,'0')}"
+                                                       readonly required title="此列累计"></td>
+                                        </tr>
+                                        </tbody>
+                                    </table>
+                                    <span class="am-text-lg">成本</span>
+                                    <#-- <span class="am-text-primary"><a style="cursor: pointer"  id="cost-detail">采购成本明细表</a></span>
+                                     <span class="am-text-primary"><a style="cursor: pointer"  id="cost-project-manage-detail">项目管理成本表</a></span>-->
+                                    <table class="am-table am-table-bordered am-table-radius table-main"
+                                           style="padding:0;">
+                                        <tbody>
+                                        <tr class="am-text-lg">
+                                            <td>类别</td>
+                                            <td>费用</td>
+                                            <td>费用项目</td>
+                                            <td>含税金额（元）</td>
+                                            <td>不含税金额（元）</td>
+                                        </tr>
+                                        <tr>
+                                            <td>成本</td>
+                                            <td>采购成本</td>
+                                            <td>设备</td>
+                                            <td><input type="text" class="number" name="costPurchaseDeviceTaxInclude"
+                                                       value="${Utils.format(budgetBean.costPurchaseDeviceTaxInclude,'0')}"
+                                                       readonly required title="购买设备含税总额"></td>
+                                            <td><input type="text" class="number" name="costPurchaseDeviceTaxExclude"
+                                                       value="${Utils.format(budgetBean.costPurchaseDeviceTaxExclude,'0')}"
+                                                       readonly required title="购买设备不含税总额"></td>
+                                        </tr>
+                                        <tr>
+                                            <td>成本</td>
+                                            <td>采购成本</td>
+                                            <td>施工</td>
+                                            <td><input type="text" class="number" name="costPurchaseBuildTaxInclude"
+                                                       value="${Utils.format(budgetBean.costPurchaseBuildTaxInclude,'0')}"
+                                                       readonly required title="购买施工含税总额"></td>
+                                            <td><input type="text" class="number" name="costPurchaseBuildTaxExclude"
+                                                       value="${Utils.format(budgetBean.costPurchaseBuildTaxExclude,'0')}"
+                                                       readonly required title="购买施工不含税总额"></td>
+                                        </tr>
+                                        <tr>
+                                            <td>成本</td>
+                                            <td>采购成本</td>
+                                            <td>服务</td>
+                                            <td><input type="text" class="number" name="costPurchaseServiceTaxInclude"
+                                                       value="${Utils.format(budgetBean.costPurchaseServiceTaxInclude,'0')}"
+                                                       readonly required title="购买服务含税总额"></td>
+                                            <td><input type="text" class="number" name="costPurchaseServiceTaxExclude"
+                                                       value="${Utils.format(budgetBean.costPurchaseServiceTaxExclude,'0')}"
+                                                       readonly required title="购买服务不含税总额"></td>
+                                        </tr>
+                                        <tr>
+                                            <td>成本</td>
+                                            <td>采购成本</td>
+                                            <td>其他</td>
+                                            <td><input type="text" class="number" name="costPurchaseOtherTaxInclude"
+                                                       value="${Utils.format(budgetBean.costPurchaseOtherTaxInclude,'0')}"
+                                                       readonly required title="购买其他含税总额"></td>
+                                            <td><input type="text" class="number" name="costPurchaseOtherTaxExclude"
+                                                       value="${Utils.format(budgetBean.costPurchaseOtherTaxExclude,'0')}"
+                                                       readonly required title="购买其他不含税总额"></td>
+                                        </tr>
+                                        <tr>
+                                            <td>成本</td>
+                                            <td>项目管理成本</td>
+                                            <td>项目管理成本</td>
+                                            <td><input type="text" class="number" name="costProjectManageTaxInclude"
+                                                       value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0')}"
+                                                       readonly required title="项目管理成本总额"></td>
+                                            <td><input type="text" class="number" name="costProjectManageTaxExclude"
+                                                       value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0')}"
+                                                       readonly required title="项目管理成本总额"></td>
+                                        </tr>
+                                        <tr>
+                                            <td>成本</td>
+                                            <td>其他</td>
+                                            <td>${project.otherName!}</td>
+                                            <td><input type="text" class="number" name="costOtherOtherTaxInclude"
+                                                       value="${Utils.format(budgetBean.costOtherOtherTaxInclude,'0')}"
+                                                       required readonly title="其他含税总额（填入）"></td>
+                                            <td><input type="text" class="number" name="costOtherOtherTaxExclude"
+                                                       value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0')}"
+                                                       required readonly title="其他不含税总额（填入）"></td>
+                                        </tr>
+                                        <tr>
+                                            <td>合计</td>
+                                            <td></td>
+                                            <td></td>
+                                            <td><input type="text" class="number" name="costTotalTaxInclude"
+                                                       value="${Utils.format(budgetBean.costTotalTaxInclude,'0')}"
+                                                       readonly required title="此列累计"></td>
+                                            <td><input type="text" class="number" name="costTotalTaxExclude"
+                                                       value="${Utils.format(budgetBean.costTotalTaxExclude,'0')}"
+                                                       readonly required title="此列累计"></td>
+                                        </tr>
+                                        </tbody>
+                                    </table>
+                                    <span class="am-text-lg">管理</span>
+                                    <#--<span class="am-text-primary budget-plan-detail"><a style="cursor: pointer">资金计划表</a></span>-->
+                                    <table class="am-table am-table-bordered am-table-radius table-main"
+                                           style="padding:0;">
+                                        <tbody>
+                                        <tr class="am-text-lg">
+                                            <td>类别</td>
+                                            <td>费用项目</td>
+                                            <td>不含税金额（元）</td>
+                                        </tr>
+                                        <tr>
+                                            <td>财务费用</td>
+                                            <td>资金占用成本</td>
+                                            <td><input type="text" class="number" name="costExpropriationTaxExclude"
+                                                       value="${Utils.format(budgetBean.costExpropriationTaxExclude,'0')}"
+                                                       required readonly title="资金占用成本不含税总额"></td>
+                                        </tr>
+                                        <tr>
+                                            <td>公司管理费用</td>
+                                            <td></td>
+                                            <td><input type="text" class="number" name="costCompanyManageTaxExclude"
+                                                       value="${Utils.format(budgetBean.costCompanyManageTaxExclude,'0')}"
+                                                       required readonly title="公司管理费用不含税总额"></td>
+                                        </tr>
+                                        </tbody>
+                                    </table>
                                 </tbody>
                             </table>
 
@@ -935,104 +1218,145 @@
                                 </tbody>
                             </table>
 
-                            <span class="am-text-lg">利润率计算</span>
-                            <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;">
-                                <tbody>
-                                <tr class="am-text-lg">
-                                    <td>类别</td>
-                                    <td></td>
-                                </tr>
-                                <tr>
-                                    <td>项目毛利（元）</td>
-                                    <td><input type="text" class="number" name="projectGrossProfit" value="${Utils.format(budgetBean.projectGrossProfit,'0')}" readonly required title="收入总计（不含税）-成本总计（不含税）-财务费用总计（不含税）"></td>
-                                </tr>
-                                <tr>
-                                    <td>项目毛利率（%）</td>
-                                    <td><input type="text" class="number" name="projectGrossProfitRate" value="${Utils.format(budgetBean.projectGrossProfitRate,'0')}" readonly required title="毛利（不含税）/收入总计（不含税）"></td>
-                                </tr>
-                                <tr>
-                                    <td>项目贡献利润（元）</td>
-                                    <td><input type="text" class="number" name="projectContributionProfit" value="${Utils.format(budgetBean.projectContributionProfit,'0')}" readonly required title="项目毛利（不含税）-公司管理费用总计（不含税）"></td>
-                                </tr>
-                                <tr>
-                                    <td>项目贡献利润率（%）</td>
-                                    <td><input type="text" class="number" name="projectContributionProfitRate" value="${Utils.format(budgetBean.projectContributionProfitRate,'0')}" readonly required title="贡献利润（不含税）/收入总计（不含税）"></td>
-                                </tr>
-                                </tbody>
-                            </table>
+                                    <span class="am-text-lg">利润率计算</span>
+                                    <table class="am-table am-table-bordered am-table-radius table-main"
+                                           style="padding:0;">
+                                        <tbody>
+                                        <tr class="am-text-lg">
+                                            <td>类别</td>
+                                            <td></td>
+                                        </tr>
+                                        <tr>
+                                            <td>项目毛利（元）</td>
+                                            <td><input type="text" class="number" name="projectGrossProfit"
+                                                       value="${Utils.format(budgetBean.projectGrossProfit,'0')}"
+                                                       readonly required title="收入总计（不含税）-成本总计（不含税）-财务费用总计（不含税）"></td>
+                                        </tr>
+                                        <tr>
+                                            <td>项目毛利率（%）</td>
+                                            <td><input type="text" class="number" name="projectGrossProfitRate"
+                                                       value="${Utils.format(budgetBean.projectGrossProfitRate,'0')}"
+                                                       readonly required title="毛利（不含税）/收入总计（不含税）"></td>
+                                        </tr>
+                                        <tr>
+                                            <td>项目贡献利润（元）</td>
+                                            <td><input type="text" class="number" name="projectContributionProfit"
+                                                       value="${Utils.format(budgetBean.projectContributionProfit,'0')}"
+                                                       readonly required title="项目毛利（不含税）-公司管理费用总计（不含税）"></td>
+                                        </tr>
+                                        <tr>
+                                            <td>项目贡献利润率（%）</td>
+                                            <td><input type="text" class="number" name="projectContributionProfitRate"
+                                                       value="${Utils.format(budgetBean.projectContributionProfitRate,'0')}"
+                                                       readonly required title="贡献利润（不含税）/收入总计（不含税）"></td>
+                                        </tr>
+                                        </tbody>
+                                    </table>
 
-                            <span class="am-text-lg">现金流量表</span>
-                            <#--<span class="am-text-primary budget-plan-detail"><a style="cursor: pointer">资金计划表</a></span>-->
-                            <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;">
-                                <tbody>
-                                <tr class="am-text-lg">
-                                    <td>类别</td>
-                                    <td>金额（元）</td>
-                                </tr>
-                                <tr>
-                                    <td>销售商品、提供劳务收到的现金</td>
-                                    <td><input type="text" class="number" name="saleIncomeCash" value="${Utils.format(cashFlowBean.saleIncomeCash,'0')}" readonly required title="取自资金计划表（销售收款）"></td>
-                                </tr>
-                                <tr>
-                                    <td>收到的税费返还</td>
-                                    <td>/<input type="hidden" name="taxReturn" value="${Utils.format(cashFlowBean.taxReturn,'0')}" readonly required></td>
-                                </tr>
-                                <tr>
-                                    <td>收到其他与经营活动有关的现金</td>
-                                    <td><input type="text" class="number" name="earnestMoneyIncome" value="${Utils.format(cashFlowBean.earnestMoneyIncome,'0')}" readonly required title="取自资金计划表（保证金收款）"></td>
-                                </tr>
-                                <tr>
-                                    <td>购买商品、接受劳务支付的现金</td>
-                                    <td><input type="text" class="number" name="purchaseCost" value="${Utils.format(cashFlowBean.purchaseCost,'0')}" readonly required title="取自资金计划表（设备支出+工程支出）"></td>
-                                </tr>
-                                <tr>
-                                    <td>支付的各项税费</td>
-                                    <td>/<input type="hidden" name="taxCost" value="${Utils.format(cashFlowBean.taxCost,'0')}" readonly required></td>
-                                </tr>
-                                <tr>
-                                    <td>支付其他与经营活动有关的现金</td>
-                                    <td><input type="text" class="number" name="earnestMoneyCost" value="${Utils.format(cashFlowBean.earnestMoneyCost,'0')}" readonly required title="取自资金计划表（经营性开支+保证金支出+资金利息）"></td>
-                                </tr>
-                                <tr>
-                                    <td>经营活动产生的现金流量净额</td>
-                                    <td><input type="text" class="number" name="netCashFlow" value="${Utils.format(cashFlowBean.netCashFlow,'0')}" readonly required title="g=a+c+b-d-f-e"></td>
-                                </tr>
-                                <tr>
-                                    <td>投资活动现金流入</td>
-                                    <td>/<input type="hidden" name="cashInflowFromInvestingActivities" value="${Utils.format(cashFlowBean.cashInflowFromInvestingActivities,'0')}" readonly required></td>
-                                </tr>
-                                <tr>
-                                    <td>投资活动现金流出</td>
-                                    <td>/<input type="hidden" name="cashOutflowFromInvestingActivities" value="${Utils.format(cashFlowBean.cashOutflowFromInvestingActivities,'0')}" readonly required></td>
-                                </tr>
-                                <tr>
-                                    <td>投资活动产生的现金流量净额</td>
-                                    <td>/<input type="hidden" name="netCashFromInvestingActivities" value="${Utils.format(cashFlowBean.netCashFromInvestingActivities,'0')}" readonly required></td>
-                                </tr>
-                                <tr>
-                                    <td>融资资金流入</td>
-                                    <td><input type="text" class="number" name="financingCapitalInflow" value="${Utils.format(cashFlowBean.financingCapitalInflow,'0')}" readonly required title="从资金计划表查（垫资计划）"></td>
-                                </tr>
-                                <tr>
-                                    <td>还款资金流出</td>
-                                    <td><input type="text" class="number" name="financingCapitalOutflow" value="${Utils.format(cashFlowBean.financingCapitalOutflow,'0')}" readonly required title="从资金计划表查（还款计划）"></td>
-                                </tr>
-                                <tr>
-                                    <td>筹资活动产生的现金流量净额</td>
-                                    <td><input type="text" class="number" name="financingCapitalCashflow" value="${Utils.format(cashFlowBean.financingCapitalCashflow,'0')}" readonly required title="m=k-l"></td>
-                                </tr>
-                                <tr>
-                                    <td>货币资金净增加额</td>
-                                    <td><input type="text" class="number" name="netIncreaseMonetaryFunds" value="${Utils.format(cashFlowBean.netIncreaseMonetaryFunds,'0')}" readonly required title="n=g+j+m"></td>
-                                </tr>
-                                </tbody>
-                            </table>
+                                    <span class="am-text-lg">现金流量表</span>
+                                    <#--<span class="am-text-primary budget-plan-detail"><a style="cursor: pointer">资金计划表</a></span>-->
+                                    <table class="am-table am-table-bordered am-table-radius table-main"
+                                           style="padding:0;">
+                                        <tbody>
+                                        <tr class="am-text-lg">
+                                            <td>类别</td>
+                                            <td>金额（元）</td>
+                                        </tr>
+                                        <tr>
+                                            <td>销售商品、提供劳务收到的现金</td>
+                                            <td><input type="text" class="number" name="saleIncomeCash"
+                                                       value="${Utils.format(cashFlowBean.saleIncomeCash,'0')}" readonly
+                                                       required title="取自资金计划表（销售收款）"></td>
+                                        </tr>
+                                        <tr>
+                                            <td>收到的税费返还</td>
+                                            <td>/<input type="hidden" name="taxReturn"
+                                                        value="${Utils.format(cashFlowBean.taxReturn,'0')}" readonly
+                                                        required></td>
+                                        </tr>
+                                        <tr>
+                                            <td>收到其他与经营活动有关的现金</td>
+                                            <td><input type="text" class="number" name="earnestMoneyIncome"
+                                                       value="${Utils.format(cashFlowBean.earnestMoneyIncome,'0')}"
+                                                       readonly required title="取自资金计划表（保证金收款）"></td>
+                                        </tr>
+                                        <tr>
+                                            <td>购买商品、接受劳务支付的现金</td>
+                                            <td><input type="text" class="number" name="purchaseCost"
+                                                       value="${Utils.format(cashFlowBean.purchaseCost,'0')}" readonly
+                                                       required title="取自资金计划表（设备支出+工程支出）"></td>
+                                        </tr>
+                                        <tr>
+                                            <td>支付的各项税费</td>
+                                            <td>/<input type="hidden" name="taxCost"
+                                                        value="${Utils.format(cashFlowBean.taxCost,'0')}" readonly
+                                                        required></td>
+                                        </tr>
+                                        <tr>
+                                            <td>支付其他与经营活动有关的现金</td>
+                                            <td><input type="text" class="number" name="earnestMoneyCost"
+                                                       value="${Utils.format(cashFlowBean.earnestMoneyCost,'0')}"
+                                                       readonly required title="取自资金计划表（经营性开支+保证金支出+资金利息）"></td>
+                                        </tr>
+                                        <tr>
+                                            <td>经营活动产生的现金流量净额</td>
+                                            <td><input type="text" class="number" name="netCashFlow"
+                                                       value="${Utils.format(cashFlowBean.netCashFlow,'0')}" readonly
+                                                       required title="g=a+c+b-d-f-e"></td>
+                                        </tr>
+                                        <tr>
+                                            <td>投资活动现金流入</td>
+                                            <td>/<input type="hidden" name="cashInflowFromInvestingActivities"
+                                                        value="${Utils.format(cashFlowBean.cashInflowFromInvestingActivities,'0')}"
+                                                        readonly required></td>
+                                        </tr>
+                                        <tr>
+                                            <td>投资活动现金流出</td>
+                                            <td>/<input type="hidden" name="cashOutflowFromInvestingActivities"
+                                                        value="${Utils.format(cashFlowBean.cashOutflowFromInvestingActivities,'0')}"
+                                                        readonly required></td>
+                                        </tr>
+                                        <tr>
+                                            <td>投资活动产生的现金流量净额</td>
+                                            <td>/<input type="hidden" name="netCashFromInvestingActivities"
+                                                        value="${Utils.format(cashFlowBean.netCashFromInvestingActivities,'0')}"
+                                                        readonly required></td>
+                                        </tr>
+                                        <tr>
+                                            <td>融资资金流入</td>
+                                            <td><input type="text" class="number" name="financingCapitalInflow"
+                                                       value="${Utils.format(cashFlowBean.financingCapitalInflow,'0')}"
+                                                       readonly required title="从资金计划表查（垫资计划）"></td>
+                                        </tr>
+                                        <tr>
+                                            <td>还款资金流出</td>
+                                            <td><input type="text" class="number" name="financingCapitalOutflow"
+                                                       value="${Utils.format(cashFlowBean.financingCapitalOutflow,'0')}"
+                                                       readonly required title="从资金计划表查（还款计划）"></td>
+                                        </tr>
+                                        <tr>
+                                            <td>筹资活动产生的现金流量净额</td>
+                                            <td><input type="text" class="number" name="financingCapitalCashflow"
+                                                       value="${Utils.format(cashFlowBean.financingCapitalCashflow,'0')}"
+                                                       readonly required title="m=k-l"></td>
+                                        </tr>
+                                        <tr>
+                                            <td>货币资金净增加额</td>
+                                            <td><input type="text" class="number" name="netIncreaseMonetaryFunds"
+                                                       value="${Utils.format(cashFlowBean.netIncreaseMonetaryFunds,'0')}"
+                                                       readonly required title="n=g+j+m"></td>
+                                        </tr>
+                                        </tbody>
+                                    </table>
+                                </div>
+                            </div>
                         </div>
                         <!--验证表单元素（validate end-->
                     </div>
 
                     <div class="am-tabs-bd">
-                        <div <#if check==0>class="am-tab-panel am-fade am-in am-active" <#else> class="am-tab-panel am-fade am-in"</#if> id="tab4">
+                        <div <#if check==0>class="am-tab-panel am-fade am-in am-active" <#else> class="am-tab-panel am-fade am-in"</#if>
+                             id="tab4">
                             <#if (project.status==10 || project.status==15) && project.approveStatusSettle == 1>
                                 <div class="approve-topass"></div>
                             </#if>
@@ -1042,11 +1366,12 @@
                             <#if (project.status==10 || project.status==15) && project.approveStatusSettle == 3>
                                 <div class="approve-nopass"></div>
                             </#if>
-                            <input name="id" id="id" type="hidden" value="${project.id}" />
+                            <input name="id" id="id" type="hidden" value="${project.id}"/>
                             <div class="am-u-sm-10">
                                 <div class="am-form am-form-inline">
                                     <div class="am-form-group am-form-icon">
-                                        <input type="text" id="time" name="time" autocomplete="off" readonly value="${time!}">
+                                        <input type="text" id="time" name="time" autocomplete="off" readonly
+                                               value="${time!}">
                                     </div>
                                 </div>
                             </div>
@@ -1067,38 +1392,78 @@
                                 <tr>
                                     <td>收入</td>
                                     <td>设备类</td>
-                                    <td><input name="incomeDeviceEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateIncomeDevice,'0')}" required readonly title="设备类概算总额"></td>
-                                    <td><input name="incomeDeviceBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetIncomeDevice,'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 type="text" class="number" name="incomeDevice" value="${Utils.format(monthBean.incomeDevice,'0')}" readonly required title="本月结算金额"></td>
-                                    <td><input type="text" class="number" name="incomeDeviceSettleTotal" value="${Utils.format(currentBean.incomeDeviceTaxExclude,'0')}" readonly title="设备类结算总额"></td>
+                                    <td><input name="incomeDeviceEstimateTotal" type="text" class="number"
+                                               value="${Utils.format(monthBean.estimateIncomeDevice,'0')}" required
+                                               readonly title="设备类概算总额"></td>
+                                    <td><input name="incomeDeviceBudgetTotal" type="text" class="number"
+                                               value="${Utils.format(monthBean.budgetIncomeDevice,'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 type="text" class="number" name="incomeDevice"
+                                               value="${Utils.format(monthBean.incomeDevice,'0')}" readonly required
+                                               title="本月结算金额"></td>
+                                    <td><input type="text" class="number" name="incomeDeviceSettleTotal"
+                                               value="${Utils.format(currentBean.incomeDeviceTaxExclude,'0')}" readonly
+                                               title="设备类结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>收入</td>
                                     <td>工程类</td>
-                                    <td><input name="incomeEngineerEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateIncomeEngineer,'0')}" required readonly title="工程类概算总额"></td>
-                                    <td><input name="incomeEngineerBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetIncomeEngineer,'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 type="text" class="number" name="incomeEngineer" value="${Utils.format(monthBean.incomeEngineer,'0')}" readonly required title="工程类本月结算金额"></td>
-                                    <td><input type="text" class="number" name="incomeEngineerSettleTotal" value="${Utils.format(currentBean.incomeEngineerTaxExclude,'0')}" readonly title="工程类结算总额"></td>
+                                    <td><input name="incomeEngineerEstimateTotal" type="text" class="number"
+                                               value="${Utils.format(monthBean.estimateIncomeEngineer,'0')}" required
+                                               readonly title="工程类概算总额"></td>
+                                    <td><input name="incomeEngineerBudgetTotal" type="text" class="number"
+                                               value="${Utils.format(monthBean.budgetIncomeEngineer,'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 type="text" class="number" name="incomeEngineer"
+                                               value="${Utils.format(monthBean.incomeEngineer,'0')}" readonly required
+                                               title="工程类本月结算金额"></td>
+                                    <td><input type="text" class="number" name="incomeEngineerSettleTotal"
+                                               value="${Utils.format(currentBean.incomeEngineerTaxExclude,'0')}"
+                                               readonly title="工程类结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>收入</td>
                                     <td>服务类</td>
-                                    <td><input name="incomeServiceEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateIncomeService,'0')}" required readonly title="服务类概算总额"></td>
-                                    <td><input name="incomeServiceBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetIncomeService,'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 type="text" class="number" name="incomeService" value="${Utils.format(monthBean.incomeService,'0')}" readonly required title="服务类本月结算金额"></td>
-                                    <td><input type="text" class="number" name="incomeServiceSettleTotal" value="${Utils.format(currentBean.incomeServiceTaxExclude,'0')}" readonly title="服务类结算总额"></td>
+                                    <td><input name="incomeServiceEstimateTotal" type="text" class="number"
+                                               value="${Utils.format(monthBean.estimateIncomeService,'0')}" required
+                                               readonly title="服务类概算总额"></td>
+                                    <td><input name="incomeServiceBudgetTotal" type="text" class="number"
+                                               value="${Utils.format(monthBean.budgetIncomeService,'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 type="text" class="number" name="incomeService"
+                                               value="${Utils.format(monthBean.incomeService,'0')}" readonly required
+                                               title="服务类本月结算金额"></td>
+                                    <td><input type="text" class="number" name="incomeServiceSettleTotal"
+                                               value="${Utils.format(currentBean.incomeServiceTaxExclude,'0')}" readonly
+                                               title="服务类结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>合计</td>
                                     <td></td>
-                                    <td><input name="incomeEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.getEstimateIncomeTotal(),'0')}" readonly required title="此列累计"></td>
-                                    <td><input name="incomeBudgetTotal" type="text" class="number"  value="${Utils.format(monthBean.getBudgetIncomeTotal(),'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 type="text" class="number" name="incomeTotal" value="${Utils.format(monthBean.getIncomeTotal(),'0')}" readonly title="此列累计"></td>
-                                    <td><input type="text" class="number" name="incomeSettleTotal" value="${Utils.format(currentBean.getIncomeTotalTaxExclude(),'0')}" readonly title="此列累计"></td>
+                                    <td><input name="incomeEstimateTotal" type="text" class="number"
+                                               value="${Utils.format(monthBean.getEstimateIncomeTotal(),'0')}" readonly
+                                               required title="此列累计"></td>
+                                    <td><input name="incomeBudgetTotal" type="text" class="number"
+                                               value="${Utils.format(monthBean.getBudgetIncomeTotal(),'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 type="text" class="number" name="incomeTotal"
+                                               value="${Utils.format(monthBean.getIncomeTotal(),'0')}" readonly
+                                               title="此列累计"></td>
+                                    <td><input type="text" class="number" name="incomeSettleTotal"
+                                               value="${Utils.format(currentBean.getIncomeTotalTaxExclude(),'0')}"
+                                               readonly title="此列累计"></td>
                                 </tr>
                                 </tbody>
                             </table>
@@ -1119,51 +1484,101 @@
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>设备</td>
-                                    <td><input name="costPurchaseDeviceEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateCostPurchaseDevice,'0')}" readonly required title="购买设备概算总额"></td>
-                                    <td><input name="costPurchaseDeviceBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetCostPurchaseDevice,'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 type="text" class="number" name="costPurchaseDevice" value="${Utils.format(monthBean.costPurchaseDevice,'0')}" readonly required title="购买设备本月结算总额"></td>
-                                    <td><input type="text" class="number" name="costPurchaseDeviceSettleTotal" value="${Utils.format(currentBean.costPurchaseDeviceTaxExclude,'0')}" readonly title="购买设备结算总额"></td>
+                                    <td><input name="costPurchaseDeviceEstimateTotal" type="text" class="number"
+                                               value="${Utils.format(monthBean.estimateCostPurchaseDevice,'0')}"
+                                               readonly required title="购买设备概算总额"></td>
+                                    <td><input name="costPurchaseDeviceBudgetTotal" type="text" class="number"
+                                               value="${Utils.format(monthBean.budgetCostPurchaseDevice,'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 type="text" class="number" name="costPurchaseDevice"
+                                               value="${Utils.format(monthBean.costPurchaseDevice,'0')}" readonly
+                                               required title="购买设备本月结算总额"></td>
+                                    <td><input type="text" class="number" name="costPurchaseDeviceSettleTotal"
+                                               value="${Utils.format(currentBean.costPurchaseDeviceTaxExclude,'0')}"
+                                               readonly title="购买设备结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>施工</td>
-                                    <td><input name="costPurchaseBuildEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateCostPurchaseBuild,'0')}" readonly required title="施工采购成本概算总额"></td>
-                                    <td><input name="costPurchaseBuildBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetCostPurchaseBuild,'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 type="text" class="number" name="costPurchaseBuild" value="${Utils.format(monthBean.costPurchaseBuild,'0')}" readonly required title="施工采购成本本月结算金额"></td>
-                                    <td><input type="text" class="number" name="costPurchaseBuildSettleTotal" value="${Utils.format(currentBean.costPurchaseBuildTaxExclude,'0')}" readonly title="施工采购成本结算总额"></td>
+                                    <td><input name="costPurchaseBuildEstimateTotal" type="text" class="number"
+                                               value="${Utils.format(monthBean.estimateCostPurchaseBuild,'0')}" readonly
+                                               required title="施工采购成本概算总额"></td>
+                                    <td><input name="costPurchaseBuildBudgetTotal" type="text" class="number"
+                                               value="${Utils.format(monthBean.budgetCostPurchaseBuild,'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 type="text" class="number" name="costPurchaseBuild"
+                                               value="${Utils.format(monthBean.costPurchaseBuild,'0')}" readonly
+                                               required title="施工采购成本本月结算金额"></td>
+                                    <td><input type="text" class="number" name="costPurchaseBuildSettleTotal"
+                                               value="${Utils.format(currentBean.costPurchaseBuildTaxExclude,'0')}"
+                                               readonly title="施工采购成本结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>服务</td>
-                                    <td><input name="costPurchaseServiceEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateCostPurchaseService,'0')}" readonly required title="服务采购成本概算总额"></td>
-                                    <td><input name="costPurchaseServiceBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetCostPurchaseService,'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 type="text" class="number" name="costPurchaseService" value="${Utils.format(monthBean.costPurchaseService,'0')}" readonly required title="服务采购成本本月结算金额"></td>
-                                    <td><input type="text" class="number" name="costPurchaseServiceSettleTotal" value="${Utils.format(currentBean.costPurchaseServiceTaxExclude,'0')}" readonly title="服务采购成本结算总额"></td>
+                                    <td><input name="costPurchaseServiceEstimateTotal" type="text" class="number"
+                                               value="${Utils.format(monthBean.estimateCostPurchaseService,'0')}"
+                                               readonly required title="服务采购成本概算总额"></td>
+                                    <td><input name="costPurchaseServiceBudgetTotal" type="text" class="number"
+                                               value="${Utils.format(monthBean.budgetCostPurchaseService,'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 type="text" class="number" name="costPurchaseService"
+                                               value="${Utils.format(monthBean.costPurchaseService,'0')}" readonly
+                                               required title="服务采购成本本月结算金额"></td>
+                                    <td><input type="text" class="number" name="costPurchaseServiceSettleTotal"
+                                               value="${Utils.format(currentBean.costPurchaseServiceTaxExclude,'0')}"
+                                               readonly title="服务采购成本结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>其他</td>
-                                    <td><input name="costPurchaseOtherEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateCostPurchaseOther,'0')}" readonly required title="其他采购成本概算总额"></td>
-                                    <td><input name="costPurchaseOtherBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetCostPurchaseOther,'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 type="text" class="number" name="costPurchaseOther" value="${Utils.format(monthBean.costPurchaseOther,'0')}" readonly required title="其他采购成本本月结算金额"></td>
-                                    <td><input type="text" class="number" name="costPurchaseOtherSettleTotal" value="${Utils.format(currentBean.costPurchaseOtherTaxExclude,'0')}" readonly title="其他采购成本结算总额"></td>
+                                    <td><input name="costPurchaseOtherEstimateTotal" type="text" class="number"
+                                               value="${Utils.format(monthBean.estimateCostPurchaseOther,'0')}" readonly
+                                               required title="其他采购成本概算总额"></td>
+                                    <td><input name="costPurchaseOtherBudgetTotal" type="text" class="number"
+                                               value="${Utils.format(monthBean.budgetCostPurchaseOther,'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 type="text" class="number" name="costPurchaseOther"
+                                               value="${Utils.format(monthBean.costPurchaseOther,'0')}" readonly
+                                               required title="其他采购成本本月结算金额"></td>
+                                    <td><input type="text" class="number" name="costPurchaseOtherSettleTotal"
+                                               value="${Utils.format(currentBean.costPurchaseOtherTaxExclude,'0')}"
+                                               readonly title="其他采购成本结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
                                     <td>项目管理成本</td>
                                     <td>项目管理成本</td>
-                                    <td><input name="costProjectManageEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateCostProjectManage,'0')}" readonly required title="项目管理成本概算总额"></td>
-                                    <td><input name="costProjectManageBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetCostProjectManage,'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 type="text" class="number" name="costProjectManage" value="${Utils.format(monthBean.costProjectManage,'0')}" readonly required title="项目管理成本本月结算金额"></td>
-                                    <td><input type="text" class="number" name="costProjectManageSettleTotal" value="${Utils.format(currentBean.costProjectManageTaxExclude,'0')}" readonly title="项目管理成本结算总额"></td>
+                                    <td><input name="costProjectManageEstimateTotal" type="text" class="number"
+                                               value="${Utils.format(monthBean.estimateCostProjectManage,'0')}" readonly
+                                               required title="项目管理成本概算总额"></td>
+                                    <td><input name="costProjectManageBudgetTotal" type="text" class="number"
+                                               value="${Utils.format(monthBean.budgetCostProjectManage,'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 type="text" class="number" name="costProjectManage"
+                                               value="${Utils.format(monthBean.costProjectManage,'0')}" readonly
+                                               required title="项目管理成本本月结算金额"></td>
+                                    <td><input type="text" class="number" name="costProjectManageSettleTotal"
+                                               value="${Utils.format(currentBean.costProjectManageTaxExclude,'0')}"
+                                               readonly title="项目管理成本结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
@@ -1174,16 +1589,41 @@
                                     <td><input name="costOtherFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costOtherOtherTaxExclude,'0.00')}" required readonly title="其他成本上月结算总额"></td>
                                     <td><input type="text" class="number" name="costOther" value="${Utils.format(monthBean.costOther,'0.00')}" required readonly title="其他成本本月结算金额"></td>
                                     <td><input type="text" class="number" name="costOtherSettleTotal" value="${Utils.format(currentBean.costOtherOtherTaxExclude,'0.00')}" readonly title="其他成本结算总额"></td>
+                                    <td><input name="costOtherEstimateTotal" type="text" class="number"
+                                               value="${Utils.format(monthBean.estimateCostOther,'0')}" readonly
+                                               required title="其他成本概算总额"></td>
+                                    <td><input name="costOtherBudgetTotal" type="text" class="number"
+                                               value="${Utils.format(monthBean.budgetCostOther,'0')}" readonly required
+                                               title="其他成本预算总额"></td>
+                                    <td><input name="costOtherFormerSettleTotal" type="text" class="number"
+                                               value="${Utils.format(formerBean.costOtherOtherTaxExclude,'0')}" required
+                                               readonly title="其他成本上月结算总额"></td>
+                                    <td><input type="text" class="number" name="costOther"
+                                               value="${Utils.format(monthBean.costOther,'0')}" required readonly
+                                               title="其他成本本月结算金额"></td>
+                                    <td><input type="text" class="number" name="costOtherSettleTotal"
+                                               value="${Utils.format(currentBean.costOtherOtherTaxExclude,'0')}"
+                                               readonly title="其他成本结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>合计</td>
                                     <td></td>
                                     <td></td>
-                                    <td><input name="costEstimateTotal" value="${Utils.format(monthBean.getEstimateCostTotal(),'0')}" type="text" class="number" readonly required title="此列累计"></td>
-                                    <td><input name="costBudgetTotal" value="${Utils.format(monthBean.getBudgetCostTotal(),'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 type="text" class="number" name="costTotal" value="${Utils.format(monthBean.getCostTotal(),'0')}" readonly title="此列累计"></td>
-                                    <td><input type="text" class="number" name="costSettleTotal" value="${Utils.format(currentBean.getCostTotalTaxExclude(),'0')}" readonly title="此列累计"></td>
+                                    <td><input name="costEstimateTotal"
+                                               value="${Utils.format(monthBean.getEstimateCostTotal(),'0')}" type="text"
+                                               class="number" readonly required title="此列累计"></td>
+                                    <td><input name="costBudgetTotal"
+                                               value="${Utils.format(monthBean.getBudgetCostTotal(),'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 type="text" class="number" name="costTotal"
+                                               value="${Utils.format(monthBean.getCostTotal(),'0')}" readonly
+                                               title="此列累计"></td>
+                                    <td><input type="text" class="number" name="costSettleTotal"
+                                               value="${Utils.format(currentBean.getCostTotalTaxExclude(),'0')}"
+                                               readonly title="此列累计"></td>
                                 </tr>
                                 </tbody>
                             </table>
@@ -1202,38 +1642,74 @@
                                 <tr>
                                     <td>财务费用</td>
                                     <td>资金占用成本</td>
-                                    <td><input name="costExpropriationEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateCostExpropriation,'0')}" required readonly title="资金占用成本概算总额"></td>
-                                    <td><input name="costExpropriationBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetCostExpropriation,'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 type="text" class="number" name="costExpropriation" value="${Utils.format(monthBean.costExpropriation,'0')}" readonly required title="资金占用成本本月结算金额"></td>
-                                    <td><input type="text" class="number" name="costExpropriationSettleTotal" value="${Utils.format(currentBean.costExpropriationTaxExclude,'0')}" readonly title="资金占用成本结算总额"></td>
+                                    <td><input name="costExpropriationEstimateTotal" type="text" class="number"
+                                               value="${Utils.format(monthBean.estimateCostExpropriation,'0')}" required
+                                               readonly title="资金占用成本概算总额"></td>
+                                    <td><input name="costExpropriationBudgetTotal" type="text" class="number"
+                                               value="${Utils.format(monthBean.budgetCostExpropriation,'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 type="text" class="number" name="costExpropriation"
+                                               value="${Utils.format(monthBean.costExpropriation,'0')}" readonly
+                                               required title="资金占用成本本月结算金额"></td>
+                                    <td><input type="text" class="number" name="costExpropriationSettleTotal"
+                                               value="${Utils.format(currentBean.costExpropriationTaxExclude,'0')}"
+                                               readonly title="资金占用成本结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>公司管理费用</td>
                                     <td></td>
-                                    <td><input name="costCompanyManageEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateCostCompanyManage,'0')}" required readonly title="公司管理费用概算总额"></td>
-                                    <td><input name="costCompanyManageBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetCostCompanyManage,'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 type="text" class="number" name="costCompanyManage" value="${Utils.format(monthBean.costCompanyManage,'0')}" readonly required title="公司管理费用本月结算金额"></td>
-                                    <td><input type="text" class="number" name="costCompanyManageSettleTotal" value="${Utils.format(currentBean.costCompanyManageTaxExclude,'0')}" readonly title="公司管理费用结算总额"></td>
+                                    <td><input name="costCompanyManageEstimateTotal" type="text" class="number"
+                                               value="${Utils.format(monthBean.estimateCostCompanyManage,'0')}" required
+                                               readonly title="公司管理费用概算总额"></td>
+                                    <td><input name="costCompanyManageBudgetTotal" type="text" class="number"
+                                               value="${Utils.format(monthBean.budgetCostCompanyManage,'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 type="text" class="number" name="costCompanyManage"
+                                               value="${Utils.format(monthBean.costCompanyManage,'0')}" readonly
+                                               required title="公司管理费用本月结算金额"></td>
+                                    <td><input type="text" class="number" name="costCompanyManageSettleTotal"
+                                               value="${Utils.format(currentBean.costCompanyManageTaxExclude,'0')}"
+                                               readonly title="公司管理费用结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>所得税费用</td>
                                     <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 type="text" class="number" name="costIncomeTax" value="${Utils.format(monthBean.costIncomeTax,'0')}" readonly required title="公司管理费用本月结算金额"></td>
-                                    <td><input type="text" class="number" name="costIncomeTaxSettleTotal" value="${Utils.format(currentBean.costIncomeTax,'0')}" readonly title="公司管理费用结算总额"></td>
+                                    <td><input name="costIncomeTaxFormerSettleTotal" type="text" class="number"
+                                               value="${Utils.format(formerBean.costIncomeTax,'0')}" required readonly
+                                               title="公司管理费用上月结算总额"></td>
+                                    <td><input type="text" class="number" name="costIncomeTax"
+                                               value="${Utils.format(monthBean.costIncomeTax,'0')}" readonly required
+                                               title="公司管理费用本月结算金额"></td>
+                                    <td><input type="text" class="number" name="costIncomeTaxSettleTotal"
+                                               value="${Utils.format(currentBean.costIncomeTax,'0')}" readonly
+                                               title="公司管理费用结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>合计</td>
                                     <td></td>
-                                    <td><input name="costManageEstimateTotal" value="${Utils.format(monthBean.getEstimateCostManageTotal(),'0')}" type="text" class="number" readonly required title="此列累计"></td>
-                                    <td><input name="costManageBudgetTotal" value="${Utils.format(monthBean.getBudgetCostManageTotal(),'0')}" type="text" class="number" readonly required title="此列累计"></td>
-                                    <td><input name="costManageFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.getCostManageTotal(),'0')}" required readonly title="此列累计"></td>
-                                    <td><input type="text" class="number" name="costManageTotal" value="${Utils.format(monthBean.getCostManageTotal(),'0')}" readonly title="此列累计"></td>
-                                    <td><input type="text" class="number" name="costManageSettleTotal" value="${Utils.format(currentBean.getCostManageTotal(),'0')}" readonly title="此列累计"></td>
+                                    <td><input name="costManageEstimateTotal"
+                                               value="${Utils.format(monthBean.getEstimateCostManageTotal(),'0')}"
+                                               type="text" class="number" readonly required title="此列累计"></td>
+                                    <td><input name="costManageBudgetTotal"
+                                               value="${Utils.format(monthBean.getBudgetCostManageTotal(),'0')}"
+                                               type="text" class="number" readonly required title="此列累计"></td>
+                                    <td><input name="costManageFormerSettleTotal" type="text" class="number"
+                                               value="${Utils.format(formerBean.getCostManageTotal(),'0')}" required
+                                               readonly title="此列累计"></td>
+                                    <td><input type="text" class="number" name="costManageTotal"
+                                               value="${Utils.format(monthBean.getCostManageTotal(),'0')}" readonly
+                                               title="此列累计"></td>
+                                    <td><input type="text" class="number" name="costManageSettleTotal"
+                                               value="${Utils.format(currentBean.getCostManageTotal(),'0')}" readonly
+                                               title="此列累计"></td>
                                 </tr>
                                 </tbody>
                             </table>
@@ -1252,30 +1728,63 @@
                                 </tr>
                                 <tr>
                                     <td>项目毛利</td>
-                                    <td><input name="grossProfitEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateGrossProfit,'0')}" required readonly title="项目毛利概算总额"></td>
-                                    <td><input name="grossProfitBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetGrossProfit,'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 type="text" class="number" name="grossProfit" value="${Utils.format(monthBean.grossProfit,'0')}" readonly required title="项目毛利本月结算金额"></td>
-                                    <td><input type="text" class="number" name="grossProfitSettleTotal" value="${Utils.format(currentBean.grossProfit,'0')}" readonly title="项目毛利结算总额"></td>
-                                    <td><input name="grossProfitProfitMargin" type="text" class="number" value="${Utils.format(currentBean.getGrossProfitProfitMargin(),'0')}" readonly title="项目毛利利润率"></td>
+                                    <td><input name="grossProfitEstimateTotal" type="text" class="number"
+                                               value="${Utils.format(monthBean.estimateGrossProfit,'0')}" required
+                                               readonly title="项目毛利概算总额"></td>
+                                    <td><input name="grossProfitBudgetTotal" type="text" class="number"
+                                               value="${Utils.format(monthBean.budgetGrossProfit,'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 type="text" class="number" name="grossProfit"
+                                               value="${Utils.format(monthBean.grossProfit,'0')}" readonly required
+                                               title="项目毛利本月结算金额"></td>
+                                    <td><input type="text" class="number" name="grossProfitSettleTotal"
+                                               value="${Utils.format(currentBean.grossProfit,'0')}" readonly
+                                               title="项目毛利结算总额"></td>
+                                    <td><input name="grossProfitProfitMargin" type="text" class="number"
+                                               value="${Utils.format(currentBean.getGrossProfitProfitMargin(),'0')}"
+                                               readonly title="项目毛利利润率"></td>
                                 </tr>
                                 <tr>
                                     <td>项目贡献利润</td>
-                                    <td><input name="contributionProfitEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateContributionProfit,'0')}" required readonly title="项目贡献利润概算总额"></td>
-                                    <td><input name="contributionProfitBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetContributionProfit,'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 type="text" class="number" name="contributionProfit" value="${Utils.format(monthBean.contributionProfit,'0')}" required readonly title="项目贡献利润本月结算金额"></td>
-                                    <td><input type="text" class="number" name="contributionProfitSettleTotal" value="${Utils.format(currentBean.contributionProfit,'0')}" readonly title="项目贡献利润结算总额"></td>
-                                    <td><input name="contributionProfitProfitMargin" type="text" class="number" value="${Utils.format(currentBean.getContributionProfitProfitMargin(),'0')}" readonly title="项目贡献利润利润率"></td>
+                                    <td><input name="contributionProfitEstimateTotal" type="text" class="number"
+                                               value="${Utils.format(monthBean.estimateContributionProfit,'0')}"
+                                               required readonly title="项目贡献利润概算总额"></td>
+                                    <td><input name="contributionProfitBudgetTotal" type="text" class="number"
+                                               value="${Utils.format(monthBean.budgetContributionProfit,'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 type="text" class="number" name="contributionProfit"
+                                               value="${Utils.format(monthBean.contributionProfit,'0')}" required
+                                               readonly title="项目贡献利润本月结算金额"></td>
+                                    <td><input type="text" class="number" name="contributionProfitSettleTotal"
+                                               value="${Utils.format(currentBean.contributionProfit,'0')}" readonly
+                                               title="项目贡献利润结算总额"></td>
+                                    <td><input name="contributionProfitProfitMargin" type="text" class="number"
+                                               value="${Utils.format(currentBean.getContributionProfitProfitMargin(),'0')}"
+                                               readonly title="项目贡献利润利润率"></td>
                                 </tr>
                                 <tr>
                                     <td>项目净利润</td>
                                     <td>/</td>
-                                    <td>/<#--<input name="netProfitBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.getProjectContributionProfit(),'0')}" required readonly title="项目净利润预算总额">--></td>
-                                    <td><input name="netProfitFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.netProfit,'0')}" required readonly title="项目净利润上月结算总额"></td>
-                                    <td><input type="text" class="number" name="netProfit" value="${Utils.format(monthBean.netProfit,'0')}" required readonly title="项目净利润本月结算金额"></td>
-                                    <td><input type="text" class="number" name="netProfitSettleTotal" value="${Utils.format(currentBean.netProfit,'0')}" readonly title="项目净利润结算总额"></td>
-                                    <td><input name="netProfitProfitMargin" type="text" class="number" value="${Utils.format(currentBean.getNetProfitProfitMargin(),'0')}" readonly title="项目净利润利润率"></td>
+                                    <td>
+                                        /<#--<input name="netProfitBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.getProjectContributionProfit(),'0')}" required readonly title="项目净利润预算总额">--></td>
+                                    <td><input name="netProfitFormerSettleTotal" type="text" class="number"
+                                               value="${Utils.format(formerBean.netProfit,'0')}" required readonly
+                                               title="项目净利润上月结算总额"></td>
+                                    <td><input type="text" class="number" name="netProfit"
+                                               value="${Utils.format(monthBean.netProfit,'0')}" required readonly
+                                               title="项目净利润本月结算金额"></td>
+                                    <td><input type="text" class="number" name="netProfitSettleTotal"
+                                               value="${Utils.format(currentBean.netProfit,'0')}" readonly
+                                               title="项目净利润结算总额"></td>
+                                    <td><input name="netProfitProfitMargin" type="text" class="number"
+                                               value="${Utils.format(currentBean.getNetProfitProfitMargin(),'0')}"
+                                               readonly title="项目净利润利润率"></td>
                                 </tr>
                                 </tbody>
                             </table>
@@ -1292,101 +1801,206 @@
                                 </tr>
                                 <tr>
                                     <td>销售商品、提供劳务收到的现金</td>
-                                    <td><input name="saleIncomeCashBudget" type="text" class="number" value="${Utils.format(monthBean.budgetSaleIncomeCash,'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 type="text" class="number" name="saleIncomeCash" value="${Utils.format(monthBean.saleIncomeCash,'0')}" required readonly title="本月结算金额"></td>
-                                    <td><input name="saleIncomeCashSettle" type="text" class="number" value="${Utils.format(currentBean.saleIncomeCash,'0')}" readonly title="结算总额"></td>
+                                    <td><input name="saleIncomeCashBudget" type="text" class="number"
+                                               value="${Utils.format(monthBean.budgetSaleIncomeCash,'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 type="text" class="number" name="saleIncomeCash"
+                                               value="${Utils.format(monthBean.saleIncomeCash,'0')}" required readonly
+                                               title="本月结算金额"></td>
+                                    <td><input name="saleIncomeCashSettle" type="text" class="number"
+                                               value="${Utils.format(currentBean.saleIncomeCash,'0')}" 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 type="text" class="number" name="taxReturn" value="${Utils.format(monthBean.taxReturn,'0')}" required readonly title="本月结算金额"></td>
-                                    <td><input name="taxReturnSettle" type="text" class="number" value="${Utils.format(currentBean.taxReturn,'0')}" readonly title="结算总额"></td>
+                                    <td><input name="taxReturnFormerSettle" type="text" class="number"
+                                               value="${Utils.format(formerBean.taxReturn,'0')}" required readonly
+                                               title="上月结算总额"></td>
+                                    <td><input type="text" class="number" name="taxReturn"
+                                               value="${Utils.format(monthBean.taxReturn,'0')}" required readonly
+                                               title="本月结算金额"></td>
+                                    <td><input name="taxReturnSettle" type="text" class="number"
+                                               value="${Utils.format(currentBean.taxReturn,'0')}" readonly title="结算总额">
+                                    </td>
                                 </tr>
                                 <tr>
                                     <td>收到其他与经营活动有关的现金</td>
-                                    <td><input name="earnestMoneyIncomeBudget" type="text" class="number" value="${Utils.format(monthBean.budgetEarnestMoneyIncome,'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 type="text" class="number" name="earnestMoneyIncome" value="${Utils.format(monthBean.earnestMoneyIncome,'0')}" readonly required title="本月结算金额"></td>
-                                    <td><input name="earnestMoneyIncomeSettle" type="text" class="number" value="${Utils.format(currentBean.earnestMoneyIncome,'0')}" readonly title="结算总额"></td>
+                                    <td><input name="earnestMoneyIncomeBudget" type="text" class="number"
+                                               value="${Utils.format(monthBean.budgetEarnestMoneyIncome,'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 type="text" class="number" name="earnestMoneyIncome"
+                                               value="${Utils.format(monthBean.earnestMoneyIncome,'0')}" readonly
+                                               required title="本月结算金额"></td>
+                                    <td><input name="earnestMoneyIncomeSettle" type="text" class="number"
+                                               value="${Utils.format(currentBean.earnestMoneyIncome,'0')}" readonly
+                                               title="结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>购买商品、接受劳务支付的现金</td>
-                                    <td><input name="purchaseCostBudget" type="text" class="number" value="${Utils.format(monthBean.budgetPurchaseCost,'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 type="text" class="number" name="purchaseCost" value="${Utils.format(monthBean.purchaseCost,'0')}" required readonly title="本月结算金额"></td>
-                                    <td><input name="purchaseCostSettle" type="text" class="number" value="${Utils.format(currentBean.purchaseCost,'0')}" readonly title="结算总额"></td>
+                                    <td><input name="purchaseCostBudget" type="text" class="number"
+                                               value="${Utils.format(monthBean.budgetPurchaseCost,'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 type="text" class="number" name="purchaseCost"
+                                               value="${Utils.format(monthBean.purchaseCost,'0')}" required readonly
+                                               title="本月结算金额"></td>
+                                    <td><input name="purchaseCostSettle" type="text" class="number"
+                                               value="${Utils.format(currentBean.purchaseCost,'0')}" 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 type="text" class="number" name="taxCost" value="${Utils.format(monthBean.taxCost,'0')}" required readonly title="本月结算金额"></td>
-                                    <td><input name="taxCostSettle" type="text" class="number" value="${Utils.format(currentBean.taxCost,'0')}" readonly title="结算总额"></td>
+                                    <td><input name="taxCostFormerSettle" type="text" class="number"
+                                               value="${Utils.format(formerBean.taxCost,'0')}" required readonly
+                                               title="上月结算总额"></td>
+                                    <td><input type="text" class="number" name="taxCost"
+                                               value="${Utils.format(monthBean.taxCost,'0')}" required readonly
+                                               title="本月结算金额"></td>
+                                    <td><input name="taxCostSettle" type="text" class="number"
+                                               value="${Utils.format(currentBean.taxCost,'0')}" readonly title="结算总额">
+                                    </td>
                                 </tr>
                                 <tr>
                                     <td>支付其他与经营活动有关的现金</td>
-                                    <td><input name="earnestMoneyCostBudget" type="text" class="number" value="${Utils.format(monthBean.budgetEarnestMoneyCost,'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 type="text" class="number" name="earnestMoneyCost" value="${Utils.format(monthBean.earnestMoneyCost,'0')}" readonly required title="本月结算金额"></td>
-                                    <td><input name="earnestMoneyCostSettle" type="text" class="number" value="${Utils.format(currentBean.earnestMoneyCost,'0')}" readonly title="结算总额"></td>
+                                    <td><input name="earnestMoneyCostBudget" type="text" class="number"
+                                               value="${Utils.format(monthBean.budgetEarnestMoneyCost,'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 type="text" class="number" name="earnestMoneyCost"
+                                               value="${Utils.format(monthBean.earnestMoneyCost,'0')}" readonly required
+                                               title="本月结算金额"></td>
+                                    <td><input name="earnestMoneyCostSettle" type="text" class="number"
+                                               value="${Utils.format(currentBean.earnestMoneyCost,'0')}" readonly
+                                               title="结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>经营活动产生的现金流量净额</td>
-                                    <td><input name="netCashFlowBudget" type="text" class="number" value="${Utils.format(monthBean.budgetNetCashFlow,'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 type="text" class="number" name="netCashFlow" value="${Utils.format(monthBean.netCashFlow,'0')}" required readonly title="本月结算金额"></td>
-                                    <td><input name="netCashFlowSettle" type="text" class="number" value="${Utils.format(currentBean.netCashFlow,'0')}" readonly title="结算总额"></td>
+                                    <td><input name="netCashFlowBudget" type="text" class="number"
+                                               value="${Utils.format(monthBean.budgetNetCashFlow,'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 type="text" class="number" name="netCashFlow"
+                                               value="${Utils.format(monthBean.netCashFlow,'0')}" required readonly
+                                               title="本月结算金额"></td>
+                                    <td><input name="netCashFlowSettle" type="text" class="number"
+                                               value="${Utils.format(currentBean.netCashFlow,'0')}" 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 type="text" class="number" name="cashInflowFromInvestingActivities" value="${Utils.format(monthBean.cashInflowFromInvestingActivities,'0')}" required readonly title="本月结算金额"></td>
-                                    <td><input name="cashInflowFromInvestingActivitiesSettle" value="${Utils.format(currentBean.cashInflowFromInvestingActivities,'0')}" type="text" class="number" readonly title="结算总额"></td>
+                                    <td><input name="cashInflowFromInvestingActivitiesFormerSettle" type="text"
+                                               class="number"
+                                               value="${Utils.format(formerBean.cashInflowFromInvestingActivities,'0')}"
+                                               required readonly title="上月结算总额"></td>
+                                    <td><input type="text" class="number" name="cashInflowFromInvestingActivities"
+                                               value="${Utils.format(monthBean.cashInflowFromInvestingActivities,'0')}"
+                                               required readonly title="本月结算金额"></td>
+                                    <td><input name="cashInflowFromInvestingActivitiesSettle"
+                                               value="${Utils.format(currentBean.cashInflowFromInvestingActivities,'0')}"
+                                               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 type="text" class="number" name="cashOutflowFromInvestingActivities" value="${Utils.format(monthBean.cashOutflowFromInvestingActivities,'0')}" required readonly title="本月结算金额"></td>
-                                    <td><input name="cashOutflowFromInvestingActivitiesSettle" value="${Utils.format(currentBean.cashOutflowFromInvestingActivities,'0')}" type="text" class="number" readonly title="结算总额"></td>
+                                    <td><input name="cashOutflowFromInvestingActivitiesFormerSettle" type="text"
+                                               class="number"
+                                               value="${Utils.format(formerBean.cashOutflowFromInvestingActivities,'0')}"
+                                               required readonly title="上月结算总额"></td>
+                                    <td><input type="text" class="number" name="cashOutflowFromInvestingActivities"
+                                               value="${Utils.format(monthBean.cashOutflowFromInvestingActivities,'0')}"
+                                               required readonly title="本月结算金额"></td>
+                                    <td><input name="cashOutflowFromInvestingActivitiesSettle"
+                                               value="${Utils.format(currentBean.cashOutflowFromInvestingActivities,'0')}"
+                                               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 type="text" class="number" name="netCashFromInvestingActivities" value="${Utils.format(monthBean.netCashFromInvestingActivities,'0')}" readonly required title="本月结算金额"></td>
-                                    <td><input name="netCashFromInvestingActivitiesSettle" type="text" class="number" value="${Utils.format(currentBean.netCashFromInvestingActivities,'0')}" readonly title="结算总额"></td>
+                                    <td><input name="netCashFromInvestingActivitiesFormerSettle" type="text"
+                                               class="number"
+                                               value="${Utils.format(formerBean.netCashFromInvestingActivities,'0')}"
+                                               required readonly title="上月结算总额"></td>
+                                    <td><input type="text" class="number" name="netCashFromInvestingActivities"
+                                               value="${Utils.format(monthBean.netCashFromInvestingActivities,'0')}"
+                                               readonly required title="本月结算金额"></td>
+                                    <td><input name="netCashFromInvestingActivitiesSettle" type="text" class="number"
+                                               value="${Utils.format(currentBean.netCashFromInvestingActivities,'0')}"
+                                               readonly title="结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>融资资金流入</td>
-                                    <td><input name="financingCapitalInflowBudget" type="text" class="number" value="${Utils.format(monthBean.budgetFinancingCapitalInflow,'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 type="text" class="number" name="financingCapitalInflow" value="${Utils.format(monthBean.financingCapitalInflow,'0')}" required readonly title="本月结算金额"></td>
-                                    <td><input name="financingCapitalInflowSettle" type="text" class="number" value="${Utils.format(currentBean.financingCapitalInflow,'0')}" readonly title="结算总额"></td>
+                                    <td><input name="financingCapitalInflowBudget" type="text" class="number"
+                                               value="${Utils.format(monthBean.budgetFinancingCapitalInflow,'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 type="text" class="number" name="financingCapitalInflow"
+                                               value="${Utils.format(monthBean.financingCapitalInflow,'0')}" required
+                                               readonly title="本月结算金额"></td>
+                                    <td><input name="financingCapitalInflowSettle" type="text" class="number"
+                                               value="${Utils.format(currentBean.financingCapitalInflow,'0')}" readonly
+                                               title="结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>还款资金流出</td>
-                                    <td><input name="financingCapitalOutflowBudget" type="text" class="number" value="${Utils.format(monthBean.budgetFinancingCapitalOutflow,'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 type="text" class="number" name="financingCapitalOutflow" value="${Utils.format(monthBean.financingCapitalOutflow,'0')}" required readonly title="本月结算金额"></td>
-                                    <td><input name="financingCapitalOutflowSettle" type="text" class="number" value="${Utils.format(currentBean.financingCapitalOutflow,'0')}" readonly title="结算总额"></td>
+                                    <td><input name="financingCapitalOutflowBudget" type="text" class="number"
+                                               value="${Utils.format(monthBean.budgetFinancingCapitalOutflow,'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 type="text" class="number" name="financingCapitalOutflow"
+                                               value="${Utils.format(monthBean.financingCapitalOutflow,'0')}" required
+                                               readonly title="本月结算金额"></td>
+                                    <td><input name="financingCapitalOutflowSettle" type="text" class="number"
+                                               value="${Utils.format(currentBean.financingCapitalOutflow,'0')}" readonly
+                                               title="结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>筹资活动产生的现金流量净额</td>
-                                    <td><input name="financingCapitalCashflowBudget" type="text" class="number" value="${Utils.format(monthBean.budgetFinancingCapitalCashflow,'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 type="text" class="number" name="financingCapitalCashflow" value="${Utils.format(monthBean.financingCapitalCashflow,'0')}" required readonly title="本月结算金额"></td>
-                                    <td><input name="financingCapitalCashflowSettle" type="text" class="number" value="${Utils.format(currentBean.financingCapitalCashflow,'0')}" readonly title="结算总额"></td>
+                                    <td><input name="financingCapitalCashflowBudget" type="text" class="number"
+                                               value="${Utils.format(monthBean.budgetFinancingCapitalCashflow,'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 type="text" class="number" name="financingCapitalCashflow"
+                                               value="${Utils.format(monthBean.financingCapitalCashflow,'0')}" required
+                                               readonly title="本月结算金额"></td>
+                                    <td><input name="financingCapitalCashflowSettle" type="text" class="number"
+                                               value="${Utils.format(currentBean.financingCapitalCashflow,'0')}"
+                                               readonly title="结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>货币资金净增加额</td>
-                                    <td><input name="netIncreaseMonetaryFundsBudget" type="text" class="number" value="${Utils.format(monthBean.budgetNetIncreaseMonetaryFunds,'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 type="text" class="number" name="netIncreaseMonetaryFunds" value="${Utils.format(monthBean.netIncreaseMonetaryFunds,'0')}" required readonly title="本月结算金额"></td>
-                                    <td><input name="netIncreaseMonetaryFundsSettle" type="text" class="number" value="${Utils.format(currentBean.netIncreaseMonetaryFunds,'0')}" readonly title="结算总额"></td>
+                                    <td><input name="netIncreaseMonetaryFundsBudget" type="text" class="number"
+                                               value="${Utils.format(monthBean.budgetNetIncreaseMonetaryFunds,'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 type="text" class="number" name="netIncreaseMonetaryFunds"
+                                               value="${Utils.format(monthBean.netIncreaseMonetaryFunds,'0')}" required
+                                               readonly title="本月结算金额"></td>
+                                    <td><input name="netIncreaseMonetaryFundsSettle" type="text" class="number"
+                                               value="${Utils.format(currentBean.netIncreaseMonetaryFunds,'0')}"
+                                               readonly title="结算总额"></td>
                                 </tr>
                                 <#--<tr>
                                     <td>合计</td>
@@ -1414,7 +2028,7 @@
                             <#if project.status ==15 && project.approveStatusFinal == 3>
                                 <div class="approve-nopass"></div>
                             </#if>
-                            <input name="id" id="id" type="hidden" value="${project.id}" />
+                            <input name="id" id="id" type="hidden" value="${project.id}"/>
                             <span class="am-text-lg">收入</span>
                             <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;">
                                 <tbody>
@@ -1429,34 +2043,66 @@
                                 <tr>
                                     <td>收入</td>
                                     <td>设备类</td>
-                                    <td><input name="incomeDeviceTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类概算总额"></td>
-                                    <td><input name="incomeDeviceTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类预算总额"></td>
-                                    <td><input type="text" class="number" value="${Utils.format(currentBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类结算总额"></td>
-                                    <td><input name="incomeDeviceFinalTotal" type="text" class="number" value="${Utils.format(finalBean.incomeDeviceFinalTotal,'0')}" required readonly title="设备类决算总额"></td>
+                                    <td><input name="incomeDeviceTaxExclude" type="text" class="number"
+                                               value="${Utils.format(estimateBean.incomeDeviceTaxExclude,'0')}" required
+                                               readonly title="设备类概算总额"></td>
+                                    <td><input name="incomeDeviceTaxExclude" type="text" class="number"
+                                               value="${Utils.format(budgetBean.incomeDeviceTaxExclude,'0')}" required
+                                               readonly title="设备类预算总额"></td>
+                                    <td><input type="text" class="number"
+                                               value="${Utils.format(currentBean.incomeDeviceTaxExclude,'0')}" required
+                                               readonly title="设备类结算总额"></td>
+                                    <td><input name="incomeDeviceFinalTotal" type="text" class="number"
+                                               value="${Utils.format(finalBean.incomeDeviceFinalTotal,'0')}" required
+                                               readonly title="设备类决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>收入</td>
                                     <td>工程类</td>
-                                    <td><input name="incomeEngineerTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类概算总额"></td>
-                                    <td><input name="incomeEngineerTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类预算总额"></td>
-                                    <td><input type="text" class="number" value="${Utils.format(currentBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类结算总额"></td>
-                                    <td><input name="incomeEngineerFinalTotal" type="text" class="number" value="${Utils.format(finalBean.incomeEngineerFinalTotal,'0')}" required readonly title="工程类决算总额"></td>
+                                    <td><input name="incomeEngineerTaxExclude" type="text" class="number"
+                                               value="${Utils.format(estimateBean.incomeEngineerTaxExclude,'0')}"
+                                               required readonly title="工程类概算总额"></td>
+                                    <td><input name="incomeEngineerTaxExclude" type="text" class="number"
+                                               value="${Utils.format(budgetBean.incomeEngineerTaxExclude,'0')}" required
+                                               readonly title="工程类预算总额"></td>
+                                    <td><input type="text" class="number"
+                                               value="${Utils.format(currentBean.incomeEngineerTaxExclude,'0')}"
+                                               required readonly title="工程类结算总额"></td>
+                                    <td><input name="incomeEngineerFinalTotal" type="text" class="number"
+                                               value="${Utils.format(finalBean.incomeEngineerFinalTotal,'0')}" required
+                                               readonly title="工程类决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>收入</td>
                                     <td>服务类</td>
-                                    <td><input name="incomeServiceTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类概算总额"></td>
-                                    <td><input name="incomeServiceTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类预算总额"></td>
-                                    <td><input type="text" class="number" value="${Utils.format(currentBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类结算总额"></td>
-                                    <td><input name="incomeServiceFinalTotal" type="text" class="number" value="${Utils.format(finalBean.incomeServiceFinalTotal,'0')}" required readonly title="服务类决算总额"></td>
+                                    <td><input name="incomeServiceTaxExclude" type="text" class="number"
+                                               value="${Utils.format(estimateBean.incomeServiceTaxExclude,'0')}"
+                                               required readonly title="服务类概算总额"></td>
+                                    <td><input name="incomeServiceTaxExclude" type="text" class="number"
+                                               value="${Utils.format(budgetBean.incomeServiceTaxExclude,'0')}" required
+                                               readonly title="服务类预算总额"></td>
+                                    <td><input type="text" class="number"
+                                               value="${Utils.format(currentBean.incomeServiceTaxExclude,'0')}" required
+                                               readonly title="服务类结算总额"></td>
+                                    <td><input name="incomeServiceFinalTotal" type="text" class="number"
+                                               value="${Utils.format(finalBean.incomeServiceFinalTotal,'0')}" required
+                                               readonly title="服务类决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>合计</td>
                                     <td></td>
-                                    <td><input name="estimateIncomeTotalTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.getIncomeTotalTaxExclude(),'0')}" readonly required title="此列累计"></td>
-                                    <td><input name="budgetIncomeTotalTaxExclude" type="text" class="number"  value="${Utils.format(budgetBean.getIncomeTotalTaxExclude(),'0')}" readonly required title="此列累计"></td>
-                                    <td><input type="text" class="number" value="${Utils.format(currentBean.getIncomeTotalTaxExclude(),'0')}" readonly required title="此列累计"></td>
-                                    <td><input name="incomeFinalTotal" type="text" class="number" value="${Utils.format(finalBean.getIncomeTotal(),'0')}" readonly required title="此列累计"></td>
+                                    <td><input name="estimateIncomeTotalTaxExclude" type="text" class="number"
+                                               value="${Utils.format(estimateBean.getIncomeTotalTaxExclude(),'0')}"
+                                               readonly required title="此列累计"></td>
+                                    <td><input name="budgetIncomeTotalTaxExclude" type="text" class="number"
+                                               value="${Utils.format(budgetBean.getIncomeTotalTaxExclude(),'0')}"
+                                               readonly required title="此列累计"></td>
+                                    <td><input type="text" class="number"
+                                               value="${Utils.format(currentBean.getIncomeTotalTaxExclude(),'0')}"
+                                               readonly required title="此列累计"></td>
+                                    <td><input name="incomeFinalTotal" type="text" class="number"
+                                               value="${Utils.format(finalBean.getIncomeTotal(),'0')}" readonly required
+                                               title="此列累计"></td>
                                 </tr>
                                 </tbody>
                             </table>
@@ -1476,46 +2122,86 @@
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>设备</td>
-                                    <td><input name="costPurchaseDeviceTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseDeviceTaxExclude,'0')}" readonly required title="购买设备概算总额"></td>
-                                    <td><input name="costPurchaseDeviceTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseDeviceTaxExclude,'0')}" readonly required title="购买设备预算总额"></td>
-                                    <td><input  type="text" class="number" value="${Utils.format(currentBean.costPurchaseDeviceTaxExclude,'0')}" readonly required title="购买设备结算总额"></td>
-                                    <td><input name="costPurchaseDeviceFinalTotal" type="text" class="number" value="${Utils.format(finalBean.costPurchaseDeviceFinalTotal,'0')}" readonly required title="购买设备决算总额"></td>
+                                    <td><input name="costPurchaseDeviceTaxExclude" type="text" class="number"
+                                               value="${Utils.format(estimateBean.costPurchaseDeviceTaxExclude,'0')}"
+                                               readonly required title="购买设备概算总额"></td>
+                                    <td><input name="costPurchaseDeviceTaxExclude" type="text" class="number"
+                                               value="${Utils.format(budgetBean.costPurchaseDeviceTaxExclude,'0')}"
+                                               readonly required title="购买设备预算总额"></td>
+                                    <td><input type="text" class="number"
+                                               value="${Utils.format(currentBean.costPurchaseDeviceTaxExclude,'0')}"
+                                               readonly required title="购买设备结算总额"></td>
+                                    <td><input name="costPurchaseDeviceFinalTotal" type="text" class="number"
+                                               value="${Utils.format(finalBean.costPurchaseDeviceFinalTotal,'0')}"
+                                               readonly required title="购买设备决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>施工</td>
-                                    <td><input name="costPurchaseBuildTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseBuildTaxExclude,'0')}" readonly required title="施工采购成本概算总额"></td>
-                                    <td><input name="costPurchaseBuildTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseBuildTaxExclude,'0')}" readonly required title="施工采购成本预算总额"></td>
-                                    <td><input type="text" class="number" value="${Utils.format(currentBean.costPurchaseBuildTaxExclude,'0')}" readonly required title="施工采购成本结算总额"></td>
-                                    <td><input name="costPurchaseBuildFinalTotal" type="text" class="number" value="${Utils.format(finalBean.costPurchaseBuildFinalTotal,'0')}" required readonly title="施工采购成本决算总额"></td>
+                                    <td><input name="costPurchaseBuildTaxExclude" type="text" class="number"
+                                               value="${Utils.format(estimateBean.costPurchaseBuildTaxExclude,'0')}"
+                                               readonly required title="施工采购成本概算总额"></td>
+                                    <td><input name="costPurchaseBuildTaxExclude" type="text" class="number"
+                                               value="${Utils.format(budgetBean.costPurchaseBuildTaxExclude,'0')}"
+                                               readonly required title="施工采购成本预算总额"></td>
+                                    <td><input type="text" class="number"
+                                               value="${Utils.format(currentBean.costPurchaseBuildTaxExclude,'0')}"
+                                               readonly required title="施工采购成本结算总额"></td>
+                                    <td><input name="costPurchaseBuildFinalTotal" type="text" class="number"
+                                               value="${Utils.format(finalBean.costPurchaseBuildFinalTotal,'0')}"
+                                               required readonly title="施工采购成本决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>服务</td>
-                                    <td><input name="costPurchaseServiceTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseServiceTaxExclude,'0')}" readonly required title="服务采购成本概算总额"></td>
-                                    <td><input name="costPurchaseServiceTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseServiceTaxExclude,'0')}" readonly required title="服务采购成本预算总额"></td>
-                                    <td><input type="text" class="number" value="${Utils.format(currentBean.costPurchaseServiceTaxExclude,'0')}" readonly required title="服务采购成本结算总额"></td>
-                                    <td><input name="costPurchaseServiceFinalTotal" type="text" class="number" value="${Utils.format(finalBean.costPurchaseServiceFinalTotal,'0')}" required readonly title="服务采购成本决算总额"></td>
+                                    <td><input name="costPurchaseServiceTaxExclude" type="text" class="number"
+                                               value="${Utils.format(estimateBean.costPurchaseServiceTaxExclude,'0')}"
+                                               readonly required title="服务采购成本概算总额"></td>
+                                    <td><input name="costPurchaseServiceTaxExclude" type="text" class="number"
+                                               value="${Utils.format(budgetBean.costPurchaseServiceTaxExclude,'0')}"
+                                               readonly required title="服务采购成本预算总额"></td>
+                                    <td><input type="text" class="number"
+                                               value="${Utils.format(currentBean.costPurchaseServiceTaxExclude,'0')}"
+                                               readonly required title="服务采购成本结算总额"></td>
+                                    <td><input name="costPurchaseServiceFinalTotal" type="text" class="number"
+                                               value="${Utils.format(finalBean.costPurchaseServiceFinalTotal,'0')}"
+                                               required readonly title="服务采购成本决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>其他</td>
-                                    <td><input name="costPurchaseOtherTaxInclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseOtherTaxInclude,'0')}" readonly required title="其他采购成本概算总额"></td>
-                                    <td><input name="costPurchaseOtherTaxInclude" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseOtherTaxInclude,'0')}" readonly required title="其他采购成本预算总额"></td>
-                                    <td><input name="costPurchaseOtherSettleTotal" value="${Utils.format(currentBean.costPurchaseOtherTaxExclude,'0')}" type="text" class="number" readonly required title="其他采购成本结算总额"></td>
-                                    <td><input name="costPurchaseOtherFinalTotal" type="text" class="number" value="${Utils.format(finalBean.costPurchaseOtherFinalTotal,'0')}" required readonly title="其他采购成本决算总额"></td>
+                                    <td><input name="costPurchaseOtherTaxInclude" type="text" class="number"
+                                               value="${Utils.format(estimateBean.costPurchaseOtherTaxInclude,'0')}"
+                                               readonly required title="其他采购成本概算总额"></td>
+                                    <td><input name="costPurchaseOtherTaxInclude" type="text" class="number"
+                                               value="${Utils.format(budgetBean.costPurchaseOtherTaxInclude,'0')}"
+                                               readonly required title="其他采购成本预算总额"></td>
+                                    <td><input name="costPurchaseOtherSettleTotal"
+                                               value="${Utils.format(currentBean.costPurchaseOtherTaxExclude,'0')}"
+                                               type="text" class="number" readonly required title="其他采购成本结算总额"></td>
+                                    <td><input name="costPurchaseOtherFinalTotal" type="text" class="number"
+                                               value="${Utils.format(finalBean.costPurchaseOtherFinalTotal,'0')}"
+                                               required readonly title="其他采购成本决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
                                     <td>项目管理成本</td>
                                     <td>项目管理成本</td>
-                                    <td><input name="costProjectManageTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costProjectManageTaxExclude,'0')}" readonly required title="项目管理成本概算总额"></td>
-                                    <td><input name="costProjectManageTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0')}" readonly required title="项目管理成本预算总额"></td>
-                                    <td><input name="costProjectManageSettleTotal" value="${Utils.format(currentBean.costProjectManageTaxExclude,'0')}" type="text" class="number" readonly required title="项目管理成本结算总额"></td>
-                                    <td><input name="costProjectManageFinalTotal" type="text" class="number" value="${Utils.format(finalBean.costProjectManageFinalTotal,'0')}" required readonly title="项目管理成本决算总额"></td>
+                                    <td><input name="costProjectManageTaxExclude" type="text" class="number"
+                                               value="${Utils.format(estimateBean.costProjectManageTaxExclude,'0')}"
+                                               readonly required title="项目管理成本概算总额"></td>
+                                    <td><input name="costProjectManageTaxExclude" type="text" class="number"
+                                               value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0')}"
+                                               readonly required title="项目管理成本预算总额"></td>
+                                    <td><input name="costProjectManageSettleTotal"
+                                               value="${Utils.format(currentBean.costProjectManageTaxExclude,'0')}"
+                                               type="text" class="number" readonly required title="项目管理成本结算总额"></td>
+                                    <td><input name="costProjectManageFinalTotal" type="text" class="number"
+                                               value="${Utils.format(finalBean.costProjectManageFinalTotal,'0')}"
+                                               required readonly title="项目管理成本决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
@@ -1525,15 +2211,36 @@
                                     <td><input name="costOtherOtherTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0.00')}" readonly required title="其他成本预算总额"></td>
                                     <td><input name="costOtherSettleTotal" value="${Utils.format(currentBean.costOtherOtherTaxExclude,'0.00')}" type="text" class="number" readonly required title="其他成本结算总额"></td>
                                     <td><input name="costOtherFinalTotal" type="text" class="number" value="${Utils.format(finalBean.costOtherFinalTotal,'0.00')}" required readonly title="其他成本决算总额"></td>
+                                    <td><input name="costOtherOtherTaxExclude" type="text" class="number"
+                                               value="${Utils.format(estimateBean.costOtherOtherTaxExclude,'0')}"
+                                               readonly required title="其他成本概算总额"></td>
+                                    <td><input name="costOtherOtherTaxExclude" type="text" class="number"
+                                               value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0')}" readonly
+                                               required title="其他成本预算总额"></td>
+                                    <td><input name="costOtherSettleTotal"
+                                               value="${Utils.format(currentBean.costOtherOtherTaxExclude,'0')}"
+                                               type="text" class="number" type="text" class="number" readonly required
+                                               title="其他成本结算总额"></td>
+                                    <td><input name="costOtherFinalTotal" type="text" class="number"
+                                               value="${Utils.format(finalBean.costOtherFinalTotal,'0')}" required
+                                               readonly title="其他成本决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>合计</td>
                                     <td></td>
                                     <td></td>
-                                    <td><input name="incomeTotalTaxExclude" value="${Utils.format(estimateBean.getCostTotalTaxExclude(),'0')}" type="text" class="number" readonly required title="此列累计"></td>
-                                    <td><input name="costTotalTaxExclude" value="${Utils.format(budgetBean.getCostTotalTaxExclude(),'0')}" type="text" class="number" readonly required title="此列累计"></td>
-                                    <td><input name="costSettleTotal" value="${Utils.format(currentBean.getCostTotalTaxExclude(),'0')}" type="text" class="number" readonly required title="此列累计"></td>
-                                    <td><input name="costFinalTotal" type="text" class="number" value="${Utils.format(finalBean.getCostTotal(),'0')}" readonly required title="此列累计"></td>
+                                    <td><input name="incomeTotalTaxExclude"
+                                               value="${Utils.format(estimateBean.getCostTotalTaxExclude(),'0')}"
+                                               type="text" class="number" readonly required title="此列累计"></td>
+                                    <td><input name="costTotalTaxExclude"
+                                               value="${Utils.format(budgetBean.getCostTotalTaxExclude(),'0')}"
+                                               type="text" class="number" readonly required title="此列累计"></td>
+                                    <td><input name="costSettleTotal"
+                                               value="${Utils.format(currentBean.getCostTotalTaxExclude(),'0')}"
+                                               type="text" class="number" readonly required title="此列累计"></td>
+                                    <td><input name="costFinalTotal" type="text" class="number"
+                                               value="${Utils.format(finalBean.getCostTotal(),'0')}" readonly required
+                                               title="此列累计"></td>
                                 </tr>
                                 </tbody>
                             </table>
@@ -1551,34 +2258,62 @@
                                 <tr>
                                     <td>财务费用</td>
                                     <td>资金占用成本</td>
-                                    <td><input name="costExpropriationTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本概算总额"></td>
-                                    <td><input name="costExpropriationTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本预算总额"></td>
-                                    <td><input type="text" class="number"  value="${Utils.format(currentBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本结算总额"></td>
-                                    <td><input name="costExpropriationFinalTotal" type="text" class="number" value="${Utils.format(finalBean.costExpropriationFinalTotal,'0')}" required readonly title="资金占用成本决算总额"></td>
+                                    <td><input name="costExpropriationTaxExclude" type="text" class="number"
+                                               value="${Utils.format(estimateBean.costExpropriationTaxExclude,'0')}"
+                                               required readonly title="资金占用成本概算总额"></td>
+                                    <td><input name="costExpropriationTaxExclude" type="text" class="number"
+                                               value="${Utils.format(budgetBean.costExpropriationTaxExclude,'0')}"
+                                               required readonly title="资金占用成本预算总额"></td>
+                                    <td><input type="text" class="number"
+                                               value="${Utils.format(currentBean.costExpropriationTaxExclude,'0')}"
+                                               required readonly title="资金占用成本结算总额"></td>
+                                    <td><input name="costExpropriationFinalTotal" type="text" class="number"
+                                               value="${Utils.format(finalBean.costExpropriationFinalTotal,'0')}"
+                                               required readonly title="资金占用成本决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>公司管理费用</td>
                                     <td></td>
-                                    <td><input name="costCompanyManageTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costCompanyManageTaxExclude,'0')}" required readonly title="公司管理费用概算总额"></td>
-                                    <td><input name="costCompanyManageTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costCompanyManageTaxExclude,'0')}" required readonly title="公司管理费用预算总额"></td>
-                                    <td><input type="text" class="number" value="${Utils.format(currentBean.costCompanyManageTaxExclude,'0')}" required readonly title="公司管理费用结算总额"></td>
-                                    <td><input name="costCompanyManageFinalTotal" type="text" class="number" value="${Utils.format(finalBean.costCompanyManageFinalTotal,'0')}" required readonly title="公司管理费用决算总额"></td>
+                                    <td><input name="costCompanyManageTaxExclude" type="text" class="number"
+                                               value="${Utils.format(estimateBean.costCompanyManageTaxExclude,'0')}"
+                                               required readonly title="公司管理费用概算总额"></td>
+                                    <td><input name="costCompanyManageTaxExclude" type="text" class="number"
+                                               value="${Utils.format(budgetBean.costCompanyManageTaxExclude,'0')}"
+                                               required readonly title="公司管理费用预算总额"></td>
+                                    <td><input type="text" class="number"
+                                               value="${Utils.format(currentBean.costCompanyManageTaxExclude,'0')}"
+                                               required readonly title="公司管理费用结算总额"></td>
+                                    <td><input name="costCompanyManageFinalTotal" type="text" class="number"
+                                               value="${Utils.format(finalBean.costCompanyManageFinalTotal,'0')}"
+                                               required readonly title="公司管理费用决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>所得税费用</td>
                                     <td></td>
                                     <td>/</td>
                                     <td>/</td>
-                                    <td><input name="costIncomeTaxSettleTotal" value="${Utils.format(currentBean.costIncomeTax,'0')}" type="text" class="number" required readonly title="所得税费用结算总额"></td>
-                                    <td><input name="costIncomeTaxFinalTotal" type="text" class="number" value="${Utils.format(finalBean.costIncomeTaxFinalTotal,'0')}" required readonly title="所得税费用决算总额"></td>
+                                    <td><input name="costIncomeTaxSettleTotal"
+                                               value="${Utils.format(currentBean.costIncomeTax,'0')}" type="text"
+                                               class="number" required readonly title="所得税费用结算总额"></td>
+                                    <td><input name="costIncomeTaxFinalTotal" type="text" class="number"
+                                               value="${Utils.format(finalBean.costIncomeTaxFinalTotal,'0')}" required
+                                               readonly title="所得税费用决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>合计</td>
                                     <td></td>
-                                    <td><input name="manageEstimateTotal" value="${Utils.format(estimateBean.getCostManageExclude(),'0')}" type="text" class="number" readonly required title="此列累计"></td>
-                                    <td><input name="manageBudgetTotal" value="${Utils.format(budgetBean.getCostManageExclude(),'0')}" type="text" class="number" readonly required title="此列累计"></td>
-                                    <td><input name="manageSettleTotal" value="${Utils.format(currentBean.getCostManageTotal(),'0')}" type="text" class="number" readonly required title="此列累计"></td>
-                                    <td><input name="manageFinalTotal" type="text" class="number" value="${Utils.format(finalBean.getCostManageTotal(),'0')}" readonly required title="此列累计"></td>
+                                    <td><input name="manageEstimateTotal"
+                                               value="${Utils.format(estimateBean.getCostManageExclude(),'0')}"
+                                               type="text" class="number" readonly required title="此列累计"></td>
+                                    <td><input name="manageBudgetTotal"
+                                               value="${Utils.format(budgetBean.getCostManageExclude(),'0')}"
+                                               type="text" class="number" readonly required title="此列累计"></td>
+                                    <td><input name="manageSettleTotal"
+                                               value="${Utils.format(currentBean.getCostManageTotal(),'0')}" type="text"
+                                               class="number" readonly required title="此列累计"></td>
+                                    <td><input name="manageFinalTotal" type="text" class="number"
+                                               value="${Utils.format(finalBean.getCostManageTotal(),'0')}" readonly
+                                               required title="此列累计"></td>
                                 </tr>
                                 </tbody>
                             </table>
@@ -1596,27 +2331,55 @@
                                 </tr>
                                 <tr>
                                     <td>项目毛利</td>
-                                    <td><input name="projectGrossProfit" type="text" class="number" value="${Utils.format(estimateBean.getProjectGrossProfit(),'0')}" readonly required title="项目毛利概算总额"></td>
-                                    <td><input name="projectGrossProfit" type="text" class="number" value="${Utils.format(budgetBean.getProjectGrossProfit(),'0')}" readonly required title="项目毛利预算总额"></td>
-                                    <td><input name="grossProfitSettleTotal" type="text" class="number" value="${Utils.format(finalBean.grossProfitSettleTotal,'0')}" readonly required title="项目毛利结算总额"></td>
-                                    <td><input name="grossProfitFinalTotal" type="text" class="number" value="${Utils.format(finalBean.grossProfitFinalTotal,'0')}" required readonly title="项目毛利决算总额"></td>
-                                    <td><input name="grossProfitProfitMargin" type="text" class="number" value="${Utils.format(finalBean.grossProfitProfitMargin,'0')}" required readonly title="项目毛利利润率"></td>
+                                    <td><input name="projectGrossProfit" type="text" class="number"
+                                               value="${Utils.format(estimateBean.getProjectGrossProfit(),'0')}"
+                                               readonly required title="项目毛利概算总额"></td>
+                                    <td><input name="projectGrossProfit" type="text" class="number"
+                                               value="${Utils.format(budgetBean.getProjectGrossProfit(),'0')}" readonly
+                                               required title="项目毛利预算总额"></td>
+                                    <td><input name="grossProfitSettleTotal" type="text" class="number"
+                                               value="${Utils.format(finalBean.grossProfitSettleTotal,'0')}" readonly
+                                               required title="项目毛利结算总额"></td>
+                                    <td><input name="grossProfitFinalTotal" type="text" class="number"
+                                               value="${Utils.format(finalBean.grossProfitFinalTotal,'0')}" required
+                                               readonly title="项目毛利决算总额"></td>
+                                    <td><input name="grossProfitProfitMargin" type="text" class="number"
+                                               value="${Utils.format(finalBean.grossProfitProfitMargin,'0')}" required
+                                               readonly title="项目毛利利润率"></td>
                                 </tr>
                                 <tr>
                                     <td>项目贡献利润</td>
-                                    <td><input name="projectContributionProfit" type="text" class="number" value="${Utils.format(estimateBean.getProjectContributionProfit(),'0')}" readonly required title="项目贡献利润概算总额"></td>
-                                    <td><input name="projectContributionProfit" type="text" class="number" value="${Utils.format(budgetBean.getProjectContributionProfit(),'0')}" readonly required title="项目贡献利润预算总额"></td>
-                                    <td><input name="contributionMarginSettleTotal" type="text" class="number" value="${Utils.format(currentBean.contributionProfit,'0')}" readonly required title="项目贡献利润结算总额"></td>
-                                    <td><input name="contributionMarginFinalTotal" type="text" class="number" value="${Utils.format(finalBean.contributionMarginFinalTotal,'0')}" required readonly title="项目贡献利润决算总额"></td>
-                                    <td><input name="contributionMarginProfitMargin" type="text" class="number" value="${Utils.format(finalBean.contributionMarginProfitMargin,'0')}" required readonly title="项目贡献利润利润率"></td>
+                                    <td><input name="projectContributionProfit" type="text" class="number"
+                                               value="${Utils.format(estimateBean.getProjectContributionProfit(),'0')}"
+                                               readonly required title="项目贡献利润概算总额"></td>
+                                    <td><input name="projectContributionProfit" type="text" class="number"
+                                               value="${Utils.format(budgetBean.getProjectContributionProfit(),'0')}"
+                                               readonly required title="项目贡献利润预算总额"></td>
+                                    <td><input name="contributionMarginSettleTotal" type="text" class="number"
+                                               value="${Utils.format(currentBean.contributionProfit,'0')}" readonly
+                                               required title="项目贡献利润结算总额"></td>
+                                    <td><input name="contributionMarginFinalTotal" type="text" class="number"
+                                               value="${Utils.format(finalBean.contributionMarginFinalTotal,'0')}"
+                                               required readonly title="项目贡献利润决算总额"></td>
+                                    <td><input name="contributionMarginProfitMargin" type="text" class="number"
+                                               value="${Utils.format(finalBean.contributionMarginProfitMargin,'0')}"
+                                               required readonly title="项目贡献利润利润率"></td>
                                 </tr>
                                 <tr>
                                     <td>项目净利润</td>
                                     <td>/</td>
-                                    <td><#--<input name="netMarginBudgetTotal" type="text" class="number" value="${Utils.format(finalBean.netMarginBudgetTotal,'0')}" readonly required title="项目净利润预算总额">-->/</td>
-                                    <td><input name="netMarginSettleTotal" type="text" class="number" value="${Utils.format(currentBean.netProfit,'0')}" readonly required title="项目净利润结算总额"></td>
-                                    <td><input name="netMarginFinalTotal" type="text" class="number" value="${Utils.format(finalBean.netMarginFinalTotal,'0')}" required readonly title="项目净利润决算总额"></td>
-                                    <td><input name="netMarginProfitMargin" type="text" class="number" value="${Utils.format(finalBean.netMarginProfitMargin,'0')}" required readonly title="项目净利润利润率"></td>
+                                    <td><#--<input name="netMarginBudgetTotal" type="text" class="number" value="${Utils.format(finalBean.netMarginBudgetTotal,'0')}" readonly required title="项目净利润预算总额">-->
+                                        /
+                                    </td>
+                                    <td><input name="netMarginSettleTotal" type="text" class="number"
+                                               value="${Utils.format(currentBean.netProfit,'0')}" readonly required
+                                               title="项目净利润结算总额"></td>
+                                    <td><input name="netMarginFinalTotal" type="text" class="number"
+                                               value="${Utils.format(finalBean.netMarginFinalTotal,'0')}" required
+                                               readonly title="项目净利润决算总额"></td>
+                                    <td><input name="netMarginProfitMargin" type="text" class="number"
+                                               value="${Utils.format(finalBean.netMarginProfitMargin,'0')}" required
+                                               readonly title="项目净利润利润率"></td>
                                 </tr>
                                 </tbody>
                             </table>
@@ -1632,87 +2395,161 @@
                                 </tr>
                                 <tr>
                                     <td>销售商品、提供劳务收到的现金</td>
-                                    <td><input name="budgetSaleIncomeCash" type="text" class="number" value="${Utils.format(cashFlowBean.saleIncomeCash,'0')}" readonly required title="预算总额"></td>
-                                    <td><input type="text" class="number" value="${Utils.format(currentBean.saleIncomeCash,'0')}" readonly required title="结算总额"></td>
-                                    <td><input name="saleIncomeCash" type="text" class="number" value="${Utils.format(finalBean.saleIncomeCash,'0')}" readonly required title="决算总额"></td>
+                                    <td><input name="budgetSaleIncomeCash" type="text" class="number"
+                                               value="${Utils.format(cashFlowBean.saleIncomeCash,'0')}" readonly
+                                               required title="预算总额"></td>
+                                    <td><input type="text" class="number"
+                                               value="${Utils.format(currentBean.saleIncomeCash,'0')}" readonly required
+                                               title="结算总额"></td>
+                                    <td><input name="saleIncomeCash" type="text" class="number"
+                                               value="${Utils.format(finalBean.saleIncomeCash,'0')}" readonly required
+                                               title="决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>收到的税费返还</td>
                                     <td>/</td>
-                                    <td><input type="text" class="number" value="${Utils.format(currentBean.taxReturn,'0')}" readonly required title="结算总额"></td>
-                                    <td><input name="taxReturn" type="text" class="number" value="${Utils.format(finalBean.taxReturn,'0')}" readonly required title="决算总额"></td>
+                                    <td><input type="text" class="number"
+                                               value="${Utils.format(currentBean.taxReturn,'0')}" readonly required
+                                               title="结算总额"></td>
+                                    <td><input name="taxReturn" type="text" class="number"
+                                               value="${Utils.format(finalBean.taxReturn,'0')}" readonly required
+                                               title="决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>收到其他与经营活动有关的现金</td>
-                                    <td><input name="budgetEarnestMoneyIncome" type="text" class="number" value="${Utils.format(cashFlowBean.earnestMoneyIncome,'0')}" readonly required title="预算总额"></td>
-                                    <td><input type="text" class="number" value="${Utils.format(currentBean.earnestMoneyIncome,'0')}" readonly required title="结算总额"></td>
-                                    <td><input name="earnestMoneyIncome" type="text" class="number" value="${Utils.format(finalBean.earnestMoneyIncome,'0')}" readonly required title="决算总额"></td>
+                                    <td><input name="budgetEarnestMoneyIncome" type="text" class="number"
+                                               value="${Utils.format(cashFlowBean.earnestMoneyIncome,'0')}" readonly
+                                               required title="预算总额"></td>
+                                    <td><input type="text" class="number"
+                                               value="${Utils.format(currentBean.earnestMoneyIncome,'0')}" readonly
+                                               required title="结算总额"></td>
+                                    <td><input name="earnestMoneyIncome" type="text" class="number"
+                                               value="${Utils.format(finalBean.earnestMoneyIncome,'0')}" readonly
+                                               required title="决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>购买商品、接受劳务支付的现金</td>
-                                    <td><input name="budgetPurchaseCost" type="text" class="number" value="${Utils.format(cashFlowBean.purchaseCost,'0')}" readonly required title="预算总额"></td>
-                                    <td><input type="text" class="number" value="${Utils.format(currentBean.purchaseCost,'0')}" readonly required title="结算总额"></td>
-                                    <td><input name="purchaseCost" type="text" class="number" value="${Utils.format(finalBean.purchaseCost,'0')}" readonly required title="决算总额"></td>
+                                    <td><input name="budgetPurchaseCost" type="text" class="number"
+                                               value="${Utils.format(cashFlowBean.purchaseCost,'0')}" readonly required
+                                               title="预算总额"></td>
+                                    <td><input type="text" class="number"
+                                               value="${Utils.format(currentBean.purchaseCost,'0')}" readonly required
+                                               title="结算总额"></td>
+                                    <td><input name="purchaseCost" type="text" class="number"
+                                               value="${Utils.format(finalBean.purchaseCost,'0')}" readonly required
+                                               title="决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>支付的各项税费</td>
                                     <td>/</td>
-                                    <td><input type="text" class="number" value="${Utils.format(currentBean.taxCost,'0')}" readonly required title="结算总额"></td>
-                                    <td><input name="taxCost" type="text" class="number" value="${Utils.format(finalBean.taxCost,'0')}" readonly required title="决算总额"></td>
+                                    <td><input type="text" class="number"
+                                               value="${Utils.format(currentBean.taxCost,'0')}" readonly required
+                                               title="结算总额"></td>
+                                    <td><input name="taxCost" type="text" class="number"
+                                               value="${Utils.format(finalBean.taxCost,'0')}" readonly required
+                                               title="决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>支付其他与经营活动有关的现金</td>
-                                    <td><input name="budgetEarnestMoneyCost" type="text" class="number" value="${Utils.format(cashFlowBean.earnestMoneyCost,'0')}" readonly required title="预算总额"></td>
-                                    <td><input type="text" class="number" value="${Utils.format(currentBean.earnestMoneyCost,'0')}" readonly required title="结算总额"></td>
-                                    <td><input name="earnestMoneyCost" type="text" class="number" value="${Utils.format(finalBean.earnestMoneyCost,'0')}" readonly required title="决算总额"></td>
+                                    <td><input name="budgetEarnestMoneyCost" type="text" class="number"
+                                               value="${Utils.format(cashFlowBean.earnestMoneyCost,'0')}" readonly
+                                               required title="预算总额"></td>
+                                    <td><input type="text" class="number"
+                                               value="${Utils.format(currentBean.earnestMoneyCost,'0')}" readonly
+                                               required title="结算总额"></td>
+                                    <td><input name="earnestMoneyCost" type="text" class="number"
+                                               value="${Utils.format(finalBean.earnestMoneyCost,'0')}" readonly required
+                                               title="决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>经营活动产生的现金流量净额</td>
-                                    <td><input name="budgetNetCashFlow" type="text" class="number" value="${Utils.format(cashFlowBean.getNetCashFlow(),'0')}" readonly required title="预算总额"></td>
-                                    <td><input type="text" class="number" value="${Utils.format(currentBean.netCashFlow,'0')}" readonly required title="结算总额"></td>
-                                    <td><input name="netCashFlow" type="text" class="number" value="${Utils.format(finalBean.netCashFlow,'0')}" readonly required title="决算总额"></td>
+                                    <td><input name="budgetNetCashFlow" type="text" class="number"
+                                               value="${Utils.format(cashFlowBean.getNetCashFlow(),'0')}" readonly
+                                               required title="预算总额"></td>
+                                    <td><input type="text" class="number"
+                                               value="${Utils.format(currentBean.netCashFlow,'0')}" readonly required
+                                               title="结算总额"></td>
+                                    <td><input name="netCashFlow" type="text" class="number"
+                                               value="${Utils.format(finalBean.netCashFlow,'0')}" readonly required
+                                               title="决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>投资活动现金流入</td>
                                     <td>/</td>
-                                    <td><input type="text" class="number" value="${Utils.format(currentBean.cashInflowFromInvestingActivities,'0')}" readonly required title="结算总额"></td>
-                                    <td><input name="cashInflowFromInvestingActivities" value="${Utils.format(finalBean.cashInflowFromInvestingActivities,'0')}" type="text" class="number" readonly required title="决算总额"></td>
+                                    <td><input type="text" class="number"
+                                               value="${Utils.format(currentBean.cashInflowFromInvestingActivities,'0')}"
+                                               readonly required title="结算总额"></td>
+                                    <td><input name="cashInflowFromInvestingActivities"
+                                               value="${Utils.format(finalBean.cashInflowFromInvestingActivities,'0')}"
+                                               type="text" class="number" readonly required title="决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>投资活动现金流出</td>
                                     <td>/</td>
-                                    <td><input type="text" class="number" value="${Utils.format(currentBean.cashOutflowFromInvestingActivities,'0')}" readonly required title="结算总额"></td>
-                                    <td><input name="cashOutflowFromInvestingActivities" type="text" class="number" value="${Utils.format(finalBean.cashOutflowFromInvestingActivities,'0')}" readonly required title="决算总额"></td>
+                                    <td><input type="text" class="number"
+                                               value="${Utils.format(currentBean.cashOutflowFromInvestingActivities,'0')}"
+                                               readonly required title="结算总额"></td>
+                                    <td><input name="cashOutflowFromInvestingActivities" type="text" class="number"
+                                               value="${Utils.format(finalBean.cashOutflowFromInvestingActivities,'0')}"
+                                               readonly required title="决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>投资活动产生的现金流量净额</td>
                                     <td>/</td>
-                                    <td><input type="text" class="number" value="${Utils.format(currentBean.netCashFromInvestingActivities,'0')}" readonly required title="结算总额"></td>
-                                    <td><input name="netCashFromInvestingActivities" type="text" class="number" value="${Utils.format(finalBean.netCashFromInvestingActivities,'0')}" readonly required title="决算总额"></td>
+                                    <td><input type="text" class="number"
+                                               value="${Utils.format(currentBean.netCashFromInvestingActivities,'0')}"
+                                               readonly required title="结算总额"></td>
+                                    <td><input name="netCashFromInvestingActivities" type="text" class="number"
+                                               value="${Utils.format(finalBean.netCashFromInvestingActivities,'0')}"
+                                               readonly required title="决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>融资资金流入</td>
-                                    <td><input name="budgetFinancingCapitalInflow" type="text" class="number" value="${Utils.format(cashFlowBean.financingCapitalInflow,'0')}" readonly required title="预算总额"></td>
-                                    <td><input type="text" class="number" value="${Utils.format(currentBean.financingCapitalInflow,'0')}" readonly required title="结算总额"></td>
-                                    <td><input name="financingCapitalInflow" type="text" class="number" value="${Utils.format(finalBean.financingCapitalInflow,'0')}" required readonly title="决算总额"></td>
+                                    <td><input name="budgetFinancingCapitalInflow" type="text" class="number"
+                                               value="${Utils.format(cashFlowBean.financingCapitalInflow,'0')}" readonly
+                                               required title="预算总额"></td>
+                                    <td><input type="text" class="number"
+                                               value="${Utils.format(currentBean.financingCapitalInflow,'0')}" readonly
+                                               required title="结算总额"></td>
+                                    <td><input name="financingCapitalInflow" type="text" class="number"
+                                               value="${Utils.format(finalBean.financingCapitalInflow,'0')}" required
+                                               readonly title="决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>还款资金流出</td>
-                                    <td><input name="budgetFinancingCapitalOutflow" type="text" class="number" value="${Utils.format(cashFlowBean.financingCapitalOutflow,'0')}" readonly required title="预算总额"></td>
-                                    <td><input type="text" class="number" value="${Utils.format(currentBean.financingCapitalOutflow,'0')}" readonly required title="结算总额"></td>
-                                    <td><input name="financingCapitalOutflow" type="text" class="number" value="${Utils.format(finalBean.financingCapitalOutflow,'0')}" required readonly title="决算总额"></td>
+                                    <td><input name="budgetFinancingCapitalOutflow" type="text" class="number"
+                                               value="${Utils.format(cashFlowBean.financingCapitalOutflow,'0')}"
+                                               readonly required title="预算总额"></td>
+                                    <td><input type="text" class="number"
+                                               value="${Utils.format(currentBean.financingCapitalOutflow,'0')}" readonly
+                                               required title="结算总额"></td>
+                                    <td><input name="financingCapitalOutflow" type="text" class="number"
+                                               value="${Utils.format(finalBean.financingCapitalOutflow,'0')}" required
+                                               readonly title="决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>筹资活动产生的现金流量净额</td>
-                                    <td><input name="budgetFinancingCapitalCashflow" type="text" class="number" value="${Utils.format(cashFlowBean.getFinancingCapitalCashflow(),'0')}" readonly required title="预算总额"></td>
-                                    <td><input type="text" class="number" value="${Utils.format(currentBean.financingCapitalCashflow,'0')}" readonly required title="结算总额"></td>
-                                    <td><input name="financingCapitalCashflow" type="text" class="number" value="${Utils.format(finalBean.financingCapitalCashflow,'0')}" required readonly title="决算总额"></td>
+                                    <td><input name="budgetFinancingCapitalCashflow" type="text" class="number"
+                                               value="${Utils.format(cashFlowBean.getFinancingCapitalCashflow(),'0')}"
+                                               readonly required title="预算总额"></td>
+                                    <td><input type="text" class="number"
+                                               value="${Utils.format(currentBean.financingCapitalCashflow,'0')}"
+                                               readonly required title="结算总额"></td>
+                                    <td><input name="financingCapitalCashflow" type="text" class="number"
+                                               value="${Utils.format(finalBean.financingCapitalCashflow,'0')}" required
+                                               readonly title="决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>货币资金净增加额</td>
-                                    <td><input name="budgetNetIncreaseMonetaryFunds" type="text" class="number" value="${Utils.format(cashFlowBean.getNetIncreaseMonetaryFunds(),'0')}" readonly required title="预算总额"></td>
-                                    <td><input name="type14SettleTotal" type="text" class="number" value="${Utils.format(currentBean.netIncreaseMonetaryFunds,'0')}" readonly required title="结算总额"></td>
-                                    <td><input name="netIncreaseMonetaryFunds" type="text" class="number" value="${Utils.format(finalBean.netIncreaseMonetaryFunds,'0')}" required readonly title="决算总额"></td>
+                                    <td><input name="budgetNetIncreaseMonetaryFunds" type="text" class="number"
+                                               value="${Utils.format(cashFlowBean.getNetIncreaseMonetaryFunds(),'0')}"
+                                               readonly required title="预算总额"></td>
+                                    <td><input name="type14SettleTotal" type="text" class="number"
+                                               value="${Utils.format(currentBean.netIncreaseMonetaryFunds,'0')}"
+                                               readonly required title="结算总额"></td>
+                                    <td><input name="netIncreaseMonetaryFunds" type="text" class="number"
+                                               value="${Utils.format(finalBean.netIncreaseMonetaryFunds,'0')}" required
+                                               readonly title="决算总额"></td>
                                 </tr>
                                 <#--<tr>
                                     <td>合计</td>
@@ -1734,7 +2571,8 @@
 
                                         <#list taskRecords as node>
                                             <li class="time-axis-item">
-                                                <div class="time-axis-date" style="margin-left: -96px">  ${node.createTime}
+                                                <div class="time-axis-date"
+                                                     style="margin-left: -96px">  ${node.createTime}
                                                     <span></span>
                                                 </div>
                                                 <div class="time-axis-title"> ${node.roleName}-${node.assigneeName}:
@@ -1920,9 +2758,9 @@
                                                        value="${Utils.format(costDetail.totalTaxExclude,'0')}" readonly>
                                             </td>
                                             <td>
-                                               <#-- <button type="button"
-                                                        class="am-btn am-btn-warning am-btn-xs am-round am-modal-line-delete">
-                                                    <span class="am-icon-minus"></span></button>-->
+                                                <#-- <button type="button"
+                                                         class="am-btn am-btn-warning am-btn-xs am-round am-modal-line-delete">
+                                                     <span class="am-icon-minus"></span></button>-->
                                             </td>
                                         </tr>
                                     </#list>
@@ -1990,7 +2828,8 @@
                                             <td><input type="text"
                                                        class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
                                                        value="${costProjectManageDetail.name!}" readonly
-                                                       <#--<#if costProjectManageDetail.deletable==0>readonly</#if>-->></td>
+                                                        <#--<#if costProjectManageDetail.deletable==0>readonly</#if>-->>
+                                            </td>
                                             <td><input type="text" readonly
                                                        class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
                                                        value="${costProjectManageDetail.detail!}"></td>
@@ -2063,7 +2902,7 @@
                                     <td>资金利息</td>
                                     <td>垫资计划</td>
                                     <td>还款计划</td>
-                                   <#-- <td>操作</td>-->
+                                    <#-- <td>操作</td>-->
                                 </tr>
                                 <tr>
                                     <td><#--<input type="text" class="am-modal-prompt-input input-total-month-budget-plan"
@@ -2217,7 +3056,7 @@
                         </div>
                         <div class="am-modal-footer">
                             <span class="am-modal-btn" data-am-modal-cancel>取消</span>
-                           <#-- <span class="am-modal-btn" data-am-modal-confirm>保存</span>-->
+                            <#-- <span class="am-modal-btn" data-am-modal-confirm>保存</span>-->
                         </div>
                     </div>
                 </div>
@@ -2238,10 +3077,11 @@
 
                                                 <div class="am-u-sm-12 am-u-md-4 switch-button" style="height: 25px;">
                                                     <label class="am-radio-inline">
-                                                        <input type="radio"  value="2" checked="checked" name="docVlGender" required> 审核通过
+                                                        <input type="radio" value="2" checked="checked"
+                                                               name="docVlGender" required> 审核通过
                                                     </label>
                                                     <label class="am-radio-inline">
-                                                        <input type="radio" value="3"  name="docVlGender"> 审核不通过
+                                                        <input type="radio" value="3" name="docVlGender"> 审核不通过
                                                     </label>
                                                 </div>
 
@@ -2251,9 +3091,11 @@
 
                                             <div class="am-g am-form-group am-margin-top" style="display: flex;">
                                                 <div class="am-u-sm-4 am-u-md-2 am-text-right">
-                                                    <span style="color: red;">*</span>审核意见</div>
+                                                    <span style="color: red;">*</span>审核意见
+                                                </div>
                                                 <div class="am-u-sm-6 am-u-md-6">
-                                                    <textarea id="doc-vld-ta-2" minlength="10" maxlength="100"></textarea>
+                                                    <textarea id="doc-vld-ta-2" minlength="10"
+                                                              maxlength="100"></textarea>
                                                 </div>
                                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                                             </div>
@@ -2285,7 +3127,7 @@
                         返回上一级
                     </button>
                     <#if adminId==project.approveId>
-                    <button type="submit" class="am-btn am-btn-primary am-btn-xs" id="saveFinal">审核</button>
+                        <button type="submit" class="am-btn am-btn-primary am-btn-xs" id="saveFinal">审核</button>
                     </#if>
                 </div>
             </form>
@@ -2306,6 +3148,11 @@
 
 <script>
     $(function () {
+        $("#subTab").find('a').on('opened.tabs.amui', function(e) {
+            console.log(e)
+            var id = $(this).attr('href');
+            $(id).addClass('am-active').siblings().removeClass('am-active')
+        })
         $("#saveFinal").click(function () {
             $('#my-approve').modal({
                 relatedTarget: this,
@@ -2351,7 +3198,7 @@
         });
     };
 
-    layui.use('laydate', function(){
+    layui.use('laydate', function () {
         var laydate = layui.laydate;
 
         laydate.render({
@@ -2359,14 +3206,14 @@
             type: 'month',
             btns: ['confirm'],
             trigger: 'click',
-            ready: function(){
+            ready: function () {
                 console.log($(this.elem).val());
             },
-            done: function() {
+            done: function () {
                 var time = $(this.elem).val();
                 console.log("time:" + time)
                 setKeywords(time);
-                $("#pmsForm").attr("action","${base}/project/approve?listFrom=list&id=${project.id}");
+                $("#pmsForm").attr("action", "${base}/project/approve?listFrom=list&id=${project.id}");
                 $("#pmsForm").submit();
             }
         });

From 3e5eaa103a95da777268da545bed3cd04913f627 Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Thu, 13 Jan 2022 18:05:21 +0800
Subject: [PATCH 26/35] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/admin/project_approve.ftl       | 671 ------------------
 1 file changed, 671 deletions(-)

diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index baddc49..b129dca 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -916,184 +916,6 @@
                                         </tbody>
                                     </table>
                                 </div>
-                                <#--<span class="am-text-primary"><a style="cursor: pointer" id="income-detail">收入明细表</a></span>
-                                <span class="am-text-primary"><a style="cursor: pointer"  id="cost-detail">采购成本明细表</a></span>
-                                <span class="am-text-primary"><a style="cursor: pointer"  id="cost-project-manage-detail">项目管理成本表</a></span>
-                                <span class="am-text-primary budget-plan-detail"><a style="cursor: pointer">资金计划表</a></span>-->
-                                <div class="am-tab-panel am-fade am-in" id="tab35">
-                                    <span class="am-text-lg">收入</span>
-                                    <table class="am-table am-table-bordered am-table-radius table-main"
-                                           style="padding:0;">
-                                        <tbody>
-                                        <tr class="am-text-lg">
-                                            <td>类别</td>
-                                            <td>费用</td>
-                                            <td>含税金额（元）</td>
-                                            <td>不含税金额（元）</td>
-                                        </tr>
-                                        <tr>
-                                            <td>收入</td>
-                                            <td>设备类</td>
-                                            <td><input type="text" class="number" name="incomeDeviceTaxInclude"
-                                                       value="${Utils.format(budgetBean.incomeDeviceTaxInclude,'0')}"
-                                                       required readonly title="设备类含税总额"></td>
-                                            <td><input type="text" class="number" name="incomeDeviceTaxExclude"
-                                                       value="${Utils.format(budgetBean.incomeDeviceTaxExclude,'0')}"
-                                                       required readonly title="设备类不含税总额"></td>
-                                        </tr>
-                                        <tr>
-                                            <td>收入</td>
-                                            <td>工程类</td>
-                                            <td><input type="text" class="number" name="incomeEngineerTaxInclude"
-                                                       value="${Utils.format(budgetBean.incomeEngineerTaxInclude,'0')}"
-                                                       required readonly title="工程类含税总额"></td>
-                                            <td><input type="text" class="number" name="incomeEngineerTaxExclude"
-                                                       value="${Utils.format(budgetBean.incomeEngineerTaxExclude,'0')}"
-                                                       required readonly title="工程类不含税总额"></td>
-                                        </tr>
-                                        <tr>
-                                            <td>收入</td>
-                                            <td>服务类</td>
-                                            <td><input type="text" class="number" name="incomeServiceTaxInclude"
-                                                       value="${Utils.format(budgetBean.incomeServiceTaxInclude,'0')}"
-                                                       required readonly title="服务类含税总额"></td>
-                                            <td><input type="text" class="number" name="incomeServiceTaxExclude"
-                                                       value="${Utils.format(budgetBean.incomeServiceTaxExclude,'0')}"
-                                                       required readonly title="服务类不含税总额"></td>
-                                        </tr>
-                                        <tr>
-                                            <td>合计</td>
-                                            <td></td>
-                                            <td><input type="text" class="number" name="incomeTotalTaxInclude"
-                                                       value="${Utils.format(budgetBean.incomeTotalTaxInclude,'0')}"
-                                                       readonly required title="此列累计"></td>
-                                            <td><input type="text" class="number" name="incomeTotalTaxExclude"
-                                                       value="${Utils.format(budgetBean.incomeTotalTaxExclude,'0')}"
-                                                       readonly required title="此列累计"></td>
-                                        </tr>
-                                        </tbody>
-                                    </table>
-                                    <span class="am-text-lg">成本</span>
-                                    <#-- <span class="am-text-primary"><a style="cursor: pointer"  id="cost-detail">采购成本明细表</a></span>
-                                     <span class="am-text-primary"><a style="cursor: pointer"  id="cost-project-manage-detail">项目管理成本表</a></span>-->
-                                    <table class="am-table am-table-bordered am-table-radius table-main"
-                                           style="padding:0;">
-                                        <tbody>
-                                        <tr class="am-text-lg">
-                                            <td>类别</td>
-                                            <td>费用</td>
-                                            <td>费用项目</td>
-                                            <td>含税金额（元）</td>
-                                            <td>不含税金额（元）</td>
-                                        </tr>
-                                        <tr>
-                                            <td>成本</td>
-                                            <td>采购成本</td>
-                                            <td>设备</td>
-                                            <td><input type="text" class="number" name="costPurchaseDeviceTaxInclude"
-                                                       value="${Utils.format(budgetBean.costPurchaseDeviceTaxInclude,'0')}"
-                                                       readonly required title="购买设备含税总额"></td>
-                                            <td><input type="text" class="number" name="costPurchaseDeviceTaxExclude"
-                                                       value="${Utils.format(budgetBean.costPurchaseDeviceTaxExclude,'0')}"
-                                                       readonly required title="购买设备不含税总额"></td>
-                                        </tr>
-                                        <tr>
-                                            <td>成本</td>
-                                            <td>采购成本</td>
-                                            <td>施工</td>
-                                            <td><input type="text" class="number" name="costPurchaseBuildTaxInclude"
-                                                       value="${Utils.format(budgetBean.costPurchaseBuildTaxInclude,'0')}"
-                                                       readonly required title="购买施工含税总额"></td>
-                                            <td><input type="text" class="number" name="costPurchaseBuildTaxExclude"
-                                                       value="${Utils.format(budgetBean.costPurchaseBuildTaxExclude,'0')}"
-                                                       readonly required title="购买施工不含税总额"></td>
-                                        </tr>
-                                        <tr>
-                                            <td>成本</td>
-                                            <td>采购成本</td>
-                                            <td>服务</td>
-                                            <td><input type="text" class="number" name="costPurchaseServiceTaxInclude"
-                                                       value="${Utils.format(budgetBean.costPurchaseServiceTaxInclude,'0')}"
-                                                       readonly required title="购买服务含税总额"></td>
-                                            <td><input type="text" class="number" name="costPurchaseServiceTaxExclude"
-                                                       value="${Utils.format(budgetBean.costPurchaseServiceTaxExclude,'0')}"
-                                                       readonly required title="购买服务不含税总额"></td>
-                                        </tr>
-                                        <tr>
-                                            <td>成本</td>
-                                            <td>采购成本</td>
-                                            <td>其他</td>
-                                            <td><input type="text" class="number" name="costPurchaseOtherTaxInclude"
-                                                       value="${Utils.format(budgetBean.costPurchaseOtherTaxInclude,'0')}"
-                                                       readonly required title="购买其他含税总额"></td>
-                                            <td><input type="text" class="number" name="costPurchaseOtherTaxExclude"
-                                                       value="${Utils.format(budgetBean.costPurchaseOtherTaxExclude,'0')}"
-                                                       readonly required title="购买其他不含税总额"></td>
-                                        </tr>
-                                        <tr>
-                                            <td>成本</td>
-                                            <td>项目管理成本</td>
-                                            <td>项目管理成本</td>
-                                            <td><input type="text" class="number" name="costProjectManageTaxInclude"
-                                                       value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0')}"
-                                                       readonly required title="项目管理成本总额"></td>
-                                            <td><input type="text" class="number" name="costProjectManageTaxExclude"
-                                                       value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0')}"
-                                                       readonly required title="项目管理成本总额"></td>
-                                        </tr>
-                                        <tr>
-                                            <td>成本</td>
-                                            <td>其他</td>
-                                            <td>${project.otherName!}</td>
-                                            <td><input type="text" class="number" name="costOtherOtherTaxInclude"
-                                                       value="${Utils.format(budgetBean.costOtherOtherTaxInclude,'0')}"
-                                                       required readonly title="其他含税总额（填入）"></td>
-                                            <td><input type="text" class="number" name="costOtherOtherTaxExclude"
-                                                       value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0')}"
-                                                       required readonly title="其他不含税总额（填入）"></td>
-                                        </tr>
-                                        <tr>
-                                            <td>合计</td>
-                                            <td></td>
-                                            <td></td>
-                                            <td><input type="text" class="number" name="costTotalTaxInclude"
-                                                       value="${Utils.format(budgetBean.costTotalTaxInclude,'0')}"
-                                                       readonly required title="此列累计"></td>
-                                            <td><input type="text" class="number" name="costTotalTaxExclude"
-                                                       value="${Utils.format(budgetBean.costTotalTaxExclude,'0')}"
-                                                       readonly required title="此列累计"></td>
-                                        </tr>
-                                        </tbody>
-                                    </table>
-                                    <span class="am-text-lg">管理</span>
-                                    <#--<span class="am-text-primary budget-plan-detail"><a style="cursor: pointer">资金计划表</a></span>-->
-                                    <table class="am-table am-table-bordered am-table-radius table-main"
-                                           style="padding:0;">
-                                        <tbody>
-                                        <tr class="am-text-lg">
-                                            <td>类别</td>
-                                            <td>费用项目</td>
-                                            <td>不含税金额（元）</td>
-                                        </tr>
-                                        <tr>
-                                            <td>财务费用</td>
-                                            <td>资金占用成本</td>
-                                            <td><input type="text" class="number" name="costExpropriationTaxExclude"
-                                                       value="${Utils.format(budgetBean.costExpropriationTaxExclude,'0')}"
-                                                       required readonly title="资金占用成本不含税总额"></td>
-                                        </tr>
-                                        <tr>
-                                            <td>公司管理费用</td>
-                                            <td></td>
-                                            <td><input type="text" class="number" name="costCompanyManageTaxExclude"
-                                                       value="${Utils.format(budgetBean.costCompanyManageTaxExclude,'0')}"
-                                                       required readonly title="公司管理费用不含税总额"></td>
-                                        </tr>
-                                        </tbody>
-                                    </table>
-                                </tbody>
-                            </table>
-
                             <#--<span class="am-text-primary"><a style="cursor: pointer" id="income-detail">收入明细表</a></span>
                             <span class="am-text-primary"><a style="cursor: pointer"  id="cost-detail">采购成本明细表</a></span>
                             <span class="am-text-primary"><a style="cursor: pointer"  id="cost-project-manage-detail">项目管理成本表</a></span>
@@ -1589,21 +1411,6 @@
                                     <td><input name="costOtherFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costOtherOtherTaxExclude,'0.00')}" required readonly title="其他成本上月结算总额"></td>
                                     <td><input type="text" class="number" name="costOther" value="${Utils.format(monthBean.costOther,'0.00')}" required readonly title="其他成本本月结算金额"></td>
                                     <td><input type="text" class="number" name="costOtherSettleTotal" value="${Utils.format(currentBean.costOtherOtherTaxExclude,'0.00')}" readonly title="其他成本结算总额"></td>
-                                    <td><input name="costOtherEstimateTotal" type="text" class="number"
-                                               value="${Utils.format(monthBean.estimateCostOther,'0')}" readonly
-                                               required title="其他成本概算总额"></td>
-                                    <td><input name="costOtherBudgetTotal" type="text" class="number"
-                                               value="${Utils.format(monthBean.budgetCostOther,'0')}" readonly required
-                                               title="其他成本预算总额"></td>
-                                    <td><input name="costOtherFormerSettleTotal" type="text" class="number"
-                                               value="${Utils.format(formerBean.costOtherOtherTaxExclude,'0')}" required
-                                               readonly title="其他成本上月结算总额"></td>
-                                    <td><input type="text" class="number" name="costOther"
-                                               value="${Utils.format(monthBean.costOther,'0')}" required readonly
-                                               title="其他成本本月结算金额"></td>
-                                    <td><input type="text" class="number" name="costOtherSettleTotal"
-                                               value="${Utils.format(currentBean.costOtherOtherTaxExclude,'0')}"
-                                               readonly title="其他成本结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>合计</td>
@@ -2211,19 +2018,6 @@
                                     <td><input name="costOtherOtherTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0.00')}" readonly required title="其他成本预算总额"></td>
                                     <td><input name="costOtherSettleTotal" value="${Utils.format(currentBean.costOtherOtherTaxExclude,'0.00')}" type="text" class="number" readonly required title="其他成本结算总额"></td>
                                     <td><input name="costOtherFinalTotal" type="text" class="number" value="${Utils.format(finalBean.costOtherFinalTotal,'0.00')}" required readonly title="其他成本决算总额"></td>
-                                    <td><input name="costOtherOtherTaxExclude" type="text" class="number"
-                                               value="${Utils.format(estimateBean.costOtherOtherTaxExclude,'0')}"
-                                               readonly required title="其他成本概算总额"></td>
-                                    <td><input name="costOtherOtherTaxExclude" type="text" class="number"
-                                               value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0')}" readonly
-                                               required title="其他成本预算总额"></td>
-                                    <td><input name="costOtherSettleTotal"
-                                               value="${Utils.format(currentBean.costOtherOtherTaxExclude,'0')}"
-                                               type="text" class="number" type="text" class="number" readonly required
-                                               title="其他成本结算总额"></td>
-                                    <td><input name="costOtherFinalTotal" type="text" class="number"
-                                               value="${Utils.format(finalBean.costOtherFinalTotal,'0')}" required
-                                               readonly title="其他成本决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>合计</td>
@@ -2596,471 +2390,6 @@
 
                 </div>
 
-
-                <#--收入明细表弹窗-->
-                <div class="am-modal am-modal-prompt" style="width: 1200px;max-height:600px;overflow-y:auto;"
-                     tabindex="-1" id="my-prompt-income-detail">
-                    <div class="am-modal-dialog">
-                        <div class="am-modal-hd">销售收入明细表——${project.name}</div>
-                        <div class="am-modal-bd">
-                            <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;"
-                                   id="incomeTable">
-                                <tbody>
-                                <tr>
-                                    <td>类别</td>
-                                    <td>名称</td>
-                                    <td>单位</td>
-                                    <td>数量</td>
-                                    <td>单价</td>
-                                    <td>税率（%）</td>
-                                    <td>含税总金额（元）</td>
-                                    <td>不含税金额（元）</td>
-                                    <#--<td>操作</td>-->
-                                </tr>
-
-                                <#if incomeDetails??>
-                                    <#list incomeDetails as incomeDetail>
-                                        <tr>
-                                            <td>
-                                                <#--<select style="width: auto" readonly
-                                                        class="am-modal-prompt-input am-modal-prompt-input-income">
-                                                    <option value="1" <#if incomeDetail.type == 1>selected</#if>>设备类
-                                                    </option>
-                                                    <option value="2" <#if incomeDetail.type == 2>selected</#if>>工程类
-                                                    </option>
-                                                    <option value="3" <#if incomeDetail.type == 3>selected</#if>>服务类
-                                                    </option>
-                                                </select>-->
-                                                <#if incomeDetail.type ==1 >
-                                                    设备类
-                                                <#elseif incomeDetail.type  ==2>
-                                                    工程类
-                                                <#elseif incomeDetail.type  ==3>
-                                                    服务类
-                                                </#if>
-                                            </td>
-                                            <td><input type="text" readonly
-                                                       class="am-modal-prompt-input am-modal-prompt-input-income"
-                                                       value="${incomeDetail.name!}"></td>
-                                            <td><input type="text" readonly
-                                                       class="am-modal-prompt-input am-modal-prompt-input-income"
-                                                       value="${incomeDetail.unit!}"></td>
-                                            <td><input type="text" readonly
-                                                       class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-amount"
-                                                       value="${incomeDetail.amount!0}"></td>
-                                            <td><input type="text" readonly
-                                                       class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-price"
-                                                       value="${Utils.format2(incomeDetail.price,'0')}"></td>
-                                            <td><input type="text" readonly
-                                                       class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-tax-rate"
-                                                       value="${Utils.format(incomeDetail.taxRate,'0')}"></td>
-                                            <td><input type="text"
-                                                       class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-tax-include"
-                                                       value="${Utils.format(incomeDetail.totalTaxInclude,'0')}"
-                                                       readonly></td>
-                                            <td><input type="text"
-                                                       class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-tax-exclude"
-                                                       value="${Utils.format(incomeDetail.totalTaxExclude,'0')}"
-                                                       readonly></td>
-                                            <#--<td>
-                                                <button type="button"
-                                                        class="am-btn am-btn-warning am-btn-xs am-round am-modal-line-delete">
-                                                    <span class="am-icon-minus"></span></button>
-                                            </td>-->
-                                        </tr>
-                                    </#list>
-                                </#if>
-
-                                </tbody>
-                            </table>
-                            <#--<button type="button" id="incomeAddBtn" class="am-btn am-btn-primary am-btn-xs am-round">
-                                <span class="am-icon-plus"></span></button>-->
-                        </div>
-                        <div class="am-modal-footer">
-                            <span class="am-modal-btn" data-am-modal-cancel>取消</span>
-                            <#--<span class="am-modal-btn" data-am-modal-confirm>保存</span>-->
-                        </div>
-                    </div>
-                </div>
-                <#--采购成本明细弹窗-->
-                <div class="am-modal am-modal-prompt" style="width: 1200px;max-height:600px;overflow-y:auto;"
-                     tabindex="-1" id="my-prompt-cost-detail">
-                    <div class="am-modal-dialog">
-                        <div class="am-modal-hd">采购成本明细表——${project.name}</div>
-                        <div class="am-modal-bd">
-                            <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;"
-                                   id="costTable">
-                                <tbody>
-                                <tr>
-                                    <td>大类</td>
-                                    <td>类别</td>
-                                    <td>名称</td>
-                                    <td>单位</td>
-                                    <td>数量</td>
-                                    <td>单价</td>
-                                    <td>税率（%）</td>
-                                    <td>含税总金额（元）</td>
-                                    <td>不含税金额（元）</td>
-                                    <#--<td>操作</td>-->
-                                </tr>
-
-                                <#if costDetails??>
-                                    <#list costDetails as costDetail>
-                                        <tr>
-                                            <td>
-                                                <#--<select style="width: auto" readonly
-                                                        class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-type">
-                                                    <option value="1" <#if costDetail.type == 1>selected</#if>>设备
-                                                    </option>
-                                                    <option value="2" <#if costDetail.type == 2>selected</#if>>施工
-                                                    </option>
-                                                    <option value="3" <#if costDetail.type == 3>selected</#if>>服务
-                                                    </option>
-                                                    <option value="4" <#if costDetail.type == 4>selected</#if>>其他
-                                                    </option>
-                                                </select>-->
-                                                <#if costDetail.type ==1 >
-                                                    设备
-                                                <#elseif costDetail.type  ==2>
-                                                    施工
-                                                <#elseif costDetail.type  ==3>
-                                                    服务
-                                                <#elseif costDetail.type  ==4>
-                                                    其他
-                                                </#if>
-                                            </td>
-                                            <td>
-                                                <#list procurementTypes as procurementType>
-                                                    <#if costDetail.category == procurementType.id>${procurementType.name}</#if>
-                                                </#list>
-                                            </td>
-                                            <td><input type="text" readonly
-                                                       class="am-modal-prompt-input am-modal-prompt-input-cost"
-                                                       value="${costDetail.name!}"></td>
-                                            <td><input type="text" readonly
-                                                       class="am-modal-prompt-input am-modal-prompt-input-cost"
-                                                       value="${costDetail.unit!}"></td>
-                                            <td><input type="text" readonly
-                                                       class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-amount"
-                                                       value="${costDetail.amount!0}"></td>
-                                            <td><input type="text" readonly
-                                                       class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-price"
-                                                       value="${Utils.format2(costDetail.price,'0')}"></td>
-                                            <td><input type="text" min="0.00" max="99.99" step="0.01" readonly
-                                                       class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-tax-rate"
-                                                       value="${Utils.format(costDetail.taxRate,'0')}"></td>
-                                            <td><input type="text"
-                                                       class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-tax-include"
-                                                       value="${Utils.format(costDetail.totalTaxInclude,'0')}" readonly>
-                                            </td>
-                                            <td><input type="text"
-                                                       class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-tax-exclude"
-                                                       value="${Utils.format(costDetail.totalTaxExclude,'0')}" readonly>
-                                            </td>
-                                            <td>
-                                                <#-- <button type="button"
-                                                         class="am-btn am-btn-warning am-btn-xs am-round am-modal-line-delete">
-                                                     <span class="am-icon-minus"></span></button>-->
-                                            </td>
-                                        </tr>
-                                    </#list>
-                                </#if>
-
-                                </tbody>
-                            </table>
-                            <#--<button type="button" id="costAddBtn" class="am-btn am-btn-primary am-btn-xs am-round"><span
-                                        class="am-icon-plus"></span></button>-->
-                        </div>
-                        <div class="am-modal-footer">
-                            <span class="am-modal-btn" data-am-modal-cancel>取消</span>
-                            <#--<span class="am-modal-btn" data-am-modal-confirm>保存</span>-->
-                        </div>
-                    </div>
-                </div>
-                <#--项目管理明细表弹窗-->
-                <div class="am-modal am-modal-prompt" style="width: 1200px;max-height:600px;overflow-y:auto;"
-                     tabindex="-1" id="my-prompt-cost-project-manage-detail">
-                    <div class="am-modal-dialog">
-                        <div class="am-modal-hd">项目管理成本明细表——${project.name}</div>
-                        <div class="am-modal-bd">
-                            <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;"
-                                   id="costProjectManageTable">
-                                <tbody>
-                                <tr>
-                                    <td>财务费用类别</td>
-                                    <td>业务项目</td>
-                                    <td>项目明细</td>
-                                    <td>单位</td>
-                                    <td>数量</td>
-                                    <td>单价</td>
-                                    <td>总金额（元）</td>
-                                    <td>预估计算方法</td>
-                                    <td>预估依据</td>
-                                    <td>备注</td>
-                                    <#--<td>操作</td>-->
-                                </tr>
-
-                                <#if costProjectManageDetails??>
-                                    <#list costProjectManageDetails as costProjectManageDetail>
-                                        <tr>
-                                            <td>
-                                                <#--<select style="width: auto"
-                                                        class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
-                                                        <#if costProjectManageDetail.deletable==0>readonly</#if>>
-                                                    <option value="1"
-                                                            <#if costProjectManageDetail.type == 1>selected</#if>>人工成本
-                                                    </option>
-                                                    <option value="2"
-                                                            <#if costProjectManageDetail.type == 2>selected</#if>>业务费用
-                                                    </option>
-                                                    <option value="3"
-                                                            <#if costProjectManageDetail.type == 3>selected</#if>>其他费用
-                                                    </option>
-                                                </select>-->
-                                                <#if costProjectManageDetail.type ==1 >
-                                                    人工成本
-                                                <#elseif costProjectManageDetail.type  ==2>
-                                                    业务费用
-                                                <#elseif costProjectManageDetail.type  ==3>
-                                                    其他费用
-                                                </#if>
-                                            </td>
-                                            <td><input type="text"
-                                                       class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
-                                                       value="${costProjectManageDetail.name!}" readonly
-                                                        <#--<#if costProjectManageDetail.deletable==0>readonly</#if>-->>
-                                            </td>
-                                            <td><input type="text" readonly
-                                                       class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
-                                                       value="${costProjectManageDetail.detail!}"></td>
-                                            <td><input type="text" readonly
-                                                       class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
-                                                       value="${costProjectManageDetail.unit!}"></td>
-                                            <td><input type="text" readonly
-                                                       class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-amount-project-manage"
-                                                       value="${costProjectManageDetail.amount!0}"></td>
-                                            <td><input type="text" readonly
-                                                       class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-price-project-manage"
-                                                       value="${Utils.format2(costProjectManageDetail.price,'0')}"></td>
-                                            <td><input type="text"
-                                                       class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-total-project-manage"
-                                                       value="${Utils.format(costProjectManageDetail.total,'0')}"
-                                                       readonly></td>
-                                            <td><input type="text" readonly
-                                                       class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
-                                                       value="${costProjectManageDetail.predictMethod!}"></td>
-                                            <td><input type="text" readonly
-                                                       class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
-                                                       value="${costProjectManageDetail.predictWhy!}"></td>
-                                            <td><input type="text" readonly
-                                                       class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
-                                                       value="${costProjectManageDetail.remark!}"></td>
-                                            <#--<td><#if costProjectManageDetail.deletable==1>
-                                                    <button type="button"
-                                                            class="am-btn am-btn-warning am-btn-xs am-round am-modal-line-delete">
-                                                        <span class="am-icon-minus"></span></button></#if>
-                                                <input type="hidden"
-                                                       class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
-                                                       value="${costProjectManageDetail.deletable!}">
-                                            </td>-->
-                                        </tr>
-                                    </#list>
-                                </#if>
-
-                                </tbody>
-                            </table>
-                            <#--<button type="button" id="costProjectManageAddBtn"
-                                    class="am-btn am-btn-primary am-btn-xs am-round"><span class="am-icon-plus"></span>
-                            </button>-->
-                        </div>
-                        <div class="am-modal-footer">
-                            <span class="am-modal-btn" data-am-modal-cancel>取消</span>
-                            <#--<span class="am-modal-btn" data-am-modal-confirm>保存</span>-->
-                        </div>
-                    </div>
-                </div>
-                <#--资金计划明细表弹窗-->
-                <div class="am-modal am-modal-prompt" style="width: 1200px;max-height:600px;overflow-y:auto;"
-                     tabindex="-1" id="my-prompt-budget-plan-detail">
-                    <div class="am-modal-dialog">
-                        <div class="am-modal-hd">资金计划明细表——${project.name}</div>
-                        <div class="am-modal-bd">
-                            <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;"
-                                   id="budgetPlanDetailTable">
-                                <tbody>
-                                <tr>
-                                    <td>月份</td>
-                                    <td>设备支出</td>
-                                    <td>工程支出（含服务+施工+其他）</td>
-                                    <td>经营性开支</td>
-                                    <td>保证金支出</td>
-                                    <td>支出合计</td>
-                                    <td>销售收款</td>
-                                    <td>保证金收款</td>
-                                    <td>收款合计</td>
-                                    <td>资金余额</td>
-                                    <td>资金利息</td>
-                                    <td>垫资计划</td>
-                                    <td>还款计划</td>
-                                    <#-- <td>操作</td>-->
-                                </tr>
-                                <tr>
-                                    <td><#--<input type="text" class="am-modal-prompt-input input-total-month-budget-plan"
-                                               value="${projectBudgetPlanDetailTotal.month}" readonly/>-->${projectBudgetPlanDetailTotal.month}</td>
-                                    <td><input type="text"
-                                               class="am-modal-prompt-input input-total-device-cost-budget-plan"
-                                               value="${Utils.format(projectBudgetPlanDetailTotal.deviceCost)}"
-                                               readonly/></td>
-                                    <td><input type="text"
-                                               class="am-modal-prompt-input input-total-engineer-cost-budget-plan"
-                                               value="${Utils.format(projectBudgetPlanDetailTotal.engineerCost)}"
-                                               readonly/></td>
-                                    <td><input type="text"
-                                               class="am-modal-prompt-input input-total-project-manage-cost-budget-plan"
-                                               value="${Utils.format(projectBudgetPlanDetailTotal.projectManageCost)}"
-                                               readonly/></td>
-                                    <td><input type="text"
-                                               class="am-modal-prompt-input input-total-earnest-money-cost-budget-plan"
-                                               value="${Utils.format(projectBudgetPlanDetailTotal.earnestMoneyCost)}"
-                                               readonly/></td>
-                                    <td><input type="text"
-                                               class="am-modal-prompt-input input-total-total-cost-budget-plan"
-                                               value="${Utils.format(projectBudgetPlanDetailTotal.totalCost)}"
-                                               readonly/></td>
-                                    <td><input type="text"
-                                               class="am-modal-prompt-input input-total-sale-income-budget-plan"
-                                               value="${Utils.format(projectBudgetPlanDetailTotal.saleIncome)}"
-                                               readonly/></td>
-                                    <td><input type="text"
-                                               class="am-modal-prompt-input input-total-earnest-money-income-budget-plan"
-                                               value="${Utils.format(projectBudgetPlanDetailTotal.earnestMoneyIncome)}"
-                                               readonly/></td>
-                                    <td><input type="text"
-                                               class="am-modal-prompt-input input-total-total-income-budget-plan"
-                                               value="${Utils.format(projectBudgetPlanDetailTotal.totalIncome)}"
-                                               readonly/></td>
-                                    <td><input type="text"
-                                               class="am-modal-prompt-input input-total-fund-balance-budget-plan"
-                                               value="${Utils.format(projectBudgetPlanDetailTotal.fundBalance)}"
-                                               readonly/></td>
-                                    <td><input type="text"
-                                               class="am-modal-prompt-input input-total-capital-interest-budget-plan"
-                                               value="${Utils.format(projectBudgetPlanDetailTotal.capitalInterest)}"
-                                               readonly/></td>
-                                    <td><input type="text"
-                                               class="am-modal-prompt-input input-total-underwritten-plan-budget-plan"
-                                               value="${Utils.format(projectBudgetPlanDetailTotal.underwrittenPlan)}"
-                                               readonly/></td>
-                                    <td><input type="text"
-                                               class="am-modal-prompt-input input-total-repayment-plan-budget-plan"
-                                               value="${Utils.format(projectBudgetPlanDetailTotal.repaymentPlan)}"
-                                               readonly/></td>
-                                    <td></td>
-                                </tr>
-
-                                <#if projectBudgetPlanDetails??>
-                                    <#list projectBudgetPlanDetails as projectBudgetPlanDetail>
-                                        <tr>
-                                            <td><#--<input type="text" readonly
-                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-month-budget-plan"
-                                                       value="${projectBudgetPlanDetail.month!}">-->${projectBudgetPlanDetail.month!}</td>
-                                            <td><input type="text" readonly
-                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-device-cost-budget-plan"
-                                                       value="${Utils.format(projectBudgetPlanDetail.deviceCost)}"></td>
-                                            <td><input type="text" readonly
-                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-engineer-cost-budget-plan"
-                                                       value="${Utils.format(projectBudgetPlanDetail.engineerCost)}">
-                                            </td>
-                                            <td><input type="text" readonly
-                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-project-manage-cost-budget-plan"
-                                                       value="${Utils.format(projectBudgetPlanDetail.projectManageCost)}">
-                                            </td>
-                                            <td><input type="text" readonly
-                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-earnest-money-cost-budget-plan"
-                                                       value="${Utils.format(projectBudgetPlanDetail.earnestMoneyCost)}">
-                                            </td>
-                                            <td><input type="text"
-                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-total-cost-budget-plan"
-                                                       value="${Utils.format(projectBudgetPlanDetail.totalCost)}"
-                                                       readonly></td>
-                                            <td><input type="text" readonly
-                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-sale-income-budget-plan"
-                                                       value="${Utils.format(projectBudgetPlanDetail.saleIncome)}"></td>
-                                            <td><input type="text" readonly
-                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-earnest-money-income-budget-plan"
-                                                       value="${Utils.format(projectBudgetPlanDetail.earnestMoneyIncome)}">
-                                            </td>
-                                            <td><input type="text"
-                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-total-income-budget-plan"
-                                                       value="${Utils.format(projectBudgetPlanDetail.totalIncome)}"
-                                                       readonly></td>
-                                            <td><input type="text"
-                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-fund-balance-budget-plan"
-                                                       value="${Utils.format(projectBudgetPlanDetail.fundBalance)}"
-                                                       readonly></td>
-                                            <td><input type="text"
-                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-capital-interest-budget-plan"
-                                                       value="${Utils.format(projectBudgetPlanDetail.capitalInterest)}"
-                                                       readonly></td>
-                                            <td><input type="text"
-                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-underwritten-plan-budget-plan"
-                                                       value="${Utils.format(projectBudgetPlanDetail.underwrittenPlan)}"
-                                                       readonly></td>
-                                            <td><input type="text"
-                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-repayment-plan-budget-plan"
-                                                       value="${Utils.format(projectBudgetPlanDetail.repaymentPlan)}"
-                                                       readonly></td>
-                                            <#--<td>
-                                                <button type="button"
-                                                        class="am-btn am-btn-warning am-btn-xs am-round am-modal-line-delete-budget-plan">
-                                                    <span class="am-icon-minus"></span></button>
-                                            </td>-->
-                                        </tr>
-                                    </#list>
-                                </#if>
-
-                                </tbody>
-                            </table>
-                            <#--<button type="button" id="budgetPlanDetailAddBtn"
-                                    class="am-btn am-btn-primary am-btn-xs am-round"><span class="am-icon-plus"></span>
-                            </button>-->
-
-                            <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;">
-                                <tbody>
-                                <tr>
-                                    <td>垫资峰值时间</td>
-                                    <td>垫资峰值金额</td>
-                                    <td>利率</td>
-                                    <td>资金利息</td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text"
-                                               class="am-modal-prompt-input input-underwritten-plan-statistic-max-month-budget-plan"
-                                               value="${underwrittenPlanStatistic.maxMonth!}" readonly/></td>
-                                    <td><input type="text"
-                                               class="am-modal-prompt-input input-underwritten-plan-statistic-amount-budget-plan"
-                                               value="${Utils.format(underwrittenPlanStatistic.amount,'')}" readonly/>
-                                    </td>
-                                    <td><input type="text"
-                                               class="am-modal-prompt-input input-underwritten-plan-statistic-tax-rate-budget-plan"
-                                               value="${Utils.format(project.underwrittenTaxRate,'')}" readonly/></td>
-                                    <td><input type="text"
-                                               class="am-modal-prompt-input input-underwritten-plan-statistic-capital-interest-budget-plan"
-                                               value="${Utils.format(underwrittenPlanStatistic.capitalInterest,'')}"
-                                               readonly/></td>
-                                </tr>
-                                </tbody>
-                            </table>
-
-
-                        </div>
-                        <div class="am-modal-footer">
-                            <span class="am-modal-btn" data-am-modal-cancel>取消</span>
-                            <#-- <span class="am-modal-btn" data-am-modal-confirm>保存</span>-->
-                        </div>
-                    </div>
-                </div>
-
                 <#--审核弹窗-->
                 <div class="am-modal am-modal-prompt" style="width: 1000px;max-height:600px;overflow-y:auto;"
                      tabindex="-1" id="my-approve">

From 228e60f73a06f024ca70c24d382bd3240fa4969e Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Thu, 13 Jan 2022 18:06:59 +0800
Subject: [PATCH 27/35] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/admin/project_approve.ftl       | 4 ++--
 src/main/resources/templates/admin/project_budget_edit.ftl   | 4 ++--
 src/main/resources/templates/admin/project_estimate_edit.ftl | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index b129dca..4bd5d2f 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -248,14 +248,14 @@
                             <div class="am-g am-form-group am-margin-top">
                                 <div class="am-u-sm-4 am-u-md-2 am-text-right">华智产品金额</div>
                                 <div class="am-u-sm-6 am-u-md-6">
-                                    <span>${Utils.format(project.huazhiProductAmount)}</span>元
+                                    <span>${Utils.format(project.huazhiProductAmount, "0.00")}</span>元
                                 </div>
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
                             <div class="am-g am-form-group am-margin-top">
                                 <div class="am-u-sm-4 am-u-md-2 am-text-right">其他产品金额</div>
                                 <div class="am-u-sm-6 am-u-md-6">
-                                    <span>${Utils.format(project.ziguangOtherAmount)}</span>元
+                                    <span>${Utils.format(project.ziguangOtherAmount, "0.00")}</span>元
                                 </div>
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index 93fc774..d9561c0 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -176,7 +176,7 @@
                     <div class="am-u-sm-6 am-u-md-6">
                         <input type="text" class="number am-input" data-validation-message="华智产品金额"
                                name="huazhiProductAmount" placeholder="单位（元）" maxlength="20"
-                               value="${Utils.format(project.huazhiProductAmount)}"  />
+                               value="${Utils.format(project.huazhiProductAmount, "0.00")}"  />
                     </div>
                     <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                 </div>
@@ -185,7 +185,7 @@
                     <div class="am-u-sm-6 am-u-md-6">
                         <input type="text" class="number am-input" data-validation-message="请输入其他产品金额"
                                name="ziguangOtherAmount" placeholder="单位（元）" maxlength="20"
-                               value="${Utils.format(project.ziguangOtherAmount)}" />
+                               value="${Utils.format(project.ziguangOtherAmount, "0.00")}" />
                     </div>
                     <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                 </div>
diff --git a/src/main/resources/templates/admin/project_estimate_edit.ftl b/src/main/resources/templates/admin/project_estimate_edit.ftl
index bd25d56..7e6be85 100644
--- a/src/main/resources/templates/admin/project_estimate_edit.ftl
+++ b/src/main/resources/templates/admin/project_estimate_edit.ftl
@@ -156,7 +156,7 @@
                     <div class="am-u-sm-4 am-u-md-2 am-text-right"><#--<span style="color: red;">*</span>-->华智产品金额</div>
                     <div class="am-u-sm-6 am-u-md-6">
                         <input type="text" class="number am-input" data-validation-message="华智产品金额"
-                               name="huazhiProductAmount" placeholder="单位（元）" maxlength="16" value="${Utils.format(project.huazhiProductAmount)}"  />
+                               name="huazhiProductAmount" placeholder="单位（元）" maxlength="16" value="${Utils.format(project.huazhiProductAmount, "0.00")}"  />
                     </div>
                     <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                 </div>
@@ -164,7 +164,7 @@
                     <div class="am-u-sm-4 am-u-md-2 am-text-right"><#--<span style="color: red;">*</span>-->其他产品金额</div>
                     <div class="am-u-sm-6 am-u-md-6">
                         <input type="text" class="number am-input" data-validation-message="请输入其他产品金额"
-                               name="ziguangOtherAmount" placeholder="单位（元）" maxlength="16" value="${Utils.format(project.ziguangOtherAmount)}" />
+                               name="ziguangOtherAmount" placeholder="单位（元）" maxlength="16" value="${Utils.format(project.ziguangOtherAmount, "0.00")}" />
                     </div>
                     <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                 </div>

From dead0c4d103dff6bb38443f6a7a468f77a804c73 Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Thu, 13 Jan 2022 18:38:46 +0800
Subject: [PATCH 28/35] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/admin/project_approve.ftl | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index 4bd5d2f..67d60da 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -920,8 +920,10 @@
                             <span class="am-text-primary"><a style="cursor: pointer"  id="cost-detail">采购成本明细表</a></span>
                             <span class="am-text-primary"><a style="cursor: pointer"  id="cost-project-manage-detail">项目管理成本表</a></span>
                             <span class="am-text-primary budget-plan-detail"><a style="cursor: pointer">资金计划表</a></span>-->
-                            <span class="am-text-lg">收入</span>
-                            <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;">
+                                <div class="am-tab-panel am-fade am-in" id="tab35">
+                                    <span class="am-text-lg">收入</span>
+                                    <table class="am-table am-table-bordered am-table-radius table-main"
+                                           style="padding:0;">
                                 <tbody>
                                 <tr class="am-text-lg">
                                     <td>类别</td>
@@ -1174,7 +1176,6 @@
                             </div>
                         </div>
                         <!--验证表单元素（validate end-->
-                    </div>
 
                     <div class="am-tabs-bd">
                         <div <#if check==0>class="am-tab-panel am-fade am-in am-active" <#else> class="am-tab-panel am-fade am-in"</#if>

From 291212727fa40d3ed126e0fcef27b986ae125f53 Mon Sep 17 00:00:00 2001
From: hanbo <2608504783@qq.com>
Date: Fri, 14 Jan 2022 10:20:27 +0800
Subject: [PATCH 29/35] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E9=A2=84=E7=AE=97?=
 =?UTF-8?q?=E8=A1=A8sheet=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/admin/project_approve.ftl       | 2085 +++++++++--------
 1 file changed, 1079 insertions(+), 1006 deletions(-)

diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index 67d60da..70e1d3a 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -22,10 +22,10 @@
         /**
          审核通过
          */
-        .approve-passed {
-            position: absolute;
-            right: 10px;
-            top: 10px;
+        .approve-passed{
+            position:absolute;
+            right:10px;
+            top:10px;
             border-radius: 100%;
             width: 150px;
             height: 150px;
@@ -38,18 +38,16 @@
             transform: rotateZ(20deg);
             font-size: 14px;
         }
-
         .approve-passed:after {
-            content: "审核通过";
+            content:"审核通过";
         }
-
         /**
         待审核
          */
-        .approve-topass {
-            position: absolute;
-            right: 10px;
-            top: 170px;
+        .approve-topass{
+            position:absolute;
+            right:10px;
+            top:170px;
             border-radius: 100%;
             width: 150px;
             height: 150px;
@@ -62,18 +60,16 @@
             transform: rotateZ(20deg);
             font-size: 14px;
         }
-
         .approve-topass:after {
-            content: "待审核";
+            content:"待审核";
         }
-
         /**
         审核不过
          */
-        .approve-nopass {
-            position: absolute;
-            right: 10px;
-            top: 10px;
+        .approve-nopass{
+            position:absolute;
+            right:10px;
+            top:10px;
             border-radius: 100%;
             width: 150px;
             height: 150px;
@@ -86,9 +82,8 @@
             transform: rotateZ(20deg);
             font-size: 14px;
         }
-
         .approve-nopass:after {
-            content: "审核不通过";
+            content:"审核不通过";
         }
     </style>
 
@@ -112,7 +107,7 @@
                             <li><a href="#tab3">项目预算信息</a></li>
                         </#if>
                         <#if project.status==10 || project.status==15>
-                            <li id="jiesuan" <#if check==0>class="am-active"</#if>><a href="#tab4">项目结算信息</a></li>
+                            <li id="jiesuan"  <#if check==0>class="am-active"</#if>><a href="#tab4">项目结算信息</a></li>
                         </#if>
                         <#if project.status==15>
                             <li><a href="#tab5">项目决算信息</a></li>
@@ -120,17 +115,13 @@
                         <li><a href="#tab6">项目审核记录</a></li>
                     </ul>
                     <div class="am-tabs-bd">
-                        <div <#if check==1>class="am-tab-panel am-fade am-in am-active" <#else> class="am-tab-panel am-fade am-in"</#if>
-                             id="tab1">
-                            <input name="id" id="id" type="hidden" value="${project.id}"/>
-                            <input name="projectContributionProfitRateThreshold"
-                                   id="projectContributionProfitRateThreshold" type="hidden"
-                                   value="${project.projectContributionProfitRateThreshold}"/>
+                        <div <#if check==1>class="am-tab-panel am-fade am-in am-active" <#else> class="am-tab-panel am-fade am-in"</#if> id="tab1">
+                            <input name="id" id="id" type="hidden" value="${project.id}" />
+                            <input name="projectContributionProfitRateThreshold" id="projectContributionProfitRateThreshold" type="hidden" value="${project.projectContributionProfitRateThreshold}" />
                             <!--验证表单元素（validate) begin-->
 
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>部门名称
-                                </div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>部门名称</div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <span>${project.deptName}</span>
                                 </div>
@@ -138,16 +129,14 @@
                             </div>
 
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目计划开始时间
-                                </div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目计划开始时间</div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <span>${project.startDate?string("yyyy-MM-dd")}</span>
                                 </div>
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目计划结束时间
-                                </div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目计划结束时间</div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <span>${project.endDate?string("yyyy-MM-dd")}</span>
                                 </div>
@@ -155,8 +144,7 @@
                             </div>
 
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目名称
-                                </div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目名称</div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <span>${project.name}</span>
                                 </div>
@@ -164,8 +152,7 @@
                             </div>
 
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目类型
-                                </div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目类型</div>
                                 <div class="am-u-sm-6 am-u-md-6">
                         <span>
                         <#if (project.type) =1>
@@ -180,8 +167,7 @@
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>垫资模式
-                                </div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>垫资模式</div>
                                 <div class="am-u-sm-6 am-u-md-6">
                         <span>
                         <#if (project.underwrittenMode) =1>
@@ -199,8 +185,7 @@
                             </div>
 
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>客户名称
-                                </div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>客户名称</div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <span>${project.customer}</span>
                                 </div>
@@ -208,8 +193,7 @@
                             </div>
 
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>终端客户名称
-                                </div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>终端客户名称</div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <span>${project.terminalCustomer}</span>
                                 </div>
@@ -230,16 +214,14 @@
                             <#--                                <div class="am-u-sm-2 am-u-md-4 input-msg"></div>-->
                             <#--                            </div>-->
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>合同金额
-                                </div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>合同金额</div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <span>${Utils.format(project.contractAmount)}</span>元
                                 </div>
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>行业场景应用
-                                </div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>行业场景应用</div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <span>${project.industryScenario}</span>
                                 </div>
@@ -248,28 +230,26 @@
                             <div class="am-g am-form-group am-margin-top">
                                 <div class="am-u-sm-4 am-u-md-2 am-text-right">华智产品金额</div>
                                 <div class="am-u-sm-6 am-u-md-6">
-                                    <span>${Utils.format(project.huazhiProductAmount, "0.00")}</span>元
+                                    <span>${Utils.format(project.huazhiProductAmount)}</span>元
                                 </div>
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
                             <div class="am-g am-form-group am-margin-top">
                                 <div class="am-u-sm-4 am-u-md-2 am-text-right">其他产品金额</div>
                                 <div class="am-u-sm-6 am-u-md-6">
-                                    <span>${Utils.format(project.ziguangOtherAmount, "0.00")}</span>元
+                                    <span>${Utils.format(project.ziguangOtherAmount)}</span>元
                                 </div>
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>主合同收款条款
-                                </div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>主合同收款条款</div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <div style="width:600px; height:auto; word-wrap:break-word;">${project.mainContractCollectionTerms!}</div>
                                 </div>
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>价值及风险
-                                </div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>价值及风险</div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <div style="width:600px; height:auto; word-wrap:break-word;">${project.valueRisk!}</div>
                                 </div>
@@ -303,42 +283,26 @@
                                 <tr>
                                     <td>收入</td>
                                     <td>设备类</td>
-                                    <td><input type="text" class="number" name="incomeDeviceTaxInclude"
-                                               value="${Utils.format(estimateBean.incomeDeviceTaxInclude)}" required
-                                               readonly></td>
-                                    <td><input type="text" class="number" name="incomeDeviceTaxExclude"
-                                               value="${Utils.format(estimateBean.incomeDeviceTaxExclude)}" required
-                                               readonly></td>
+                                    <td><input type="text" class="number" name="incomeDeviceTaxInclude" value="${Utils.format(estimateBean.incomeDeviceTaxInclude)}" required readonly></td>
+                                    <td><input type="text" class="number" name="incomeDeviceTaxExclude" value="${Utils.format(estimateBean.incomeDeviceTaxExclude)}" required readonly></td>
                                 </tr>
                                 <tr>
                                     <td>收入</td>
                                     <td>工程类</td>
-                                    <td><input type="text" class="number" name="incomeEngineerTaxInclude"
-                                               value="${Utils.format(estimateBean.incomeEngineerTaxInclude)}" required
-                                               readonly></td>
-                                    <td><input type="text" class="number" name="incomeEngineerTaxExclude"
-                                               value="${Utils.format(estimateBean.incomeEngineerTaxExclude)}" required
-                                               readonly></td>
+                                    <td><input type="text" class="number" name="incomeEngineerTaxInclude" value="${Utils.format(estimateBean.incomeEngineerTaxInclude)}" required readonly></td>
+                                    <td><input type="text" class="number" name="incomeEngineerTaxExclude" value="${Utils.format(estimateBean.incomeEngineerTaxExclude)}" required readonly></td>
                                 </tr>
                                 <tr>
                                     <td>收入</td>
                                     <td>服务类</td>
-                                    <td><input type="text" class="number" name="incomeServiceTaxInclude"
-                                               value="${Utils.format(estimateBean.incomeServiceTaxInclude)}" required
-                                               readonly></td>
-                                    <td><input type="text" class="number" name="incomeServiceTaxExclude"
-                                               value="${Utils.format(estimateBean.incomeServiceTaxExclude)}" required
-                                               readonly></td>
+                                    <td><input type="text" class="number" name="incomeServiceTaxInclude" value="${Utils.format(estimateBean.incomeServiceTaxInclude)}" required readonly></td>
+                                    <td><input type="text" class="number" name="incomeServiceTaxExclude" value="${Utils.format(estimateBean.incomeServiceTaxExclude)}" required readonly></td>
                                 </tr>
                                 <tr>
                                     <td>合计</td>
                                     <td></td>
-                                    <td><input type="text" class="number" name="incomeTotalTaxInclude"
-                                               value="${Utils.format(estimateBean.incomeTotalTaxInclude)}" readonly
-                                               readonly title="此列累计"></td>
-                                    <td><input type="text" class="number" name="incomeTotalTaxExclude"
-                                               value="${Utils.format(estimateBean.incomeTotalTaxExclude)}" readonly
-                                               readonly title="此列累计"></td>
+                                    <td><input type="text" class="number" name="incomeTotalTaxInclude" value="${Utils.format(estimateBean.incomeTotalTaxInclude)}" readonly readonly title="此列累计"></td>
+                                    <td><input type="text" class="number" name="incomeTotalTaxExclude" value="${Utils.format(estimateBean.incomeTotalTaxExclude)}" readonly readonly title="此列累计"></td>
                                 </tr>
                                 </tbody>
                             </table>
@@ -356,67 +320,41 @@
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>设备</td>
-                                    <td><input type="text" class="number" name="costPurchaseDeviceTaxInclude"
-                                               value="${Utils.format(estimateBean.costPurchaseDeviceTaxInclude)}"
-                                               required readonly></td>
-                                    <td><input type="text" class="number" name="costPurchaseDeviceTaxExclude"
-                                               value="${Utils.format(estimateBean.costPurchaseDeviceTaxExclude)}"
-                                               required readonly></td>
+                                    <td><input type="text" class="number" name="costPurchaseDeviceTaxInclude" value="${Utils.format(estimateBean.costPurchaseDeviceTaxInclude)}" required readonly></td>
+                                    <td><input type="text" class="number" name="costPurchaseDeviceTaxExclude" value="${Utils.format(estimateBean.costPurchaseDeviceTaxExclude)}" required readonly></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>施工</td>
-                                    <td><input type="text" class="number" name="costPurchaseBuildTaxInclude"
-                                               value="${Utils.format(estimateBean.costPurchaseBuildTaxInclude)}"
-                                               required readonly></td>
-                                    <td><input type="text" class="number" name="costPurchaseBuildTaxExclude"
-                                               value="${Utils.format(estimateBean.costPurchaseBuildTaxExclude)}"
-                                               required readonly></td>
+                                    <td><input type="text" class="number" name="costPurchaseBuildTaxInclude" value="${Utils.format(estimateBean.costPurchaseBuildTaxInclude)}" required readonly></td>
+                                    <td><input type="text" class="number" name="costPurchaseBuildTaxExclude" value="${Utils.format(estimateBean.costPurchaseBuildTaxExclude)}" required readonly></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>服务</td>
-                                    <td><input type="text" class="number" name="costPurchaseServiceTaxInclude"
-                                               value="${Utils.format(estimateBean.costPurchaseServiceTaxInclude)}"
-                                               required readonly></td>
-                                    <td><input type="text" class="number" name="costPurchaseServiceTaxExclude"
-                                               value="${Utils.format(estimateBean.costPurchaseServiceTaxExclude)}"
-                                               required readonly></td>
+                                    <td><input type="text" class="number" name="costPurchaseServiceTaxInclude" value="${Utils.format(estimateBean.costPurchaseServiceTaxInclude)}" required readonly></td>
+                                    <td><input type="text" class="number" name="costPurchaseServiceTaxExclude" value="${Utils.format(estimateBean.costPurchaseServiceTaxExclude)}" required readonly></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>其他</td>
-                                    <td><input type="text" class="number" name="costPurchaseOtherTaxInclude"
-                                               value="${Utils.format(estimateBean.costPurchaseOtherTaxInclude)}"
-                                               required readonly></td>
-                                    <td><input type="text" class="number" name="costPurchaseOtherTaxExclude"
-                                               value="${Utils.format(estimateBean.costPurchaseOtherTaxExclude)}"
-                                               required readonly></td>
+                                    <td><input type="text" class="number" name="costPurchaseOtherTaxInclude" value="${Utils.format(estimateBean.costPurchaseOtherTaxInclude)}" required readonly></td>
+                                    <td><input type="text" class="number" name="costPurchaseOtherTaxExclude" value="${Utils.format(estimateBean.costPurchaseOtherTaxExclude)}" required readonly></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
                                     <td>项目管理成本</td>
                                     <td>项目管理成本</td>
-                                    <td><input type="text" class="number" name="costProjectManageTaxInclude"
-                                               value="${Utils.format(estimateBean.costProjectManageTaxExclude)}"
-                                               required readonly></td>
-                                    <td><input type="text" class="number" name="costProjectManageTaxExclude"
-                                               value="${Utils.format(estimateBean.costProjectManageTaxExclude)}"
-                                               required readonly></td>
+                                    <td><input type="text" class="number" name="costProjectManageTaxInclude" value="${Utils.format(estimateBean.costProjectManageTaxExclude)}" required readonly></td>
+                                    <td><input type="text" class="number" name="costProjectManageTaxExclude" value="${Utils.format(estimateBean.costProjectManageTaxExclude)}" required readonly></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
                                     <td>其他</td>
                                     <td>${project.otherName!}</td>
-                                    <td><input type="text" class="number" name="costOtherOtherTaxInclude"
-                                               value="${Utils.format(estimateBean.costOtherOtherTaxInclude)}" required
-                                               readonly></td>
-                                    <td><input type="text" class="number" name="costOtherOtherTaxExclude"
-                                               value="${Utils.format(estimateBean.costOtherOtherTaxExclude)}" required
-                                               readonly></td>
                                     <td><input type="text" class="number" name="costOtherOtherTaxInclude" value="${Utils.format(estimateBean.costOtherOtherTaxInclude, "0.00")}" required readonly></td>
                                     <td><input type="text" class="number" name="costOtherOtherTaxExclude" value="${Utils.format(estimateBean.costOtherOtherTaxExclude, "0.00")}" required readonly></td>
                                 </tr>
@@ -424,12 +362,8 @@
                                     <td>合计</td>
                                     <td></td>
                                     <td></td>
-                                    <td><input type="text" class="number" name="costTotalTaxInclude"
-                                               value="${Utils.format(estimateBean.costTotalTaxInclude)}" readonly
-                                               readonly title="此列累计"></td>
-                                    <td><input type="text" class="number" name="costTotalTaxExclude"
-                                               value="${Utils.format(estimateBean.costTotalTaxExclude)}" readonly
-                                               readonly title="此列累计"></td>
+                                    <td><input type="text" class="number" name="costTotalTaxInclude" value="${Utils.format(estimateBean.costTotalTaxInclude)}" readonly readonly title="此列累计"></td>
+                                    <td><input type="text" class="number" name="costTotalTaxExclude" value="${Utils.format(estimateBean.costTotalTaxExclude)}" readonly readonly title="此列累计"></td>
                                 </tr>
                                 </tbody>
                             </table>
@@ -444,16 +378,12 @@
                                 <tr>
                                     <td>财务费用</td>
                                     <td>资金占用成本</td>
-                                    <td><input type="text" class="number" name="costExpropriationTaxExclude"
-                                               value="${Utils.format(estimateBean.costExpropriationTaxExclude)}"
-                                               required readonly></td>
+                                    <td><input type="text" class="number" name="costExpropriationTaxExclude" value="${Utils.format(estimateBean.costExpropriationTaxExclude)}" required readonly></td>
                                 </tr>
                                 <tr>
                                     <td>公司管理费用</td>
                                     <td></td>
-                                    <td><input type="text" class="number" name="costCompanyManageTaxExclude"
-                                               value="${Utils.format(estimateBean.costCompanyManageTaxExclude)}"
-                                               required readonly></td>
+                                    <td><input type="text" class="number" name="costCompanyManageTaxExclude" value="${Utils.format(estimateBean.costCompanyManageTaxExclude)}" required readonly></td>
                                 </tr>
                                 </tbody>
                             </table>
@@ -467,27 +397,19 @@
                                 </tr>
                                 <tr>
                                     <td>项目毛利（元）</td>
-                                    <td><input type="text" class="number" name="projectGrossProfit"
-                                               value="${Utils.format(estimateBean.projectGrossProfit)}" readonly
-                                               title="收入总计（不含税）-成本总计（不含税）-财务费用总计（不含税）"></td>
+                                    <td><input type="text" class="number" name="projectGrossProfit" value="${Utils.format(estimateBean.projectGrossProfit)}" readonly title="收入总计（不含税）-成本总计（不含税）-财务费用总计（不含税）"></td>
                                 </tr>
                                 <tr>
                                     <td>项目毛利率（%）</td>
-                                    <td><input type="text" class="number" name="projectGrossProfitRate"
-                                               value="${Utils.format(estimateBean.projectGrossProfitRate)}" readonly
-                                               title="毛利（不含税）/收入总计（不含税）"></td>
+                                    <td><input type="text" class="number" name="projectGrossProfitRate" value="${Utils.format(estimateBean.projectGrossProfitRate)}" readonly title="毛利（不含税）/收入总计（不含税）"></td>
                                 </tr>
                                 <tr>
                                     <td>项目贡献利润（元）</td>
-                                    <td><input type="text" class="number" name="projectContributionProfit"
-                                               value="${Utils.format(estimateBean.projectContributionProfit)}" readonly
-                                               title="项目毛利（不含税）-公司管理费用总计（不含税）"></td>
+                                    <td><input type="text" class="number" name="projectContributionProfit" value="${Utils.format(estimateBean.projectContributionProfit)}" readonly title="项目毛利（不含税）-公司管理费用总计（不含税）"></td>
                                 </tr>
                                 <tr>
                                     <td>项目贡献利润率（%）</td>
-                                    <td><input type="text" class="number" name="projectContributionProfitRate"
-                                               value="${Utils.format(estimateBean.projectContributionProfitRate)}"
-                                               readonly title="贡献利润（不含税）/收入总计（不含税）"></td>
+                                    <td><input type="text" class="number" name="projectContributionProfitRate" value="${Utils.format(estimateBean.projectContributionProfitRate)}" readonly title="贡献利润（不含税）/收入总计（不含税）"></td>
                                 </tr>
                                 </tbody>
                             </table>
@@ -518,7 +440,7 @@
                             </div>
                             <div class="am-tabs-bd">
                                 <div class="am-tab-panel am-fade am-in am-active" id="tab31">
-                                    <span class="am-text-lg">收入明细表</span>
+                                    <#--<span class="am-text-lg">收入明细表</span>-->
                                     <table class="am-table am-table-bordered am-table-radius table-main"
                                            style="padding:0;"
                                            id="incomeTable">
@@ -594,7 +516,7 @@
                                     </table>
                                 </div>
                                 <div class="am-tab-panel am-fade am-in" id="tab32">
-                                    <span class="am-text-lg">采购成本明细表</span>
+                                    <#--<span class="am-text-lg">采购成本明细表</span>-->
                                     <table class="am-table am-table-bordered am-table-radius table-main"
                                            style="padding:0;"
                                            id="costTable">
@@ -682,7 +604,7 @@
                                     </table>
                                 </div>
                                 <div class="am-tab-panel am-fade am-in" id="tab33">
-                                    <span class="am-text-lg">项目管理成本表</span>
+                                    <#--<span class="am-text-lg">项目管理成本表</span>-->
                                     <table class="am-table am-table-bordered am-table-radius table-main"
                                            style="padding:0;"
                                            id="costProjectManageTable">
@@ -775,7 +697,7 @@
                                     </table>
                                 </div>
                                 <div class="am-tab-panel am-fade am-in" id="tab34">
-                                    <span class="am-text-lg">资金计划表</span>
+                                    <#--<span class="am-text-lg">资金计划表</span>-->
                                     <table class="am-table am-table-bordered am-table-radius table-main"
                                            style="padding:0;"
                                            id="budgetPlanDetailTable">
@@ -916,131 +838,307 @@
                                         </tbody>
                                     </table>
                                 </div>
-                            <#--<span class="am-text-primary"><a style="cursor: pointer" id="income-detail">收入明细表</a></span>
-                            <span class="am-text-primary"><a style="cursor: pointer"  id="cost-detail">采购成本明细表</a></span>
-                            <span class="am-text-primary"><a style="cursor: pointer"  id="cost-project-manage-detail">项目管理成本表</a></span>
-                            <span class="am-text-primary budget-plan-detail"><a style="cursor: pointer">资金计划表</a></span>-->
+                                <#--<span class="am-text-primary"><a style="cursor: pointer" id="income-detail">收入明细表</a></span>
+                                <span class="am-text-primary"><a style="cursor: pointer"  id="cost-detail">采购成本明细表</a></span>
+                                <span class="am-text-primary"><a style="cursor: pointer"  id="cost-project-manage-detail">项目管理成本表</a></span>
+                                <span class="am-text-primary budget-plan-detail"><a style="cursor: pointer">资金计划表</a></span>-->
                                 <div class="am-tab-panel am-fade am-in" id="tab35">
                                     <span class="am-text-lg">收入</span>
                                     <table class="am-table am-table-bordered am-table-radius table-main"
                                            style="padding:0;">
-                                <tbody>
-                                <tr class="am-text-lg">
-                                    <td>类别</td>
-                                    <td>费用</td>
-                                    <td>含税金额（元）</td>
-                                    <td>不含税金额（元）</td>
-                                </tr>
-                                <tr>
-                                    <td>收入</td>
-                                    <td>设备类</td>
-                                    <td><input type="text" class="number" name="incomeDeviceTaxInclude" value="${Utils.format(budgetBean.incomeDeviceTaxInclude,'0')}" required readonly title="设备类含税总额"></td>
-                                    <td><input type="text" class="number" name="incomeDeviceTaxExclude" value="${Utils.format(budgetBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类不含税总额"></td>
-                                </tr>
-                                <tr>
-                                    <td>收入</td>
-                                    <td>工程类</td>
-                                    <td><input type="text" class="number" name="incomeEngineerTaxInclude" value="${Utils.format(budgetBean.incomeEngineerTaxInclude,'0')}" required readonly title="工程类含税总额"></td>
-                                    <td><input type="text" class="number" name="incomeEngineerTaxExclude" value="${Utils.format(budgetBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类不含税总额"></td>
-                                </tr>
-                                <tr>
-                                    <td>收入</td>
-                                    <td>服务类</td>
-                                    <td><input type="text" class="number" name="incomeServiceTaxInclude" value="${Utils.format(budgetBean.incomeServiceTaxInclude,'0')}" required readonly title="服务类含税总额"></td>
-                                    <td><input type="text" class="number" name="incomeServiceTaxExclude" value="${Utils.format(budgetBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类不含税总额"></td>
-                                </tr>
-                                <tr>
-                                    <td>合计</td>
-                                    <td></td>
-                                    <td><input type="text" class="number" name="incomeTotalTaxInclude" value="${Utils.format(budgetBean.incomeTotalTaxInclude,'0')}" readonly required title="此列累计"></td>
-                                    <td><input type="text" class="number" name="incomeTotalTaxExclude" value="${Utils.format(budgetBean.incomeTotalTaxExclude,'0')}" readonly required title="此列累计"></td>
-                                </tr>
-                                </tbody>
-                            </table>
-                            <span class="am-text-lg">成本</span>
-                           <#-- <span class="am-text-primary"><a style="cursor: pointer"  id="cost-detail">采购成本明细表</a></span>
-                            <span class="am-text-primary"><a style="cursor: pointer"  id="cost-project-manage-detail">项目管理成本表</a></span>-->
-                            <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;">
-                                <tbody>
-                                <tr class="am-text-lg">
-                                    <td>类别</td>
-                                    <td>费用</td>
-                                    <td>费用项目</td>
-                                    <td>含税金额（元）</td>
-                                    <td>不含税金额（元）</td>
-                                </tr>
-                                <tr>
-                                    <td>成本</td>
-                                    <td>采购成本</td>
-                                    <td>设备</td>
-                                    <td><input type="text" class="number" name="costPurchaseDeviceTaxInclude" value="${Utils.format(budgetBean.costPurchaseDeviceTaxInclude,'0')}" readonly required title="购买设备含税总额"></td>
-                                    <td><input type="text" class="number" name="costPurchaseDeviceTaxExclude" value="${Utils.format(budgetBean.costPurchaseDeviceTaxExclude,'0')}" readonly required title="购买设备不含税总额"></td>
-                                </tr>
-                                <tr>
-                                    <td>成本</td>
-                                    <td>采购成本</td>
-                                    <td>施工</td>
-                                    <td><input type="text" class="number" name="costPurchaseBuildTaxInclude" value="${Utils.format(budgetBean.costPurchaseBuildTaxInclude,'0')}" readonly required title="购买施工含税总额"></td>
-                                    <td><input type="text" class="number" name="costPurchaseBuildTaxExclude" value="${Utils.format(budgetBean.costPurchaseBuildTaxExclude,'0')}" readonly required title="购买施工不含税总额"></td>
-                                </tr>
-                                <tr>
-                                    <td>成本</td>
-                                    <td>采购成本</td>
-                                    <td>服务</td>
-                                    <td><input type="text" class="number" name="costPurchaseServiceTaxInclude" value="${Utils.format(budgetBean.costPurchaseServiceTaxInclude,'0')}" readonly required title="购买服务含税总额"></td>
-                                    <td><input type="text" class="number" name="costPurchaseServiceTaxExclude" value="${Utils.format(budgetBean.costPurchaseServiceTaxExclude,'0')}" readonly required title="购买服务不含税总额"></td>
-                                </tr>
-                                <tr>
-                                    <td>成本</td>
-                                    <td>采购成本</td>
-                                    <td>其他</td>
-                                    <td><input type="text" class="number" name="costPurchaseOtherTaxInclude" value="${Utils.format(budgetBean.costPurchaseOtherTaxInclude,'0')}" readonly required title="购买其他含税总额"></td>
-                                    <td><input type="text" class="number" name="costPurchaseOtherTaxExclude" value="${Utils.format(budgetBean.costPurchaseOtherTaxExclude,'0')}" readonly required title="购买其他不含税总额"></td>
-                                </tr>
-                                <tr>
-                                    <td>成本</td>
-                                    <td>项目管理成本</td>
-                                    <td>项目管理成本</td>
-                                    <td><input type="text" class="number" name="costProjectManageTaxInclude" value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0')}" readonly required title="项目管理成本总额"></td>
-                                    <td><input type="text" class="number" name="costProjectManageTaxExclude" value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0')}" readonly required title="项目管理成本总额"></td>
-                                </tr>
-                                <tr>
-                                    <td>成本</td>
-                                    <td>其他</td>
-                                    <td>${project.otherName!}</td>
-                                    <td><input type="text" class="number" name="costOtherOtherTaxInclude" value="${Utils.format(budgetBean.costOtherOtherTaxInclude,'0.00')}" required readonly title="其他含税总额（填入）"></td>
-                                    <td><input type="text" class="number" name="costOtherOtherTaxExclude" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0.00')}" required readonly title="其他不含税总额（填入）"></td>
-                                </tr>
-                                <tr>
-                                    <td>合计</td>
-                                    <td></td>
-                                    <td></td>
-                                    <td><input type="text" class="number" name="costTotalTaxInclude" value="${Utils.format(budgetBean.costTotalTaxInclude,'0')}" readonly required title="此列累计"></td>
-                                    <td><input type="text" class="number" name="costTotalTaxExclude" value="${Utils.format(budgetBean.costTotalTaxExclude,'0')}" readonly required title="此列累计"></td>
-                                </tr>
-                                </tbody>
-                            </table>
-                            <span class="am-text-lg">管理</span>
-                            <#--<span class="am-text-primary budget-plan-detail"><a style="cursor: pointer">资金计划表</a></span>-->
-                            <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;">
-                                <tbody>
-                                <tr class="am-text-lg">
-                                    <td>类别</td>
-                                    <td>费用项目</td>
-                                    <td>不含税金额（元）</td>
-                                </tr>
-                                <tr>
-                                    <td>财务费用</td>
-                                    <td>资金占用成本</td>
-                                    <td><input type="text" class="number" name="costExpropriationTaxExclude" value="${Utils.format(budgetBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本不含税总额"></td>
-                                </tr>
-                                <tr>
-                                    <td>公司管理费用</td>
-                                    <td></td>
-                                    <td><input type="text" class="number" name="costCompanyManageTaxExclude" value="${Utils.format(budgetBean.costCompanyManageTaxExclude,'0')}" required readonly title="公司管理费用不含税总额"></td>
-                                </tr>
-                                </tbody>
-                            </table>
+                                        <tbody>
+                                        <tr class="am-text-lg">
+                                            <td>类别</td>
+                                            <td>费用</td>
+                                            <td>含税金额（元）</td>
+                                            <td>不含税金额（元）</td>
+                                        </tr>
+                                        <tr>
+                                            <td>收入</td>
+                                            <td>设备类</td>
+                                            <td><input type="text" class="number" name="incomeDeviceTaxInclude"
+                                                       value="${Utils.format(budgetBean.incomeDeviceTaxInclude,'0')}"
+                                                       required readonly title="设备类含税总额"></td>
+                                            <td><input type="text" class="number" name="incomeDeviceTaxExclude"
+                                                       value="${Utils.format(budgetBean.incomeDeviceTaxExclude,'0')}"
+                                                       required readonly title="设备类不含税总额"></td>
+                                        </tr>
+                                        <tr>
+                                            <td>收入</td>
+                                            <td>工程类</td>
+                                            <td><input type="text" class="number" name="incomeEngineerTaxInclude"
+                                                       value="${Utils.format(budgetBean.incomeEngineerTaxInclude,'0')}"
+                                                       required readonly title="工程类含税总额"></td>
+                                            <td><input type="text" class="number" name="incomeEngineerTaxExclude"
+                                                       value="${Utils.format(budgetBean.incomeEngineerTaxExclude,'0')}"
+                                                       required readonly title="工程类不含税总额"></td>
+                                        </tr>
+                                        <tr>
+                                            <td>收入</td>
+                                            <td>服务类</td>
+                                            <td><input type="text" class="number" name="incomeServiceTaxInclude"
+                                                       value="${Utils.format(budgetBean.incomeServiceTaxInclude,'0')}"
+                                                       required readonly title="服务类含税总额"></td>
+                                            <td><input type="text" class="number" name="incomeServiceTaxExclude"
+                                                       value="${Utils.format(budgetBean.incomeServiceTaxExclude,'0')}"
+                                                       required readonly title="服务类不含税总额"></td>
+                                        </tr>
+                                        <tr>
+                                            <td>合计</td>
+                                            <td></td>
+                                            <td><input type="text" class="number" name="incomeTotalTaxInclude"
+                                                       value="${Utils.format(budgetBean.incomeTotalTaxInclude,'0')}"
+                                                       readonly required title="此列累计"></td>
+                                            <td><input type="text" class="number" name="incomeTotalTaxExclude"
+                                                       value="${Utils.format(budgetBean.incomeTotalTaxExclude,'0')}"
+                                                       readonly required title="此列累计"></td>
+                                        </tr>
+                                        </tbody>
+                                    </table>
+                                    <span class="am-text-lg">成本</span>
+                                    <#-- <span class="am-text-primary"><a style="cursor: pointer"  id="cost-detail">采购成本明细表</a></span>
+                                     <span class="am-text-primary"><a style="cursor: pointer"  id="cost-project-manage-detail">项目管理成本表</a></span>-->
+                                    <table class="am-table am-table-bordered am-table-radius table-main"
+                                           style="padding:0;">
+                                        <tbody>
+                                        <tr class="am-text-lg">
+                                            <td>类别</td>
+                                            <td>费用</td>
+                                            <td>费用项目</td>
+                                            <td>含税金额（元）</td>
+                                            <td>不含税金额（元）</td>
+                                        </tr>
+                                        <tr>
+                                            <td>成本</td>
+                                            <td>采购成本</td>
+                                            <td>设备</td>
+                                            <td><input type="text" class="number" name="costPurchaseDeviceTaxInclude"
+                                                       value="${Utils.format(budgetBean.costPurchaseDeviceTaxInclude,'0')}"
+                                                       readonly required title="购买设备含税总额"></td>
+                                            <td><input type="text" class="number" name="costPurchaseDeviceTaxExclude"
+                                                       value="${Utils.format(budgetBean.costPurchaseDeviceTaxExclude,'0')}"
+                                                       readonly required title="购买设备不含税总额"></td>
+                                        </tr>
+                                        <tr>
+                                            <td>成本</td>
+                                            <td>采购成本</td>
+                                            <td>施工</td>
+                                            <td><input type="text" class="number" name="costPurchaseBuildTaxInclude"
+                                                       value="${Utils.format(budgetBean.costPurchaseBuildTaxInclude,'0')}"
+                                                       readonly required title="购买施工含税总额"></td>
+                                            <td><input type="text" class="number" name="costPurchaseBuildTaxExclude"
+                                                       value="${Utils.format(budgetBean.costPurchaseBuildTaxExclude,'0')}"
+                                                       readonly required title="购买施工不含税总额"></td>
+                                        </tr>
+                                        <tr>
+                                            <td>成本</td>
+                                            <td>采购成本</td>
+                                            <td>服务</td>
+                                            <td><input type="text" class="number" name="costPurchaseServiceTaxInclude"
+                                                       value="${Utils.format(budgetBean.costPurchaseServiceTaxInclude,'0')}"
+                                                       readonly required title="购买服务含税总额"></td>
+                                            <td><input type="text" class="number" name="costPurchaseServiceTaxExclude"
+                                                       value="${Utils.format(budgetBean.costPurchaseServiceTaxExclude,'0')}"
+                                                       readonly required title="购买服务不含税总额"></td>
+                                        </tr>
+                                        <tr>
+                                            <td>成本</td>
+                                            <td>采购成本</td>
+                                            <td>其他</td>
+                                            <td><input type="text" class="number" name="costPurchaseOtherTaxInclude"
+                                                       value="${Utils.format(budgetBean.costPurchaseOtherTaxInclude,'0.00')}"
+                                                       readonly required title="购买其他含税总额"></td>
+                                            <td><input type="text" class="number" name="costPurchaseOtherTaxExclude"
+                                                       value="${Utils.format(budgetBean.costPurchaseOtherTaxExclude,'0.00')}"
+                                                       readonly required title="购买其他不含税总额"></td>
+                                        </tr>
+                                        <tr>
+                                            <td>成本</td>
+                                            <td>项目管理成本</td>
+                                            <td>项目管理成本</td>
+                                            <td><input type="text" class="number" name="costProjectManageTaxInclude"
+                                                       value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0')}"
+                                                       readonly required title="项目管理成本总额"></td>
+                                            <td><input type="text" class="number" name="costProjectManageTaxExclude"
+                                                       value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0')}"
+                                                       readonly required title="项目管理成本总额"></td>
+                                        </tr>
+                                        <tr>
+                                            <td>成本</td>
+                                            <td>其他</td>
+                                            <td>${project.otherName!}</td>
+                                            <td><input type="text" class="number" name="costOtherOtherTaxInclude"
+                                                       value="${Utils.format(budgetBean.costOtherOtherTaxInclude,'0.00')}"
+                                                       required readonly title="其他含税总额（填入）"></td>
+                                            <td><input type="text" class="number" name="costOtherOtherTaxExclude"
+                                                       value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0.00')}"
+                                                       required readonly title="其他不含税总额（填入）"></td>
+                                        </tr>
+                                        <tr>
+                                            <td>合计</td>
+                                            <td></td>
+                                            <td></td>
+                                            <td><input type="text" class="number" name="costTotalTaxInclude"
+                                                       value="${Utils.format(budgetBean.costTotalTaxInclude,'0')}"
+                                                       readonly required title="此列累计"></td>
+                                            <td><input type="text" class="number" name="costTotalTaxExclude"
+                                                       value="${Utils.format(budgetBean.costTotalTaxExclude,'0')}"
+                                                       readonly required title="此列累计"></td>
+                                        </tr>
+                                        </tbody>
+                                    </table>
+                                    <span class="am-text-lg">管理</span>
+                                    <#--<span class="am-text-primary budget-plan-detail"><a style="cursor: pointer">资金计划表</a></span>-->
+                                    <table class="am-table am-table-bordered am-table-radius table-main"
+                                           style="padding:0;">
+                                        <tbody>
+                                        <tr class="am-text-lg">
+                                            <td>类别</td>
+                                            <td>费用项目</td>
+                                            <td>不含税金额（元）</td>
+                                        </tr>
+                                        <tr>
+                                            <td>财务费用</td>
+                                            <td>资金占用成本</td>
+                                            <td><input type="text" class="number" name="costExpropriationTaxExclude"
+                                                       value="${Utils.format(budgetBean.costExpropriationTaxExclude,'0')}"
+                                                       required readonly title="资金占用成本不含税总额"></td>
+                                        </tr>
+                                        <tr>
+                                            <td>公司管理费用</td>
+                                            <td></td>
+                                            <td><input type="text" class="number" name="costCompanyManageTaxExclude"
+                                                       value="${Utils.format(budgetBean.costCompanyManageTaxExclude,'0')}"
+                                                       required readonly title="公司管理费用不含税总额"></td>
+                                        </tr>
+                                        </tbody>
+                                    </table>
+                                    </tbody>
+                                    </table>
+
+                                    <#--<span class="am-text-primary"><a style="cursor: pointer" id="income-detail">收入明细表</a></span>
+                                    <span class="am-text-primary"><a style="cursor: pointer"  id="cost-detail">采购成本明细表</a></span>
+                                    <span class="am-text-primary"><a style="cursor: pointer"  id="cost-project-manage-detail">项目管理成本表</a></span>
+                                    <span class="am-text-primary budget-plan-detail"><a style="cursor: pointer">资金计划表</a></span>-->
+                                    <span class="am-text-lg">收入</span>
+                                    <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;">
+                                        <tbody>
+                                        <tr class="am-text-lg">
+                                            <td>类别</td>
+                                            <td>费用</td>
+                                            <td>含税金额（元）</td>
+                                            <td>不含税金额（元）</td>
+                                        </tr>
+                                        <tr>
+                                            <td>收入</td>
+                                            <td>设备类</td>
+                                            <td><input type="text" class="number" name="incomeDeviceTaxInclude" value="${Utils.format(budgetBean.incomeDeviceTaxInclude,'0')}" required readonly title="设备类含税总额"></td>
+                                            <td><input type="text" class="number" name="incomeDeviceTaxExclude" value="${Utils.format(budgetBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类不含税总额"></td>
+                                        </tr>
+                                        <tr>
+                                            <td>收入</td>
+                                            <td>工程类</td>
+                                            <td><input type="text" class="number" name="incomeEngineerTaxInclude" value="${Utils.format(budgetBean.incomeEngineerTaxInclude,'0')}" required readonly title="工程类含税总额"></td>
+                                            <td><input type="text" class="number" name="incomeEngineerTaxExclude" value="${Utils.format(budgetBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类不含税总额"></td>
+                                        </tr>
+                                        <tr>
+                                            <td>收入</td>
+                                            <td>服务类</td>
+                                            <td><input type="text" class="number" name="incomeServiceTaxInclude" value="${Utils.format(budgetBean.incomeServiceTaxInclude,'0')}" required readonly title="服务类含税总额"></td>
+                                            <td><input type="text" class="number" name="incomeServiceTaxExclude" value="${Utils.format(budgetBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类不含税总额"></td>
+                                        </tr>
+                                        <tr>
+                                            <td>合计</td>
+                                            <td></td>
+                                            <td><input type="text" class="number" name="incomeTotalTaxInclude" value="${Utils.format(budgetBean.incomeTotalTaxInclude,'0')}" readonly required title="此列累计"></td>
+                                            <td><input type="text" class="number" name="incomeTotalTaxExclude" value="${Utils.format(budgetBean.incomeTotalTaxExclude,'0')}" readonly required title="此列累计"></td>
+                                        </tr>
+                                        </tbody>
+                                    </table>
+                                    <span class="am-text-lg">成本</span>
+                                    <#-- <span class="am-text-primary"><a style="cursor: pointer"  id="cost-detail">采购成本明细表</a></span>
+                                     <span class="am-text-primary"><a style="cursor: pointer"  id="cost-project-manage-detail">项目管理成本表</a></span>-->
+                                    <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;">
+                                        <tbody>
+                                        <tr class="am-text-lg">
+                                            <td>类别</td>
+                                            <td>费用</td>
+                                            <td>费用项目</td>
+                                            <td>含税金额（元）</td>
+                                            <td>不含税金额（元）</td>
+                                        </tr>
+                                        <tr>
+                                            <td>成本</td>
+                                            <td>采购成本</td>
+                                            <td>设备</td>
+                                            <td><input type="text" class="number" name="costPurchaseDeviceTaxInclude" value="${Utils.format(budgetBean.costPurchaseDeviceTaxInclude,'0')}" readonly required title="购买设备含税总额"></td>
+                                            <td><input type="text" class="number" name="costPurchaseDeviceTaxExclude" value="${Utils.format(budgetBean.costPurchaseDeviceTaxExclude,'0')}" readonly required title="购买设备不含税总额"></td>
+                                        </tr>
+                                        <tr>
+                                            <td>成本</td>
+                                            <td>采购成本</td>
+                                            <td>施工</td>
+                                            <td><input type="text" class="number" name="costPurchaseBuildTaxInclude" value="${Utils.format(budgetBean.costPurchaseBuildTaxInclude,'0')}" readonly required title="购买施工含税总额"></td>
+                                            <td><input type="text" class="number" name="costPurchaseBuildTaxExclude" value="${Utils.format(budgetBean.costPurchaseBuildTaxExclude,'0')}" readonly required title="购买施工不含税总额"></td>
+                                        </tr>
+                                        <tr>
+                                            <td>成本</td>
+                                            <td>采购成本</td>
+                                            <td>服务</td>
+                                            <td><input type="text" class="number" name="costPurchaseServiceTaxInclude" value="${Utils.format(budgetBean.costPurchaseServiceTaxInclude,'0')}" readonly required title="购买服务含税总额"></td>
+                                            <td><input type="text" class="number" name="costPurchaseServiceTaxExclude" value="${Utils.format(budgetBean.costPurchaseServiceTaxExclude,'0')}" readonly required title="购买服务不含税总额"></td>
+                                        </tr>
+                                        <tr>
+                                            <td>成本</td>
+                                            <td>采购成本</td>
+                                            <td>其他</td>
+                                            <td><input type="text" class="number" name="costPurchaseOtherTaxInclude" value="${Utils.format(budgetBean.costPurchaseOtherTaxInclude,'0')}" readonly required title="购买其他含税总额"></td>
+                                            <td><input type="text" class="number" name="costPurchaseOtherTaxExclude" value="${Utils.format(budgetBean.costPurchaseOtherTaxExclude,'0')}" readonly required title="购买其他不含税总额"></td>
+                                        </tr>
+                                        <tr>
+                                            <td>成本</td>
+                                            <td>项目管理成本</td>
+                                            <td>项目管理成本</td>
+                                            <td><input type="text" class="number" name="costProjectManageTaxInclude" value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0')}" readonly required title="项目管理成本总额"></td>
+                                            <td><input type="text" class="number" name="costProjectManageTaxExclude" value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0')}" readonly required title="项目管理成本总额"></td>
+                                        </tr>
+                                        <tr>
+                                            <td>成本</td>
+                                            <td>其他</td>
+                                            <td>${project.otherName!}</td>
+                                            <td><input type="text" class="number" name="costOtherOtherTaxInclude" value="${Utils.format(budgetBean.costOtherOtherTaxInclude,'0.00')}" required readonly title="其他含税总额（填入）"></td>
+                                            <td><input type="text" class="number" name="costOtherOtherTaxExclude" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0.00')}" required readonly title="其他不含税总额（填入）"></td>
+                                        </tr>
+                                        <tr>
+                                            <td>合计</td>
+                                            <td></td>
+                                            <td></td>
+                                            <td><input type="text" class="number" name="costTotalTaxInclude" value="${Utils.format(budgetBean.costTotalTaxInclude,'0')}" readonly required title="此列累计"></td>
+                                            <td><input type="text" class="number" name="costTotalTaxExclude" value="${Utils.format(budgetBean.costTotalTaxExclude,'0')}" readonly required title="此列累计"></td>
+                                        </tr>
+                                        </tbody>
+                                    </table>
+                                    <span class="am-text-lg">管理</span>
+                                    <#--<span class="am-text-primary budget-plan-detail"><a style="cursor: pointer">资金计划表</a></span>-->
+                                    <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;">
+                                        <tbody>
+                                        <tr class="am-text-lg">
+                                            <td>类别</td>
+                                            <td>费用项目</td>
+                                            <td>不含税金额（元）</td>
+                                        </tr>
+                                        <tr>
+                                            <td>财务费用</td>
+                                            <td>资金占用成本</td>
+                                            <td><input type="text" class="number" name="costExpropriationTaxExclude" value="${Utils.format(budgetBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本不含税总额"></td>
+                                        </tr>
+                                        <tr>
+                                            <td>公司管理费用</td>
+                                            <td></td>
+                                            <td><input type="text" class="number" name="costCompanyManageTaxExclude" value="${Utils.format(budgetBean.costCompanyManageTaxExclude,'0')}" required readonly title="公司管理费用不含税总额"></td>
+                                        </tr>
+                                        </tbody>
+                                    </table>
 
                                     <span class="am-text-lg">利润率计算</span>
                                     <table class="am-table am-table-bordered am-table-radius table-main"
@@ -1176,10 +1274,10 @@
                             </div>
                         </div>
                         <!--验证表单元素（validate end-->
+                    </div>
 
                     <div class="am-tabs-bd">
-                        <div <#if check==0>class="am-tab-panel am-fade am-in am-active" <#else> class="am-tab-panel am-fade am-in"</#if>
-                             id="tab4">
+                        <div <#if check==0>class="am-tab-panel am-fade am-in am-active" <#else> class="am-tab-panel am-fade am-in"</#if> id="tab4">
                             <#if (project.status==10 || project.status==15) && project.approveStatusSettle == 1>
                                 <div class="approve-topass"></div>
                             </#if>
@@ -1189,12 +1287,11 @@
                             <#if (project.status==10 || project.status==15) && project.approveStatusSettle == 3>
                                 <div class="approve-nopass"></div>
                             </#if>
-                            <input name="id" id="id" type="hidden" value="${project.id}"/>
+                            <input name="id" id="id" type="hidden" value="${project.id}" />
                             <div class="am-u-sm-10">
                                 <div class="am-form am-form-inline">
                                     <div class="am-form-group am-form-icon">
-                                        <input type="text" id="time" name="time" autocomplete="off" readonly
-                                               value="${time!}">
+                                        <input type="text" id="time" name="time" autocomplete="off" readonly value="${time!}">
                                     </div>
                                 </div>
                             </div>
@@ -1215,78 +1312,38 @@
                                 <tr>
                                     <td>收入</td>
                                     <td>设备类</td>
-                                    <td><input name="incomeDeviceEstimateTotal" type="text" class="number"
-                                               value="${Utils.format(monthBean.estimateIncomeDevice,'0')}" required
-                                               readonly title="设备类概算总额"></td>
-                                    <td><input name="incomeDeviceBudgetTotal" type="text" class="number"
-                                               value="${Utils.format(monthBean.budgetIncomeDevice,'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 type="text" class="number" name="incomeDevice"
-                                               value="${Utils.format(monthBean.incomeDevice,'0')}" readonly required
-                                               title="本月结算金额"></td>
-                                    <td><input type="text" class="number" name="incomeDeviceSettleTotal"
-                                               value="${Utils.format(currentBean.incomeDeviceTaxExclude,'0')}" readonly
-                                               title="设备类结算总额"></td>
+                                    <td><input name="incomeDeviceEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateIncomeDevice,'0')}" required readonly title="设备类概算总额"></td>
+                                    <td><input name="incomeDeviceBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetIncomeDevice,'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 type="text" class="number" name="incomeDevice" value="${Utils.format(monthBean.incomeDevice,'0')}" readonly required title="本月结算金额"></td>
+                                    <td><input type="text" class="number" name="incomeDeviceSettleTotal" value="${Utils.format(currentBean.incomeDeviceTaxExclude,'0')}" readonly title="设备类结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>收入</td>
                                     <td>工程类</td>
-                                    <td><input name="incomeEngineerEstimateTotal" type="text" class="number"
-                                               value="${Utils.format(monthBean.estimateIncomeEngineer,'0')}" required
-                                               readonly title="工程类概算总额"></td>
-                                    <td><input name="incomeEngineerBudgetTotal" type="text" class="number"
-                                               value="${Utils.format(monthBean.budgetIncomeEngineer,'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 type="text" class="number" name="incomeEngineer"
-                                               value="${Utils.format(monthBean.incomeEngineer,'0')}" readonly required
-                                               title="工程类本月结算金额"></td>
-                                    <td><input type="text" class="number" name="incomeEngineerSettleTotal"
-                                               value="${Utils.format(currentBean.incomeEngineerTaxExclude,'0')}"
-                                               readonly title="工程类结算总额"></td>
+                                    <td><input name="incomeEngineerEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateIncomeEngineer,'0')}" required readonly title="工程类概算总额"></td>
+                                    <td><input name="incomeEngineerBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetIncomeEngineer,'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 type="text" class="number" name="incomeEngineer" value="${Utils.format(monthBean.incomeEngineer,'0')}" readonly required title="工程类本月结算金额"></td>
+                                    <td><input type="text" class="number" name="incomeEngineerSettleTotal" value="${Utils.format(currentBean.incomeEngineerTaxExclude,'0')}" readonly title="工程类结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>收入</td>
                                     <td>服务类</td>
-                                    <td><input name="incomeServiceEstimateTotal" type="text" class="number"
-                                               value="${Utils.format(monthBean.estimateIncomeService,'0')}" required
-                                               readonly title="服务类概算总额"></td>
-                                    <td><input name="incomeServiceBudgetTotal" type="text" class="number"
-                                               value="${Utils.format(monthBean.budgetIncomeService,'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 type="text" class="number" name="incomeService"
-                                               value="${Utils.format(monthBean.incomeService,'0')}" readonly required
-                                               title="服务类本月结算金额"></td>
-                                    <td><input type="text" class="number" name="incomeServiceSettleTotal"
-                                               value="${Utils.format(currentBean.incomeServiceTaxExclude,'0')}" readonly
-                                               title="服务类结算总额"></td>
+                                    <td><input name="incomeServiceEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateIncomeService,'0')}" required readonly title="服务类概算总额"></td>
+                                    <td><input name="incomeServiceBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetIncomeService,'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 type="text" class="number" name="incomeService" value="${Utils.format(monthBean.incomeService,'0')}" readonly required title="服务类本月结算金额"></td>
+                                    <td><input type="text" class="number" name="incomeServiceSettleTotal" value="${Utils.format(currentBean.incomeServiceTaxExclude,'0')}" readonly title="服务类结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>合计</td>
                                     <td></td>
-                                    <td><input name="incomeEstimateTotal" type="text" class="number"
-                                               value="${Utils.format(monthBean.getEstimateIncomeTotal(),'0')}" readonly
-                                               required title="此列累计"></td>
-                                    <td><input name="incomeBudgetTotal" type="text" class="number"
-                                               value="${Utils.format(monthBean.getBudgetIncomeTotal(),'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 type="text" class="number" name="incomeTotal"
-                                               value="${Utils.format(monthBean.getIncomeTotal(),'0')}" readonly
-                                               title="此列累计"></td>
-                                    <td><input type="text" class="number" name="incomeSettleTotal"
-                                               value="${Utils.format(currentBean.getIncomeTotalTaxExclude(),'0')}"
-                                               readonly title="此列累计"></td>
+                                    <td><input name="incomeEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.getEstimateIncomeTotal(),'0')}" readonly required title="此列累计"></td>
+                                    <td><input name="incomeBudgetTotal" type="text" class="number"  value="${Utils.format(monthBean.getBudgetIncomeTotal(),'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 type="text" class="number" name="incomeTotal" value="${Utils.format(monthBean.getIncomeTotal(),'0')}" readonly title="此列累计"></td>
+                                    <td><input type="text" class="number" name="incomeSettleTotal" value="${Utils.format(currentBean.getIncomeTotalTaxExclude(),'0')}" readonly title="此列累计"></td>
                                 </tr>
                                 </tbody>
                             </table>
@@ -1307,101 +1364,51 @@
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>设备</td>
-                                    <td><input name="costPurchaseDeviceEstimateTotal" type="text" class="number"
-                                               value="${Utils.format(monthBean.estimateCostPurchaseDevice,'0')}"
-                                               readonly required title="购买设备概算总额"></td>
-                                    <td><input name="costPurchaseDeviceBudgetTotal" type="text" class="number"
-                                               value="${Utils.format(monthBean.budgetCostPurchaseDevice,'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 type="text" class="number" name="costPurchaseDevice"
-                                               value="${Utils.format(monthBean.costPurchaseDevice,'0')}" readonly
-                                               required title="购买设备本月结算总额"></td>
-                                    <td><input type="text" class="number" name="costPurchaseDeviceSettleTotal"
-                                               value="${Utils.format(currentBean.costPurchaseDeviceTaxExclude,'0')}"
-                                               readonly title="购买设备结算总额"></td>
+                                    <td><input name="costPurchaseDeviceEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateCostPurchaseDevice,'0')}" readonly required title="购买设备概算总额"></td>
+                                    <td><input name="costPurchaseDeviceBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetCostPurchaseDevice,'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 type="text" class="number" name="costPurchaseDevice" value="${Utils.format(monthBean.costPurchaseDevice,'0')}" readonly required title="购买设备本月结算总额"></td>
+                                    <td><input type="text" class="number" name="costPurchaseDeviceSettleTotal" value="${Utils.format(currentBean.costPurchaseDeviceTaxExclude,'0')}" readonly title="购买设备结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>施工</td>
-                                    <td><input name="costPurchaseBuildEstimateTotal" type="text" class="number"
-                                               value="${Utils.format(monthBean.estimateCostPurchaseBuild,'0')}" readonly
-                                               required title="施工采购成本概算总额"></td>
-                                    <td><input name="costPurchaseBuildBudgetTotal" type="text" class="number"
-                                               value="${Utils.format(monthBean.budgetCostPurchaseBuild,'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 type="text" class="number" name="costPurchaseBuild"
-                                               value="${Utils.format(monthBean.costPurchaseBuild,'0')}" readonly
-                                               required title="施工采购成本本月结算金额"></td>
-                                    <td><input type="text" class="number" name="costPurchaseBuildSettleTotal"
-                                               value="${Utils.format(currentBean.costPurchaseBuildTaxExclude,'0')}"
-                                               readonly title="施工采购成本结算总额"></td>
+                                    <td><input name="costPurchaseBuildEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateCostPurchaseBuild,'0')}" readonly required title="施工采购成本概算总额"></td>
+                                    <td><input name="costPurchaseBuildBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetCostPurchaseBuild,'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 type="text" class="number" name="costPurchaseBuild" value="${Utils.format(monthBean.costPurchaseBuild,'0')}" readonly required title="施工采购成本本月结算金额"></td>
+                                    <td><input type="text" class="number" name="costPurchaseBuildSettleTotal" value="${Utils.format(currentBean.costPurchaseBuildTaxExclude,'0')}" readonly title="施工采购成本结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>服务</td>
-                                    <td><input name="costPurchaseServiceEstimateTotal" type="text" class="number"
-                                               value="${Utils.format(monthBean.estimateCostPurchaseService,'0')}"
-                                               readonly required title="服务采购成本概算总额"></td>
-                                    <td><input name="costPurchaseServiceBudgetTotal" type="text" class="number"
-                                               value="${Utils.format(monthBean.budgetCostPurchaseService,'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 type="text" class="number" name="costPurchaseService"
-                                               value="${Utils.format(monthBean.costPurchaseService,'0')}" readonly
-                                               required title="服务采购成本本月结算金额"></td>
-                                    <td><input type="text" class="number" name="costPurchaseServiceSettleTotal"
-                                               value="${Utils.format(currentBean.costPurchaseServiceTaxExclude,'0')}"
-                                               readonly title="服务采购成本结算总额"></td>
+                                    <td><input name="costPurchaseServiceEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateCostPurchaseService,'0')}" readonly required title="服务采购成本概算总额"></td>
+                                    <td><input name="costPurchaseServiceBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetCostPurchaseService,'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 type="text" class="number" name="costPurchaseService" value="${Utils.format(monthBean.costPurchaseService,'0')}" readonly required title="服务采购成本本月结算金额"></td>
+                                    <td><input type="text" class="number" name="costPurchaseServiceSettleTotal" value="${Utils.format(currentBean.costPurchaseServiceTaxExclude,'0')}" readonly title="服务采购成本结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>其他</td>
-                                    <td><input name="costPurchaseOtherEstimateTotal" type="text" class="number"
-                                               value="${Utils.format(monthBean.estimateCostPurchaseOther,'0')}" readonly
-                                               required title="其他采购成本概算总额"></td>
-                                    <td><input name="costPurchaseOtherBudgetTotal" type="text" class="number"
-                                               value="${Utils.format(monthBean.budgetCostPurchaseOther,'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 type="text" class="number" name="costPurchaseOther"
-                                               value="${Utils.format(monthBean.costPurchaseOther,'0')}" readonly
-                                               required title="其他采购成本本月结算金额"></td>
-                                    <td><input type="text" class="number" name="costPurchaseOtherSettleTotal"
-                                               value="${Utils.format(currentBean.costPurchaseOtherTaxExclude,'0')}"
-                                               readonly title="其他采购成本结算总额"></td>
+                                    <td><input name="costPurchaseOtherEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateCostPurchaseOther,'0')}" readonly required title="其他采购成本概算总额"></td>
+                                    <td><input name="costPurchaseOtherBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetCostPurchaseOther,'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 type="text" class="number" name="costPurchaseOther" value="${Utils.format(monthBean.costPurchaseOther,'0')}" readonly required title="其他采购成本本月结算金额"></td>
+                                    <td><input type="text" class="number" name="costPurchaseOtherSettleTotal" value="${Utils.format(currentBean.costPurchaseOtherTaxExclude,'0')}" readonly title="其他采购成本结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
                                     <td>项目管理成本</td>
                                     <td>项目管理成本</td>
-                                    <td><input name="costProjectManageEstimateTotal" type="text" class="number"
-                                               value="${Utils.format(monthBean.estimateCostProjectManage,'0')}" readonly
-                                               required title="项目管理成本概算总额"></td>
-                                    <td><input name="costProjectManageBudgetTotal" type="text" class="number"
-                                               value="${Utils.format(monthBean.budgetCostProjectManage,'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 type="text" class="number" name="costProjectManage"
-                                               value="${Utils.format(monthBean.costProjectManage,'0')}" readonly
-                                               required title="项目管理成本本月结算金额"></td>
-                                    <td><input type="text" class="number" name="costProjectManageSettleTotal"
-                                               value="${Utils.format(currentBean.costProjectManageTaxExclude,'0')}"
-                                               readonly title="项目管理成本结算总额"></td>
+                                    <td><input name="costProjectManageEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateCostProjectManage,'0')}" readonly required title="项目管理成本概算总额"></td>
+                                    <td><input name="costProjectManageBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetCostProjectManage,'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 type="text" class="number" name="costProjectManage" value="${Utils.format(monthBean.costProjectManage,'0')}" readonly required title="项目管理成本本月结算金额"></td>
+                                    <td><input type="text" class="number" name="costProjectManageSettleTotal" value="${Utils.format(currentBean.costProjectManageTaxExclude,'0')}" readonly title="项目管理成本结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
@@ -1417,21 +1424,11 @@
                                     <td>合计</td>
                                     <td></td>
                                     <td></td>
-                                    <td><input name="costEstimateTotal"
-                                               value="${Utils.format(monthBean.getEstimateCostTotal(),'0')}" type="text"
-                                               class="number" readonly required title="此列累计"></td>
-                                    <td><input name="costBudgetTotal"
-                                               value="${Utils.format(monthBean.getBudgetCostTotal(),'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 type="text" class="number" name="costTotal"
-                                               value="${Utils.format(monthBean.getCostTotal(),'0')}" readonly
-                                               title="此列累计"></td>
-                                    <td><input type="text" class="number" name="costSettleTotal"
-                                               value="${Utils.format(currentBean.getCostTotalTaxExclude(),'0')}"
-                                               readonly title="此列累计"></td>
+                                    <td><input name="costEstimateTotal" value="${Utils.format(monthBean.getEstimateCostTotal(),'0')}" type="text" class="number" readonly required title="此列累计"></td>
+                                    <td><input name="costBudgetTotal" value="${Utils.format(monthBean.getBudgetCostTotal(),'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 type="text" class="number" name="costTotal" value="${Utils.format(monthBean.getCostTotal(),'0')}" readonly title="此列累计"></td>
+                                    <td><input type="text" class="number" name="costSettleTotal" value="${Utils.format(currentBean.getCostTotalTaxExclude(),'0')}" readonly title="此列累计"></td>
                                 </tr>
                                 </tbody>
                             </table>
@@ -1450,74 +1447,38 @@
                                 <tr>
                                     <td>财务费用</td>
                                     <td>资金占用成本</td>
-                                    <td><input name="costExpropriationEstimateTotal" type="text" class="number"
-                                               value="${Utils.format(monthBean.estimateCostExpropriation,'0')}" required
-                                               readonly title="资金占用成本概算总额"></td>
-                                    <td><input name="costExpropriationBudgetTotal" type="text" class="number"
-                                               value="${Utils.format(monthBean.budgetCostExpropriation,'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 type="text" class="number" name="costExpropriation"
-                                               value="${Utils.format(monthBean.costExpropriation,'0')}" readonly
-                                               required title="资金占用成本本月结算金额"></td>
-                                    <td><input type="text" class="number" name="costExpropriationSettleTotal"
-                                               value="${Utils.format(currentBean.costExpropriationTaxExclude,'0')}"
-                                               readonly title="资金占用成本结算总额"></td>
+                                    <td><input name="costExpropriationEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateCostExpropriation,'0')}" required readonly title="资金占用成本概算总额"></td>
+                                    <td><input name="costExpropriationBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetCostExpropriation,'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 type="text" class="number" name="costExpropriation" value="${Utils.format(monthBean.costExpropriation,'0')}" readonly required title="资金占用成本本月结算金额"></td>
+                                    <td><input type="text" class="number" name="costExpropriationSettleTotal" value="${Utils.format(currentBean.costExpropriationTaxExclude,'0')}" readonly title="资金占用成本结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>公司管理费用</td>
                                     <td></td>
-                                    <td><input name="costCompanyManageEstimateTotal" type="text" class="number"
-                                               value="${Utils.format(monthBean.estimateCostCompanyManage,'0')}" required
-                                               readonly title="公司管理费用概算总额"></td>
-                                    <td><input name="costCompanyManageBudgetTotal" type="text" class="number"
-                                               value="${Utils.format(monthBean.budgetCostCompanyManage,'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 type="text" class="number" name="costCompanyManage"
-                                               value="${Utils.format(monthBean.costCompanyManage,'0')}" readonly
-                                               required title="公司管理费用本月结算金额"></td>
-                                    <td><input type="text" class="number" name="costCompanyManageSettleTotal"
-                                               value="${Utils.format(currentBean.costCompanyManageTaxExclude,'0')}"
-                                               readonly title="公司管理费用结算总额"></td>
+                                    <td><input name="costCompanyManageEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateCostCompanyManage,'0')}" required readonly title="公司管理费用概算总额"></td>
+                                    <td><input name="costCompanyManageBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetCostCompanyManage,'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 type="text" class="number" name="costCompanyManage" value="${Utils.format(monthBean.costCompanyManage,'0')}" readonly required title="公司管理费用本月结算金额"></td>
+                                    <td><input type="text" class="number" name="costCompanyManageSettleTotal" value="${Utils.format(currentBean.costCompanyManageTaxExclude,'0')}" readonly title="公司管理费用结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>所得税费用</td>
                                     <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 type="text" class="number" name="costIncomeTax"
-                                               value="${Utils.format(monthBean.costIncomeTax,'0')}" readonly required
-                                               title="公司管理费用本月结算金额"></td>
-                                    <td><input type="text" class="number" name="costIncomeTaxSettleTotal"
-                                               value="${Utils.format(currentBean.costIncomeTax,'0')}" readonly
-                                               title="公司管理费用结算总额"></td>
+                                    <td><input name="costIncomeTaxFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costIncomeTax,'0')}" required readonly title="公司管理费用上月结算总额"></td>
+                                    <td><input type="text" class="number" name="costIncomeTax" value="${Utils.format(monthBean.costIncomeTax,'0')}" readonly required title="公司管理费用本月结算金额"></td>
+                                    <td><input type="text" class="number" name="costIncomeTaxSettleTotal" value="${Utils.format(currentBean.costIncomeTax,'0')}" readonly title="公司管理费用结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>合计</td>
                                     <td></td>
-                                    <td><input name="costManageEstimateTotal"
-                                               value="${Utils.format(monthBean.getEstimateCostManageTotal(),'0')}"
-                                               type="text" class="number" readonly required title="此列累计"></td>
-                                    <td><input name="costManageBudgetTotal"
-                                               value="${Utils.format(monthBean.getBudgetCostManageTotal(),'0')}"
-                                               type="text" class="number" readonly required title="此列累计"></td>
-                                    <td><input name="costManageFormerSettleTotal" type="text" class="number"
-                                               value="${Utils.format(formerBean.getCostManageTotal(),'0')}" required
-                                               readonly title="此列累计"></td>
-                                    <td><input type="text" class="number" name="costManageTotal"
-                                               value="${Utils.format(monthBean.getCostManageTotal(),'0')}" readonly
-                                               title="此列累计"></td>
-                                    <td><input type="text" class="number" name="costManageSettleTotal"
-                                               value="${Utils.format(currentBean.getCostManageTotal(),'0')}" readonly
-                                               title="此列累计"></td>
+                                    <td><input name="costManageEstimateTotal" value="${Utils.format(monthBean.getEstimateCostManageTotal(),'0')}" type="text" class="number" readonly required title="此列累计"></td>
+                                    <td><input name="costManageBudgetTotal" value="${Utils.format(monthBean.getBudgetCostManageTotal(),'0')}" type="text" class="number" readonly required title="此列累计"></td>
+                                    <td><input name="costManageFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.getCostManageTotal(),'0')}" required readonly title="此列累计"></td>
+                                    <td><input type="text" class="number" name="costManageTotal" value="${Utils.format(monthBean.getCostManageTotal(),'0')}" readonly title="此列累计"></td>
+                                    <td><input type="text" class="number" name="costManageSettleTotal" value="${Utils.format(currentBean.getCostManageTotal(),'0')}" readonly title="此列累计"></td>
                                 </tr>
                                 </tbody>
                             </table>
@@ -1536,63 +1497,30 @@
                                 </tr>
                                 <tr>
                                     <td>项目毛利</td>
-                                    <td><input name="grossProfitEstimateTotal" type="text" class="number"
-                                               value="${Utils.format(monthBean.estimateGrossProfit,'0')}" required
-                                               readonly title="项目毛利概算总额"></td>
-                                    <td><input name="grossProfitBudgetTotal" type="text" class="number"
-                                               value="${Utils.format(monthBean.budgetGrossProfit,'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 type="text" class="number" name="grossProfit"
-                                               value="${Utils.format(monthBean.grossProfit,'0')}" readonly required
-                                               title="项目毛利本月结算金额"></td>
-                                    <td><input type="text" class="number" name="grossProfitSettleTotal"
-                                               value="${Utils.format(currentBean.grossProfit,'0')}" readonly
-                                               title="项目毛利结算总额"></td>
-                                    <td><input name="grossProfitProfitMargin" type="text" class="number"
-                                               value="${Utils.format(currentBean.getGrossProfitProfitMargin(),'0')}"
-                                               readonly title="项目毛利利润率"></td>
+                                    <td><input name="grossProfitEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateGrossProfit,'0')}" required readonly title="项目毛利概算总额"></td>
+                                    <td><input name="grossProfitBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetGrossProfit,'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 type="text" class="number" name="grossProfit" value="${Utils.format(monthBean.grossProfit,'0')}" readonly required title="项目毛利本月结算金额"></td>
+                                    <td><input type="text" class="number" name="grossProfitSettleTotal" value="${Utils.format(currentBean.grossProfit,'0')}" readonly title="项目毛利结算总额"></td>
+                                    <td><input name="grossProfitProfitMargin" type="text" class="number" value="${Utils.format(currentBean.getGrossProfitProfitMargin(),'0')}" readonly title="项目毛利利润率"></td>
                                 </tr>
                                 <tr>
                                     <td>项目贡献利润</td>
-                                    <td><input name="contributionProfitEstimateTotal" type="text" class="number"
-                                               value="${Utils.format(monthBean.estimateContributionProfit,'0')}"
-                                               required readonly title="项目贡献利润概算总额"></td>
-                                    <td><input name="contributionProfitBudgetTotal" type="text" class="number"
-                                               value="${Utils.format(monthBean.budgetContributionProfit,'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 type="text" class="number" name="contributionProfit"
-                                               value="${Utils.format(monthBean.contributionProfit,'0')}" required
-                                               readonly title="项目贡献利润本月结算金额"></td>
-                                    <td><input type="text" class="number" name="contributionProfitSettleTotal"
-                                               value="${Utils.format(currentBean.contributionProfit,'0')}" readonly
-                                               title="项目贡献利润结算总额"></td>
-                                    <td><input name="contributionProfitProfitMargin" type="text" class="number"
-                                               value="${Utils.format(currentBean.getContributionProfitProfitMargin(),'0')}"
-                                               readonly title="项目贡献利润利润率"></td>
+                                    <td><input name="contributionProfitEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateContributionProfit,'0')}" required readonly title="项目贡献利润概算总额"></td>
+                                    <td><input name="contributionProfitBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetContributionProfit,'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 type="text" class="number" name="contributionProfit" value="${Utils.format(monthBean.contributionProfit,'0')}" required readonly title="项目贡献利润本月结算金额"></td>
+                                    <td><input type="text" class="number" name="contributionProfitSettleTotal" value="${Utils.format(currentBean.contributionProfit,'0')}" readonly title="项目贡献利润结算总额"></td>
+                                    <td><input name="contributionProfitProfitMargin" type="text" class="number" value="${Utils.format(currentBean.getContributionProfitProfitMargin(),'0')}" readonly title="项目贡献利润利润率"></td>
                                 </tr>
                                 <tr>
                                     <td>项目净利润</td>
                                     <td>/</td>
-                                    <td>
-                                        /<#--<input name="netProfitBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.getProjectContributionProfit(),'0')}" required readonly title="项目净利润预算总额">--></td>
-                                    <td><input name="netProfitFormerSettleTotal" type="text" class="number"
-                                               value="${Utils.format(formerBean.netProfit,'0')}" required readonly
-                                               title="项目净利润上月结算总额"></td>
-                                    <td><input type="text" class="number" name="netProfit"
-                                               value="${Utils.format(monthBean.netProfit,'0')}" required readonly
-                                               title="项目净利润本月结算金额"></td>
-                                    <td><input type="text" class="number" name="netProfitSettleTotal"
-                                               value="${Utils.format(currentBean.netProfit,'0')}" readonly
-                                               title="项目净利润结算总额"></td>
-                                    <td><input name="netProfitProfitMargin" type="text" class="number"
-                                               value="${Utils.format(currentBean.getNetProfitProfitMargin(),'0')}"
-                                               readonly title="项目净利润利润率"></td>
+                                    <td>/<#--<input name="netProfitBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.getProjectContributionProfit(),'0')}" required readonly title="项目净利润预算总额">--></td>
+                                    <td><input name="netProfitFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.netProfit,'0')}" required readonly title="项目净利润上月结算总额"></td>
+                                    <td><input type="text" class="number" name="netProfit" value="${Utils.format(monthBean.netProfit,'0')}" required readonly title="项目净利润本月结算金额"></td>
+                                    <td><input type="text" class="number" name="netProfitSettleTotal" value="${Utils.format(currentBean.netProfit,'0')}" readonly title="项目净利润结算总额"></td>
+                                    <td><input name="netProfitProfitMargin" type="text" class="number" value="${Utils.format(currentBean.getNetProfitProfitMargin(),'0')}" readonly title="项目净利润利润率"></td>
                                 </tr>
                                 </tbody>
                             </table>
@@ -1609,206 +1537,101 @@
                                 </tr>
                                 <tr>
                                     <td>销售商品、提供劳务收到的现金</td>
-                                    <td><input name="saleIncomeCashBudget" type="text" class="number"
-                                               value="${Utils.format(monthBean.budgetSaleIncomeCash,'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 type="text" class="number" name="saleIncomeCash"
-                                               value="${Utils.format(monthBean.saleIncomeCash,'0')}" required readonly
-                                               title="本月结算金额"></td>
-                                    <td><input name="saleIncomeCashSettle" type="text" class="number"
-                                               value="${Utils.format(currentBean.saleIncomeCash,'0')}" readonly
-                                               title="结算总额"></td>
+                                    <td><input name="saleIncomeCashBudget" type="text" class="number" value="${Utils.format(monthBean.budgetSaleIncomeCash,'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 type="text" class="number" name="saleIncomeCash" value="${Utils.format(monthBean.saleIncomeCash,'0')}" required readonly title="本月结算金额"></td>
+                                    <td><input name="saleIncomeCashSettle" type="text" class="number" value="${Utils.format(currentBean.saleIncomeCash,'0')}" 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 type="text" class="number" name="taxReturn"
-                                               value="${Utils.format(monthBean.taxReturn,'0')}" required readonly
-                                               title="本月结算金额"></td>
-                                    <td><input name="taxReturnSettle" type="text" class="number"
-                                               value="${Utils.format(currentBean.taxReturn,'0')}" readonly title="结算总额">
-                                    </td>
+                                    <td><input name="taxReturnFormerSettle" type="text" class="number" value="${Utils.format(formerBean.taxReturn,'0')}" required readonly title="上月结算总额"></td>
+                                    <td><input type="text" class="number" name="taxReturn" value="${Utils.format(monthBean.taxReturn,'0')}" required readonly title="本月结算金额"></td>
+                                    <td><input name="taxReturnSettle" type="text" class="number" value="${Utils.format(currentBean.taxReturn,'0')}" readonly title="结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>收到其他与经营活动有关的现金</td>
-                                    <td><input name="earnestMoneyIncomeBudget" type="text" class="number"
-                                               value="${Utils.format(monthBean.budgetEarnestMoneyIncome,'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 type="text" class="number" name="earnestMoneyIncome"
-                                               value="${Utils.format(monthBean.earnestMoneyIncome,'0')}" readonly
-                                               required title="本月结算金额"></td>
-                                    <td><input name="earnestMoneyIncomeSettle" type="text" class="number"
-                                               value="${Utils.format(currentBean.earnestMoneyIncome,'0')}" readonly
-                                               title="结算总额"></td>
+                                    <td><input name="earnestMoneyIncomeBudget" type="text" class="number" value="${Utils.format(monthBean.budgetEarnestMoneyIncome,'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 type="text" class="number" name="earnestMoneyIncome" value="${Utils.format(monthBean.earnestMoneyIncome,'0')}" readonly required title="本月结算金额"></td>
+                                    <td><input name="earnestMoneyIncomeSettle" type="text" class="number" value="${Utils.format(currentBean.earnestMoneyIncome,'0')}" readonly title="结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>购买商品、接受劳务支付的现金</td>
-                                    <td><input name="purchaseCostBudget" type="text" class="number"
-                                               value="${Utils.format(monthBean.budgetPurchaseCost,'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 type="text" class="number" name="purchaseCost"
-                                               value="${Utils.format(monthBean.purchaseCost,'0')}" required readonly
-                                               title="本月结算金额"></td>
-                                    <td><input name="purchaseCostSettle" type="text" class="number"
-                                               value="${Utils.format(currentBean.purchaseCost,'0')}" readonly
-                                               title="结算总额"></td>
+                                    <td><input name="purchaseCostBudget" type="text" class="number" value="${Utils.format(monthBean.budgetPurchaseCost,'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 type="text" class="number" name="purchaseCost" value="${Utils.format(monthBean.purchaseCost,'0')}" required readonly title="本月结算金额"></td>
+                                    <td><input name="purchaseCostSettle" type="text" class="number" value="${Utils.format(currentBean.purchaseCost,'0')}" 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 type="text" class="number" name="taxCost"
-                                               value="${Utils.format(monthBean.taxCost,'0')}" required readonly
-                                               title="本月结算金额"></td>
-                                    <td><input name="taxCostSettle" type="text" class="number"
-                                               value="${Utils.format(currentBean.taxCost,'0')}" readonly title="结算总额">
-                                    </td>
+                                    <td><input name="taxCostFormerSettle" type="text" class="number" value="${Utils.format(formerBean.taxCost,'0')}" required readonly title="上月结算总额"></td>
+                                    <td><input type="text" class="number" name="taxCost" value="${Utils.format(monthBean.taxCost,'0')}" required readonly title="本月结算金额"></td>
+                                    <td><input name="taxCostSettle" type="text" class="number" value="${Utils.format(currentBean.taxCost,'0')}" readonly title="结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>支付其他与经营活动有关的现金</td>
-                                    <td><input name="earnestMoneyCostBudget" type="text" class="number"
-                                               value="${Utils.format(monthBean.budgetEarnestMoneyCost,'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 type="text" class="number" name="earnestMoneyCost"
-                                               value="${Utils.format(monthBean.earnestMoneyCost,'0')}" readonly required
-                                               title="本月结算金额"></td>
-                                    <td><input name="earnestMoneyCostSettle" type="text" class="number"
-                                               value="${Utils.format(currentBean.earnestMoneyCost,'0')}" readonly
-                                               title="结算总额"></td>
+                                    <td><input name="earnestMoneyCostBudget" type="text" class="number" value="${Utils.format(monthBean.budgetEarnestMoneyCost,'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 type="text" class="number" name="earnestMoneyCost" value="${Utils.format(monthBean.earnestMoneyCost,'0')}" readonly required title="本月结算金额"></td>
+                                    <td><input name="earnestMoneyCostSettle" type="text" class="number" value="${Utils.format(currentBean.earnestMoneyCost,'0')}" readonly title="结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>经营活动产生的现金流量净额</td>
-                                    <td><input name="netCashFlowBudget" type="text" class="number"
-                                               value="${Utils.format(monthBean.budgetNetCashFlow,'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 type="text" class="number" name="netCashFlow"
-                                               value="${Utils.format(monthBean.netCashFlow,'0')}" required readonly
-                                               title="本月结算金额"></td>
-                                    <td><input name="netCashFlowSettle" type="text" class="number"
-                                               value="${Utils.format(currentBean.netCashFlow,'0')}" readonly
-                                               title="结算总额"></td>
+                                    <td><input name="netCashFlowBudget" type="text" class="number" value="${Utils.format(monthBean.budgetNetCashFlow,'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 type="text" class="number" name="netCashFlow" value="${Utils.format(monthBean.netCashFlow,'0')}" required readonly title="本月结算金额"></td>
+                                    <td><input name="netCashFlowSettle" type="text" class="number" value="${Utils.format(currentBean.netCashFlow,'0')}" 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 type="text" class="number" name="cashInflowFromInvestingActivities"
-                                               value="${Utils.format(monthBean.cashInflowFromInvestingActivities,'0')}"
-                                               required readonly title="本月结算金额"></td>
-                                    <td><input name="cashInflowFromInvestingActivitiesSettle"
-                                               value="${Utils.format(currentBean.cashInflowFromInvestingActivities,'0')}"
-                                               type="text" class="number" readonly title="结算总额"></td>
+                                    <td><input name="cashInflowFromInvestingActivitiesFormerSettle" type="text" class="number" value="${Utils.format(formerBean.cashInflowFromInvestingActivities,'0')}" required readonly title="上月结算总额"></td>
+                                    <td><input type="text" class="number" name="cashInflowFromInvestingActivities" value="${Utils.format(monthBean.cashInflowFromInvestingActivities,'0')}" required readonly title="本月结算金额"></td>
+                                    <td><input name="cashInflowFromInvestingActivitiesSettle" value="${Utils.format(currentBean.cashInflowFromInvestingActivities,'0')}" 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 type="text" class="number" name="cashOutflowFromInvestingActivities"
-                                               value="${Utils.format(monthBean.cashOutflowFromInvestingActivities,'0')}"
-                                               required readonly title="本月结算金额"></td>
-                                    <td><input name="cashOutflowFromInvestingActivitiesSettle"
-                                               value="${Utils.format(currentBean.cashOutflowFromInvestingActivities,'0')}"
-                                               type="text" class="number" readonly title="结算总额"></td>
+                                    <td><input name="cashOutflowFromInvestingActivitiesFormerSettle" type="text" class="number" value="${Utils.format(formerBean.cashOutflowFromInvestingActivities,'0')}" required readonly title="上月结算总额"></td>
+                                    <td><input type="text" class="number" name="cashOutflowFromInvestingActivities" value="${Utils.format(monthBean.cashOutflowFromInvestingActivities,'0')}" required readonly title="本月结算金额"></td>
+                                    <td><input name="cashOutflowFromInvestingActivitiesSettle" value="${Utils.format(currentBean.cashOutflowFromInvestingActivities,'0')}" 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 type="text" class="number" name="netCashFromInvestingActivities"
-                                               value="${Utils.format(monthBean.netCashFromInvestingActivities,'0')}"
-                                               readonly required title="本月结算金额"></td>
-                                    <td><input name="netCashFromInvestingActivitiesSettle" type="text" class="number"
-                                               value="${Utils.format(currentBean.netCashFromInvestingActivities,'0')}"
-                                               readonly title="结算总额"></td>
+                                    <td><input name="netCashFromInvestingActivitiesFormerSettle" type="text" class="number" value="${Utils.format(formerBean.netCashFromInvestingActivities,'0')}" required readonly title="上月结算总额"></td>
+                                    <td><input type="text" class="number" name="netCashFromInvestingActivities" value="${Utils.format(monthBean.netCashFromInvestingActivities,'0')}" readonly required title="本月结算金额"></td>
+                                    <td><input name="netCashFromInvestingActivitiesSettle" type="text" class="number" value="${Utils.format(currentBean.netCashFromInvestingActivities,'0')}" readonly title="结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>融资资金流入</td>
-                                    <td><input name="financingCapitalInflowBudget" type="text" class="number"
-                                               value="${Utils.format(monthBean.budgetFinancingCapitalInflow,'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 type="text" class="number" name="financingCapitalInflow"
-                                               value="${Utils.format(monthBean.financingCapitalInflow,'0')}" required
-                                               readonly title="本月结算金额"></td>
-                                    <td><input name="financingCapitalInflowSettle" type="text" class="number"
-                                               value="${Utils.format(currentBean.financingCapitalInflow,'0')}" readonly
-                                               title="结算总额"></td>
+                                    <td><input name="financingCapitalInflowBudget" type="text" class="number" value="${Utils.format(monthBean.budgetFinancingCapitalInflow,'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 type="text" class="number" name="financingCapitalInflow" value="${Utils.format(monthBean.financingCapitalInflow,'0')}" required readonly title="本月结算金额"></td>
+                                    <td><input name="financingCapitalInflowSettle" type="text" class="number" value="${Utils.format(currentBean.financingCapitalInflow,'0')}" readonly title="结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>还款资金流出</td>
-                                    <td><input name="financingCapitalOutflowBudget" type="text" class="number"
-                                               value="${Utils.format(monthBean.budgetFinancingCapitalOutflow,'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 type="text" class="number" name="financingCapitalOutflow"
-                                               value="${Utils.format(monthBean.financingCapitalOutflow,'0')}" required
-                                               readonly title="本月结算金额"></td>
-                                    <td><input name="financingCapitalOutflowSettle" type="text" class="number"
-                                               value="${Utils.format(currentBean.financingCapitalOutflow,'0')}" readonly
-                                               title="结算总额"></td>
+                                    <td><input name="financingCapitalOutflowBudget" type="text" class="number" value="${Utils.format(monthBean.budgetFinancingCapitalOutflow,'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 type="text" class="number" name="financingCapitalOutflow" value="${Utils.format(monthBean.financingCapitalOutflow,'0')}" required readonly title="本月结算金额"></td>
+                                    <td><input name="financingCapitalOutflowSettle" type="text" class="number" value="${Utils.format(currentBean.financingCapitalOutflow,'0')}" readonly title="结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>筹资活动产生的现金流量净额</td>
-                                    <td><input name="financingCapitalCashflowBudget" type="text" class="number"
-                                               value="${Utils.format(monthBean.budgetFinancingCapitalCashflow,'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 type="text" class="number" name="financingCapitalCashflow"
-                                               value="${Utils.format(monthBean.financingCapitalCashflow,'0')}" required
-                                               readonly title="本月结算金额"></td>
-                                    <td><input name="financingCapitalCashflowSettle" type="text" class="number"
-                                               value="${Utils.format(currentBean.financingCapitalCashflow,'0')}"
-                                               readonly title="结算总额"></td>
+                                    <td><input name="financingCapitalCashflowBudget" type="text" class="number" value="${Utils.format(monthBean.budgetFinancingCapitalCashflow,'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 type="text" class="number" name="financingCapitalCashflow" value="${Utils.format(monthBean.financingCapitalCashflow,'0')}" required readonly title="本月结算金额"></td>
+                                    <td><input name="financingCapitalCashflowSettle" type="text" class="number" value="${Utils.format(currentBean.financingCapitalCashflow,'0')}" readonly title="结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>货币资金净增加额</td>
-                                    <td><input name="netIncreaseMonetaryFundsBudget" type="text" class="number"
-                                               value="${Utils.format(monthBean.budgetNetIncreaseMonetaryFunds,'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 type="text" class="number" name="netIncreaseMonetaryFunds"
-                                               value="${Utils.format(monthBean.netIncreaseMonetaryFunds,'0')}" required
-                                               readonly title="本月结算金额"></td>
-                                    <td><input name="netIncreaseMonetaryFundsSettle" type="text" class="number"
-                                               value="${Utils.format(currentBean.netIncreaseMonetaryFunds,'0')}"
-                                               readonly title="结算总额"></td>
+                                    <td><input name="netIncreaseMonetaryFundsBudget" type="text" class="number" value="${Utils.format(monthBean.budgetNetIncreaseMonetaryFunds,'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 type="text" class="number" name="netIncreaseMonetaryFunds" value="${Utils.format(monthBean.netIncreaseMonetaryFunds,'0')}" required readonly title="本月结算金额"></td>
+                                    <td><input name="netIncreaseMonetaryFundsSettle" type="text" class="number" value="${Utils.format(currentBean.netIncreaseMonetaryFunds,'0')}" readonly title="结算总额"></td>
                                 </tr>
                                 <#--<tr>
                                     <td>合计</td>
@@ -1836,7 +1659,7 @@
                             <#if project.status ==15 && project.approveStatusFinal == 3>
                                 <div class="approve-nopass"></div>
                             </#if>
-                            <input name="id" id="id" type="hidden" value="${project.id}"/>
+                            <input name="id" id="id" type="hidden" value="${project.id}" />
                             <span class="am-text-lg">收入</span>
                             <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;">
                                 <tbody>
@@ -1851,66 +1674,34 @@
                                 <tr>
                                     <td>收入</td>
                                     <td>设备类</td>
-                                    <td><input name="incomeDeviceTaxExclude" type="text" class="number"
-                                               value="${Utils.format(estimateBean.incomeDeviceTaxExclude,'0')}" required
-                                               readonly title="设备类概算总额"></td>
-                                    <td><input name="incomeDeviceTaxExclude" type="text" class="number"
-                                               value="${Utils.format(budgetBean.incomeDeviceTaxExclude,'0')}" required
-                                               readonly title="设备类预算总额"></td>
-                                    <td><input type="text" class="number"
-                                               value="${Utils.format(currentBean.incomeDeviceTaxExclude,'0')}" required
-                                               readonly title="设备类结算总额"></td>
-                                    <td><input name="incomeDeviceFinalTotal" type="text" class="number"
-                                               value="${Utils.format(finalBean.incomeDeviceFinalTotal,'0')}" required
-                                               readonly title="设备类决算总额"></td>
+                                    <td><input name="incomeDeviceTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类概算总额"></td>
+                                    <td><input name="incomeDeviceTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类预算总额"></td>
+                                    <td><input type="text" class="number" value="${Utils.format(currentBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类结算总额"></td>
+                                    <td><input name="incomeDeviceFinalTotal" type="text" class="number" value="${Utils.format(finalBean.incomeDeviceFinalTotal,'0')}" required readonly title="设备类决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>收入</td>
                                     <td>工程类</td>
-                                    <td><input name="incomeEngineerTaxExclude" type="text" class="number"
-                                               value="${Utils.format(estimateBean.incomeEngineerTaxExclude,'0')}"
-                                               required readonly title="工程类概算总额"></td>
-                                    <td><input name="incomeEngineerTaxExclude" type="text" class="number"
-                                               value="${Utils.format(budgetBean.incomeEngineerTaxExclude,'0')}" required
-                                               readonly title="工程类预算总额"></td>
-                                    <td><input type="text" class="number"
-                                               value="${Utils.format(currentBean.incomeEngineerTaxExclude,'0')}"
-                                               required readonly title="工程类结算总额"></td>
-                                    <td><input name="incomeEngineerFinalTotal" type="text" class="number"
-                                               value="${Utils.format(finalBean.incomeEngineerFinalTotal,'0')}" required
-                                               readonly title="工程类决算总额"></td>
+                                    <td><input name="incomeEngineerTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类概算总额"></td>
+                                    <td><input name="incomeEngineerTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类预算总额"></td>
+                                    <td><input type="text" class="number" value="${Utils.format(currentBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类结算总额"></td>
+                                    <td><input name="incomeEngineerFinalTotal" type="text" class="number" value="${Utils.format(finalBean.incomeEngineerFinalTotal,'0')}" required readonly title="工程类决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>收入</td>
                                     <td>服务类</td>
-                                    <td><input name="incomeServiceTaxExclude" type="text" class="number"
-                                               value="${Utils.format(estimateBean.incomeServiceTaxExclude,'0')}"
-                                               required readonly title="服务类概算总额"></td>
-                                    <td><input name="incomeServiceTaxExclude" type="text" class="number"
-                                               value="${Utils.format(budgetBean.incomeServiceTaxExclude,'0')}" required
-                                               readonly title="服务类预算总额"></td>
-                                    <td><input type="text" class="number"
-                                               value="${Utils.format(currentBean.incomeServiceTaxExclude,'0')}" required
-                                               readonly title="服务类结算总额"></td>
-                                    <td><input name="incomeServiceFinalTotal" type="text" class="number"
-                                               value="${Utils.format(finalBean.incomeServiceFinalTotal,'0')}" required
-                                               readonly title="服务类决算总额"></td>
+                                    <td><input name="incomeServiceTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类概算总额"></td>
+                                    <td><input name="incomeServiceTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类预算总额"></td>
+                                    <td><input type="text" class="number" value="${Utils.format(currentBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类结算总额"></td>
+                                    <td><input name="incomeServiceFinalTotal" type="text" class="number" value="${Utils.format(finalBean.incomeServiceFinalTotal,'0')}" required readonly title="服务类决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>合计</td>
                                     <td></td>
-                                    <td><input name="estimateIncomeTotalTaxExclude" type="text" class="number"
-                                               value="${Utils.format(estimateBean.getIncomeTotalTaxExclude(),'0')}"
-                                               readonly required title="此列累计"></td>
-                                    <td><input name="budgetIncomeTotalTaxExclude" type="text" class="number"
-                                               value="${Utils.format(budgetBean.getIncomeTotalTaxExclude(),'0')}"
-                                               readonly required title="此列累计"></td>
-                                    <td><input type="text" class="number"
-                                               value="${Utils.format(currentBean.getIncomeTotalTaxExclude(),'0')}"
-                                               readonly required title="此列累计"></td>
-                                    <td><input name="incomeFinalTotal" type="text" class="number"
-                                               value="${Utils.format(finalBean.getIncomeTotal(),'0')}" readonly required
-                                               title="此列累计"></td>
+                                    <td><input name="estimateIncomeTotalTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.getIncomeTotalTaxExclude(),'0')}" readonly required title="此列累计"></td>
+                                    <td><input name="budgetIncomeTotalTaxExclude" type="text" class="number"  value="${Utils.format(budgetBean.getIncomeTotalTaxExclude(),'0')}" readonly required title="此列累计"></td>
+                                    <td><input type="text" class="number" value="${Utils.format(currentBean.getIncomeTotalTaxExclude(),'0')}" readonly required title="此列累计"></td>
+                                    <td><input name="incomeFinalTotal" type="text" class="number" value="${Utils.format(finalBean.getIncomeTotal(),'0')}" readonly required title="此列累计"></td>
                                 </tr>
                                 </tbody>
                             </table>
@@ -1930,86 +1721,46 @@
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>设备</td>
-                                    <td><input name="costPurchaseDeviceTaxExclude" type="text" class="number"
-                                               value="${Utils.format(estimateBean.costPurchaseDeviceTaxExclude,'0')}"
-                                               readonly required title="购买设备概算总额"></td>
-                                    <td><input name="costPurchaseDeviceTaxExclude" type="text" class="number"
-                                               value="${Utils.format(budgetBean.costPurchaseDeviceTaxExclude,'0')}"
-                                               readonly required title="购买设备预算总额"></td>
-                                    <td><input type="text" class="number"
-                                               value="${Utils.format(currentBean.costPurchaseDeviceTaxExclude,'0')}"
-                                               readonly required title="购买设备结算总额"></td>
-                                    <td><input name="costPurchaseDeviceFinalTotal" type="text" class="number"
-                                               value="${Utils.format(finalBean.costPurchaseDeviceFinalTotal,'0')}"
-                                               readonly required title="购买设备决算总额"></td>
+                                    <td><input name="costPurchaseDeviceTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseDeviceTaxExclude,'0')}" readonly required title="购买设备概算总额"></td>
+                                    <td><input name="costPurchaseDeviceTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseDeviceTaxExclude,'0')}" readonly required title="购买设备预算总额"></td>
+                                    <td><input  type="text" class="number" value="${Utils.format(currentBean.costPurchaseDeviceTaxExclude,'0')}" readonly required title="购买设备结算总额"></td>
+                                    <td><input name="costPurchaseDeviceFinalTotal" type="text" class="number" value="${Utils.format(finalBean.costPurchaseDeviceFinalTotal,'0')}" readonly required title="购买设备决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>施工</td>
-                                    <td><input name="costPurchaseBuildTaxExclude" type="text" class="number"
-                                               value="${Utils.format(estimateBean.costPurchaseBuildTaxExclude,'0')}"
-                                               readonly required title="施工采购成本概算总额"></td>
-                                    <td><input name="costPurchaseBuildTaxExclude" type="text" class="number"
-                                               value="${Utils.format(budgetBean.costPurchaseBuildTaxExclude,'0')}"
-                                               readonly required title="施工采购成本预算总额"></td>
-                                    <td><input type="text" class="number"
-                                               value="${Utils.format(currentBean.costPurchaseBuildTaxExclude,'0')}"
-                                               readonly required title="施工采购成本结算总额"></td>
-                                    <td><input name="costPurchaseBuildFinalTotal" type="text" class="number"
-                                               value="${Utils.format(finalBean.costPurchaseBuildFinalTotal,'0')}"
-                                               required readonly title="施工采购成本决算总额"></td>
+                                    <td><input name="costPurchaseBuildTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseBuildTaxExclude,'0')}" readonly required title="施工采购成本概算总额"></td>
+                                    <td><input name="costPurchaseBuildTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseBuildTaxExclude,'0')}" readonly required title="施工采购成本预算总额"></td>
+                                    <td><input type="text" class="number" value="${Utils.format(currentBean.costPurchaseBuildTaxExclude,'0')}" readonly required title="施工采购成本结算总额"></td>
+                                    <td><input name="costPurchaseBuildFinalTotal" type="text" class="number" value="${Utils.format(finalBean.costPurchaseBuildFinalTotal,'0')}" required readonly title="施工采购成本决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>服务</td>
-                                    <td><input name="costPurchaseServiceTaxExclude" type="text" class="number"
-                                               value="${Utils.format(estimateBean.costPurchaseServiceTaxExclude,'0')}"
-                                               readonly required title="服务采购成本概算总额"></td>
-                                    <td><input name="costPurchaseServiceTaxExclude" type="text" class="number"
-                                               value="${Utils.format(budgetBean.costPurchaseServiceTaxExclude,'0')}"
-                                               readonly required title="服务采购成本预算总额"></td>
-                                    <td><input type="text" class="number"
-                                               value="${Utils.format(currentBean.costPurchaseServiceTaxExclude,'0')}"
-                                               readonly required title="服务采购成本结算总额"></td>
-                                    <td><input name="costPurchaseServiceFinalTotal" type="text" class="number"
-                                               value="${Utils.format(finalBean.costPurchaseServiceFinalTotal,'0')}"
-                                               required readonly title="服务采购成本决算总额"></td>
+                                    <td><input name="costPurchaseServiceTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseServiceTaxExclude,'0')}" readonly required title="服务采购成本概算总额"></td>
+                                    <td><input name="costPurchaseServiceTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseServiceTaxExclude,'0')}" readonly required title="服务采购成本预算总额"></td>
+                                    <td><input type="text" class="number" value="${Utils.format(currentBean.costPurchaseServiceTaxExclude,'0')}" readonly required title="服务采购成本结算总额"></td>
+                                    <td><input name="costPurchaseServiceFinalTotal" type="text" class="number" value="${Utils.format(finalBean.costPurchaseServiceFinalTotal,'0')}" required readonly title="服务采购成本决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>其他</td>
-                                    <td><input name="costPurchaseOtherTaxInclude" type="text" class="number"
-                                               value="${Utils.format(estimateBean.costPurchaseOtherTaxInclude,'0')}"
-                                               readonly required title="其他采购成本概算总额"></td>
-                                    <td><input name="costPurchaseOtherTaxInclude" type="text" class="number"
-                                               value="${Utils.format(budgetBean.costPurchaseOtherTaxInclude,'0')}"
-                                               readonly required title="其他采购成本预算总额"></td>
-                                    <td><input name="costPurchaseOtherSettleTotal"
-                                               value="${Utils.format(currentBean.costPurchaseOtherTaxExclude,'0')}"
-                                               type="text" class="number" readonly required title="其他采购成本结算总额"></td>
-                                    <td><input name="costPurchaseOtherFinalTotal" type="text" class="number"
-                                               value="${Utils.format(finalBean.costPurchaseOtherFinalTotal,'0')}"
-                                               required readonly title="其他采购成本决算总额"></td>
+                                    <td><input name="costPurchaseOtherTaxInclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseOtherTaxInclude,'0')}" readonly required title="其他采购成本概算总额"></td>
+                                    <td><input name="costPurchaseOtherTaxInclude" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseOtherTaxInclude,'0')}" readonly required title="其他采购成本预算总额"></td>
+                                    <td><input name="costPurchaseOtherSettleTotal" value="${Utils.format(currentBean.costPurchaseOtherTaxExclude,'0')}" type="text" class="number" readonly required title="其他采购成本结算总额"></td>
+                                    <td><input name="costPurchaseOtherFinalTotal" type="text" class="number" value="${Utils.format(finalBean.costPurchaseOtherFinalTotal,'0')}" required readonly title="其他采购成本决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
                                     <td>项目管理成本</td>
                                     <td>项目管理成本</td>
-                                    <td><input name="costProjectManageTaxExclude" type="text" class="number"
-                                               value="${Utils.format(estimateBean.costProjectManageTaxExclude,'0')}"
-                                               readonly required title="项目管理成本概算总额"></td>
-                                    <td><input name="costProjectManageTaxExclude" type="text" class="number"
-                                               value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0')}"
-                                               readonly required title="项目管理成本预算总额"></td>
-                                    <td><input name="costProjectManageSettleTotal"
-                                               value="${Utils.format(currentBean.costProjectManageTaxExclude,'0')}"
-                                               type="text" class="number" readonly required title="项目管理成本结算总额"></td>
-                                    <td><input name="costProjectManageFinalTotal" type="text" class="number"
-                                               value="${Utils.format(finalBean.costProjectManageFinalTotal,'0')}"
-                                               required readonly title="项目管理成本决算总额"></td>
+                                    <td><input name="costProjectManageTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costProjectManageTaxExclude,'0')}" readonly required title="项目管理成本概算总额"></td>
+                                    <td><input name="costProjectManageTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0')}" readonly required title="项目管理成本预算总额"></td>
+                                    <td><input name="costProjectManageSettleTotal" value="${Utils.format(currentBean.costProjectManageTaxExclude,'0')}" type="text" class="number" readonly required title="项目管理成本结算总额"></td>
+                                    <td><input name="costProjectManageFinalTotal" type="text" class="number" value="${Utils.format(finalBean.costProjectManageFinalTotal,'0')}" required readonly title="项目管理成本决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>成本</td>
@@ -2024,18 +1775,10 @@
                                     <td>合计</td>
                                     <td></td>
                                     <td></td>
-                                    <td><input name="incomeTotalTaxExclude"
-                                               value="${Utils.format(estimateBean.getCostTotalTaxExclude(),'0')}"
-                                               type="text" class="number" readonly required title="此列累计"></td>
-                                    <td><input name="costTotalTaxExclude"
-                                               value="${Utils.format(budgetBean.getCostTotalTaxExclude(),'0')}"
-                                               type="text" class="number" readonly required title="此列累计"></td>
-                                    <td><input name="costSettleTotal"
-                                               value="${Utils.format(currentBean.getCostTotalTaxExclude(),'0')}"
-                                               type="text" class="number" readonly required title="此列累计"></td>
-                                    <td><input name="costFinalTotal" type="text" class="number"
-                                               value="${Utils.format(finalBean.getCostTotal(),'0')}" readonly required
-                                               title="此列累计"></td>
+                                    <td><input name="incomeTotalTaxExclude" value="${Utils.format(estimateBean.getCostTotalTaxExclude(),'0')}" type="text" class="number" readonly required title="此列累计"></td>
+                                    <td><input name="costTotalTaxExclude" value="${Utils.format(budgetBean.getCostTotalTaxExclude(),'0')}" type="text" class="number" readonly required title="此列累计"></td>
+                                    <td><input name="costSettleTotal" value="${Utils.format(currentBean.getCostTotalTaxExclude(),'0')}" type="text" class="number" readonly required title="此列累计"></td>
+                                    <td><input name="costFinalTotal" type="text" class="number" value="${Utils.format(finalBean.getCostTotal(),'0')}" readonly required title="此列累计"></td>
                                 </tr>
                                 </tbody>
                             </table>
@@ -2053,62 +1796,34 @@
                                 <tr>
                                     <td>财务费用</td>
                                     <td>资金占用成本</td>
-                                    <td><input name="costExpropriationTaxExclude" type="text" class="number"
-                                               value="${Utils.format(estimateBean.costExpropriationTaxExclude,'0')}"
-                                               required readonly title="资金占用成本概算总额"></td>
-                                    <td><input name="costExpropriationTaxExclude" type="text" class="number"
-                                               value="${Utils.format(budgetBean.costExpropriationTaxExclude,'0')}"
-                                               required readonly title="资金占用成本预算总额"></td>
-                                    <td><input type="text" class="number"
-                                               value="${Utils.format(currentBean.costExpropriationTaxExclude,'0')}"
-                                               required readonly title="资金占用成本结算总额"></td>
-                                    <td><input name="costExpropriationFinalTotal" type="text" class="number"
-                                               value="${Utils.format(finalBean.costExpropriationFinalTotal,'0')}"
-                                               required readonly title="资金占用成本决算总额"></td>
+                                    <td><input name="costExpropriationTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本概算总额"></td>
+                                    <td><input name="costExpropriationTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本预算总额"></td>
+                                    <td><input type="text" class="number"  value="${Utils.format(currentBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本结算总额"></td>
+                                    <td><input name="costExpropriationFinalTotal" type="text" class="number" value="${Utils.format(finalBean.costExpropriationFinalTotal,'0')}" required readonly title="资金占用成本决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>公司管理费用</td>
                                     <td></td>
-                                    <td><input name="costCompanyManageTaxExclude" type="text" class="number"
-                                               value="${Utils.format(estimateBean.costCompanyManageTaxExclude,'0')}"
-                                               required readonly title="公司管理费用概算总额"></td>
-                                    <td><input name="costCompanyManageTaxExclude" type="text" class="number"
-                                               value="${Utils.format(budgetBean.costCompanyManageTaxExclude,'0')}"
-                                               required readonly title="公司管理费用预算总额"></td>
-                                    <td><input type="text" class="number"
-                                               value="${Utils.format(currentBean.costCompanyManageTaxExclude,'0')}"
-                                               required readonly title="公司管理费用结算总额"></td>
-                                    <td><input name="costCompanyManageFinalTotal" type="text" class="number"
-                                               value="${Utils.format(finalBean.costCompanyManageFinalTotal,'0')}"
-                                               required readonly title="公司管理费用决算总额"></td>
+                                    <td><input name="costCompanyManageTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costCompanyManageTaxExclude,'0')}" required readonly title="公司管理费用概算总额"></td>
+                                    <td><input name="costCompanyManageTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costCompanyManageTaxExclude,'0')}" required readonly title="公司管理费用预算总额"></td>
+                                    <td><input type="text" class="number" value="${Utils.format(currentBean.costCompanyManageTaxExclude,'0')}" required readonly title="公司管理费用结算总额"></td>
+                                    <td><input name="costCompanyManageFinalTotal" type="text" class="number" value="${Utils.format(finalBean.costCompanyManageFinalTotal,'0')}" required readonly title="公司管理费用决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>所得税费用</td>
                                     <td></td>
                                     <td>/</td>
                                     <td>/</td>
-                                    <td><input name="costIncomeTaxSettleTotal"
-                                               value="${Utils.format(currentBean.costIncomeTax,'0')}" type="text"
-                                               class="number" required readonly title="所得税费用结算总额"></td>
-                                    <td><input name="costIncomeTaxFinalTotal" type="text" class="number"
-                                               value="${Utils.format(finalBean.costIncomeTaxFinalTotal,'0')}" required
-                                               readonly title="所得税费用决算总额"></td>
+                                    <td><input name="costIncomeTaxSettleTotal" value="${Utils.format(currentBean.costIncomeTax,'0')}" type="text" class="number" required readonly title="所得税费用结算总额"></td>
+                                    <td><input name="costIncomeTaxFinalTotal" type="text" class="number" value="${Utils.format(finalBean.costIncomeTaxFinalTotal,'0')}" required readonly title="所得税费用决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>合计</td>
                                     <td></td>
-                                    <td><input name="manageEstimateTotal"
-                                               value="${Utils.format(estimateBean.getCostManageExclude(),'0')}"
-                                               type="text" class="number" readonly required title="此列累计"></td>
-                                    <td><input name="manageBudgetTotal"
-                                               value="${Utils.format(budgetBean.getCostManageExclude(),'0')}"
-                                               type="text" class="number" readonly required title="此列累计"></td>
-                                    <td><input name="manageSettleTotal"
-                                               value="${Utils.format(currentBean.getCostManageTotal(),'0')}" type="text"
-                                               class="number" readonly required title="此列累计"></td>
-                                    <td><input name="manageFinalTotal" type="text" class="number"
-                                               value="${Utils.format(finalBean.getCostManageTotal(),'0')}" readonly
-                                               required title="此列累计"></td>
+                                    <td><input name="manageEstimateTotal" value="${Utils.format(estimateBean.getCostManageExclude(),'0')}" type="text" class="number" readonly required title="此列累计"></td>
+                                    <td><input name="manageBudgetTotal" value="${Utils.format(budgetBean.getCostManageExclude(),'0')}" type="text" class="number" readonly required title="此列累计"></td>
+                                    <td><input name="manageSettleTotal" value="${Utils.format(currentBean.getCostManageTotal(),'0')}" type="text" class="number" readonly required title="此列累计"></td>
+                                    <td><input name="manageFinalTotal" type="text" class="number" value="${Utils.format(finalBean.getCostManageTotal(),'0')}" readonly required title="此列累计"></td>
                                 </tr>
                                 </tbody>
                             </table>
@@ -2126,55 +1841,27 @@
                                 </tr>
                                 <tr>
                                     <td>项目毛利</td>
-                                    <td><input name="projectGrossProfit" type="text" class="number"
-                                               value="${Utils.format(estimateBean.getProjectGrossProfit(),'0')}"
-                                               readonly required title="项目毛利概算总额"></td>
-                                    <td><input name="projectGrossProfit" type="text" class="number"
-                                               value="${Utils.format(budgetBean.getProjectGrossProfit(),'0')}" readonly
-                                               required title="项目毛利预算总额"></td>
-                                    <td><input name="grossProfitSettleTotal" type="text" class="number"
-                                               value="${Utils.format(finalBean.grossProfitSettleTotal,'0')}" readonly
-                                               required title="项目毛利结算总额"></td>
-                                    <td><input name="grossProfitFinalTotal" type="text" class="number"
-                                               value="${Utils.format(finalBean.grossProfitFinalTotal,'0')}" required
-                                               readonly title="项目毛利决算总额"></td>
-                                    <td><input name="grossProfitProfitMargin" type="text" class="number"
-                                               value="${Utils.format(finalBean.grossProfitProfitMargin,'0')}" required
-                                               readonly title="项目毛利利润率"></td>
+                                    <td><input name="projectGrossProfit" type="text" class="number" value="${Utils.format(estimateBean.getProjectGrossProfit(),'0')}" readonly required title="项目毛利概算总额"></td>
+                                    <td><input name="projectGrossProfit" type="text" class="number" value="${Utils.format(budgetBean.getProjectGrossProfit(),'0')}" readonly required title="项目毛利预算总额"></td>
+                                    <td><input name="grossProfitSettleTotal" type="text" class="number" value="${Utils.format(finalBean.grossProfitSettleTotal,'0')}" readonly required title="项目毛利结算总额"></td>
+                                    <td><input name="grossProfitFinalTotal" type="text" class="number" value="${Utils.format(finalBean.grossProfitFinalTotal,'0')}" required readonly title="项目毛利决算总额"></td>
+                                    <td><input name="grossProfitProfitMargin" type="text" class="number" value="${Utils.format(finalBean.grossProfitProfitMargin,'0')}" required readonly title="项目毛利利润率"></td>
                                 </tr>
                                 <tr>
                                     <td>项目贡献利润</td>
-                                    <td><input name="projectContributionProfit" type="text" class="number"
-                                               value="${Utils.format(estimateBean.getProjectContributionProfit(),'0')}"
-                                               readonly required title="项目贡献利润概算总额"></td>
-                                    <td><input name="projectContributionProfit" type="text" class="number"
-                                               value="${Utils.format(budgetBean.getProjectContributionProfit(),'0')}"
-                                               readonly required title="项目贡献利润预算总额"></td>
-                                    <td><input name="contributionMarginSettleTotal" type="text" class="number"
-                                               value="${Utils.format(currentBean.contributionProfit,'0')}" readonly
-                                               required title="项目贡献利润结算总额"></td>
-                                    <td><input name="contributionMarginFinalTotal" type="text" class="number"
-                                               value="${Utils.format(finalBean.contributionMarginFinalTotal,'0')}"
-                                               required readonly title="项目贡献利润决算总额"></td>
-                                    <td><input name="contributionMarginProfitMargin" type="text" class="number"
-                                               value="${Utils.format(finalBean.contributionMarginProfitMargin,'0')}"
-                                               required readonly title="项目贡献利润利润率"></td>
+                                    <td><input name="projectContributionProfit" type="text" class="number" value="${Utils.format(estimateBean.getProjectContributionProfit(),'0')}" readonly required title="项目贡献利润概算总额"></td>
+                                    <td><input name="projectContributionProfit" type="text" class="number" value="${Utils.format(budgetBean.getProjectContributionProfit(),'0')}" readonly required title="项目贡献利润预算总额"></td>
+                                    <td><input name="contributionMarginSettleTotal" type="text" class="number" value="${Utils.format(currentBean.contributionProfit,'0')}" readonly required title="项目贡献利润结算总额"></td>
+                                    <td><input name="contributionMarginFinalTotal" type="text" class="number" value="${Utils.format(finalBean.contributionMarginFinalTotal,'0')}" required readonly title="项目贡献利润决算总额"></td>
+                                    <td><input name="contributionMarginProfitMargin" type="text" class="number" value="${Utils.format(finalBean.contributionMarginProfitMargin,'0')}" required readonly title="项目贡献利润利润率"></td>
                                 </tr>
                                 <tr>
                                     <td>项目净利润</td>
                                     <td>/</td>
-                                    <td><#--<input name="netMarginBudgetTotal" type="text" class="number" value="${Utils.format(finalBean.netMarginBudgetTotal,'0')}" readonly required title="项目净利润预算总额">-->
-                                        /
-                                    </td>
-                                    <td><input name="netMarginSettleTotal" type="text" class="number"
-                                               value="${Utils.format(currentBean.netProfit,'0')}" readonly required
-                                               title="项目净利润结算总额"></td>
-                                    <td><input name="netMarginFinalTotal" type="text" class="number"
-                                               value="${Utils.format(finalBean.netMarginFinalTotal,'0')}" required
-                                               readonly title="项目净利润决算总额"></td>
-                                    <td><input name="netMarginProfitMargin" type="text" class="number"
-                                               value="${Utils.format(finalBean.netMarginProfitMargin,'0')}" required
-                                               readonly title="项目净利润利润率"></td>
+                                    <td><#--<input name="netMarginBudgetTotal" type="text" class="number" value="${Utils.format(finalBean.netMarginBudgetTotal,'0')}" readonly required title="项目净利润预算总额">-->/</td>
+                                    <td><input name="netMarginSettleTotal" type="text" class="number" value="${Utils.format(currentBean.netProfit,'0')}" readonly required title="项目净利润结算总额"></td>
+                                    <td><input name="netMarginFinalTotal" type="text" class="number" value="${Utils.format(finalBean.netMarginFinalTotal,'0')}" required readonly title="项目净利润决算总额"></td>
+                                    <td><input name="netMarginProfitMargin" type="text" class="number" value="${Utils.format(finalBean.netMarginProfitMargin,'0')}" required readonly title="项目净利润利润率"></td>
                                 </tr>
                                 </tbody>
                             </table>
@@ -2190,161 +1877,87 @@
                                 </tr>
                                 <tr>
                                     <td>销售商品、提供劳务收到的现金</td>
-                                    <td><input name="budgetSaleIncomeCash" type="text" class="number"
-                                               value="${Utils.format(cashFlowBean.saleIncomeCash,'0')}" readonly
-                                               required title="预算总额"></td>
-                                    <td><input type="text" class="number"
-                                               value="${Utils.format(currentBean.saleIncomeCash,'0')}" readonly required
-                                               title="结算总额"></td>
-                                    <td><input name="saleIncomeCash" type="text" class="number"
-                                               value="${Utils.format(finalBean.saleIncomeCash,'0')}" readonly required
-                                               title="决算总额"></td>
+                                    <td><input name="budgetSaleIncomeCash" type="text" class="number" value="${Utils.format(cashFlowBean.saleIncomeCash,'0')}" readonly required title="预算总额"></td>
+                                    <td><input type="text" class="number" value="${Utils.format(currentBean.saleIncomeCash,'0')}" readonly required title="结算总额"></td>
+                                    <td><input name="saleIncomeCash" type="text" class="number" value="${Utils.format(finalBean.saleIncomeCash,'0')}" readonly required title="决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>收到的税费返还</td>
                                     <td>/</td>
-                                    <td><input type="text" class="number"
-                                               value="${Utils.format(currentBean.taxReturn,'0')}" readonly required
-                                               title="结算总额"></td>
-                                    <td><input name="taxReturn" type="text" class="number"
-                                               value="${Utils.format(finalBean.taxReturn,'0')}" readonly required
-                                               title="决算总额"></td>
+                                    <td><input type="text" class="number" value="${Utils.format(currentBean.taxReturn,'0')}" readonly required title="结算总额"></td>
+                                    <td><input name="taxReturn" type="text" class="number" value="${Utils.format(finalBean.taxReturn,'0')}" readonly required title="决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>收到其他与经营活动有关的现金</td>
-                                    <td><input name="budgetEarnestMoneyIncome" type="text" class="number"
-                                               value="${Utils.format(cashFlowBean.earnestMoneyIncome,'0')}" readonly
-                                               required title="预算总额"></td>
-                                    <td><input type="text" class="number"
-                                               value="${Utils.format(currentBean.earnestMoneyIncome,'0')}" readonly
-                                               required title="结算总额"></td>
-                                    <td><input name="earnestMoneyIncome" type="text" class="number"
-                                               value="${Utils.format(finalBean.earnestMoneyIncome,'0')}" readonly
-                                               required title="决算总额"></td>
+                                    <td><input name="budgetEarnestMoneyIncome" type="text" class="number" value="${Utils.format(cashFlowBean.earnestMoneyIncome,'0')}" readonly required title="预算总额"></td>
+                                    <td><input type="text" class="number" value="${Utils.format(currentBean.earnestMoneyIncome,'0')}" readonly required title="结算总额"></td>
+                                    <td><input name="earnestMoneyIncome" type="text" class="number" value="${Utils.format(finalBean.earnestMoneyIncome,'0')}" readonly required title="决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>购买商品、接受劳务支付的现金</td>
-                                    <td><input name="budgetPurchaseCost" type="text" class="number"
-                                               value="${Utils.format(cashFlowBean.purchaseCost,'0')}" readonly required
-                                               title="预算总额"></td>
-                                    <td><input type="text" class="number"
-                                               value="${Utils.format(currentBean.purchaseCost,'0')}" readonly required
-                                               title="结算总额"></td>
-                                    <td><input name="purchaseCost" type="text" class="number"
-                                               value="${Utils.format(finalBean.purchaseCost,'0')}" readonly required
-                                               title="决算总额"></td>
+                                    <td><input name="budgetPurchaseCost" type="text" class="number" value="${Utils.format(cashFlowBean.purchaseCost,'0')}" readonly required title="预算总额"></td>
+                                    <td><input type="text" class="number" value="${Utils.format(currentBean.purchaseCost,'0')}" readonly required title="结算总额"></td>
+                                    <td><input name="purchaseCost" type="text" class="number" value="${Utils.format(finalBean.purchaseCost,'0')}" readonly required title="决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>支付的各项税费</td>
                                     <td>/</td>
-                                    <td><input type="text" class="number"
-                                               value="${Utils.format(currentBean.taxCost,'0')}" readonly required
-                                               title="结算总额"></td>
-                                    <td><input name="taxCost" type="text" class="number"
-                                               value="${Utils.format(finalBean.taxCost,'0')}" readonly required
-                                               title="决算总额"></td>
+                                    <td><input type="text" class="number" value="${Utils.format(currentBean.taxCost,'0')}" readonly required title="结算总额"></td>
+                                    <td><input name="taxCost" type="text" class="number" value="${Utils.format(finalBean.taxCost,'0')}" readonly required title="决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>支付其他与经营活动有关的现金</td>
-                                    <td><input name="budgetEarnestMoneyCost" type="text" class="number"
-                                               value="${Utils.format(cashFlowBean.earnestMoneyCost,'0')}" readonly
-                                               required title="预算总额"></td>
-                                    <td><input type="text" class="number"
-                                               value="${Utils.format(currentBean.earnestMoneyCost,'0')}" readonly
-                                               required title="结算总额"></td>
-                                    <td><input name="earnestMoneyCost" type="text" class="number"
-                                               value="${Utils.format(finalBean.earnestMoneyCost,'0')}" readonly required
-                                               title="决算总额"></td>
+                                    <td><input name="budgetEarnestMoneyCost" type="text" class="number" value="${Utils.format(cashFlowBean.earnestMoneyCost,'0')}" readonly required title="预算总额"></td>
+                                    <td><input type="text" class="number" value="${Utils.format(currentBean.earnestMoneyCost,'0')}" readonly required title="结算总额"></td>
+                                    <td><input name="earnestMoneyCost" type="text" class="number" value="${Utils.format(finalBean.earnestMoneyCost,'0')}" readonly required title="决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>经营活动产生的现金流量净额</td>
-                                    <td><input name="budgetNetCashFlow" type="text" class="number"
-                                               value="${Utils.format(cashFlowBean.getNetCashFlow(),'0')}" readonly
-                                               required title="预算总额"></td>
-                                    <td><input type="text" class="number"
-                                               value="${Utils.format(currentBean.netCashFlow,'0')}" readonly required
-                                               title="结算总额"></td>
-                                    <td><input name="netCashFlow" type="text" class="number"
-                                               value="${Utils.format(finalBean.netCashFlow,'0')}" readonly required
-                                               title="决算总额"></td>
+                                    <td><input name="budgetNetCashFlow" type="text" class="number" value="${Utils.format(cashFlowBean.getNetCashFlow(),'0')}" readonly required title="预算总额"></td>
+                                    <td><input type="text" class="number" value="${Utils.format(currentBean.netCashFlow,'0')}" readonly required title="结算总额"></td>
+                                    <td><input name="netCashFlow" type="text" class="number" value="${Utils.format(finalBean.netCashFlow,'0')}" readonly required title="决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>投资活动现金流入</td>
                                     <td>/</td>
-                                    <td><input type="text" class="number"
-                                               value="${Utils.format(currentBean.cashInflowFromInvestingActivities,'0')}"
-                                               readonly required title="结算总额"></td>
-                                    <td><input name="cashInflowFromInvestingActivities"
-                                               value="${Utils.format(finalBean.cashInflowFromInvestingActivities,'0')}"
-                                               type="text" class="number" readonly required title="决算总额"></td>
+                                    <td><input type="text" class="number" value="${Utils.format(currentBean.cashInflowFromInvestingActivities,'0')}" readonly required title="结算总额"></td>
+                                    <td><input name="cashInflowFromInvestingActivities" value="${Utils.format(finalBean.cashInflowFromInvestingActivities,'0')}" type="text" class="number" readonly required title="决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>投资活动现金流出</td>
                                     <td>/</td>
-                                    <td><input type="text" class="number"
-                                               value="${Utils.format(currentBean.cashOutflowFromInvestingActivities,'0')}"
-                                               readonly required title="结算总额"></td>
-                                    <td><input name="cashOutflowFromInvestingActivities" type="text" class="number"
-                                               value="${Utils.format(finalBean.cashOutflowFromInvestingActivities,'0')}"
-                                               readonly required title="决算总额"></td>
+                                    <td><input type="text" class="number" value="${Utils.format(currentBean.cashOutflowFromInvestingActivities,'0')}" readonly required title="结算总额"></td>
+                                    <td><input name="cashOutflowFromInvestingActivities" type="text" class="number" value="${Utils.format(finalBean.cashOutflowFromInvestingActivities,'0')}" readonly required title="决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>投资活动产生的现金流量净额</td>
                                     <td>/</td>
-                                    <td><input type="text" class="number"
-                                               value="${Utils.format(currentBean.netCashFromInvestingActivities,'0')}"
-                                               readonly required title="结算总额"></td>
-                                    <td><input name="netCashFromInvestingActivities" type="text" class="number"
-                                               value="${Utils.format(finalBean.netCashFromInvestingActivities,'0')}"
-                                               readonly required title="决算总额"></td>
+                                    <td><input type="text" class="number" value="${Utils.format(currentBean.netCashFromInvestingActivities,'0')}" readonly required title="结算总额"></td>
+                                    <td><input name="netCashFromInvestingActivities" type="text" class="number" value="${Utils.format(finalBean.netCashFromInvestingActivities,'0')}" readonly required title="决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>融资资金流入</td>
-                                    <td><input name="budgetFinancingCapitalInflow" type="text" class="number"
-                                               value="${Utils.format(cashFlowBean.financingCapitalInflow,'0')}" readonly
-                                               required title="预算总额"></td>
-                                    <td><input type="text" class="number"
-                                               value="${Utils.format(currentBean.financingCapitalInflow,'0')}" readonly
-                                               required title="结算总额"></td>
-                                    <td><input name="financingCapitalInflow" type="text" class="number"
-                                               value="${Utils.format(finalBean.financingCapitalInflow,'0')}" required
-                                               readonly title="决算总额"></td>
+                                    <td><input name="budgetFinancingCapitalInflow" type="text" class="number" value="${Utils.format(cashFlowBean.financingCapitalInflow,'0')}" readonly required title="预算总额"></td>
+                                    <td><input type="text" class="number" value="${Utils.format(currentBean.financingCapitalInflow,'0')}" readonly required title="结算总额"></td>
+                                    <td><input name="financingCapitalInflow" type="text" class="number" value="${Utils.format(finalBean.financingCapitalInflow,'0')}" required readonly title="决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>还款资金流出</td>
-                                    <td><input name="budgetFinancingCapitalOutflow" type="text" class="number"
-                                               value="${Utils.format(cashFlowBean.financingCapitalOutflow,'0')}"
-                                               readonly required title="预算总额"></td>
-                                    <td><input type="text" class="number"
-                                               value="${Utils.format(currentBean.financingCapitalOutflow,'0')}" readonly
-                                               required title="结算总额"></td>
-                                    <td><input name="financingCapitalOutflow" type="text" class="number"
-                                               value="${Utils.format(finalBean.financingCapitalOutflow,'0')}" required
-                                               readonly title="决算总额"></td>
+                                    <td><input name="budgetFinancingCapitalOutflow" type="text" class="number" value="${Utils.format(cashFlowBean.financingCapitalOutflow,'0')}" readonly required title="预算总额"></td>
+                                    <td><input type="text" class="number" value="${Utils.format(currentBean.financingCapitalOutflow,'0')}" readonly required title="结算总额"></td>
+                                    <td><input name="financingCapitalOutflow" type="text" class="number" value="${Utils.format(finalBean.financingCapitalOutflow,'0')}" required readonly title="决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>筹资活动产生的现金流量净额</td>
-                                    <td><input name="budgetFinancingCapitalCashflow" type="text" class="number"
-                                               value="${Utils.format(cashFlowBean.getFinancingCapitalCashflow(),'0')}"
-                                               readonly required title="预算总额"></td>
-                                    <td><input type="text" class="number"
-                                               value="${Utils.format(currentBean.financingCapitalCashflow,'0')}"
-                                               readonly required title="结算总额"></td>
-                                    <td><input name="financingCapitalCashflow" type="text" class="number"
-                                               value="${Utils.format(finalBean.financingCapitalCashflow,'0')}" required
-                                               readonly title="决算总额"></td>
+                                    <td><input name="budgetFinancingCapitalCashflow" type="text" class="number" value="${Utils.format(cashFlowBean.getFinancingCapitalCashflow(),'0')}" readonly required title="预算总额"></td>
+                                    <td><input type="text" class="number" value="${Utils.format(currentBean.financingCapitalCashflow,'0')}" readonly required title="结算总额"></td>
+                                    <td><input name="financingCapitalCashflow" type="text" class="number" value="${Utils.format(finalBean.financingCapitalCashflow,'0')}" required readonly title="决算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>货币资金净增加额</td>
-                                    <td><input name="budgetNetIncreaseMonetaryFunds" type="text" class="number"
-                                               value="${Utils.format(cashFlowBean.getNetIncreaseMonetaryFunds(),'0')}"
-                                               readonly required title="预算总额"></td>
-                                    <td><input name="type14SettleTotal" type="text" class="number"
-                                               value="${Utils.format(currentBean.netIncreaseMonetaryFunds,'0')}"
-                                               readonly required title="结算总额"></td>
-                                    <td><input name="netIncreaseMonetaryFunds" type="text" class="number"
-                                               value="${Utils.format(finalBean.netIncreaseMonetaryFunds,'0')}" required
-                                               readonly title="决算总额"></td>
+                                    <td><input name="budgetNetIncreaseMonetaryFunds" type="text" class="number" value="${Utils.format(cashFlowBean.getNetIncreaseMonetaryFunds(),'0')}" readonly required title="预算总额"></td>
+                                    <td><input name="type14SettleTotal" type="text" class="number" value="${Utils.format(currentBean.netIncreaseMonetaryFunds,'0')}" readonly required title="结算总额"></td>
+                                    <td><input name="netIncreaseMonetaryFunds" type="text" class="number" value="${Utils.format(finalBean.netIncreaseMonetaryFunds,'0')}" required readonly title="决算总额"></td>
                                 </tr>
                                 <#--<tr>
                                     <td>合计</td>
@@ -2366,8 +1979,7 @@
 
                                         <#list taskRecords as node>
                                             <li class="time-axis-item">
-                                                <div class="time-axis-date"
-                                                     style="margin-left: -96px">  ${node.createTime}
+                                                <div class="time-axis-date" style="margin-left: -96px">  ${node.createTime}
                                                     <span></span>
                                                 </div>
                                                 <div class="time-axis-title"> ${node.roleName}-${node.assigneeName}:
@@ -2391,6 +2003,470 @@
 
                 </div>
 
+
+                <#--收入明细表弹窗-->
+                <div class="am-modal am-modal-prompt" style="width: 1200px;max-height:600px;overflow-y:auto;"
+                     tabindex="-1" id="my-prompt-income-detail">
+                    <div class="am-modal-dialog">
+                        <div class="am-modal-hd">销售收入明细表——${project.name}</div>
+                        <div class="am-modal-bd">
+                            <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;"
+                                   id="incomeTable">
+                                <tbody>
+                                <tr>
+                                    <td>类别</td>
+                                    <td>名称</td>
+                                    <td>单位</td>
+                                    <td>数量</td>
+                                    <td>单价</td>
+                                    <td>税率（%）</td>
+                                    <td>含税总金额（元）</td>
+                                    <td>不含税金额（元）</td>
+                                    <#--<td>操作</td>-->
+                                </tr>
+
+                                <#if incomeDetails??>
+                                    <#list incomeDetails as incomeDetail>
+                                        <tr>
+                                            <td>
+                                                <#--<select style="width: auto" readonly
+                                                        class="am-modal-prompt-input am-modal-prompt-input-income">
+                                                    <option value="1" <#if incomeDetail.type == 1>selected</#if>>设备类
+                                                    </option>
+                                                    <option value="2" <#if incomeDetail.type == 2>selected</#if>>工程类
+                                                    </option>
+                                                    <option value="3" <#if incomeDetail.type == 3>selected</#if>>服务类
+                                                    </option>
+                                                </select>-->
+                                                <#if incomeDetail.type ==1 >
+                                                    设备类
+                                                <#elseif incomeDetail.type  ==2>
+                                                    工程类
+                                                <#elseif incomeDetail.type  ==3>
+                                                    服务类
+                                                </#if>
+                                            </td>
+                                            <td><input type="text" readonly
+                                                       class="am-modal-prompt-input am-modal-prompt-input-income"
+                                                       value="${incomeDetail.name!}"></td>
+                                            <td><input type="text" readonly
+                                                       class="am-modal-prompt-input am-modal-prompt-input-income"
+                                                       value="${incomeDetail.unit!}"></td>
+                                            <td><input type="text" readonly
+                                                       class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-amount"
+                                                       value="${incomeDetail.amount!0}"></td>
+                                            <td><input type="text" readonly
+                                                       class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-price"
+                                                       value="${Utils.format2(incomeDetail.price,'0')}"></td>
+                                            <td><input type="text" readonly
+                                                       class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-tax-rate"
+                                                       value="${Utils.format(incomeDetail.taxRate,'0')}"></td>
+                                            <td><input type="text"
+                                                       class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-tax-include"
+                                                       value="${Utils.format(incomeDetail.totalTaxInclude,'0')}"
+                                                       readonly></td>
+                                            <td><input type="text"
+                                                       class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-tax-exclude"
+                                                       value="${Utils.format(incomeDetail.totalTaxExclude,'0')}"
+                                                       readonly></td>
+                                            <#--<td>
+                                                <button type="button"
+                                                        class="am-btn am-btn-warning am-btn-xs am-round am-modal-line-delete">
+                                                    <span class="am-icon-minus"></span></button>
+                                            </td>-->
+                                        </tr>
+                                    </#list>
+                                </#if>
+
+                                </tbody>
+                            </table>
+                            <#--<button type="button" id="incomeAddBtn" class="am-btn am-btn-primary am-btn-xs am-round">
+                                <span class="am-icon-plus"></span></button>-->
+                        </div>
+                        <div class="am-modal-footer">
+                            <span class="am-modal-btn" data-am-modal-cancel>取消</span>
+                            <#--<span class="am-modal-btn" data-am-modal-confirm>保存</span>-->
+                        </div>
+                    </div>
+                </div>
+                <#--采购成本明细弹窗-->
+                <div class="am-modal am-modal-prompt" style="width: 1200px;max-height:600px;overflow-y:auto;"
+                     tabindex="-1" id="my-prompt-cost-detail">
+                    <div class="am-modal-dialog">
+                        <div class="am-modal-hd">采购成本明细表——${project.name}</div>
+                        <div class="am-modal-bd">
+                            <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;"
+                                   id="costTable">
+                                <tbody>
+                                <tr>
+                                    <td>大类</td>
+                                    <td>类别</td>
+                                    <td>名称</td>
+                                    <td>单位</td>
+                                    <td>数量</td>
+                                    <td>单价</td>
+                                    <td>税率（%）</td>
+                                    <td>含税总金额（元）</td>
+                                    <td>不含税金额（元）</td>
+                                    <#--<td>操作</td>-->
+                                </tr>
+
+                                <#if costDetails??>
+                                    <#list costDetails as costDetail>
+                                        <tr>
+                                            <td>
+                                                <#--<select style="width: auto" readonly
+                                                        class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-type">
+                                                    <option value="1" <#if costDetail.type == 1>selected</#if>>设备
+                                                    </option>
+                                                    <option value="2" <#if costDetail.type == 2>selected</#if>>施工
+                                                    </option>
+                                                    <option value="3" <#if costDetail.type == 3>selected</#if>>服务
+                                                    </option>
+                                                    <option value="4" <#if costDetail.type == 4>selected</#if>>其他
+                                                    </option>
+                                                </select>-->
+                                                <#if costDetail.type ==1 >
+                                                    设备
+                                                <#elseif costDetail.type  ==2>
+                                                    施工
+                                                <#elseif costDetail.type  ==3>
+                                                    服务
+                                                <#elseif costDetail.type  ==4>
+                                                    其他
+                                                </#if>
+                                            </td>
+                                            <td>
+                                                <#list procurementTypes as procurementType>
+                                                    <#if costDetail.category == procurementType.id>${procurementType.name}</#if>
+                                                </#list>
+                                            </td>
+                                            <td><input type="text" readonly
+                                                       class="am-modal-prompt-input am-modal-prompt-input-cost"
+                                                       value="${costDetail.name!}"></td>
+                                            <td><input type="text" readonly
+                                                       class="am-modal-prompt-input am-modal-prompt-input-cost"
+                                                       value="${costDetail.unit!}"></td>
+                                            <td><input type="text" readonly
+                                                       class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-amount"
+                                                       value="${costDetail.amount!0}"></td>
+                                            <td><input type="text" readonly
+                                                       class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-price"
+                                                       value="${Utils.format2(costDetail.price,'0')}"></td>
+                                            <td><input type="text" min="0.00" max="99.99" step="0.01" readonly
+                                                       class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-tax-rate"
+                                                       value="${Utils.format(costDetail.taxRate,'0')}"></td>
+                                            <td><input type="text"
+                                                       class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-tax-include"
+                                                       value="${Utils.format(costDetail.totalTaxInclude,'0')}" readonly>
+                                            </td>
+                                            <td><input type="text"
+                                                       class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-tax-exclude"
+                                                       value="${Utils.format(costDetail.totalTaxExclude,'0')}" readonly>
+                                            </td>
+                                            <td>
+                                                <#-- <button type="button"
+                                                         class="am-btn am-btn-warning am-btn-xs am-round am-modal-line-delete">
+                                                     <span class="am-icon-minus"></span></button>-->
+                                            </td>
+                                        </tr>
+                                    </#list>
+                                </#if>
+
+                                </tbody>
+                            </table>
+                            <#--<button type="button" id="costAddBtn" class="am-btn am-btn-primary am-btn-xs am-round"><span
+                                        class="am-icon-plus"></span></button>-->
+                        </div>
+                        <div class="am-modal-footer">
+                            <span class="am-modal-btn" data-am-modal-cancel>取消</span>
+                            <#--<span class="am-modal-btn" data-am-modal-confirm>保存</span>-->
+                        </div>
+                    </div>
+                </div>
+                <#--项目管理明细表弹窗-->
+                <div class="am-modal am-modal-prompt" style="width: 1200px;max-height:600px;overflow-y:auto;"
+                     tabindex="-1" id="my-prompt-cost-project-manage-detail">
+                    <div class="am-modal-dialog">
+                        <div class="am-modal-hd">项目管理成本明细表——${project.name}</div>
+                        <div class="am-modal-bd">
+                            <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;"
+                                   id="costProjectManageTable">
+                                <tbody>
+                                <tr>
+                                    <td>财务费用类别</td>
+                                    <td>业务项目</td>
+                                    <td>项目明细</td>
+                                    <td>单位</td>
+                                    <td>数量</td>
+                                    <td>单价</td>
+                                    <td>总金额（元）</td>
+                                    <td>预估计算方法</td>
+                                    <td>预估依据</td>
+                                    <td>备注</td>
+                                    <#--<td>操作</td>-->
+                                </tr>
+
+                                <#if costProjectManageDetails??>
+                                    <#list costProjectManageDetails as costProjectManageDetail>
+                                        <tr>
+                                            <td>
+                                                <#--<select style="width: auto"
+                                                        class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
+                                                        <#if costProjectManageDetail.deletable==0>readonly</#if>>
+                                                    <option value="1"
+                                                            <#if costProjectManageDetail.type == 1>selected</#if>>人工成本
+                                                    </option>
+                                                    <option value="2"
+                                                            <#if costProjectManageDetail.type == 2>selected</#if>>业务费用
+                                                    </option>
+                                                    <option value="3"
+                                                            <#if costProjectManageDetail.type == 3>selected</#if>>其他费用
+                                                    </option>
+                                                </select>-->
+                                                <#if costProjectManageDetail.type ==1 >
+                                                    人工成本
+                                                <#elseif costProjectManageDetail.type  ==2>
+                                                    业务费用
+                                                <#elseif costProjectManageDetail.type  ==3>
+                                                    其他费用
+                                                </#if>
+                                            </td>
+                                            <td><input type="text"
+                                                       class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
+                                                       value="${costProjectManageDetail.name!}" readonly
+                                                        <#--<#if costProjectManageDetail.deletable==0>readonly</#if>-->></td>
+                                            <td><input type="text" readonly
+                                                       class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
+                                                       value="${costProjectManageDetail.detail!}"></td>
+                                            <td><input type="text" readonly
+                                                       class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
+                                                       value="${costProjectManageDetail.unit!}"></td>
+                                            <td><input type="text" readonly
+                                                       class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-amount-project-manage"
+                                                       value="${costProjectManageDetail.amount!0}"></td>
+                                            <td><input type="text" readonly
+                                                       class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-price-project-manage"
+                                                       value="${Utils.format2(costProjectManageDetail.price,'0')}"></td>
+                                            <td><input type="text"
+                                                       class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-total-project-manage"
+                                                       value="${Utils.format(costProjectManageDetail.total,'0')}"
+                                                       readonly></td>
+                                            <td><input type="text" readonly
+                                                       class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
+                                                       value="${costProjectManageDetail.predictMethod!}"></td>
+                                            <td><input type="text" readonly
+                                                       class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
+                                                       value="${costProjectManageDetail.predictWhy!}"></td>
+                                            <td><input type="text" readonly
+                                                       class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
+                                                       value="${costProjectManageDetail.remark!}"></td>
+                                            <#--<td><#if costProjectManageDetail.deletable==1>
+                                                    <button type="button"
+                                                            class="am-btn am-btn-warning am-btn-xs am-round am-modal-line-delete">
+                                                        <span class="am-icon-minus"></span></button></#if>
+                                                <input type="hidden"
+                                                       class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
+                                                       value="${costProjectManageDetail.deletable!}">
+                                            </td>-->
+                                        </tr>
+                                    </#list>
+                                </#if>
+
+                                </tbody>
+                            </table>
+                            <#--<button type="button" id="costProjectManageAddBtn"
+                                    class="am-btn am-btn-primary am-btn-xs am-round"><span class="am-icon-plus"></span>
+                            </button>-->
+                        </div>
+                        <div class="am-modal-footer">
+                            <span class="am-modal-btn" data-am-modal-cancel>取消</span>
+                            <#--<span class="am-modal-btn" data-am-modal-confirm>保存</span>-->
+                        </div>
+                    </div>
+                </div>
+                <#--资金计划明细表弹窗-->
+                <div class="am-modal am-modal-prompt" style="width: 1200px;max-height:600px;overflow-y:auto;"
+                     tabindex="-1" id="my-prompt-budget-plan-detail">
+                    <div class="am-modal-dialog">
+                        <div class="am-modal-hd">资金计划明细表——${project.name}</div>
+                        <div class="am-modal-bd">
+                            <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;"
+                                   id="budgetPlanDetailTable">
+                                <tbody>
+                                <tr>
+                                    <td>月份</td>
+                                    <td>设备支出</td>
+                                    <td>工程支出（含服务+施工+其他）</td>
+                                    <td>经营性开支</td>
+                                    <td>保证金支出</td>
+                                    <td>支出合计</td>
+                                    <td>销售收款</td>
+                                    <td>保证金收款</td>
+                                    <td>收款合计</td>
+                                    <td>资金余额</td>
+                                    <td>资金利息</td>
+                                    <td>垫资计划</td>
+                                    <td>还款计划</td>
+                                    <#-- <td>操作</td>-->
+                                </tr>
+                                <tr>
+                                    <td><#--<input type="text" class="am-modal-prompt-input input-total-month-budget-plan"
+                                               value="${projectBudgetPlanDetailTotal.month}" readonly/>-->${projectBudgetPlanDetailTotal.month}</td>
+                                    <td><input type="text"
+                                               class="am-modal-prompt-input input-total-device-cost-budget-plan"
+                                               value="${Utils.format(projectBudgetPlanDetailTotal.deviceCost)}"
+                                               readonly/></td>
+                                    <td><input type="text"
+                                               class="am-modal-prompt-input input-total-engineer-cost-budget-plan"
+                                               value="${Utils.format(projectBudgetPlanDetailTotal.engineerCost)}"
+                                               readonly/></td>
+                                    <td><input type="text"
+                                               class="am-modal-prompt-input input-total-project-manage-cost-budget-plan"
+                                               value="${Utils.format(projectBudgetPlanDetailTotal.projectManageCost)}"
+                                               readonly/></td>
+                                    <td><input type="text"
+                                               class="am-modal-prompt-input input-total-earnest-money-cost-budget-plan"
+                                               value="${Utils.format(projectBudgetPlanDetailTotal.earnestMoneyCost)}"
+                                               readonly/></td>
+                                    <td><input type="text"
+                                               class="am-modal-prompt-input input-total-total-cost-budget-plan"
+                                               value="${Utils.format(projectBudgetPlanDetailTotal.totalCost)}"
+                                               readonly/></td>
+                                    <td><input type="text"
+                                               class="am-modal-prompt-input input-total-sale-income-budget-plan"
+                                               value="${Utils.format(projectBudgetPlanDetailTotal.saleIncome)}"
+                                               readonly/></td>
+                                    <td><input type="text"
+                                               class="am-modal-prompt-input input-total-earnest-money-income-budget-plan"
+                                               value="${Utils.format(projectBudgetPlanDetailTotal.earnestMoneyIncome)}"
+                                               readonly/></td>
+                                    <td><input type="text"
+                                               class="am-modal-prompt-input input-total-total-income-budget-plan"
+                                               value="${Utils.format(projectBudgetPlanDetailTotal.totalIncome)}"
+                                               readonly/></td>
+                                    <td><input type="text"
+                                               class="am-modal-prompt-input input-total-fund-balance-budget-plan"
+                                               value="${Utils.format(projectBudgetPlanDetailTotal.fundBalance)}"
+                                               readonly/></td>
+                                    <td><input type="text"
+                                               class="am-modal-prompt-input input-total-capital-interest-budget-plan"
+                                               value="${Utils.format(projectBudgetPlanDetailTotal.capitalInterest)}"
+                                               readonly/></td>
+                                    <td><input type="text"
+                                               class="am-modal-prompt-input input-total-underwritten-plan-budget-plan"
+                                               value="${Utils.format(projectBudgetPlanDetailTotal.underwrittenPlan)}"
+                                               readonly/></td>
+                                    <td><input type="text"
+                                               class="am-modal-prompt-input input-total-repayment-plan-budget-plan"
+                                               value="${Utils.format(projectBudgetPlanDetailTotal.repaymentPlan)}"
+                                               readonly/></td>
+                                    <td></td>
+                                </tr>
+
+                                <#if projectBudgetPlanDetails??>
+                                    <#list projectBudgetPlanDetails as projectBudgetPlanDetail>
+                                        <tr>
+                                            <td><#--<input type="text" readonly
+                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-month-budget-plan"
+                                                       value="${projectBudgetPlanDetail.month!}">-->${projectBudgetPlanDetail.month!}</td>
+                                            <td><input type="text" readonly
+                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-device-cost-budget-plan"
+                                                       value="${Utils.format(projectBudgetPlanDetail.deviceCost)}"></td>
+                                            <td><input type="text" readonly
+                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-engineer-cost-budget-plan"
+                                                       value="${Utils.format(projectBudgetPlanDetail.engineerCost)}">
+                                            </td>
+                                            <td><input type="text" readonly
+                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-project-manage-cost-budget-plan"
+                                                       value="${Utils.format(projectBudgetPlanDetail.projectManageCost)}">
+                                            </td>
+                                            <td><input type="text" readonly
+                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-earnest-money-cost-budget-plan"
+                                                       value="${Utils.format(projectBudgetPlanDetail.earnestMoneyCost)}">
+                                            </td>
+                                            <td><input type="text"
+                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-total-cost-budget-plan"
+                                                       value="${Utils.format(projectBudgetPlanDetail.totalCost)}"
+                                                       readonly></td>
+                                            <td><input type="text" readonly
+                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-sale-income-budget-plan"
+                                                       value="${Utils.format(projectBudgetPlanDetail.saleIncome)}"></td>
+                                            <td><input type="text" readonly
+                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-earnest-money-income-budget-plan"
+                                                       value="${Utils.format(projectBudgetPlanDetail.earnestMoneyIncome)}">
+                                            </td>
+                                            <td><input type="text"
+                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-total-income-budget-plan"
+                                                       value="${Utils.format(projectBudgetPlanDetail.totalIncome)}"
+                                                       readonly></td>
+                                            <td><input type="text"
+                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-fund-balance-budget-plan"
+                                                       value="${Utils.format(projectBudgetPlanDetail.fundBalance)}"
+                                                       readonly></td>
+                                            <td><input type="text"
+                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-capital-interest-budget-plan"
+                                                       value="${Utils.format(projectBudgetPlanDetail.capitalInterest)}"
+                                                       readonly></td>
+                                            <td><input type="text"
+                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-underwritten-plan-budget-plan"
+                                                       value="${Utils.format(projectBudgetPlanDetail.underwrittenPlan)}"
+                                                       readonly></td>
+                                            <td><input type="text"
+                                                       class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-repayment-plan-budget-plan"
+                                                       value="${Utils.format(projectBudgetPlanDetail.repaymentPlan)}"
+                                                       readonly></td>
+                                            <#--<td>
+                                                <button type="button"
+                                                        class="am-btn am-btn-warning am-btn-xs am-round am-modal-line-delete-budget-plan">
+                                                    <span class="am-icon-minus"></span></button>
+                                            </td>-->
+                                        </tr>
+                                    </#list>
+                                </#if>
+
+                                </tbody>
+                            </table>
+                            <#--<button type="button" id="budgetPlanDetailAddBtn"
+                                    class="am-btn am-btn-primary am-btn-xs am-round"><span class="am-icon-plus"></span>
+                            </button>-->
+
+                            <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;">
+                                <tbody>
+                                <tr>
+                                    <td>垫资峰值时间</td>
+                                    <td>垫资峰值金额</td>
+                                    <td>利率</td>
+                                    <td>资金利息</td>
+                                </tr>
+                                <tr>
+                                    <td><input type="text"
+                                               class="am-modal-prompt-input input-underwritten-plan-statistic-max-month-budget-plan"
+                                               value="${underwrittenPlanStatistic.maxMonth!}" readonly/></td>
+                                    <td><input type="text"
+                                               class="am-modal-prompt-input input-underwritten-plan-statistic-amount-budget-plan"
+                                               value="${Utils.format(underwrittenPlanStatistic.amount,'')}" readonly/>
+                                    </td>
+                                    <td><input type="text"
+                                               class="am-modal-prompt-input input-underwritten-plan-statistic-tax-rate-budget-plan"
+                                               value="${Utils.format(project.underwrittenTaxRate,'')}" readonly/></td>
+                                    <td><input type="text"
+                                               class="am-modal-prompt-input input-underwritten-plan-statistic-capital-interest-budget-plan"
+                                               value="${Utils.format(underwrittenPlanStatistic.capitalInterest,'')}"
+                                               readonly/></td>
+                                </tr>
+                                </tbody>
+                            </table>
+
+
+                        </div>
+                        <div class="am-modal-footer">
+                            <span class="am-modal-btn" data-am-modal-cancel>取消</span>
+                            <#-- <span class="am-modal-btn" data-am-modal-confirm>保存</span>-->
+                        </div>
+                    </div>
+                </div>
+
                 <#--审核弹窗-->
                 <div class="am-modal am-modal-prompt" style="width: 1000px;max-height:600px;overflow-y:auto;"
                      tabindex="-1" id="my-approve">
@@ -2407,11 +2483,10 @@
 
                                                 <div class="am-u-sm-12 am-u-md-4 switch-button" style="height: 25px;">
                                                     <label class="am-radio-inline">
-                                                        <input type="radio" value="2" checked="checked"
-                                                               name="docVlGender" required> 审核通过
+                                                        <input type="radio"  value="2" checked="checked" name="docVlGender" required> 审核通过
                                                     </label>
                                                     <label class="am-radio-inline">
-                                                        <input type="radio" value="3" name="docVlGender"> 审核不通过
+                                                        <input type="radio" value="3"  name="docVlGender"> 审核不通过
                                                     </label>
                                                 </div>
 
@@ -2421,11 +2496,9 @@
 
                                             <div class="am-g am-form-group am-margin-top" style="display: flex;">
                                                 <div class="am-u-sm-4 am-u-md-2 am-text-right">
-                                                    <span style="color: red;">*</span>审核意见
-                                                </div>
+                                                    <span style="color: red;">*</span>审核意见</div>
                                                 <div class="am-u-sm-6 am-u-md-6">
-                                                    <textarea id="doc-vld-ta-2" minlength="10"
-                                                              maxlength="100"></textarea>
+                                                    <textarea id="doc-vld-ta-2" minlength="10" maxlength="100"></textarea>
                                                 </div>
                                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                                             </div>
@@ -2528,7 +2601,7 @@
         });
     };
 
-    layui.use('laydate', function () {
+    layui.use('laydate', function(){
         var laydate = layui.laydate;
 
         laydate.render({
@@ -2536,14 +2609,14 @@
             type: 'month',
             btns: ['confirm'],
             trigger: 'click',
-            ready: function () {
+            ready: function(){
                 console.log($(this.elem).val());
             },
-            done: function () {
+            done: function() {
                 var time = $(this.elem).val();
                 console.log("time:" + time)
                 setKeywords(time);
-                $("#pmsForm").attr("action", "${base}/project/approve?listFrom=list&id=${project.id}");
+                $("#pmsForm").attr("action","${base}/project/approve?listFrom=list&id=${project.id}");
                 $("#pmsForm").submit();
             }
         });

From 05145701a12cf768e513aafa049cd2f23ae79fba Mon Sep 17 00:00:00 2001
From: hanbo <2608504783@qq.com>
Date: Fri, 14 Jan 2022 10:41:14 +0800
Subject: [PATCH 30/35] =?UTF-8?q?=E5=86=B3=E7=AE=97=E8=A1=A8=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E6=AF=9B=E5=88=A9=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E3=80=81=E5=86=B3=E7=AE=97=E8=A1=A8=E5=88=A9=E6=B6=A6=E7=8E=87?=
 =?UTF-8?q?=E8=A2=AB=E9=99=A4=E6=95=B0=E4=B8=BA0=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/static/assets/js/project_final.js      | 6 +++---
 src/main/resources/templates/admin/project_final_edit.ftl | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/static/assets/js/project_final.js b/src/main/resources/static/assets/js/project_final.js
index ac54375..5f92b92 100644
--- a/src/main/resources/static/assets/js/project_final.js
+++ b/src/main/resources/static/assets/js/project_final.js
@@ -378,7 +378,7 @@ function calGrossProfitProfitMargin() {
 
     var grossProfitProfitMargin = $("input[name='grossProfitProfitMargin']");
     if (grossProfitFinalTotal && incomeFinalTotal) {
-        grossProfitProfitMargin.val(f2Fixed(100 * f2(grossProfitFinalTotal) / f2(incomeFinalTotal)));
+        grossProfitProfitMargin.val(f2Fixed(100 * f2(grossProfitFinalTotal) / f2min(incomeFinalTotal)));
     } else {
         grossProfitProfitMargin.val("");
     }
@@ -410,7 +410,7 @@ function calContributionMarginProfitMargin() {
 
     var contributionMarginProfitMargin = $("input[name='contributionMarginProfitMargin']");
     if (contributionMarginFinalTotal && incomeFinalTotal) {
-        contributionMarginProfitMargin.val(f2Fixed(100 * f2(contributionMarginFinalTotal) / f2(incomeFinalTotal)));
+        contributionMarginProfitMargin.val(f2Fixed(100 * f2(contributionMarginFinalTotal) / f2min(incomeFinalTotal)));
     } else {
         contributionMarginProfitMargin.val("");
     }
@@ -442,7 +442,7 @@ function calNetMarginProfitMargin() {
 
     var netMarginProfitMargin = $("input[name='netMarginProfitMargin']");
     if (netMarginFinalTotal && incomeFinalTotal) {
-        netMarginProfitMargin.val(f2Fixed(100 * f2(netMarginFinalTotal) / f2(incomeFinalTotal)));
+        netMarginProfitMargin.val(f2Fixed(100 * f2(netMarginFinalTotal) / f2min(incomeFinalTotal)));
     } else {
         netMarginProfitMargin.val("");
     }
diff --git a/src/main/resources/templates/admin/project_final_edit.ftl b/src/main/resources/templates/admin/project_final_edit.ftl
index f926a6d..ab63464 100644
--- a/src/main/resources/templates/admin/project_final_edit.ftl
+++ b/src/main/resources/templates/admin/project_final_edit.ftl
@@ -218,7 +218,7 @@
                         <td>项目毛利</td>
                         <td><input name="projectGrossProfit" type="text" class="number" value="${Utils.format(estimateBean.getProjectGrossProfit(),'0')}" readonly required title="项目毛利概算总额"></td>
                         <td><input name="projectGrossProfit" type="text" class="number" value="${Utils.format(budgetBean.getProjectGrossProfit(),'0')}" readonly required title="项目毛利预算总额"></td>
-                        <td><input name="grossProfitSettleTotal" type="text" class="number" value="${Utils.format(finalBean.grossProfitSettleTotal,'0')}" readonly required title="项目毛利结算总额"></td>
+                        <td><input name="grossProfitSettleTotal" type="text" class="number" value="${Utils.format(settleBean.grossProfit,'0')}" readonly required title="项目毛利结算总额"></td>
                         <td><input name="grossProfitFinalTotal" type="text" class="number" value="${Utils.format(finalBean.grossProfitFinalTotal,'0')}" readonly required title="项目毛利决算总额"></td>
                         <td><input name="grossProfitProfitMargin" type="text" class="number" value="${Utils.format(finalBean.grossProfitProfitMargin,'0')}" required readonly title="项目毛利利润率"></td>
                     </tr>

From 23767ce48011f6aed4815bdd92b72a44d8b2bd11 Mon Sep 17 00:00:00 2001
From: hanbo <2608504783@qq.com>
Date: Fri, 14 Jan 2022 11:06:01 +0800
Subject: [PATCH 31/35] =?UTF-8?q?=E9=A2=84=E7=AE=97=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/admin/project_approve.ftl       | 124 ------------------
 1 file changed, 124 deletions(-)

diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index 70e1d3a..8ecd4c9 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -1016,130 +1016,6 @@
                                     </tbody>
                                     </table>
 
-                                    <#--<span class="am-text-primary"><a style="cursor: pointer" id="income-detail">收入明细表</a></span>
-                                    <span class="am-text-primary"><a style="cursor: pointer"  id="cost-detail">采购成本明细表</a></span>
-                                    <span class="am-text-primary"><a style="cursor: pointer"  id="cost-project-manage-detail">项目管理成本表</a></span>
-                                    <span class="am-text-primary budget-plan-detail"><a style="cursor: pointer">资金计划表</a></span>-->
-                                    <span class="am-text-lg">收入</span>
-                                    <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;">
-                                        <tbody>
-                                        <tr class="am-text-lg">
-                                            <td>类别</td>
-                                            <td>费用</td>
-                                            <td>含税金额（元）</td>
-                                            <td>不含税金额（元）</td>
-                                        </tr>
-                                        <tr>
-                                            <td>收入</td>
-                                            <td>设备类</td>
-                                            <td><input type="text" class="number" name="incomeDeviceTaxInclude" value="${Utils.format(budgetBean.incomeDeviceTaxInclude,'0')}" required readonly title="设备类含税总额"></td>
-                                            <td><input type="text" class="number" name="incomeDeviceTaxExclude" value="${Utils.format(budgetBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类不含税总额"></td>
-                                        </tr>
-                                        <tr>
-                                            <td>收入</td>
-                                            <td>工程类</td>
-                                            <td><input type="text" class="number" name="incomeEngineerTaxInclude" value="${Utils.format(budgetBean.incomeEngineerTaxInclude,'0')}" required readonly title="工程类含税总额"></td>
-                                            <td><input type="text" class="number" name="incomeEngineerTaxExclude" value="${Utils.format(budgetBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类不含税总额"></td>
-                                        </tr>
-                                        <tr>
-                                            <td>收入</td>
-                                            <td>服务类</td>
-                                            <td><input type="text" class="number" name="incomeServiceTaxInclude" value="${Utils.format(budgetBean.incomeServiceTaxInclude,'0')}" required readonly title="服务类含税总额"></td>
-                                            <td><input type="text" class="number" name="incomeServiceTaxExclude" value="${Utils.format(budgetBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类不含税总额"></td>
-                                        </tr>
-                                        <tr>
-                                            <td>合计</td>
-                                            <td></td>
-                                            <td><input type="text" class="number" name="incomeTotalTaxInclude" value="${Utils.format(budgetBean.incomeTotalTaxInclude,'0')}" readonly required title="此列累计"></td>
-                                            <td><input type="text" class="number" name="incomeTotalTaxExclude" value="${Utils.format(budgetBean.incomeTotalTaxExclude,'0')}" readonly required title="此列累计"></td>
-                                        </tr>
-                                        </tbody>
-                                    </table>
-                                    <span class="am-text-lg">成本</span>
-                                    <#-- <span class="am-text-primary"><a style="cursor: pointer"  id="cost-detail">采购成本明细表</a></span>
-                                     <span class="am-text-primary"><a style="cursor: pointer"  id="cost-project-manage-detail">项目管理成本表</a></span>-->
-                                    <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;">
-                                        <tbody>
-                                        <tr class="am-text-lg">
-                                            <td>类别</td>
-                                            <td>费用</td>
-                                            <td>费用项目</td>
-                                            <td>含税金额（元）</td>
-                                            <td>不含税金额（元）</td>
-                                        </tr>
-                                        <tr>
-                                            <td>成本</td>
-                                            <td>采购成本</td>
-                                            <td>设备</td>
-                                            <td><input type="text" class="number" name="costPurchaseDeviceTaxInclude" value="${Utils.format(budgetBean.costPurchaseDeviceTaxInclude,'0')}" readonly required title="购买设备含税总额"></td>
-                                            <td><input type="text" class="number" name="costPurchaseDeviceTaxExclude" value="${Utils.format(budgetBean.costPurchaseDeviceTaxExclude,'0')}" readonly required title="购买设备不含税总额"></td>
-                                        </tr>
-                                        <tr>
-                                            <td>成本</td>
-                                            <td>采购成本</td>
-                                            <td>施工</td>
-                                            <td><input type="text" class="number" name="costPurchaseBuildTaxInclude" value="${Utils.format(budgetBean.costPurchaseBuildTaxInclude,'0')}" readonly required title="购买施工含税总额"></td>
-                                            <td><input type="text" class="number" name="costPurchaseBuildTaxExclude" value="${Utils.format(budgetBean.costPurchaseBuildTaxExclude,'0')}" readonly required title="购买施工不含税总额"></td>
-                                        </tr>
-                                        <tr>
-                                            <td>成本</td>
-                                            <td>采购成本</td>
-                                            <td>服务</td>
-                                            <td><input type="text" class="number" name="costPurchaseServiceTaxInclude" value="${Utils.format(budgetBean.costPurchaseServiceTaxInclude,'0')}" readonly required title="购买服务含税总额"></td>
-                                            <td><input type="text" class="number" name="costPurchaseServiceTaxExclude" value="${Utils.format(budgetBean.costPurchaseServiceTaxExclude,'0')}" readonly required title="购买服务不含税总额"></td>
-                                        </tr>
-                                        <tr>
-                                            <td>成本</td>
-                                            <td>采购成本</td>
-                                            <td>其他</td>
-                                            <td><input type="text" class="number" name="costPurchaseOtherTaxInclude" value="${Utils.format(budgetBean.costPurchaseOtherTaxInclude,'0')}" readonly required title="购买其他含税总额"></td>
-                                            <td><input type="text" class="number" name="costPurchaseOtherTaxExclude" value="${Utils.format(budgetBean.costPurchaseOtherTaxExclude,'0')}" readonly required title="购买其他不含税总额"></td>
-                                        </tr>
-                                        <tr>
-                                            <td>成本</td>
-                                            <td>项目管理成本</td>
-                                            <td>项目管理成本</td>
-                                            <td><input type="text" class="number" name="costProjectManageTaxInclude" value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0')}" readonly required title="项目管理成本总额"></td>
-                                            <td><input type="text" class="number" name="costProjectManageTaxExclude" value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0')}" readonly required title="项目管理成本总额"></td>
-                                        </tr>
-                                        <tr>
-                                            <td>成本</td>
-                                            <td>其他</td>
-                                            <td>${project.otherName!}</td>
-                                            <td><input type="text" class="number" name="costOtherOtherTaxInclude" value="${Utils.format(budgetBean.costOtherOtherTaxInclude,'0.00')}" required readonly title="其他含税总额（填入）"></td>
-                                            <td><input type="text" class="number" name="costOtherOtherTaxExclude" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0.00')}" required readonly title="其他不含税总额（填入）"></td>
-                                        </tr>
-                                        <tr>
-                                            <td>合计</td>
-                                            <td></td>
-                                            <td></td>
-                                            <td><input type="text" class="number" name="costTotalTaxInclude" value="${Utils.format(budgetBean.costTotalTaxInclude,'0')}" readonly required title="此列累计"></td>
-                                            <td><input type="text" class="number" name="costTotalTaxExclude" value="${Utils.format(budgetBean.costTotalTaxExclude,'0')}" readonly required title="此列累计"></td>
-                                        </tr>
-                                        </tbody>
-                                    </table>
-                                    <span class="am-text-lg">管理</span>
-                                    <#--<span class="am-text-primary budget-plan-detail"><a style="cursor: pointer">资金计划表</a></span>-->
-                                    <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;">
-                                        <tbody>
-                                        <tr class="am-text-lg">
-                                            <td>类别</td>
-                                            <td>费用项目</td>
-                                            <td>不含税金额（元）</td>
-                                        </tr>
-                                        <tr>
-                                            <td>财务费用</td>
-                                            <td>资金占用成本</td>
-                                            <td><input type="text" class="number" name="costExpropriationTaxExclude" value="${Utils.format(budgetBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本不含税总额"></td>
-                                        </tr>
-                                        <tr>
-                                            <td>公司管理费用</td>
-                                            <td></td>
-                                            <td><input type="text" class="number" name="costCompanyManageTaxExclude" value="${Utils.format(budgetBean.costCompanyManageTaxExclude,'0')}" required readonly title="公司管理费用不含税总额"></td>
-                                        </tr>
-                                        </tbody>
-                                    </table>
-
                                     <span class="am-text-lg">利润率计算</span>
                                     <table class="am-table am-table-bordered am-table-radius table-main"
                                            style="padding:0;">

From 5b1147b24615058d22ebdaac041a23cabe078e3e Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Fri, 14 Jan 2022 16:32:20 +0800
Subject: [PATCH 32/35] =?UTF-8?q?=E7=BB=99=E7=A9=BA=E7=99=BD=E5=A4=84?=
 =?UTF-8?q?=E9=A2=84=E8=AE=BE=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/admin/project_approve.ftl          | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index 8ecd4c9..913f01f 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -230,14 +230,14 @@
                             <div class="am-g am-form-group am-margin-top">
                                 <div class="am-u-sm-4 am-u-md-2 am-text-right">华智产品金额</div>
                                 <div class="am-u-sm-6 am-u-md-6">
-                                    <span>${Utils.format(project.huazhiProductAmount)}</span>元
+                                    <span>${Utils.format(project.huazhiProductAmount, '0.00')}</span>元
                                 </div>
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
                             <div class="am-g am-form-group am-margin-top">
                                 <div class="am-u-sm-4 am-u-md-2 am-text-right">其他产品金额</div>
                                 <div class="am-u-sm-6 am-u-md-6">
-                                    <span>${Utils.format(project.ziguangOtherAmount)}</span>元
+                                    <span>${Utils.format(project.ziguangOtherAmount, '0.00')}</span>元
                                 </div>
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
@@ -355,15 +355,15 @@
                                     <td>成本</td>
                                     <td>其他</td>
                                     <td>${project.otherName!}</td>
-                                    <td><input type="text" class="number" name="costOtherOtherTaxInclude" value="${Utils.format(estimateBean.costOtherOtherTaxInclude, "0.00")}" required readonly></td>
-                                    <td><input type="text" class="number" name="costOtherOtherTaxExclude" value="${Utils.format(estimateBean.costOtherOtherTaxExclude, "0.00")}" required readonly></td>
+                                    <td><input type="text" class="number" name="costOtherOtherTaxInclude" value="${Utils.format(estimateBean.costOtherOtherTaxInclude, '0.00')}" required readonly></td>
+                                    <td><input type="text" class="number" name="costOtherOtherTaxExclude" value="${Utils.format(estimateBean.costOtherOtherTaxExclude, '0.00')}" required readonly></td>
                                 </tr>
                                 <tr>
                                     <td>合计</td>
                                     <td></td>
                                     <td></td>
-                                    <td><input type="text" class="number" name="costTotalTaxInclude" value="${Utils.format(estimateBean.costTotalTaxInclude)}" readonly readonly title="此列累计"></td>
-                                    <td><input type="text" class="number" name="costTotalTaxExclude" value="${Utils.format(estimateBean.costTotalTaxExclude)}" readonly readonly title="此列累计"></td>
+                                    <td><input type="text" class="number" name="costTotalTaxInclude" value="${Utils.format(estimateBean.costTotalTaxInclude, '0.00')}" readonly readonly title="此列累计"></td>
+                                    <td><input type="text" class="number" name="costTotalTaxExclude" value="${Utils.format(estimateBean.costTotalTaxExclude, '0.00')}" readonly readonly title="此列累计"></td>
                                 </tr>
                                 </tbody>
                             </table>
@@ -979,10 +979,10 @@
                                             <td></td>
                                             <td></td>
                                             <td><input type="text" class="number" name="costTotalTaxInclude"
-                                                       value="${Utils.format(budgetBean.costTotalTaxInclude,'0')}"
+                                                       value="${Utils.format(budgetBean.costTotalTaxInclude, '0.00')}"
                                                        readonly required title="此列累计"></td>
                                             <td><input type="text" class="number" name="costTotalTaxExclude"
-                                                       value="${Utils.format(budgetBean.costTotalTaxExclude,'0')}"
+                                                       value="${Utils.format(budgetBean.costTotalTaxExclude, '0.00')}"
                                                        readonly required title="此列累计"></td>
                                         </tr>
                                         </tbody>

From a305337e85eec89d144e9b05217b24fda50d4bc3 Mon Sep 17 00:00:00 2001
From: hanbo <2608504783@qq.com>
Date: Fri, 14 Jan 2022 18:34:41 +0800
Subject: [PATCH 33/35] =?UTF-8?q?=E9=A2=84=E7=AE=97=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/admin/project_approve.ftl       | 18 ++++----
 .../templates/admin/project_estimate_add.ftl  | 43 ++++++++++++++++---
 2 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index 913f01f..02398ce 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -419,15 +419,6 @@
 
                     <div class="am-tabs-bd">
                         <div class="am-tab-panel am-fade am-in" id="tab3">
-                            <#if (project.status==5 || project.status==10 || project.status==15) && project.approveStatusBudget == 1>
-                                <div class="approve-topass"></div>
-                            </#if>
-                            <#if (project.status==5 || project.status==10 || project.status==15) && project.approveStatusBudget == 2>
-                                <div class="approve-passed"></div>
-                            </#if>
-                            <#if (project.status==5 || project.status==10 || project.status==15) && project.approveStatusBudget == 3>
-                                <div class="approve-nopass"></div>
-                            </#if>
 
                             <div class="am-tabs am-margin" data-am-tabs id="subTab">
                                 <ul class="am-tabs-nav am-nav am-nav-tabs">
@@ -440,6 +431,15 @@
                             </div>
                             <div class="am-tabs-bd">
                                 <div class="am-tab-panel am-fade am-in am-active" id="tab31">
+                                    <#if (project.status==5 || project.status==10 || project.status==15) && project.approveStatusBudget == 1>
+                                        <div class="approve-topass"></div>
+                                    </#if>
+                                    <#if (project.status==5 || project.status==10 || project.status==15) && project.approveStatusBudget == 2>
+                                        <div class="approve-passed"></div>
+                                    </#if>
+                                    <#if (project.status==5 || project.status==10 || project.status==15) && project.approveStatusBudget == 3>
+                                        <div class="approve-nopass"></div>
+                                    </#if>
                                     <#--<span class="am-text-lg">收入明细表</span>-->
                                     <table class="am-table am-table-bordered am-table-radius table-main"
                                            style="padding:0;"
diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl
index 52e1ce8..a183a11 100644
--- a/src/main/resources/templates/admin/project_estimate_add.ftl
+++ b/src/main/resources/templates/admin/project_estimate_add.ftl
@@ -466,9 +466,25 @@
                 window.confirm('项目名称已存在');
                 return;
             }
-            $("#pmsForm").attr("action","${base}/project/estimateAddSave");
-            $("#pmsForm").submit();
-            $("#saveDraft").attr('disabled',false);
+
+            var incomeDeviceTaxExclude = $("input[name='incomeDeviceTaxExclude']").val();
+            var incomeEngineerTaxExclude = $("input[name='incomeEngineerTaxExclude']").val();
+            var incomeServiceTaxExclude = $("input[name='incomeServiceTaxExclude']").val();
+            var costPurchaseDeviceTaxExclude = $("input[name='costPurchaseDeviceTaxExclude']").val();
+            var costPurchaseBuildTaxExclude = $("input[name='costPurchaseBuildTaxExclude']").val();
+            var costPurchaseServiceTaxExclude = $("input[name='costPurchaseServiceTaxExclude']").val();
+            var costOtherOtherTaxExclude = $("input[name='costOtherOtherTaxExclude']").val();
+
+            if(incomeDeviceTaxExclude && incomeEngineerTaxExclude && incomeServiceTaxExclude
+            && costPurchaseDeviceTaxExclude && costPurchaseBuildTaxExclude && costPurchaseServiceTaxExclude && costOtherOtherTaxExclude){
+                $("#pmsForm").attr("action","${base}/project/estimateAddSave");
+                $("#pmsForm").submit();
+                $("#saveDraft").attr('disabled',false);
+            }else {
+                alert("请完善不含税金额")
+                return;
+            }
+
         });
         $("#saveApprove").click(function () {
             $("#saveApprove").attr('disabled',true);
@@ -485,9 +501,24 @@
                 window.confirm('项目名称已存在');
                 return;
             }
-            $("#pmsForm").attr("action","${base}/project/estimateAddSaveAndApprove");
-            $("#pmsForm").submit();
-            $("#saveApprove").attr('disabled',false);
+
+            var incomeDeviceTaxExclude = $("input[name='incomeDeviceTaxExclude']").val();
+            var incomeEngineerTaxExclude = $("input[name='incomeEngineerTaxExclude']").val();
+            var incomeServiceTaxExclude = $("input[name='incomeServiceTaxExclude']").val();
+            var costPurchaseDeviceTaxExclude = $("input[name='costPurchaseDeviceTaxExclude']").val();
+            var costPurchaseBuildTaxExclude = $("input[name='costPurchaseBuildTaxExclude']").val();
+            var costPurchaseServiceTaxExclude = $("input[name='costPurchaseServiceTaxExclude']").val();
+            var costOtherOtherTaxExclude = $("input[name='costOtherOtherTaxExclude']").val();
+
+            if(incomeDeviceTaxExclude && incomeEngineerTaxExclude && incomeServiceTaxExclude
+                && costPurchaseDeviceTaxExclude && costPurchaseBuildTaxExclude && costPurchaseServiceTaxExclude && costOtherOtherTaxExclude){
+                $("#pmsForm").attr("action","${base}/project/estimateAddSave");
+                $("#pmsForm").submit();
+                $("#saveDraft").attr('disabled',false);
+            }else {
+                alert("请完善不含税金额")
+                return;
+            }
         });
     });
 

From ace488e05f719d3818e5870fd5948718e06c621b Mon Sep 17 00:00:00 2001
From: hanbo <2608504783@qq.com>
Date: Sun, 16 Jan 2022 18:02:27 +0800
Subject: [PATCH 34/35] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=A6=82=E7=AE=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/admin/project_estimate_add.ftl    | 8 +++++---
 .../resources/templates/admin/project_estimate_edit.ftl   | 8 --------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl
index a183a11..895cde1 100644
--- a/src/main/resources/templates/admin/project_estimate_add.ftl
+++ b/src/main/resources/templates/admin/project_estimate_add.ftl
@@ -481,7 +481,8 @@
                 $("#pmsForm").submit();
                 $("#saveDraft").attr('disabled',false);
             }else {
-                alert("请完善不含税金额")
+                alert("请完善不含税金额");
+                $("#saveDraft").attr('disabled',false);
                 return;
             }
 
@@ -514,9 +515,10 @@
                 && costPurchaseDeviceTaxExclude && costPurchaseBuildTaxExclude && costPurchaseServiceTaxExclude && costOtherOtherTaxExclude){
                 $("#pmsForm").attr("action","${base}/project/estimateAddSave");
                 $("#pmsForm").submit();
-                $("#saveDraft").attr('disabled',false);
+                $("#saveApprove").attr('disabled',false);
             }else {
-                alert("请完善不含税金额")
+                alert("请完善不含税金额");
+                $("#saveApprove").attr('disabled',false);
                 return;
             }
         });
diff --git a/src/main/resources/templates/admin/project_estimate_edit.ftl b/src/main/resources/templates/admin/project_estimate_edit.ftl
index 7e6be85..5811502 100644
--- a/src/main/resources/templates/admin/project_estimate_edit.ftl
+++ b/src/main/resources/templates/admin/project_estimate_edit.ftl
@@ -210,7 +210,6 @@
                             <td><input type="text" class="number" maxlength="16" name="incomeDeviceTaxExclude" value="${Utils.format(estimateBean.incomeDeviceTaxExclude)}" <#if estimateBean.incomeDeviceSelect! !="自定义">readonly</#if> required></td>
                             <td>
                                 <select data-am-selected name="incomeDeviceSelect" id="incomeDeviceSelect">
-                                    <option value="请选择税率">请选择税率</option>
                                     <option value="0" <#if estimateBean.incomeDeviceSelect! =="0">selected</#if>>0%</option>
                                     <option value="0.01" <#if estimateBean.incomeDeviceSelect! =="0.01">selected</#if>>1%</option>
                                     <option value="0.03" <#if estimateBean.incomeDeviceSelect! =="0.03">selected</#if>>3%</option>
@@ -228,7 +227,6 @@
                             <td><input type="text" class="number" maxlength="16" name="incomeEngineerTaxExclude" value="${Utils.format(estimateBean.incomeEngineerTaxExclude)}" <#if estimateBean.incomeEngineerSelect! !="自定义">readonly</#if> required></td>
                             <td>
                                 <select data-am-selected name="incomeEngineerSelect" id="incomeEngineerSelect">
-                                    <option value="请选择税率">请选择税率</option>
                                     <option value="0" <#if estimateBean.incomeEngineerSelect! =="0">selected</#if>>0%</option>
                                     <option value="0.01" <#if estimateBean.incomeEngineerSelect! =="0.01">selected</#if>>1%</option>
                                     <option value="0.03" <#if estimateBean.incomeEngineerSelect! =="0.03">selected</#if>>3%</option>
@@ -246,7 +244,6 @@
                             <td><input type="text" class="number" maxlength="16" name="incomeServiceTaxExclude" value="${Utils.format(estimateBean.incomeServiceTaxExclude)}" <#if estimateBean.incomeServiceSelect! !="自定义">readonly</#if> required></td>
                             <td>
                                 <select data-am-selected name="incomeServiceSelect" id="incomeServiceSelect">
-                                    <option value="请选择税率">请选择税率</option>
                                     <option value="0" <#if estimateBean.incomeServiceSelect! =="0">selected</#if>>0%</option>
                                     <option value="0.01" <#if estimateBean.incomeServiceSelect! =="0.01">selected</#if>>1%</option>
                                     <option value="0.03" <#if estimateBean.incomeServiceSelect! =="0.03">selected</#if>>3%</option>
@@ -285,7 +282,6 @@
                             <td><input type="text" class="number" maxlength="16" name="costPurchaseDeviceTaxExclude" value="${Utils.format(estimateBean.costPurchaseDeviceTaxExclude)}" <#if estimateBean.costPurchaseDeviceSelect! !="自定义">readonly</#if> required></td>
                             <td>
                                 <select data-am-selected name="costPurchaseDeviceSelect" id="costPurchaseDeviceSelect">
-                                    <option value="请选择税率">请选择税率</option>
                                     <option value="0" <#if estimateBean.costPurchaseDeviceSelect! =="0">selected</#if>>0%</option>
                                     <option value="0.01" <#if estimateBean.costPurchaseDeviceSelect! =="0.01">selected</#if>>1%</option>
                                     <option value="0.03" <#if estimateBean.costPurchaseDeviceSelect! =="0.03">selected</#if>>3%</option>
@@ -304,7 +300,6 @@
                             <td><input type="text" class="number" maxlength="16" name="costPurchaseBuildTaxExclude" value="${Utils.format(estimateBean.costPurchaseBuildTaxExclude)}" <#if estimateBean.costPurchaseBuildSelect! !="自定义">readonly</#if> required></td>
                             <td>
                                 <select data-am-selected name="costPurchaseBuildSelect" id="costPurchaseBuildSelect">
-                                    <option value="请选择税率">请选择税率</option>
                                     <option value="0" <#if estimateBean.costPurchaseBuildSelect! =="0">selected</#if>>0%</option>
                                     <option value="0.01" <#if estimateBean.costPurchaseBuildSelect! =="0.01">selected</#if>>1%</option>
                                     <option value="0.03" <#if estimateBean.costPurchaseBuildSelect! =="0.03">selected</#if>>3%</option>
@@ -323,7 +318,6 @@
                             <td><input type="text" class="number" maxlength="16" name="costPurchaseServiceTaxExclude" value="${Utils.format(estimateBean.costPurchaseServiceTaxExclude)}" <#if estimateBean.costPurchaseServiceSelect! !="自定义">readonly</#if> required></td>
                             <td>
                                 <select data-am-selected name="costPurchaseServiceSelect" id="costPurchaseServiceSelect">
-                                    <option value="请选择税率">请选择税率</option>
                                     <option value="0" <#if estimateBean.costPurchaseServiceSelect! =="0">selected</#if>>0%</option>
                                     <option value="0.01" <#if estimateBean.costPurchaseServiceSelect! =="0.01">selected</#if>>1%</option>
                                     <option value="0.03" <#if estimateBean.costPurchaseServiceSelect! =="0.03">selected</#if>>3%</option>
@@ -342,7 +336,6 @@
                             <td><input type="text" class="number" maxlength="16" name="costPurchaseOtherTaxExclude" value="${Utils.format(estimateBean.costPurchaseOtherTaxExclude)}" <#if estimateBean.costPurchaseOtherSelect! !="自定义">readonly</#if> required></td>
                             <td>
                                 <select data-am-selected name="costPurchaseOtherSelect" id="costPurchaseOtherSelect">
-                                    <option value="请选择税率">请选择税率</option>
                                     <option value="0" <#if estimateBean.costPurchaseOtherSelect! =="0">selected</#if>>0%</option>
                                     <option value="0.01" <#if estimateBean.costPurchaseOtherSelect! =="0.01">selected</#if>>1%</option>
                                     <option value="0.03" <#if estimateBean.costPurchaseOtherSelect! =="0.03">selected</#if>>3%</option>
@@ -369,7 +362,6 @@
                             <td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxExclude" value="${Utils.format(estimateBean.costOtherOtherTaxExclude, "0.00")}" <#if estimateBean.costOtherOtherSelect! !="自定义">readonly</#if>></td>
                             <td>
                                 <select data-am-selected name="costOtherOtherSelect" id="costOtherOtherSelect">
-                                    <option value="请选择税率">请选择税率</option>
                                     <option value="0" <#if estimateBean.costOtherOtherSelect! =="0">selected</#if>>0%</option>
                                     <option value="0.01" <#if estimateBean.costOtherOtherSelect! =="0.01">selected</#if>>1%</option>
                                     <option value="0.03" <#if estimateBean.costOtherOtherSelect! =="0.03">selected</#if>>3%</option>

From d0ecf99facf75419a5007d9cbeee3ec5d8ab2ee7 Mon Sep 17 00:00:00 2001
From: hanbo <2608504783@qq.com>
Date: Mon, 17 Jan 2022 11:38:50 +0800
Subject: [PATCH 35/35] =?UTF-8?q?=E9=A2=84=E7=AE=97=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index d9561c0..df9a7e5 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -748,7 +748,7 @@
                     <tr>
                         <td>成本</td>
                         <td>其他</td>
-                        <td><input type="text" id="otherName" maxlength="6" data-validate-async data-validation-message="请输入其他中的小类名称（10字符以内）"
+                        <td><input type="text" id="otherName" maxlength="10" data-validate-async data-validation-message="请输入其他中的小类名称（10字符以内）"
                                    value="${project.otherName!}" name="otherName" placeholder="请输入其他中的小类名称（10字符以内）"/> </td>
                         <td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxInclude" value="${Utils.format(budgetBean.costOtherOtherTaxInclude,'0')}" title="其他含税总额（填入）"></td>
                         <td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxExclude" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0')}" title="其他不含税总额（填入）"></td>