From d5b3e5a413bcfccba294793ee093722f31b2448a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 16 八月 2023 17:02:13 +0800
Subject: [PATCH] 添加推单日志
---
management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrder.html | 59 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 31 insertions(+), 28 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 81e2201..21d040c 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
@@ -9,48 +9,48 @@
<div class="row row-lg">
<div class="col-sm-12">
<div class="row">
- <div class="col-sm-2">
+ <div class="col-sm-3">
<#TimeCon id="createTime" name="订单时间" />
</div>
- <div class="col-sm-2">
+ <div class="col-sm-3">
<#NameCon id="code" name="订单编号" />
</div>
- <div class="col-sm-1">
- <select class="input-group" id="source" style="width: 120px;height: 33px" name="source">
- <option value="">请选择订单来源</option>
- <option value="1">小程序</option>
- <option value="2">司机创建</option>
- </select>
+ <div class="col-sm-3">
+ <#SelectCon id="source" name="订单来源" >
+ <option value="">请选择订单来源</option>
+ <option value="1">小程序</option>
+ <option value="2">司机创建</option>
+ </#SelectCon>
</div>
- <div class="col-sm-2">
+ <div class="col-sm-3">
<#NameCon id="userName" name="下单用户昵称" />
</div>
- <div class="col-sm-2">
+ <div class="col-sm-3">
<#NameCon id="userPhone" name="下单用户手机" />
</div>
- <div class="col-sm-1">
- <select class="input-group" id="state" style="width: 120px;height: 33px" name="state">
- <option value="">请选择订单状态</option>
- <option value="101">待接单</option>
- <option value="102">已接单</option>
- <option value="103">前往预约点</option>
- <option value="104">到达预约点</option>
- <option value="105">开始服务</option>
- <option value="106">到达目的地</option>
- <option value="107">待支付</option>
- <option value="108">待评价</option>
- <option value="109">已完成</option>
- <option value="201">转单中</option>
- <option value="301">已取消</option>
- <option value="401">等待中</option>
- </select>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="订单状态" >
+ <option value="">请选择订单状态</option>
+ <option value="101">待接单</option>
+ <option value="102">已接单</option>
+ <option value="103">前往预约点</option>
+ <option value="104">到达预约点</option>
+ <option value="105">开始服务</option>
+ <option value="106">到达目的地</option>
+ <option value="107">待支付</option>
+ <option value="108">待评价</option>
+ <option value="109">已完成</option>
+ <option value="201">转单中</option>
+ <option value="301">已取消</option>
+ <option value="401">等待中</option>
+ </#SelectCon>
</div>
- <div class="col-sm-2">
+ <div class="col-sm-3">
<#NameCon id="driverName" name="司机姓名" />
</div>
</div>
<div class="col-sm-12">
- <#button name="搜索" icon="fa-search" clickFun="TOrder.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TOrder.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TOrder.resetSearch()" space="true"/>
</div>
<div class="col-sm-12">
@@ -63,6 +63,9 @@
@if(shiro.hasPermission("/tOrder/export")){
<#button name="导出" icon="" clickFun="TOrder.export()"/>
@}
+ @if(shiro.hasPermission("/tOrder/cancelOrderUpdate")){
+ <#button name="关闭订单" icon="" clickFun="TOrder.cancelOrderUpdate()"/>
+ @}
</div>
<div class="hidden-xs" id="TOrderTableToolbar" role="group">
@if(shiro.hasPermission("/tOrder/add")){
--
Gitblit v1.7.1