diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index 0a811eb..be93b56 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -87,6 +87,7 @@
         }
 
         input {
+            width: 600px;
             border:0 none;
             outline:none;
         }
@@ -94,10 +95,10 @@
             overflow-x: hidden;
             overflow-y:hidden;
         }
+
         .huanhang{
-        // 表格自动换行
-        table-layout:fixed;
-            word-break:break-all
+            table-layout:fixed;
+            word-break:break-all;
         }
 
     </style>
@@ -137,7 +138,7 @@
                             <!--验证表单元素（validate) begin-->
 
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 69px; margin-bottom: 13px;" value="部门名称"/></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 80px; margin-bottom: 13px;" value="部门名称"/></div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <input readonly value="${project.deptName!}"/>
                                 </div>
@@ -145,7 +146,7 @@
                             </div>
 
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 69px;margin-bottom: 6px;" value="项目编号"/></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 80px;margin-bottom: 6px;" value="项目编号"/></div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <#--<textarea style="overflow:auto; background-attachment: fixed;
                                     background-repeat: no-repeat; border-style: solid;border-color: #FFFFFF">${project.name}</textarea>-->
@@ -155,7 +156,7 @@
                             </div>
 
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 69px;margin-bottom: 6px;" value="项目名称"/></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 80px;margin-bottom: 6px;" value="项目名称"/></div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <#--<textarea style="overflow:auto; background-attachment: fixed;
                                     background-repeat: no-repeat; border-style: solid;border-color: #FFFFFF">${project.name}</textarea>-->
@@ -165,7 +166,7 @@
                             </div>
 
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 69px ;margin-bottom: 12px;" value="项目类型"/></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 80px ;margin-bottom: 12px;" value="项目类型"/></div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <span>
                                     <#if (project.type) =1>
@@ -181,7 +182,7 @@
                             </div>
 
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 134px ;margin-bottom: 6px;" value="项目计划开始时间"/></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 160px ;margin-bottom: 6px;" value="项目计划开始时间"/></div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <input readonly value="${(project.startDate?string("yyyy-MM-dd"))!}"/>
                                 </div>
@@ -189,7 +190,7 @@
                             </div>
 
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 134px ;margin-bottom: 6px;" value="项目计划结束时间"/></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 160px ;margin-bottom: 6px;" value="项目计划结束时间"/></div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <input readonly value="${(project.endDate?string("yyyy-MM-dd"))!}"/>
                                 </div>
@@ -197,7 +198,7 @@
                             </div>
 
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 69px ;margin-bottom: 12px;" value="垫资模式"/></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 80px ;margin-bottom: 12px;" value="垫资模式"/></div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <span>
                                     <#if (project.underwrittenMode) =1>
@@ -215,7 +216,7 @@
                             </div>
 
                             <div class="am-g am-form-group am-margin-top" id="coop" <#if project.underwrittenMode! != 1>hidden</#if>>
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 69px ;margin-bottom: 12px;" value="合作对象"/></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 80px ;margin-bottom: 12px;" value="合作对象"/></div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <input readonly value="${project.collaborator!}"/>
                                 </div>
@@ -230,7 +231,7 @@
                             </div>
 
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 69px ;margin-bottom: 12px;" value="项目把握度"/></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 100px ;margin-bottom: 12px;" value="项目把握度"/></div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <span>
                                     <#if (project.certainty) =1>
@@ -246,7 +247,7 @@
                             </div>
 
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 100px;margin-bottom: 12px;" value="行业场景应用"/></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 120px;margin-bottom: 12px;" value="行业场景应用"/></div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <input readonly value="${project.industryScenario!}"/>
                                 </div>
@@ -254,7 +255,7 @@
                             </div>
 
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 69px ;margin-bottom: 6px;" value="客户名称"/></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 80px ;margin-bottom: 6px;" value="客户名称"/></div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                    <#-- <textarea style="overflow:auto; background-attachment: fixed;
                                     background-repeat: no-repeat; border-style: solid;border-color: #FFFFFF">${project.customer}</textarea>-->
@@ -264,7 +265,7 @@
                             </div>
 
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 100px ;margin-bottom: 6px;" value="终端客户名称"/></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 120px ;margin-bottom: 6px;" value="终端客户名称"/></div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <#--<textarea style="overflow:auto; background-attachment: fixed;
                                     background-repeat: no-repeat; border-style: solid;border-color: #FFFFFF">${project.terminalCustomer}</textarea>-->
