From 5cb1979f05446792cc33a8cb6b7aaae906da5a70 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 16 八月 2023 09:32:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrder.html | 14 +++-----------
1 files changed, 3 insertions(+), 11 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 10132af..0e9431c 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
@@ -53,7 +53,7 @@
<#button name="查询" icon="fa-search" clickFun="TOrder.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TOrder.resetSearch()" space="true"/>
</div>
- <div class="col-sm-12">
+ <div class="hidden-xs" id="TOrderTableToolbar" role="group">
@if(shiro.hasPermission("/tOrder/cancelOrder")){
<#button name="取消订单" icon="" clickFun="TOrder.cancelOrder()"/>
@}
@@ -63,16 +63,8 @@
@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")){
- <#button name="添加" icon="fa-plus" clickFun="TOrder.openAddTOrder()"/>
- @}
- @if(shiro.hasPermission("/tOrder/update")){
- <#button name="修改" icon="fa-edit" clickFun="TOrder.openTOrderDetail()" space="true"/>
- @}
- @if(shiro.hasPermission("/tOrder/delete")){
- <#button name="删除" icon="fa-remove" clickFun="TOrder.delete()" space="true"/>
+ @if(shiro.hasPermission("/tOrder/cancelOrderUpdate")){
+ <#button name="关闭订单" icon="" clickFun="TOrder.cancelOrderUpdate()"/>
@}
</div>
<#table id="TOrderTable"/>
--
Gitblit v1.7.1