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