From dedfc9f1a3fb311874a360324447e717f3034c4a Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 15 十一月 2024 09:52:58 +0800
Subject: [PATCH] 修改bug
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCompanyMapper.xml | 4
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java | 12 +
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TPubWithdrawalMapper.xml | 7
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tPubWithdrawal/tPubWithdrawal.html | 1
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TUserMapper.xml | 9 +
ManagementIGOTravel/guns-admin/src/main/resources/application.yml | 2
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/tReassign.js | 16 ++
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tAdvertisement/yesDriver.js | 22 --
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/pubTransactionDetails/userPubTransactionDetails.js | 8
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysCouponActivity/tUser.js | 20 --
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderLogisticsMapper.xml | 2
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tAdvertisement/tAdvertisement_info.js | 61 +++++--
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponActivity.js | 1
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver_info.js | 9 +
ManagementIGOTravel/guns-admin/src/main/resources/application-dev.yml | 13 +
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html | 10 +
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tAdvertisement/tUser.js | 12 -
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponActivity_info.js | 31 +++-
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html | 2
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tAdvertisement/tAdvertisement_info_defined.js | 31 +++-
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tOrderLogistics/tOrderLogistics.js | 4
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/platformEdit.html | 12
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html | 10 +
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js | 4
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSmsrecord.java | 18 +-
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/smallPieceLogistics.js | 14 +
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml | 2
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity.html | 3
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml | 17 ++
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tPubWithdrawal/tPubWithdrawal.js | 2
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java | 3
31 files changed, 226 insertions(+), 136 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java
index 0c937d1..791145e 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java
@@ -152,7 +152,17 @@
model.addAttribute("tReassignId",tReassignId);
return PREFIX + "tReassign_reassignmentSmall.html";
}
-
+
+
+ @RequestMapping("/lookDetail/{id}")
+ public String lookDetail(@PathVariable Integer id, Model model) {
+ TReassign tReassign = tReassignService.selectById(id);
+ String str = tReassign.getReason();
+ model.addAttribute("str",str);
+ return "/system/tComplaint/lookDetail.html";
+ }
+
+
/**
* 获取专车改派管理列表
*/
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCompanyMapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCompanyMapper.xml
index 2ba69fb..2ba43b8 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCompanyMapper.xml
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCompanyMapper.xml
@@ -64,7 +64,7 @@
<!--根据条件查询分公司列表-->
<select id="getCompanyList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
SELECT * FROM (SELECT ui.account,IFNULL(ci.num,0) as franchiseeNum,IFNULL(ca.num,0) as carNumber,IFNULL(di.num,0) as driverNumber,
- CONCAT(case when cc.isSpe = 1 then '专车,' else '' end,
+ case when cc.isSpe = 1 then '专车,' else '' end,
case when cc.isSameLogistics = 1 then '市内小件物流,' else '' end,
cc.* FROM t_company as cc
LEFT JOIN (SELECT * FROM sys_user where roleType = 2) as ui on ui.objectId = cc.id
@@ -115,7 +115,7 @@
<!--根据条件查询加盟商列表-->
<select id="getFranchiseeList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
SELECT * FROM (SELECT ui.account,ci.`name` as companyName,IFNULL(ca.num,0) as carNumber,IFNULL(di.num,0) as driverNumber,
- CONCAT(case when cc.isSpe = 1 then '专车,' else '' end,
+ case when cc.isSpe = 1 then '专车,' else '' end,
case when cc.isSameLogistics = 1 then '市内小件物流,' else '' end,
cc.* FROM t_company as cc
LEFT JOIN (SELECT * FROM sys_user where roleType = 3) as ui on ui.objectId = cc.id
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml
index 9917892..fd22eb4 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml
@@ -132,8 +132,17 @@
<!--根据审核通过的司机列表-->
<select id="getDriverList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
- SELECT * FROM (SELECT cc1.`name` as companyName,cc2.`name` as franchiseeName,ci.carLicensePlate,ds.serverStr,IFNULL(oe.evaluateNum,0) as evaluateNum,
- (IFNULL(ot1.taxiNum, 0) + IFNULL(ot3.num, 0) + IFNULL(ot5.num, 0)) as historyNum,(IFNULL(ot2.taxiMoney, 0)+ IFNULL(ot4.money, 0) + IFNULL(ot6.money, 0)) as historyMoney,dd.*,tdt.teamName from t_driver as dd
+ SELECT * FROM (
+ SELECT cc1.`name` as companyName,
+ cc2.`name` as franchiseeName,
+ ci.carLicensePlate,
+ ds.serverStr,
+ IFNULL(oe.evaluateNum,0) as evaluateNum,
+ (IFNULL(ot1.taxiNum, 0) + IFNULL(ot3.num, 0) + IFNULL(ot5.num, 0) + IFNULL(ot7.num, 0)) as historyNum,
+ (IFNULL(ot2.taxiMoney, 0)+ IFNULL(ot4.money, 0) + IFNULL(ot6.money, 0) + IFNULL(ot8.money, 0)) as historyMoney,
+ dd.*,
+ tdt.teamName
+ from t_driver as dd
LEFT JOIN t_driver_team tdt on dd.teamId=tdt.id and tdt.state!=3
LEFT JOIN (select * from t_company where type = 2 and flag != 3) as cc1 on cc1.id = dd.companyId
LEFT JOIN (select * from t_company where type = 3 and flag != 3) as cc2 on cc2.id = dd.franchiseeId
@@ -149,7 +158,9 @@
LEFT JOIN (SELECT COUNT(id) as num,driverId FROM t_order_private_car where FIND_IN_SET(state,'7,8,9') GROUP BY driverId) as ot3 on ot3.driverId = dd.id
LEFT JOIN (SELECT SUM(orderMoney) as money,driverId FROM t_order_private_car where FIND_IN_SET(state,'7,8,9') GROUP BY driverId) as ot4 on ot4.driverId = dd.id
LEFT JOIN (SELECT COUNT(id) as num,driverId FROM t_order_cross_city where FIND_IN_SET(state,'6,7,8') GROUP BY driverId) as ot5 on ot5.driverId = dd.id
- LEFT JOIN (SELECT SUM(orderMoney) as money,driverId FROM t_order_cross_city where FIND_IN_SET(state,'6,7,8') GROUP BY driverId) as ot6 on ot6.driverId = dd.id) as o
+ LEFT JOIN (SELECT SUM(orderMoney) as money,driverId FROM t_order_cross_city where FIND_IN_SET(state,'6,7,8') GROUP BY driverId) as ot6 on ot6.driverId = dd.id
+ LEFT JOIN (SELECT COUNT(id) as num,driverId FROM t_order_logistics where FIND_IN_SET(state,'7,8,9') GROUP BY driverId) as ot7 on ot7.driverId = dd.id
+ LEFT JOIN (SELECT SUM(orderMoney) as money,driverId FROM t_order_logistics where FIND_IN_SET(state,'7,8,9') GROUP BY driverId) as ot8 on ot8.driverId = dd.id) as o
<where>
o.flag != 3
<if test="roleType != null and roleType != '' and roleType == 1">
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderLogisticsMapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderLogisticsMapper.xml
index e8a0dd6..ffd7ae9 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderLogisticsMapper.xml
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderLogisticsMapper.xml
@@ -72,7 +72,7 @@
<!--根据条件查询小件物流订单列表-->
<select id="getLogisticsOrderList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
SELECT * FROM (SELECT ui.nickName as userName,ui.phone as userPhone,CONCAT(di.firstName, " ", di.lastName,'-',di.phone) as driver,CONCAT(cb.`name`,'-',ci.carLicensePlate) as car,
- ot.*,oc.money as cancel_money FROM t_order_logistics as ot
+ ot.*,ifnull(oc.money, 0) as cancel_money FROM t_order_logistics as ot
LEFT JOIN t_user as ui on ui.id = ot.userId
LEFT JOIN t_driver as di on di.id = ot.driverId
LEFT JOIN t_car as ci on ci.id= ot.carId
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml
index f912f78..4c14672 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml
@@ -78,7 +78,7 @@
<!--根据条件查询专车订单列表-->
<select id="getPrivateCarOrderList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
SELECT * FROM (SELECT ui.nickName as userName,ui.phone as userPhone,CONCAT(di.firstName, " ", di.lastName,'-',di.phone) as driver,CONCAT(cb.`name`,'-',ci.carLicensePlate) as car,
- sc.chineseName as serverCarModel,oc.money as cancel_money,ot.* FROM t_order_private_car as ot
+ sc.chineseName as serverCarModel,ifnull(oc.money, 0) as cancel_money,ot.* FROM t_order_private_car as ot
LEFT JOIN t_user as ui on ui.id = ot.userId
LEFT JOIN t_driver as di on di.id = ot.driverId
LEFT JOIN t_car as ci on ci.id= ot.carId
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TPubWithdrawalMapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TPubWithdrawalMapper.xml
index 26baf8f..1cdc7b0 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TPubWithdrawalMapper.xml
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TPubWithdrawalMapper.xml
@@ -39,7 +39,7 @@
AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
</if>
<if test="name != null and name != ''">
- and o.name LIKE CONCAT('%',#{name},'%')
+ and o.userName LIKE CONCAT('%',#{name},'%')
</if>
<if test="withdrawalType != null and withdrawalType != ''">
and o.withdrawalType = #{withdrawalType}
@@ -47,9 +47,12 @@
<if test="userType != null and userType != ''">
and o.userType = #{userType}
</if>
- <if test="type != null and type != ''">
+ <if test="type != null and type != '' and type != 3">
and o.type = #{type}
</if>
+ <if test="type != null and type != '' and type == 3">
+ and o.type is null
+ </if>
<if test="state != null and state != ''">
and o.state = #{state}
</if>
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TUserMapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TUserMapper.xml
index 6e61ca1..890972e 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TUserMapper.xml
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TUserMapper.xml
@@ -45,9 +45,16 @@
<!--根据条件查询用户列表-->
<select id="getUserList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
- SELECT * FROM (SELECT ci.`name` as companyName,IFNULL(ot.num,0) as historyNum,IFNULL(td.num,0) as consumptionNum,ui.* from t_user as ui
+ SELECT * FROM
+ (
+ SELECT ci.`name` as companyName,
+ IFNULL(ot.num,0) + IFNULL(ol.num,0) as historyNum,
+ IFNULL(td.num,0) as consumptionNum,
+ ui.*
+ from t_user as ui
LEFT JOIN (select * from t_company where flag != 3) as ci on ci.id = ui.companyId
LEFT JOIN (SELECT COUNT(id) as num,userId from t_order_private_car where FIND_IN_SET(state,'8,9') GROUP BY userId) as ot on ot.userId = ui.id
+ LEFT JOIN (SELECT COUNT(id) as num,userId from t_order_logistics where FIND_IN_SET(state,'8,9') GROUP BY userId) as ol on ol.userId = ui.id
LEFT JOIN (SELECT sum(money) as num,userId from t_pub_transaction_details where userType = 1 and type = 1 and state = 2 GROUP BY userId) as td on td.userId = ui.id
) as o
<where>
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSmsrecord.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSmsrecord.java
index 1f84b40..1f4222e 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSmsrecord.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSmsrecord.java
@@ -44,7 +44,7 @@
/**
* 添加时间
*/
- private Date createTime;
+ private Date insertTime;
public Integer getId() {
@@ -86,15 +86,15 @@
public void setContent(String content) {
this.content = content;
}
-
- public Date getCreateTime() {
- return createTime;
+
+ public Date getInsertTime() {
+ return insertTime;
}
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
}
-
+
@Override
protected Serializable pkVal() {
return this.id;
@@ -108,7 +108,7 @@
", phone=" + phone +
", code=" + code +
", content=" + content +
- ", createTime=" + createTime +
+ ", insertTime=" + insertTime +
"}";
}
}
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java
index 36b17a4..2568a8e 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java
@@ -33,7 +33,8 @@
@Override
public List<Map<String, Object>> getDriverList(Page<Map<String, Object>> page, Integer roleType,Integer nowUserId,String beginTime, String endTime, String companyName, String phone, String name, Integer addType, Integer authState,Integer state,Integer teamId) {
- return this.baseMapper.getDriverList(page,roleType,nowUserId, beginTime, endTime, companyName, phone, name, addType, authState,state,teamId);
+ List<Map<String, Object>> driverList = this.baseMapper.getDriverList(page, roleType, nowUserId, beginTime, endTime, companyName, phone, name, addType, authState, state, teamId);
+ return driverList;
}
@Override
diff --git a/ManagementIGOTravel/guns-admin/src/main/resources/application-dev.yml b/ManagementIGOTravel/guns-admin/src/main/resources/application-dev.yml
index 05599c5..2bc611b 100644
--- a/ManagementIGOTravel/guns-admin/src/main/resources/application-dev.yml
+++ b/ManagementIGOTravel/guns-admin/src/main/resources/application-dev.yml
@@ -27,6 +27,8 @@
multipart:
max-request-size: 100MB
max-file-size: 100MB
+ profiles:
+ active: dev
mybatis-plus:
type-aliases-package: com.stylefeng.guns.modular.system.model
@@ -42,10 +44,9 @@
spring:
datasource:
- url: jdbc:mysql://127.0.0.1:3306/igotravel2.0?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B0
- username: root
-# password: HjKbXilb9zajmXbl
- password: 123456
+ url: jdbc:mysql://34.35.60.126:3306/igotravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B0
+ username: xiwang
+ password: HjKbXilb9zajmXbl
db-name: igotravel #用来搜集数据库的所有表
filters: wall,mergeStat
@@ -54,8 +55,8 @@
guns:
muti-datasource:
open: false
- url: jdbc:mysql://127.0.0.1:3306/igotravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B0
- username: root
+ url: jdbc:mysql://34.35.60.126:3306/igotravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B0
+ username: xiwang
password: HjKbXilb9zajmXbl
dataSourceNames:
- dataSourceGuns
diff --git a/ManagementIGOTravel/guns-admin/src/main/resources/application.yml b/ManagementIGOTravel/guns-admin/src/main/resources/application.yml
index 65a512b..0fda6ec 100644
--- a/ManagementIGOTravel/guns-admin/src/main/resources/application.yml
+++ b/ManagementIGOTravel/guns-admin/src/main/resources/application.yml
@@ -1,3 +1,3 @@
spring:
profiles:
- active: "@spring.active@"
\ No newline at end of file
+ active: "@spring.active@"
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity.html
index e71272a..9fa8dcb 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity.html
@@ -39,9 +39,6 @@
@if(shiro.hasPermission("/sysCouponActivity/add")){
<#button name="添加" icon="fa-plus" clickFun="SysCouponActivity.openAddSysCouponActivity()"/>
@}
- @if(shiro.hasPermission("/sysCouponActivity/update")){
- <#button name="编辑" icon="fa-edit" clickFun="SysCouponActivity.openSysCouponActivityDetail()" space="true"/>
- @}
@if(shiro.hasPermission("/sysCouponActivity/delete")){
<#button name="删除记录" icon="fa-remove" clickFun="SysCouponActivity.delete()" space="true"/>
@}
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/platformEdit.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/platformEdit.html
index da0d383..9c485aa 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/platformEdit.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/platformEdit.html
@@ -6,10 +6,10 @@
<input type="hidden" id="userId" name="userId" value="${user.id}">
<div class="row">
<div class="col-sm-6 b-r">
- <#input id="name" name="分公司名称" value="${item.name}" />
- <#input id="code" name="分公司代码" value="${item.code}" />
- <#input id="principalName" name="分公司负责人" value="${item.principalName}" />
- <#input id="adminName" name="分公司管理人" value="${item.adminName}" />
+ <#input id="name" name="公司名称" value="${item.name}" />
+ <#input id="code" name="公司代码" value="${item.code}" />
+ <#input id="principalName" name="公司负责人" value="${item.principalName}" />
+ <#input id="adminName" name="公司管理人" value="${item.adminName}" />
<#input id="documentAddress" name="行政文书送达地址" value="${item.documentAddress}" />
<#input id="setupTime" name="服务机构设立日期" value="${item.setupTime}" />
<#input id="licenseNumber" name="网络预约出租汽<br>车经营许可证号" value="${item.licenseNumber}" />
@@ -24,8 +24,8 @@
</div>
<div class="col-sm-6">
- <#input id="scopeCode" name="分公司区划代码" value="${item.scopeCode}"/>
- <#input id="detailAddress" name="分公司具体地址" value="${item.detailAddress}"/>
+ <#input id="scopeCode" name="公司区划代码" value="${item.scopeCode}"/>
+ <#input id="detailAddress" name="公司具体地址" value="${item.detailAddress}"/>
<#input id="principalPhone" name="负责人电话" value="${item.principalPhone}"/>
<#input id="adminPhone" name="管理员电话" value="${item.adminPhone}"/>
<#input id="urgentPhoen" name="紧急联系电话" value="${item.urgentPhoen}"/>
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html
index da9a9b3..249ed4e 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html
@@ -16,11 +16,15 @@
<input type="radio" id="companyType1" value="1" name="companyType" checked="" onclick="YesDriverInfoDlg.companyTypeClick(1)">
<label for="companyType1"> 平台司机 </label>
</div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="companyTyp2" value="2" name="companyType" onclick="YesDriverInfoDlg.companyTypeClick(2)">
+ <label for="companyTyp2"> 分公司司机 </label>
+ </div>
<div class="radio radio-success radio-inline">
- <input type="radio" id="companyTyp2" value="2" name="companyType" onclick="YesDriverInfoDlg.companyTypeClick(2)">
- <label for="companyTyp2"> 加盟司机 </label>
+ <input type="radio" id="companyTyp3" value="3" name="companyType" onclick="YesDriverInfoDlg.companyTypeClick(3)">
+ <label for="companyTyp3"> 加盟司机 </label>
</div>
- <select class="form-control companyDiv" id="oneId" onchange="YesDriverInfoDlg.oneChange(this)" style="width: 200px;display: none;" >
+ <select class="form-control companyDiv" id="oneId" style="width: 200px;display: none;" >
<option value="">选择所属分公司</option>
@for(obj in companyList!){
<option value="${obj.id}">${obj.name}</option>
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html
index 8d7c0a2..2c3c08b 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html
@@ -17,11 +17,15 @@
<input type="radio" id="companyType1" value="1" name="companyType" ${1 == companyType ? 'checked=checked' : ''} onclick="YesDriverInfoDlg.companyTypeClick(1)">
<label for="companyType1"> 平台司机 </label>
</div>
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="companyType2" value="2" name="companyType" ${2 == companyType ? 'checked=checked' : ''} onclick="YesDriverInfoDlg.companyTypeClick(2)">
+ <label for="companyType2"> 平台司机 </label>
+ </div>
<div class="radio radio-success radio-inline">
- <input type="radio" id="companyTyp2" value="2" name="companyType" ${2 == companyType ? 'checked=checked' : ''} onclick="YesDriverInfoDlg.companyTypeClick(2)">
- <label for="companyTyp2"> 加盟司机 </label>
+ <input type="radio" id="companyTyp3" value="3" name="companyType" ${3 == companyType ? 'checked=checked' : ''} onclick="YesDriverInfoDlg.companyTypeClick(3)">
+ <label for="companyTyp3"> 加盟司机 </label>
</div>
- <select class="form-control companyDiv" id="oneId" onchange="YesDriverInfoDlg.oneChange(this)" style="width: 200px">
+ <select class="form-control companyDiv" id="oneId" style="width: 200px">
<option value="">选择所属分公司</option>
@for(obj in companyList!){
<option value="${obj.id}" ${obj.id == item.companyId ? 'selected=selected' : ''}>${obj.name}</option>
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tPubWithdrawal/tPubWithdrawal.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tPubWithdrawal/tPubWithdrawal.html
index b0b61a6..eae4e20 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tPubWithdrawal/tPubWithdrawal.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tPubWithdrawal/tPubWithdrawal.html
@@ -27,6 +27,7 @@
<option value="">全部</option>
<option value="1">活动收入提现</option>
<option value="2">业务收入提现</option>
+ <option value="3">钱包余额提现</option>
</#SelectCon>
</div>
<div class="col-sm-3">
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html
index 2113d9e..3c99847 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html
@@ -43,7 +43,7 @@
<div class="form-group">
<label class="col-sm-2 control-label">积分设置：</label>
<div class="col-sm-10">
- 消费一GHS积 <input type="text" oninput="checkIsInt(this)"
+ 消费 GHS 1.0 积 <input type="text" oninput="checkIsInt(this)"
@if(isNotEmpty(integral)){
value="${integral.integral}"
@}else{
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/pubTransactionDetails/userPubTransactionDetails.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/pubTransactionDetails/userPubTransactionDetails.js
index 7925986..d23efb2 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/pubTransactionDetails/userPubTransactionDetails.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/pubTransactionDetails/userPubTransactionDetails.js
@@ -20,9 +20,9 @@
{title: '用户昵称', field: 'nickName', visible: true, align: 'center', valign: 'middle'},
{title: '手机号码', field: 'phone', visible: true, align: 'center', valign: 'middle'},
{title: '类型', field: 'type', visible: true, align: 'center', valign: 'middle',formatter:function(value, row){
- if("1"==row.type){
+ if(1==row.type){
return "余额变更";
- }else if("2"==row.type){
+ }else if(2==row.type){
return "积分变更";
}else{
return ""
@@ -30,9 +30,9 @@
}},
{title: '数量', field: 'money', visible: true, align: 'center', valign: 'middle'},
{title: '状态', field: 'state', visible: true, align: 'center', valign: 'middle',formatter:function (value,row) {
- if("1"==row.state){
+ if(1==row.state){
return "增加";
- }else if("2"==row.state){
+ }else if(2==row.state){
return "减少";
}else{
return ""
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponActivity.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponActivity.js
index 9082e63..257f185 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponActivity.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponActivity.js
@@ -35,7 +35,6 @@
{title: '金额', field: 'money', visible: true, align: 'center', valign: 'middle'},
{title: '有效天数', field: 'effective', visible: true, align: 'center', valign: 'middle'},
{title: '领取人数', field: 'sendUserNum', visible: true, align: 'center', valign: 'middle'},
- {title: '备注', field: 'remark', visible: true, align: 'center', valign: 'middle'},
{title: '状态', field: 'status', visible: true, align: 'center', valign: 'middle',
formatter: function (value, row) {
if(value==1){
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponActivity_info.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponActivity_info.js
index e3ff17c..89f6556 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponActivity_info.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponActivity_info.js
@@ -261,7 +261,7 @@
* @param nickName
* @param phone
*/
-SysCouponActivityInfoDlg.selecUserOpt=function(id,companyName,nickName,phone){
+SysCouponActivityInfoDlg.selecUserOpt=function(selected){
//获取所有的值
var subArr=[];
$(".timeClass").each(function () {
@@ -271,17 +271,28 @@
});
for(var i=0;i<subArr.length;i++){
var userId = subArr[i].userId;
- if (userId == id) {
- Feng.info("用户已选择,请重新选择");
- return;
+ for (let j = 0; j < selected.length; j++) {
+ var id = selected[j].id;
+ if (userId == id) {
+ Feng.info("用户已选择,请重新选择");
+ return;
+ }
}
+
}
- console.log(subArr);
- var str = '<tr class="timeClass">' +
- '<td><input type="hidden" id="userId" name="userId" value="'+id+'"><input type="hidden" id="nickName" name="nickName" value="'+nickName+'">' + nickName + '</td>' +
- '<td><input type="hidden" id="phone" name="phone" value="'+phone+'">' + phone + '</td>' +
- '<td><input type="hidden" id="companyName" name="companyName" value="'+companyName+'">' + companyName + '</td><td><button onclick="deleteSub(this)">移除</button></td></tr>';
- $("#coun").append(str);
+
+ for (let i = 0; i < selected.length; i++) {
+ var id = selected[i].id;
+ var companyName = selected[i].companyName;
+ if(companyName==undefined)companyName="";
+ var nickName = selected[i].nickName;
+ var phone = selected[i].phone;
+ var str = '<tr class="timeClass">' +
+ '<td><input type="hidden" id="userId" name="userId" value="'+id+'"><input type="hidden" id="nickName" name="nickName" value="'+nickName+'">' + nickName + '</td>' +
+ '<td><input type="hidden" id="phone" name="phone" value="'+phone+'">' + phone + '</td>' +
+ '<td><input type="hidden" id="companyName" name="companyName" value="'+companyName+'">' + companyName + '</td><td><button onclick="deleteSub(this)">移除</button></td></tr>';
+ $("#coun").append(str);
+ }
}
function deleteSub(e) {
$(e).parent().parent().remove();
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysCouponActivity/tUser.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysCouponActivity/tUser.js
index 0cd92e3..f9ee125 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysCouponActivity/tUser.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysCouponActivity/tUser.js
@@ -20,7 +20,7 @@
*/
TUser.initColumn = function () {
return [
- {field: 'selectItem', radio: true},
+ {field: 'selectItem', radio: false},
{title: '注册时间', field: 'insertTime', visible: true, align: 'center', valign: 'middle',width:'10%',
formatter: function (value, row) {
var btn = "";
@@ -111,11 +111,11 @@
return btn;
}
},
- {title: '历史消费', field: 'consumption', visible: true, align: 'center', valign: 'middle',
+ {title: '历史消费', field: 'consumptionNum', visible: true, align: 'center', valign: 'middle',
formatter: function (value, row) {
var btn = "";
- if(row.consumption != '' && row.consumption != null) {
- btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="¥' + row.consumption + '" onfocus="TUser.tooltip()">¥' + row.consumption + '</p>']
+ if(row.consumptionNum != '' && row.consumptionNum != null) {
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="¥' + row.consumptionNum + '" onfocus="TUser.tooltip()">¥' + row.consumptionNum + '</p>']
}else {
btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="¥0" onfocus="TUser.tooltip()">¥0</p>']
}
@@ -191,17 +191,7 @@
Feng.info("请先选中表格中的某一记录！");
return false;
}
- var id = selected[0].id;
- var companyName = selected[0].companyName;
- if(companyName==undefined)companyName="";
- var nickName = selected[0].nickName;
- var phone = selected[0].phone;
- if ("" == id || null == id || undefined == id){
- Feng.info("请先选中表格中的某一记录！");
- return ;
- }
- var obj = $("#obj").val();
- window.parent.SysCouponActivityInfoDlg.selecUserOpt(id,companyName,nickName,phone);
+ window.parent.SysCouponActivityInfoDlg.selecUserOpt(selected);
TUser.close();
}
/**
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tAdvertisement/tAdvertisement_info.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tAdvertisement/tAdvertisement_info.js
index b1c0a76..189b9e4 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tAdvertisement/tAdvertisement_info.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tAdvertisement/tAdvertisement_info.js
@@ -393,7 +393,7 @@
}
}
- TAdvertisementInfoDlg.selecUserOpt1=function(id,companyName,nickName,phone){
+ TAdvertisementInfoDlg.selecUserOpt1=function(selected){
//获取所有的值
var subArr=[];
$(".timeClass").each(function () {
@@ -403,22 +403,33 @@
});
for(var i=0;i<subArr.length;i++){
var userId = subArr[i].userId;
- if (userId == id) {
- Feng.info("用户已选择,请重新选择");
- return;
+ for (let j = 0; j < selected.length; j++) {
+ var id = selected[j].id;
+ if (userId == id) {
+ Feng.info("用户已选择,请重新选择");
+ return;
+ }
}
}
- console.log(subArr);
- var str = '<tr class="timeClass">' +
- '<td><input type="hidden" id="userId" name="userId" value="'+id+'"><input type="hidden" id="nickName" name="nickName" value="'+nickName+'">' + nickName + '</td>' +
- '<td><input type="hidden" id="phone" name="phone" value="'+phone+'">' + phone + '</td>' +
- '<td><input type="hidden" id="companyName" name="companyName" value="'+companyName+'">' + companyName + '</td><td><button onclick="deleteSub1(this)">移除</button></td></tr>';
- $("#coun").append(str);
+
+
+ for (let i = 0; i < selected.length; i++) {
+ var id = selected[i].id;
+ var companyName = selected[i].companyName;
+ if(companyName==undefined)companyName="";
+ var nickName = selected[i].nickName;
+ var phone = selected[i].phone;
+ var str = '<tr class="timeClass">' +
+ '<td><input type="hidden" id="userId" name="userId" value="'+id+'"><input type="hidden" id="nickName" name="nickName" value="'+nickName+'">' + nickName + '</td>' +
+ '<td><input type="hidden" id="phone" name="phone" value="'+phone+'">' + phone + '</td>' +
+ '<td><input type="hidden" id="companyName" name="companyName" value="'+companyName+'">' + companyName + '</td><td><button onclick="deleteSub1(this)">移除</button></td></tr>';
+ $("#coun").append(str);
+ }
}
function deleteSub1(e) {
$(e).parent().parent().remove();
}
-TAdvertisementInfoDlg.selecUserOpt2=function(id,companyName,nickName,phone){
+TAdvertisementInfoDlg.selecUserOpt2=function(selected){
//获取所有的值
var subArr1=[];
$(".timeClass1").each(function () {
@@ -428,17 +439,27 @@
});
for(var i=0;i<subArr1.length;i++){
var userId = subArr1[i].userId;
- if (userId == id) {
- Feng.info("用户已选择,请重新选择");
- return;
+ for (let j = 0; j < selected.length; j++) {
+ var id = selected[j].id;
+ if (userId == id) {
+ Feng.info("用户已选择,请重新选择");
+ return;
+ }
}
}
- console.log(subArr1);
- var str = '<tr class="timeClass1">' +
- '<td><input type="hidden" id="userId" name="userId" value="'+id+'"><input type="hidden" id="nickName" name="nickName" value="'+nickName+'">' + nickName + '</td>' +
- '<td><input type="hidden" id="phone" name="phone" value="'+phone+'">' + phone + '</td>' +
- '<td><input type="hidden" id="companyName" name="companyName" value="'+companyName+'">' + companyName + '</td><td><button onclick="deleteSub2(this)">移除</button></td></tr>';
- $("#coun1").append(str);
+ for (let i = 0; i < selected.length; i++) {
+ var id = selected[i].id;
+ var companyName = selected[i].companyName;
+ if(companyName==undefined)companyName="";
+ var nickName = selected[i].firstName + ' ' + selected[i].lastName;
+ var phone = selected[i].phone;
+ var str = '<tr class="timeClass1">' +
+ '<td><input type="hidden" id="userId" name="userId" value="'+id+'"><input type="hidden" id="nickName" name="nickName" value="'+nickName+'">' + nickName + '</td>' +
+ '<td><input type="hidden" id="phone" name="phone" value="'+phone+'">' + phone + '</td>' +
+ '<td><input type="hidden" id="companyName" name="companyName" value="'+companyName+'">' + companyName + '</td><td><button onclick="deleteSub2(this)">移除</button></td></tr>';
+ $("#coun1").append(str);
+ }
+
}
function deleteSub2(e) {
$(e).parent().parent().remove();
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tAdvertisement/tAdvertisement_info_defined.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tAdvertisement/tAdvertisement_info_defined.js
index d608c23..856277d 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tAdvertisement/tAdvertisement_info_defined.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tAdvertisement/tAdvertisement_info_defined.js
@@ -256,7 +256,7 @@
}
}
-TAdvertisementInfoDlg.selecUserOpt1=function(id,companyName,nickName,phone){
+TAdvertisementInfoDlg.selecUserOpt1=function(selected){
//获取所有的值
var subArr=[];
$(".timeClass").each(function () {
@@ -266,17 +266,30 @@
});
for(var i=0;i<subArr.length;i++){
var userId = subArr[i].userId;
- if (userId == id) {
- Feng.info("用户已选择,请重新选择");
- return;
+ for (let j = 0; j < selected.length; j++) {
+ var id = selected[j].id;
+ if (userId == id) {
+ Feng.info("用户已选择,请重新选择");
+ return;
+ }
}
}
console.log(subArr);
- var str = '<tr class="timeClass">' +
- '<td><input type="hidden" id="userId" name="userId" value="'+id+'"><input type="hidden" id="nickName" name="nickName" value="'+nickName+'">' + nickName + '</td>' +
- '<td><input type="hidden" id="phone" name="phone" value="'+phone+'">' + phone + '</td>' +
- '<td><input type="hidden" id="companyName" name="companyName" value="'+companyName+'">' + companyName + '</td><td><button onclick="deleteSub(this)">移除</button></td></tr>';
- $("#coun").append(str);
+ for (let i = 0; i < selected.length; i++) {
+ var id = selected[i].id;
+ var companyName = selected[i].companyName;
+ if(companyName==undefined)companyName="";
+ var nickName = selected[i].nickName;
+ var phone = selected[i].phone;
+ var str = '<tr class="timeClass">' +
+ '<td><input type="hidden" id="userId" name="userId" value="'+id+'"><input type="hidden" id="nickName" name="nickName" value="'+nickName+'">' + nickName + '</td>' +
+ '<td><input type="hidden" id="phone" name="phone" value="'+phone+'">' + phone + '</td>' +
+ '<td><input type="hidden" id="companyName" name="companyName" value="'+companyName+'">' + companyName + '</td><td><button onclick="deleteSub(this)">移除</button></td></tr>';
+ $("#coun").append(str);
+ }
+
+
+
}
function deleteSub(e) {
$(e).parent().parent().remove();
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tAdvertisement/tUser.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tAdvertisement/tUser.js
index 8a03d9c..e516edf 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tAdvertisement/tUser.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tAdvertisement/tUser.js
@@ -20,7 +20,7 @@
*/
TUser.initColumn = function () {
return [
- {field: 'selectItem', radio: true},
+ {field: 'selectItem', radio: false},
{title: '注册时间', field: 'insertTime', visible: true, align: 'center', valign: 'middle',width:'10%',
formatter: function (value, row) {
var btn = "";
@@ -191,17 +191,13 @@
Feng.info("请先选中表格中的某一记录！");
return false;
}
- var id = selected[0].id;
- var companyName = selected[0].companyName;
- if(companyName==undefined)companyName="";
- var nickName = selected[0].nickName;
- var phone = selected[0].phone;
- if ("" == id || null == id || undefined == id){
+
+ if (selected.length == 0){
Feng.info("请先选中表格中的某一记录！");
return ;
}
var obj = $("#obj").val();
- window.parent.TAdvertisementInfoDlg.selecUserOpt1(id,companyName,nickName,phone);
+ window.parent.TAdvertisementInfoDlg.selecUserOpt1(selected);
TUser.close();
}
/**
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tAdvertisement/yesDriver.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tAdvertisement/yesDriver.js
index d625777..12c1334 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tAdvertisement/yesDriver.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tAdvertisement/yesDriver.js
@@ -14,7 +14,7 @@
*/
YesDriver.initColumn = function () {
return [
- {field: 'selectItem', radio: true},
+ {field: 'selectItem', radio: false},
{title: '主键ID', field: 'id', visible: false, align: 'center', valign: 'middle'},
{title: '添加时间', field: 'insertTime', visible: true, align: 'center', valign: 'middle',width:'7%',
formatter: function (value, row) {
@@ -279,21 +279,11 @@
};
YesDriver.selectUserOpt = function () {
var selected = $('#' + this.id).bootstrapTable('getSelections');
- if (selected.length == 0) {
- Feng.info("请先选中表格中的某一记录！");
- return false;
- }
- var id = selected[0].id;
- var companyName = selected[0].companyName;
- if(companyName==undefined)companyName="";
- var nickName = selected[0].firstName + ' ' + selected[0].lastName;
- var phone = selected[0].phone;
- if ("" == id || null == id || undefined == id){
+ if (selected.length == 0){
Feng.info("请先选中表格中的某一记录！");
return ;
}
- var obj = $("#obj").val();
- window.parent.TAdvertisementInfoDlg.selecUserOpt2(id,companyName,nickName,phone);
+ window.parent.TAdvertisementInfoDlg.selecUserOpt2(selected);
YesDriver.close();
}
@@ -567,7 +557,7 @@
window.location.href = Feng.ctxPath + "/tDriver/uploadDriverModel";
}
-var agreement = function(){
+var agreement = function(){
this.init = function(){
//模拟上传excel
$("#uploadEventBtn").unbind("click").bind("click",function(){
@@ -595,7 +585,7 @@
}
}
}
-YesDriver.sendAjaxRequest = function(url,type,data){
+YesDriver.sendAjaxRequest = function(url,type,data){
$.ajax({
url : url,
type : type,
@@ -649,7 +639,7 @@
}
};
-var agreement;
+var agreement;
$(function(){
agreement = new agreement();
agreement.init();
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver_info.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver_info.js
index f4468d3..0f6c1fa 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver_info.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver_info.js
@@ -730,9 +730,14 @@
*/
YesDriverInfoDlg.companyTypeClick = function (e) {
if (1 == e){
- $("#companyDiv").hide();
+ $("#oneId").hide();
+ $("#twoId").hide();
} else if (2 == e){
- $("#companyDiv").show();
+ $("#oneId").show();
+ $("#twoId").hide();
+ }else if (3 == e){
+ $("#oneId").hide();
+ $("#twoId").show();
}
}
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tOrderLogistics/tOrderLogistics.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tOrderLogistics/tOrderLogistics.js
index 7987c32..492ec0c 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tOrderLogistics/tOrderLogistics.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tOrderLogistics/tOrderLogistics.js
@@ -173,11 +173,11 @@
},
{title: '订单金额', field: 'orderMoney', visible: true, align: 'center', valign: 'middle',
formatter: function (value, row) {
- var btn = "";
+ var btn = "0";
if(row.orderMoney != '' && row.orderMoney != null) {
btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.orderMoney + '" onfocus="TUser.tooltip()">' + row.orderMoney + '</p>']
}
- if(row.state == 10){
+ if(row.state == 10 && row.cancel_money != null){
btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.cancel_money + '" onfocus="TUser.tooltip()">' + row.cancel_money + '</p>']
}
return btn;
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js
index b4977b9..5e091dc 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js
@@ -169,11 +169,11 @@
},
{title: '订单金额', field: 'orderMoney', visible: true, align: 'center', valign: 'middle',
formatter: function (value, row) {
- var btn = "";
+ var btn = "0";
if(row.orderMoney != '' && row.orderMoney != null) {
btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.orderMoney + '" onfocus="TUser.tooltip()">' + row.orderMoney + '</p>']
}
- if(row.state == 10){
+ if(row.state == 10 && row.cancel_money != null){
btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.cancel_money + '" onfocus="TUser.tooltip()">' + row.cancel_money + '</p>']
}
return btn;
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tPubWithdrawal/tPubWithdrawal.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tPubWithdrawal/tPubWithdrawal.js
index 330b316..a4effde 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tPubWithdrawal/tPubWithdrawal.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tPubWithdrawal/tPubWithdrawal.js
@@ -86,7 +86,7 @@
formatter: function (value, row) {
var btn = "";
if(row.money != '' && row.money != null) {
- btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.money + '" onfocus="TUser.tooltip()">' + row.money + '</p>']
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + (row.balance - row.money).toFixed(2) + '" onfocus="TUser.tooltip()">' + (row.balance - row.money).toFixed(2) + '</p>']
}else if (row.withdrawalType == 2){
btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="0" onfocus="TUser.tooltip()">0</p>']
}
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/smallPieceLogistics.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/smallPieceLogistics.js
index c79c585..cc500e1 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/smallPieceLogistics.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/smallPieceLogistics.js
@@ -43,7 +43,7 @@
if(row.reason != '' && row.reason != null) {
var str = row.reason;
if (str.length > 20){
- str = str.substring(0,20)+'...<br><button class="btn btn-outline btn-primary" onclick="TReassign.buttonClick(' + row.id + ',1)">查看更多</button>';
+ str = str.substring(0,20)+'...<br><button class="btn btn-outline btn-primary" onclick="TReassign.buttonClick(' + row.id + ')">查看更多</button>';
}
btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.reason + '" onfocus="TUser.tooltip()">' + str + '</p>']
}
@@ -289,6 +289,18 @@
}
};
+TReassign.buttonClick = function (id) {
+ var index = layer.open({
+ type: 2,
+ title: '查看详情',
+ area: ['800px', '420px'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/tReassign/lookDetail/'+id
+ });
+ this.layerIndex = index;
+}
+
/**
* 查询专车改派管理列表
*/
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/tReassign.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/tReassign.js
index c12e44f..b453114 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/tReassign.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/tReassign.js
@@ -43,7 +43,7 @@
if(row.reason != '' && row.reason != null) {
var str = row.reason;
if (str.length > 20){
- str = str.substring(0,20)+'...<br><button class="btn btn-outline btn-primary" onclick="TReassign.buttonClick(' + row.id + ',1)">查看更多</button>';
+ str = str.substring(0,20)+'...<br><button class="btn btn-outline btn-primary" onclick="TReassign.buttonClick(' + row.id + ')">查看更多</button>';
}
btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.reason + '" onfocus="TUser.tooltip()">' + str + '</p>']
}
@@ -289,6 +289,20 @@
}
};
+
+TReassign.buttonClick = function (id) {
+ var index = layer.open({
+ type: 2,
+ title: '查看详情',
+ area: ['800px', '420px'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/tReassign/lookDetail/'+id
+ });
+ this.layerIndex = index;
+}
+
+
/**
* 查询专车改派管理列表
*/
--
Gitblit v1.7.1