From 318124170c6836caefcd36132a88be6aaee51a20 Mon Sep 17 00:00:00 2001 From: hanbo <2608504783@qq.com> Date: Tue, 18 Jan 2022 10:06:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=86=B3=E7=AE=97=E8=A1=A8=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E9=87=87=E8=B4=AD=E6=88=90=E6=9C=AC=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/templates/admin/project_approve.ftl | 4 ++-- src/main/resources/templates/admin/project_final_add.ftl | 4 ++-- src/main/resources/templates/admin/project_final_edit.ftl | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl index 02398ce..5b3d2ab 100644 --- a/src/main/resources/templates/admin/project_approve.ftl +++ b/src/main/resources/templates/admin/project_approve.ftl @@ -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> diff --git a/src/main/resources/templates/admin/project_final_add.ftl b/src/main/resources/templates/admin/project_final_add.ftl index 409fcbc..3b9db07 100644 --- a/src/main/resources/templates/admin/project_final_add.ftl +++ b/src/main/resources/templates/admin/project_final_add.ftl @@ -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> diff --git a/src/main/resources/templates/admin/project_final_edit.ftl b/src/main/resources/templates/admin/project_final_edit.ftl index ab63464..db589d6 100644 --- a/src/main/resources/templates/admin/project_final_edit.ftl +++ b/src/main/resources/templates/admin/project_final_edit.ftl @@ -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> From 1e88a7c0a40a32a5226f4a049214ab2ec7b351aa Mon Sep 17 00:00:00 2001 From: hanbo <2608504783@qq.com> Date: Tue, 18 Jan 2022 10:47:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E9=A2=84=E7=AE=97?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/admin/project_approve.ftl | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl index 5b3d2ab..d712626 100644 --- a/src/main/resources/templates/admin/project_approve.ftl +++ b/src/main/resources/templates/admin/project_approve.ftl @@ -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;">