恢复误提交

master
xxssyyyyssxx 2021-11-18 16:22:56 +08:00
parent 9bc5bd5515
commit 190050be73
1 changed files with 4 additions and 4 deletions

View File

@ -199,26 +199,26 @@
<td> <td>
<div class="am-btn-toolbar"> <div class="am-btn-toolbar">
<div class="am-btn-group am-btn-group-xs"> <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 list.status==1 && (list.approveStatusEstimate==0 || list.approveStatusEstimate==3)>
</#if>
<button type="button" <button type="button"
class="am-btn am-btn-default am-btn-xs am-text-secondary" class="am-btn am-btn-default am-btn-xs am-text-secondary"
onclick="location.href='${base}/project/edit?id=${list.id}'"><span onclick="location.href='${base}/project/edit?id=${list.id}'"><span
class="am-icon-pencil-square-o"></span>编辑概算 class="am-icon-pencil-square-o"></span>编辑概算
</button> </button>
</#if>
<#-- </@shiro.hasPermission> <#-- </@shiro.hasPermission>
<@shiro.hasPermission name="PROJECT_EDIT">--> <@shiro.hasPermission name="PROJECT_EDIT">-->
<#-- 概算审核通过、预算审批不等于待审核、 结算审批未通过--> <#-- 概算审核通过、预算审批不等于待审核、 结算审批未通过-->
<#if list.approveStatusEstimate=2 && list.approveStatusBudget!=1 && list.approveStatusFinal!=2 > <#if list.approveStatusEstimate=2 && list.approveStatusBudget!=1 && list.approveStatusFinal!=2 >
</#if>
<button type="button" <button type="button"
class="am-btn am-btn-default am-btn-xs am-text-secondary" class="am-btn am-btn-default am-btn-xs am-text-secondary"
onclick="location.href='${base}/project/budgetEdit?id=${list.id}'"><span onclick="location.href='${base}/project/budgetEdit?id=${list.id}'"><span
class="am-icon-pencil-square-o"></span>填写预算表 class="am-icon-pencil-square-o"></span>填写预算表
</button> </button>
</#if>
<#-- </@shiro.hasPermission>--> <#-- </@shiro.hasPermission>-->
<#-- 预算审核通过 并且结算审核不等于审批状态 决算审批未通过 才可以发起结算--> <#-- 预算审核通过 并且结算审核不等于审批状态 决算审批未通过 才可以发起结算-->