From 4ff5f35054ab141d915c11ad878d4dcffe7e034a Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 12 五月 2023 18:43:27 +0800
Subject: [PATCH] BUG修改
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/RoleServiceImpl.java | 4
management/guns-admin/src/main/webapp/static/modular/system/tSystemConfig/tSystemConfig.js | 15
management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignmentCross.html | 2
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java | 12
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAgentServiceImpl.java | 6
management/guns-admin/src/main/webapp/WEB-INF/view/system/tEvaluate/tEvaluateDetail.html | 7
management/guns-admin/src/main/webapp/WEB-INF/view/system/tHomePage/tHomePageMap.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tRegion/tRegion.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigCommissionShareRules.html | 41 +-
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/RoleMapper.java | 4
management/guns-admin/src/main/webapp/WEB-INF/view/system/report/operationalData.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/home.html | 4
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/resp/TDriverCommissionResp.java | 11
management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrderException.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfig.html | 2
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/RoleController.java | 6
management/guns-admin/src/main/webapp/WEB-INF/view/system/tCoupon/tCoupon_add.html | 36 +
management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/tMainContent.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tRechargeRecord/tRechargeRecordAgent.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUser.html | 41 -
management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/tMainContent_edit.html | 4
management/guns-admin/src/main/webapp/WEB-INF/view/driverOnline.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tRechargeRecord/tRechargeRecord.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/log/log.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver.html | 14
management/guns-admin/src/main/webapp/WEB-INF/view/system/dict/dict.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/report/couponStatisticsInfo.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/report/couponStatistics.html | 10
management/guns-admin/src/main/webapp/WEB-INF/view/system/tBroadcast/tBroadcast.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/tNotices.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/blackboard.html | 12
management/guns-admin/src/main/webapp/WEB-INF/view/system/tHtml/tHtml.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/system.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tRechargeRecord/tRechargeRecordUser.html | 2
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITAgentService.java | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tBranchOffice.html | 48 +-
management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgent/tAgent.html | 38 -
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Role.java | 23 +
management/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/menu/menu.html | 2
management/guns-admin/src/main/webapp/static/modular/system/role/role_info.js | 22 +
management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriverCommissionConnect.js | 3
management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/tMainContent_add.html | 4
management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignmentSmall.html | 2
management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUser.js | 4
management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/transferOrderUpdate.html | 4
management/guns-admin/src/main/webapp/WEB-INF/view/system/tRevenue/tRevenue.html | 26
management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/transferOrderAdd.html | 4
management/guns-admin/src/main/webapp/WEB-INF/view/system/tYouTui/tYouTui.html | 6
management/guns-admin/src/main/webapp/WEB-INF/view/system/tYouTui/tYouTui_add.html | 27 +
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java | 13
management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUserException.js | 4
management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/yesDriver.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tCancelOrder.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/notice/notice.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tEdition/tEdition.html | 2
management/guns-admin/src/main/webapp/static/modular/system/tAgent/tAgent.js | 4
management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/driverCancelOrderAdd.html | 4
management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderRefusal/tOrderRefusal.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/smallPieceLogistics.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/log/login_log.html | 2
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IRoleService.java | 4
management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverCommissionDetail.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tCancelOrder/tCancelOrder.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_changeCar.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tEvaluate/tEvaluate.html | 18
management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrder.html | 56 +-
management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverCommission.html | 14
management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemBulletin/tSystemBulletin.html | 2
management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver.js | 6
management/guns-admin/src/main/webapp/WEB-INF/view/system/tInvoice/tInvoice.html | 2
management/guns-admin/src/main/webapp/static/modular/system/tYouTui/tYouTui_info.js | 5
management/guns-admin/src/main/webapp/WEB-INF/view/system/tBill/tBill.html | 32
management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriverException.js | 4
management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/userCancelOrderAdd.html | 4
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSystemConfigController.java | 14
management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/driverCancelOrderUpdate.html | 4
management/guns-admin/src/main/webapp/static/modular/system/role/role.js | 17
management/guns-admin/src/main/webapp/WEB-INF/view/system/dept/dept.html | 2
management/guns-admin/src/main/webapp/static/modular/system/tCoupon/tCoupon_info.js | 39 +
management/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint.html | 12
management/guns-admin/src/main/webapp/static/modular/system/tYouTui/tYouTui.js | 17
management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/transferOrder.html | 4
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgentController.java | 12
management/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_add.html | 4
management/guns-admin/src/main/webapp/WEB-INF/view/system/role/role.html | 10
management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverDetail.html | 22
management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/franchisee.html | 2
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RoleMapper.xml | 17
management/guns-admin/src/main/webapp/WEB-INF/view/system/tCoupon/tCoupon.html | 20
management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate.html | 2
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TYouTui.java | 11
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCouponController.java | 10
management/guns-admin/src/main/webapp/WEB-INF/view/blackboardBlank.html | 4
management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUserException.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverException.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/userCancelOrder.html | 4
management/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_edit.html | 4
management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignment.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tCouponException.html | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tCancelOrder/tCancelOrderDetail.html | 48 +-
management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverAudit.html | 21 +
management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/driverCancelOrder.html | 4
management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/userCancelOrderUpdate.html | 4
management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tCoupon.html | 2
109 files changed, 583 insertions(+), 415 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgentController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgentController.java
index ce81018..6a4ba09 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgentController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgentController.java
@@ -135,8 +135,8 @@
*/
@RequestMapping(value = "/list")
@ResponseBody
- public Object list(String principal,String principalPhone,String createTime) {
- EntityWrapper<TAgent> wrapper = tAgentService.getAgentWrapper(principal,principalPhone,createTime);
+ public Object list(String principal,String principalPhone,String createTime,Integer status) {
+ EntityWrapper<TAgent> wrapper = tAgentService.getAgentWrapper(principal,principalPhone,createTime,status);
List<TAgent> tAgents = tAgentService.selectList(wrapper);
// 代理商列表数据封装（导出共用）
return tAgentService.getAgentResp(tAgents);
@@ -231,7 +231,9 @@
tDriver.setStatus(1);
}
}
- tDriverService.updateBatchById(list);
+ if(!CollectionUtils.isEmpty(list)){
+ tDriverService.updateBatchById(list);
+ }
return SUCCESS_TIP;
}
@@ -281,7 +283,7 @@
@ApiOperation(value = "导出代理商列表",notes="导出代理商列表")
@RequestMapping(value = "/export")
@ResponseBody
- public void export(String principal,String principalPhone,String createTime, HttpServletResponse response) {
+ public void export(String principal,String principalPhone,Integer status,String createTime, HttpServletResponse response) {
try {
Date date = new Date();
DateFormat format = new SimpleDateFormat("yyyyMMdd");
@@ -289,7 +291,7 @@
String fileName = "Agent"+time1+".xls";
String[] title = new String[] {"时间","姓名","联系电话","代理区域","客服电话","订单数量",
"有效订单","已发放优惠券","已使用优惠券","累计优惠券金额","司机充值","司机数","状态"};
- EntityWrapper<TAgent> wrapper = tAgentService.getAgentWrapper(principal,principalPhone,createTime);
+ EntityWrapper<TAgent> wrapper = tAgentService.getAgentWrapper(principal,principalPhone,createTime,status);
// 是否异常
List<TAgent> list = tAgentService.selectList(wrapper);
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCouponController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCouponController.java
index 9af2f0c..e38c646 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCouponController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCouponController.java
@@ -136,6 +136,16 @@
if(isExit){
return new SuccessTip(500,"该优惠券名称与类型已存在!");
}
+ // 如果是新人优惠券，查询是否存在已启用的新人优惠券
+ if(tCoupon.getCouponType() == 2){
+ int count = tCouponService.selectCount(new EntityWrapper<TCoupon>()
+ .eq("coupon_type", 2)
+ .eq("coupon_state", 1)
+ .eq("status", true));
+ if(count>0){
+ return new SuccessTip(500,"已存在已启用的新人优惠券!");
+ }
+ }
tCouponService.insert(tCoupon);
return SUCCESS_TIP;
}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
index 73b0ab4..d0bb555 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
@@ -357,6 +357,18 @@
if(Objects.nonNull(tDriver)){
tDriverCommissionResp.setInviterName(tDriver.getName());
tDriverCommissionResp.setInviterPhone(tDriver.getPhone());
+
+ if(Objects.nonNull(tDriver.getInviterId())){
+ TDriver driver = tDriverService.selectById(tDriver.getInviterId());
+ if(Objects.nonNull(driver.getInviterId())){
+ tDriverCommissionResp.setLevel("三级");
+ }else {
+ tDriverCommissionResp.setLevel("二级");
+ }
+ }else {
+ tDriverCommissionResp.setLevel("一级");
+ }
+
}
}
return commissionResp;
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSystemConfigController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSystemConfigController.java
index 4599961..86ffb3a 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSystemConfigController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSystemConfigController.java
@@ -85,13 +85,13 @@
TSystemConfig tSystemConfig = tSystemConfigService.selectOne(new EntityWrapper<TSystemConfig>().eq("type", 2)
.last("LIMIT 1"));
JSONObject jsonObject = JSONObject.parseObject(tSystemConfig.getContent());
- model.addAttribute("num1",jsonObject.getInteger("num1"));
- model.addAttribute("num2",jsonObject.getInteger("num2"));
- model.addAttribute("num3",jsonObject.getInteger("num3"));
- model.addAttribute("num4",jsonObject.getInteger("num4"));
- model.addAttribute("num5",jsonObject.getInteger("num5"));
- model.addAttribute("num6",jsonObject.getInteger("num6"));
- model.addAttribute("num7",jsonObject.getInteger("num7"));
+ model.addAttribute("num1",jsonObject.getString("num1"));
+ model.addAttribute("num2",jsonObject.getString("num2"));
+ model.addAttribute("num3",jsonObject.getString("num3"));
+ model.addAttribute("num4",jsonObject.getString("num4"));
+ model.addAttribute("num5",jsonObject.getString("num5"));
+ model.addAttribute("num6",jsonObject.getString("num6"));
+ model.addAttribute("num7",jsonObject.getString("num7"));
return PREFIX + "tSystemConfigCommissionShareRules.html";
}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/resp/TDriverCommissionResp.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/resp/TDriverCommissionResp.java
index b15b8d6..ddf5e84 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/resp/TDriverCommissionResp.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/resp/TDriverCommissionResp.java
@@ -7,6 +7,9 @@
public class TDriverCommissionResp extends TDriver {
+ @ApiModelProperty(value = "层级")
+ private String level;
+
// 所属代理商
@ApiModelProperty(value = "所属代理商")
private String agentName;
@@ -29,6 +32,14 @@
@ApiModelProperty(value = "邀约人电话")
private String inviterPhone;
+ public String getLevel() {
+ return level;
+ }
+
+ public void setLevel(String level) {
+ this.level = level;
+ }
+
@Override
public String getInviterName() {
return inviterName;
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/RoleController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/RoleController.java
index 287755f..d518886 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/RoleController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/RoleController.java
@@ -105,8 +105,10 @@
@Permission
@RequestMapping(value = "/list")
@ResponseBody
- public Object list(@RequestParam(required = false) String roleName) {
- List<Map<String, Object>> roles = this.roleService.selectRoles(super.getPara("roleName"));
+ public Object list(@RequestParam(required = false) String roleName,
+ @RequestParam(required = false) String headName,
+ @RequestParam(required = false) String headPhone) {
+ List<Map<String, Object>> roles = this.roleService.selectRoles(super.getPara("roleName"),super.getPara("headName"),super.getPara("headPhone"));
return super.warpObject(new RoleWarpper(roles));
}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/RoleMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/RoleMapper.java
index d95d87f..1cf3c9a 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/RoleMapper.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/RoleMapper.java
@@ -24,7 +24,9 @@
* @return
* @date 2017年2月12日 下午9:14:34
*/
- List<Map<String, Object>> selectRoles(@Param("condition") String condition);
+ List<Map<String, Object>> selectRoles(@Param("condition") String condition,
+ @Param("headName") String headName,
+ @Param("headPhone") String headPhone);
/**
* 删除某个角色的所有权限
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RoleMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RoleMapper.xml
index c0afcd5..2209457 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RoleMapper.xml
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RoleMapper.xml
@@ -11,6 +11,8 @@
<result column="deptid" property="deptid" />
<result column="tips" property="tips" />
<result column="version" property="version" />
+ <result column="headName" property="headName" />
+ <result column="headPhone" property="headPhone" />
</resultMap>
<sql id="Base_Column_List">
@@ -20,9 +22,18 @@
<select id="selectRoles" resultType="map">
select rr.*,(SELECT COUNT(id) from sys_user where FIND_IN_SET(rr.id,roleid)) as userCount
from sys_role as rr
- <if test="condition != null">
- where rr.name like CONCAT('%',#{condition},'%')
- </if>
+ <where>
+ <if test="condition != null and condition != ''">
+ and rr.name like CONCAT('%',#{condition},'%')
+ </if>
+ <if test="headName != null and headName != ''">
+ and rr.headName like CONCAT('%',#{headName},'%')
+ </if>
+ <if test="headPhone != null and headPhone != ''">
+ and rr.headPhone like CONCAT('%',#{headPhone},'%')
+ </if>
+ </where>
+ ORDER BY rr.num
</select>
<delete id="deleteRolesById">
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Role.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Role.java
index 70ae563..5b4a45f 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Role.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Role.java
@@ -49,7 +49,30 @@
* 保留字段(暂时没用）
*/
private Integer version;
+ /**
+ * 负责人姓名
+ */
+ private String headName;
+ /**
+ * 负责人电话
+ */
+ private String headPhone;
+ public String getHeadName() {
+ return headName;
+ }
+
+ public void setHeadName(String headName) {
+ this.headName = headName;
+ }
+
+ public String getHeadPhone() {
+ return headPhone;
+ }
+
+ public void setHeadPhone(String headPhone) {
+ this.headPhone = headPhone;
+ }
public Integer getId() {
return id;
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TYouTui.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TYouTui.java
index 3378d21..2eedbb7 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TYouTui.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TYouTui.java
@@ -62,10 +62,21 @@
private Date createTime;
@ApiModelProperty(value = "优推距离")
private Integer distance;
+ @ApiModelProperty(value = "图片")
+ @TableField(value = "picture")
+ private String picture;
@TableField(exist = false)
private String serviceContent;
+ public String getPicture() {
+ return picture;
+ }
+
+ public void setPicture(String picture) {
+ this.picture = picture;
+ }
+
public String getServiceContent() {
return serviceContent;
}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IRoleService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IRoleService.java
index cc7332d..e26abbb 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IRoleService.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IRoleService.java
@@ -39,7 +39,9 @@
* @return
* @date 2017年2月12日 下午9:14:34
*/
- List<Map<String, Object>> selectRoles(@Param("condition") String condition);
+ List<Map<String, Object>> selectRoles(@Param("condition") String condition,
+ @Param("headName") String headName,
+ @Param("headPhone") String headPhone);
/**
* 删除某个角色的所有权限
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITAgentService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITAgentService.java
index d670151..a5efeaf 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITAgentService.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITAgentService.java
@@ -26,7 +26,7 @@
* @param createTime
* @return
*/
- EntityWrapper<TAgent> getAgentWrapper(String principal, String principalPhone, String createTime);
+ EntityWrapper<TAgent> getAgentWrapper(String principal, String principalPhone, String createTime,Integer status);
/**
* 代理商查看详情
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/RoleServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/RoleServiceImpl.java
index 34a0875..12209f4 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/RoleServiceImpl.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/RoleServiceImpl.java
@@ -53,8 +53,8 @@
}
@Override
- public List<Map<String, Object>> selectRoles(String condition) {
- return this.baseMapper.selectRoles(condition);
+ public List<Map<String, Object>> selectRoles(String condition,String headName,String headPhone) {
+ return this.baseMapper.selectRoles(condition,headName,headPhone);
}
@Override
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAgentServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAgentServiceImpl.java
index 3a4712f..83397f1 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAgentServiceImpl.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAgentServiceImpl.java
@@ -55,7 +55,7 @@
private TUserToCouponMapper tUserToCouponMapper;
@Override
- public EntityWrapper<TAgent> getAgentWrapper(String principal, String principalPhone, String createTime) {
+ public EntityWrapper<TAgent> getAgentWrapper(String principal, String principalPhone, String createTime,Integer status) {
EntityWrapper<TAgent> wrapper = new EntityWrapper<>();
// 昵称
if(StringUtils.hasLength(principal)){
@@ -76,6 +76,10 @@
if(Objects.requireNonNull(ShiroKit.getUser()).getRoleType() == 3){
wrapper.eq("id",ShiroKit.getUser().getObjectId());
}
+ // 状态
+ if(Objects.nonNull(status)){
+ wrapper.eq("status",status);
+ }
wrapper.ne("status", StatusEnum.DELETE.getCode());
wrapper.orderBy("createTime",false);
return wrapper;
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java
index 259d2e5..7658f40 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java
@@ -185,11 +185,8 @@
// 计算驾龄
if(Objects.nonNull(tDriver.getFirstCertificateTime())){
- ZoneId zoneId = ZoneId.systemDefault();
- LocalDate firstTime = tDriver.getFirstCertificateTime().toInstant().atZone(zoneId).toLocalDate();
- LocalDate now = tDriver.getFirstCertificateTime().toInstant().atZone(zoneId).toLocalDate();
- Period period = Period.between(firstTime, now);
- model.addAttribute("drivingExperience",period.getYears());
+ Period period = Period.between(LocalDate.now(), com.stylefeng.guns.modular.system.util.DateUtil.dateToLocalDate(tDriver.getFirstCertificateTime()));
+ model.addAttribute("drivingExperience",Math.max(Math.abs(period.getYears()), 1));
}else {
model.addAttribute("drivingExperience",0);
}
@@ -231,10 +228,10 @@
TDriver tDriver1 = tDriverMapper.selectById(tDriver.getInviterId());
model.addAttribute("inviterName",tDriver1.getName());
model.addAttribute("inviterPhone",tDriver1.getPhone());
- }else {
- model.addAttribute("inviterName","");
- model.addAttribute("inviterPhone","");
}
+ }else {
+ model.addAttribute("inviterName","");
+ model.addAttribute("inviterPhone","");
}
// 查询当前用户邀请了哪些人
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/blackboard.html b/management/guns-admin/src/main/webapp/WEB-INF/view/blackboard.html
index f3710fe..67a4d27 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/blackboard.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/blackboard.html
@@ -105,7 +105,7 @@
<div id="noVipUnlockDiv" class="flex-div">
<div class="sp-hidden flex-div noVipUnlockTimess sp-width" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);">
<input type="text" id="noVipUnlockTime" class="form-control layer-date " >
- <#button style="margin: 0;" btnCs="info" name="搜索" id="ensure" icon="fa-check" clickFun="noVipUnlockSubmit()"/>
+ <#button style="margin: 0;" btnCs="info" name="查询" id="ensure" icon="fa-check" clickFun="noVipUnlockSubmit()"/>
</div>
<div class="noVipUnlockTimes flex-div" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);width: 180px;justify-content: flex-end;">
<span class="active sp-item">今日</span>
@@ -128,7 +128,7 @@
<div id="vipUnlockDiv" class="flex-div">
<div class="sp-hidden flex-div vipUnlockTimess sp-width" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);">
<input type="text" id="vipUnlockTime" class="form-control layer-date " >
- <#button style="margin: 0;" btnCs="info" name="搜索" id="ensure" icon="fa-check" clickFun="vipUnlockSubmit()"/>
+ <#button style="margin: 0;" btnCs="info" name="查询" id="ensure" icon="fa-check" clickFun="vipUnlockSubmit()"/>
</div>
<div class="vipUnlockTimes flex-div" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);width: 180px;justify-content: flex-end;">
<span class="active sp-item">今日</span>
@@ -151,7 +151,7 @@
<div id="allIncomeDiv" class="flex-div">
<div class="sp-hidden flex-div allIncomeTimess sp-width" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);">
<input type="text" id="allIncomeTime" class="form-control layer-date " >
- <#button style="margin: 0;" btnCs="info" name="搜索" id="ensure" icon="fa-check" clickFun="allIncomeSubmit()"/>
+ <#button style="margin: 0;" btnCs="info" name="查询" id="ensure" icon="fa-check" clickFun="allIncomeSubmit()"/>
</div>
<div class="allIncomeTimes flex-div" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);width: 180px;justify-content: flex-end;">
<span class="active sp-item">今日</span>
@@ -174,7 +174,7 @@
<div id="addVipDiv" class="flex-div">
<div class="sp-hidden flex-div addVipTimess sp-width" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);">
<input type="text" id="addVipTime" class="form-control layer-date " >
- <#button style="margin: 0;" btnCs="info" name="搜索" id="ensure" icon="fa-check" clickFun="addVipSubmit()"/>
+ <#button style="margin: 0;" btnCs="info" name="查询" id="ensure" icon="fa-check" clickFun="addVipSubmit()"/>
</div>
<div class="addVipTimes flex-div" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);width: 180px;justify-content: flex-end;">
<span class="active sp-item">今日</span>
@@ -197,7 +197,7 @@
<div id="sendActiveDiv" class="flex-div">
<div class="sp-hidden flex-div sendActiveTimess sp-width" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);">
<input type="text" id="sendActiveTime" class="form-control layer-date " >
- <#button style="margin: 0;" btnCs="info" name="搜索" id="ensure" icon="fa-check" clickFun="sendActiveSubmit()"/>
+ <#button style="margin: 0;" btnCs="info" name="查询" id="ensure" icon="fa-check" clickFun="sendActiveSubmit()"/>
</div>
<div class="sendActiveTimes flex-div" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);width: 180px;justify-content: flex-end;">
<span class="active sp-item">今日</span>
@@ -230,7 +230,7 @@
<div id="userDiv" class="flex-div">
<div class="sp-hidden flex-div userTimess sp-width" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);">
<input type="text" id="userTime" class="form-control layer-date " >
- <#button style="margin: 0;" btnCs="info" name="搜索" id="ensure" icon="fa-check" clickFun="userSubmit()"/>
+ <#button style="margin: 0;" btnCs="info" name="查询" id="ensure" icon="fa-check" clickFun="userSubmit()"/>
</div>
<div class="userTimes flex-div" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);width: 180px;justify-content: flex-end;">
<span class="active sp-item">今日</span>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/blackboardBlank.html b/management/guns-admin/src/main/webapp/WEB-INF/view/blackboardBlank.html
index 648ff23..0d33e83 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/blackboardBlank.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/blackboardBlank.html
@@ -139,7 +139,7 @@
</select>
</div>
<div class="initialLevel col-sm-2 control-label form-group" >
- <#button name="搜索" icon="fa-search" clickFun="getData()"/>
+ <#button name="查询" icon="fa-search" clickFun="getData()"/>
<#button name="重置" icon="fa-trash" clickFun="reset()" space="true"/>
</div>
</div>
@@ -174,7 +174,7 @@
</select>
</div>
<div class="initialLevel col-sm-2 control-label form-group" >
- <#button name="搜索" icon="fa-search" clickFun="getDataOrder()"/>
+ <#button name="查询" icon="fa-search" clickFun="getDataOrder()"/>
<#button name="重置" icon="fa-trash" clickFun="resetOrder()" space="true"/>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/driverOnline.html b/management/guns-admin/src/main/webapp/WEB-INF/view/driverOnline.html
index 9299d76..d38cf42 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/driverOnline.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/driverOnline.html
@@ -16,7 +16,7 @@
<#NameCon id="phone" name="手机号" />
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="Home.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="Home.search()"/>
<#button name="重置" icon="fa-trash" clickFun="Home.resetSearch()" space="true"/>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/home.html b/management/guns-admin/src/main/webapp/WEB-INF/view/home.html
index 07cce38..b9308a3 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/home.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/home.html
@@ -27,7 +27,7 @@
</div>
</div>
<div class="col-sm-2">
- <#button name="搜索" icon="fa-search" clickFun="getData()"/>
+ <#button name="查询" icon="fa-search" clickFun="getData()"/>
</div>
</div>
<div class="col-sm-3">
@@ -215,7 +215,7 @@
</div>
</div>
<div class="col-sm-2">
- <#button name="搜索" icon="fa-search" clickFun="getData1()"/>
+ <#button name="查询" icon="fa-search" clickFun="getData1()"/>
</div>
</div>
<div class="form-group">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/dept/dept.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/dept/dept.html
index a0570a2..84fe526 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/dept/dept.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/dept/dept.html
@@ -13,7 +13,7 @@
<#NameCon id="condition" name="名称" />
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="Dept.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="Dept.search()"/>
</div>
</div>
<div class="hidden-xs" id="DeptTableToolbar" role="group">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/dict/dict.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/dict/dict.html
index 2bf81ee..daabbd2 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/dict/dict.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/dict/dict.html
@@ -13,7 +13,7 @@
<#NameCon id="condition" name="名称" />
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="Dict.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="Dict.search()"/>
</div>
</div>
<div class="hidden-xs" id="DictTableToolbar" role="group">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity.html
index 5707610..970f094 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity.html
@@ -16,7 +16,7 @@
<#NameCon id="name" name="名称" />
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="DriverActivity.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="DriverActivity.search()"/>
<#button name="重置" icon="fa-trash" clickFun="DriverActivity.resetSearch()" space="true"/>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/log/log.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/log/log.html
index a9b7f48..bae3fdb 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/log/log.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/log/log.html
@@ -19,7 +19,7 @@
<#NameCon id="logName" name="用户名称" />
</div>
<div class="col-sm-2">
- <#button name="搜索" icon="fa-search" clickFun="OptLog.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="OptLog.search()"/>
<#button name="重置" icon="fa-trash" clickFun="OptLog.resetSearch()" space="true"/>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/log/login_log.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/log/login_log.html
index 8d38ac9..122e277 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/log/login_log.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/log/login_log.html
@@ -19,7 +19,7 @@
<#NameCon id="logName" name="用户名称" />
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="LoginLog.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="LoginLog.search()"/>
<#button name="重置" icon="fa-trash" clickFun="LoginLog.resetSearch()" space="true"/>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/menu/menu.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/menu/menu.html
index b0e89a7..63bd8fb 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/menu/menu.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/menu/menu.html
@@ -16,7 +16,7 @@
<#NameCon id="level" name="层级" />
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="Menu.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="Menu.search()"/>
</div>
</div>
<div class="hidden-xs" id="menuTableToolbar" role="group">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/notice/notice.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/notice/notice.html
index f373984..1a72544 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/notice/notice.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/notice/notice.html
@@ -13,7 +13,7 @@
<#NameCon id="condition" name="名称" />
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="Notice.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="Notice.search()"/>
</div>
</div>
<div class="hidden-xs" id="NoticeTableToolbar" role="group">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/report/couponStatistics.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/report/couponStatistics.html
index 1742b48..75e25af 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/report/couponStatistics.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/report/couponStatistics.html
@@ -34,7 +34,7 @@
</#SelectCon>
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="CouponStatistics.search1()"/>
+ <#button name="查询" icon="fa-search" clickFun="CouponStatistics.search1()"/>
<#button name="重置" icon="fa-search" clickFun="CouponStatistics.resetSearch1()"/>
<#button name="下载" icon="fa-download" clickFun="CouponStatistics.downloadExcel1()"/>
</div>
@@ -61,7 +61,7 @@
</#SelectCon>
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="CouponStatistics.search2()"/>
+ <#button name="查询" icon="fa-search" clickFun="CouponStatistics.search2()"/>
<#button name="重置" icon="fa-search" clickFun="CouponStatistics.resetSearch2()"/>
<#button name="下载" icon="fa-download" clickFun="CouponStatistics.downloadExcel2()"/>
</div>
@@ -88,7 +88,7 @@
</#SelectCon>
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="CouponStatistics.search3()"/>
+ <#button name="查询" icon="fa-search" clickFun="CouponStatistics.search3()"/>
<#button name="重置" icon="fa-search" clickFun="CouponStatistics.resetSearch3()"/>
<#button name="下载" icon="fa-download" clickFun="CouponStatistics.downloadExcel3()"/>
</div>
@@ -115,7 +115,7 @@
</#SelectCon>
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="CouponStatistics.search4()"/>
+ <#button name="查询" icon="fa-search" clickFun="CouponStatistics.search4()"/>
<#button name="重置" icon="fa-search" clickFun="CouponStatistics.resetSearch4()"/>
<#button name="下载" icon="fa-download" clickFun="CouponStatistics.downloadExcel4()"/>
</div>
@@ -142,7 +142,7 @@
</#SelectCon>
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="CouponStatistics.search5()"/>
+ <#button name="查询" icon="fa-search" clickFun="CouponStatistics.search5()"/>
<#button name="重置" icon="fa-search" clickFun="CouponStatistics.resetSearch5()"/>
<#button name="下载" icon="fa-download" clickFun="CouponStatistics.downloadExcel5()"/>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/report/couponStatisticsInfo.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/report/couponStatisticsInfo.html
index f98ec0f..1e6329f 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/report/couponStatisticsInfo.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/report/couponStatisticsInfo.html
@@ -22,7 +22,7 @@
</#SelectCon>
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="CouponStatisticsInfo.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="CouponStatisticsInfo.search()"/>
<#button name="重置" icon="fa-search" clickFun="CouponStatisticsInfo.resetSearch()"/>
<#button name="下载" icon="fa-download" clickFun="CouponStatisticsInfo.downloadExcel()"/>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/report/operationalData.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/report/operationalData.html
index 8cc397d..b4b50ae 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/report/operationalData.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/report/operationalData.html
@@ -29,7 +29,7 @@
</#SelectCon>
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="OperationalData.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="OperationalData.search()"/>
<#button name="重置" icon="fa-search" clickFun="OperationalData.resetSearch()"/>
<#button name="下载" icon="fa-download" clickFun="OperationalData.downloadExcel()"/>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/role/role.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/role/role.html
index 31b0863..5ca659f 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/role/role.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/role/role.html
@@ -13,7 +13,13 @@
<#NameCon id="roleName" name="角色名称" />
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="Role.search()"/>
+ <#NameCon id="headName" name="负责人" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="headPhone" name="负责人电话" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="查询" icon="fa-search" clickFun="Role.search()"/>
<#button name="重置" icon="fa-trash" clickFun="Role.resetSearch()" space="true"/>
</div>
</div>
@@ -22,7 +28,7 @@
<#button name="添加" icon="fa-plus" clickFun="Role.openAddRole()" />
@}
@if(shiro.hasPermission("/role/edit")){
- <#button name="修改" icon="fa-edit" clickFun="Role.openChangeRole()" space="true"/>
+ <#button name="编辑" icon="fa-edit" clickFun="Role.openChangeRole()" space="true"/>
@}
@if(shiro.hasPermission("/role/remove")){
<#button name="删除" icon="fa-remove" clickFun="Role.delRole()" space="true"/>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_add.html
index 1d576cc..137ea57 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_add.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_add.html
@@ -11,13 +11,15 @@
<#input id="pName" name="上级名称" underline="true" hidden="pid" readonly="readonly"
clickFun="RolInfoDlg.showPNameSelectTree(); return false;"
style="background-color: #ffffff !important;"/>
+ <#input id="headName" name="负责人名称" underline="true"/>
<#input id="deptName" name="部门名称" hidden="deptid" readonly="readonly"
clickFun="RolInfoDlg.showDeptSelectTree(); return false;"
style="background-color: #ffffff !important;"/>
</div>
<div class="col-sm-6">
<#input id="tips" name="别名" underline="true"/>
- <#input id="num" name="排序"/>
+ <#input id="num" name="排序" underline="true"/>
+ <#input id="headPhone" name="负责人电话" underline="true"/>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_edit.html
index ae538ac..80d033a 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_edit.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_edit.html
@@ -11,13 +11,15 @@
<#input id="pName" name="上级名称" underline="true" hidden="pid" hiddenValue="${role.pid}" readonly="readonly" value="${pName}"
clickFun="RolInfoDlg.showPNameSelectTree(); return false;"
style="background-color: #ffffff !important;"/>
+ <#input id="headName" name="负责人名称" value="${role.headName}" underline="true"/>
<#input id="deptName" name="部门名称" hidden="deptid" hiddenValue="${role.deptid}" readonly="readonly" value="${deptName}"
clickFun="RolInfoDlg.showDeptSelectTree(); return false;"
style="background-color: #ffffff !important;"/>
</div>
<div class="col-sm-6">
<#input id="tips" name="别名" underline="true" value="${role.tips}"/>
- <#input id="num" name="排序" value="${role.num}"/>
+ <#input id="num" name="排序" value="${role.num}" underline="true"/>
+ <#input id="headPhone" name="负责人电话" value="${role.headPhone}" underline="true"/>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgent/tAgent.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgent/tAgent.html
index c2690a2..de81247 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgent/tAgent.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgent/tAgent.html
@@ -18,38 +18,26 @@
<div class="col-sm-3">
<#TimeCon id="createTime" name="时间" />
</div>
- <!--<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>
- <option value="3">已删除</option>
- </select>
- </div>-->
+ <div class="col-sm-2">
+ <#SelectCon id="status" name="状态" >
+ <option value="">状态</option>
+ <option value="1">正常</option>
+ <option value="2">冻结</option>
+ </#SelectCon>
+ </div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="TAgent.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TAgent.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TAgent.resetSearch()" space="true"/>
</div>
- <div class="col-sm-3">
- @if(shiro.hasPermission("/tAgent/export")){
- <#button name="导出" icon="" clickFun="TAgent.export()"/>
- @}
- @if(shiro.hasPermission("/tAgent/add")){
- <#button name="添加" icon="fa-plus" clickFun="TAgent.openAddTAgent()"/>
- @}
- </div>
</div>
- <!--<div class="hidden-xs" id="TAgentTableToolbar" role="group">
+ <div class="hidden-xs" id="TAgentTableToolbar" role="group">
+ @if(shiro.hasPermission("/tAgent/export")){
+ <#button name="导出" icon="" clickFun="TAgent.export()"/>
+ @}
@if(shiro.hasPermission("/tAgent/add")){
<#button name="添加" icon="fa-plus" clickFun="TAgent.openAddTAgent()"/>
@}
- @if(shiro.hasPermission("/tAgent/update")){
- <#button name="修改" icon="fa-edit" clickFun="TAgent.openTAgentDetail()" space="true"/>
- @}
- @if(shiro.hasPermission("/tAgent/delete")){
- <#button name="删除" icon="fa-remove" clickFun="TAgent.delete()" space="true"/>
- @}
- </div>-->
+ </div>
<#table id="TAgentTable"/>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUser.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUser.html
index d1c0757..0b857d5 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUser.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUser.html
@@ -21,40 +21,29 @@
<div class="col-sm-2">
<#NameCon id="phone" name="手机号" />
</div>
- <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 class="col-sm-2">
+ <#SelectCon id="status" name="状态" >
+ <option value="">状态</option>
+ <option value="1">正常</option>
+ <option value="2">冻结</option>
+ </#SelectCon>
</div>
<div class="col-sm-2">
- <#button name="搜索" icon="fa-search" clickFun="TAppUser.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TAppUser.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TAppUser.resetSearch()" space="true"/>
</div>
- <div class="col-sm-3">
- @if(shiro.hasPermission("/tAppUser/export-userInfo")){
- <#button name="导出" icon="" clickFun="TAppUser.export()"/>
- @}
- @if(shiro.hasPermission("/tAppUser/tAppUser_exception")){
- <#button name="异常" icon="" clickFun="TAppUserException.tAppUserException()"/>
- @}
- @if(shiro.hasPermission("/tAppUser/sendCoupon")){
- <#button name="赠送优惠劵" icon="" clickFun="TAppUser.searchCoupon()"/>
- @}
- </div>
</div>
- <!--<div class="hidden-xs" id="TAppUserTableToolbar" role="group">
- @if(shiro.hasPermission("/tAppUser/add")){
- <#button name="添加" icon="fa-plus" clickFun="TAppUser.openAddTAppUser()"/>
+ <div class="hidden-xs" id="TAppUserTableToolbar" role="group">
+ @if(shiro.hasPermission("/tAppUser/export-userInfo")){
+ <#button name="导出" icon="" clickFun="TAppUser.export()"/>
@}
- @if(shiro.hasPermission("/tAppUser/update")){
- <#button name="修改" icon="fa-edit" clickFun="TAppUser.openTAppUserDetail()" space="true"/>
+ @if(shiro.hasPermission("/tAppUser/tAppUser_exception")){
+ <#button name="异常" icon="" clickFun="TAppUserException.tAppUserException()"/>
@}
- @if(shiro.hasPermission("/tAppUser/delete")){
- <#button name="删除" icon="fa-remove" clickFun="TAppUser.delete()" space="true"/>
+ @if(shiro.hasPermission("/tAppUser/sendCoupon")){
+ <#button name="赠送优惠劵" icon="" clickFun="TAppUser.searchCoupon()"/>
@}
- </div>-->
+ </div>
<#table id="TAppUserTable"/>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUserException.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUserException.html
index a1e6517..ca0d780 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUserException.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUserException.html
@@ -29,7 +29,7 @@
</select>
</div>
<div class="col-sm-2">
- <#button name="搜索" icon="fa-search" clickFun="TAppUserException.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TAppUserException.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TAppUserException.resetSearch()" space="true"/>
</div>
<div class="col-sm-3">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tCoupon.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tCoupon.html
index ced25a0..fe3820e 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tCoupon.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tCoupon.html
@@ -14,7 +14,7 @@
<#NameCon id="couponName" name="优惠券名称" placeholder="请输入优惠券名称"/>
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="TCoupon.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TCoupon.search()"/>
</div>
</div>
<#table id="TCouponTable"/>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tCouponException.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tCouponException.html
index bc1891e..d6b7705 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tCouponException.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tCouponException.html
@@ -14,7 +14,7 @@
<#NameCon id="couponName" name="优惠券名称" placeholder="请输入优惠券名称"/>
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="TCoupon.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TCoupon.search()"/>
</div>
</div>
<#table id="TCouponTable"/>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tBill/tBill.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tBill/tBill.html
index 7a2ad09..61aad66 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tBill/tBill.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tBill/tBill.html
@@ -16,28 +16,28 @@
<#NameCon id="addresseePhone" name="手机号" />
</div>
<div class="col-sm-2">
- <select class="input-group" id="state" style="width: 180px;height: 33px" name="state">
- <option value="">状态</option>
- <option value="1">待开票</option>
- <option value="2">已开票</option>
- <option value="3">开票失败</option>
- </select>
+ <#SelectCon id="state" name="状态" >
+ <option value="">状态</option>
+ <option value="1">待开票</option>
+ <option value="2">已开票</option>
+ <option value="3">开票失败</option>
+ </#SelectCon>
</div>
<div class="col-sm-2">
- <select class="input-group" id="billType" style="width: 180px;height: 33px" name="billType">
- <option value="">发票类型</option>
- <option value="1">电子发票</option>
- </select>
+ <#SelectCon id="billType" name="发票类型" >
+ <option value="">发票类型</option>
+ <option value="1">电子发票</option>
+ </#SelectCon>
</div>
<div class="col-sm-2">
- <select class="input-group" id="billHeaderType" style="width: 180px;height: 33px" name="billHeaderType">
- <option value="">抬头类型</option>
- <option value="1">公司</option>
- <option value="2">个人</option>
- </select>
+ <#SelectCon id="billHeaderType" name="抬头类型" >
+ <option value="">抬头类型</option>
+ <option value="1">公司</option>
+ <option value="2">个人</option>
+ </#SelectCon>
</div>
<div class="col-sm-2">
- <#button name="搜索" icon="fa-search" clickFun="TBill.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TBill.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TBill.resetSearch()" space="true"/>
</div>
<div class="col-sm-12">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tBranchOffice.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tBranchOffice.html
index 9d4f6ff..f891811 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tBranchOffice.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tBranchOffice.html
@@ -25,45 +25,37 @@
<#NameCon id="condition" name="管理人电话" />
</div>-->
<div class="col-sm-2">
- <select class="input-group" id="operatingBusiness" style="width: 180px;height: 33px" name="operatingBusiness">
- <option value="">选择经营业务</option>
- <option value="1">司机代驾</option>
- </select>
+ <#SelectCon id="operatingBusiness" name="选择经营业务" >
+ <option value="">选择经营业务</option>
+ <option value="1">司机代驾</option>
+ </#SelectCon>
</div>
<div class="col-sm-2">
- <select class="input-group" id="status" style="width: 180px;height: 33px" name="status">
- <option value="">选择状态</option>
- <option value="1">正常</option>
- <option value="2">冻结</option>
- </select>
+ <#SelectCon id="status" name="选择状态" >
+ <option value="">选择状态</option>
+ <option value="1">正常</option>
+ <option value="2">冻结</option>
+ </#SelectCon>
</div>
<div class="col-sm-2">
- <#button name="搜索" icon="fa-search" clickFun="TBranchOffice.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TBranchOffice.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TBranchOffice.resetSearch()" space="true"/>
</div>
- <div class="col-sm-12">
- @if(shiro.hasPermission("/tBranchOffice/add")){
- <#button name="添加" icon="fa-plus" clickFun="TBranchOffice.openAddTBranchOffice()"/>
- @}
- @if(shiro.hasPermission("/tBranchOffice/update")){
- <#button name="编辑" icon="fa-edit" clickFun="TBranchOffice.openTBranchOfficeDetail()" space="true"/>
- @}
- @if(shiro.hasPermission("/tBranchOffice/stop")){
- <#button name="冻结" icon="fa-edit" clickFun="TBranchOffice.stop()" space="true"/>
- @}
- @if(shiro.hasPermission("/tBranchOffice/start")){
- <#button name="启动" icon="fa-edit" clickFun="TBranchOffice.start()" space="true"/>
- @}
- </div>
</div>
- <!--<div class="hidden-xs" id="TBranchOfficeTableToolbar" role="group">
+ <div class="hidden-xs" id="TBranchOfficeTableToolbar" role="group">
@if(shiro.hasPermission("/tBranchOffice/add")){
- <#button name="添加" icon="fa-plus" clickFun="TBranchOffice.openAddTBranchOffice()"/>
+ <#button name="添加" icon="fa-plus" clickFun="TBranchOffice.openAddTBranchOffice()"/>
@}
@if(shiro.hasPermission("/tBranchOffice/update")){
- <#button name="修改" icon="fa-edit" clickFun="TBranchOffice.openTBranchOfficeDetail()" space="true"/>
+ <#button name="编辑" icon="fa-edit" clickFun="TBranchOffice.openTBranchOfficeDetail()" space="true"/>
@}
- </div>-->
+ @if(shiro.hasPermission("/tBranchOffice/stop")){
+ <#button name="冻结" icon="fa-edit" clickFun="TBranchOffice.stop()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tBranchOffice/start")){
+ <#button name="启动" icon="fa-edit" clickFun="TBranchOffice.start()" space="true"/>
+ @}
+ </div>
<#table id="TBranchOfficeTable"/>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tBroadcast/tBroadcast.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tBroadcast/tBroadcast.html
index f5056cc..bfaf76e 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tBroadcast/tBroadcast.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tBroadcast/tBroadcast.html
@@ -16,7 +16,7 @@
<#NameCon id="content" name="消息内容" />
</div>
<div class="col-sm-2">
- <#button name="搜索" icon="fa-search" clickFun="TBroadcast.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TBroadcast.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TBroadcast.resetSearch()"/>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCancelOrder/tCancelOrder.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCancelOrder/tCancelOrder.html
index 9c95d30..e2bb2d8 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCancelOrder/tCancelOrder.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCancelOrder/tCancelOrder.html
@@ -13,7 +13,7 @@
<#NameCon id="condition" name="名称" />
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="TCancelOrder.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TCancelOrder.search()"/>
</div>
</div>
<div class="hidden-xs" id="TCancelOrderTableToolbar" role="group">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCancelOrder/tCancelOrderDetail.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCancelOrder/tCancelOrderDetail.html
index 3d35322..8c8a947 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCancelOrder/tCancelOrderDetail.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCancelOrder/tCancelOrderDetail.html
@@ -110,30 +110,6 @@
<hr/>
<div class="initialLevel col-sm-12 control-label form-group" >
<div style="background-color: gray;height: 35px;line-height: 35px">
- <label style="color: #0C0C0C">取消信息</label>
- </div>
- </div>
- <hr/>
-
- <div class="initialLevel col-sm-12 control-label form-group" >
- <div class="initialLevel col-sm-2 control-label form-group" >
- <label class="control-label" >取消时间:</label>
- <label>${cancelTime}</label>
- </div>
- </div>
-
- <div class="initialLevel col-sm-12 control-label form-group" >
- <div class="initialLevel col-sm-2 control-label form-group" >
- <label class="control-label" >取消原因:</label>
- <div style="margin-left: 70px" >
- <textarea id="cause" style="width: 681px; height: 249px;" readonly>${cause}</textarea>
- </div>
- </div>
- </div>
-
- <hr/>
- <div class="initialLevel col-sm-12 control-label form-group" >
- <div style="background-color: gray;height: 35px;line-height: 35px">
<label style="color: #0C0C0C">费用明细</label>
</div>
</div>
@@ -188,6 +164,30 @@
</div>
</div>
+ <hr/>
+ <div class="initialLevel col-sm-12 control-label form-group" >
+ <div style="background-color: gray;height: 35px;line-height: 35px">
+ <label style="color: #0C0C0C">取消信息</label>
+ </div>
+ </div>
+ <hr/>
+
+ <div class="initialLevel col-sm-12 control-label form-group" >
+ <div class="initialLevel col-sm-2 control-label form-group" >
+ <label class="control-label" >取消时间:</label>
+ <label>${cancelTime}</label>
+ </div>
+ </div>
+
+ <div class="initialLevel col-sm-12 control-label form-group" >
+ <div class="initialLevel col-sm-2 control-label form-group" >
+ <label class="control-label" >取消原因:</label>
+ <div style="margin-left: 70px" >
+ <textarea id="cause" style="width: 681px; height: 249px;" readonly>${cause}</textarea>
+ </div>
+ </div>
+ </div>
+
<div class="hidden-xs" id="TDriverTableToolbar" role="group" style="text-align: center">
<#button name="取消" icon="fa-plus" clickFun="TCancelOrderInfoDlg.close()" />
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar.html
index bdcfe5a..f900626 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar.html
@@ -40,7 +40,7 @@
<#NameCon id="franchiseeName" name="所属加盟商" />
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="TCar.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TCar.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TCar.resetSearch()" space="true"/>
</div>
<div class="col-sm-3">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/franchisee.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/franchisee.html
index ccfe69f..5b32305 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/franchisee.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/franchisee.html
@@ -35,7 +35,7 @@
</#SelectCon>
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="Franchisee.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="Franchisee.search()"/>
<#button name="重置" icon="fa-trash" clickFun="Franchisee.resetSearch()" space="true"/>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany.html
index 677cd52..1668512 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany.html
@@ -38,7 +38,7 @@
</#SelectCon>
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="TCompany.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TCompany.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TCompany.resetSearch()" space="true"/>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint.html
index 06db201..db05d4a 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint.html
@@ -22,14 +22,14 @@
<#NameCon id="driverPhone" name="司机手机号" />
</div>
<div class="col-sm-2">
- <select class="input-group" id="state" style="width: 180px;height: 33px" name="state">
- <option value="">选择状态</option>
- <option value="1">待处理</option>
- <option value="2">已处理</option>
- </select>
+ <#SelectCon id="state" name="选择状态" >
+ <option value="">选择状态</option>
+ <option value="1">待处理</option>
+ <option value="2">已处理</option>
+ </#SelectCon>
</div>
<div class="col-sm-2">
- <#button name="搜索" icon="fa-search" clickFun="TComplaint.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TComplaint.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TComplaint.resetSearch()" space="true"/>
</div>
<div class="col-sm-12">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCoupon/tCoupon.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCoupon/tCoupon.html
index 7c10e66..c75bd82 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCoupon/tCoupon.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCoupon/tCoupon.html
@@ -13,20 +13,20 @@
<#TimeCon id="createTime" name="发布时间"/>
</div>
<div class="col-sm-2">
- <select class="input-group" id="couponType" style="width: 180px;height: 33px" name="couponType">
- <option value="">优惠券类型</option>
- <option value="1">活动券</option>
- <option value="2">优惠券</option>
- </select>
+ <#SelectCon id="couponType" name="优惠券类型" >
+ <option value="">优惠券类型</option>
+ <option value="1">活动券</option>
+ <option value="2">优惠券</option>
+ </#SelectCon>
</div>
<div class="col-sm-2">
- <select class="input-group" id="couponServiceType" style="width: 180px;height: 33px" name="couponServiceType">
- <option value="">服务类类型</option>
- <option value="1">通用券</option>
- </select>
+ <#SelectCon id="couponServiceType" name="服务类类型" >
+ <option value="">服务类类型</option>
+ <option value="1">通用券</option>
+ </#SelectCon>
</div>
<div class="col-sm-2">
- <#button name="搜索" icon="fa-search" clickFun="TCoupon.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TCoupon.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TCoupon.resetSearch()" space="true"/>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCoupon/tCoupon_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCoupon/tCoupon_add.html
index 5e33072..bb14f87 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCoupon/tCoupon_add.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCoupon/tCoupon_add.html
@@ -22,7 +22,7 @@
<div class="initialLevel col-sm-3 control-label form-group" >
<span style="color:red">*</span>
<label class="control-label" >优惠券类型:</label>
- <select id="couponType" name="couponType" onclick="TCoupon.changeCouponType()" style="height: 30px" required>
+ <select id="couponType" name="couponType" onclick="TCoupon.changeCouponType()" style="height: 30px;width: 180px" required>
<option value="">请选择优惠券类型</option>
<option value="1">活动券</option>
<option value="2">新人券</option>
@@ -34,18 +34,25 @@
<div class="initialLevel col-sm-3 control-label form-group" >
<span style="color:red">*</span>
<label class=" control-label">服务类类型：</label>
- <select id="couponServiceType" name="couponServiceType" style="height: 30px" required>
+ <select id="couponServiceType" name="couponServiceType" style="height: 30px;width: 180px" required>
<option value="">请选择服务类类型</option>
<option value="1">通用型</option>
</select>
</div>
</div>
- <div class="initialLevel col-sm-12 control-label form-group" >
+ <div class="initialLevel col-sm-12 control-label form-group" id="coupon1" >
+ <div class="initialLevel col-sm-3 control-label form-group" >
+ <label class="control-label">优惠券限制数量：</label>
+ <input id="couponCount" name="couponCount" type="number" min="0" maxlength="4" placeholder="最多4位数字" style="height: 30px" required>
+ </div>
+ </div>
+
+ <div class="initialLevel col-sm-12 control-label form-group" id="coupon2" >
<div class="initialLevel col-sm-3 control-label form-group" >
<span style="color:red">*</span>
<label class="control-label">优惠券限制数量：</label>
- <input id="couponCount" name="couponCount" type="number" maxlength="4" placeholder="最多4位数字" style="height: 30px" required>
+ <input id="couponCount" name="couponCount" type="number" min="0" maxlength="4" placeholder="最多4位数字" style="height: 30px" required>
</div>
</div>
@@ -53,7 +60,7 @@
<div class="initialLevel col-sm-3 control-label form-group" >
<span style="color:red">*</span>
<label class="control-label">条件金额：订单满</label>
- <input id="couponConditionalAmount" name="couponConditionalAmount" type="number" maxlength="4" placeholder="最多4位数字" style="height: 30px" required>
+ <input id="couponConditionalAmount" name="couponConditionalAmount" type="number" min="14" maxlength="4" placeholder="最多4位数字" style="height: 30px" required>
</div>
<div class="initialLevel col-sm-3 control-label form-group" style="text-align: left" >
<label>可使用</label>
@@ -64,7 +71,7 @@
<div class="initialLevel col-sm-3 control-label form-group" >
<span style="color:red">*</span>
<label class="control-label">优惠金额：</label>
- <input id="couponPreferentialAmount" name="couponPreferentialAmount" type="number" maxlength="4" placeholder="最多4位数字" style="height: 30px" required>
+ <input id="couponPreferentialAmount" name="couponPreferentialAmount" type="number" min="1" maxlength="4" placeholder="最多4位数字" style="height: 30px" required>
</div>
</div>
@@ -72,7 +79,7 @@
<div class="initialLevel col-sm-3 control-label form-group" >
<span style="color:red">*</span>
<label class="control-label">有效期：</label>
- <input id="couponValidity" name="couponValidity" type="number" maxlength="4" placeholder="最多4位数字" style="height: 30px" required>
+ <input id="couponValidity" name="couponValidity" type="number" min="1" maxlength="4" placeholder="最多4位数字" style="height: 30px" required>
</div>
<div class="initialLevel col-sm-3 control-label form-group" style="text-align: left" >
<label>天</label>
@@ -83,7 +90,7 @@
<div class="initialLevel col-sm-3 control-label form-group" >
<span style="color:red">*</span>
<label class="control-label">优惠券总量：</label>
- <input id="remainingQuantity" name="remainingQuantity" type="number" maxlength="4" placeholder="最多4位数字" style="height: 30px" required>
+ <input id="remainingQuantity" name="remainingQuantity" min="1" type="number" maxlength="4" placeholder="最多4位数字" style="height: 30px" required>
</div>
</div>
@@ -91,7 +98,7 @@
<div class="initialLevel col-sm-3 control-label form-group" >
<span style="color:red">*</span>
<label class="control-label">赠送数量：</label>
- <input id="couponSendQuantity" name="couponSendQuantity" type="number" maxlength="4" placeholder="最多4位数字" style="height: 30px" required>
+ <input id="couponSendQuantity" name="couponSendQuantity" min="1" type="number" maxlength="4" placeholder="最多4位数字" style="height: 30px" required>
</div>
<div class="initialLevel col-sm-3 control-label form-group" style="text-align: left" >
<label>张</label>
@@ -113,5 +120,16 @@
<script src="${ctxPath}/static/modular/system/tCoupon/tCoupon_info.js"></script>
<script src="${ctxPath}/static/modular/system/tCoupon/tCoupon.js"></script>
<script type="text/javascript">
+ //监听下拉菜单的变动操作
+ $("#couponType").change(function(){
+ if(this.value == 1){
+ $("#coupon1").show()
+ $("#coupon2").hide()
+ }
+ if(this.value == 2){
+ $("#coupon1").hide()
+ $("#coupon2").show()
+ }
+ })
</script>
@}
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 0dc2310..e55ffcd 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
@@ -15,15 +15,15 @@
<div class="col-sm-3">
<#NameCon id="phone" name="手机号" />
</div>
- <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 class="col-sm-2">
+ <#SelectCon id="status" name="状态" >
+ <option value="">状态</option>
+ <option value="1">正常</option>
+ <option value="2">冻结</option>
+ </#SelectCon>
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="TDriver.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TDriver.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TDriver.resetSearch()" space="true"/>
</div>
<div class="col-sm-12">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverAudit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverAudit.html
index 773a4ab..aed8ad4 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverAudit.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverAudit.html
@@ -38,6 +38,8 @@
<label class="control-label" >手机号:</label>
<label>${phone}</label>
</div>
+ <div class="initialLevel col-sm-2 control-label form-group" >
+ </div>
<div class="initialLevel col-sm-2 control-label form-group" >
<label class="control-label">紧急联系人电话:</label>
<label>${emergencyPhone}</label>
@@ -57,13 +59,20 @@
<label>未知</label>
@}
</div>
+ </div>
+
+ <div class="initialLevel col-sm-12 control-label form-group" >
+ <div class="initialLevel col-sm-3 control-label form-group" >
+ <label class="control-label">司机来源:</label>
+ <label></label>
+ </div>
<div class="initialLevel col-sm-2 control-label form-group" >
<label class="control-label">邀请人:</label>
- <label>${phone}</label>
+ <label>${inviterName}</label>
</div>
<div class="initialLevel col-sm-3 control-label form-group" >
<label class="control-label">电话:</label>
- <label>${phone}</label>
+ <label>${inviterPhone}</label>
</div>
</div>
@@ -72,9 +81,11 @@
<label class="control-label" >驾驶证号码:</label>
<label>${driverLicenseNumber}</label>
</div>
+ </div>
+ <div class="initialLevel col-sm-12 control-label form-group" >
<div class="initialLevel col-sm-2 control-label form-group" >
<label class="control-label">驾龄:</label>
- <label>${driverLicenseNumber}</label>
+ <label>${drivingExperience}</label>
</div>
</div>
@@ -102,10 +113,14 @@
<label class="control-label" >身份证号码:</label>
<label>${idcard}</label>
</div>
+ </div>
+ <div class="initialLevel col-sm-12 control-label form-group" >
<div class="initialLevel col-sm-2 control-label form-group" >
<label class="control-label">加盟城市:</label>
<label>${cityName}</label>
</div>
+ </div>
+ <div class="initialLevel col-sm-12 control-label form-group" >
<div class="initialLevel col-sm-2 control-label form-group" >
<label class="control-label">服务区域:</label>
<label>${areaName}</label>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverCommission.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverCommission.html
index 57ed60d..eade4c8 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverCommission.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverCommission.html
@@ -15,15 +15,15 @@
<div class="col-sm-3">
<#NameCon id="name" name="司机姓名" />
</div>
- <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 class="col-sm-2">
+ <#SelectCon id="status" name="状态" >
+ <option value="">状态</option>
+ <option value="1">正常</option>
+ <option value="2">冻结</option>
+ </#SelectCon>
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="TDriverCommission.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TDriverCommission.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TDriverCommission.resetSearch()" space="true"/>
</div>
<div class="col-sm-3">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverCommissionDetail.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverCommissionDetail.html
index 4500740..9a35c4d 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverCommissionDetail.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverCommissionDetail.html
@@ -13,7 +13,7 @@
<hr/>
<div class="initialLevel col-sm-12 control-label form-group" >
<div style="background-color: gray;height: 35px;line-height: 35px">
- <label style="color: #0C0C0C">用户资料</label>
+ <label style="color: #0C0C0C">司机详情</label>
</div>
</div>
<hr/>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverDetail.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverDetail.html
index ec6aa84..ca6cc62 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverDetail.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverDetail.html
@@ -65,17 +65,6 @@
<div class="initialLevel col-sm-12 control-label form-group" >
<div class="initialLevel col-sm-3 control-label form-group" >
- <label class="control-label" >身份证正面照:</label><br/>
- <img src="${idcardFront}" style="height: 100px;width: 100px"/>
- </div>
- <div class="initialLevel col-sm-2 control-label form-group" >
- <label class="control-label">身份证背面照:</label><br/>
- <img src="${idcardBack}" style="height: 100px;width: 100px"/>
- </div>
- </div>
-
- <div class="initialLevel col-sm-12 control-label form-group" >
- <div class="initialLevel col-sm-3 control-label form-group" >
<label class="control-label" >姓名:</label>
<label>${name}</label>
</div>
@@ -85,6 +74,17 @@
</div>
</div>
+ <div class="initialLevel col-sm-12 control-label form-group" >
+ <div class="initialLevel col-sm-3 control-label form-group" >
+ <label class="control-label" >身份证正面照:</label><br/>
+ <img src="${idcardFront}" style="height: 100px;width: 100px"/>
+ </div>
+ <div class="initialLevel col-sm-2 control-label form-group" >
+ <label class="control-label">身份证背面照:</label><br/>
+ <img src="${idcardBack}" style="height: 100px;width: 100px"/>
+ </div>
+ </div>
+
<hr/>
<div class="initialLevel col-sm-12 control-label form-group" >
<div style="background-color: gray;height: 35px;line-height: 35px">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverException.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverException.html
index ee34855..8305567 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverException.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverException.html
@@ -23,7 +23,7 @@
</select>
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="TDriverException.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TDriverException.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TDriverException.resetSearch()" space="true"/>
</div>
<div class="col-sm-3">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_changeCar.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_changeCar.html
index e831775..0c5c2df 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_changeCar.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_changeCar.html
@@ -23,7 +23,7 @@
<#NameCon id="serverStr" name="服务模式" />
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="SelectCar.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="SelectCar.search()"/>
<#button name="重置" icon="fa-trash" clickFun="SelectCar.resetSearch()" space="true"/>
<#button btnCss="info" name="确定" id="ensure" icon="fa-check" clickFun="SelectCar.selectCarOpt()" space="true"/>
<#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SelectCar.close()" space="true"/>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/yesDriver.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/yesDriver.html
index 7e280e5..6bda689 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/yesDriver.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/yesDriver.html
@@ -38,7 +38,7 @@
</#SelectCon>
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="YesDriver.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="YesDriver.search()"/>
<#button name="重置" icon="fa-trash" clickFun="YesDriver.resetSearch()" space="true"/>
</div>
<div class="col-sm-3">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tEdition/tEdition.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tEdition/tEdition.html
index 714ebf1..bf090ab 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tEdition/tEdition.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tEdition/tEdition.html
@@ -16,7 +16,7 @@
<#NameCon id="editionNo" name="版本号" />
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="TEdition.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TEdition.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TEdition.resetSearch()" space="true"/>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tEvaluate/tEvaluate.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tEvaluate/tEvaluate.html
index 4f13788..72613e1 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tEvaluate/tEvaluate.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tEvaluate/tEvaluate.html
@@ -24,17 +24,17 @@
</select>
</div>-->
<div class="col-sm-2">
- <select class="input-group" id="score" style="width: 120px;height: 33px" name="score">
- <option value="">选择分数</option>
- <option value="1">非常差</option>
- <option value="2">差</option>
- <option value="3">一般</option>
- <option value="4">满意</option>
- <option value="5">非常满意</option>
- </select>
+ <#SelectCon id="score" name="评价分数" >
+ <option value="">选择分数</option>
+ <option value="1">非常差</option>
+ <option value="2">差</option>
+ <option value="3">一般</option>
+ <option value="4">满意</option>
+ <option value="5">非常满意</option>
+ </#SelectCon>
</div>
<div class="col-sm-2">
- <#button name="搜索" icon="fa-search" clickFun="TEvaluate.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TEvaluate.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TEvaluate.resetSearch()" space="true"/>
</div>
<div class="col-sm-12">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tEvaluate/tEvaluateDetail.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tEvaluate/tEvaluateDetail.html
index 3fc7c19..c1e88f1 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tEvaluate/tEvaluateDetail.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tEvaluate/tEvaluateDetail.html
@@ -31,7 +31,12 @@
<div class="initialLevel col-sm-12 control-label form-group" >
<div class="initialLevel col-sm-3 control-label form-group" >
<label class="control-label" >订单来源:</label>
- <label>${source}</label>
+ @if(1 == source){
+ <label>用户创建</label>
+ @}
+ @if(2 == source){
+ <label>司机创建</label>
+ @}
</div>
<div class="initialLevel col-sm-3 control-label form-group" >
<label class="control-label" >乘车时间:</label>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tHomePage/tHomePageMap.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tHomePage/tHomePageMap.html
index 80ef970..5ca0bb6 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tHomePage/tHomePageMap.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tHomePage/tHomePageMap.html
@@ -35,7 +35,7 @@
</select>
</div>
<div class="initialLevel col-sm-2 control-label form-group" >
- <#button name="搜索" icon="fa-search" clickFun="getData()"/>
+ <#button name="查询" icon="fa-search" clickFun="getData()"/>
<#button name="重置" icon="fa-trash" clickFun="reset()" space="true"/>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tHtml/tHtml.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tHtml/tHtml.html
index f6b6948..5c446b4 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tHtml/tHtml.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tHtml/tHtml.html
@@ -13,7 +13,7 @@
<#NameCon id="condition" name="名称" />
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="THtml.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="THtml.search()"/>
</div>
</div>
<div class="hidden-xs" id="THtmlTableToolbar" role="group">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tInvoice/tInvoice.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tInvoice/tInvoice.html
index d17d306..3ee7fe3 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tInvoice/tInvoice.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tInvoice/tInvoice.html
@@ -34,7 +34,7 @@
</#SelectCon>
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="TInvoice.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TInvoice.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TInvoice.resetSearch()" space="true"/>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine.html
index c450377..e1f5d2c 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine.html
@@ -29,7 +29,7 @@
</#SelectCon>
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="TLine.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TLine.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TLine.resetSearch()" space="true"/>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/driverCancelOrder.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/driverCancelOrder.html
index 608cdd5..ff5a111 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/driverCancelOrder.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/driverCancelOrder.html
@@ -16,10 +16,10 @@
<div class="row btn-group-m-t">
<div class="col-sm-2" style="text-align: center">
@if(shiro.hasPermission("/tMainContent/driverCancelOrder/add")){
- <#button btnCss="info" name="新增" id="ensure" icon="fa-check" clickFun="TMainContent.driverCancelOrderAdd()"/>
+ <#button btnCss="info" name="新增" id="ensure" icon="" clickFun="TMainContent.driverCancelOrderAdd()"/>
@}
@if(shiro.hasPermission("/tMainContent/driverCancelOrder/update")){
- <#button btnCss="info" name="编辑" id="ensure" icon="fa-check" clickFun="TMainContent.driverCancelOrderUpdate()"/>
+ <#button btnCss="info" name="编辑" id="ensure" icon="" clickFun="TMainContent.driverCancelOrderUpdate()"/>
@}
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/driverCancelOrderAdd.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/driverCancelOrderAdd.html
index 98bf03c..2316904 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/driverCancelOrderAdd.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/driverCancelOrderAdd.html
@@ -22,8 +22,8 @@
</div>
<div class="row btn-group-m-t">
<div class="col-sm-12" style="text-align: center">
- <#button btnCss="info" name="取消" id="cancel" icon="fa-check" clickFun="TMainContentInfoDlg.close()"/>
- <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="TMainContentInfoDlg.driverCancelOrderAddSubmit()"/>
+ <#button btnCss="info" name="取消" id="cancel" icon="" clickFun="TMainContentInfoDlg.close()"/>
+ <#button btnCss="info" name="保存" id="ensure" icon="" clickFun="TMainContentInfoDlg.driverCancelOrderAddSubmit()"/>
</div>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/driverCancelOrderUpdate.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/driverCancelOrderUpdate.html
index daea4ec..a4f8841 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/driverCancelOrderUpdate.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/driverCancelOrderUpdate.html
@@ -22,8 +22,8 @@
</div>
<div class="row btn-group-m-t">
<div class="col-sm-12" style="text-align: center">
- <#button btnCss="info" name="取消" id="cancel" icon="fa-check" clickFun="TMainContentInfoDlg.close()"/>
- <#button btnCss="info" name="确定" id="ensure" icon="fa-check" clickFun="TMainContentInfoDlg.driverCancelOrderUpdateSubmit()"/>
+ <#button btnCss="info" name="取消" id="cancel" icon="" clickFun="TMainContentInfoDlg.close()"/>
+ <#button btnCss="info" name="确定" id="ensure" icon="" clickFun="TMainContentInfoDlg.driverCancelOrderUpdateSubmit()"/>
</div>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/tMainContent.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/tMainContent.html
index 770d4ef..cc6ff20 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/tMainContent.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/tMainContent.html
@@ -13,7 +13,7 @@
<#NameCon id="condition" name="名称" />
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="TMainContent.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TMainContent.search()"/>
</div>
</div>
<div class="hidden-xs" id="TMainContentTableToolbar" role="group">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/tMainContent_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/tMainContent_add.html
index b300cfa..637989c 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/tMainContent_add.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/tMainContent_add.html
@@ -18,8 +18,8 @@
<div class="row btn-group-m-t">
<div class="col-sm-10">
- <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TMainContentInfoDlg.addSubmit()"/>
- <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TMainContentInfoDlg.close()"/>
+ <#button btnCss="info" name="提交" id="ensure" icon="" clickFun="TMainContentInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="" clickFun="TMainContentInfoDlg.close()"/>
</div>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/tMainContent_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/tMainContent_edit.html
index 9ed74f6..effa34d 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/tMainContent_edit.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/tMainContent_edit.html
@@ -18,8 +18,8 @@
<div class="row btn-group-m-t">
<div class="col-sm-10">
- <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TMainContentInfoDlg.editSubmit()"/>
- <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TMainContentInfoDlg.close()"/>
+ <#button btnCss="info" name="提交" id="ensure" icon="" clickFun="TMainContentInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="" clickFun="TMainContentInfoDlg.close()"/>
</div>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/transferOrder.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/transferOrder.html
index aaba869..295cfb4 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/transferOrder.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/transferOrder.html
@@ -16,10 +16,10 @@
<div class="row btn-group-m-t">
<div class="col-sm-2" style="text-align: center">
@if(shiro.hasPermission("/tMainContent/transferOrder/add")){
- <#button btnCss="info" name="新增" id="ensure" icon="fa-check" clickFun="TMainContent.transferOrderAdd()"/>
+ <#button btnCss="info" name="新增" id="ensure" icon="" clickFun="TMainContent.transferOrderAdd()"/>
@}
@if(shiro.hasPermission("/tMainContent/transferOrder/update")){
- <#button btnCss="info" name="编辑" id="ensure" icon="fa-check" clickFun="TMainContent.transferOrderUpdate()"/>
+ <#button btnCss="info" name="编辑" id="ensure" icon="" clickFun="TMainContent.transferOrderUpdate()"/>
@}
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/transferOrderAdd.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/transferOrderAdd.html
index 72b3eac..588182a 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/transferOrderAdd.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/transferOrderAdd.html
@@ -22,8 +22,8 @@
</div>
<div class="row btn-group-m-t">
<div class="col-sm-12" style="text-align: center">
- <#button btnCss="info" name="取消" id="cancel" icon="fa-check" clickFun="TMainContentInfoDlg.close()"/>
- <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="TMainContentInfoDlg.transferOrderAddSubmit()"/>
+ <#button btnCss="info" name="取消" id="cancel" icon="" clickFun="TMainContentInfoDlg.close()"/>
+ <#button btnCss="info" name="保存" id="ensure" icon="" clickFun="TMainContentInfoDlg.transferOrderAddSubmit()"/>
</div>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/transferOrderUpdate.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/transferOrderUpdate.html
index 1a2cded..153ecfc 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/transferOrderUpdate.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/transferOrderUpdate.html
@@ -22,8 +22,8 @@
</div>
<div class="row btn-group-m-t">
<div class="col-sm-12" style="text-align: center">
- <#button btnCss="info" name="取消" id="cancel" icon="fa-check" clickFun="TMainContentInfoDlg.close()"/>
- <#button btnCss="info" name="确定" id="ensure" icon="fa-check" clickFun="TMainContentInfoDlg.transferOrderUpdateSubmit()"/>
+ <#button btnCss="info" name="取消" id="cancel" icon="" clickFun="TMainContentInfoDlg.close()"/>
+ <#button btnCss="info" name="确定" id="ensure" icon="" clickFun="TMainContentInfoDlg.transferOrderUpdateSubmit()"/>
</div>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/userCancelOrder.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/userCancelOrder.html
index 6d706c1..854cc49 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/userCancelOrder.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/userCancelOrder.html
@@ -16,10 +16,10 @@
<div class="row btn-group-m-t">
<div class="col-sm-2" style="text-align: center">
@if(shiro.hasPermission("/tMainContent/userCancelOrder/add")){
- <#button btnCss="info" name="新增" id="ensure" icon="fa-check" clickFun="TMainContent.userCancelOrderAdd()"/>
+ <#button btnCss="info" name="新增" id="ensure" icon="" clickFun="TMainContent.userCancelOrderAdd()"/>
@}
@if(shiro.hasPermission("/tMainContent/userCancelOrder/update")){
- <#button btnCss="info" name="编辑" id="ensure" icon="fa-check" clickFun="TMainContent.userCancelOrderUpdate()"/>
+ <#button btnCss="info" name="编辑" id="ensure" icon="" clickFun="TMainContent.userCancelOrderUpdate()"/>
@}
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/userCancelOrderAdd.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/userCancelOrderAdd.html
index 2ca430a..70cb95e 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/userCancelOrderAdd.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/userCancelOrderAdd.html
@@ -22,8 +22,8 @@
</div>
<div class="row btn-group-m-t">
<div class="col-sm-12" style="text-align: center">
- <#button btnCss="info" name="取消" id="cancel" icon="fa-check" clickFun="TMainContentInfoDlg.close()"/>
- <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="TMainContentInfoDlg.userCancelOrderAddSubmit()"/>
+ <#button btnCss="info" name="取消" id="cancel" icon="" clickFun="TMainContentInfoDlg.close()"/>
+ <#button btnCss="info" name="保存" id="ensure" icon="" clickFun="TMainContentInfoDlg.userCancelOrderAddSubmit()"/>
</div>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/userCancelOrderUpdate.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/userCancelOrderUpdate.html
index 837f8a5..177fbaa 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/userCancelOrderUpdate.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tMainContent/userCancelOrderUpdate.html
@@ -22,8 +22,8 @@
</div>
<div class="row btn-group-m-t">
<div class="col-sm-12" style="text-align: center">
- <#button btnCss="info" name="取消" id="cancel" icon="fa-check" clickFun="TMainContentInfoDlg.close()"/>
- <#button btnCss="info" name="确定" id="ensure" icon="fa-check" clickFun="TMainContentInfoDlg.userCancelOrderUpdateSubmit()"/>
+ <#button btnCss="info" name="取消" id="cancel" icon="" clickFun="TMainContentInfoDlg.close()"/>
+ <#button btnCss="info" name="确定" id="ensure" icon="" clickFun="TMainContentInfoDlg.userCancelOrderUpdateSubmit()"/>
</div>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/system.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/system.html
index e7c74a4..d7cf59c 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/system.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/system.html
@@ -16,7 +16,7 @@
<#NameCon id="content" name="消息内容" />
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="System.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="System.search()"/>
<#button name="重置" icon="fa-trash" clickFun="System.resetSearch()" space="true"/>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/tNotices.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/tNotices.html
index fbf8f2a..1182b06 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/tNotices.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/tNotices.html
@@ -16,7 +16,7 @@
<#NameCon id="content" name="消息内容" />
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="TNotices.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TNotices.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TNotices.resetSearch()" space="true"/>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tCancelOrder.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tCancelOrder.html
index e2cfe39..1ab0bf9 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tCancelOrder.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tCancelOrder.html
@@ -50,7 +50,7 @@
</div>
</div>
<div class="col-sm-12">
- <#button name="搜索" icon="fa-search" clickFun="TCancelOrder.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TCancelOrder.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TCancelOrder.resetSearch()" space="true"/>
</div>
<div class="col-sm-12">
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..9477cdf 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">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrderException.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrderException.html
index 4461826..90e1bc5 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrderException.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrderException.html
@@ -50,7 +50,7 @@
</div>
</div>
<div class="col-sm-12">
- <#button name="搜索" icon="fa-search" clickFun="TOrderException.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TOrderException.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TOrderException.resetSearch()" space="true"/>
</div>
<div class="col-sm-12">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate.html
index 4f9968a..7ba4dad 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate.html
@@ -39,7 +39,7 @@
</#SelectCon>
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="TOrderEvaluate.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TOrderEvaluate.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TOrderEvaluate.resetSearch()" space="true"/>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderRefusal/tOrderRefusal.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderRefusal/tOrderRefusal.html
index 19642c0..560b003 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderRefusal/tOrderRefusal.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderRefusal/tOrderRefusal.html
@@ -13,7 +13,7 @@
<#NameCon id="condition" name="名称" />
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="TOrderRefusal.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TOrderRefusal.search()"/>
</div>
</div>
<div class="hidden-xs" id="TOrderRefusalTableToolbar" role="group">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/smallPieceLogistics.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/smallPieceLogistics.html
index 259c40f..0fe876c 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/smallPieceLogistics.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/smallPieceLogistics.html
@@ -54,7 +54,7 @@
</#SelectCon>
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="TReassign.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TReassign.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TReassign.resetSearch()" space="true"/>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign.html
index e5fbcb1..f72a5c7 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign.html
@@ -55,7 +55,7 @@
</#SelectCon>
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="TReassign.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TReassign.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TReassign.resetSearch()" space="true"/>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignment.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignment.html
index 62241b2..cafaf7e 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignment.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignment.html
@@ -17,7 +17,7 @@
<#NameCon id="phone" name="司机手机号" />
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="SelectPrivateCarDriver.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="SelectPrivateCarDriver.search()"/>
<#button name="重置" icon="fa-trash" clickFun="SelectPrivateCarDriver.resetSearch()" space="true"/>
<#button btnCss="info" name="确定" id="ensure" icon="fa-check" clickFun="SelectPrivateCarDriver.selectDriver()" space="true"/>
<#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SelectPrivateCarDriver.close()" space="true"/>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignmentCross.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignmentCross.html
index a4a739b..70a861a 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignmentCross.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignmentCross.html
@@ -17,7 +17,7 @@
<#NameCon id="phone" name="司机手机号" />
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="SelectCrossDriver.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="SelectCrossDriver.search()"/>
<#button name="重置" icon="fa-trash" clickFun="SelectCrossDriver.resetSearch()" space="true"/>
<#button btnCss="info" name="确定" id="ensure" icon="fa-check" clickFun="SelectCrossDriver.selectDriver()" space="true"/>
<#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SelectCrossDriver.close()" space="true"/>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignmentSmall.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignmentSmall.html
index 6af6c90..5e2268d 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignmentSmall.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignmentSmall.html
@@ -17,7 +17,7 @@
<#NameCon id="phone" name="司机手机号" />
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="SelectPrivateCarDriver.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="SelectPrivateCarDriver.search()"/>
<#button name="重置" icon="fa-trash" clickFun="SelectPrivateCarDriver.resetSearch()" space="true"/>
<#button btnCss="info" name="确定" id="ensure" icon="fa-check" clickFun="SelectPrivateCarDriver.selectDriver()" space="true"/>
<#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SelectPrivateCarDriver.close()" space="true"/>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tRechargeRecord/tRechargeRecord.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tRechargeRecord/tRechargeRecord.html
index 1211d30..438ee01 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tRechargeRecord/tRechargeRecord.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tRechargeRecord/tRechargeRecord.html
@@ -34,7 +34,7 @@
<#TimeCon id="businessTime" name="交易时间" />
</div>
<div class="col-sm-2">
- <#button name="搜索" icon="fa-search" clickFun="TRechargeRecord.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TRechargeRecord.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TRechargeRecord.resetSearch()" space="true"/>
</div>
<div class="col-sm-12">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tRechargeRecord/tRechargeRecordAgent.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tRechargeRecord/tRechargeRecordAgent.html
index ccf2591..74c3656 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tRechargeRecord/tRechargeRecordAgent.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tRechargeRecord/tRechargeRecordAgent.html
@@ -19,7 +19,7 @@
<#TimeCon id="createTime" name="充值时间" />
</div>
<div class="col-sm-2">
- <#button name="搜索" icon="fa-search" clickFun="TRechargeRecordAgent.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TRechargeRecordAgent.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TRechargeRecordAgent.resetSearch()" space="true"/>
</div>
<div class="col-sm-12">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tRechargeRecord/tRechargeRecordUser.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tRechargeRecord/tRechargeRecordUser.html
index b6fdb69..62bab4d 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tRechargeRecord/tRechargeRecordUser.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tRechargeRecord/tRechargeRecordUser.html
@@ -22,7 +22,7 @@
<#TimeCon id="createTime" name="充值时间" />
</div>
<div class="col-sm-2">
- <#button name="搜索" icon="fa-search" clickFun="TRechargeRecordUser.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TRechargeRecordUser.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TRechargeRecordUser.resetSearch()" space="true"/>
</div>
<div class="col-sm-12">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tRegion/tRegion.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tRegion/tRegion.html
index a8f1d0f..6a6ea97 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tRegion/tRegion.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tRegion/tRegion.html
@@ -13,7 +13,7 @@
<#NameCon id="condition" name="名称" />
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="TRegion.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TRegion.search()"/>
</div>
</div>
<div class="hidden-xs" id="TRegionTableToolbar" role="group">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tRevenue/tRevenue.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tRevenue/tRevenue.html
index 8fca86a..857c611 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tRevenue/tRevenue.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tRevenue/tRevenue.html
@@ -13,20 +13,20 @@
<#NameCon id="code" name="订单号" />
</div>
<div class="col-sm-2">
- <select class="input-group" id="businessType" style="width: 180px;height: 33px" name="businessType">
- <option value="">交易类型</option>
- <option value="11">佣金提现</option>
- <option value="12">余额提现</option>
- <option value="1">支付订单</option>
- </select>
+ <#SelectCon id="businessType" name="交易类型" >
+ <option value="">交易类型</option>
+ <option value="11">佣金提现</option>
+ <option value="12">余额提现</option>
+ <option value="1">支付订单</option>
+ </#SelectCon>
</div>
<div class="col-sm-2">
- <select class="input-group" id="payType" style="width: 180px;height: 33px" name="payType">
- <option value="">支付渠道</option>
- <option value="1">微信支付</option>
- <option value="2">余额支付</option>
- <option value="3">线下收款</option>
- </select>
+ <#SelectCon id="payType" name="支付渠道" >
+ <option value="">支付渠道</option>
+ <option value="1">微信支付</option>
+ <option value="2">余额支付</option>
+ <option value="3">线下收款</option>
+ </#SelectCon>
</div>
<div class="col-sm-2">
<#NameCon id="driverName" name="司机姓名" />
@@ -35,7 +35,7 @@
<#TimeCon id="businessTime" name="交易时间" />
</div>
<div class="col-sm-2">
- <#button name="搜索" icon="fa-search" clickFun="TRevenue.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TRevenue.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TRevenue.resetSearch()" space="true"/>
</div>
<div class="col-sm-12">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemBulletin/tSystemBulletin.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemBulletin/tSystemBulletin.html
index 34d61f2..d323318 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemBulletin/tSystemBulletin.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemBulletin/tSystemBulletin.html
@@ -16,7 +16,7 @@
<#NameCon id="content" name="消息内容" />
</div>
<div class="col-sm-2">
- <#button name="搜索" icon="fa-search" clickFun="TSystemBulletin.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TSystemBulletin.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TSystemBulletin.resetSearch()"/>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfig.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfig.html
index 358f2b4..dd87d07 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfig.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfig.html
@@ -13,7 +13,7 @@
<#NameCon id="condition" name="名称" />
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="TSystemConfig.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TSystemConfig.search()"/>
</div>
</div>
<div class="hidden-xs" id="TSystemConfigTableToolbar" role="group">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigCommissionShareRules.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigCommissionShareRules.html
index a0853c6..8e072d6 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigCommissionShareRules.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigCommissionShareRules.html
@@ -15,37 +15,37 @@
</div>
</div>
- <div class="initialLevel col-sm-12 control-label form-group" style="text-align: left" >
+ <!--<div class="initialLevel col-sm-12 control-label form-group" style="text-align: left" >
<div class="initialLevel col-sm-12 control-label form-group" >
<span class="control-label" >司机邀请1名用户,下单后完成订单后获得</span>
- <input class="control-label" id="num1" name="num1" value="${num1}" type="number" min="0" style="height: 30px;width: 80px">
+ <input class="control-label" id="num1" name="num1" value="${num1}" type="text" min="0" style="height: 30px;width: 80px">
<span class="control-label" >元/单</span>
</div>
- </div>
+ </div>-->
<div class="initialLevel col-sm-12 control-label form-group" style="text-align: left" >
<div class="initialLevel col-sm-12 control-label form-group" >
<span class="control-label" >司机A邀请1名司机B,完成有效单后获得</span>
- <input class="control-label" id="num2" name="num2" value="${num2}" type="number" min="0" style="height: 30px;width: 80px">
+ <input class="control-label" id="num2" name="num2" value="${num2}" type="text" min="0" style="height: 30px;width: 80px">
<span class="control-label" >元/单</span>
</div>
</div>
<div class="initialLevel col-sm-12 control-label form-group" style="text-align: left" >
<div class="initialLevel col-sm-12 control-label form-group" >
<span class="control-label" >司机B邀请1名司机C,完成有效单后B获得</span>
- <input class="control-label" id="num3" name="num3" value="${num3}" type="number" min="0" style="height: 30px;width: 80px">
+ <input class="control-label" id="num3" name="num3" value="${num3}" type="text" min="0" style="height: 30px;width: 80px">
<span class="control-label" >元/单 司机A获得</span>
- <input class="control-label" id="num4" name="num4" value="${num4}" type="number" min="0" style="height: 30px;width: 80px">
+ <input class="control-label" id="num4" name="num4" value="${num4}" type="text" min="0" style="height: 30px;width: 80px">
<span class="control-label" >元/单</span>
</div>
</div>
<div class="initialLevel col-sm-12 control-label form-group" style="text-align: left" >
<div class="initialLevel col-sm-12 control-label form-group" >
<span class="control-label" >司机C邀请1名司机D,完成有效单后C获得</span>
- <input class="control-label" id="num5" name="num5" value="${num5}" type="number" min="0" style="height: 30px;width: 80px">
+ <input class="control-label" id="num5" name="num5" value="${num5}" type="text" min="0" style="height: 30px;width: 80px">
<span class="control-label" >元/单 司机B获得</span>
- <input class="control-label" id="num6" name="num6" value="${num6}" type="number" min="0" style="height: 30px;width: 80px">
+ <input class="control-label" id="num6" name="num6" value="${num6}" type="text" min="0" style="height: 30px;width: 80px">
<span class="control-label" >元/单 司机A获得</span>
- <input class="control-label" id="num7" name="num7" value="${num7}" type="number" min="0" style="height: 30px;width: 80px">
+ <input class="control-label" id="num7" name="num7" value="${num7}" type="text" min="0" style="height: 30px;width: 80px">
<span class="control-label" >元/单</span>
</div>
</div>
@@ -66,44 +66,45 @@
<script src="${ctxPath}/static/modular/system/tSystemConfig/tSystemConfig.js"></script>
<script src="${ctxPath}/static/modular/system/tSystemConfig/tSystemConfig_info.js"></script>
<script>
- $("input[name=num1]").bind('input',function(){
+ $("input[name=num1]").mouseleave('input',function(){
var value = $(this).val()
regexp(value)
})
- $("input[name=num2]").bind('input',function(){
+ $("input[name=num2]").mouseleave('input',function(){
var value = $(this).val()
regexp(value)
})
- $("input[name=num3]").bind('input',function(){
+ $("input[name=num3]").mouseleave('input',function(){
var value = $(this).val()
regexp(value)
})
- $("input[name=num4]").bind('input',function(){
+ $("input[name=num4]").mouseleave('input',function(){
var value = $(this).val()
regexp(value)
})
- $("input[name=num5]").bind('input',function(){
+ $("input[name=num5]").mouseleave('input',function(){
var value = $(this).val()
regexp(value)
})
- $("input[name=num6]").bind('input',function(){
+ $("input[name=num6]").mouseleave('input',function(){
var value = $(this).val()
regexp(value)
})
- $("input[name=num7]").bind('input',function(){
+ $("input[name=num7]").mouseleave(function(){
var value = $(this).val()
regexp(value)
})
function regexp(value){
- var reg=/^[1-9]\d*$/;//由 1-9开头 的正则表达式
+ var reg=/^(\d+.?)?\d{0,2}$/;//由 1-9开头 的正则表达式 整数
+ var reg1 = /^(([1-9]{1}\d*)|(0{1}))(\.\d{2})$/; // 两位小数
//先判断是否为整数 在判断 是否在 1-总页 整数范围之内
if(reg.test(value)){
- if(parseInt(value) <= 0){
- Feng.error("请输入大于0的正整数");
+ if(value == 0){
+ Feng.error("请输入大于0的整数或保留两位小数");
return;
}
}else{
- Feng.error("请输入大于0的正整数");
+ Feng.error("请输入整数或保留两位小数");
return;
}
}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tYouTui/tYouTui.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tYouTui/tYouTui.html
index ec6a562..3bd3848 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tYouTui/tYouTui.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tYouTui/tYouTui.html
@@ -13,14 +13,14 @@
<#TimeCon id="createTime" name="发布时间" />
</div>
<div class="col-sm-2">
- <select class="input-group" id="type" style="width: 180px;height: 33px" name="type">
+ <#SelectCon id="type" name="服务类类型" >
<option value="">服务类类型</option>
<option value="1">次数</option>
<option value="2">小时</option>
- </select>
+ </#SelectCon>
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="TYouTui.search()"/>
+ <#button name="查询" icon="fa-search" clickFun="TYouTui.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TYouTui.resetSearch()"/>
</div>
</div>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tYouTui/tYouTui_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tYouTui/tYouTui_add.html
index bf45922..7af9250 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tYouTui/tYouTui_add.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tYouTui/tYouTui_add.html
@@ -23,11 +23,10 @@
<div class="initialLevel col-sm-3 control-label form-group" >
<span style="color:red">*</span>
<label class="control-label" >优推类型:</label>
- <input id="number" name="number" type="number" placeholder="请输入0以上的数字" min="0" style="height: 30px" required>
+ <input id="number" name="number" type="number" placeholder="请输入0以上的数字" min="1" style="height: 30px" required>
</div>
<div class="initialLevel col-sm-3 control-label form-group" style="text-align: left" >
<select id="type" name="type" style="height: 30px" required>
- <option value="">请选择类型</option>
<option value="1">次数</option>
<option value="2">小时</option>
</select>
@@ -38,13 +37,12 @@
<div class="initialLevel col-sm-3 control-label form-group" >
<span style="color:red">*</span>
<label class="control-label" >兑换条件:</label>
- <input id="integral" name="integral" type="number" maxlength="4" placeholder="最多4位数" style="height: 30px" required>
+ <input id="integral" name="integral" type="number" min="1" maxlength="4" placeholder="最多4位数" style="height: 30px" required>
</div>
<div class="initialLevel col-sm-3 control-label form-group" style="text-align: left" >
<label>积分</label>
</div>
</div>
-
<div class="initialLevel col-sm-12 control-label form-group">
<div class="initialLevel col-sm-3 control-label form-group" >
<span style="color:red">*</span>
@@ -60,7 +58,7 @@
<div class="initialLevel col-sm-3 control-label form-group" >
<span style="color:red">*</span>
<label class="control-label" >有效期:</label>
- <input id="effectiveTime" name="effectiveTime" maxlength="4" placeholder="最多4位数" type="number" style="height: 30px" required>
+ <input id="effectiveTime" name="effectiveTime" min="1" maxlength="4" placeholder="最多4位数" type="number" style="height: 30px" required>
</div>
<div class="initialLevel col-sm-3 control-label form-group" style="text-align: left" >
<label>天</label>
@@ -72,6 +70,18 @@
<span style="color:red">*</span>
<label class="control-label" >服务内容:</label>
<textarea id="serviceContent" name="serviceContent" placeholder="请输入" maxlength="500" style="height: 80px" required></textarea>
+ </div>
+ </div>
+
+ <div class="initialLevel col-sm-12 control-label form-group">
+ <div class="initialLevel col-sm-8 control-label form-group" >
+ <div style="width: 20%">
+ <span style="color:red">*</span>
+ <label class="control-label" >上传图片:</label>
+ </div>
+ <div style="width: 80%" >
+ <#uploadImg id="picture" name="picture"/>
+ </div>
</div>
</div>
@@ -92,4 +102,11 @@
</div>
</div>
<script src="${ctxPath}/static/modular/system/tYouTui/tYouTui_info.js"></script>
+<script type="text/javascript">
+ $(function (){
+ var idCardPositive = new $WebUpload("picture");
+ idCardPositive.setUploadBarId("progressBar");
+ idCardPositive.init();
+ })
+</script>
@}
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/role/role.js b/management/guns-admin/src/main/webapp/static/modular/system/role/role.js
index fa1bbca..35bd98e 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/role/role.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/role/role.js
@@ -22,12 +22,15 @@
return "";
}*/
},
- {title: 'id', field: 'id', visible: false, align: 'center', valign: 'middle'},
- {title: '名称', field: 'name', align: 'center', valign: 'middle', sortable: true},
+ {title: 'ID', field: 'id', visible: false, align: 'center', valign: 'middle'},
+ {title: '角色名称', field: 'name', align: 'center', valign: 'middle', sortable: true},
{title: '上级角色', field: 'pName', align: 'center', valign: 'middle', sortable: true},
- {title: '所在部门', field: 'deptName', align: 'center', valign: 'middle', sortable: true},
- {title: '包含账户数', field: 'userCount', align: 'center', valign: 'middle', sortable: true},
- {title: '别名', field: 'tips', align: 'center', valign: 'middle', sortable: true}]
+ {title: '所属部门', field: 'deptName', align: 'center', valign: 'middle', sortable: true},
+ {title: '负责人', field: 'headName', align: 'center', valign: 'middle', sortable: true},
+ {title: '负责人电话', field: 'headPhone', align: 'center', valign: 'middle', sortable: true},
+ {title: '包含账户数', field: 'userCount',visible: false, align: 'center', valign: 'middle', sortable: true},
+ {title: '排序', field: 'num', align: 'center', valign: 'middle', sortable: true},
+ {title: '别名', field: 'tips', visible: false,align: 'center', valign: 'middle', sortable: true}]
return columns;
};
@@ -122,6 +125,8 @@
Role.search = function () {
var queryData = {};
queryData['roleName'] = $("#roleName").val();
+ queryData['headName'] = $("#headName").val();
+ queryData['headPhone'] = $("#headPhone").val();
Role.table.refresh({query: queryData});
}
@@ -130,6 +135,8 @@
*/
Role.resetSearch = function (){
$("#roleName").val('');
+ $("#headName").val('');
+ $("#headPhone").val('');
Role.search();
}
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/role/role_info.js b/management/guns-admin/src/main/webapp/static/modular/system/role/role_info.js
index c9fc418..0083ff9 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/role/role_info.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/role/role_info.js
@@ -19,14 +19,26 @@
message: '别名不能为空'
}
}
- }/*,
- pName: {
+ },
+ headName: {
validators: {
notEmpty: {
- message: '父级名称不能为空'
+ message: '负责人名称不能为空'
+ },
+ regexp: {
+ regexp: /^[\u4E00-\u9FA5A-Za-z\s]+$/,
+ message: '不能输入特殊字符和数字'
}
}
- }*/
+ },
+ headPhone: {
+ validators: {
+ regexp: {
+ regexp: /^1[3-9]\d{9}$/,
+ message: '请输入合法手机号'
+ }
+ }
+ }
}
};
@@ -118,7 +130,7 @@
* 收集数据
*/
RolInfoDlg.collectData = function () {
- this.set('id').set('name').set('pid').set('deptid').set('tips').set('num');
+ this.set('id').set('name').set('pid').set('deptid').set('tips').set('num').set("headName").set("headPhone");
};
/**
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tAgent/tAgent.js b/management/guns-admin/src/main/webapp/static/modular/system/tAgent/tAgent.js
index f815e7a..220a924 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tAgent/tAgent.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tAgent/tAgent.js
@@ -244,9 +244,11 @@
var principal=$("#principal").val();
var principalPhone = $("#principalPhone").val();
var createTime = $("#createTime").val();
+ var status = $("#status").val();
window.location.href=Feng.ctxPath + "/tAgent/export?principal="+principal
+"&principalPhone="+principalPhone
+"&createTime="+createTime
+ +"&status="+status
;
}
@@ -258,6 +260,7 @@
queryData['principal'] = $("#principal").val();
queryData['principalPhone'] = $("#principalPhone").val();
queryData['createTime'] = $("#createTime").val();
+ queryData['status'] = $("#status").val();
TAgent.table.refresh({query: queryData});
};
@@ -268,6 +271,7 @@
$("#principal").val('');
$("#principalPhone").val('');
$("#createTime").val('');
+ $("#status").val('');
TAgent.search();
}
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUser.js b/management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUser.js
index c881b64..56bf20c 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUser.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUser.js
@@ -124,7 +124,7 @@
var index = layer.open({
type: 2,
title: '停用',
- area: ['45%', '50%'], //宽高
+ area: ['800px', '420px'], //宽高
fix: false, //不固定
maxmin: true,
content: Feng.ctxPath + '/tAppUser/tAppUser_start_and_stop?id='+id
@@ -139,7 +139,7 @@
var index = layer.open({
type: 2,
title: '启用',
- area: ['45%', '50%'], //宽高
+ area: ['800px', '420px'], //宽高
fix: false, //不固定
maxmin: true,
content: Feng.ctxPath + '/tAppUser/tAppUser_start_and_stop?id='+id
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUserException.js b/management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUserException.js
index a0f10f5..55d1770 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUserException.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUserException.js
@@ -102,7 +102,7 @@
var index = layer.open({
type: 2,
title: '停用',
- area: ['45%', '50%'], //宽高
+ area: ['800px', '420px'], //宽高
fix: false, //不固定
maxmin: true,
content: Feng.ctxPath + '/tAppUser/tAppUserException_start_and_stop?id='+id
@@ -117,7 +117,7 @@
var index = layer.open({
type: 2,
title: '启用',
- area: ['45%', '50%'], //宽高
+ area: ['800px', '420px'], //宽高
fix: false, //不固定
maxmin: true,
content: Feng.ctxPath + '/tAppUser/tAppUserException_start_and_stop?id='+id
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tCoupon/tCoupon_info.js b/management/guns-admin/src/main/webapp/static/modular/system/tCoupon/tCoupon_info.js
index 91fbf7b..b92bbc2 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tCoupon/tCoupon_info.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tCoupon/tCoupon_info.js
@@ -8,6 +8,10 @@
validators: {
notEmpty: {
message: '优惠券名称不能为空'
+ },
+ regexp: {
+ regexp: /^[\u4E00-\u9FA5A-Za-z\s]+$/,
+ message: '不能输入特殊字符和数字'
}
}
},
@@ -22,17 +26,6 @@
validators: {
notEmpty: {
message: '请选择服务类类型'
- }
- }
- },
- couponCount: {
- validators: {
- notEmpty: {
- message: '优惠券数量不能为空'
- },
- regexp: {
- regexp: /^[1-9]\d*$/,
- message: '请输入大于0的正整数'
}
}
},
@@ -157,11 +150,29 @@
return ;
}
+ var couponConditionalAmount = $('#couponConditionalAmount').val();
+ if(couponConditionalAmount < 14){
+ Feng.info("条件金额最低14元!")
+ return;
+ }
+
+ var couponCount = $('#couponCount').val();
+ var couponType = $('#couponType').val();
+ if(couponType == 2 && (couponCount == null || couponCount == '')){
+ Feng.info("请填写优惠券限制数量!")
+ return;
+ }
+
//提交信息
var ajax = new $ax(Feng.ctxPath + "/tCoupon/add", function(data){
- Feng.success("添加成功!");
- window.parent.TCoupon.table.refresh();
- TCouponInfoDlg.close();
+ if(500 == data.code){
+ Feng.error(data.message)
+ return;
+ }else {
+ Feng.success("添加成功!");
+ window.parent.TCoupon.table.refresh();
+ TCouponInfoDlg.close();
+ }
},function(data){
Feng.error("添加失败!" + data.responseJSON.message + "!");
});
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver.js b/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver.js
index eaaeb26..9aece9f 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver.js
@@ -165,7 +165,7 @@
var index = layer.open({
type: 2,
title: '冻结',
- area: ['45%', '50%'], //宽高
+ area: ['800px', '420px'], //宽高
fix: false, //不固定
maxmin: true,
content: Feng.ctxPath + '/tDriver/tDriver_start_and_stop?id='+id
@@ -180,7 +180,7 @@
var index = layer.open({
type: 2,
title: '启用',
- area: ['45%', '50%'], //宽高
+ area: ['800px', '420px'], //宽高
fix: false, //不固定
maxmin: true,
content: Feng.ctxPath + '/tDriver/tDriver_start_and_stop?id='+id
@@ -233,7 +233,7 @@
var index = layer.open({
type: 2,
title: '充值余额',
- area: ['45%', '20%'], //宽高
+ area: ['800px', '220px'], //宽高
fix: false, //不固定
maxmin: true,
content: Feng.ctxPath + '/tDriver/rechargeBalancePage?id=' + id
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriverCommissionConnect.js b/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriverCommissionConnect.js
index c7ca600..b85fb5c 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriverCommissionConnect.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriverCommissionConnect.js
@@ -15,7 +15,7 @@
return [
{field: 'selectItem', radio: true},
{title: '主键', field: 'id', visible: false, align: 'center', valign: 'middle'},
- {title: '关联层级', field: 'id', visible: false, align: 'center', valign: 'middle'},
+ {title: '关联层级', field: 'level', visible: true, align: 'center', valign: 'middle'},
{title: '用户姓名', field: 'name', visible: true, align: 'center', valign: 'middle'},
{title: '联系电话', field: 'phone', visible: true, align: 'center', valign: 'middle'},
{title: '上级人员', field: 'inviterName', visible: true, align: 'center', valign: 'middle'},
@@ -32,6 +32,7 @@
}
}},
{title: '关联人数', field: 'connectedPersons', visible: true, align: 'center', valign: 'middle'},
+ {title: '更新时间', field: 'createTime', visible: true, align: 'center', valign: 'middle'},
{title: '操作', visible: true, align: 'center', valign: 'middle',width:150,
formatter: function (value, row) {
return '<a href="#" onclick="TDriverCommissionConnect.searchTDriverDetail('+row.id+')" style="color:blue">查询</a>'
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriverException.js b/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriverException.js
index 72137f4..ba3b551 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriverException.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriverException.js
@@ -128,7 +128,7 @@
var index = layer.open({
type: 2,
title: '停用',
- area: ['45%', '50%'], //宽高
+ area: ['800px', '420px'], //宽高
fix: false, //不固定
maxmin: true,
content: Feng.ctxPath + '/tDriver/tDriverException_start_and_stop?id='+id
@@ -143,7 +143,7 @@
var index = layer.open({
type: 2,
title: '启用',
- area: ['45%', '50%'], //宽高
+ area: ['800px', '420px'], //宽高
fix: false, //不固定
maxmin: true,
content: Feng.ctxPath + '/tDriver/tDriverException_start_and_stop?id='+id
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tSystemConfig/tSystemConfig.js b/management/guns-admin/src/main/webapp/static/modular/system/tSystemConfig/tSystemConfig.js
index 0375706..85d79f5 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tSystemConfig/tSystemConfig.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tSystemConfig/tSystemConfig.js
@@ -114,13 +114,14 @@
Feng.error("保存失败!" + data.responseJSON.message + "!");
});
var reqData = {};
- reqData['num1'] = Number($("#num1").val());
- reqData['num2'] = Number($("#num2").val());
- reqData['num3'] = Number($("#num3").val());
- reqData['num4'] = Number($("#num4").val());
- reqData['num5'] = Number($("#num5").val());
- reqData['num6'] = Number($("#num6").val());
- reqData['num7'] = Number($("#num7").val());
+ reqData['num1'] = $("#num1").val();
+ reqData['num2'] = $("#num2").val();
+ reqData['num3'] = $("#num3").val();
+ reqData['num4'] = $("#num4").val();
+ reqData['num5'] = $("#num5").val();
+ reqData['num6'] = $("#num6").val();
+ reqData['num7'] = $("#num7").val();
+ console.log(JSON.stringify(reqData))
ajax.set("content",JSON.stringify(reqData));
ajax.set("type",2);
ajax.start();
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tYouTui/tYouTui.js b/management/guns-admin/src/main/webapp/static/modular/system/tYouTui/tYouTui.js
index 59da50f..414d4ee 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tYouTui/tYouTui.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tYouTui/tYouTui.js
@@ -27,6 +27,11 @@
}
},
{title: '服务内容', field: 'content', visible: true, align: 'center', valign: 'middle'},
+ {title: '图片', field: 'picture', visible: true, align: 'center', valign: 'middle',
+ formatter: function (value, row) {
+ return '<img src="'+row.picture+'" style="height: 60px;width: 60px"/>'
+ }
+ },
{title: '兑换积分数', field: 'integral', visible: true, align: 'center', valign: 'middle'},
{title: '优推值', field: 'number', visible: false, align: 'center', valign: 'middle'},
{title: '优推距离(米)', field: 'distance', visible: true, align: 'center', valign: 'middle'},
@@ -34,9 +39,9 @@
{title: '状态', field: 'status', visible: true, align: 'center', valign: 'middle',
formatter: function (value, row) {
if (row.status === 1){
- return '<span>正常</span>'
+ return '<span>启用</span>'
}else if (row.status === 2){
- return '<span>冻结</span>'
+ return '<span>停用</span>'
}else if (row.status === 3){
return '<span>已删除</span>'
}
@@ -45,11 +50,11 @@
{title: '操作', visible: true, align: 'center', valign: 'middle',width:150,
formatter: function (value, row) {
if (row.status === 1){
- return '<a href="#" onclick="TYouTui.updateStatus('+row.id+','+row.status+')" style="color:red">冻结</a>' +' ' +
- '<a href="#" onclick="TYouTui.delete('+row.id+')" style="color:red">删除</a>'
+ return '<a href="#" onclick="TYouTui.updateStatus('+row.id+','+row.status+')" style="color:lightskyblue">停用</a>' +' ' +
+ '<a href="#" onclick="TYouTui.delete('+row.id+')" style="color:lightskyblue">删除</a>'
}else if (row.status === 2){
- return '<a href="#" onclick="TYouTui.updateStatus('+row.id+','+row.status+')" style="color:green">解冻</a>' +' ' +
- '<a href="#" onclick="TYouTui.delete('+row.id+')" style="color:red">删除</a>'
+ return '<a href="#" onclick="TYouTui.updateStatus('+row.id+','+row.status+')" style="color:lightskyblue">启用</a>' +' ' +
+ '<a href="#" onclick="TYouTui.delete('+row.id+')" style="color:lightskyblue">删除</a>'
}
}
}
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tYouTui/tYouTui_info.js b/management/guns-admin/src/main/webapp/static/modular/system/tYouTui/tYouTui_info.js
index e182b88..e989234 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tYouTui/tYouTui_info.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tYouTui/tYouTui_info.js
@@ -8,6 +8,10 @@
validators: {
notEmpty: {
message: '优推名称不能为空'
+ },
+ regexp: {
+ regexp: /^[\u4E00-\u9FA5A-Za-z\s]+$/,
+ message: '不能输入特殊字符和数字'
}
}
},
@@ -120,6 +124,7 @@
.set('status')
.set('distance')
.set('serviceContent')
+ .set('picture')
.set('createTime');
}
--
Gitblit v1.7.1