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

Merge remote-tracking branch 'origin/master'

master
OathK1per 2022-01-18 11:09:52 +08:00
parent eec5916c52 1e88a7c0a4
commit ce7c45aa6c
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -422,24 +422,15 @@
<div class="am-tabs am-margin" data-am-tabs id="subTab">
<ul class="am-tabs-nav am-nav am-nav-tabs">
<li class="am-active"><a href="#tab31">收入明细表</a></li>
<li class="am-active"><a href="#tab35">预算信息</a></li>
<li><a href="#tab31">收入明细表</a></li>
<li><a href="#tab32">采购成本明细表</a></li>
<li><a href="#tab33">项目管理成本表</a></li>
<li><a href="#tab34">资金计划表</a></li>
<li><a href="#tab35">预算信息</a></li>
</ul>
</div>
<div class="am-tabs-bd">
<div class="am-tab-panel am-fade am-in am-active" id="tab31">
<#if (project.status==5 || project.status==10 || project.status==15) && project.approveStatusBudget == 1>
<div class="approve-topass"></div>
</#if>
<#if (project.status==5 || project.status==10 || project.status==15) && project.approveStatusBudget == 2>
<div class="approve-passed"></div>
</#if>
<#if (project.status==5 || project.status==10 || project.status==15) && project.approveStatusBudget == 3>
<div class="approve-nopass"></div>
</#if>
<div class="am-tab-panel am-fade am-in" id="tab31">
<#--<span class="am-text-lg">收入明细表</span>-->
<table class="am-table am-table-bordered am-table-radius table-main"
style="padding:0;"
@ -842,7 +833,16 @@
<span class="am-text-primary"><a style="cursor: pointer" id="cost-detail">采购成本明细表</a></span>
<span class="am-text-primary"><a style="cursor: pointer" id="cost-project-manage-detail">项目管理成本表</a></span>
<span class="am-text-primary budget-plan-detail"><a style="cursor: pointer">资金计划表</a></span>-->
<div class="am-tab-panel am-fade am-in" id="tab35">
<div class="am-tab-panel am-fade am-in am-active" id="tab35">
<#if (project.status==5 || project.status==10 || project.status==15) && project.approveStatusBudget == 1>
<div class="approve-topass"></div>
</#if>
<#if (project.status==5 || project.status==10 || project.status==15) && project.approveStatusBudget == 2>
<div class="approve-passed"></div>
</#if>
<#if (project.status==5 || project.status==10 || project.status==15) && project.approveStatusBudget == 3>
<div class="approve-nopass"></div>
</#if>
<span class="am-text-lg">收入</span>
<table class="am-table am-table-bordered am-table-radius table-main"
style="padding:0;">
@ -1624,8 +1624,8 @@
<td>成本</td>
<td>采购成本</td>
<td>其他</td>
<td><input name="costPurchaseOtherTaxInclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseOtherTaxInclude,'0')}" readonly required title="其他采购成本概算总额"></td>
<td><input name="costPurchaseOtherTaxInclude" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseOtherTaxInclude,'0')}" readonly required title="其他采购成本预算总额"></td>
<td><input name="costPurchaseOtherTaxInclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseOtherTaxExclude,'0')}" readonly required title="其他采购成本概算总额"></td>
<td><input name="costPurchaseOtherTaxInclude" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseOtherTaxExclude,'0')}" readonly required title="其他采购成本预算总额"></td>
<td><input name="costPurchaseOtherSettleTotal" value="${Utils.format(currentBean.costPurchaseOtherTaxExclude,'0')}" type="text" class="number" readonly required title="其他采购成本结算总额"></td>
<td><input name="costPurchaseOtherFinalTotal" type="text" class="number" value="${Utils.format(finalBean.costPurchaseOtherFinalTotal,'0')}" required readonly title="其他采购成本决算总额"></td>
</tr>

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

@ -122,8 +122,8 @@
<td>成本</td>
<td>采购成本</td>
<td>其他</td>
<td><input name="costPurchaseOtherTaxInclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseOtherTaxInclude,'0')}" readonly required title="其他采购成本概算总额"></td>
<td><input name="costPurchaseOtherTaxInclude" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseOtherTaxInclude,'0')}" readonly required title="其他采购成本预算总额"></td>
<td><input name="costPurchaseOtherTaxInclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseOtherTaxExclude,'0')}" readonly required title="其他采购成本概算总额"></td>
<td><input name="costPurchaseOtherTaxInclude" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseOtherTaxExclude,'0')}" readonly required title="其他采购成本预算总额"></td>
<td><input name="costPurchaseOtherSettleTotal" value="${Utils.format(settleBean.costPurchaseOtherTaxExclude,'0')}" type="text" class="number" readonly required title="其他采购成本结算总额"></td>
<td><input name="costPurchaseOtherFinalTotal" type="text" class="number" maxlength="16" required title="其他采购成本决算总额"></td>
</tr>

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

@ -122,8 +122,8 @@
<td>成本</td>
<td>采购成本</td>
<td>其他</td>
<td><input name="costPurchaseOtherTaxInclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseOtherTaxInclude,'0')}" readonly required title="其他采购成本概算总额"></td>
<td><input name="costPurchaseOtherTaxInclude" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseOtherTaxInclude,'0')}" readonly required title="其他采购成本预算总额"></td>
<td><input name="costPurchaseOtherTaxInclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseOtherTaxExclude,'0')}" readonly required title="其他采购成本概算总额"></td>
<td><input name="costPurchaseOtherTaxInclude" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseOtherTaxExclude,'0')}" readonly required title="其他采购成本预算总额"></td>
<td><input name="costPurchaseOtherSettleTotal" value="${Utils.format(settleBean.costPurchaseOtherTaxExclude,'0')}" type="text" class="number" readonly required title="其他采购成本结算总额"></td>
<td><input name="costPurchaseOtherFinalTotal" type="text" class="number" maxlength="16" value="${Utils.format(finalBean.costPurchaseOtherFinalTotal,'0')}" required title="其他采购成本决算总额"></td>
</tr>