diff --git a/src/main/java/cn/palmte/work/model/NumSeq.java b/src/main/java/cn/palmte/work/model/NumSeq.java
new file mode 100644
index 0000000..f96c88b
--- /dev/null
+++ b/src/main/java/cn/palmte/work/model/NumSeq.java
@@ -0,0 +1,33 @@
+package cn.palmte.work.model;
+
+import org.hibernate.annotations.GenericGenerator;
+
+import javax.persistence.*;
+
+@Entity
+@Table(name = "num_seq")
+public class NumSeq {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @GenericGenerator(name = "persistenceGenerator", strategy = "increment")
+    private Integer id;
+
+    @Column(name = "number")
+    private int number;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public int getNumber() {
+        return number;
+    }
+
+    public void setNumber(int number) {
+        this.number = number;
+    }
+}
diff --git a/src/main/java/cn/palmte/work/model/NumSeqRepository.java b/src/main/java/cn/palmte/work/model/NumSeqRepository.java
new file mode 100644
index 0000000..519501f
--- /dev/null
+++ b/src/main/java/cn/palmte/work/model/NumSeqRepository.java
@@ -0,0 +1,15 @@
+package cn.palmte.work.model;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+public interface NumSeqRepository extends JpaRepository<NumSeq, Integer> {
+
+    @Query(value = "select * from num_seq where id = 1", nativeQuery = true)
+    NumSeq findNum();
+
+    @Modifying
+    @Query(value = "update num_seq set number = ?1 where id = 1", nativeQuery = true)
+    int updateNum(int num);
+}
diff --git a/src/main/java/cn/palmte/work/service/NumSeqService.java b/src/main/java/cn/palmte/work/service/NumSeqService.java
index 94f8a2c..f023160 100644
--- a/src/main/java/cn/palmte/work/service/NumSeqService.java
+++ b/src/main/java/cn/palmte/work/service/NumSeqService.java
@@ -1,5 +1,7 @@
 package cn.palmte.work.service;
 
