From 190050be730051b5789813ef484d9bd38c82dfb5 Mon Sep 17 00:00:00 2001
From: xxssyyyyssxx <xxssyyyyssxx@126.com>
Date: Thu, 18 Nov 2021 16:22:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E8=AF=AF=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/resources/templates/admin/project_list.ftl | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl
index 33a201c..51c8c44 100644
--- a/src/main/resources/templates/admin/project_list.ftl
+++ b/src/main/resources/templates/admin/project_list.ftl
@@ -199,26 +199,26 @@
<td>
<div class="am-btn-toolbar">
<div class="am-btn-group am-btn-group-xs">
- <#--<@shiro.hasPermission name="PROJECT_EDIT">-->
- <#--概算状态 并且概算审批状态为草稿和不通过-->
+ <#--<@shiro.hasPermission name="PROJECT_EDIT">-->
+ <#--概算状态 并且概算审批状态为草稿和不通过-->
<#if list.status==1 && (list.approveStatusEstimate==0 || list.approveStatusEstimate==3)>
- </#if>
<button type="button"
class="am-btn am-btn-default am-btn-xs am-text-secondary"
onclick="location.href='${base}/project/edit?id=${list.id}'"><span
class="am-icon-pencil-square-o"></span>编辑概算
</button>
+ </#if>
<#-- </@shiro.hasPermission>
<@shiro.hasPermission name="PROJECT_EDIT">-->
<#-- 概算审核通过、预算审批不等于待审核、 结算审批未通过-->
<#if list.approveStatusEstimate=2 && list.approveStatusBudget!=1 && list.approveStatusFinal!=2 >
- </#if>
<button type="button"
class="am-btn am-btn-default am-btn-xs am-text-secondary"
onclick="location.href='${base}/project/budgetEdit?id=${list.id}'"><span
class="am-icon-pencil-square-o"></span>填写预算表
</button>
+ </#if>
<#-- </@shiro.hasPermission>-->
<#-- 预算审核通过 并且结算审核不等于审批状态 决算审批未通过 才可以发起结算-->