From 2879417e563c4923e0aabd402d5a4ccfb62bd980 Mon Sep 17 00:00:00 2001
From: pengqiang <1067496116@qq.com>
Date: Fri, 19 Nov 2021 15:33:11 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=8A=B6=E6=80=81=E5=92=8C?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81=E6=8E=A7=E5=88=B6=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/admin/project_list.ftl          | 30 +++++++++++--------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl
index 6a3584a..9d3f57d 100644
--- a/src/main/resources/templates/admin/project_list.ftl
+++ b/src/main/resources/templates/admin/project_list.ftl
@@ -208,7 +208,8 @@
                                                 </button>
                                             </#if>
                                         <#--<@shiro.hasPermission name="PROJECT_EDIT">-->
-                                        <#--概算状态 并且概算审批状态为草稿和不通过-->
+
+                                           <#--  项目等于概算状态、概算审核为草稿和不通过状态-->
                                             <#if list.status==1 && (list.approveStatusEstimate==0 || list.approveStatusEstimate==3)>
                                                 <button type="button"
                                                         class="am-btn am-btn-default am-btn-xs am-text-secondary"
@@ -219,7 +220,7 @@
 
                                            <#-- </@shiro.hasPermission>
                                             <@shiro.hasPermission name="PROJECT_EDIT">-->
-                                            <#--  概算审核通过、预算审批不等于待审核、 结算审批未通过-->
+                                            <#--  概算审核等于通过状态、预算审核不等于待审核状态、 决算审核不等于通过状态-->
                                             <#if list.approveStatusEstimate=2 && list.approveStatusBudget!=1 && list.approveStatusFinal!=2 >
                                                 <button type="button"
                                                         class="am-btn am-btn-default am-btn-xs am-text-secondary"
@@ -229,8 +230,8 @@
                                             </#if>
                                             <#-- </@shiro.hasPermission>-->
 
-                                             <#-- 预算审核通过 并且结算审核不等于审批状态 决算审批未通过 才可以发起结算-->
-                                            <#if list.approveStatusBudget=2 && list.approveStatusSettle !=1 && list.approveStatusFinal !=2>
+                                             <#-- 项目等于预算状态、预算审核等于通过状态  -->
+                                            <#if list.status==5 && list.approveStatusBudget=2 >
                                                 <button type="button"
                                                         class="am-btn am-btn-default am-btn-xs am-text-secondary"
                                                         onclick="location.href='${base}/project/settle/add?id=${list.id}'"><span
@@ -238,8 +239,8 @@
                                                 </button>
                                             </#if>
 
-                                            <#-- 除了审核通过都能编辑结算表-->
-                                            <#if list.approveStatusBudget=2 && list.approveStatusSettle !=1 && list.approveStatusFinal !=2>
+                                            <#-- 项目等于结算状态、结算审核不等于待审核状态-->
+                                            <#if list.status==10 && list.approveStatusSettle!=1>
                                                 <button type="button"
                                                         class="am-btn am-btn-default am-btn-xs am-text-secondary"
                                                         onclick="location.href='${base}/project/settle/edit?id=${list.id}'"><span
@@ -247,8 +248,8 @@
                                                 </button>
                                             </#if>
 
-                                            <#-- 项目为结算状态 并且结算审批通过  或者 结算审批不通过 才能发起决算-->
-                                            <#if (list.status== 10 && list.approveStatusSettle== 2) ||  (list.status== 15 && list.approveStatusFinal== 0) || (list.status== 15 && list.approveStatusFinal== 3)>
+                                            <#-- 项目等于结算状态、结算审核等于通过状态 -->
+                                            <#if list.status== 10 && list.approveStatusSettle==2 >
                                                 <button type="button"
                                                         class="am-btn am-btn-default am-btn-xs am-text-secondary"
                                                         onclick="location.href='${base}/project/final/add?id=${list.id}'"><span
@@ -256,11 +257,14 @@
                                                 </button>
                                             </#if>
 
-                                            <button type="button"
-                                                    class="am-btn am-btn-default am-btn-xs am-text-secondary"
-                                                    onclick="location.href='${base}/project/final/edit?id=${list.id}'"><span
-                                                        class="am-icon-pencil-square-o"></span>编辑决算
-                                            </button>
+                                            <#-- 项目等于决算状态、决算审核不等于待审核状态、 决算审核不等于通过状态-->
+                                            <#if list.status== 15 && list.approveStatusFinal!=1 && list.approveStatusFinal!=2 >
+                                                <button type="button"
+                                                        class="am-btn am-btn-default am-btn-xs am-text-secondary"
+                                                        onclick="location.href='${base}/project/final/edit?id=${list.id}'"><span
+                                                            class="am-icon-pencil-square-o"></span>编辑决算
+                                                </button>
+                                            </#if>
 
                                             <button type="button"
                                                     class="am-btn am-btn-default am-btn-xs am-text-secondary"