From 1a0c0fc8b02415e919e17c0b6ffbf99d08dec8f5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 07 四月 2023 17:40:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrder.html | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrder.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrder.html
index 9f0fd9b..81e2201 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrder.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrder.html
@@ -54,15 +54,15 @@
<#button name="重置" icon="fa-trash" clickFun="TOrder.resetSearch()" space="true"/>
</div>
<div class="col-sm-12">
- <button type="button" class="btn btn-primary " onclick="TOrder.cancelOrder()" id="cancelOrder">
- <i class="fa "></i> 取消订单
- </button>
- <button type="button" class="btn btn-primary " onclick="TOrder.tOrderException()" id="orderException">
- <i class="fa "></i> 异常
- </button>
- <button type="button" class="btn btn-primary " onclick="TOrder.export()" id="export">
- <i class="fa "></i> 导出
- </button>
+ @if(shiro.hasPermission("/tOrder/cancelOrder")){
+ <#button name="取消订单" icon="" clickFun="TOrder.cancelOrder()"/>
+ @}
+ @if(shiro.hasPermission("/tOrder/tOrder-exception")){
+ <#button name="异常" icon="" clickFun="TOrder.tOrderException()"/>
+ @}
+ @if(shiro.hasPermission("/tOrder/export")){
+ <#button name="导出" icon="" clickFun="TOrder.export()"/>
+ @}
</div>
<div class="hidden-xs" id="TOrderTableToolbar" role="group">
@if(shiro.hasPermission("/tOrder/add")){
--
Gitblit v1.7.1