From 532d9843a050fdf2100bf526cc5bddba66c2950f Mon Sep 17 00:00:00 2001 From: pengqiang <1067496116@qq.com> Date: Mon, 29 Nov 2021 09:52:21 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85=E9=87=8C?= =?UTF-8?q?=E7=9A=84=E9=A2=84=E7=AE=97=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=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 | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl index 08f26a2..8612d96 100644 --- a/src/main/resources/templates/admin/project_approve.ftl +++ b/src/main/resources/templates/admin/project_approve.ftl @@ -407,13 +407,13 @@
- <#if (project.status==5 || project.status==10 || project.status==15) && project.approveStatusEstimate == 1> + <#if (project.status==5 || project.status==10 || project.status==15) && project.approveStatusBudget == 1>
- <#if (project.status==5 || project.status==10 || project.status==15) && project.approveStatusEstimate == 2> + <#if (project.status==5 || project.status==10 || project.status==15) && project.approveStatusBudget == 2>
- <#if (project.status==5 || project.status==10 || project.status==15) && project.approveStatusEstimate == 3> + <#if (project.status==5 || project.status==10 || project.status==15) && project.approveStatusBudget == 3>
收入 @@ -630,13 +630,13 @@
- <#if (project.status==10 || project.status==15) && project.approveStatusEstimate == 1> + <#if (project.status==10 || project.status==15) && project.approveStatusSettle == 1>
- <#if (project.status==10 || project.status==15) && project.approveStatusEstimate == 2> + <#if (project.status==10 || project.status==15) && project.approveStatusSettle == 2>
- <#if (project.status==10 || project.status==15) && project.approveStatusEstimate == 3> + <#if (project.status==10 || project.status==15) && project.approveStatusSettle == 3>
@@ -1002,13 +1002,13 @@
- <#if project.status ==15 && project.approveStatusEstimate == 1> + <#if project.status ==15 && project.approveStatusFinal == 1>
- <#if project.status ==15 && project.approveStatusEstimate == 2> + <#if project.status ==15 && project.approveStatusFinal == 2>
- <#if project.status ==15 && project.approveStatusEstimate == 3> + <#if project.status ==15 && project.approveStatusFinal == 3>