+import cn.palmte.work.model.NumSeq;
+import cn.palmte.work.model.NumSeqRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -8,6 +10,7 @@ import org.springframework.stereotype.Service;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
+import javax.transaction.Transactional;
 
 /**
  * @author Yuanping Zhang
@@ -18,16 +21,15 @@ public class NumSeqService {
     private static final Logger logger = LoggerFactory.getLogger(NumSeqService.class);
 
     @Autowired
-    @PersistenceContext
-    private EntityManager entityManager;
+    private NumSeqRepository numSeqRepository;
 
+    @Transactional(rollbackOn = Exception.class)
     public String generate() {
         String prefix = "P";
-        String querySql = "select num from num_seq limit 1";
-        Query nativeQuery = entityManager.createNativeQuery(querySql);
-        int num = (Integer)nativeQuery.getSingleResult();
-        String counterString = String.format("%05d", num++);
-        entityManager.createNativeQuery("update num_seq set num = " + num);
+        NumSeq one = numSeqRepository.findNum();
+        int number = one.getNumber();
+        String counterString = String.format("%05d", number++);
+        numSeqRepository.updateNum(number);
         return prefix + counterString;
     }
 }
diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index a4de9ae..0799660 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -294,162 +294,162 @@
                     </div>
 
 
-                    <div class="am-tabs-bd">
-                        <div class="am-tab-panel am-fade am-in am-scrollable-horizontal" id="tab2">
-                            <#if (project.status==1 || project.status==5 || project.status==10 || project.status==15) && project.approveStatusEstimate == 1>
-                                <div class="approve-topass"></div>
-                            </#if>
-                            <#if (project.status==1 || project.status==5 || project.status==10 || project.status==15) && project.approveStatusEstimate == 2>
-                                <div class="approve-passed"></div>
-                            </#if>
-                            <#if (project.status==1 || project.status==5 || project.status==10 || project.status==15) && project.approveStatusEstimate == 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 am-text-nowrap" 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(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>
-                                </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>
-                                </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>
-                                </tr>
-                                </tbody>
-                            </table>
-                            <span class="am-text-lg">成本</span>
-                            <table class="am-table am-table-bordered am-table-radius table-main am-text-nowrap" 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(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>
-                                </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>
-                                </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>
-                                </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>
-                                </tr>
-                                <tr>
-                                    <td>成本</td>
-                                    <td>其他</td>
-                                    <td style="width: 300px" class="huanhang">${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>
-                                </tr>
-                                <tr>
-                                    <td>合计</td>
-                                    <td></td>
-                                    <td></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>
-                            <span class="am-text-lg">管理</span>
-                            <table class="am-table am-table-bordered am-table-radius table-main am-text-nowrap" 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(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>
-                                </tr>
-                                </tbody>
-                            </table>
+<#--                    <div class="am-tabs-bd">-->
+<#--                        <div class="am-tab-panel am-fade am-in am-scrollable-horizontal" id="tab2">-->
+<#--                            <#if (project.status==1 || project.status==5 || project.status==10 || project.status==15) && project.approveStatusEstimate == 1>-->
+<#--                                <div class="approve-topass"></div>-->
+<#--                            </#if>-->
+<#--                            <#if (project.status==1 || project.status==5 || project.status==10 || project.status==15) && project.approveStatusEstimate == 2>-->
+<#--                                <div class="approve-passed"></div>-->
+<#--                            </#if>-->
+<#--                            <#if (project.status==1 || project.status==5 || project.status==10 || project.status==15) && project.approveStatusEstimate == 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 am-text-nowrap" 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(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>-->
+<#--                                </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>-->
+<#--                                </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>-->
+<#--                                </tr>-->
+<#--                                </tbody>-->
+<#--                            </table>-->
+<#--                            <span class="am-text-lg">成本</span>-->
+<#--                            <table class="am-table am-table-bordered am-table-radius table-main am-text-nowrap" 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(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>-->
+<#--                                </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>-->
+<#--                                </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>-->
+<#--                                </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>-->
+<#--                                </tr>-->
+<#--                                <tr>-->
+<#--                                    <td>成本</td>-->
+<#--                                    <td>其他</td>-->
+<#--                                    <td style="width: 300px" class="huanhang">${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>-->
+<#--                                </tr>-->
+<#--                                <tr>-->
+<#--                                    <td>合计</td>-->
+<#--                                    <td></td>-->
+<#--                                    <td></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>-->
+<#--                            <span class="am-text-lg">管理</span>-->
+<#--                            <table class="am-table am-table-bordered am-table-radius table-main am-text-nowrap" 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(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>-->
+<#--                                </tr>-->
+<#--                                </tbody>-->
+<#--                            </table>-->
 
-                            <span class="am-text-lg">利润率计算</span>
-                            <table class="am-table am-table-bordered am-table-radius table-main am-text-nowrap" 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(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>
-                                </tr>
-                                <tr>
-                                    <td>项目贡献利润（元）</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>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div>
-                        <!--验证表单元素（validate end-->
-                    </div>
+<#--                            <span class="am-text-lg">利润率计算</span>-->
+<#--                            <table class="am-table am-table-bordered am-table-radius table-main am-text-nowrap" 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(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>-->
+<#--                                </tr>-->
+<#--                                <tr>-->
+<#--                                    <td>项目贡献利润（元）</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>-->
+<#--                                </tr>-->
+<#--                                </tbody>-->
+<#--                            </table>-->
+<#--                        </div>-->
+<#--                        <!--验证表单元素（validate end&ndash;&gt;-->
+<#--                    </div>-->
 
                     <div class="am-tabs-bd">
                         <div class="am-tab-panel am-fade am-in" id="tab3">
@@ -1249,7 +1249,7 @@
                                 <tr class="am-text-lg">
                                     <td>类别</td>
                                     <td>费用</td>
-                                    <td>概算总额（元）</td>
+<#--                                    <td>概算总额（元）</td>-->
                                     <td>预算总额（元）</td>
                                     <td>上月结算总额（元）</td>
                                     <td>本月结算金额（元）</td>
@@ -1258,7 +1258,7 @@
                                 <tr>
                                     <td>收入</td>
                                     <td>设备类</td>
-                                    <td><input name="incomeDeviceEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateIncomeDevice,'0.00')}" required readonly title="设备类概算总额"></td>
+<#--                                    <td><input name="incomeDeviceEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateIncomeDevice,'0.00')}" required readonly title="设备类概算总额"></td>-->
                                     <td><input name="incomeDeviceBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetIncomeDevice,'0.00')}" required readonly title="设备类预算总额"></td>
                                     <td><input name="incomeDeviceFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.incomeDeviceTaxExclude,'0.00')}" required readonly title="设备类上月结算总额"></td>
                                     <td><input type="text" class="number" name="incomeDevice" value="${Utils.format(monthBean.incomeDevice,'0.00')}" readonly required title="本月结算金额"></td>
@@ -1267,7 +1267,7 @@
                                 <tr>
                                     <td>收入</td>
                                     <td>工程类</td>
-                                    <td><input name="incomeEngineerEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateIncomeEngineer,'0.00')}" required readonly title="工程类概算总额"></td>
+<#--                                    <td><input name="incomeEngineerEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateIncomeEngineer,'0.00')}" required readonly title="工程类概算总额"></td>-->
                                     <td><input name="incomeEngineerBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetIncomeEngineer,'0.00')}" required readonly title="工程类预算总额"></td>
                                     <td><input name="incomeEngineerFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.incomeEngineerTaxExclude,'0.00')}" required readonly title="工程类上月结算总额"></td>
                                     <td><input type="text" class="number" name="incomeEngineer" value="${Utils.format(monthBean.incomeEngineer,'0.00')}" readonly required title="工程类本月结算金额"></td>
@@ -1276,7 +1276,7 @@
                                 <tr>
                                     <td>收入</td>
                                     <td>服务类</td>
-                                    <td><input name="incomeServiceEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateIncomeService,'0.00')}" required readonly title="服务类概算总额"></td>
+<#--                                    <td><input name="incomeServiceEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateIncomeService,'0.00')}" required readonly title="服务类概算总额"></td>-->
                                     <td><input name="incomeServiceBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetIncomeService,'0.00')}" required readonly title="服务类预算总额"></td>
                                     <td><input name="incomeServiceFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.incomeServiceTaxExclude,'0.00')}" required readonly title="服务类上月结算总额"></td>
                                     <td><input type="text" class="number" name="incomeService" value="${Utils.format(monthBean.incomeService,'0.00')}" readonly required title="服务类本月结算金额"></td>
@@ -1285,7 +1285,7 @@
                                 <tr>
                                     <td>合计</td>
                                     <td></td>
-                                    <td><input name="incomeEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.getEstimateIncomeTotal(),'0.00')}" readonly required title="此列累计"></td>
+<#--                                    <td><input name="incomeEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.getEstimateIncomeTotal(),'0.00')}" readonly required title="此列累计"></td>-->
                                     <td><input name="incomeBudgetTotal" type="text" class="number"  value="${Utils.format(monthBean.getBudgetIncomeTotal(),'0.00')}" readonly required title="此列累计"></td>
                                     <td><input name="incomeFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.getIncomeTotalTaxExclude(),'0.00')}" required readonly title="此列累计"></td>
                                     <td><input type="text" class="number" name="incomeTotal" value="${Utils.format(monthBean.getIncomeTotal(),'0.00')}" readonly title="此列累计"></td>
@@ -1300,7 +1300,7 @@
                                     <td>类别</td>
                                     <td>费用</td>
                                     <td>费用项目</td>
-                                    <td>概算总额（元）</td>
+<#--                                    <td>概算总额（元）</td>-->
                                     <td>预算总额（元）</td>
                                     <td>上月结算总额（元）</td>
                                     <td>本月结算金额（元）</td>
@@ -1310,7 +1310,7 @@
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>设备</td>
-                                    <td><input name="costPurchaseDeviceEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateCostPurchaseDevice,'0.00')}" readonly required title="购买设备概算总额"></td>
+<#--                                    <td><input name="costPurchaseDeviceEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateCostPurchaseDevice,'0.00')}" readonly required title="购买设备概算总额"></td>-->
                                     <td><input name="costPurchaseDeviceBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetCostPurchaseDevice,'0.00')}" readonly required title="购买设备预算总额"></td>
                                     <td><input name="costPurchaseDeviceFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costPurchaseDeviceTaxExclude,'0.00')}" required readonly title="购买设备上月结算总额"></td>
                                     <td><input type="text" class="number" name="costPurchaseDevice" value="${Utils.format(monthBean.costPurchaseDevice,'0.00')}" readonly required title="购买设备本月结算总额"></td>
@@ -1320,7 +1320,7 @@
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>施工</td>
-                                    <td><input name="costPurchaseBuildEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateCostPurchaseBuild,'0.00')}" readonly required title="施工采购成本概算总额"></td>
+<#--                                    <td><input name="costPurchaseBuildEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateCostPurchaseBuild,'0.00')}" readonly required title="施工采购成本概算总额"></td>-->
                                     <td><input name="costPurchaseBuildBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetCostPurchaseBuild,'0.00')}" readonly required title="施工采购成本预算总额"></td>
                                     <td><input name="costPurchaseBuildFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costPurchaseBuildTaxExclude,'0.00')}" required readonly title="施工采购成本上月结算总额"></td>
                                     <td><input type="text" class="number" name="costPurchaseBuild" value="${Utils.format(monthBean.costPurchaseBuild,'0.00')}" readonly required title="施工采购成本本月结算金额"></td>
@@ -1330,7 +1330,7 @@
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>服务</td>
-                                    <td><input name="costPurchaseServiceEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateCostPurchaseService,'0.00')}" readonly required title="服务采购成本概算总额"></td>
+<#--                                    <td><input name="costPurchaseServiceEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateCostPurchaseService,'0.00')}" readonly required title="服务采购成本概算总额"></td>-->
                                     <td><input name="costPurchaseServiceBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetCostPurchaseService,'0.00')}" readonly required title="服务采购成本预算总额"></td>
                                     <td><input name="costPurchaseServiceFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costPurchaseServiceTaxExclude,'0.00')}" required readonly title="服务采购成本上月结算总额"></td>
                                     <td><input type="text" class="number" name="costPurchaseService" value="${Utils.format(monthBean.costPurchaseService,'0.00')}" readonly required title="服务采购成本本月结算金额"></td>
@@ -1340,7 +1340,7 @@
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>其他</td>
-                                    <td><input name="costPurchaseOtherEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateCostPurchaseOther,'0.00')}" readonly required title="其他采购成本概算总额"></td>
+<#--                                    <td><input name="costPurchaseOtherEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateCostPurchaseOther,'0.00')}" readonly required title="其他采购成本概算总额"></td>-->
                                     <td><input name="costPurchaseOtherBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetCostPurchaseOther,'0.00')}" readonly required title="其他采购成本预算总额"></td>
                                     <td><input name="costPurchaseOtherFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costPurchaseOtherTaxExclude,'0.00')}" required readonly title="其他采购成本上月结算总额"></td>
                                     <td><input type="text" class="number" name="costPurchaseOther" value="${Utils.format(monthBean.costPurchaseOther,'0.00')}" readonly required title="其他采购成本本月结算金额"></td>
@@ -1350,7 +1350,7 @@
                                     <td>成本</td>
                                     <td>项目管理成本</td>
                                     <td>项目管理成本</td>
-                                    <td><input name="costProjectManageEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateCostProjectManage,'0.00')}" readonly required title="项目管理成本概算总额"></td>
+<#--                                    <td><input name="costProjectManageEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateCostProjectManage,'0.00')}" readonly required title="项目管理成本概算总额"></td>-->
                                     <td><input name="costProjectManageBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetCostProjectManage,'0.00')}" readonly required title="项目管理成本预算总额"></td>
                                     <td><input name="costProjectManageFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costProjectManageTaxExclude,'0.00')}" required readonly title="项目管理成本上月结算总额"></td>
                                     <td><input type="text" class="number" name="costProjectManage" value="${Utils.format(monthBean.costProjectManage,'0.00')}" readonly required title="项目管理成本本月结算金额"></td>
@@ -1360,7 +1360,7 @@
                                     <td>成本</td>
                                     <td>其他</td>
                                     <td style="width: 200px" class="huanhang">${project.otherName!}</td>
-                                    <td><input name="costOtherEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateCostOther,'0.00')}" readonly required 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>
@@ -1370,7 +1370,7 @@
                                     <td>合计</td>
                                     <td></td>
                                     <td></td>
-                                    <td><input name="costEstimateTotal" value="${Utils.format(monthBean.getEstimateCostTotal(),'0.00')}" type="text" class="number" readonly required title="此列累计"></td>
+<#--                                    <td><input name="costEstimateTotal" value="${Utils.format(monthBean.getEstimateCostTotal(),'0.00')}" type="text" class="number" readonly required title="此列累计"></td>-->
                                     <td><input name="costBudgetTotal" value="${Utils.format(monthBean.getBudgetCostTotal(),'0.00')}" type="text" class="number" readonly required title="此列累计"></td>
                                     <td><input name="costFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.getCostTotalTaxExclude(),'0.00')}" required readonly title="此列累计"></td>
                                     <td><input type="text" class="number" name="costTotal" value="${Utils.format(monthBean.getCostTotal(),'0.00')}" readonly title="此列累计"></td>
@@ -1384,7 +1384,7 @@
                                 <tr class="am-text-lg">
                                     <td>类别</td>
                                     <td>费用项目</td>
-                                    <td>概算总额（元）</td>
+<#--                                    <td>概算总额（元）</td>-->
                                     <td>预算总额（元）</td>
                                     <td>上月结算总额（元）</td>
                                     <td>本月结算金额（元）</td>
@@ -1393,7 +1393,7 @@
                                 <tr>
                                     <td>财务费用</td>
                                     <td>资金占用成本</td>
-                                    <td><input name="costExpropriationEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateCostExpropriation,'0.00')}" required readonly title="资金占用成本概算总额"></td>
+<#--                                    <td><input name="costExpropriationEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateCostExpropriation,'0.00')}" required readonly title="资金占用成本概算总额"></td>-->
                                     <td><input name="costExpropriationBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetCostExpropriation,'0.00')}" required readonly title="资金占用成本预算总额"></td>
                                     <td><input name="costExpropriationFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costExpropriationTaxExclude,'0.00')}" required readonly title="资金占用成本上月结算总额"></td>
                                     <td><input type="text" class="number" name="costExpropriation" value="${Utils.format(monthBean.costExpropriation,'0.00')}" readonly required title="资金占用成本本月结算金额"></td>
@@ -1402,7 +1402,7 @@
                                 <tr>
                                     <td>公司管理费用</td>
                                     <td></td>
-                                    <td><input name="costCompanyManageEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateCostCompanyManage,'0.00')}" required readonly title="公司管理费用概算总额"></td>
+<#--                                    <td><input name="costCompanyManageEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateCostCompanyManage,'0.00')}" required readonly title="公司管理费用概算总额"></td>-->
                                     <td><input name="costCompanyManageBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetCostCompanyManage,'0.00')}" required readonly title="公司管理费用预算总额"></td>
                                     <td><input name="costCompanyManageFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costCompanyManageTaxExclude,'0.00')}" required readonly title="公司管理费用上月结算总额"></td>
                                     <td><input type="text" class="number" name="costCompanyManage" value="${Utils.format(monthBean.costCompanyManage,'0.00')}" readonly required title="公司管理费用本月结算金额"></td>
@@ -1411,7 +1411,7 @@
                                 <tr>
                                     <td>所得税费用</td>
                                     <td></td>
-                                    <td>/</td>
+<#--                                    <td>/</td>-->
                                     <td>/</td>
                                     <td><input name="costIncomeTaxFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costIncomeTax,'0.00')}" required readonly title="公司管理费用上月结算总额"></td>
                                     <td><input type="text" class="number" name="costIncomeTax" value="${Utils.format(monthBean.costIncomeTax,'0.00')}" readonly required title="公司管理费用本月结算金额"></td>
@@ -1420,7 +1420,7 @@
                                 <tr>
                                     <td>合计</td>
                                     <td></td>
-                                    <td><input name="costManageEstimateTotal" value="${Utils.format(monthBean.getEstimateCostManageTotal(),'0.00')}" type="text" class="number" readonly required title="此列累计"></td>
+<#--                                    <td><input name="costManageEstimateTotal" value="${Utils.format(monthBean.getEstimateCostManageTotal(),'0.00')}" type="text" class="number" readonly required title="此列累计"></td>-->
                                     <td><input name="costManageBudgetTotal" value="${Utils.format(monthBean.getBudgetCostManageTotal(),'0.00')}" type="text" class="number" readonly required title="此列累计"></td>
                                     <td><input name="costManageFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.getCostManageTotal(),'0.00')}" required readonly title="此列累计"></td>
                                     <td><input type="text" class="number" name="costManageTotal" value="${Utils.format(monthBean.getCostManageTotal(),'0.00')}" readonly title="此列累计"></td>
@@ -1434,7 +1434,7 @@
                                 <tbody>
                                 <tr class="am-text-lg">
                                     <td>类别</td>
-                                    <td>概算总额（元）</td>
+<#--                                    <td>概算总额（元）</td>-->
                                     <td>预算总额（元）</td>
                                     <td>上月结算总额（元）</td>
                                     <td>本月结算金额（元）</td>
@@ -1443,7 +1443,7 @@
                                 </tr>
                                 <tr>
                                     <td>项目毛利</td>
-                                    <td><input name="grossProfitEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateGrossProfit,'0.00')}" required readonly title="项目毛利概算总额"></td>
+<#--                                    <td><input name="grossProfitEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateGrossProfit,'0.00')}" required readonly title="项目毛利概算总额"></td>-->
                                     <td><input name="grossProfitBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetGrossProfit,'0.00')}" required readonly title="项目毛利预算总额"></td>
                                     <td><input name="grossProfitFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.grossProfit,'0.00')}" required readonly title="项目毛利上月结算总额"></td>
                                     <td><input type="text" class="number" name="grossProfit" value="${Utils.format(monthBean.grossProfit,'0.00')}" readonly required title="项目毛利本月结算金额"></td>
@@ -1452,7 +1452,7 @@
                                 </tr>
                                 <tr>
                                     <td>项目贡献利润</td>
-                                    <td><input name="contributionProfitEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateContributionProfit,'0.00')}" required readonly title="项目贡献利润概算总额"></td>
+<#--                                    <td><input name="contributionProfitEstimateTotal" type="text" class="number" value="${Utils.format(monthBean.estimateContributionProfit,'0.00')}" required readonly title="项目贡献利润概算总额"></td>-->
                                     <td><input name="contributionProfitBudgetTotal" type="text" class="number" value="${Utils.format(monthBean.budgetContributionProfit,'0.00')}" required readonly title="项目贡献利润预算总额"></td>
                                     <td><input name="contributionProfitFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.contributionProfit,'0.00')}" required readonly title="项目贡献利润上月结算总额"></td>
                                     <td><input type="text" class="number" name="contributionProfit" value="${Utils.format(monthBean.contributionProfit,'0.00')}" required readonly title="项目贡献利润本月结算金额"></td>
@@ -1461,7 +1461,7 @@
                                 </tr>
                                 <tr>
                                     <td>项目净利润</td>
-                                    <td>/</td>
+<#--                                    <td>/</td>-->
                                     <td>/<#--<input name="netProfitBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.getProjectContributionProfit(),'0.00')}" required readonly title="项目净利润预算总额">--></td>
                                     <td><input name="netProfitFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.netProfit,'0.00')}" required readonly title="项目净利润上月结算总额"></td>
                                     <td><input type="text" class="number" name="netProfit" value="${Utils.format(monthBean.netProfit,'0.00')}" required readonly title="项目净利润本月结算金额"></td>
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index b319292..adbb786 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -233,153 +233,153 @@
             <!--验证表单元素（validate end-->
         </div>
 
-        <div class="am-tabs-bd">
-            <div class="am-tab-panel am-fade am-in" id="tab2">
-                <span>收入</span>
-                <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>收入</td>
-                        <td>设备类</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="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="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="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>
-                <span>成本</span>
-                <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>
-                        <td>不含税金额（元）</td>
-                    </tr>
-                    <tr>
-                        <td>成本</td>
-                        <td>采购成本</td>
-                        <td>设备</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="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="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="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="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 style="width: 300px" class="huanhang">${project.otherName!}</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>
-                        <td></td>
-                        <td></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>
-                <span>管理</span>
-                <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;">
-                    <tbody>
-                    <tr>
-                        <td>类别</td>
-                        <td>费用项目</td>
-                        <td>不含税金额（元）</td>
-                    </tr>
-                    <tr>
-                        <td>财务费用</td>
-                        <td>资金占用成本</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="text" class="number" name="costCompanyManageTaxExclude1" value="${Utils.format(estimateBean.costCompanyManageTaxExclude)}" required readonly></td>
-                    </tr>
-                    </tbody>
-                </table>
+<#--        <div class="am-tabs-bd">-->
+<#--            <div class="am-tab-panel am-fade am-in" id="tab2">-->
+<#--                <span>收入</span>-->
+<#--                <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>收入</td>-->
+<#--                        <td>设备类</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="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="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="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>-->
+<#--                <span>成本</span>-->
+<#--                <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>-->
+<#--                        <td>不含税金额（元）</td>-->
+<#--                    </tr>-->
+<#--                    <tr>-->
+<#--                        <td>成本</td>-->
+<#--                        <td>采购成本</td>-->
+<#--                        <td>设备</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="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="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="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="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 style="width: 300px" class="huanhang">${project.otherName!}</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>-->
+<#--                        <td></td>-->
+<#--                        <td></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>-->
+<#--                <span>管理</span>-->
+<#--                <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;">-->
+<#--                    <tbody>-->
+<#--                    <tr>-->
+<#--                        <td>类别</td>-->
+<#--                        <td>费用项目</td>-->
+<#--                        <td>不含税金额（元）</td>-->
+<#--                    </tr>-->
+<#--                    <tr>-->
+<#--                        <td>财务费用</td>-->
+<#--                        <td>资金占用成本</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="text" class="number" name="costCompanyManageTaxExclude1" value="${Utils.format(estimateBean.costCompanyManageTaxExclude)}" required readonly></td>-->
+<#--                    </tr>-->
+<#--                    </tbody>-->
+<#--                </table>-->
 
-                <span>利润率计算</span>
-                <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;">
-                    <tbody>
-                    <tr>
-                        <td>类别</td>
-                        <td></td>
-                    </tr>
-                    <tr>
-                        <td>项目毛利（元）</td>
-                        <td><input type="text" class="number" name="projectGrossProfit1" value="${Utils.format(estimateBean.projectGrossProfit)}" readonly title="收入总计（不含税）-成本总计（不含税）-财务费用总计（不含税）"></td>
-                    </tr>
-                    <tr>
-                        <td>项目毛利率（%）</td>
-                        <td><input type="text" class="number" name="projectGrossProfitRate1" value="${Utils.format(estimateBean.projectGrossProfitRate)}" readonly title="毛利（不含税）/收入总计（不含税）"></td>
-                    </tr>
-                    <tr>
-                        <td>项目贡献利润（元）</td>
-                        <td><input type="text" class="number" name="projectContributionProfit1" value="${Utils.format(estimateBean.projectContributionProfit)}" readonly title="项目毛利（不含税）-公司管理费用总计（不含税）"></td>
-                    </tr>
-                    <tr>
-                        <td>项目贡献利润率（%）</td>
-                        <td><input type="text" class="number" name="projectContributionProfitRate1" value="${Utils.format(estimateBean.projectContributionProfitRate)}" readonly title="贡献利润（不含税）/收入总计（不含税）"></td>
-                    </tr>
-                    </tbody>
-                </table>
-            </div>
-            <!--验证表单元素（validate end-->
-        </div>
+<#--                <span>利润率计算</span>-->
+<#--                <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;">-->
+<#--                    <tbody>-->
+<#--                    <tr>-->
+<#--                        <td>类别</td>-->
+<#--                        <td></td>-->
+<#--                    </tr>-->
+<#--                    <tr>-->
+<#--                        <td>项目毛利（元）</td>-->
+<#--                        <td><input type="text" class="number" name="projectGrossProfit1" value="${Utils.format(estimateBean.projectGrossProfit)}" readonly title="收入总计（不含税）-成本总计（不含税）-财务费用总计（不含税）"></td>-->
+<#--                    </tr>-->
+<#--                    <tr>-->
+<#--                        <td>项目毛利率（%）</td>-->
+<#--                        <td><input type="text" class="number" name="projectGrossProfitRate1" value="${Utils.format(estimateBean.projectGrossProfitRate)}" readonly title="毛利（不含税）/收入总计（不含税）"></td>-->
+<#--                    </tr>-->
+<#--                    <tr>-->
+<#--                        <td>项目贡献利润（元）</td>-->
+<#--                        <td><input type="text" class="number" name="projectContributionProfit1" value="${Utils.format(estimateBean.projectContributionProfit)}" readonly title="项目毛利（不含税）-公司管理费用总计（不含税）"></td>-->
+<#--                    </tr>-->
+<#--                    <tr>-->
+<#--                        <td>项目贡献利润率（%）</td>-->
+<#--                        <td><input type="text" class="number" name="projectContributionProfitRate1" value="${Utils.format(estimateBean.projectContributionProfitRate)}" readonly title="贡献利润（不含税）/收入总计（不含税）"></td>-->
+<#--                    </tr>-->
+<#--                    </tbody>-->
+<#--                </table>-->
+<#--            </div>-->
+<#--            <!--验证表单元素（validate end&ndash;&gt;-->
+<#--        </div>-->
 
         <div class="am-tabs-bd">
             <div class="am-tab-panel am-fade am-in" id="tab3">
diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl
index ef0924e..684e54a 100644
--- a/src/main/resources/templates/admin/project_estimate_add.ftl
+++ b/src/main/resources/templates/admin/project_estimate_add.ftl
@@ -12,7 +12,7 @@
             <div class="am-tabs am-margin" data-am-tabs>
                 <ul class="am-tabs-nav am-nav am-nav-tabs">
                     <li class="am-active"><a href="#tab1">项目基本信息</a></li>
-                    <li><a href="#tab2">项目详细信息</a></li>
+                    <li><a href="#tab2">项目其他信息</a></li>
                 </ul>
                 <div class="am-tabs-bd">
                     <div class="am-tab-panel am-fade am-in am-active" id="tab1">
@@ -27,6 +27,38 @@
                             <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">
+                                <input type="text" id="projectNo" class="am-input" data-validate-async data-validation-message="请输入项目编号（50字符以内）"
+                                       name="projectNo" placeholder="请输入项目编号（50字符以内）" maxlength="50"
+                                       value="${projectNo!}" readonly required />
+                            </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">
+                                <input type="text" id="name" class="am-input" data-validate-async data-validation-message="请输入项目名称（1000字符以内）"
+                                       name="name" placeholder="请输入项目名称（1000字符以内）" maxlength="1000"
+                                       value="" required />
+                            </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" style="font-size: small">
+                                <select data-am-selected id="type" name="type" >
+                                    <option value="1" >工程集成类</option>
+                                    <option value="2" >设备集成类</option>
+                                    <#--                                    <option value="3" >战略合作类</option>-->
+                                </select>
+                            </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-2 am-u-md-2">
@@ -54,37 +86,6 @@
                             <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">
-                                <input type="text" id="projectNo" class="am-input" data-validate-async data-validation-message="请输入项目编号（50字符以内）"
-                                       name="projectNo" placeholder="请输入项目编号（50字符以内）" maxlength="50"
-                                       value="" required />
-                            </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">
-                                <input type="text" id="name" class="am-input" data-validate-async data-validation-message="请输入项目名称（1000字符以内）"
-                                       name="name" placeholder="请输入项目名称（1000字符以内）" maxlength="1000"
-                                       value="" required />
-                            </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" style="font-size: small">
-                                <select data-am-selected id="type" name="type" >
-                                    <option value="1" >工程集成类</option>
-                                    <option value="2" >设备集成类</option>
-                                    <option value="3" >战略合作类</option>
-                                </select>
-                            </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">
@@ -98,6 +99,51 @@
                             <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">
+                                <input type="text" class="am-input" data-validate-async data-validation-message="请输入合作对象"
+                                       name="collaborator" id="collaborator" placeholder="请输入合作对象" maxlength="20"
+                                       value="" />
+                            </div>
+
+                            <div class="am-form-file am-text-xs">
+                                <button type="button" class="am-btn am-btn-primary am-btn-sm">
+                                    <i class="am-icon-cloud-upload"></i> 上传附件
+                                </button>
+                                <input id="fileupload_button_icon" type="file" name="files[]" multiple>
+                            </div>
+                            <!-- The global progress bar -->
+                            <div id="progress-area-icon" class="am-margin-top-sm am-hide">
+                                <div id="progress-text-icon" class="am-text-xs am-text-right"></div>
+                                <div id="progress" class="am-progress am-progress-xs">
+                                    <div class="am-progress-bar" style="width: 0%"></div>
+                                </div>
+                            </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">
+                                <select data-am-selected id="certainty" name="certainty">
+                                    <option value="1" >A：基本确定中标，待签合同，合同签订中</option>
+                                    <option value="2" >B：客户产品参数、商务评分、商务资质引导成功</option>
+                                    <option value="3" >C：项目初期引导阶段</option>
+                                </select>
+                            </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">
+                                <input type="text" class="am-input" data-validate-async data-validation-message="请输入行业场景应用"
+                                       name="industryScenario" id="industryScenario" placeholder="请输入行业场景应用" maxlength="20"
+                                       value="" required />
+                            </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">
@@ -107,6 +153,7 @@
                             </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">
@@ -116,6 +163,7 @@
                             </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">-->
@@ -143,15 +191,27 @@
                             </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">
-                                <input type="text" class="am-input" data-validate-async data-validation-message="请输入行业场景应用"
-                                       name="industryScenario" id="industryScenario" placeholder="请输入行业场景应用" maxlength="20"
+                                <input type="text" class="number am-input" data-validate-async data-validation-message="请输入项目毛利"
+                                       name="grossProfit" id="grossProfit" placeholder="单位（元）" maxlength="16"
                                        value="" required />
                             </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">
+                                <input type="text" class="number am-input" data-validate-async data-validation-message="请输入项目毛利率"
+                                       name="grossProfitMargin" id="grossProfitMargin" placeholder="单位（%）" maxlength="16"
+                                       value="" required />
+                            </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">
@@ -160,6 +220,25 @@
                             </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">
+                                <input type="text" class="number am-input" data-validation-message="汇智产品金额"
+                                       name="huizhiProductAmount" id="huizhiProductAmount" placeholder="单位（元）" maxlength="16" value="" />
+                            </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">
+                                <input type="text" class="number am-input" data-validation-message="华三产品金额"
+                                       name="huasanProductAmount" id="huasanProductAmount" placeholder="单位（元）" maxlength="16" value="" />
+                            </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">
@@ -168,16 +247,7 @@
                             </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">
-                                <textarea rows="3" cols="20" id="mainContractCollectionTerms" name="mainContractCollectionTerms" maxlength="1000"
-                                          class="am-input" data-validate-async data-validation-message="请输入收款条款"
-                                          placeholder="请输入收款条款" required
-                                ></textarea>
-                            </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">
@@ -191,248 +261,283 @@
                     </div>
                     <!--验证表单元素（validate end-->
                 </div>
+
                 <div class="am-tabs-bd">
                     <div class="am-tab-panel am-fade am-in" id="tab2">
-                        <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>
-                                    <td>税率</td>
-                                </tr>
-                                <tr>
-                                    <td>收入</td>
-                                    <td>设备类</td>
-                                    <td><input type="text" class="number" maxlength="16" name="incomeDeviceTaxInclude" id="incomeDeviceTaxInclude"></td>
-                                    <td><input type="text" class="number" maxlength="16" name="incomeDeviceTaxExclude" id="incomeDeviceTaxExclude" readonly></td>
-                                    <td>
-                                        <select data-am-selected name="incomeDeviceSelect" id="incomeDeviceSelect">
-                                        <option value="0">0%</option>
-                                        <option value="0.01">1%</option>
-                                        <option value="0.03">3%</option>
-                                        <option value="0.06">6%</option>
-                                        <option value="0.09">9%</option>
-                                        <option value="0.13">13%</option>
-                                        <option value="自定义">自定义</option>
-                                    </select>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>收入</td>
-                                    <td>工程类</td>
-                                    <td><input type="text" class="number" maxlength="16" name="incomeEngineerTaxInclude" id="incomeEngineerTaxInclude"></td>
-                                    <td><input type="text" class="number" maxlength="16" name="incomeEngineerTaxExclude" id="incomeEngineerTaxExclude" readonly></td>
-                                    <td>
-                                        <select data-am-selected name="incomeEngineerSelect" id="incomeEngineerSelect">
-                                            <option value="0">0%</option>
-                                            <option value="0.01">1%</option>
-                                            <option value="0.03">3%</option>
-                                            <option value="0.06">6%</option>
-                                            <option value="0.09">9%</option>
-                                            <option value="0.13">13%</option>
-                                            <option value="自定义">自定义</option>
-                                        </select>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>收入</td>
-                                    <td>服务类</td>
-                                    <td><input type="text" class="number" maxlength="16" name="incomeServiceTaxInclude" id="incomeServiceTaxInclude"></td>
-                                    <td><input type="text" class="number" maxlength="16" name="incomeServiceTaxExclude" id="incomeServiceTaxExclude" readonly></td>
-                                    <td>
-                                        <select data-am-selected name="incomeServiceSelect" id="incomeServiceSelect">
-                                            <option value="0">0%</option>
-                                            <option value="0.01">1%</option>
-                                            <option value="0.03">3%</option>
-                                            <option value="0.06">6%</option>
-                                            <option value="0.09">9%</option>
-                                            <option value="0.13">13%</option>
-                                            <option value="自定义">自定义</option>
-                                        </select>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>合计</td>
-                                    <td></td>
-                                    <td><input type="text" class="number" name="incomeTotalTaxInclude" readonly title="此列累计"></td>
-                                    <td><input type="text" class="number" name="incomeTotalTaxExclude" readonly title="此列累计"></td>
-                                    <td>/</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>
-                                    <td>费用项目</td>
-                                    <td>含税金额（元）</td>
-                                    <td>不含税金额（元）</td>
-                                    <td>税率</td>
-                                </tr>
-                                <tr>
-                                    <td>成本</td>
-                                    <td>采购成本</td>
-                                    <td>设备</td>
-                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseDeviceTaxInclude" id="costPurchaseDeviceTaxInclude"></td>
-                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseDeviceTaxExclude" id="costPurchaseDeviceTaxExclude" readonly></td>
-                                    <td>
-                                        <select data-am-selected name="costPurchaseDeviceSelect" id="costPurchaseDeviceSelect">
-                                            <option value="0">0%</option>
-                                            <option value="0.01">1%</option>
-                                            <option value="0.03">3%</option>
-                                            <option value="0.06">6%</option>
-                                            <option value="0.09">9%</option>
-                                            <option value="0.13">13%</option>
-                                            <option value="自定义">自定义</option>
-                                        </select>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>成本</td>
-                                    <td>采购成本</td>
-                                    <td>施工</td>
-                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseBuildTaxInclude" id="costPurchaseBuildTaxInclude"></td>
-                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseBuildTaxExclude" id="costPurchaseBuildTaxExclude" readonly></td>
-                                    <td>
-                                        <select data-am-selected name="costPurchaseBuildSelect" id="costPurchaseBuildSelect">
-                                            <option value="0">0%</option>
-                                            <option value="0.01">1%</option>
-                                            <option value="0.03">3%</option>
-                                            <option value="0.06">6%</option>
-                                            <option value="0.09">9%</option>
-                                            <option value="0.13">13%</option>
-                                            <option value="自定义">自定义</option>
-                                        </select>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>成本</td>
-                                    <td>采购成本</td>
-                                    <td>服务</td>
-                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseServiceTaxInclude" id="costPurchaseServiceTaxInclude"></td>
-                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseServiceTaxExclude" id="costPurchaseServiceTaxExclude" readonly></td>
-                                    <td>
-                                        <select data-am-selected name="costPurchaseServiceSelect" id="costPurchaseServiceSelect">
-                                            <option value="0">0%</option>
-                                            <option value="0.01">1%</option>
-                                            <option value="0.03">3%</option>
-                                            <option value="0.06">6%</option>
-                                            <option value="0.09">9%</option>
-                                            <option value="0.13">13%</option>
-                                            <option value="自定义">自定义</option>
-                                        </select>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>成本</td>
-                                    <td>采购成本</td>
-                                    <td>其他</td>
-                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseOtherTaxInclude" id="costPurchaseOtherTaxInclude"></td>
-                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseOtherTaxExclude" id="costPurchaseOtherTaxExclude" readonly></td>
-                                    <td>
-                                        <select data-am-selected name="costPurchaseOtherSelect" id="costPurchaseOtherSelect">
-                                            <option value="0">0%</option>
-                                            <option value="0.01">1%</option>
-                                            <option value="0.03">3%</option>
-                                            <option value="0.06">6%</option>
-                                            <option value="0.09">9%</option>
-                                            <option value="0.13">13%</option>
-                                            <option value="自定义">自定义</option>
-                                        </select>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>成本</td>
-                                    <td>项目管理成本</td>
-                                    <td>项目管理成本</td>
-                                    <td><input type="text" class="number" name="costProjectManageTaxInclude" id="costProjectManageTaxInclude" readonly></td>
-                                    <td><input type="text" class="number" maxlength="16" name="costProjectManageTaxExclude" id="costProjectManageTaxExclude"></td>
-                                    <td>/</td>
-                                </tr>
-                                <tr>
-                                    <td>成本</td>
-                                    <td>其他</td>
-                                    <td><input type="text" id="otherName" maxlength="50" data-validate-async data-validation-message="请输入其他类的名称（50字符以内）"
-                                               value="" name="otherName" placeholder="请输入其他类的名称（50字符以内）"/> </td>
-                                    <td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxInclude" id="costOtherOtherTaxInclude"></td>
-                                    <td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxExclude" id="costOtherOtherTaxExclude" readonly></td>
-                                    <td>
-                                        <select data-am-selected name="costOtherOtherSelect" id="costOtherOtherSelect">
-                                            <option value="0">0%</option>
-                                            <option value="0.01">1%</option>
-                                            <option value="0.03">3%</option>
-                                            <option value="0.06">6%</option>
-                                            <option value="0.09">9%</option>
-                                            <option value="0.13">13%</option>
-                                            <option value="自定义">自定义</option>
-                                        </select>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>合计</td>
-                                    <td></td>
-                                    <td></td>
-                                    <td><input type="text" class="number" name="costTotalTaxInclude" readonly title="此列累计"></td>
-                                    <td><input type="text" class="number" name="costTotalTaxExclude" readonly title="此列累计"></td>
-                                    <td>/</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>
-                                <td>不含税金额（元）</td>
-                            </tr>
-                            <tr>
-                                <td>财务费用</td>
-                                <td>资金占用成本</td>
-                                <td><input type="text" class="number" maxlength="16" name="costExpropriationTaxExclude" id="costExpropriationTaxExclude"></td>
-                            </tr>
-                            <tr>
-                                <td>公司管理费用</td>
-                                <td></td>
-                                <td><input type="text" class="number" maxlength="16" name="costCompanyManageTaxExclude" id="costCompanyManageTaxExclude"></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" readonly title="收入总计（不含税）-成本总计（不含税）-财务费用总计（不含税）"></td>
-                            </tr>
-                            <tr>
-                                <td>项目毛利率（%）</td>
-                                <td><input type="text" class="number" name="projectGrossProfitRate" readonly title="毛利（不含税）/收入总计（不含税）"></td>
-                            </tr>
-                            <tr>
-                                <td>项目贡献利润（元）</td>
-                                <td><input type="text" class="number" name="projectContributionProfit" readonly title="项目毛利（不含税）-公司管理费用总计（不含税）"></td>
-                            </tr>
-                            <tr>
-                                <td>项目贡献利润率（%）</td>
-                                <td><input type="text" class="number" name="projectContributionProfitRate" readonly title="贡献利润（不含税）/收入总计（不含税）"></td>
-                            </tr>
-                            </tbody>
-                        </table>
-                    </div>
-                    <!--验证表单元素（validate end-->
-                </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">
+                                <textarea rows="3" cols="20" id="mainContractCollectionTerms" name="mainContractCollectionTerms" maxlength="1000"
+                                          class="am-input" data-validate-async data-validation-message="请输入收款条款"
+                                          placeholder="请输入收款条款" required
+                                ></textarea>
+                            </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">
+                                <textarea rows="3" cols="20" id="mainContractResolvePlan" name="mainContractResolvePlan" maxlength="1000"
+                                          class="am-input" data-validate-async data-validation-message="请输入具体解决方案"
+                                          placeholder="请输入具体解决方案" required
+                                ></textarea>
+                            </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">
+                                <textarea rows="3" cols="20" id="CalculationCollection" name="CalculationCollection" maxlength="1000"
+                                          class="am-input" data-validate-async data-validation-message="按照开票金额及时间罗列计收计划"
+                                          placeholder="按照开票金额及时间罗列计收计划" required
+                                ></textarea>
+                            </div>
+                            <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
+                        </div>
+<#--                <div class="am-tabs-bd">-->
+<#--                    <div class="am-tab-panel am-fade am-in" id="tab2">-->
+<#--                        <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>-->
+<#--                                    <td>税率</td>-->
+<#--                                </tr>-->
+<#--                                <tr>-->
+<#--                                    <td>收入</td>-->
+<#--                                    <td>设备类</td>-->
+<#--                                    <td><input type="text" class="number" maxlength="16" name="incomeDeviceTaxInclude" id="incomeDeviceTaxInclude"></td>-->
+<#--                                    <td><input type="text" class="number" maxlength="16" name="incomeDeviceTaxExclude" id="incomeDeviceTaxExclude" readonly></td>-->
+<#--                                    <td>-->
+<#--                                        <select data-am-selected name="incomeDeviceSelect" id="incomeDeviceSelect">-->
+<#--                                        <option value="0">0%</option>-->
+<#--                                        <option value="0.01">1%</option>-->
+<#--                                        <option value="0.03">3%</option>-->
+<#--                                        <option value="0.06">6%</option>-->
+<#--                                        <option value="0.09">9%</option>-->
+<#--                                        <option value="0.13">13%</option>-->
+<#--                                        <option value="自定义">自定义</option>-->
+<#--                                    </select>-->
+<#--                                    </td>-->
+<#--                                </tr>-->
+<#--                                <tr>-->
+<#--                                    <td>收入</td>-->
+<#--                                    <td>工程类</td>-->
+<#--                                    <td><input type="text" class="number" maxlength="16" name="incomeEngineerTaxInclude" id="incomeEngineerTaxInclude"></td>-->
+<#--                                    <td><input type="text" class="number" maxlength="16" name="incomeEngineerTaxExclude" id="incomeEngineerTaxExclude" readonly></td>-->
+<#--                                    <td>-->
+<#--                                        <select data-am-selected name="incomeEngineerSelect" id="incomeEngineerSelect">-->
+<#--                                            <option value="0">0%</option>-->
+<#--                                            <option value="0.01">1%</option>-->
+<#--                                            <option value="0.03">3%</option>-->
+<#--                                            <option value="0.06">6%</option>-->
+<#--                                            <option value="0.09">9%</option>-->
+<#--                                            <option value="0.13">13%</option>-->
+<#--                                            <option value="自定义">自定义</option>-->
+<#--                                        </select>-->
+<#--                                    </td>-->
+<#--                                </tr>-->
+<#--                                <tr>-->
+<#--                                    <td>收入</td>-->
+<#--                                    <td>服务类</td>-->
+<#--                                    <td><input type="text" class="number" maxlength="16" name="incomeServiceTaxInclude" id="incomeServiceTaxInclude"></td>-->
+<#--                                    <td><input type="text" class="number" maxlength="16" name="incomeServiceTaxExclude" id="incomeServiceTaxExclude" readonly></td>-->
+<#--                                    <td>-->
+<#--                                        <select data-am-selected name="incomeServiceSelect" id="incomeServiceSelect">-->
+<#--                                            <option value="0">0%</option>-->
+<#--                                            <option value="0.01">1%</option>-->
+<#--                                            <option value="0.03">3%</option>-->
+<#--                                            <option value="0.06">6%</option>-->
+<#--                                            <option value="0.09">9%</option>-->
+<#--                                            <option value="0.13">13%</option>-->
+<#--                                            <option value="自定义">自定义</option>-->
+<#--                                        </select>-->
+<#--                                    </td>-->
+<#--                                </tr>-->
+<#--                                <tr>-->
+<#--                                    <td>合计</td>-->
+<#--                                    <td></td>-->
+<#--                                    <td><input type="text" class="number" name="incomeTotalTaxInclude" readonly title="此列累计"></td>-->
+<#--                                    <td><input type="text" class="number" name="incomeTotalTaxExclude" readonly title="此列累计"></td>-->
+<#--                                    <td>/</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>-->
+<#--                                    <td>费用项目</td>-->
+<#--                                    <td>含税金额（元）</td>-->
+<#--                                    <td>不含税金额（元）</td>-->
+<#--                                    <td>税率</td>-->
+<#--                                </tr>-->
+<#--                                <tr>-->
+<#--                                    <td>成本</td>-->
+<#--                                    <td>采购成本</td>-->
+<#--                                    <td>设备</td>-->
+<#--                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseDeviceTaxInclude" id="costPurchaseDeviceTaxInclude"></td>-->
+<#--                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseDeviceTaxExclude" id="costPurchaseDeviceTaxExclude" readonly></td>-->
+<#--                                    <td>-->
+<#--                                        <select data-am-selected name="costPurchaseDeviceSelect" id="costPurchaseDeviceSelect">-->
+<#--                                            <option value="0">0%</option>-->
+<#--                                            <option value="0.01">1%</option>-->
+<#--                                            <option value="0.03">3%</option>-->
+<#--                                            <option value="0.06">6%</option>-->
+<#--                                            <option value="0.09">9%</option>-->
+<#--                                            <option value="0.13">13%</option>-->
+<#--                                            <option value="自定义">自定义</option>-->
+<#--                                        </select>-->
+<#--                                    </td>-->
+<#--                                </tr>-->
+<#--                                <tr>-->
+<#--                                    <td>成本</td>-->
+<#--                                    <td>采购成本</td>-->
+<#--                                    <td>施工</td>-->
+<#--                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseBuildTaxInclude" id="costPurchaseBuildTaxInclude"></td>-->
+<#--                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseBuildTaxExclude" id="costPurchaseBuildTaxExclude" readonly></td>-->
+<#--                                    <td>-->
+<#--                                        <select data-am-selected name="costPurchaseBuildSelect" id="costPurchaseBuildSelect">-->
+<#--                                            <option value="0">0%</option>-->
+<#--                                            <option value="0.01">1%</option>-->
+<#--                                            <option value="0.03">3%</option>-->
+<#--                                            <option value="0.06">6%</option>-->
+<#--                                            <option value="0.09">9%</option>-->
+<#--                                            <option value="0.13">13%</option>-->
+<#--                                            <option value="自定义">自定义</option>-->
+<#--                                        </select>-->
+<#--                                    </td>-->
+<#--                                </tr>-->
+<#--                                <tr>-->
+<#--                                    <td>成本</td>-->
+<#--                                    <td>采购成本</td>-->
+<#--                                    <td>服务</td>-->
+<#--                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseServiceTaxInclude" id="costPurchaseServiceTaxInclude"></td>-->
+<#--                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseServiceTaxExclude" id="costPurchaseServiceTaxExclude" readonly></td>-->
+<#--                                    <td>-->
+<#--                                        <select data-am-selected name="costPurchaseServiceSelect" id="costPurchaseServiceSelect">-->
+<#--                                            <option value="0">0%</option>-->
+<#--                                            <option value="0.01">1%</option>-->
+<#--                                            <option value="0.03">3%</option>-->
+<#--                                            <option value="0.06">6%</option>-->
+<#--                                            <option value="0.09">9%</option>-->
+<#--                                            <option value="0.13">13%</option>-->
+<#--                                            <option value="自定义">自定义</option>-->
+<#--                                        </select>-->
+<#--                                    </td>-->
+<#--                                </tr>-->
+<#--                                <tr>-->
+<#--                                    <td>成本</td>-->
+<#--                                    <td>采购成本</td>-->
+<#--                                    <td>其他</td>-->
+<#--                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseOtherTaxInclude" id="costPurchaseOtherTaxInclude"></td>-->
+<#--                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseOtherTaxExclude" id="costPurchaseOtherTaxExclude" readonly></td>-->
+<#--                                    <td>-->
+<#--                                        <select data-am-selected name="costPurchaseOtherSelect" id="costPurchaseOtherSelect">-->
+<#--                                            <option value="0">0%</option>-->
+<#--                                            <option value="0.01">1%</option>-->
+<#--                                            <option value="0.03">3%</option>-->
+<#--                                            <option value="0.06">6%</option>-->
+<#--                                            <option value="0.09">9%</option>-->
+<#--                                            <option value="0.13">13%</option>-->
+<#--                                            <option value="自定义">自定义</option>-->
+<#--                                        </select>-->
+<#--                                    </td>-->
+<#--                                </tr>-->
+<#--                                <tr>-->
+<#--                                    <td>成本</td>-->
+<#--                                    <td>项目管理成本</td>-->
+<#--                                    <td>项目管理成本</td>-->
+<#--                                    <td><input type="text" class="number" name="costProjectManageTaxInclude" id="costProjectManageTaxInclude" readonly></td>-->
+<#--                                    <td><input type="text" class="number" maxlength="16" name="costProjectManageTaxExclude" id="costProjectManageTaxExclude"></td>-->
+<#--                                    <td>/</td>-->
+<#--                                </tr>-->
+<#--                                <tr>-->
+<#--                                    <td>成本</td>-->
+<#--                                    <td>其他</td>-->
+<#--                                    <td><input type="text" id="otherName" maxlength="50" data-validate-async data-validation-message="请输入其他类的名称（50字符以内）"-->
+<#--                                               value="" name="otherName" placeholder="请输入其他类的名称（50字符以内）"/> </td>-->
+<#--                                    <td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxInclude" id="costOtherOtherTaxInclude"></td>-->
+<#--                                    <td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxExclude" id="costOtherOtherTaxExclude" readonly></td>-->
+<#--                                    <td>-->
+<#--                                        <select data-am-selected name="costOtherOtherSelect" id="costOtherOtherSelect">-->
+<#--                                            <option value="0">0%</option>-->
+<#--                                            <option value="0.01">1%</option>-->
+<#--                                            <option value="0.03">3%</option>-->
+<#--                                            <option value="0.06">6%</option>-->
+<#--                                            <option value="0.09">9%</option>-->
+<#--                                            <option value="0.13">13%</option>-->
+<#--                                            <option value="自定义">自定义</option>-->
+<#--                                        </select>-->
+<#--                                    </td>-->
+<#--                                </tr>-->
+<#--                                <tr>-->
+<#--                                    <td>合计</td>-->
+<#--                                    <td></td>-->
+<#--                                    <td></td>-->
+<#--                                    <td><input type="text" class="number" name="costTotalTaxInclude" readonly title="此列累计"></td>-->
+<#--                                    <td><input type="text" class="number" name="costTotalTaxExclude" readonly title="此列累计"></td>-->
+<#--                                    <td>/</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>-->
+<#--                                <td>不含税金额（元）</td>-->
+<#--                            </tr>-->
+<#--                            <tr>-->
+<#--                                <td>财务费用</td>-->
+<#--                                <td>资金占用成本</td>-->
+<#--                                <td><input type="text" class="number" maxlength="16" name="costExpropriationTaxExclude" id="costExpropriationTaxExclude"></td>-->
+<#--                            </tr>-->
+<#--                            <tr>-->
+<#--                                <td>公司管理费用</td>-->
+<#--                                <td></td>-->
+<#--                                <td><input type="text" class="number" maxlength="16" name="costCompanyManageTaxExclude" id="costCompanyManageTaxExclude"></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" readonly title="收入总计（不含税）-成本总计（不含税）-财务费用总计（不含税）"></td>-->
+<#--                            </tr>-->
+<#--                            <tr>-->
+<#--                                <td>项目毛利率（%）</td>-->
+<#--                                <td><input type="text" class="number" name="projectGrossProfitRate" readonly title="毛利（不含税）/收入总计（不含税）"></td>-->
+<#--                            </tr>-->
+<#--                            <tr>-->
+<#--                                <td>项目贡献利润（元）</td>-->
+<#--                                <td><input type="text" class="number" name="projectContributionProfit" readonly title="项目毛利（不含税）-公司管理费用总计（不含税）"></td>-->
+<#--                            </tr>-->
+<#--                            <tr>-->
+<#--                                <td>项目贡献利润率（%）</td>-->
+<#--                                <td><input type="text" class="number" name="projectContributionProfitRate" readonly title="贡献利润（不含税）/收入总计（不含税）"></td>-->
+<#--                            </tr>-->
+<#--                            </tbody>-->
+<#--                        </table>-->
+<#--                    </div>-->
+<#--                    <!--验证表单元素（validate end&ndash;&gt;-->
+<#--                </div>-->
             </div>
             <!--选项卡（tabs）end-->
             <div class="am-margin">
diff --git a/src/main/resources/templates/admin/project_estimate_edit.ftl b/src/main/resources/templates/admin/project_estimate_edit.ftl
index 7072a30..1bfd53f 100644
--- a/src/main/resources/templates/admin/project_estimate_edit.ftl
+++ b/src/main/resources/templates/admin/project_estimate_edit.ftl
@@ -67,7 +67,7 @@
                     <div class="am-u-sm-6 am-u-md-6">
                         <input type="text" id="projectNo" class="am-input" data-validate-async data-validation-message="请输入项目编号（50字符以内）"
                                name="projectNo" placeholder="请输入项目编号（50字符以内）" maxlength="50"
-                               value="${project.projectNo!}" required />
+                               value="${project.projectNo!}" required readonly />
                     </div>
                     <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                 </div>
@@ -88,7 +88,7 @@
                         <select data-am-selected id="type" name="type">
                             <option value="1" <#if project.type=1>selected</#if>>工程集成类</option>
                             <option value="2" <#if project.type=2>selected</#if>>设备集成类</option>
-                            <option value="3" <#if project.type=3>selected</#if>>战略合作类</option>
+<#--                            <option value="3" <#if project.type=3>selected</#if>>战略合作类</option>-->
                         </select>
                     </div>
                     <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
@@ -199,247 +199,246 @@
             </div>
             <!--验证表单元素（validate end-->
         </div>
-        <div class="am-tabs-bd">
-            <div class="am-tab-panel am-fade am-in" id="tab2">
-                <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>
-                            <td>税率</td>
-                        </tr>
-                        <tr>
-                            <td>收入</td>
-                            <td>设备类</td>
-                            <td><input type="text" class="number" maxlength="16" name="incomeDeviceTaxInclude" id="incomeDeviceTaxInclude" value="${Utils.format(estimateBean.incomeDeviceTaxInclude)}" required></td>
-                            <td><input type="text" class="number" maxlength="16" name="incomeDeviceTaxExclude" id="incomeDeviceTaxExclude" value="${Utils.format(estimateBean.incomeDeviceTaxExclude)}" <#if estimateBean.incomeDeviceSelect! !="自定义">readonly</#if> required></td>
-                            <td>
-                                <select data-am-selected name="incomeDeviceSelect" id="incomeDeviceSelect">
-                                    <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>
-                                    <option value="0.06" <#if estimateBean.incomeDeviceSelect! =="0.06">selected</#if>>6%</option>
-                                    <option value="0.09" <#if estimateBean.incomeDeviceSelect! =="0.09">selected</#if>>9%</option>
-                                    <option value="0.13" <#if estimateBean.incomeDeviceSelect! =="0.13">selected</#if>>13%</option>
-                                    <option value="自定义" <#if estimateBean.incomeDeviceSelect! =="自定义">selected</#if>>自定义</option>
-                                </select>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>收入</td>
-                            <td>工程类</td>
-                            <td><input type="text" class="number" maxlength="16" name="incomeEngineerTaxInclude" id="incomeEngineerTaxInclude" value="${Utils.format(estimateBean.incomeEngineerTaxInclude)}" required></td>
-                            <td><input type="text" class="number" maxlength="16" name="incomeEngineerTaxExclude" id="incomeEngineerTaxExclude" value="${Utils.format(estimateBean.incomeEngineerTaxExclude)}" <#if estimateBean.incomeEngineerSelect! !="自定义">readonly</#if> required></td>
-                            <td>
-                                <select data-am-selected name="incomeEngineerSelect" id="incomeEngineerSelect">
-                                    <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>
-                                    <option value="0.06" <#if estimateBean.incomeEngineerSelect! =="0.06">selected</#if>>6%</option>
-                                    <option value="0.09" <#if estimateBean.incomeEngineerSelect! =="0.09">selected</#if>>9%</option>
-                                    <option value="0.13" <#if estimateBean.incomeEngineerSelect! =="0.13">selected</#if>>13%</option>
-                                    <option value="自定义" <#if estimateBean.incomeEngineerSelect! =="自定义">selected</#if>>自定义</option>
-                                </select>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>收入</td>
-                            <td>服务类</td>
-                            <td><input type="text" class="number" maxlength="16" name="incomeServiceTaxInclude" id="incomeServiceTaxInclude" value="${Utils.format(estimateBean.incomeServiceTaxInclude)}" required></td>
-                            <td><input type="text" class="number" maxlength="16" name="incomeServiceTaxExclude" id="incomeServiceTaxExclude" value="${Utils.format(estimateBean.incomeServiceTaxExclude)}" <#if estimateBean.incomeServiceSelect! !="自定义">readonly</#if> required></td>
-                            <td>
-                                <select data-am-selected name="incomeServiceSelect" id="incomeServiceSelect">
-                                    <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>
-                                    <option value="0.06" <#if estimateBean.incomeServiceSelect! =="0.06">selected</#if>>6%</option>
-                                    <option value="0.09" <#if estimateBean.incomeServiceSelect! =="0.09">selected</#if>>9%</option>
-                                    <option value="0.13" <#if estimateBean.incomeServiceSelect! =="0.13">selected</#if>>13%</option>
-                                    <option value="自定义" <#if estimateBean.incomeServiceSelect! =="自定义">selected</#if>>自定义</option>
-                                </select>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>合计</td>
-                            <td></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>
-                </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>
-                            <td>费用项目</td>
-                            <td>含税金额（元）</td>
-                            <td>不含税金额（元）</td>
-                            <td>税率</td>
-                        </tr>
-                        <tr>
-                            <td>成本</td>
-                            <td>采购成本</td>
-                            <td>设备</td>
-                            <td><input type="text" class="number" maxlength="16" name="costPurchaseDeviceTaxInclude" id="costPurchaseDeviceTaxInclude" value="${Utils.format(estimateBean.costPurchaseDeviceTaxInclude)}" required></td>
-                            <td><input type="text" class="number" maxlength="16" name="costPurchaseDeviceTaxExclude" id="costPurchaseDeviceTaxExclude" value="${Utils.format(estimateBean.costPurchaseDeviceTaxExclude)}" <#if estimateBean.costPurchaseDeviceSelect! !="自定义">readonly</#if> required></td>
-                            <td>
-                                <select data-am-selected name="costPurchaseDeviceSelect" id="costPurchaseDeviceSelect">
-                                    <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>
-                                    <option value="0.06" <#if estimateBean.costPurchaseDeviceSelect! =="0.06">selected</#if>>6%</option>
-                                    <option value="0.09" <#if estimateBean.costPurchaseDeviceSelect! =="0.09">selected</#if>>9%</option>
-                                    <option value="0.13" <#if estimateBean.costPurchaseDeviceSelect! =="0.13">selected</#if>>13%</option>
-                                    <option value="自定义" <#if estimateBean.costPurchaseDeviceSelect! =="自定义">selected</#if>>自定义</option>
-                                </select>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>成本</td>
-                            <td>采购成本</td>
-                            <td>施工</td>
-                            <td><input type="text" class="number" maxlength="16" name="costPurchaseBuildTaxInclude" id="costPurchaseBuildTaxInclude" value="${Utils.format(estimateBean.costPurchaseBuildTaxInclude)}" required></td>
-                            <td><input type="text" class="number" maxlength="16" name="costPurchaseBuildTaxExclude" id="costPurchaseBuildTaxExclude" value="${Utils.format(estimateBean.costPurchaseBuildTaxExclude)}" <#if estimateBean.costPurchaseBuildSelect! !="自定义">readonly</#if> required></td>
-                            <td>
-                                <select data-am-selected name="costPurchaseBuildSelect" id="costPurchaseBuildSelect">
-                                    <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>
-                                    <option value="0.06" <#if estimateBean.costPurchaseBuildSelect! =="0.06">selected</#if>>6%</option>
-                                    <option value="0.09" <#if estimateBean.costPurchaseBuildSelect! =="0.09">selected</#if>>9%</option>
-                                    <option value="0.13" <#if estimateBean.costPurchaseBuildSelect! =="0.13">selected</#if>>13%</option>
-                                    <option value="自定义" <#if estimateBean.costPurchaseBuildSelect! =="自定义">selected</#if>>自定义</option>
-                                </select>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>成本</td>
-                            <td>采购成本</td>
-                            <td>服务</td>
-                            <td><input type="text" class="number" maxlength="16" name="costPurchaseServiceTaxInclude" id="costPurchaseServiceTaxInclude" value="${Utils.format(estimateBean.costPurchaseServiceTaxInclude)}" required></td>
-                            <td><input type="text" class="number" maxlength="16" name="costPurchaseServiceTaxExclude" id="costPurchaseServiceTaxExclude" value="${Utils.format(estimateBean.costPurchaseServiceTaxExclude)}" <#if estimateBean.costPurchaseServiceSelect! !="自定义">readonly</#if> required></td>
-                            <td>
-                                <select data-am-selected name="costPurchaseServiceSelect" id="costPurchaseServiceSelect">
-                                    <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>
-                                    <option value="0.06" <#if estimateBean.costPurchaseServiceSelect! =="0.06">selected</#if>>6%</option>
-                                    <option value="0.09" <#if estimateBean.costPurchaseServiceSelect! =="0.09">selected</#if>>9%</option>
-                                    <option value="0.13" <#if estimateBean.costPurchaseServiceSelect! =="0.13">selected</#if>>13%</option>
-                                    <option value="自定义" <#if estimateBean.costPurchaseServiceSelect! =="自定义">selected</#if>>自定义</option>
-                                </select>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>成本</td>
-                            <td>采购成本</td>
-                            <td>其他</td>
-                            <td><input type="text" class="number" maxlength="16" name="costPurchaseOtherTaxInclude" id="costPurchaseOtherTaxInclude" value="${Utils.format(estimateBean.costPurchaseOtherTaxInclude)}" required></td>
-                            <td><input type="text" class="number" maxlength="16" name="costPurchaseOtherTaxExclude" id="costPurchaseOtherTaxExclude" value="${Utils.format(estimateBean.costPurchaseOtherTaxExclude)}" <#if estimateBean.costPurchaseOtherSelect! !="自定义">readonly</#if> required></td>
-                            <td>
-                                <select data-am-selected name="costPurchaseOtherSelect" id="costPurchaseOtherSelect">
-                                    <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>
-                                    <option value="0.06" <#if estimateBean.costPurchaseOtherSelect! =="0.06">selected</#if>>6%</option>
-                                    <option value="0.09" <#if estimateBean.costPurchaseOtherSelect! =="0.09">selected</#if>>9%</option>
-                                    <option value="0.13" <#if estimateBean.costPurchaseOtherSelect! =="0.13">selected</#if>>13%</option>
-                                    <option value="自定义" <#if estimateBean.costPurchaseOtherSelect! =="自定义">selected</#if>>自定义</option>
-                                </select>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>成本</td>
-                            <td>项目管理成本</td>
-                            <td>项目管理成本</td>
-                            <td><input type="text" class="number" name="costProjectManageTaxInclude" id="costProjectManageTaxInclude" value="${Utils.format(estimateBean.costProjectManageTaxInclude)}" required readonly></td>
-                            <td><input type="text" class="number" maxlength="16" name="costProjectManageTaxExclude" id="costProjectManageTaxExclude" value="${Utils.format(estimateBean.costProjectManageTaxExclude)}" required></td>
-                        </tr>
-                        <tr>
-                            <td>成本</td>
-                            <td>其他</td>
-                            <td><input type="text" id="otherName" maxlength="50" data-validate-async data-validation-message="请输入其他类的名称（50字符以内）"
-                                       value="${project.otherName!}" name="otherName" placeholder="请输入其他类的名称（50字符以内）"/> </td>
-                            <td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxInclude" id="costOtherOtherTaxInclude" value="${Utils.format(estimateBean.costOtherOtherTaxInclude, "0.00")}"></td>
-                            <td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxExclude" id="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="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>
-                                    <option value="0.06" <#if estimateBean.costOtherOtherSelect! =="0.06">selected</#if>>6%</option>
-                                    <option value="0.09" <#if estimateBean.costOtherOtherSelect! =="0.09">selected</#if>>9%</option>
-                                    <option value="0.13" <#if estimateBean.costOtherOtherSelect! =="0.13">selected</#if>>13%</option>
-                                    <option value="自定义" <#if estimateBean.costOtherOtherSelect! =="自定义">selected</#if>>自定义</option>
-                                </select>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>合计</td>
-                            <td></td>
-                            <td></td>
-                            <td><input type="text" class="number" name="costTotalTaxInclude" value="${Utils.format(estimateBean.costTotalTaxInclude)}" readonly title="此列累计"></td>
-                            <td><input type="text" class="number" name="costTotalTaxExclude" value="${Utils.format(estimateBean.costTotalTaxExclude)}" readonly title="此列累计"></td>
-                            <td>/</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>
-                        <td>不含税金额（元）</td>
-                    </tr>
-                    <tr>
-                        <td>财务费用</td>
-                        <td>资金占用成本</td>
-                        <td><input type="text" class="number" maxlength="16" name="costExpropriationTaxExclude" id="costExpropriationTaxExclude" value="${Utils.format(estimateBean.costExpropriationTaxExclude)}" required></td>
-                    </tr>
-                    <tr>
-                        <td>公司管理费用</td>
-                        <td></td>
-                        <td><input type="text" class="number" maxlength="16" name="costCompanyManageTaxExclude" id="costCompanyManageTaxExclude" value="${Utils.format(estimateBean.costCompanyManageTaxExclude)}" required></td>
-                    </tr>
-                    </tbody>
-                </table>
+<#--        <div class="am-tabs-bd">-->
+<#--            <div class="am-tab-panel am-fade am-in" id="tab2">-->
+<#--                <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>-->
+<#--                            <td>税率</td>-->
+<#--                        </tr>-->
+<#--                        <tr>-->
+<#--                            <td>收入</td>-->
+<#--                            <td>设备类</td>-->
+<#--                            <td><input type="text" class="number" maxlength="16" name="incomeDeviceTaxInclude" id="incomeDeviceTaxInclude" value="${Utils.format(estimateBean.incomeDeviceTaxInclude)}" required></td>-->
+<#--                            <td><input type="text" class="number" maxlength="16" name="incomeDeviceTaxExclude" id="incomeDeviceTaxExclude" value="${Utils.format(estimateBean.incomeDeviceTaxExclude)}" <#if estimateBean.incomeDeviceSelect! !="自定义">readonly</#if> required></td>-->
+<#--                            <td>-->
+<#--                                <select data-am-selected name="incomeDeviceSelect" id="incomeDeviceSelect">-->
+<#--                                    <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>-->
+<#--                                    <option value="0.06" <#if estimateBean.incomeDeviceSelect! =="0.06">selected</#if>>6%</option>-->
+<#--                                    <option value="0.09" <#if estimateBean.incomeDeviceSelect! =="0.09">selected</#if>>9%</option>-->
+<#--                                    <option value="0.13" <#if estimateBean.incomeDeviceSelect! =="0.13">selected</#if>>13%</option>-->
+<#--                                    <option value="自定义" <#if estimateBean.incomeDeviceSelect! =="自定义">selected</#if>>自定义</option>-->
+<#--                                </select>-->
+<#--                            </td>-->
+<#--                        </tr>-->
+<#--                        <tr>-->
+<#--                            <td>收入</td>-->
+<#--                            <td>工程类</td>-->
+<#--                            <td><input type="text" class="number" maxlength="16" name="incomeEngineerTaxInclude" id="incomeEngineerTaxInclude" value="${Utils.format(estimateBean.incomeEngineerTaxInclude)}" required></td>-->
+<#--                            <td><input type="text" class="number" maxlength="16" name="incomeEngineerTaxExclude" id="incomeEngineerTaxExclude" value="${Utils.format(estimateBean.incomeEngineerTaxExclude)}" <#if estimateBean.incomeEngineerSelect! !="自定义">readonly</#if> required></td>-->
+<#--                            <td>-->
+<#--                                <select data-am-selected name="incomeEngineerSelect" id="incomeEngineerSelect">-->
+<#--                                    <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>-->
+<#--                                    <option value="0.06" <#if estimateBean.incomeEngineerSelect! =="0.06">selected</#if>>6%</option>-->
+<#--                                    <option value="0.09" <#if estimateBean.incomeEngineerSelect! =="0.09">selected</#if>>9%</option>-->
+<#--                                    <option value="0.13" <#if estimateBean.incomeEngineerSelect! =="0.13">selected</#if>>13%</option>-->
+<#--                                    <option value="自定义" <#if estimateBean.incomeEngineerSelect! =="自定义">selected</#if>>自定义</option>-->
+<#--                                </select>-->
+<#--                            </td>-->
+<#--                        </tr>-->
+<#--                        <tr>-->
+<#--                            <td>收入</td>-->
+<#--                            <td>服务类</td>-->
+<#--                            <td><input type="text" class="number" maxlength="16" name="incomeServiceTaxInclude" id="incomeServiceTaxInclude" value="${Utils.format(estimateBean.incomeServiceTaxInclude)}" required></td>-->
+<#--                            <td><input type="text" class="number" maxlength="16" name="incomeServiceTaxExclude" id="incomeServiceTaxExclude" value="${Utils.format(estimateBean.incomeServiceTaxExclude)}" <#if estimateBean.incomeServiceSelect! !="自定义">readonly</#if> required></td>-->
+<#--                            <td>-->
+<#--                                <select data-am-selected name="incomeServiceSelect" id="incomeServiceSelect">-->
+<#--                                    <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>-->
+<#--                                    <option value="0.06" <#if estimateBean.incomeServiceSelect! =="0.06">selected</#if>>6%</option>-->
+<#--                                    <option value="0.09" <#if estimateBean.incomeServiceSelect! =="0.09">selected</#if>>9%</option>-->
+<#--                                    <option value="0.13" <#if estimateBean.incomeServiceSelect! =="0.13">selected</#if>>13%</option>-->
+<#--                                    <option value="自定义" <#if estimateBean.incomeServiceSelect! =="自定义">selected</#if>>自定义</option>-->
+<#--                                </select>-->
+<#--                            </td>-->
+<#--                        </tr>-->
+<#--                        <tr>-->
+<#--                            <td>合计</td>-->
+<#--                            <td></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>-->
+<#--                </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>-->
+<#--                            <td>费用项目</td>-->
+<#--                            <td>含税金额（元）</td>-->
+<#--                            <td>不含税金额（元）</td>-->
+<#--                            <td>税率</td>-->
+<#--                        </tr>-->
+<#--                        <tr>-->
+<#--                            <td>成本</td>-->
+<#--                            <td>采购成本</td>-->
+<#--                            <td>设备</td>-->
+<#--                            <td><input type="text" class="number" maxlength="16" name="costPurchaseDeviceTaxInclude" id="costPurchaseDeviceTaxInclude" value="${Utils.format(estimateBean.costPurchaseDeviceTaxInclude)}" required></td>-->
+<#--                            <td><input type="text" class="number" maxlength="16" name="costPurchaseDeviceTaxExclude" id="costPurchaseDeviceTaxExclude" value="${Utils.format(estimateBean.costPurchaseDeviceTaxExclude)}" <#if estimateBean.costPurchaseDeviceSelect! !="自定义">readonly</#if> required></td>-->
+<#--                            <td>-->
+<#--                                <select data-am-selected name="costPurchaseDeviceSelect" id="costPurchaseDeviceSelect">-->
+<#--                                    <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>-->
+<#--                                    <option value="0.06" <#if estimateBean.costPurchaseDeviceSelect! =="0.06">selected</#if>>6%</option>-->
+<#--                                    <option value="0.09" <#if estimateBean.costPurchaseDeviceSelect! =="0.09">selected</#if>>9%</option>-->
+<#--                                    <option value="0.13" <#if estimateBean.costPurchaseDeviceSelect! =="0.13">selected</#if>>13%</option>-->
+<#--                                    <option value="自定义" <#if estimateBean.costPurchaseDeviceSelect! =="自定义">selected</#if>>自定义</option>-->
+<#--                                </select>-->
+<#--                            </td>-->
+<#--                        </tr>-->
+<#--                        <tr>-->
+<#--                            <td>成本</td>-->
+<#--                            <td>采购成本</td>-->
+<#--                            <td>施工</td>-->
+<#--                            <td><input type="text" class="number" maxlength="16" name="costPurchaseBuildTaxInclude" id="costPurchaseBuildTaxInclude" value="${Utils.format(estimateBean.costPurchaseBuildTaxInclude)}" required></td>-->
+<#--                            <td><input type="text" class="number" maxlength="16" name="costPurchaseBuildTaxExclude" id="costPurchaseBuildTaxExclude" value="${Utils.format(estimateBean.costPurchaseBuildTaxExclude)}" <#if estimateBean.costPurchaseBuildSelect! !="自定义">readonly</#if> required></td>-->
+<#--                            <td>-->
+<#--                                <select data-am-selected name="costPurchaseBuildSelect" id="costPurchaseBuildSelect">-->
+<#--                                    <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>-->
+<#--                                    <option value="0.06" <#if estimateBean.costPurchaseBuildSelect! =="0.06">selected</#if>>6%</option>-->
+<#--                                    <option value="0.09" <#if estimateBean.costPurchaseBuildSelect! =="0.09">selected</#if>>9%</option>-->
+<#--                                    <option value="0.13" <#if estimateBean.costPurchaseBuildSelect! =="0.13">selected</#if>>13%</option>-->
+<#--                                    <option value="自定义" <#if estimateBean.costPurchaseBuildSelect! =="自定义">selected</#if>>自定义</option>-->
+<#--                                </select>-->
+<#--                            </td>-->
+<#--                        </tr>-->
+<#--                        <tr>-->
+<#--                            <td>成本</td>-->
+<#--                            <td>采购成本</td>-->
+<#--                            <td>服务</td>-->
+<#--                            <td><input type="text" class="number" maxlength="16" name="costPurchaseServiceTaxInclude" id="costPurchaseServiceTaxInclude" value="${Utils.format(estimateBean.costPurchaseServiceTaxInclude)}" required></td>-->
+<#--                            <td><input type="text" class="number" maxlength="16" name="costPurchaseServiceTaxExclude" id="costPurchaseServiceTaxExclude" value="${Utils.format(estimateBean.costPurchaseServiceTaxExclude)}" <#if estimateBean.costPurchaseServiceSelect! !="自定义">readonly</#if> required></td>-->
+<#--                            <td>-->
+<#--                                <select data-am-selected name="costPurchaseServiceSelect" id="costPurchaseServiceSelect">-->
+<#--                                    <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>-->
+<#--                                    <option value="0.06" <#if estimateBean.costPurchaseServiceSelect! =="0.06">selected</#if>>6%</option>-->
+<#--                                    <option value="0.09" <#if estimateBean.costPurchaseServiceSelect! =="0.09">selected</#if>>9%</option>-->
+<#--                                    <option value="0.13" <#if estimateBean.costPurchaseServiceSelect! =="0.13">selected</#if>>13%</option>-->
+<#--                                    <option value="自定义" <#if estimateBean.costPurchaseServiceSelect! =="自定义">selected</#if>>自定义</option>-->
+<#--                                </select>-->
+<#--                            </td>-->
+<#--                        </tr>-->
+<#--                        <tr>-->
+<#--                            <td>成本</td>-->
+<#--                            <td>采购成本</td>-->
+<#--                            <td>其他</td>-->
+<#--                            <td><input type="text" class="number" maxlength="16" name="costPurchaseOtherTaxInclude" id="costPurchaseOtherTaxInclude" value="${Utils.format(estimateBean.costPurchaseOtherTaxInclude)}" required></td>-->
+<#--                            <td><input type="text" class="number" maxlength="16" name="costPurchaseOtherTaxExclude" id="costPurchaseOtherTaxExclude" value="${Utils.format(estimateBean.costPurchaseOtherTaxExclude)}" <#if estimateBean.costPurchaseOtherSelect! !="自定义">readonly</#if> required></td>-->
+<#--                            <td>-->
+<#--                                <select data-am-selected name="costPurchaseOtherSelect" id="costPurchaseOtherSelect">-->
+<#--                                    <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>-->
+<#--                                    <option value="0.06" <#if estimateBean.costPurchaseOtherSelect! =="0.06">selected</#if>>6%</option>-->
+<#--                                    <option value="0.09" <#if estimateBean.costPurchaseOtherSelect! =="0.09">selected</#if>>9%</option>-->
+<#--                                    <option value="0.13" <#if estimateBean.costPurchaseOtherSelect! =="0.13">selected</#if>>13%</option>-->
+<#--                                    <option value="自定义" <#if estimateBean.costPurchaseOtherSelect! =="自定义">selected</#if>>自定义</option>-->
+<#--                                </select>-->
+<#--                            </td>-->
+<#--                        </tr>-->
+<#--                        <tr>-->
+<#--                            <td>成本</td>-->
+<#--                            <td>项目管理成本</td>-->
+<#--                            <td>项目管理成本</td>-->
+<#--                            <td><input type="text" class="number" name="costProjectManageTaxInclude" id="costProjectManageTaxInclude" value="${Utils.format(estimateBean.costProjectManageTaxInclude)}" required readonly></td>-->
+<#--                            <td><input type="text" class="number" maxlength="16" name="costProjectManageTaxExclude" id="costProjectManageTaxExclude" value="${Utils.format(estimateBean.costProjectManageTaxExclude)}" required></td>-->
+<#--                        </tr>-->
+<#--                        <tr>-->
+<#--                            <td>成本</td>-->
+<#--                            <td>其他</td>-->
+<#--                            <td><input type="text" id="otherName" maxlength="50" data-validate-async data-validation-message="请输入其他类的名称（50字符以内）"-->
+<#--                                       value="${project.otherName!}" name="otherName" placeholder="请输入其他类的名称（50字符以内）"/> </td>-->
+<#--                            <td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxInclude" id="costOtherOtherTaxInclude" value="${Utils.format(estimateBean.costOtherOtherTaxInclude, "0.00")}"></td>-->
+<#--                            <td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxExclude" id="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="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>-->
+<#--                                    <option value="0.06" <#if estimateBean.costOtherOtherSelect! =="0.06">selected</#if>>6%</option>-->
+<#--                                    <option value="0.09" <#if estimateBean.costOtherOtherSelect! =="0.09">selected</#if>>9%</option>-->
+<#--                                    <option value="0.13" <#if estimateBean.costOtherOtherSelect! =="0.13">selected</#if>>13%</option>-->
+<#--                                    <option value="自定义" <#if estimateBean.costOtherOtherSelect! =="自定义">selected</#if>>自定义</option>-->
+<#--                                </select>-->
+<#--                            </td>-->
+<#--                        </tr>-->
+<#--                        <tr>-->
+<#--                            <td>合计</td>-->
+<#--                            <td></td>-->
+<#--                            <td></td>-->
+<#--                            <td><input type="text" class="number" name="costTotalTaxInclude" value="${Utils.format(estimateBean.costTotalTaxInclude)}" readonly title="此列累计"></td>-->
+<#--                            <td><input type="text" class="number" name="costTotalTaxExclude" value="${Utils.format(estimateBean.costTotalTaxExclude)}" readonly title="此列累计"></td>-->
+<#--                            <td>/</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>-->
+<#--                        <td>不含税金额（元）</td>-->
+<#--                    </tr>-->
+<#--                    <tr>-->
+<#--                        <td>财务费用</td>-->
+<#--                        <td>资金占用成本</td>-->
+<#--                        <td><input type="text" class="number" maxlength="16" name="costExpropriationTaxExclude" id="costExpropriationTaxExclude" value="${Utils.format(estimateBean.costExpropriationTaxExclude)}" required></td>-->
+<#--                    </tr>-->
+<#--                    <tr>-->
+<#--                        <td>公司管理费用</td>-->
+<#--                        <td></td>-->
+<#--                        <td><input type="text" class="number" maxlength="16" name="costCompanyManageTaxExclude" id="costCompanyManageTaxExclude" value="${Utils.format(estimateBean.costCompanyManageTaxExclude)}" required></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(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>
-                    </tr>
-                    <tr>
-                        <td>项目贡献利润（元）</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>
-                    </tr>
-                    </tbody>
-                </table>
-            </div>
-            <!--验证表单元素（validate end-->
-        </div>
-    </div>
+<#--                <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(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>-->
+<#--                    </tr>-->
+<#--                    <tr>-->
+<#--                        <td>项目贡献利润（元）</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>-->
+<#--                    </tr>-->
+<#--                    </tbody>-->
+<#--                </table>-->
+<#--            </div>-->
+<#--            <!--验证表单元素（validate end&ndash;&gt;-->
+<#--        </div>-->
     </div>
     <!--选项卡（tabs）end-->
     <div class="am-margin">
diff --git a/src/main/resources/templates/admin/project_final_add.ftl b/src/main/resources/templates/admin/project_final_add.ftl
index ad73b44..d362d07 100644
--- a/src/main/resources/templates/admin/project_final_add.ftl
+++ b/src/main/resources/templates/admin/project_final_add.ftl
@@ -40,7 +40,7 @@
                     <tr class="am-text-xl">
                         <td>类别</td>
                         <td>费用</td>
-                        <td>概算总额（元）</td>
+<#--                        <td>概算总额（元）</td>-->
                         <td>预算总额（元）</td>
                         <td>结算总额（元）</td>
                         <td>决算总额（元）</td>
@@ -48,7 +48,7 @@
                     <tr>
                         <td>收入</td>
                         <td>设备类</td>
-                        <td><input name="incomeDeviceTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.incomeDeviceTaxExclude,'0.00')}" required readonly title="设备类概算总额"></td>
+<#--                        <td><input name="incomeDeviceTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.incomeDeviceTaxExclude,'0.00')}" required readonly title="设备类概算总额"></td>-->
                         <td><input name="incomeDeviceTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.incomeDeviceTaxExclude,'0.00')}" required readonly title="设备类预算总额"></td>
                         <td><input type="text" class="number" value="${Utils.format(settleBean.incomeDeviceTaxExclude,'0.00')}" required readonly title="设备类结算总额"></td>
                         <td><input name="incomeDeviceFinalTotal" type="text" class="number" maxlength="16" required title="设备类决算总额"></td>
@@ -56,7 +56,7 @@
                     <tr>
                         <td>收入</td>
                         <td>工程类</td>
-                        <td><input name="incomeEngineerTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.incomeEngineerTaxExclude,'0.00')}" required readonly title="工程类概算总额"></td>
+<#--                        <td><input name="incomeEngineerTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.incomeEngineerTaxExclude,'0.00')}" required readonly title="工程类概算总额"></td>-->
                         <td><input name="incomeEngineerTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.incomeEngineerTaxExclude,'0.00')}" required readonly title="工程类预算总额"></td>
                         <td><input type="text" class="number" value="${Utils.format(settleBean.incomeEngineerTaxExclude,'0.00')}" required readonly title="工程类结算总额"></td>
                         <td><input name="incomeEngineerFinalTotal" type="text" class="number" maxlength="16"  required title="工程类决算总额"></td>
@@ -64,7 +64,7 @@
                     <tr>
                         <td>收入</td>
                         <td>服务类</td>
-                        <td><input name="incomeServiceTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.incomeServiceTaxExclude,'0.00')}" required readonly title="服务类概算总额"></td>
+<#--                        <td><input name="incomeServiceTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.incomeServiceTaxExclude,'0.00')}" required readonly title="服务类概算总额"></td>-->
                         <td><input name="incomeServiceTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.incomeServiceTaxExclude,'0.00')}" required readonly title="服务类预算总额"></td>
                         <td><input type="text" class="number" value="${Utils.format(settleBean.incomeServiceTaxExclude,'0.00')}" required readonly title="服务类结算总额"></td>
                         <td><input name="incomeServiceFinalTotal" type="text" class="number" maxlength="16" required title="服务类决算总额"></td>
@@ -72,7 +72,7 @@
                     <tr>
                         <td>合计</td>
                         <td></td>
-                        <td><input name="estimateIncomeTotalTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.getIncomeTotalTaxExclude(),'0.00')}" readonly required title="此列累计"></td>
+<#--                        <td><input name="estimateIncomeTotalTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.getIncomeTotalTaxExclude(),'0.00')}" readonly required title="此列累计"></td>-->
                         <td><input name="budgetIncomeTotalTaxExclude" type="text" class="number"  value="${Utils.format(budgetBean.getIncomeTotalTaxExclude(),'0.00')}" readonly required title="此列累计"></td>
                         <td><input type="text" class="number" value="${Utils.format(settleBean.getIncomeTotalTaxExclude(),'0.00')}" readonly required title="此列累计"></td>
                         <td><input name="incomeFinalTotal" type="text" class="number" readonly required title="此列累计"></td>
@@ -86,7 +86,7 @@
                         <td>类别</td>
                         <td>费用</td>
                         <td>费用项目</td>
-                        <td>概算总额（元）</td>
+<#--                        <td>概算总额（元）</td>-->
                         <td>预算总额（元）</td>
                         <td>结算总额（元）</td>
                         <td>决算总额（元）</td>
@@ -95,7 +95,7 @@
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>设备</td>
-                        <td><input name="costPurchaseDeviceTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseDeviceTaxExclude,'0.00')}" readonly required title="购买设备概算总额"></td>
+<#--                        <td><input name="costPurchaseDeviceTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseDeviceTaxExclude,'0.00')}" readonly required title="购买设备概算总额"></td>-->
                         <td><input name="costPurchaseDeviceTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseDeviceTaxExclude,'0.00')}" readonly required title="购买设备预算总额"></td>
                         <td><input  type="text" class="number" value="${Utils.format(settleBean.costPurchaseDeviceTaxExclude,'0.00')}" readonly required title="购买设备结算总额"></td>
                         <td><input name="costPurchaseDeviceFinalTotal" type="text" class="number" maxlength="16" required title="购买设备决算总额"></td>
@@ -104,7 +104,7 @@
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>施工</td>
-                        <td><input name="costPurchaseBuildTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseBuildTaxExclude,'0.00')}" readonly required title="施工采购成本概算总额"></td>
+<#--                        <td><input name="costPurchaseBuildTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseBuildTaxExclude,'0.00')}" readonly required title="施工采购成本概算总额"></td>-->
                         <td><input name="costPurchaseBuildTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseBuildTaxExclude,'0.00')}" readonly required title="施工采购成本预算总额"></td>
                         <td><input type="text" class="number" value="${Utils.format(settleBean.costPurchaseBuildTaxExclude,'0.00')}" readonly required title="施工采购成本结算总额"></td>
                         <td><input name="costPurchaseBuildFinalTotal" type="text" class="number" maxlength="16" required title="施工采购成本决算总额"></td>
@@ -113,7 +113,7 @@
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>服务</td>
-                        <td><input name="costPurchaseServiceTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseServiceTaxExclude,'0.00')}" readonly required title="服务采购成本概算总额"></td>
+<#--                        <td><input name="costPurchaseServiceTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseServiceTaxExclude,'0.00')}" readonly required title="服务采购成本概算总额"></td>-->
                         <td><input name="costPurchaseServiceTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseServiceTaxExclude,'0.00')}" readonly required title="服务采购成本预算总额"></td>
                         <td><input type="text" class="number" value="${Utils.format(settleBean.costPurchaseServiceTaxExclude,'0.00')}" readonly required title="服务采购成本结算总额"></td>
                         <td><input name="costPurchaseServiceFinalTotal" type="text" class="number" maxlength="16" required title="服务采购成本决算总额"></td>
@@ -122,7 +122,7 @@
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>其他</td>
-                        <td><input name="costPurchaseOtherTaxInclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseOtherTaxExclude,'0.00')}" readonly required title="其他采购成本概算总额"></td>
+<#--                        <td><input name="costPurchaseOtherTaxInclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseOtherTaxExclude,'0.00')}" readonly required title="其他采购成本概算总额"></td>-->
                         <td><input name="costPurchaseOtherTaxInclude" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseOtherTaxExclude,'0.00')}" readonly required title="其他采购成本预算总额"></td>
                         <td><input name="costPurchaseOtherSettleTotal" value="${Utils.format(settleBean.costPurchaseOtherTaxExclude,'0.00')}" type="text" class="number" readonly required title="其他采购成本结算总额"></td>
                         <td><input name="costPurchaseOtherFinalTotal" type="text" class="number" maxlength="16" required title="其他采购成本决算总额"></td>
@@ -131,7 +131,7 @@
                         <td>成本</td>
                         <td>项目管理成本</td>
                         <td>项目管理成本</td>
-                        <td><input name="costProjectManageTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costProjectManageTaxExclude,'0.00')}" readonly required title="项目管理成本概算总额"></td>
+<#--                        <td><input name="costProjectManageTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costProjectManageTaxExclude,'0.00')}" readonly required title="项目管理成本概算总额"></td>-->
                         <td><input name="costProjectManageTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0.00')}" readonly required title="项目管理成本预算总额"></td>
                         <td><input name="costProjectManageSettleTotal" value="${Utils.format(settleBean.costProjectManageTaxExclude,'0.00')}" type="text" class="number" readonly required title="项目管理成本结算总额"></td>
                         <td><input name="costProjectManageFinalTotal" type="text" class="number" maxlength="16" required title="项目管理成本决算总额"></td>
@@ -141,7 +141,7 @@
                         <td>其他</td>
                         <td><input type="text" id="otherName" maxlength="50" data-validate-async data-validation-message="请输入其他中的小类名称（50字符以内）"
                                    value="${project.otherName!}" name="otherName" placeholder="请输入其他中的小类名称（50字符以内）"/> </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(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>
@@ -150,7 +150,7 @@
                         <td>合计</td>
                         <td></td>
                         <td></td>
-                        <td><input name="incomeTotalTaxExclude" value="${Utils.format(estimateBean.getCostTotalTaxExclude(),'0.00')}" type="text" class="number" readonly required title="此列累计"></td>
+<#--                        <td><input name="incomeTotalTaxExclude" value="${Utils.format(estimateBean.getCostTotalTaxExclude(),'0.00')}" type="text" class="number" readonly required title="此列累计"></td>-->
                         <td><input name="costTotalTaxExclude" value="${Utils.format(budgetBean.getCostTotalTaxExclude(),'0.00')}" type="text" class="number" readonly required title="此列累计"></td>
                         <td><input name="costSettleTotal" value="${Utils.format(settleBean.getCostTotalTaxExclude(),'0.00')}" type="text" class="number" readonly required title="此列累计"></td>
                         <td><input name="costFinalTotal" type="text" class="number" readonly required title="此列累计"></td>
@@ -163,7 +163,7 @@
                     <tr class="am-text-xl">
                         <td>类别</td>
                         <td>费用项目</td>
-                        <td>概算总额（元）</td>
+<#--                        <td>概算总额（元）</td>-->
                         <td>预算总额（元）</td>
                         <td>结算总额（元）</td>
                         <td>决算总额（元）</td>
@@ -171,7 +171,7 @@
                     <tr>
                         <td>财务费用</td>
                         <td>资金占用成本</td>
-                        <td><input name="costExpropriationTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costExpropriationTaxExclude,'0.00')}" required readonly title="资金占用成本概算总额"></td>
+<#--                        <td><input name="costExpropriationTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costExpropriationTaxExclude,'0.00')}" required readonly title="资金占用成本概算总额"></td>-->
                         <td><input name="costExpropriationTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costExpropriationTaxExclude,'0.00')}" required readonly title="资金占用成本预算总额"></td>
                         <td><input type="text" class="number"  value="${Utils.format(settleBean.costExpropriationTaxExclude,'0.00')}" required readonly title="资金占用成本结算总额"></td>
                         <td><input name="costExpropriationFinalTotal" type="text" class="number" maxlength="16" required title="资金占用成本决算总额"></td>
@@ -179,7 +179,7 @@
                     <tr>
                         <td>公司管理费用</td>
                         <td></td>
-                        <td><input name="costCompanyManageTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costCompanyManageTaxExclude,'0.00')}" required readonly title="公司管理费用概算总额"></td>
+<#--                        <td><input name="costCompanyManageTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costCompanyManageTaxExclude,'0.00')}" required readonly title="公司管理费用概算总额"></td>-->
                         <td><input name="costCompanyManageTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costCompanyManageTaxExclude,'0.00')}" required readonly title="公司管理费用预算总额"></td>
                         <td><input type="text" class="number" value="${Utils.format(settleBean.costCompanyManageTaxExclude,'0.00')}" required readonly title="公司管理费用结算总额"></td>
                         <td><input name="costCompanyManageFinalTotal" type="text" class="number" maxlength="16" required title="公司管理费用决算总额"></td>
@@ -187,7 +187,7 @@
                     <tr>
                         <td>所得税费用</td>
                         <td></td>
-                        <td>/</td>
+<#--                        <td>/</td>-->
                         <td>/</td>
                         <td><input name="costIncomeTaxSettleTotal" value="${Utils.format(settleBean.costIncomeTax,'0.00')}" type="text" class="number" required readonly title="所得税费用结算总额"></td>
                         <td><input name="costIncomeTaxFinalTotal" type="text" class="number" maxlength="16" required title="所得税费用决算总额"></td>
@@ -195,7 +195,7 @@
                     <tr>
                         <td>合计</td>
                         <td></td>
-                        <td><input name="manageEstimateTotal" value="${Utils.format(estimateBean.getCostManageExclude(),'0.00')}" type="text" class="number" readonly required title="此列累计"></td>
+<#--                        <td><input name="manageEstimateTotal" value="${Utils.format(estimateBean.getCostManageExclude(),'0.00')}" type="text" class="number" readonly required title="此列累计"></td>-->
                         <td><input name="manageBudgetTotal" value="${Utils.format(budgetBean.getCostManageExclude(),'0.00')}" type="text" class="number" readonly required title="此列累计"></td>
                         <td><input name="manageSettleTotal" value="${Utils.format(settleBean.getCostManageTotal(),'0.00')}" type="text" class="number" readonly required title="此列累计"></td>
                         <td><input name="manageFinalTotal" type="text" class="number" readonly required title="此列累计"></td>
@@ -208,7 +208,7 @@
                     <tbody>
                     <tr class="am-text-xl">
                         <td>类别</td>
-                        <td>概算总额（元）</td>
+<#--                        <td>概算总额（元）</td>-->
                         <td>预算总额（元）</td>
                         <td>结算总额（元）</td>
                         <td>决算总额（元）</td>
@@ -216,7 +216,7 @@
                     </tr>
                     <tr>
                         <td>项目毛利</td>
-                        <td><input name="projectGrossProfit" type="text" class="number" value="${Utils.format(estimateBean.getProjectGrossProfit(),'0.00')}" readonly required title="项目毛利概算总额"></td>
+<#--                        <td><input name="projectGrossProfit" type="text" class="number" value="${Utils.format(estimateBean.getProjectGrossProfit(),'0.00')}" readonly required title="项目毛利概算总额"></td>-->
                         <td><input name="projectGrossProfit" type="text" class="number" value="${Utils.format(budgetBean.getProjectGrossProfit(),'0.00')}" readonly required title="项目毛利预算总额"></td>
                         <td><input name="grossProfitSettleTotal" type="text" class="number" value="${Utils.format(settleBean.grossProfit,'0.00')}" readonly required title="项目毛利结算总额"></td>
                         <td><input name="grossProfitFinalTotal" required readonly type="text" class="number" title="项目毛利决算总额"></td>
@@ -224,7 +224,7 @@
                     </tr>
                     <tr>
                         <td>项目贡献利润</td>
-                        <td><input name="projectContributionProfit" type="text" class="number" value="${Utils.format(estimateBean.getProjectContributionProfit(),'0.00')}" readonly required title="项目贡献利润概算总额"></td>
+<#--                        <td><input name="projectContributionProfit" type="text" class="number" value="${Utils.format(estimateBean.getProjectContributionProfit(),'0.00')}" readonly required title="项目贡献利润概算总额"></td>-->
                         <td><input name="projectContributionProfit" type="text" class="number" value="${Utils.format(budgetBean.getProjectContributionProfit(),'0.00')}" readonly required title="项目贡献利润预算总额"></td>
                         <td><input name="contributionMarginSettleTotal" type="text" class="number" value="${Utils.format(settleBean.contributionProfit,'0.00')}" readonly required title="项目贡献利润结算总额"></td>
                         <td><input name="contributionMarginFinalTotal" type="text" class="number" required readonly title="项目贡献利润决算总额"></td>
@@ -232,7 +232,7 @@
                     </tr>
                     <tr>
                         <td>项目净利润</td>
-                        <td>/</td>
+<#--                        <td>/</td>-->
                         <td><input name="netMarginBudgetTotal" type="text" class="number" value="${Utils.format(finalBean.netMarginBudgetTotal,'0.00')}" readonly required title="项目净利润预算总额"></td>
                         <td><input name="netMarginSettleTotal" type="text" class="number" value="${Utils.format(settleBean.netProfit,'0.00')}" readonly required title="项目净利润结算总额"></td>
                         <td><input name="netMarginFinalTotal" type="text" class="number" required readonly title="项目净利润决算总额"></td>
diff --git a/src/main/resources/templates/admin/project_final_edit.ftl b/src/main/resources/templates/admin/project_final_edit.ftl
index 193ccf0..da273db 100644
--- a/src/main/resources/templates/admin/project_final_edit.ftl
+++ b/src/main/resources/templates/admin/project_final_edit.ftl
@@ -40,7 +40,7 @@
                     <tr class="am-text-xl">
                         <td>类别</td>
                         <td>费用</td>
-                        <td>概算总额（元）</td>
+<#--                        <td>概算总额（元）</td>-->
                         <td>预算总额（元）</td>
                         <td>结算总额（元）</td>
                         <td>决算总额（元）</td>
@@ -48,7 +48,7 @@
                     <tr>
                         <td>收入</td>
                         <td>设备类</td>
-                        <td><input name="incomeDeviceTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.incomeDeviceTaxExclude,'0.00')}" required readonly title="设备类概算总额"></td>
+<#--                        <td><input name="incomeDeviceTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.incomeDeviceTaxExclude,'0.00')}" required readonly title="设备类概算总额"></td>-->
                         <td><input name="incomeDeviceTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.incomeDeviceTaxExclude,'0.00')}" required readonly title="设备类预算总额"></td>
                         <td><input type="text" class="number" value="${Utils.format(settleBean.incomeDeviceTaxExclude,'0.00')}" required readonly title="设备类结算总额"></td>
                         <td><input name="incomeDeviceFinalTotal" maxlength="16" type="text" class="number" value="${Utils.format(finalBean.incomeDeviceFinalTotal,'0.00')}" required title="设备类决算总额"></td>
@@ -56,7 +56,7 @@
                     <tr>
                         <td>收入</td>
                         <td>工程类</td>
-                        <td><input name="incomeEngineerTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.incomeEngineerTaxExclude,'0.00')}" required readonly title="工程类概算总额"></td>
+<#--                        <td><input name="incomeEngineerTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.incomeEngineerTaxExclude,'0.00')}" required readonly title="工程类概算总额"></td>-->
                         <td><input name="incomeEngineerTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.incomeEngineerTaxExclude,'0.00')}" required readonly title="工程类预算总额"></td>
                         <td><input type="text" class="number" value="${Utils.format(settleBean.incomeEngineerTaxExclude,'0.00')}" required readonly title="工程类结算总额"></td>
                         <td><input name="incomeEngineerFinalTotal" type="text" class="number" maxlength="16" value="${Utils.format(finalBean.incomeEngineerFinalTotal,'0.00')}" required title="工程类决算总额"></td>
@@ -64,7 +64,7 @@
                     <tr>
                         <td>收入</td>
                         <td>服务类</td>
-                        <td><input name="incomeServiceTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.incomeServiceTaxExclude,'0.00')}" required readonly title="服务类概算总额"></td>
+<#--                        <td><input name="incomeServiceTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.incomeServiceTaxExclude,'0.00')}" required readonly title="服务类概算总额"></td>-->
                         <td><input name="incomeServiceTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.incomeServiceTaxExclude,'0.00')}" required readonly title="服务类预算总额"></td>
                         <td><input type="text" class="number" value="${Utils.format(settleBean.incomeServiceTaxExclude,'0.00')}" required readonly title="服务类结算总额"></td>
                         <td><input name="incomeServiceFinalTotal" type="text" class="number" maxlength="16" value="${Utils.format(finalBean.incomeServiceFinalTotal,'0.00')}" required title="服务类决算总额"></td>
@@ -72,7 +72,7 @@
                     <tr>
                         <td>合计</td>
                         <td></td>
-                        <td><input name="estimateIncomeTotalTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.getIncomeTotalTaxExclude(),'0.00')}" readonly required title="此列累计"></td>
+<#--                        <td><input name="estimateIncomeTotalTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.getIncomeTotalTaxExclude(),'0.00')}" readonly required title="此列累计"></td>-->
                         <td><input name="budgetIncomeTotalTaxExclude" type="text" class="number"  value="${Utils.format(budgetBean.getIncomeTotalTaxExclude(),'0.00')}" readonly required title="此列累计"></td>
                         <td><input type="text" class="number" value="${Utils.format(settleBean.getIncomeTotalTaxExclude(),'0.00')}" readonly required title="此列累计"></td>
                         <td><input name="incomeFinalTotal" type="text" class="number" value="${Utils.format(finalBean.getIncomeTotal(),'0.00')}" readonly required title="此列累计"></td>
@@ -86,7 +86,7 @@
                         <td>类别</td>
                         <td>费用</td>
                         <td>费用项目</td>
-                        <td>概算总额（元）</td>
+<#--                        <td>概算总额（元）</td>-->
                         <td>预算总额（元）</td>
                         <td>结算总额（元）</td>
                         <td>决算总额（元）</td>
@@ -95,7 +95,7 @@
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>设备</td>
-                        <td><input name="costPurchaseDeviceTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseDeviceTaxExclude,'0.00')}" readonly required title="购买设备概算总额"></td>
+<#--                        <td><input name="costPurchaseDeviceTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseDeviceTaxExclude,'0.00')}" readonly required title="购买设备概算总额"></td>-->
                         <td><input name="costPurchaseDeviceTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseDeviceTaxExclude,'0.00')}" readonly required title="购买设备预算总额"></td>
                         <td><input  type="text" class="number" value="${Utils.format(settleBean.costPurchaseDeviceTaxExclude,'0.00')}" readonly required title="购买设备结算总额"></td>
                         <td><input name="costPurchaseDeviceFinalTotal" type="text" class="number" maxlength="16" value="${Utils.format(finalBean.costPurchaseDeviceFinalTotal,'0.00')}" required title="购买设备决算总额"></td>
@@ -104,7 +104,7 @@
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>施工</td>
-                        <td><input name="costPurchaseBuildTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseBuildTaxExclude,'0.00')}" readonly required title="施工采购成本概算总额"></td>
+<#--                        <td><input name="costPurchaseBuildTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseBuildTaxExclude,'0.00')}" readonly required title="施工采购成本概算总额"></td>-->
                         <td><input name="costPurchaseBuildTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseBuildTaxExclude,'0.00')}" readonly required title="施工采购成本预算总额"></td>
                         <td><input type="text" class="number" value="${Utils.format(settleBean.costPurchaseBuildTaxExclude,'0.00')}" readonly required title="施工采购成本结算总额"></td>
                         <td><input name="costPurchaseBuildFinalTotal" type="text" class="number" maxlength="16" value="${Utils.format(finalBean.costPurchaseBuildFinalTotal,'0.00')}" required title="施工采购成本决算总额"></td>
@@ -113,7 +113,7 @@
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>服务</td>
-                        <td><input name="costPurchaseServiceTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseServiceTaxExclude,'0.00')}" readonly required title="服务采购成本概算总额"></td>
+<#--                        <td><input name="costPurchaseServiceTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseServiceTaxExclude,'0.00')}" readonly required title="服务采购成本概算总额"></td>-->
                         <td><input name="costPurchaseServiceTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseServiceTaxExclude,'0.00')}" readonly required title="服务采购成本预算总额"></td>
                         <td><input type="text" class="number" value="${Utils.format(settleBean.costPurchaseServiceTaxExclude,'0.00')}" readonly required title="服务采购成本结算总额"></td>
                         <td><input name="costPurchaseServiceFinalTotal" type="text" class="number" maxlength="16" value="${Utils.format(finalBean.costPurchaseServiceFinalTotal,'0.00')}" required title="服务采购成本决算总额"></td>
@@ -122,7 +122,7 @@
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>其他</td>
-                        <td><input name="costPurchaseOtherTaxInclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseOtherTaxExclude,'0.00')}" readonly required title="其他采购成本概算总额"></td>
+<#--                        <td><input name="costPurchaseOtherTaxInclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseOtherTaxExclude,'0.00')}" readonly required title="其他采购成本概算总额"></td>-->
                         <td><input name="costPurchaseOtherTaxInclude" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseOtherTaxExclude,'0.00')}" readonly required title="其他采购成本预算总额"></td>
                         <td><input name="costPurchaseOtherSettleTotal" value="${Utils.format(settleBean.costPurchaseOtherTaxExclude,'0.00')}" type="text" class="number" readonly required title="其他采购成本结算总额"></td>
                         <td><input name="costPurchaseOtherFinalTotal" type="text" class="number" maxlength="16" value="${Utils.format(finalBean.costPurchaseOtherFinalTotal,'0.00')}" required title="其他采购成本决算总额"></td>
@@ -131,7 +131,7 @@
                         <td>成本</td>
                         <td>项目管理成本</td>
                         <td>项目管理成本</td>
-                        <td><input name="costProjectManageTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costProjectManageTaxExclude,'0.00')}" readonly required title="项目管理成本概算总额"></td>
+<#--                        <td><input name="costProjectManageTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costProjectManageTaxExclude,'0.00')}" readonly required title="项目管理成本概算总额"></td>-->
                         <td><input name="costProjectManageTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0.00')}" readonly required title="项目管理成本预算总额"></td>
                         <td><input name="costProjectManageSettleTotal" value="${Utils.format(settleBean.costProjectManageTaxExclude,'0.00')}" type="text" class="number" readonly required title="项目管理成本结算总额"></td>
                         <td><input name="costProjectManageFinalTotal" type="text" class="number" maxlength="16" value="${Utils.format(finalBean.costProjectManageFinalTotal,'0.00')}" required title="项目管理成本决算总额"></td>
@@ -141,7 +141,7 @@
                         <td>其他</td>
                         <td><input type="text" id="otherName" maxlength="50" data-validate-async data-validation-message="请输入其他中的小类名称（50字符以内）"
                                    value="${project.otherName!}" name="otherName" placeholder="请输入其他中的小类名称（50字符以内）"/> </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(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>
@@ -150,7 +150,7 @@
                         <td>合计</td>
                         <td></td>
                         <td></td>
-                        <td><input name="incomeTotalTaxExclude" value="${Utils.format(estimateBean.getCostTotalTaxExclude(),'0.00')}" type="text" class="number" readonly required title="此列累计"></td>
+<#--                        <td><input name="incomeTotalTaxExclude" value="${Utils.format(estimateBean.getCostTotalTaxExclude(),'0.00')}" type="text" class="number" readonly required title="此列累计"></td>-->
                         <td><input name="costTotalTaxExclude" value="${Utils.format(budgetBean.getCostTotalTaxExclude(),'0.00')}" type="text" class="number" readonly required title="此列累计"></td>
                         <td><input name="costSettleTotal" value="${Utils.format(settleBean.getCostTotalTaxExclude(),'0.00')}" type="text" class="number" readonly required title="此列累计"></td>
                         <td><input name="costFinalTotal" type="text" class="number" value="${Utils.format(finalBean.getCostTotal(),'0.00')}" readonly required title="此列累计"></td>
@@ -163,7 +163,7 @@
                     <tr class="am-text-xl">
                         <td>类别</td>
                         <td>费用项目</td>
-                        <td>概算总额（元）</td>
+<#--                        <td>概算总额（元）</td>-->
                         <td>预算总额（元）</td>
                         <td>结算总额（元）</td>
                         <td>决算总额（元）</td>
@@ -171,7 +171,7 @@
                     <tr>
                         <td>财务费用</td>
                         <td>资金占用成本</td>
-                        <td><input name="costExpropriationTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costExpropriationTaxExclude,'0.00')}" required readonly title="资金占用成本概算总额"></td>
+<#--                        <td><input name="costExpropriationTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costExpropriationTaxExclude,'0.00')}" required readonly title="资金占用成本概算总额"></td>-->
                         <td><input name="costExpropriationTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costExpropriationTaxExclude,'0.00')}" required readonly title="资金占用成本预算总额"></td>
                         <td><input type="text" class="number"  value="${Utils.format(settleBean.costExpropriationTaxExclude,'0.00')}" required readonly title="资金占用成本结算总额"></td>
                         <td><input name="costExpropriationFinalTotal" type="text" class="number" maxlength="16" value="${Utils.format(finalBean.costExpropriationFinalTotal,'0.00')}" required title="资金占用成本决算总额"></td>
@@ -179,7 +179,7 @@
                     <tr>
                         <td>公司管理费用</td>
                         <td></td>
-                        <td><input name="costCompanyManageTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costCompanyManageTaxExclude,'0.00')}" required readonly title="公司管理费用概算总额"></td>
+<#--                        <td><input name="costCompanyManageTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costCompanyManageTaxExclude,'0.00')}" required readonly title="公司管理费用概算总额"></td>-->
                         <td><input name="costCompanyManageTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costCompanyManageTaxExclude,'0.00')}" required readonly title="公司管理费用预算总额"></td>
                         <td><input type="text" class="number" value="${Utils.format(settleBean.costCompanyManageTaxExclude,'0.00')}" required readonly title="公司管理费用结算总额"></td>
                         <td><input name="costCompanyManageFinalTotal" type="text" class="number" maxlength="16" value="${Utils.format(finalBean.costCompanyManageFinalTotal,'0.00')}" required title="公司管理费用决算总额"></td>
@@ -187,7 +187,7 @@
                     <tr>
                         <td>所得税费用</td>
                         <td></td>
-                        <td>/</td>
+<#--                        <td>/</td>-->
                         <td>/</td>
                         <td><input name="costIncomeTaxSettleTotal" value="${Utils.format(settleBean.costIncomeTax,'0.00')}" type="text" class="number" required readonly title="所得税费用结算总额"></td>
                         <td><input name="costIncomeTaxFinalTotal" type="text" class="number" maxlength="16" value="${Utils.format(finalBean.costIncomeTaxFinalTotal,'0.00')}" required title="所得税费用决算总额"></td>
@@ -195,7 +195,7 @@
                     <tr>
                         <td>合计</td>
                         <td></td>
-                        <td><input name="manageEstimateTotal" value="${Utils.format(estimateBean.getCostManageExclude(),'0.00')}" type="text" class="number" readonly required title="此列累计"></td>
+<#--                        <td><input name="manageEstimateTotal" value="${Utils.format(estimateBean.getCostManageExclude(),'0.00')}" type="text" class="number" readonly required title="此列累计"></td>-->
                         <td><input name="manageBudgetTotal" value="${Utils.format(budgetBean.getCostManageExclude(),'0.00')}" type="text" class="number" readonly required title="此列累计"></td>
                         <td><input name="manageSettleTotal" value="${Utils.format(settleBean.getCostManageTotal(),'0.00')}" type="text" class="number" readonly required title="此列累计"></td>
                         <td><input name="manageFinalTotal" type="text" class="number" value="${Utils.format(finalBean.getCostManageTotal(),'0.00')}" readonly required title="此列累计"></td>
@@ -208,7 +208,7 @@
                     <tbody>
                     <tr class="am-text-xl">
                         <td>类别</td>
-                        <td>概算总额（元）</td>
+<#--                        <td>概算总额（元）</td>-->
                         <td>预算总额（元）</td>
                         <td>结算总额（元）</td>
                         <td>决算总额（元）</td>
@@ -216,7 +216,7 @@
                     </tr>
                     <tr>
                         <td>项目毛利</td>
-                        <td><input name="projectGrossProfit" type="text" class="number" value="${Utils.format(estimateBean.getProjectGrossProfit(),'0.00')}" readonly required title="项目毛利概算总额"></td>
+<#--                        <td><input name="projectGrossProfit" type="text" class="number" value="${Utils.format(estimateBean.getProjectGrossProfit(),'0.00')}" readonly required title="项目毛利概算总额"></td>-->
                         <td><input name="projectGrossProfit" type="text" class="number" value="${Utils.format(budgetBean.getProjectGrossProfit(),'0.00')}" readonly required title="项目毛利预算总额"></td>
                         <td><input name="grossProfitSettleTotal" type="text" class="number" value="${Utils.format(settleBean.grossProfit,'0.00')}" readonly required title="项目毛利结算总额"></td>
                         <td><input name="grossProfitFinalTotal" type="text" class="number" value="${Utils.format(finalBean.grossProfitFinalTotal,'0.00')}" readonly required title="项目毛利决算总额"></td>
@@ -224,7 +224,7 @@
                     </tr>
                     <tr>
                         <td>项目贡献利润</td>
-                        <td><input name="projectContributionProfit" type="text" class="number" value="${Utils.format(estimateBean.getProjectContributionProfit(),'0.00')}" readonly required title="项目贡献利润概算总额"></td>
+<#--                        <td><input name="projectContributionProfit" type="text" class="number" value="${Utils.format(estimateBean.getProjectContributionProfit(),'0.00')}" readonly required title="项目贡献利润概算总额"></td>-->
                         <td><input name="projectContributionProfit" type="text" class="number" value="${Utils.format(budgetBean.getProjectContributionProfit(),'0.00')}" readonly required title="项目贡献利润预算总额"></td>
                         <td><input name="contributionMarginSettleTotal" type="text" class="number" value="${Utils.format(settleBean.contributionProfit,'0.00')}" readonly required title="项目贡献利润结算总额"></td>
                         <td><input name="contributionMarginFinalTotal" type="text" class="number" value="${Utils.format(finalBean.contributionMarginFinalTotal,'0.00')}" readonly required title="项目贡献利润决算总额"></td>
@@ -232,7 +232,7 @@
                     </tr>
                     <tr>
                         <td>项目净利润</td>
-                        <td>/</td>
+<#--                        <td>/</td>-->
                         <td>/<#--<input name="netMarginBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.netProfit,'0.00')}" readonly required title="项目净利润预算总额">--></td>
                         <td><input name="netMarginSettleTotal" type="text" class="number" value="${Utils.format(settleBean.netProfit,'0.00')}" readonly required title="项目净利润结算总额"></td>
                         <td><input name="netMarginFinalTotal" type="text" class="number" value="${Utils.format(finalBean.netMarginFinalTotal,'0.00')}" readonly required title="项目净利润决算总额"></td>
diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl
index e4f1cf3..850b8d4 100644
--- a/src/main/resources/templates/admin/project_list.ftl
+++ b/src/main/resources/templates/admin/project_list.ftl
@@ -220,7 +220,7 @@
                                                 </button>
                                             </#if>
 
-                                            <#if adminId==1>
+                                            <#if adminId==1 && !list.projectNo??>
                                                 <button type="button"
                                                         class="am-btn am-btn-default am-btn-xs am-text-secondary"
                                                         onclick="projectNo(${list.id})"><span class="am-icon-pencil-square-o"></span>填写项目编号
diff --git a/src/main/resources/templates/admin/project_settle_add.ftl b/src/main/resources/templates/admin/project_settle_add.ftl
index 841d8b2..591263c 100644
--- a/src/main/resources/templates/admin/project_settle_add.ftl
+++ b/src/main/resources/templates/admin/project_settle_add.ftl
@@ -51,7 +51,7 @@
                     <tr class="am-text-xl">
                         <td>类别</td>
                         <td>费用</td>
-                        <td>概算总额（元）</td>
+<#--                        <td>概算总额（元）</td>-->
                         <td>预算总额（元）</td>
                         <td>上月结算总额（元）</td>
                         <td>本月结算金额（元）</td>
@@ -60,7 +60,7 @@
                     <tr>
                         <td>收入</td>
                         <td>设备类</td>
-                        <td><input name="incomeDeviceEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.incomeDeviceTaxExclude,'0.00')}" required readonly title="设备类概算总额"></td>
+<#--                        <td><input name="incomeDeviceEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.incomeDeviceTaxExclude,'0.00')}" required readonly title="设备类概算总额"></td>-->
                         <td><input name="incomeDeviceBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.incomeDeviceTaxExclude,'0.00')}" required readonly title="设备类预算总额"></td>
                         <td><input name="incomeDeviceFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.incomeDeviceTaxExclude,'0.00')}" required readonly title="设备类上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="incomeDevice" required title="本月结算金额"></td>
@@ -69,7 +69,7 @@
                     <tr>
                         <td>收入</td>
                         <td>工程类</td>
-                        <td><input name="incomeEngineerEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.incomeEngineerTaxExclude,'0.00')}" required readonly title="工程类概算总额"></td>
+<#--                        <td><input name="incomeEngineerEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.incomeEngineerTaxExclude,'0.00')}" required readonly title="工程类概算总额"></td>-->
                         <td><input name="incomeEngineerBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.incomeEngineerTaxExclude,'0.00')}" required readonly title="工程类预算总额"></td>
                         <td><input name="incomeEngineerFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.incomeEngineerTaxExclude,'0.00')}" required readonly title="工程类上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="incomeEngineer" required title="工程类本月结算金额"></td>
@@ -78,7 +78,7 @@
                     <tr>
                         <td>收入</td>
                         <td>服务类</td>
-                        <td><input name="incomeServiceEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.incomeServiceTaxExclude,'0.00')}" required readonly title="服务类概算总额"></td>
+<#--                        <td><input name="incomeServiceEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.incomeServiceTaxExclude,'0.00')}" required readonly title="服务类概算总额"></td>-->
                         <td><input name="incomeServiceBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.incomeServiceTaxExclude,'0.00')}" required readonly title="服务类预算总额"></td>
                         <td><input name="incomeServiceFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.incomeServiceTaxExclude,'0.00')}" required readonly title="服务类上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="incomeService" required title="服务类本月结算金额"></td>
@@ -87,7 +87,7 @@
                     <tr>
                         <td>合计</td>
                         <td></td>
-                        <td><input name="incomeEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.getIncomeTotalTaxExclude(),'0.00')}" readonly required title="此列累计"></td>
+<#--                        <td><input name="incomeEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.getIncomeTotalTaxExclude(),'0.00')}" readonly required title="此列累计"></td>-->
                         <td><input name="incomeBudgetTotal" type="text" class="number"  value="${Utils.format(budgetBean.getIncomeTotalTaxExclude(),'0.00')}" readonly required title="此列累计"></td>
                         <td><input name="incomeFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.getIncomeTotalTaxExclude(),'0.00')}" required readonly title="此列累计"></td>
                         <td><input type="text" class="number" name="incomeTotal" readonly title="此列累计"></td>
@@ -102,7 +102,7 @@
                         <td>类别</td>
                         <td>费用</td>
                         <td>费用项目</td>
-                        <td>概算总额（元）</td>
+<#--                        <td>概算总额（元）</td>-->
                         <td>预算总额（元）</td>
                         <td>上月结算总额（元）</td>
                         <td>本月结算金额（元）</td>
@@ -112,7 +112,7 @@
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>设备</td>
-                        <td><input name="costPurchaseDeviceEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseDeviceTaxExclude,'0.00')}" readonly required title="购买设备概算总额"></td>
+<#--                        <td><input name="costPurchaseDeviceEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseDeviceTaxExclude,'0.00')}" readonly required title="购买设备概算总额"></td>-->
                         <td><input name="costPurchaseDeviceBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseDeviceTaxExclude,'0.00')}" readonly required title="购买设备预算总额"></td>
                         <td><input name="costPurchaseDeviceFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costPurchaseDeviceTaxExclude,'0.00')}" required readonly title="购买设备上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="costPurchaseDevice" required title="购买设备本月结算总额"></td>
@@ -122,7 +122,7 @@
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>施工</td>
-                        <td><input name="costPurchaseBuildEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseBuildTaxExclude,'0.00')}" readonly required title="施工采购成本概算总额"></td>
+<#--                        <td><input name="costPurchaseBuildEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseBuildTaxExclude,'0.00')}" readonly required title="施工采购成本概算总额"></td>-->
                         <td><input name="costPurchaseBuildBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseBuildTaxExclude,'0.00')}" readonly required title="施工采购成本预算总额"></td>
                         <td><input name="costPurchaseBuildFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costPurchaseBuildTaxExclude,'0.00')}" required readonly title="施工采购成本上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="costPurchaseBuild" required title="施工采购成本本月结算金额"></td>
@@ -132,7 +132,7 @@
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>服务</td>
-                        <td><input name="costPurchaseServiceEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseServiceTaxExclude,'0.00')}" readonly required title="服务采购成本概算总额"></td>
+<#--                        <td><input name="costPurchaseServiceEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseServiceTaxExclude,'0.00')}" readonly required title="服务采购成本概算总额"></td>-->
                         <td><input name="costPurchaseServiceBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseServiceTaxExclude,'0.00')}" readonly required title="服务采购成本预算总额"></td>
                         <td><input name="costPurchaseServiceFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costPurchaseServiceTaxExclude,'0.00')}" required readonly title="服务采购成本上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="costPurchaseService" required title="服务采购成本本月结算金额"></td>
@@ -142,7 +142,7 @@
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>其他</td>
-                        <td><input name="costPurchaseOtherEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseOtherTaxExclude,'0.00')}" readonly required title="其他采购成本概算总额"></td>
+<#--                        <td><input name="costPurchaseOtherEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseOtherTaxExclude,'0.00')}" readonly required title="其他采购成本概算总额"></td>-->
                         <td><input name="costPurchaseOtherBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseOtherTaxExclude,'0.00')}" readonly required title="其他采购成本预算总额"></td>
                         <td><input name="costPurchaseOtherFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costPurchaseOtherTaxExclude,'0.00')}" required readonly title="其他采购成本上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="costPurchaseOther" required title="其他采购成本本月结算金额"></td>
@@ -152,7 +152,7 @@
                         <td>成本</td>
                         <td>项目管理成本</td>
                         <td>项目管理成本</td>
-                        <td><input name="costProjectManageEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costProjectManageTaxExclude,'0.00')}" readonly required title="项目管理成本概算总额"></td>
+<#--                        <td><input name="costProjectManageEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costProjectManageTaxExclude,'0.00')}" readonly required title="项目管理成本概算总额"></td>-->
                         <td><input name="costProjectManageBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0.00')}" readonly required title="项目管理成本预算总额"></td>
                         <td><input name="costProjectManageFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costProjectManageTaxExclude,'0.00')}" required readonly title="项目管理成本上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="costProjectManage" required title="项目管理成本本月结算金额">
@@ -165,7 +165,7 @@
                         <td>其他</td>
                         <td><input type="text" id="otherName" maxlength="50" data-validate-async data-validation-message="请输入其他中的小类名称（50字符以内）"
                                    value="${project.otherName!}" name="otherName" placeholder="请输入其他中的小类名称（50字符以内）"/> </td>
-                        <td><input name="costOtherEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costOtherOtherTaxExclude,'0.00')}" readonly title="其他成本概算总额"></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>
@@ -175,7 +175,7 @@
                         <td>合计</td>
                         <td></td>
                         <td></td>
-                        <td><input name="costEstimateTotal" value="${Utils.format(estimateBean.getCostTotalTaxExclude(),'0.00')}" type="text" class="number" readonly required title="此列累计"></td>
+<#--                        <td><input name="costEstimateTotal" value="${Utils.format(estimateBean.getCostTotalTaxExclude(),'0.00')}" type="text" class="number" readonly required title="此列累计"></td>-->
                         <td><input name="costBudgetTotal" value="${Utils.format(budgetBean.getCostTotalTaxExclude(),'0.00')}" type="text" class="number" readonly required title="此列累计"></td>
                         <td><input name="costFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.getCostTotalTaxExclude(),'0.00')}" required readonly title="此列累计"></td>
                         <td><input type="text" class="number" name="costTotal" readonly title="此列累计"></td>
@@ -189,7 +189,7 @@
                     <tr class="am-text-xl">
                         <td>类别</td>
                         <td>费用项目</td>
-                        <td>概算总额（元）</td>
+<#--                        <td>概算总额（元）</td>-->
                         <td>预算总额（元）</td>
                         <td>上月结算总额（元）</td>
                         <td>本月结算金额（元）</td>
@@ -198,7 +198,7 @@
                     <tr>
                         <td>财务费用</td>
                         <td>资金占用成本</td>
-                        <td><input name="costExpropriationEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costExpropriationTaxExclude,'0.00')}" required readonly title="资金占用成本概算总额"></td>
+<#--                        <td><input name="costExpropriationEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costExpropriationTaxExclude,'0.00')}" required readonly title="资金占用成本概算总额"></td>-->
                         <td><input name="costExpropriationBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.costExpropriationTaxExclude,'0.00')}" required readonly title="资金占用成本预算总额"></td>
                         <td><input name="costExpropriationFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costExpropriationTaxExclude,'0.00')}" required readonly title="资金占用成本上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="costExpropriation" required title="资金占用成本本月结算金额"></td>
@@ -207,7 +207,7 @@
                     <tr>
                         <td>公司管理费用</td>
                         <td></td>
-                        <td><input name="costCompanyManageEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costCompanyManageTaxExclude,'0.00')}" required readonly title="公司管理费用概算总额"></td>
+<#--                        <td><input name="costCompanyManageEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costCompanyManageTaxExclude,'0.00')}" required readonly title="公司管理费用概算总额"></td>-->
                         <td><input name="costCompanyManageBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.costCompanyManageTaxExclude,'0.00')}" required readonly title="公司管理费用预算总额"></td>
                         <td><input name="costCompanyManageFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costCompanyManageTaxExclude,'0.00')}" required readonly title="公司管理费用上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="costCompanyManage" required title="公司管理费用本月结算金额"></td>
@@ -216,7 +216,7 @@
                     <tr>
                         <td>所得税费用</td>
                         <td></td>
-                        <td>/</td>
+<#--                        <td>/</td>-->
                         <td>/</td>
                         <td><input name="costIncomeTaxFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costIncomeTax,'0.00')}" required readonly title="公司管理费用上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="costIncomeTax" required title="公司管理费用本月结算金额"></td>
@@ -225,7 +225,7 @@
                     <tr>
                         <td>合计</td>
                         <td></td>
-                        <td><input name="costManageEstimateTotal" value="${Utils.format(estimateBean.costExpropriationTaxExclude + estimateBean.costCompanyManageTaxExclude,'0.00')}" type="text" class="number" readonly required title="此列累计"></td>
+<#--                        <td><input name="costManageEstimateTotal" value="${Utils.format(estimateBean.costExpropriationTaxExclude + estimateBean.costCompanyManageTaxExclude,'0.00')}" type="text" class="number" readonly required title="此列累计"></td>-->
                         <td><input name="costManageBudgetTotal" value="${Utils.format(budgetBean.costExpropriationTaxExclude + budgetBean.costCompanyManageTaxExclude,'0.00')}" type="text" class="number" readonly required title="此列累计"></td>
                         <td><input name="costManageFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costManageTotal,'0.00')}" required readonly title="此列累计"></td>
                         <td><input type="text" class="number" name="costManageTotal" readonly title="此列累计"></td>
@@ -239,7 +239,7 @@
                     <tbody>
                     <tr class="am-text-xl">
                         <td>类别</td>
-                        <td>概算总额（元）</td>
+<#--                        <td>概算总额（元）</td>-->
                         <td>预算总额（元）</td>
                         <td>上月结算总额（元）</td>
                         <td>本月结算金额（元）</td>
@@ -248,7 +248,7 @@
                     </tr>
                     <tr>
                         <td>项目毛利</td>
-                        <td><input name="grossProfitEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.getProjectGrossProfit(),'0.00')}" required readonly title="项目毛利概算总额"></td>
+<#--                        <td><input name="grossProfitEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.getProjectGrossProfit(),'0.00')}" required readonly title="项目毛利概算总额"></td>-->
                         <td><input name="grossProfitBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.getProjectGrossProfit(),'0.00')}" required readonly title="项目毛利预算总额"></td>
                         <td><input name="grossProfitFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.grossProfit,'0.00')}" required readonly title="项目毛利上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="grossProfit" readonly required title="项目毛利本月结算金额"></td>
@@ -257,7 +257,7 @@
                     </tr>
                     <tr>
                         <td>项目贡献利润</td>
-                        <td><input name="contributionProfitEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.getProjectContributionProfit(),'0.00')}" required readonly title="项目贡献利润概算总额"></td>
+<#--                        <td><input name="contributionProfitEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.getProjectContributionProfit(),'0.00')}" required readonly title="项目贡献利润概算总额"></td>-->
                         <td><input name="contributionProfitBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.getProjectContributionProfit(),'0.00')}" required readonly title="项目贡献利润预算总额"></td>
                         <td><input name="contributionProfitFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.contributionProfit,'0.00')}" required readonly title="项目贡献利润上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="contributionProfit" readonly required title="项目贡献利润本月结算金额"></td>
@@ -266,7 +266,7 @@
                     </tr>
                     <tr>
                         <td>项目净利润</td>
-                        <td>/</td>
+<#--                        <td>/</td>-->
                         <td>/</td>
                         <td><input name="netProfitFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.netProfit,'0.00')}" required readonly title="项目净利润上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="netProfit" readonly required title="项目净利润本月结算金额"></td>
diff --git a/src/main/resources/templates/admin/project_settle_edit.ftl b/src/main/resources/templates/admin/project_settle_edit.ftl
index b10077f..a82b2a8 100644
--- a/src/main/resources/templates/admin/project_settle_edit.ftl
+++ b/src/main/resources/templates/admin/project_settle_edit.ftl
@@ -50,7 +50,7 @@
                     <tr class="am-text-xl">
                         <td>类别</td>
                         <td>费用</td>
-                        <td>概算总额（元）</td>
+<#--                        <td>概算总额（元）</td>-->
                         <td>预算总额（元）</td>
                         <td>上月结算总额（元）</td>
                         <td>本月结算金额（元）</td>
@@ -59,7 +59,7 @@
                     <tr>
                         <td>收入</td>
                         <td>设备类</td>
-                        <td><input name="incomeDeviceEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.incomeDeviceTaxExclude,'0.00')}" required readonly title="设备类概算总额"></td>
+<#--                        <td><input name="incomeDeviceEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.incomeDeviceTaxExclude,'0.00')}" required readonly title="设备类概算总额"></td>-->
                         <td><input name="incomeDeviceBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.incomeDeviceTaxExclude,'0.00')}" required readonly title="设备类预算总额"></td>
                         <td><input name="incomeDeviceFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.incomeDeviceTaxExclude,'0.00')}" required readonly title="设备类上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="incomeDevice" value="${Utils.format(monthBean.incomeDevice,'0.00')}" required title="本月结算金额"></td>
@@ -68,7 +68,7 @@
                     <tr>
                         <td>收入</td>
                         <td>工程类</td>
-                        <td><input name="incomeEngineerEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.incomeEngineerTaxExclude,'0.00')}" required readonly title="工程类概算总额"></td>
+<#--                        <td><input name="incomeEngineerEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.incomeEngineerTaxExclude,'0.00')}" required readonly title="工程类概算总额"></td>-->
                         <td><input name="incomeEngineerBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.incomeEngineerTaxExclude,'0.00')}" required readonly title="工程类预算总额"></td>
                         <td><input name="incomeEngineerFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.incomeEngineerTaxExclude,'0.00')}" required readonly title="工程类上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="incomeEngineer" value="${Utils.format(monthBean.incomeEngineer,'0.00')}" required title="工程类本月结算金额"></td>
@@ -77,7 +77,7 @@
                     <tr>
                         <td>收入</td>
                         <td>服务类</td>
-                        <td><input name="incomeServiceEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.incomeServiceTaxExclude,'0.00')}" required readonly title="服务类概算总额"></td>
+<#--                        <td><input name="incomeServiceEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.incomeServiceTaxExclude,'0.00')}" required readonly title="服务类概算总额"></td>-->
                         <td><input name="incomeServiceBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.incomeServiceTaxExclude,'0.00')}" required readonly title="服务类预算总额"></td>
                         <td><input name="incomeServiceFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.incomeServiceTaxExclude,'0.00')}" required readonly title="服务类上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="incomeService" value="${Utils.format(monthBean.incomeService,'0.00')}" required title="服务类本月结算金额"></td>
@@ -86,7 +86,7 @@
                     <tr>
                         <td>合计</td>
                         <td></td>
-                        <td><input name="incomeEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.getIncomeTotalTaxExclude(),'0.00')}" readonly required title="此列累计"></td>
+<#--                        <td><input name="incomeEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.getIncomeTotalTaxExclude(),'0.00')}" readonly required title="此列累计"></td>-->
                         <td><input name="incomeBudgetTotal" type="text" class="number"  value="${Utils.format(budgetBean.getIncomeTotalTaxExclude(),'0.00')}" readonly required title="此列累计"></td>
                         <td><input name="incomeFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.getIncomeTotalTaxExclude(),'0.00')}" required readonly title="此列累计"></td>
                         <td><input type="text" class="number" name="incomeTotal" value="${Utils.format(monthBean.getIncomeTotal(),'0.00')}" readonly title="此列累计"></td>
@@ -101,7 +101,7 @@
                         <td>类别</td>
                         <td>费用</td>
                         <td>费用项目</td>
-                        <td>概算总额（元）</td>
+<#--                        <td>概算总额（元）</td>-->
                         <td>预算总额（元）</td>
                         <td>上月结算总额（元）</td>
                         <td>本月结算金额（元）</td>
@@ -111,7 +111,7 @@
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>设备</td>
-                        <td><input name="costPurchaseDeviceEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseDeviceTaxExclude,'0.00')}" readonly required title="购买设备概算总额"></td>
+<#--                        <td><input name="costPurchaseDeviceEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseDeviceTaxExclude,'0.00')}" readonly required title="购买设备概算总额"></td>-->
                         <td><input name="costPurchaseDeviceBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseDeviceTaxExclude,'0.00')}" readonly required title="购买设备预算总额"></td>
                         <td><input name="costPurchaseDeviceFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costPurchaseDeviceTaxExclude,'0.00')}" required readonly title="购买设备上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="costPurchaseDevice" value="${Utils.format(monthBean.costPurchaseDevice,'0.00')}" required title="购买设备本月结算总额"></td>
@@ -121,7 +121,7 @@
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>施工</td>
-                        <td><input name="costPurchaseBuildEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseBuildTaxExclude,'0.00')}" readonly required title="施工采购成本概算总额"></td>
+<#--                        <td><input name="costPurchaseBuildEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseBuildTaxExclude,'0.00')}" readonly required title="施工采购成本概算总额"></td>-->
                         <td><input name="costPurchaseBuildBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseBuildTaxExclude,'0.00')}" readonly required title="施工采购成本预算总额"></td>
                         <td><input name="costPurchaseBuildFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costPurchaseBuildTaxExclude,'0.00')}" required readonly title="施工采购成本上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="costPurchaseBuild" value="${Utils.format(monthBean.costPurchaseBuild,'0.00')}" required title="施工采购成本本月结算金额"></td>
@@ -131,7 +131,7 @@
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>服务</td>
-                        <td><input name="costPurchaseServiceEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseServiceTaxExclude,'0.00')}" readonly required title="服务采购成本概算总额"></td>
+<#--                        <td><input name="costPurchaseServiceEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseServiceTaxExclude,'0.00')}" readonly required title="服务采购成本概算总额"></td>-->
                         <td><input name="costPurchaseServiceBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseServiceTaxExclude,'0.00')}" readonly required title="服务采购成本预算总额"></td>
                         <td><input name="costPurchaseServiceFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costPurchaseServiceTaxExclude,'0.00')}" required readonly title="服务采购成本上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="costPurchaseService" value="${Utils.format(monthBean.costPurchaseService,'0.00')}" required title="服务采购成本本月结算金额"></td>
@@ -141,7 +141,7 @@
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>其他</td>
-                        <td><input name="costPurchaseOtherEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseOtherTaxExclude,'0.00')}" readonly required title="其他采购成本概算总额"></td>
+<#--                        <td><input name="costPurchaseOtherEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseOtherTaxExclude,'0.00')}" readonly required title="其他采购成本概算总额"></td>-->
                         <td><input name="costPurchaseOtherBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseOtherTaxExclude,'0.00')}" readonly required title="其他采购成本预算总额"></td>
                         <td><input name="costPurchaseOtherFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costPurchaseOtherTaxExclude,'0.00')}" required readonly title="其他采购成本上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="costPurchaseOther" value="${Utils.format(monthBean.costPurchaseOther,'0.00')}" required title="其他采购成本本月结算金额"></td>
@@ -151,7 +151,7 @@
                         <td>成本</td>
                         <td>项目管理成本</td>
                         <td>项目管理成本</td>
-                        <td><input name="costProjectManageEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costProjectManageTaxExclude,'0.00')}" readonly required title="项目管理成本概算总额"></td>
+<#--                        <td><input name="costProjectManageEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costProjectManageTaxExclude,'0.00')}" readonly required title="项目管理成本概算总额"></td>-->
                         <td><input name="costProjectManageBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0.00')}" readonly required title="项目管理成本预算总额"></td>
                         <td><input name="costProjectManageFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costProjectManageTaxExclude,'0.00')}" required readonly title="项目管理成本上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="costProjectManage" value="${Utils.format(monthBean.costProjectManage,'0.00')}" required title="项目管理成本本月结算金额">
@@ -163,7 +163,7 @@
                         <td>其他</td>
                         <td><input type="text" id="otherName" maxlength="50" data-validate-async data-validation-message="请输入其他中的小类名称（50字符以内）"
                                    value="${project.otherName!}" name="otherName" placeholder="请输入其他中的小类名称（50字符以内）"/> </td>
-                        <td><input name="costOtherEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costOtherOtherTaxExclude,'0.00')}" readonly title="其他成本概算总额"></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>
@@ -173,7 +173,7 @@
                         <td>合计</td>
                         <td></td>
                         <td></td>
-                        <td><input name="costEstimateTotal" value="${Utils.format(estimateBean.getCostTotalTaxExclude(),'0.00')}" type="text" class="number" readonly required title="此列累计"></td>
+<#--                        <td><input name="costEstimateTotal" value="${Utils.format(estimateBean.getCostTotalTaxExclude(),'0.00')}" type="text" class="number" readonly required title="此列累计"></td>-->
                         <td><input name="costBudgetTotal" value="${Utils.format(budgetBean.getCostTotalTaxExclude(),'0.00')}" type="text" class="number" readonly required title="此列累计"></td>
                         <td><input name="costFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.getCostTotalTaxExclude(),'0.00')}" required readonly title="此列累计"></td>
                         <td><input type="text" class="number" name="costTotal" value="${Utils.format(monthBean.getCostTotal(),'0.00')}" readonly title="此列累计"></td>
@@ -187,7 +187,7 @@
                     <tr class="am-text-xl">
                         <td>类别</td>
                         <td>费用项目</td>
-                        <td>概算总额（元）</td>
+<#--                        <td>概算总额（元）</td>-->
                         <td>预算总额（元）</td>
                         <td>上月结算总额（元）</td>
                         <td>本月结算金额（元）</td>
@@ -196,7 +196,7 @@
                     <tr>
                         <td>财务费用</td>
                         <td>资金占用成本</td>
-                        <td><input name="costExpropriationEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costExpropriationTaxExclude,'0.00')}" required readonly title="资金占用成本概算总额"></td>
+<#--                        <td><input name="costExpropriationEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costExpropriationTaxExclude,'0.00')}" required readonly title="资金占用成本概算总额"></td>-->
                         <td><input name="costExpropriationBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.costExpropriationTaxExclude,'0.00')}" required readonly title="资金占用成本预算总额"></td>
                         <td><input name="costExpropriationFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costExpropriationTaxExclude,'0.00')}" required readonly title="资金占用成本上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="costExpropriation" value="${Utils.format(monthBean.costExpropriation,'0.00')}" required title="资金占用成本本月结算金额"></td>
@@ -205,7 +205,7 @@
                     <tr>
                         <td>公司管理费用</td>
                         <td></td>
-                        <td><input name="costCompanyManageEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costCompanyManageTaxExclude,'0.00')}" required readonly title="公司管理费用概算总额"></td>
+<#--                        <td><input name="costCompanyManageEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costCompanyManageTaxExclude,'0.00')}" required readonly title="公司管理费用概算总额"></td>-->
                         <td><input name="costCompanyManageBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.costCompanyManageTaxExclude,'0.00')}" required readonly title="公司管理费用预算总额"></td>
                         <td><input name="costCompanyManageFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costCompanyManageTaxExclude,'0.00')}" required readonly title="公司管理费用上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="costCompanyManage" value="${Utils.format(monthBean.costCompanyManage,'0.00')}" required title="公司管理费用本月结算金额"></td>
@@ -214,7 +214,7 @@
                     <tr>
                         <td>所得税费用</td>
                         <td></td>
-                        <td>/</td>
+<#--                        <td>/</td>-->
                         <td>/</td>
                         <td><input name="costIncomeTaxFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costIncomeTax,'0.00')}" required readonly title="公司管理费用上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="costIncomeTax" value="${Utils.format(monthBean.costIncomeTax,'0.00')}" required title="公司管理费用本月结算金额"></td>
@@ -223,7 +223,7 @@
                     <tr>
                         <td>合计</td>
                         <td></td>
-                        <td><input name="costManageEstimateTotal" value="${Utils.format(estimateBean.costExpropriationTaxExclude + estimateBean.costCompanyManageTaxExclude,'0.00')}" type="text" class="number" readonly required title="此列累计"></td>
+<#--                        <td><input name="costManageEstimateTotal" value="${Utils.format(estimateBean.costExpropriationTaxExclude + estimateBean.costCompanyManageTaxExclude,'0.00')}" type="text" class="number" readonly required title="此列累计"></td>-->
                         <td><input name="costManageBudgetTotal" value="${Utils.format(budgetBean.costExpropriationTaxExclude + budgetBean.costCompanyManageTaxExclude,'0.00')}" type="text" class="number" readonly required title="此列累计"></td>
                         <td><input name="costManageFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.getCostManageTotal(),'0.00')}" required readonly title="此列累计"></td>
                         <td><input type="text" class="number" name="costManageTotal" value="${Utils.format(monthBean.getCostManageTotal(),'0.00')}" readonly title="此列累计"></td>
@@ -237,7 +237,7 @@
                     <tbody>
                     <tr class="am-text-xl">
                         <td>类别</td>
-                        <td>概算总额（元）</td>
+<#--                        <td>概算总额（元）</td>-->
                         <td>预算总额（元）</td>
                         <td>上月结算总额（元）</td>
                         <td>本月结算金额（元）</td>
@@ -246,7 +246,7 @@
                     </tr>
                     <tr>
                         <td>项目毛利</td>
-                        <td><input name="grossProfitEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.getProjectGrossProfit(),'0.00')}" required readonly title="项目毛利概算总额"></td>
+<#--                        <td><input name="grossProfitEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.getProjectGrossProfit(),'0.00')}" required readonly title="项目毛利概算总额"></td>-->
                         <td><input name="grossProfitBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.getProjectGrossProfit(),'0.00')}" required readonly title="项目毛利预算总额"></td>
                         <td><input name="grossProfitFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.grossProfit,'0.00')}" required readonly title="项目毛利上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="grossProfit" value="${Utils.format(monthBean.grossProfit,'0.00')}" readonly required title="项目毛利本月结算金额"></td>
@@ -255,7 +255,7 @@
                     </tr>
                     <tr>
                         <td>项目贡献利润</td>
-                        <td><input name="contributionProfitEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.getProjectContributionProfit(),'0.00')}" required readonly title="项目贡献利润概算总额"></td>
+<#--                        <td><input name="contributionProfitEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.getProjectContributionProfit(),'0.00')}" required readonly title="项目贡献利润概算总额"></td>-->
                         <td><input name="contributionProfitBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.getProjectContributionProfit(),'0.00')}" required readonly title="项目贡献利润预算总额"></td>
                         <td><input name="contributionProfitFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.contributionProfit,'0.00')}" required readonly title="项目贡献利润上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="contributionProfit" value="${Utils.format(monthBean.contributionProfit,'0.00')}" readonly required title="项目贡献利润本月结算金额"></td>
@@ -264,7 +264,7 @@
                     </tr>
                     <tr>
                         <td>项目净利润</td>
-                        <td>/</td>
+<#--                        <td>/</td>-->
                         <td>/</td>
                         <td><input name="netProfitFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.netProfit,'0.00')}" required readonly title="项目净利润上月结算总额"></td>
                         <td><input type="text" class="number" maxlength="16" name="netProfit" value="${Utils.format(monthBean.netProfit,'0.00')}" readonly required title="项目净利润本月结算金额"></td>