@@ -287,7 +288,7 @@
                             <#--                                <div class="am-u-sm-2 am-u-md-4 input-msg"></div>-->
                             <#--                            </div>-->
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 69px;margin-bottom: 12px;" value="合同金额"/></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 80px;margin-bottom: 12px;" value="合同金额"/></div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <input readonly value="${Utils.format(project.contractAmount)}元"/>
                                 </div>
@@ -295,7 +296,7 @@
                             </div>
 
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 69px ;margin-bottom: 12px;" value="项目毛利"/></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 80px ;margin-bottom: 12px;" value="项目毛利"/></div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <input readonly value="${Utils.format(project.grossProfit)}元" />
                                 </div>
@@ -303,7 +304,7 @@
                             </div>
 
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 69px ;margin-bottom: 12px;" value="项目毛利率"/></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 100px ;margin-bottom: 12px;" value="项目毛利率"/></div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <input readonly value="${Utils.format(project.grossProfitMargin)}%" />
                                 </div>
@@ -311,7 +312,7 @@
                             </div>
 
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;margin-left: 10px;margin-left: -15px" value="华智产品金额"/></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 120px;" value="华智产品金额"/></div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <input readonly value="${Utils.format(project.huazhiProductAmount, '0.00')}元"/>
                                 </div>
@@ -319,7 +320,7 @@
                             </div>
 
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;margin-left: -15px" value="汇智产品金额"/></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 120px;" value="汇智产品金额"/></div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <input readonly value="${Utils.format(project.huizhiProductAmount, '0.00')}元"/>
                                 </div>
@@ -327,7 +328,7 @@
                             </div>
 
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;margin-left: 10px;margin-left: -15px" value="华三产品金额"/></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 120px;" value="华三产品金额"/></div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <input readonly value="${Utils.format(project.huasanProductAmount, '0.00')}元"/>
                                 </div>
@@ -335,7 +336,7 @@
                             </div>
 
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;margin-left: -15px" value="其他产品金额"/></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 120px;" value="其他产品金额"/></div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <input readonly value="${Utils.format(project.ziguangOtherAmount, '0.00')}元"/>
                                 </div>
@@ -343,7 +344,7 @@
                             </div>
 
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 116px;margin-top: -6px;" value="主合同收款条款"/></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 140px;" value="主合同收款条款"/></div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <input readonly value="${project.mainContractCollectionTerms!}"/>
                                 </div>
@@ -351,7 +352,7 @@
                             </div>
 
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 90px;margin-top: -6px;" value="价值及风险"/></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 100px;" value="价值及风险"/></div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <input readonly value="${project.valueRisk!}"/>
                                 </div>
@@ -365,7 +366,7 @@
                         <div class="am-tab-panel am-fade am-in am-scrollable-horizontal" id="tab2">
 
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 69px ;margin-bottom: 12px;" value="项目负责人"/></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 100px ;margin-bottom: 12px;" value="项目负责人"/></div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <input readonly value="${project.principal!}"/>
                                 </div>
@@ -373,20 +374,18 @@
                             </div>
 
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 69px ;margin-bottom: 12px;" value="预计合同签订时间"/></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 160px ;margin-bottom: 12px;" value="预计合同签订时间"/></div>
                                 <div class="am-u-sm-2 am-u-md-2">
                                     <div class="am-form-group am-form-icon">
-                                        <i class="am-icon-calendar"></i>
                                         <input readonly value="${(project.contractTime?string("yyyy-MM-dd"))!}"/>
                                     </div>
                                 </div>
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 69px ;margin-bottom: 12px;" value="项目计划招标时间"/></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 160px ;margin-bottom: 12px;" value="项目计划招标时间"/></div>
                                 <div class="am-u-sm-2 am-u-md-2">
                                     <div class="am-form-group am-form-icon">
-                                        <i class="am-icon-calendar"></i>
                                         <input readonly value="${(project.bidsTime?string("yyyy-MM-dd"))!}"/>
                                     </div>
                                 </div>
@@ -394,7 +393,7 @@
                             </div>
 
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 69px ;margin-bottom: 12px;" value="是否二次合作"/></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 120px ;margin-bottom: 12px;" value="是否二次合作"/></div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <span>
                                     <#if (project.isSecond!) =1>
