From 93ab205ea6e8af0baef1608275423a30d6fc4c06 Mon Sep 17 00:00:00 2001 From: hanbo <2608504783@qq.com> Date: Thu, 2 Dec 2021 17:03:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9F=A5=E7=9C=8B=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E6=88=90=E6=9C=AC=E6=98=8E=E7=BB=86=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E5=A4=A7=E7=B1=BB=E5=92=8C=E7=B1=BB=E5=88=AB=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/backend/ProjectController.java | 1 + .../templates/admin/project_approve.ftl | 49 ++----------------- 2 files changed, 6 insertions(+), 44 deletions(-) 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} +