From db7fa6a91b9534ac90e219b6f554c54c43c83a5a Mon Sep 17 00:00:00 2001 From: liujie <liujie> Date: 星期三, 16 八月 2023 09:28:15 +0800 Subject: [PATCH] update --- management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrder.html | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 58 insertions(+), 2 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 ec76def..10132af 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 @@ -10,11 +10,59 @@ <div class="col-sm-12"> <div class="row"> <div class="col-sm-3"> - <#NameCon id="condition" name="名称" /> + <#TimeCon id="createTime" name="订单时间" /> </div> <div class="col-sm-3"> - <#button name="搜索" icon="fa-search" clickFun="TOrder.search()"/> + <#NameCon id="code" name="订单编号" /> </div> + <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-3"> + <#NameCon id="userName" name="下单用户昵称" /> + </div> + <div class="col-sm-3"> + <#NameCon id="userPhone" name="下单用户手机" /> + </div> + <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-3"> + <#NameCon id="driverName" name="司机姓名" /> + </div> + </div> + <div class="col-sm-12"> + <#button name="查询" icon="fa-search" clickFun="TOrder.search()"/> + <#button name="重置" icon="fa-trash" clickFun="TOrder.resetSearch()" space="true"/> + </div> + <div class="col-sm-12"> + @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")){ @@ -35,4 +83,12 @@ </div> </div> <script src="${ctxPath}/static/modular/system/tOrder/tOrder.js"></script> +<script src="${ctxPath}/static/modular/system/tOrder/tOrderException.js"></script> +<script type="text/javascript"> + laydate.render({ + elem: '#createTime', + type: 'date', + range: true + }); +</script> @} -- Gitblit v1.7.1