@@ -408,7 +407,7 @@
                             </div>
 
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 69px ;margin-bottom: 12px;" value="签单方式"/></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 80px ;margin-bottom: 12px;" value="签单方式"/></div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <span>
                                     <#if (project.signType!) =1>
@@ -420,7 +419,7 @@
                             </div>
 
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 69px ;margin-bottom: 12px;" value="项目解决方案"/></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 120px ;margin-bottom: 12px;" value="项目解决方案"/></div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <span>
                                     <#if (project.resolvePlan!) =1>
@@ -436,14 +435,14 @@
                             </div>
 
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 69px ;margin-bottom: 12px;" value="垫资利息"/></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 80px ;margin-bottom: 12px;" value="垫资利息"/></div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <input readonly value="${Utils.format(project.advanceInterestAmount)}元" />
                                 </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"><input readonly style="text-align: right;width: 69px ;margin-bottom: 12px;" value="垫资峰值"/></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 80px ;margin-bottom: 12px;" value="垫资峰值"/></div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <input readonly value="${Utils.format(project.advancePeakAmount)}元" />
                                 </div>
@@ -451,7 +450,7 @@
                             </div>
 
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 116px;margin-top: -6px;" value="主合同收款条款"/></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 140px;" value="主合同收款条款"/></div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <input readonly value="${project.mainContractCollectionTerms!}"/>
                                 </div>
@@ -459,7 +458,7 @@
                             </div>
 
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 116px;margin-top: -6px;" value="主合同具体解决方案"/></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 180px;" value="主合同具体解决方案"/></div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <input readonly value="${project.mainContractResolvePlan!}"/>
                                 </div>
@@ -467,7 +466,7 @@
                             </div>
 
                             <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 116px;margin-top: -6px;" value="计收计划"/></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 80px;" value="计收计划"/></div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <input readonly value="${project.calculationCollection!}"/>
                                 </div>
@@ -663,6 +662,7 @@
                                             <td>税率（%）</td>
                                             <td>含税总金额（元）</td>
                                             <td>不含税金额（元）</td>
+                                            <td>税金（元）</td>
                                             <#--<td>操作</td>-->
                                         </tr>
 
@@ -711,6 +711,10 @@
                                                                class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-tax-exclude"
                                                                value="${Utils.format(incomeDetail.totalTaxExclude,'0.00')}"
                                                                readonly></td>
+                                                    <td width="200px"><input type="text"
+                                                               class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-tax"
+                                                               value="${Utils.format(incomeDetail.totalTax,'0.00')}"
+                                                               readonly></td>
                                                     <#--<td>
                                                         <button type="button"
                                                                 class="am-btn am-btn-warning am-btn-xs am-round am-modal-line-delete">
@@ -729,6 +733,7 @@
                                             <td></td>
                                             <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-total-tax-include-income" value="${Utils.format(budgetBean.incomeTotalTaxInclude,'0.00')}" readonly></td>
                                             <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-total-tax-exclude-income" value="${Utils.format(budgetBean.incomeTotalTaxExclude,'0.00')}" readonly></td>
+                                            <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-total-tax-income" value="${Utils.format(budgetBean.incomeTotalTax,'0.00')}" readonly></td>
                                             <#--<td></td>-->
                                         </tr>
                                         </tbody>
@@ -751,6 +756,7 @@
                                             <td>税率（%）</td>
                                             <td>含税总金额（元）</td>
                                             <td>不含税金额（元）</td>
+                                            <td>税金（元）</td>
                                             <#--<td>操作</td>-->
                                         </tr>
 
@@ -810,6 +816,11 @@
                                                                value="${Utils.format(costDetail.totalTaxExclude,'0.00')}"
                                                                readonly>
                                                     </td>
+                                                    <td width="200px"><input type="text"
+                                                                             class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-tax"
+                                                                             value="${Utils.format(costDetail.totalTax,'0.00')}"
+                                                                             readonly>
+                                                    </td>
                                                     <#--<td>
                                                          <button type="button"
                                                                  class="am-btn am-btn-warning am-btn-xs am-round am-modal-line-delete">
@@ -829,6 +840,7 @@
                                             <td></td>
                                             <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-total-tax-include-cost" value="${Utils.format(budgetBean.costPurchaseTotalTaxInclude,'0.00')}" readonly></td>
                                             <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-total-tax-exclude-cost" value="${Utils.format(budgetBean.costPurchaseTotalTaxExclude,'0.00')}" readonly></td>
