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>