mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

master
xxssyyyyssxx 2021-11-30 17:05:39 +08:00
parent 35c983c697 fd13368f4f
commit 18e9e7342d
4 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/cn/palmte/work/service/StatisticsService.java
View File

@ -95,14 +95,14 @@ public class StatisticsService {
BigDecimal buildingCostTaxIncludeSum = allCost.stream().filter(d -> d.getType() == ProjectBudgetCost.TYPE_BUILDING).map(ProjectBudgetCost::getCostTaxInclude).reduce(BigDecimal.ZERO, BigDecimal::add); BigDecimal buildingCostTaxIncludeSum = allCost.stream().filter(d -> d.getType() == ProjectBudgetCost.TYPE_BUILDING).map(ProjectBudgetCost::getCostTaxInclude).reduce(BigDecimal.ZERO, BigDecimal::add);
BigDecimal serviceCostTaxIncludeSum = allCost.stream().filter(d -> d.getType() == ProjectBudgetCost.TYPE_SERVICE).map(ProjectBudgetCost::getCostTaxInclude).reduce(BigDecimal.ZERO, BigDecimal::add); BigDecimal serviceCostTaxIncludeSum = allCost.stream().filter(d -> d.getType() == ProjectBudgetCost.TYPE_SERVICE).map(ProjectBudgetCost::getCostTaxInclude).reduce(BigDecimal.ZERO, BigDecimal::add);
BigDecimal otherCostTaxIncludeSum = allCost.stream().filter(d -> d.getType() == ProjectBudgetCost.TYPE_OTHER).map(ProjectBudgetCost::getCostTaxInclude).reduce(BigDecimal.ZERO, BigDecimal::add); BigDecimal otherCostTaxIncludeSum = allCost.stream().filter(d -> d.getType() == ProjectBudgetCost.TYPE_OTHER).map(ProjectBudgetCost::getCostTaxInclude).reduce(BigDecimal.ZERO, BigDecimal::add);
BigDecimal projectManageCostTaxIncludeSum = allCost.stream().filter(d -> d.getType() == ProjectBudgetCost.TYPE_PROJECT_MANAGE).map(ProjectBudgetCost::getCostTaxInclude).reduce(BigDecimal.ZERO, BigDecimal::add); //BigDecimal projectManageCostTaxIncludeSum = allCost.stream().filter(d -> d.getType() == ProjectBudgetCost.TYPE_PROJECT_MANAGE).map(ProjectBudgetCost::getCostTaxInclude).reduce(BigDecimal.ZERO, BigDecimal::add);
BigDecimal otherOtherCostTaxIncludeSum = allCost.stream().filter(d -> d.getType() == ProjectBudgetCost.TYPE_OTHER_OTHER).map(ProjectBudgetCost::getCostTaxInclude).reduce(BigDecimal.ZERO, BigDecimal::add); BigDecimal otherOtherCostTaxIncludeSum = allCost.stream().filter(d -> d.getType() == ProjectBudgetCost.TYPE_OTHER_OTHER).map(ProjectBudgetCost::getCostTaxInclude).reduce(BigDecimal.ZERO, BigDecimal::add);
include.setCostPurchaseDevice(deviceCostTaxIncludeSum); include.setCostPurchaseDevice(deviceCostTaxIncludeSum);
include.setCostPurchaseBuild(buildingCostTaxIncludeSum); include.setCostPurchaseBuild(buildingCostTaxIncludeSum);
include.setCostPurchaseService(serviceCostTaxIncludeSum); include.setCostPurchaseService(serviceCostTaxIncludeSum);
include.setCostPurchaseOther(otherCostTaxIncludeSum); include.setCostPurchaseOther(otherCostTaxIncludeSum);
include.setCostProjectManage(projectManageCostTaxIncludeSum); //include.setCostProjectManage(projectManageCostTaxIncludeSum);
include.setCostOtherOther(otherOtherCostTaxIncludeSum); include.setCostOtherOther(otherOtherCostTaxIncludeSum);
BigDecimal deviceCostTaxExcludeSum = allCost.stream().filter(d -> d.getType() == ProjectBudgetCost.TYPE_DEVICE).map(ProjectBudgetCost::getCostTaxExclude).reduce(BigDecimal.ZERO, BigDecimal::add); BigDecimal deviceCostTaxExcludeSum = allCost.stream().filter(d -> d.getType() == ProjectBudgetCost.TYPE_DEVICE).map(ProjectBudgetCost::getCostTaxExclude).reduce(BigDecimal.ZERO, BigDecimal::add);
@ -123,7 +123,7 @@ public class StatisticsService {
BigDecimal costExclude = allCost.stream().filter(d -> d.getType() == ProjectBudgetCost.TYPE_DEVICE || d.getType() == ProjectBudgetCost.TYPE_BUILDING || d.getType() == ProjectBudgetCost.TYPE_SERVICE).map(ProjectBudgetCost::getCostTaxExclude).reduce(BigDecimal.ZERO, BigDecimal::add); BigDecimal costExclude = allCost.stream().filter(d -> d.getType() == ProjectBudgetCost.TYPE_DEVICE || d.getType() == ProjectBudgetCost.TYPE_BUILDING || d.getType() == ProjectBudgetCost.TYPE_SERVICE).map(ProjectBudgetCost::getCostTaxExclude).reduce(BigDecimal.ZERO, BigDecimal::add);
profitAndLossBeanInclude.setCost(costInclude); profitAndLossBeanInclude.setCost(costInclude);
profitAndLossBeanInclude.setManageCost(projectManageCostTaxIncludeSum); //profitAndLossBeanInclude.setManageCost(projectManageCostTaxIncludeSum);
profitAndLossBeanInclude.setOther(otherCostTaxIncludeSum.add(otherOtherCostTaxIncludeSum)); profitAndLossBeanInclude.setOther(otherCostTaxIncludeSum.add(otherOtherCostTaxIncludeSum));
profitAndLossBeanExclude.setCost(costExclude); profitAndLossBeanExclude.setCost(costExclude);

98
src/main/resources/templates/admin/project_approve.ftl
View File

@ -877,7 +877,7 @@
</tbody> </tbody>
</table> </table>
<span class="am-text-lg">现金流量表</span> <span class="am-text-lg">结算现金流量表</span>
<table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;"> <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;">
<tbody> <tbody>
<tr class="am-text-xl"> <tr class="am-text-xl">
@ -1218,7 +1218,7 @@
</tbody> </tbody>
</table> </table>
<span class="am-text-lg">现金流量表</span> <span class="am-text-lg">决算现金流量表</span>
<table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;"> <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;">
<tbody> <tbody>
<tr class="am-text-xl"> <tr class="am-text-xl">
@ -1374,14 +1374,14 @@
<td>税率（%）</td> <td>税率（%）</td>
<td>含税总金额（元）</td> <td>含税总金额（元）</td>
<td>不含税金额（元）</td> <td>不含税金额（元）</td>
<td>操作</td> <#--<td>操作</td>-->
</tr> </tr>
<#if incomeDetails??> <#if incomeDetails??>
<#list incomeDetails as incomeDetail> <#list incomeDetails as incomeDetail>
<tr> <tr>
<td> <td>
<select style="width: auto" <select style="width: auto" readonly
class="am-modal-prompt-input am-modal-prompt-input-income"> class="am-modal-prompt-input am-modal-prompt-input-income">
<option value="1" <#if incomeDetail.type == 1>selected</#if>>设备类 <option value="1" <#if incomeDetail.type == 1>selected</#if>>设备类
</option> </option>
@ -1391,19 +1391,19 @@
</option> </option>
</select> </select>
</td> </td>
<td><input type="text" <td><input type="text" readonly
class="am-modal-prompt-input am-modal-prompt-input-income" class="am-modal-prompt-input am-modal-prompt-input-income"
value="${incomeDetail.name!}"></td> value="${incomeDetail.name!}"></td>
<td><input type="text" <td><input type="text" readonly
class="am-modal-prompt-input am-modal-prompt-input-income" class="am-modal-prompt-input am-modal-prompt-input-income"
value="${incomeDetail.unit!}"></td> value="${incomeDetail.unit!}"></td>
<td><input type="number" min="0" max="99999999" step="1" <td><input type="number" min="0" max="99999999" step="1" readonly
class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-amount" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-amount"
value="${incomeDetail.amount!0}"></td> value="${incomeDetail.amount!0}"></td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" <td><input type="number" min="0.00" max="99999999.99" step="0.01" readonly
class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-price" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-price"
value="${Utils.format(incomeDetail.price,'0')}"></td> value="${Utils.format(incomeDetail.price,'0')}"></td>
<td><input type="number" min="0.00" max="99.99" step="0.01" <td><input type="number" min="0.00" max="99.99" step="0.01" readonly
class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-tax-rate" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-tax-rate"
value="${Utils.format(incomeDetail.taxRate,'0')}"></td> value="${Utils.format(incomeDetail.taxRate,'0')}"></td>
<td><input type="text" <td><input type="text"
@ -1414,19 +1414,19 @@
class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-tax-exclude" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-tax-exclude"
value="${Utils.format(incomeDetail.totalTaxExclude,'0')}" value="${Utils.format(incomeDetail.totalTaxExclude,'0')}"
readonly></td> readonly></td>
<td> <#--<td>
<button type="button" <button type="button"
class="am-btn am-btn-warning am-btn-xs am-round am-modal-line-delete"> class="am-btn am-btn-warning am-btn-xs am-round am-modal-line-delete">
<span class="am-icon-minus"></span></button> <span class="am-icon-minus"></span></button>
</td> </td>-->
</tr> </tr>
</#list> </#list>
</#if> </#if>
</tbody> </tbody>
</table> </table>
<button type="button" id="incomeAddBtn" class="am-btn am-btn-primary am-btn-xs am-round"> <#--<button type="button" id="incomeAddBtn" class="am-btn am-btn-primary am-btn-xs am-round">
<span class="am-icon-plus"></span></button> <span class="am-icon-plus"></span></button>-->
</div> </div>
<div class="am-modal-footer"> <div class="am-modal-footer">
<span class="am-modal-btn" data-am-modal-cancel>取消</span> <span class="am-modal-btn" data-am-modal-cancel>取消</span>
@ -1453,14 +1453,14 @@
<td>税率（%）</td> <td>税率（%）</td>
<td>含税总金额（元）</td> <td>含税总金额（元）</td>
<td>不含税金额（元）</td> <td>不含税金额（元）</td>
<td>操作</td> <#--<td>操作</td>-->
</tr> </tr>
<#if costDetails??> <#if costDetails??>
<#list costDetails as costDetail> <#list costDetails as costDetail>
<tr> <tr>
<td> <td>
<select style="width: auto" <select style="width: auto" readonly
class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-type"> 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 value="1" <#if costDetail.type == 1>selected</#if>>设备
</option> </option>
@ -1473,7 +1473,7 @@
</select> </select>
</td> </td>
<td> <td>
<select style="width: auto" <select style="width: auto" readonly
class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-category"> class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-category">
<option value="1" <#if costDetail.category == 1>selected</#if>> <option value="1" <#if costDetail.category == 1>selected</#if>>
华智产品 华智产品
@ -1500,19 +1500,19 @@
</option> </option>
</select> </select>
</td> </td>
<td><input type="text" <td><input type="text" readonly
class="am-modal-prompt-input am-modal-prompt-input-cost" class="am-modal-prompt-input am-modal-prompt-input-cost"
value="${costDetail.name!}"></td> value="${costDetail.name!}"></td>
<td><input type="text" <td><input type="text" readonly
class="am-modal-prompt-input am-modal-prompt-input-cost" class="am-modal-prompt-input am-modal-prompt-input-cost"
value="${costDetail.unit!}"></td> value="${costDetail.unit!}"></td>
<td><input type="number" min="0" max="99999999" step="1" <td><input type="number" min="0" max="99999999" step="1" readonly
class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-amount" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-amount"
value="${costDetail.amount!0}"></td> value="${costDetail.amount!0}"></td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" <td><input type="number" min="0.00" max="99999999.99" step="0.01" readonly
class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-price" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-price"
value="${Utils.format(costDetail.price,'0')}"></td> value="${Utils.format(costDetail.price,'0')}"></td>
<td><input type="number" min="0.00" max="99.99" step="0.01" <td><input type="number" min="0.00" max="99.99" step="0.01" readonly
class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-tax-rate" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-tax-rate"
value="${Utils.format(costDetail.taxRate,'0')}"></td> value="${Utils.format(costDetail.taxRate,'0')}"></td>
<td><input type="text" <td><input type="text"
@ -1524,9 +1524,9 @@
value="${Utils.format(costDetail.totalTaxExclude,'0')}" readonly> value="${Utils.format(costDetail.totalTaxExclude,'0')}" readonly>
</td> </td>
<td> <td>
<button type="button" <#-- <button type="button"
class="am-btn am-btn-warning am-btn-xs am-round am-modal-line-delete"> class="am-btn am-btn-warning am-btn-xs am-round am-modal-line-delete">
<span class="am-icon-minus"></span></button> <span class="am-icon-minus"></span></button>-->
</td> </td>
</tr> </tr>
</#list> </#list>
@ -1534,8 +1534,8 @@
</tbody> </tbody>
</table> </table>
<button type="button" id="costAddBtn" class="am-btn am-btn-primary am-btn-xs am-round"><span <#--<button type="button" id="costAddBtn" class="am-btn am-btn-primary am-btn-xs am-round"><span
class="am-icon-plus"></span></button> class="am-icon-plus"></span></button>-->
</div> </div>
<div class="am-modal-footer"> <div class="am-modal-footer">
<span class="am-modal-btn" data-am-modal-cancel>取消</span> <span class="am-modal-btn" data-am-modal-cancel>取消</span>
@ -1563,7 +1563,7 @@
<td>预估计算方法</td> <td>预估计算方法</td>
<td>预估依据</td> <td>预估依据</td>
<td>备注</td> <td>备注</td>
<td>操作</td> <#--<td>操作</td>-->
</tr> </tr>
<#if costProjectManageDetails??> <#if costProjectManageDetails??>
@ -1588,48 +1588,48 @@
class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
value="${costProjectManageDetail.name!}" value="${costProjectManageDetail.name!}"
<#if costProjectManageDetail.deletable==0>readonly</#if>></td> <#if costProjectManageDetail.deletable==0>readonly</#if>></td>
<td><input type="text" <td><input type="text" readonly
class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
value="${costProjectManageDetail.detail!}"></td> value="${costProjectManageDetail.detail!}"></td>
<td><input type="text" <td><input type="text" readonly
class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
value="${costProjectManageDetail.unit!}"></td> value="${costProjectManageDetail.unit!}"></td>
<td><input type="number" min="0" max="99999999" step="1" <td><input type="number" min="0" max="99999999" step="1" readonly
class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-amount-project-manage" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-amount-project-manage"
value="${costProjectManageDetail.amount!0}"></td> value="${costProjectManageDetail.amount!0}"></td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" <td><input type="number" min="0.00" max="99999999.99" step="0.01" readonly
class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-price-project-manage" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-price-project-manage"
value="${Utils.format(costProjectManageDetail.price,'0')}"></td> value="${Utils.format(costProjectManageDetail.price,'0')}"></td>
<td><input type="text" <td><input type="text"
class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-total-project-manage" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-total-project-manage"
value="${Utils.format(costProjectManageDetail.total,'0')}" value="${Utils.format(costProjectManageDetail.total,'0')}"
readonly></td> readonly></td>
<td><input type="text" <td><input type="text" readonly
class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
value="${costProjectManageDetail.predictMethod!}"></td> value="${costProjectManageDetail.predictMethod!}"></td>
<td><input type="text" <td><input type="text" readonly
class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
value="${costProjectManageDetail.predictWhy!}"></td> value="${costProjectManageDetail.predictWhy!}"></td>
<td><input type="text" <td><input type="text" readonly
class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
value="${costProjectManageDetail.remark!}"></td> value="${costProjectManageDetail.remark!}"></td>
<td><#if costProjectManageDetail.deletable==1> <#--<td><#if costProjectManageDetail.deletable==1>
<button type="button" <button type="button"
class="am-btn am-btn-warning am-btn-xs am-round am-modal-line-delete"> class="am-btn am-btn-warning am-btn-xs am-round am-modal-line-delete">
<span class="am-icon-minus"></span></button></#if> <span class="am-icon-minus"></span></button></#if>
<input type="hidden" <input type="hidden"
class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
value="${costProjectManageDetail.deletable!}"> value="${costProjectManageDetail.deletable!}">
</td> </td>-->
</tr> </tr>
</#list> </#list>
</#if> </#if>
</tbody> </tbody>
</table> </table>
<button type="button" id="costProjectManageAddBtn" <#--<button type="button" id="costProjectManageAddBtn"
class="am-btn am-btn-primary am-btn-xs am-round"><span class="am-icon-plus"></span> class="am-btn am-btn-primary am-btn-xs am-round"><span class="am-icon-plus"></span>
</button> </button>-->
</div> </div>
<div class="am-modal-footer"> <div class="am-modal-footer">
<span class="am-modal-btn" data-am-modal-cancel>取消</span> <span class="am-modal-btn" data-am-modal-cancel>取消</span>
@ -1660,7 +1660,7 @@
<td>资金利息</td> <td>资金利息</td>
<td>垫资计划</td> <td>垫资计划</td>
<td>还款计划</td> <td>还款计划</td>
<td>操作</td> <#-- <td>操作</td>-->
</tr> </tr>
<tr> <tr>
<td><input type="text" class="am-modal-prompt-input input-total-month-budget-plan" <td><input type="text" class="am-modal-prompt-input input-total-month-budget-plan"
@ -1719,21 +1719,21 @@
<#if projectBudgetPlanDetails??> <#if projectBudgetPlanDetails??>
<#list projectBudgetPlanDetails as projectBudgetPlanDetail> <#list projectBudgetPlanDetails as projectBudgetPlanDetail>
<tr> <tr>
<td><input type="text" <td><input type="text" readonly
class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-month-budget-plan" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-month-budget-plan"
value="${projectBudgetPlanDetail.month!}"></td> value="${projectBudgetPlanDetail.month!}"></td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" <td><input type="number" min="0.00" max="99999999.99" step="0.01" readonly
class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-device-cost-budget-plan" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-device-cost-budget-plan"
value="${Utils.format(projectBudgetPlanDetail.deviceCost)}"></td> value="${Utils.format(projectBudgetPlanDetail.deviceCost)}"></td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" <td><input type="number" min="0.00" max="99999999.99" step="0.01" readonly
class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-engineer-cost-budget-plan" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-engineer-cost-budget-plan"
value="${Utils.format(projectBudgetPlanDetail.engineerCost)}"> value="${Utils.format(projectBudgetPlanDetail.engineerCost)}">
</td> </td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" <td><input type="number" min="0.00" max="99999999.99" step="0.01" readonly
class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-project-manage-cost-budget-plan" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-project-manage-cost-budget-plan"
value="${Utils.format(projectBudgetPlanDetail.projectManageCost)}"> value="${Utils.format(projectBudgetPlanDetail.projectManageCost)}">
</td> </td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" <td><input type="number" min="0.00" max="99999999.99" step="0.01" readonly
class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-earnest-money-cost-budget-plan" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-earnest-money-cost-budget-plan"
value="${Utils.format(projectBudgetPlanDetail.earnestMoneyCost)}"> value="${Utils.format(projectBudgetPlanDetail.earnestMoneyCost)}">
</td> </td>
@ -1741,10 +1741,10 @@
class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-total-cost-budget-plan" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-total-cost-budget-plan"
value="${Utils.format(projectBudgetPlanDetail.totalCost)}" value="${Utils.format(projectBudgetPlanDetail.totalCost)}"
readonly></td> readonly></td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" <td><input type="number" min="0.00" max="99999999.99" step="0.01" readonly
class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-sale-income-budget-plan" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-sale-income-budget-plan"
value="${Utils.format(projectBudgetPlanDetail.saleIncome)}"></td> value="${Utils.format(projectBudgetPlanDetail.saleIncome)}"></td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" <td><input type="number" min="0.00" max="99999999.99" step="0.01" readonly
class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-earnest-money-income-budget-plan" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-earnest-money-income-budget-plan"
value="${Utils.format(projectBudgetPlanDetail.earnestMoneyIncome)}"> value="${Utils.format(projectBudgetPlanDetail.earnestMoneyIncome)}">
</td> </td>
@ -1768,20 +1768,20 @@
class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-repayment-plan-budget-plan" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-repayment-plan-budget-plan"
value="${Utils.format(projectBudgetPlanDetail.repaymentPlan)}" value="${Utils.format(projectBudgetPlanDetail.repaymentPlan)}"
readonly></td> readonly></td>
<td> <#--<td>
<button type="button" <button type="button"
class="am-btn am-btn-warning am-btn-xs am-round am-modal-line-delete-budget-plan"> class="am-btn am-btn-warning am-btn-xs am-round am-modal-line-delete-budget-plan">
<span class="am-icon-minus"></span></button> <span class="am-icon-minus"></span></button>
</td> </td>-->
</tr> </tr>
</#list> </#list>
</#if> </#if>
</tbody> </tbody>
</table> </table>
<button type="button" id="budgetPlanDetailAddBtn" <#--<button type="button" id="budgetPlanDetailAddBtn"
class="am-btn am-btn-primary am-btn-xs am-round"><span class="am-icon-plus"></span> class="am-btn am-btn-primary am-btn-xs am-round"><span class="am-icon-plus"></span>
</button> </button>-->
<table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;"> <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;">
<tbody> <tbody>

2
src/main/resources/templates/admin/project_final_add.ftl
View File

@ -240,7 +240,7 @@
</tbody> </tbody>
</table> </table>
<span class="am-text-lg">现金流量表</span> <span class="am-text-lg">决算现金流量表</span>
<table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;"> <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;">
<tbody> <tbody>
<tr class="am-text-xl"> <tr class="am-text-xl">

2
src/main/resources/templates/admin/project_final_edit.ftl
View File

@ -240,7 +240,7 @@
</tbody> </tbody>
</table> </table>
<span class="am-text-lg">现金流量表</span> <span class="am-text-lg">决算现金流量表</span>
<table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;"> <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;">
<tbody> <tbody>
<tr class="am-text-xl"> <tr class="am-text-xl">