+                                            <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-total-tax-cost" value="${Utils.format(budgetBean.costPurchaseTotalTax,'0.00')}" readonly></td>
                                             <#--<td></td>-->
                                         </tr>
                                         </tbody>
@@ -939,6 +951,9 @@
                                         </tr>
                                         </tbody>
                                     </table>
+                                    <div>
+                                        备注：本表展示不含税金额
+                                    </div>
                                 </div>
                                 <div class="am-tab-panel am-fade am-in" id="tab34">
                                     <#--<span class="am-text-lg">资金计划表</span>-->
@@ -1105,6 +1120,7 @@
                                             <td>费用</td>
                                             <td>含税金额（元）</td>
                                             <td>不含税金额（元）</td>
+                                            <td>税金（元）</td>
                                         </tr>
                                         <tr>
                                             <td>收入</td>
@@ -1115,6 +1131,9 @@
                                             <td><input type="text" class="number" name="incomeDeviceTaxExclude"
                                                        value="${Utils.format(budgetBean.incomeDeviceTaxExclude,'0.00')}"
                                                        required readonly title="设备类不含税总额"></td>
+                                            <td><input type="text" class="number" name="incomeDeviceTax"
+                                                       value="${Utils.format(budgetBean.incomeDeviceTax,'0.00')}"
+                                                       required readonly title="设备类税金"></td>
                                         </tr>
                                         <tr>
                                             <td>收入</td>
@@ -1125,6 +1144,9 @@
                                             <td><input type="text" class="number" name="incomeEngineerTaxExclude"
                                                        value="${Utils.format(budgetBean.incomeEngineerTaxExclude,'0.00')}"
                                                        required readonly title="工程类不含税总额"></td>
+                                            <td><input type="text" class="number" name="incomeEngineerTax"
+                                                       value="${Utils.format(budgetBean.incomeEngineerTax,'0.00')}"
+                                                       required readonly title="工程类税金"></td>
                                         </tr>
                                         <tr>
                                             <td>收入</td>
@@ -1135,6 +1157,9 @@
                                             <td><input type="text" class="number" name="incomeServiceTaxExclude"
                                                        value="${Utils.format(budgetBean.incomeServiceTaxExclude,'0.00')}"
                                                        required readonly title="服务类不含税总额"></td>
+                                            <td><input type="text" class="number" name="incomeServiceTax"
+                                                       value="${Utils.format(budgetBean.incomeServiceTax,'0.00')}"
+                                                       required readonly title="服务类税金"></td>
                                         </tr>
                                         <tr>
                                             <td>合计</td>
@@ -1145,8 +1170,12 @@
                                             <td><input type="text" class="number" name="incomeTotalTaxExclude"
                                                        value="${Utils.format(budgetBean.incomeTotalTaxExclude,'0.00')}"
                                                        readonly required title="此列累计"></td>
+                                            <td><input type="text" class="number" name="incomeTotalTax"
+                                                       value="${Utils.format(budgetBean.incomeTotalTax,'0.00')}"
+                                                       readonly required title="此列累计"></td>
                                         </tr>
                                         </tbody>
+                                        (备注：本表所用税率为：<span class="incomeTaxRates">${incomeTaxRates!}</span>)
                                     </table>
                                     <span class="am-text-lg">成本</span>
                                     <#-- <span class="am-text-primary"><a style="cursor: pointer"  id="cost-detail">采购成本明细表</a></span>
@@ -1160,6 +1189,7 @@
                                             <td>费用项目</td>
                                             <td>含税金额（元）</td>
                                             <td>不含税金额（元）</td>
+                                            <td>税金（元）</td>
                                         </tr>
                                         <tr>
                                             <td>成本</td>
@@ -1171,6 +1201,9 @@
                                             <td><input type="text" class="number" name="costPurchaseDeviceTaxExclude"
                                                        value="${Utils.format(budgetBean.costPurchaseDeviceTaxExclude,'0.00')}"
                                                        readonly required title="购买设备不含税总额"></td>
+                                            <td><input type="text" class="number" name="costPurchaseDeviceTax"
+                                                       value="${Utils.format(budgetBean.costPurchaseDeviceTax,'0.00')}"
+                                                       readonly required title="购买设备税金"></td>
                                         </tr>
                                         <tr>
                                             <td>成本</td>
