diff --git a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java index 8d041ee..1493ef1 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java @@ -361,6 +361,7 @@ public class ProjectController extends BaseController { //预算信息 BudgetBean budgetBean = projectBudgetService.getBudget(project); + model.put("procurementTypes", procurementTypeService.allProcurementTypeList()); model.put("budgetBean", budgetBean); //收入明细 model.put("incomeDetails", projectBudgetService.getBudgetIncomeDetail(project)); diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl index a3bffa8..64c9619 100644 --- a/src/main/resources/templates/admin/project_approve.ftl +++ b/src/main/resources/templates/admin/project_approve.ftl @@ -107,7 +107,7 @@
  • 项目预算信息
  • <#if project.status==10 || project.status==15> -
  • 项目结算信息
  • +
  • 项目结算信息
  • <#if project.status==15>
  • 项目决算信息
  • @@ -1490,49 +1490,9 @@ - <#----> - <#if costDetail.category ==1 > - 华智产品 - <#elseif costDetail.category ==2> - 紫光其他产品 - <#elseif costDetail.category ==3> - 外购产品 - <#elseif costDetail.category ==4> - 外购工程 - <#elseif costDetail.category ==5> - 华智服务 - <#elseif costDetail.category ==6> - 紫光其他服务 - <#elseif costDetail.category ==7> - 外购服务 - <#elseif costDetail.category ==8> - 其他 - + <#list procurementTypes as procurementType> + <#if costDetail.category == procurementType.id>${procurementType.name} +