diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl index 8e9c4d5..780714f 100644 --- a/src/main/resources/templates/admin/project_approve.ftl +++ b/src/main/resources/templates/admin/project_approve.ftl @@ -568,23 +568,27 @@ 项目名称: - + + + <#if projectBudget.contractBudget??> 合同名称: - + + + 项目类型: - + <#if projectBudget.typeBudget??> <#if (projectBudget.typeBudget) =1> @@ -597,6 +601,7 @@ + @@ -1159,9 +1164,7 @@ - <#list procurementTypes as procurementType> - <#if costDetail.category == procurementType.id>${procurementType.name} - + ${costDetail.category} --> 合计 - - +<#-- --> +<#-- --> diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl index 2cf6f8a..45b2d82 100644 --- a/src/main/resources/templates/admin/project_budget_edit.ftl +++ b/src/main/resources/templates/admin/project_budget_edit.ftl @@ -1182,10 +1182,10 @@ - type="text" - <#else>type="hidden" - class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-tax-rate-cost-name" - value="${costDetail.category!}"> + type="text" + <#if costDetail.category=='华智产品'||costDetail.category=='华三产品'||costDetail.category=='汇智产品'>type="hidden" + value="${costDetail.category!}" />