@@ -1182,6 +1215,9 @@
                                             <td><input type="text" class="number" name="costPurchaseBuildTaxExclude"
                                                        value="${Utils.format(budgetBean.costPurchaseBuildTaxExclude,'0.00')}"
                                                        readonly required title="购买施工不含税总额"></td>
+                                            <td><input type="text" class="number" name="costPurchaseBuildTax"
+                                                       value="${Utils.format(budgetBean.costPurchaseBuildTax,'0.00')}"
+                                                       readonly required title="购买施工税金"></td>
                                         </tr>
                                         <tr>
                                             <td>成本</td>
@@ -1193,6 +1229,9 @@
                                             <td><input type="text" class="number" name="costPurchaseServiceTaxExclude"
                                                        value="${Utils.format(budgetBean.costPurchaseServiceTaxExclude,'0.00')}"
                                                        readonly required title="购买服务不含税总额"></td>
+                                            <td><input type="text" class="number" name="costPurchaseServiceTax"
+                                                       value="${Utils.format(budgetBean.costPurchaseServiceTax,'0.00')}"
+                                                       readonly required title="购买服务税金"></td>
                                         </tr>
                                         <tr>
                                             <td>成本</td>
@@ -1204,6 +1243,9 @@
                                             <td><input type="text" class="number" name="costPurchaseOtherTaxExclude"
                                                        value="${Utils.format(budgetBean.costPurchaseOtherTaxExclude,'0.00')}"
                                                        readonly required title="购买其他不含税总额"></td>
+                                            <td><input type="text" class="number" name="costPurchaseOtherTax"
+                                                       value="${Utils.format(budgetBean.costPurchaseOtherTax,'0.00')}"
+                                                       readonly required title="购买其他税金"></td>
                                         </tr>
                                         <tr>
                                             <td>成本</td>
@@ -1215,6 +1257,9 @@
                                             <td><input type="text" class="number" name="costProjectManageTaxExclude"
                                                        value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0.00')}"
                                                        readonly required title="项目管理成本总额"></td>
+                                            <td><input type="text" class="number" name="costProjectManageTax"
+                                                       value="财务计取以不含税方式核算"
+                                                       readonly required title=""></td>
                                         </tr>
                                         <tr>
                                             <td>成本</td>
@@ -1226,6 +1271,9 @@
                                             <td><input type="text" class="number" name="costOtherOtherTaxExclude"
                                                        value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0.00')}"
                                                        required readonly title="其他不含税总额（填入）"></td>
+                                            <td><input type="text" class="number" name="costOtherOtherTax"
+                                                       value="${Utils.format(budgetBean.costOtherOtherTax,'0.00')}"
+                                                       required readonly title="其他税金"></td>
                                         </tr>
                                         <tr>
                                             <td>合计</td>
@@ -1237,8 +1285,12 @@
                                             <td><input type="text" class="number" name="costTotalTaxExclude"
                                                        value="${Utils.format(budgetBean.costTotalTaxExclude, '0.00')}"
                                                        readonly required title="此列累计"></td>
+                                            <td><input type="text" class="number" name="costTotalTax"
+                                                       value="${Utils.format(budgetBean.costTotalTax, '0.00')}"
+                                                       readonly required title="此列累计"></td>
                                         </tr>
                                         </tbody>
+                                        (备注：本表所用税率为：<span class="costTaxRates">${costTaxRates!}</span>)
                                     </table>
                                     <span class="am-text-lg">管理</span>
                                     <#--<span class="am-text-primary budget-plan-detail"><a style="cursor: pointer">资金计划表</a></span>-->
@@ -1265,8 +1317,7 @@
                                                        required readonly title="公司管理费用不含税总额"></td>
                                         </tr>
                                         </tbody>
-                                    </table>
-                                    </tbody>
+                                        (备注：财务记取以不含税方式核算)
                                     </table>
 
                                     <span class="am-text-lg">利润率计算</span>
@@ -1275,31 +1326,21 @@
                                         <tbody>
                                         <tr class="am-text-lg">
                                             <td>类别</td>
-                                            <td></td>
+                                            <td>利润率(%)</td>
+                                            <td>不含税金额(元)</td>
+                                            <td>计算方式</td>
                                         </tr>
                                         <tr>
                                             <td>项目毛利（元）</td>
