From 85eab076207efee683efb6fd04b2ca48b24d797a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 22 二月 2023 17:15:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver.html | 68 ++++++++++++++++++----------------
1 files changed, 36 insertions(+), 32 deletions(-)
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver.html
index cedbd84..188d0cd 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver.html
@@ -3,56 +3,58 @@
<div class="col-sm-12">
<div class="ibox float-e-margins">
<div class="ibox-title">
- <h5>司机审核列表管理</h5>
+ <h5>管理</h5>
</div>
<div class="ibox-content">
<div class="row row-lg">
<div class="col-sm-12">
<div class="row">
<div class="col-sm-3">
- <#TimeCon id="insertTime" name="注册时间" isTime="false"/>
- </div>
- <div class="col-sm-3">
- <#NameCon id="companyName" name="所属分公司/加盟商" />
+ <#TimeCon id="createTime" name="时间" />
</div>
<div class="col-sm-3">
<#NameCon id="phone" name="手机号" />
</div>
- <div class="col-sm-3">
- <#NameCon id="account" name="账号" />
- </div>
- <div class="col-sm-3">
- <#SelectCon id="addType" name="司机来源" >
- <option value="">全部</option>
- <option value="1">司机注册</option>
- <option value="2">平台添加</option>
- <option value="3">分公司添加</option>
- <option value="4">加盟商添加</option>
- </#SelectCon>
- </div>
- <div class="col-sm-3">
- <#SelectCon id="authState" name="状态" >
- <option value="">全部</option>
- <option value="1">待审核</option>
- <option value="4">已拒绝</option>
- </#SelectCon>
+ <div class="col-sm-1">
+ <select class="input-group" id="status" style="width: 80px;height: 33px" name="status">
+ <option value="">状态</option>
+ <option value="1">正常</option>
+ <option value="2">冻结</option>
+ </select>
</div>
<div class="col-sm-3">
<#button name="搜索" icon="fa-search" clickFun="TDriver.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TDriver.resetSearch()" space="true"/>
</div>
+ <div class="col-sm-3">
+ <button type="button" class="btn btn-primary " onclick="TDriver.auditPage()" id="audit">
+ <i class="fa "></i> 立即审核
+ </button>
+ <button type="button" class="btn btn-primary " onclick="TDriver.export()" id="export">
+ <i class="fa "></i> 导出
+ </button>
+ <button type="button" class="btn btn-primary " onclick="TDriverException.tDriverException()" id="driverException">
+ <i class="fa "></i> 异常
+ </button>
+ <button type="button" class="btn btn-primary " onclick="TDriver.rechargeBalancePage()" id="recharge">
+ <i class="fa "></i> 充值
+ </button>
+ @if(shiro.hasPermission("/tAgent/add")){
+ <#button name="添加" icon="fa-plus" clickFun="TDriver.openAddTDriver()"/>
+ @}
+ </div>
</div>
- <div class="hidden-xs" id="TDriverTableToolbar" role="group">
- @if(shiro.hasPermission("/tDriver/immediately")){
- <#button name="立即审核" icon="fa-plus" clickFun="TDriver.immediately()"/>
+ <!--<div class="hidden-xs" id="TDriverTableToolbar" role="group">
+ @if(shiro.hasPermission("/tDriver/add")){
+ <#button name="添加" icon="fa-plus" clickFun="TDriver.openAddTDriver()"/>
@}
- @if(shiro.hasPermission("/tDriver/look")){
- <#button name="查看详情" icon="fa-edit" clickFun="TDriver.look()" space="true"/>
+ @if(shiro.hasPermission("/tDriver/update")){
+ <#button name="修改" icon="fa-edit" clickFun="TDriver.openTDriverDetail()" space="true"/>
@}
@if(shiro.hasPermission("/tDriver/delete")){
<#button name="删除" icon="fa-remove" clickFun="TDriver.delete()" space="true"/>
@}
- </div>
+ </div>-->
<#table id="TDriverTable"/>
</div>
</div>
@@ -61,10 +63,12 @@
</div>
</div>
<script src="${ctxPath}/static/modular/system/tDriver/tDriver.js"></script>
-<script>
+<script src="${ctxPath}/static/modular/system/tDriver/tDriverException.js"></script>
+<script type="text/javascript">
laydate.render({
- elem: '#insertTime'
- ,range: true
+ elem: '#createTime',
+ type: 'date',
+ range: true
});
</script>
@}
--
Gitblit v1.7.1