From f58cca364b731eac2d60a440ffaa804be3cd43fd Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 30 六月 2023 10:32:28 +0800
Subject: [PATCH] 修改bug
---
management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrder.html | 19 ++++++++-----------
1 files changed, 8 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..04111cf 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
@@ -20,6 +20,7 @@
<option value="">请选择订单来源</option>
<option value="1">小程序</option>
<option value="2">司机创建</option>
+ <option value="3">后台添加</option>
</#SelectCon>
</div>
<div class="col-sm-3">
@@ -53,26 +54,22 @@
<#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/add")){
+ <#button name="添加" icon="fa-plus" clickFun="TOrder.openAddTOrder()"/>
+ @}
@if(shiro.hasPermission("/tOrder/cancelOrder")){
<#button name="取消订单" icon="" clickFun="TOrder.cancelOrder()"/>
@}
@if(shiro.hasPermission("/tOrder/tOrder-exception")){
<#button name="异常" icon="" clickFun="TOrder.tOrderException()"/>
@}
+ <div style="border-radius: 20px;background-color: red;color: #ffffff;width: 20px;height: 20px;text-align: center;line-height: 20px;font-size: 8px;position: absolute;left: 200px;top: -10px;">${error}</div>
@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