-                                            <td><input type="text" class="number" name="projectGrossProfit"
-                                                       value="${Utils.format(budgetBean.projectGrossProfit,'0.00')}"
-                                                       readonly required title="收入总计（不含税）-成本总计（不含税）-财务费用总计（不含税）"></td>
-                                        </tr>
-                                        <tr>
-                                            <td>项目毛利率（%）</td>
-                                            <td><input type="text" class="number" name="projectGrossProfitRate"
-                                                       value="${Utils.format(budgetBean.projectGrossProfitRate,'0.00')}"
-                                                       readonly required title="毛利（不含税）/收入总计（不含税）"></td>
+                                            <td><input type="text" class="number" name="projectGrossProfitRate" value="${Utils.format(budgetBean.projectGrossProfitRate,'0')}" readonly required title="毛利（不含税）/收入总计（不含税）"></td>
+                                            <td><input type="text" class="number" name="projectGrossProfit" value="${Utils.format(budgetBean.projectGrossProfit,'0')}" readonly required title="收入总计（不含税）-成本总计（不含税）-财务费用总计（不含税）"></td>
+                                            <td>毛利=收入总计(不含税)-成本总计(不含税)-财务费用总计(不含税)</td>
                                         </tr>
                                         <tr>
                                             <td>项目贡献利润（元）</td>
-                                            <td><input type="text" class="number" name="projectContributionProfit"
-                                                       value="${Utils.format(budgetBean.projectContributionProfit,'0.00')}"
-                                                       readonly required title="项目毛利（不含税）-公司管理费用总计（不含税）"></td>
-                                        </tr>
-                                        <tr>
-                                            <td>项目贡献利润率（%）</td>
-                                            <td><input type="text" class="number" name="projectContributionProfitRate"
-                                                       value="${Utils.format(budgetBean.projectContributionProfitRate,'0.00')}"
-                                                       readonly required title="贡献利润（不含税）/收入总计（不含税）"></td>
+                                            <td><input type="text" class="number" name="projectContributionProfitRate" value="${Utils.format(budgetBean.projectContributionProfitRate,'0')}" readonly required title="贡献利润（不含税）/收入总计（不含税）"></td>
+                                            <td><input type="text" class="number" name="projectContributionProfit" value="${Utils.format(budgetBean.projectContributionProfit,'0')}" readonly required title="项目毛利（不含税）-公司管理费用总计（不含税）"></td>
+                                            <td>贡献利润=项目毛利(不含税)-公司管理费用总计(不含税)</td>
                                         </tr>
                                         </tbody>
                                     </table>
@@ -1312,90 +1353,77 @@
                                         <tr class="am-text-lg">
                                             <td>类别</td>
                                             <td>金额（元）</td>
+                                            <td style="width: 200px;table-layout:fixed;word-break:break-all;">计算方式</td>
                                         </tr>
                                         <tr>
-                                            <td>销售商品、提供劳务收到的现金</td>
-                                            <td><input type="text" class="number" name="saleIncomeCash"
-                                                       value="${Utils.format(cashFlowBean.saleIncomeCash,'0.00')}" readonly
-                                                       required title="取自资金计划表（销售收款）"></td>
+                                            <td>销售商品、提供劳务收到的现金<#--a--></td>
+                                            <td><input type="text" class="number" name="saleIncomeCash" value="${Utils.format(cashFlowBean.saleIncomeCash,'0')}" readonly required title="取自资金计划表（销售收款）"></td>
+                                            <td style="width: 200px;table-layout:fixed;word-break:break-all;">从资金计划表查(销售收款)</td>
                                         </tr>
                                         <tr>
-                                            <td>收到的税费返还</td>
-                                            <td>/<input type="hidden" name="taxReturn"
-                                                        value="${Utils.format(cashFlowBean.taxReturn,'0.00')}" readonly
-                                                        required></td>
+                                            <td>收到的税费返还<#--b--></td>
+                                            <td>/<input type="hidden" name="taxReturn" value="${Utils.format(cashFlowBean.taxReturn,'0')}" readonly required></td>
+                                            <td style="width: 200px;table-layout:fixed;word-break:break-all;">/</td>
                                         </tr>
                                         <tr>
-                                            <td>收到其他与经营活动有关的现金</td>
-                                            <td><input type="text" class="number" name="earnestMoneyIncome"
-                                                       value="${Utils.format(cashFlowBean.earnestMoneyIncome,'0.00')}"
-                                                       readonly required title="取自资金计划表（保证金收款）"></td>
+                                            <td>收到其他与经营活动有关的现金<#--c--></td>
+                                            <td><input type="text" class="number" name="earnestMoneyIncome" value="${Utils.format(cashFlowBean.earnestMoneyIncome,'0')}" readonly required title="取自资金计划表（保证金收款）"></td>
+                                            <td style="width: 200px;table-layout:fixed;word-break:break-all;">从资金计划表查(保证金收款)</td>
                                         </tr>
                                         <tr>
-                                            <td>购买商品、接受劳务支付的现金</td>
-                                            <td><input type="text" class="number" name="purchaseCost"
-                                                       value="${Utils.format(cashFlowBean.purchaseCost,'0.00')}" readonly
-                                                       required title="取自资金计划表（设备支出+工程支出）"></td>
+                                            <td>购买商品、接受劳务支付的现金<#--d--></td>
+                                            <td><input type="text" class="number" name="purchaseCost" value="${Utils.format(cashFlowBean.purchaseCost,'0')}" readonly required title="取自资金计划表（设备支出+工程支出）"></td>
+                                            <td style="width: 200px;table-layout:fixed;word-break:break-all;">从资金计划表查(设备支出+工程支出)</td>
                                         </tr>
                                         <tr>
-                                            <td>支付的各项税费</td>
-                                            <td>/<input type="hidden" name="taxCost"
-                                                        value="${Utils.format(cashFlowBean.taxCost,'0.00')}" readonly
-                                                        required></td>
+                                            <td>支付的各项税费<#--e--></td>
+                                            <td>/<input type="hidden" name="taxCost" value="${Utils.format(cashFlowBean.taxCost,'0')}" readonly required></td>
+                                            <td style="width: 200px;table-layout:fixed;word-break:break-all;">/</td>
                                         </tr>
                                         <tr>
-                                            <td>支付其他与经营活动有关的现金</td>
-                                            <td><input type="text" class="number" name="earnestMoneyCost"
-                                                       value="${Utils.format(cashFlowBean.earnestMoneyCost,'0.00')}"
-                                                       readonly required title="取自资金计划表（经营性开支+保证金支出+资金利息）"></td>
+                                            <td>支付其他与经营活动有关的现金<#--f--></td>
+                                            <td><input type="text" class="number" name="earnestMoneyCost" value="${Utils.format(cashFlowBean.earnestMoneyCost,'0')}" readonly required title="取自资金计划表（经营性开支+保证金支出+资金利息）"></td>
+                                            <td style="width: 200px;table-layout:fixed;word-break:break-all;">从资金计划表查(经营性开支+保证金支出+资金利息)</td>
                                         </tr>
                                         <tr>
-                                            <td>经营活动产生的现金流量净额</td>
-                                            <td><input type="text" class="number" name="netCashFlow"
-                                                       value="${Utils.format(cashFlowBean.netCashFlow,'0.00')}" readonly
-                                                       required title="g=a+c+b-d-f-e"></td>
+                                            <td>经营活动产生的现金流量净额<#--g--></td>
+                                            <td><input type="text" class="number" name="netCashFlow" value="${Utils.format(cashFlowBean.netCashFlow,'0')}" readonly required title="g=a+c+b-d-f-e"></td>
+                                            <td style="width: 200px;table-layout:fixed;word-break:break-all;">销售商品、提供劳务收到的现金+收到其他与经营活动有关的现金-购买商品、接受劳务支付的现金-支付其他与经营活动有关的现金</td>
                                         </tr>
                                         <tr>
-                                            <td>投资活动现金流入</td>
-                                            <td>/<input type="hidden" name="cashInflowFromInvestingActivities"
-                                                        value="${Utils.format(cashFlowBean.cashInflowFromInvestingActivities,'0.00')}"
-                                                        readonly required></td>
+                                            <td>投资活动现金流入<#--h--></td>
+                                            <td>/<input type="hidden" name="cashInflowFromInvestingActivities" value="${Utils.format(cashFlowBean.cashInflowFromInvestingActivities,'0')}" readonly required></td>
+                                            <td style="width: 200px;table-layout:fixed;word-break:break-all;">/</td>
                                         </tr>
                                         <tr>
-                                            <td>投资活动现金流出</td>
-                                            <td>/<input type="hidden" name="cashOutflowFromInvestingActivities"
-                                                        value="${Utils.format(cashFlowBean.cashOutflowFromInvestingActivities,'0.00')}"
-                                                        readonly required></td>
+                                            <td>投资活动现金流出<#--i--></td>
+                                            <td>/<input type="hidden" name="cashOutflowFromInvestingActivities" value="${Utils.format(cashFlowBean.cashOutflowFromInvestingActivities,'0')}" readonly required></td>
+                                            <td style="width: 200px;table-layout:fixed;word-break:break-all;">/</td>
                                         </tr>
                                         <tr>
-                                            <td>投资活动产生的现金流量净额</td>
-                                            <td>/<input type="hidden" name="netCashFromInvestingActivities"
-                                                        value="${Utils.format(cashFlowBean.netCashFromInvestingActivities,'0.00')}"
-                                                        readonly required></td>
+                                            <td>投资活动产生的现金流量净额<#--j--></td>
+                                            <td>/<input type="hidden" name="netCashFromInvestingActivities" value="${Utils.format(cashFlowBean.netCashFromInvestingActivities,'0')}" readonly required></td>
+                                            <td style="width: 200px;table-layout:fixed;word-break:break-all;">/</td>
                                         </tr>
                                         <tr>
-                                            <td>融资资金流入</td>
-                                            <td><input type="text" class="number" name="financingCapitalInflow"
-                                                       value="${Utils.format(cashFlowBean.financingCapitalInflow,'0.00')}"
-                                                       readonly required title="从资金计划表查（垫资计划）"></td>
+                                            <td>融资资金流入<#--k--></td>
+                                            <td><input type="text" class="number" name="financingCapitalInflow" value="${Utils.format(cashFlowBean.financingCapitalInflow,'0')}" readonly required title="从资金计划表查（垫资计划）"></td>
+                                            <td style="width: 200px;table-layout:fixed;word-break:break-all;">从资金计划表查(垫资计划)</td>
                                         </tr>
                                         <tr>
-                                            <td>还款资金流出</td>
-                                            <td><input type="text" class="number" name="financingCapitalOutflow"
-                                                       value="${Utils.format(cashFlowBean.financingCapitalOutflow,'0.00')}"
-                                                       readonly required title="从资金计划表查（还款计划）"></td>
+                                            <td>还款资金流出<#--l--></td>
+                                            <td><input type="text" class="number" name="financingCapitalOutflow" value="${Utils.format(cashFlowBean.financingCapitalOutflow,'0')}" readonly required title="从资金计划表查（还款计划）"></td>
+                                            <td style="width: 200px;table-layout:fixed;word-break:break-all;">从资金计划表查(还款计划)</td>
                                         </tr>
                                         <tr>
-                                            <td>筹资活动产生的现金流量净额</td>
-                                            <td><input type="text" class="number" name="financingCapitalCashflow"
-                                                       value="${Utils.format(cashFlowBean.financingCapitalCashflow,'0.00')}"
-                                                       readonly required title="m=k-l"></td>
+                                            <td>筹资活动产生的现金流量净额<#--m--></td>
+                                            <td><input type="text" class="number" name="financingCapitalCashflow" value="${Utils.format(cashFlowBean.financingCapitalCashflow,'0')}" readonly required title="m=k-l"></td>
+                                            <td style="width: 200px;table-layout:fixed;word-break:break-all;">融资资金流入-还款资金流出</td>
                                         </tr>
                                         <tr>
-                                            <td>货币资金净增加额</td>
-                                            <td><input type="text" class="number" name="netIncreaseMonetaryFunds"
-                                                       value="${Utils.format(cashFlowBean.netIncreaseMonetaryFunds,'0.00')}"
-                                                       readonly required title="n=g+j+m"></td>
+                                            <td>货币资金净增加额<#--n--></td>
+                                            <td><input type="text" class="number" name="netIncreaseMonetaryFunds" value="${Utils.format(cashFlowBean.netIncreaseMonetaryFunds,'0')}" readonly required title="n=g+j+m"></td>
+                                            <td style="width: 200px;table-layout:fixed;word-break:break-all;">经营活动产生的现金流量净额+投资活动产生的现金流量净额+筹资活动产生的现金流量净额</td>
                                         </tr>
                                         </tbody>
                                     </table>