From 503bc89c55d675a27b689419aa906a070ca5cb03 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 24 五月 2024 09:33:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_addFranchisee.html | 34 ++
ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/tCompany_info.js | 80 ++++
ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java | 20 +
ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java | 5
ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java | 142 ++++----
ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_add.html | 15
ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html | 4
ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml | 5
ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html | 194 ++++++-----
ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/franchisee_info.js | 80 ++++
ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TInvoice.java | 11
ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html | 4
ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_edit.html | 16 +
ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detailFranchisee.html | 46 ++
ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tCar/tCar_info.js | 15
ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_updateFranchisee.html | 46 ++
ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detail.html | 40 ++
ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_add.html | 28 +
ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tInvoice/tInvoice.js | 13
ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCompany.java | 36 ++
ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarMapper.xml | 2
ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysReformist.java | 36 ++
ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_add.html | 33 ++
ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_edit.html | 45 ++
24 files changed, 790 insertions(+), 160 deletions(-)
diff --git a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java
index 62e2c9e..1b4fe1a 100644
--- a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java
+++ b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java
@@ -126,6 +126,8 @@
model.addAttribute("zcModelList",zcModelList);
List<TServerCarmodel> kcModelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 2).eq("state", 1));
model.addAttribute("kcModelList",kcModelList);
+ List<TServerCarmodel> jsjModelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 7).eq("state", 1));
+ model.addAttribute("jsjModelList",jsjModelList);
return PREFIX + "tCar_add.html";
}
@@ -184,8 +186,10 @@
Integer four = 1;
Integer five = 1;
Integer six = 1;
+ Integer seven = 1;
Integer zcModel = 0;
Integer kcModel = 0;
+ Integer jsjModel = 0;
for (TCarService obj : serviceList){
if (obj.getType() == 1){
one = 2;
@@ -207,6 +211,10 @@
if (obj.getType() == 6){
six = 2;
}
+ if (obj.getType() == 7){
+ seven = 2;
+ jsjModel = obj.getServerCarModelId();
+ }
}
model.addAttribute("one",one);
model.addAttribute("two",two);
@@ -214,13 +222,17 @@
model.addAttribute("four",four);
model.addAttribute("five",five);
model.addAttribute("six",six);
+ model.addAttribute("seven",seven);
model.addAttribute("zcModel",zcModel);
model.addAttribute("kcModel",kcModel);
+ model.addAttribute("jsjModel",jsjModel);
List<TServerCarmodel> zcModelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
model.addAttribute("zcModelList",zcModelList);
List<TServerCarmodel> kcModelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 2).eq("state", 1));
model.addAttribute("kcModelList",kcModelList);
+ List<TServerCarmodel> jsjModelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 7).eq("state", 1));
+ model.addAttribute("jsjModelList",jsjModelList);
//车辆品牌
List<TCarBrand> brandList = tCarBrandService.selectList(new EntityWrapper<TCarBrand>().eq("state", 1));
@@ -393,7 +405,7 @@
*/
@RequestMapping(value = "/add")
@ResponseBody
- public Object add(TCar tCar,@RequestParam String serverBox,Integer roleType,Integer companyType,Integer oneId,Integer twoId,Integer franchiseeId,String zcModel,String kcModel) {
+ public Object add(TCar tCar,@RequestParam String serverBox,Integer roleType,Integer companyType,Integer oneId,Integer twoId,Integer franchiseeId,String zcModel,String kcModel,String jsjModel) {
if (1 == roleType){ //平台
if (2 == companyType.intValue()){
if (SinataUtil.isNotEmpty(oneId)){
@@ -445,6 +457,8 @@
service.setServerCarModelId(Integer.valueOf(zcModel));
}else if (3 == service.getType()){
service.setServerCarModelId(Integer.valueOf(kcModel));
+ }else if (7 == service.getType()){
+ service.setServerCarModelId(Integer.valueOf(jsjModel));
}
tCarServiceService.insert(service);
}
@@ -495,7 +509,7 @@
*/
@RequestMapping(value = "/update")
@ResponseBody
- public Object update(TCar tCar,@RequestParam String serverBox,Integer roleType,Integer companyType,Integer oneId,Integer twoId,Integer franchiseeId,String zcModel,String kcModel) {
+ public Object update(TCar tCar,@RequestParam String serverBox,Integer roleType,Integer companyType,Integer oneId,Integer twoId,Integer franchiseeId,String zcModel,String kcModel,String jsjModel) {
if (1 == roleType){ //平台
if (2 == companyType.intValue()){
if (SinataUtil.isNotEmpty(oneId)){
@@ -539,6 +553,8 @@
service.setServerCarModelId(Integer.valueOf(zcModel));
}else if (3 == service.getType()){
service.setServerCarModelId(Integer.valueOf(kcModel));
+ }else if (7 == service.getType()){
+ service.setServerCarModelId(Integer.valueOf(jsjModel));
}
tCarServiceService.insert(service);
}
diff --git a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
index 0026117..f989ac3 100644
--- a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
+++ b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
@@ -207,6 +207,7 @@
Integer four = 1;
Integer five = 1;
Integer six = 1;
+ Integer seven = 1;
for (TDriverService obj : serviceList){
if (obj.getType() == 1){
one = 2;
@@ -226,6 +227,9 @@
if (obj.getType() == 6){
six = 2;
}
+ if (obj.getType() == 7){
+ seven = 2;
+ }
}
model.addAttribute("one",one);
model.addAttribute("two",two);
@@ -233,6 +237,7 @@
model.addAttribute("four",four);
model.addAttribute("five",five);
model.addAttribute("six",six);
+ model.addAttribute("seven",seven);
//查询线路列表
List<TLine> lineList = itLineService.selectList(new EntityWrapper<TLine>().eq("state", 1));
diff --git a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
index e9fe3e2..f1edc44 100644
--- a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
+++ b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
@@ -73,21 +73,21 @@
TSysPushOrder zcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 1).eq("type", 3));
model.addAttribute("zcThree",zcThree);
- //出租车推单(第一轮)
- TSysPushOrder czcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 1));
- model.addAttribute("czcOne",czcOne);
- //出租车推单(第二轮)
- TSysPushOrder czcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 2));
- model.addAttribute("czcTwo",czcTwo);
- //出租车推单(第三轮)
- TSysPushOrder czcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 3));
- model.addAttribute("czcThree",czcThree);
+ //接送机推单(第一轮)
+ TSysPushOrder jsjOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 7).eq("type", 1));
+ model.addAttribute("jsjOne",jsjOne);
+ //接送机推单(第二轮)
+ TSysPushOrder jsjTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 7).eq("type", 2));
+ model.addAttribute("jsjTwo",jsjTwo);
+ //接送机推单(第三轮)
+ TSysPushOrder jsjThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 7).eq("type", 3));
+ model.addAttribute("jsjThree",jsjThree);
//普通取消设置(专车)
TSysCancleOrder ptCancel1 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 1));
model.addAttribute("ptCancel1",ptCancel1);
- //普通取消设置(出租车)
- TSysCancleOrder ptCancel2 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 2));
+ //普通取消设置(接送机)
+ TSysCancleOrder ptCancel2 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 7));
model.addAttribute("ptCancel2",ptCancel2);
//普通取消设置(跨城出行)
TSysCancleOrder ptCancel3 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 3));
@@ -96,8 +96,8 @@
//预约取消设置(专车)
TSysCancleOrder yyCancel1 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 2).eq("orderType", 1));
model.addAttribute("yyCancel1",yyCancel1);
- //预约取消设置(出租车)
- TSysCancleOrder yyCancel2 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 2).eq("orderType", 2));
+ //预约取消设置(接送机)
+ TSysCancleOrder yyCancel2 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 2).eq("orderType", 7));
model.addAttribute("yyCancel2",yyCancel2);
//报警电话
@@ -119,22 +119,24 @@
@RequestMapping(value = "/setUp")
@ResponseBody
public Object setUp(@RequestParam BigDecimal one, @RequestParam Integer two, @RequestParam Integer three, @RequestParam Integer openValue,
- @RequestParam Integer isSpecialCar,@RequestParam Integer isTaxiCar,
+ @RequestParam Integer isSpecialCar,@RequestParam Integer isTaxiCar,@RequestParam Integer isTransfer,
@RequestParam Double zc1,@RequestParam Integer zc2,@RequestParam Double zc3,
@RequestParam Double zc4,@RequestParam Integer zc5,@RequestParam Double zc6,
@RequestParam Double zc7,@RequestParam Integer zc8,@RequestParam Double zc9,
- @RequestParam Double czc1,@RequestParam Integer czc2,@RequestParam Double czc3,
- @RequestParam Double czc4,@RequestParam Integer czc5,@RequestParam Double czc6,
- @RequestParam Double czc7,@RequestParam Integer czc8,@RequestParam Double czc9,
+ @RequestParam Double jsj1,@RequestParam Integer jsj2,@RequestParam Double jsj3,
+ @RequestParam Double jsj4,@RequestParam Integer jsj5,@RequestParam Double jsj6,
+ @RequestParam Double jsj7,@RequestParam Integer jsj8,@RequestParam Double jsj9,
@RequestParam Integer ptCancel1,@RequestParam BigDecimal ptCancel2,@RequestParam Integer ptCancel3,@RequestParam BigDecimal ptCancel4,@RequestParam Integer ptCancel5,@RequestParam BigDecimal ptCancel6,
@RequestParam Integer yyCancel1,@RequestParam BigDecimal yyCancel2,@RequestParam Integer yyCancel3,@RequestParam BigDecimal yyCancel4,
- @RequestParam String phone1,@RequestParam String phone2,@RequestParam String phone3) {
+ @RequestParam String phone1,@RequestParam String phone2,@RequestParam String phone3,@RequestParam String userQrCode,@RequestParam String driverQrCode) {
//改派设置
TSysReformist reformist = tSysReformistService.selectOne(new EntityWrapper<TSysReformist>().eq("companyId", ShiroKit.getUser().getObjectId()));
if (SinataUtil.isNotEmpty(reformist)){
reformist.setMoney(one);
reformist.setIsSpecialCar(isSpecialCar);
reformist.setIsTaxiCar(isTaxiCar);
+ reformist.setUserQrCode(userQrCode);
+ reformist.setDriverQrCode(driverQrCode);
tSysReformistService.updateById(reformist);
}else{
reformist = new TSysReformist();
@@ -142,6 +144,8 @@
reformist.setMoney(one);
reformist.setIsSpecialCar(isSpecialCar);
reformist.setIsTaxiCar(isTaxiCar);
+ reformist.setUserQrCode(userQrCode);
+ reformist.setDriverQrCode(driverQrCode);
tSysReformistService.insert(reformist);
}
@@ -223,56 +227,56 @@
tSysPushOrderService.insert(zcThree);
}
- //出租车推单(第一轮)
- TSysPushOrder czcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 1));
- if (SinataUtil.isNotEmpty(czcOne)){
- czcOne.setPushDistance(czc1);
- czcOne.setPushTime(czc2);
- czcOne.setDriverProportion(czc3);
- tSysPushOrderService.updateById(czcOne);
+ //接送机推单(第一轮)
+ TSysPushOrder jsjOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 7).eq("type", 1));
+ if (SinataUtil.isNotEmpty(jsjOne)){
+ jsjOne.setPushDistance(jsj1);
+ jsjOne.setPushTime(jsj2);
+ jsjOne.setDriverProportion(jsj3);
+ tSysPushOrderService.updateById(jsjOne);
}else{
- czcOne = new TSysPushOrder();
- czcOne.setPushDistance(czc1);
- czcOne.setPushTime(czc2);
- czcOne.setDriverProportion(czc3);
- czcOne.setCompanyId(ShiroKit.getUser().getObjectId());
- czcOne.setPushType(2);
- czcOne.setType(1);
- tSysPushOrderService.insert(czcOne);
+ jsjOne = new TSysPushOrder();
+ jsjOne.setPushDistance(jsj1);
+ jsjOne.setPushTime(jsj2);
+ jsjOne.setDriverProportion(jsj3);
+ jsjOne.setCompanyId(ShiroKit.getUser().getObjectId());
+ jsjOne.setPushType(7);
+ jsjOne.setType(1);
+ tSysPushOrderService.insert(jsjOne);
}
- //出租车推单(第二轮)
- TSysPushOrder czcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 2));
- if (SinataUtil.isNotEmpty(czcTwo)){
- czcTwo.setPushDistance(czc4);
- czcTwo.setPushTime(czc5);
- czcTwo.setDriverProportion(czc6);
- tSysPushOrderService.updateById(czcTwo);
+ //接送机推单(第二轮)
+ TSysPushOrder jsjTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 7).eq("type", 2));
+ if (SinataUtil.isNotEmpty(jsjTwo)){
+ jsjTwo.setPushDistance(jsj4);
+ jsjTwo.setPushTime(jsj5);
+ jsjTwo.setDriverProportion(jsj6);
+ tSysPushOrderService.updateById(jsjTwo);
}else{
- czcTwo = new TSysPushOrder();
- czcTwo.setPushDistance(czc4);
- czcTwo.setPushTime(czc5);
- czcTwo.setDriverProportion(czc6);
- czcTwo.setCompanyId(ShiroKit.getUser().getObjectId());
- czcTwo.setPushType(2);
- czcTwo.setType(2);
- tSysPushOrderService.insert(czcTwo);
+ jsjTwo = new TSysPushOrder();
+ jsjTwo.setPushDistance(jsj4);
+ jsjTwo.setPushTime(jsj5);
+ jsjTwo.setDriverProportion(jsj6);
+ jsjTwo.setCompanyId(ShiroKit.getUser().getObjectId());
+ jsjTwo.setPushType(7);
+ jsjTwo.setType(2);
+ tSysPushOrderService.insert(jsjTwo);
}
- //出租车推单(第三轮)
- TSysPushOrder czcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 3));
- if (SinataUtil.isNotEmpty(czcThree)){
- czcThree.setPushDistance(czc7);
- czcThree.setPushTime(czc8);
- czcThree.setDriverProportion(czc9);
- tSysPushOrderService.updateById(czcThree);
+ //接送机推单(第三轮)
+ TSysPushOrder jsjThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 7).eq("type", 3));
+ if (SinataUtil.isNotEmpty(jsjThree)){
+ jsjThree.setPushDistance(jsj7);
+ jsjThree.setPushTime(jsj8);
+ jsjThree.setDriverProportion(jsj9);
+ tSysPushOrderService.updateById(jsjThree);
}else{
- czcThree = new TSysPushOrder();
- czcThree.setPushDistance(czc7);
- czcThree.setPushTime(czc8);
- czcThree.setDriverProportion(czc9);
- czcThree.setCompanyId(ShiroKit.getUser().getObjectId());
- czcThree.setPushType(2);
- czcThree.setType(3);
- tSysPushOrderService.insert(czcThree);
+ jsjThree = new TSysPushOrder();
+ jsjThree.setPushDistance(jsj7);
+ jsjThree.setPushTime(jsj8);
+ jsjThree.setDriverProportion(jsj9);
+ jsjThree.setCompanyId(ShiroKit.getUser().getObjectId());
+ jsjThree.setPushType(7);
+ jsjThree.setType(3);
+ tSysPushOrderService.insert(jsjThree);
}
//普通取消设置(专车)
@@ -291,8 +295,8 @@
tSysCancleOrderService.insert(ptCancelOne);
}
- //普通取消设置(出租车)
- TSysCancleOrder ptCancelTwo = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 2));
+ //普通取消设置(接送机)
+ TSysCancleOrder ptCancelTwo = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 7));
if (SinataUtil.isNotEmpty(ptCancelTwo)){
ptCancelTwo.setMinuteNum(ptCancel3);
ptCancelTwo.setMoney(ptCancel4);
@@ -303,7 +307,7 @@
ptCancelTwo.setMoney(ptCancel4);
ptCancelTwo.setCompanyId(ShiroKit.getUser().getObjectId());
ptCancelTwo.setType(1);
- ptCancelTwo.setOrderType(2);
+ ptCancelTwo.setOrderType(7);
tSysCancleOrderService.insert(ptCancelTwo);
}
@@ -338,8 +342,8 @@
yyCancelOne.setOrderType(1);
tSysCancleOrderService.insert(yyCancelOne);
}
- //预约取消设置(出租车)
- TSysCancleOrder yyCancelTwo = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 2).eq("orderType", 2));
+ //预约取消设置(接送机)
+ TSysCancleOrder yyCancelTwo = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 2).eq("orderType", 7));
if (SinataUtil.isNotEmpty(yyCancelTwo)){
yyCancelTwo.setMinuteNum(yyCancel3);
yyCancelTwo.setMoney(yyCancel4);
@@ -350,7 +354,7 @@
yyCancelTwo.setMoney(yyCancel4);
yyCancelTwo.setCompanyId(ShiroKit.getUser().getObjectId());
yyCancelTwo.setType(2);
- yyCancelTwo.setOrderType(2);
+ yyCancelTwo.setOrderType(7);
tSysCancleOrderService.insert(yyCancelTwo);
}
diff --git a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarMapper.xml b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarMapper.xml
index 42e6e9c..9c7ef43 100644
--- a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarMapper.xml
+++ b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarMapper.xml
@@ -67,6 +67,7 @@
when type = 4 then '小件物流-同城'
when type = 5 then '小件物流-跨城'
when type = 6 then '包车'
+ when type = 7 then '接送机'
else '' end ) as serverStr,carId from t_car_service GROUP BY carId) as ds on ds.carId = cc.id
LEFT JOIN (select * from t_driver where flag != 3) AS dd on dd.carId = cc.id) as o
<where>
@@ -127,6 +128,7 @@
when type = 4 then '小件物流-同城'
when type = 5 then '小件物流-跨城'
when type = 6 then '包车'
+ when type = 7 then '接送机'
else '' end ) as serverStr,carId from t_car_service GROUP BY carId) as ds on ds.carId = cc.id
LEFT JOIN (select * from t_driver where flag != 3) AS dd on dd.carId = cc.id) as o
<where>
diff --git a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml
index 0d3ef08..cbb187e 100644
--- a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml
+++ b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml
@@ -86,6 +86,7 @@
when type = 4 then '小件物流-同城'
when type = 5 then '小件物流-跨城'
when type = 6 then '包车'
+ when type = 7 then '接送机'
else '' end ) as serverStr,driverId from t_driver_service GROUP BY driverId) as ds on ds.driverId = dd.id
) as o
<where>
@@ -128,6 +129,7 @@
when type = 4 then '小件物流-同城'
when type = 5 then '小件物流-跨城'
when type = 6 then '包车'
+ when type = 7 then '接送机'
else '' end SEPARATOR '、') as serverStr,driverId from t_driver_service GROUP BY driverId) as ds on ds.driverId = dd.id
where dd.id = #{driverId}
</select>
@@ -147,6 +149,7 @@
when type = 4 then '小件物流-同城'
when type = 5 then '小件物流-跨城'
when type = 6 then '包车'
+ when type = 7 then '接送机'
else '' end ) as serverStr,driverId from t_driver_service GROUP BY driverId) as ds on ds.driverId = dd.id
LEFT JOIN (SELECT IFNULL(SUM(fraction)/COUNT(id),0) as evaluateNum,driverId FROM t_order_evaluate GROUP BY driverId) as oe on oe.driverId = dd.id
LEFT JOIN (SELECT COUNT(id) as taxiNum,driverId FROM t_order_taxi where FIND_IN_SET(state,'7,8,9') GROUP BY driverId) as ot1 on ot1.driverId = dd.id
@@ -211,6 +214,7 @@
when type = 4 then '小件物流-同城'
when type = 5 then '小件物流-跨城'
when type = 6 then '包车'
+ when type = 7 then '接送机'
else '' end ) as serverStr,carId from t_car_service GROUP BY carId) as ds on ds.carId = ci.id) as o
<where>
o.state = 1
@@ -275,6 +279,7 @@
when type = 4 then '小件物流-同城'
when type = 5 then '小件物流-跨城'
when type = 6 then '包车'
+ when type = 7 then '接送机'
else '' end ) as serverStr,driverId from t_driver_service GROUP BY driverId) as ds on ds.driverId = dd.id
LEFT JOIN (SELECT IFNULL(SUM(fraction)/COUNT(id),0) as evaluateNum,driverId FROM t_order_evaluate GROUP BY driverId) as oe on oe.driverId = dd.id
LEFT JOIN (SELECT COUNT(id) as taxiNum,driverId FROM t_order_taxi where FIND_IN_SET(state,'7,8,9') GROUP BY driverId) as ot1 on ot1.driverId = dd.id
diff --git a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCompany.java b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCompany.java
index fb97a7c..a1f3f31 100644
--- a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCompany.java
+++ b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCompany.java
@@ -53,6 +53,10 @@
*/
private Integer isCharter;
/**
+ * 是否经营接送机(1=是，2=否)
+ */
+ private Integer isTransfer;
+ /**
* 专车提成方式(1=比例，2=固定)
*/
private Integer isSpeFixedOrProportional;
@@ -69,6 +73,10 @@
*/
private Integer isSameLogisticsFixedOrProportional;
/**
+ * 接送机提成方式(1=比例，2=固定)
+ */
+ private Integer isTransferFixedOrProportional;
+ /**
* 专车提成数值
*/
private BigDecimal speMoney;
@@ -84,6 +92,10 @@
* 同城物流
*/
private BigDecimal sameLogisticsMoney;
+ /**
+ * 接送机提成数值
+ */
+ private BigDecimal transferMoney;
/**
* 是否需要摆渡车(1=是，2=否)
*/
@@ -242,6 +254,30 @@
//身份证反面
private String idCardReverse;
+ public Integer getIsTransfer() {
+ return isTransfer;
+ }
+
+ public void setIsTransfer(Integer isTransfer) {
+ this.isTransfer = isTransfer;
+ }
+
+ public Integer getIsTransferFixedOrProportional() {
+ return isTransferFixedOrProportional;
+ }
+
+ public void setIsTransferFixedOrProportional(Integer isTransferFixedOrProportional) {
+ this.isTransferFixedOrProportional = isTransferFixedOrProportional;
+ }
+
+ public BigDecimal getTransferMoney() {
+ return transferMoney;
+ }
+
+ public void setTransferMoney(BigDecimal transferMoney) {
+ this.transferMoney = transferMoney;
+ }
+
public String getIdCardPositive() {
return idCardPositive;
}
diff --git a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TInvoice.java b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TInvoice.java
index 89ec877..a8d6751 100644
--- a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TInvoice.java
+++ b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TInvoice.java
@@ -32,6 +32,10 @@
*/
private Integer type;
/**
+ * 发票金额 1=普票 2=专票
+ */
+ private Integer invoiceType;
+ /**
* 抬头名称（公司名称/个人姓名）
*/
private String name;
@@ -72,6 +76,13 @@
*/
private Date insertTime;
+ public Integer getInvoiceType() {
+ return invoiceType;
+ }
+
+ public void setInvoiceType(Integer invoiceType) {
+ this.invoiceType = invoiceType;
+ }
public Integer getId() {
return id;
diff --git a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysReformist.java b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysReformist.java
index 22b47d4..d01793f 100644
--- a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysReformist.java
+++ b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysReformist.java
@@ -41,6 +41,42 @@
* 出租车改派 1=否 2=是
*/
private Integer isTaxiCar;
+ /**
+ * 接送机改派 1=否 2=是
+ */
+ private Integer isTransfer;
+ /**
+ * 用户端客服二维码
+ */
+ private String userQrCode;
+ /**
+ * 司机端客服二维码
+ */
+ private String driverQrCode;
+
+ public String getUserQrCode() {
+ return userQrCode;
+ }
+
+ public void setUserQrCode(String userQrCode) {
+ this.userQrCode = userQrCode;
+ }
+
+ public String getDriverQrCode() {
+ return driverQrCode;
+ }
+
+ public void setDriverQrCode(String driverQrCode) {
+ this.driverQrCode = driverQrCode;
+ }
+
+ public Integer getIsTransfer() {
+ return isTransfer;
+ }
+
+ public void setIsTransfer(Integer isTransfer) {
+ this.isTransfer = isTransfer;
+ }
public Integer getIsSpecialCar() {
return isSpecialCar;
diff --git a/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_add.html b/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_add.html
index 71442af..715e344 100644
--- a/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_add.html
+++ b/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_add.html
@@ -73,6 +73,10 @@
<input type="checkbox" name="serverBox" id="serverBox6" value="6">
<label for="serverBox6"> 包车 </label>
</div>
+ <div class="checkbox checkbox-success checkbox-inline">
+ <input type="checkbox" name="serverBox" id="serverBox7" value="7" onclick="TCarInfoDlg.jsjServerClick()">
+ <label for="serverBox7"> 接送机 </label>
+ </div>
</div>
</fieldset>
</div>
@@ -98,6 +102,17 @@
</select>
</div>
</div>
+ <div class="form-group" style="display: none;" id="jsjModelDiv">
+ <label class="col-sm-3 control-label">接送机车型：</label>
+ <div class="col-sm-9">
+ <select class="form-control" id="jsjModel" name="jsjModel">
+ <option value="">选择车型</option>
+ @for(obj in jsjModelList){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </select>
+ </div>
+ </div>
<#select id="carBrandId" name="车辆品牌：" onchange="TCarInfoDlg.brandChange(this)">
<option value="">选择车辆品牌</option>
diff --git a/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_edit.html b/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_edit.html
index 3c685d5..098308d 100644
--- a/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_edit.html
+++ b/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_edit.html
@@ -75,6 +75,10 @@
<input type="checkbox" name="serverBox" id="serverBox6" value="6" ${2 == six ? 'checked=checked' : ''}>
<label for="serverBox6"> 包车 </label>
</div>
+ <div class="checkbox checkbox-success checkbox-inline">
+ <input type="checkbox" name="serverBox" id="serverBox7" value="7" ${2 == seven ? 'checked=checked' : ''} onclick="TCarInfoDlg.jsjServerClick()">
+ <label for="serverBox7"> 接送机 </label>
+ </div>
</div>
</fieldset>
</div>
@@ -96,6 +100,17 @@
<option value="">选择车型</option>
@for(obj in kcModelList){
<option value="${obj.id}" ${obj.id == kcModel ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </select>
+ </div>
+ </div>
+ <div class="form-group" id="jsjModelDiv">
+ <label class="col-sm-3 control-label">接送机车型：</label>
+ <div class="col-sm-9">
+ <select class="form-control" id="jsjModel" name="jsjModel">
+ <option value="">选择车型</option>
+ @for(obj in jsjModelList){
+ <option value="${obj.id}" ${obj.id == jsjModel ? 'selected=selected' : ''}>${obj.name}</option>
@}
</select>
</div>
@@ -214,6 +229,7 @@
TCarInfoDlg.zcServerClick();
TCarInfoDlg.kcServerClick();
+ TCarInfoDlg.jsjServerClick();
});
</script>
diff --git a/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_add.html b/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_add.html
index 5dfdbe7..3cd587b 100644
--- a/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_add.html
+++ b/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_add.html
@@ -191,6 +191,39 @@
包车
</label>
</div>
+
+ <div class="checkbox checkbox-success">
+ <input name="checkbox" id="checkbox7" type="checkbox" value="7" onclick="TCompanyInfoDlg.checkbox7()">
+ <label for="checkbox7">
+ 接送机
+ </label>
+ <fieldset>
+ <div class="row" style="display: none;" id="jsjDiv">
+ <div class="col-sm-6">
+ <div class="checkbox checkbox-circle" >
+ <input type="radio" name="jsj" id="jsj1" value="1" checked="">
+ <label for="jsj1" >
+ <div style="position: relative;top: -8px;">
+ <span>按比例抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="jsjPercent" name="jsjPercent">
+ <span>%</span>
+ </div>
+ </label>
+ </div>
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="jsj" id="jsj2" value="2">
+ <label for="jsj2">
+ <div style="position: relative;top: -8px;">
+ <span>按固定金额抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="jsjMoney" name="jsjMoney">
+ <span>元</span>
+ </div>
+ </label>
+ </div>
+ </div>
+ </div>
+ </fieldset>
+ </div>
</fieldset>
</div>
</div>
diff --git a/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_addFranchisee.html b/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_addFranchisee.html
index 6096eb0..0e8af23 100644
--- a/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_addFranchisee.html
+++ b/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_addFranchisee.html
@@ -172,6 +172,40 @@
包车
</label>
</div>
+
+ <div class="checkbox checkbox-success">
+ <input name="checkbox" id="checkbox7" type="checkbox" value="7" onclick="FranchiseeInfoDlg.checkbox7()">
+ <label for="checkbox7">
+ 接送机
+ </label>
+ <fieldset>
+ <div class="row" style="display: none;" id="jsjDiv">
+ <div class="col-sm-6">
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="jsj" id="jsj1" value="1" checked="">
+ <label for="jsj1">
+ <div style="position: relative;top: -8px;">
+ <span>按比例抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="jsjPercent" name="jsjPercent">
+ <span>%</span>
+ </div>
+ </label>
+ </div>
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="jsj" id="jsj2" value="2">
+ <label for="jsj2">
+ <div style="position: relative;top: -8px;">
+ <span>按固定金额抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="jsjMoney" name="jsjMoney">
+ <span>元</span>
+ </div>
+ </label>
+ </div>
+ </div>
+ </div>
+ </fieldset>
+ </div>
+
</fieldset>
</div>
</div>
diff --git a/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detail.html b/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detail.html
index 5a74cf3..5478db4 100644
--- a/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detail.html
+++ b/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detail.html
@@ -264,6 +264,46 @@
包车
</label>
</div>
+ <div class="checkbox checkbox-success">
+ <input name="checkbox" id="checkbox7" type="checkbox" disabled value="7" ${1 == item.isTransfer ? 'checked=checked' : ''} >
+ <label for="checkbox7">
+ 接送机
+ </label>
+ <fieldset>
+ <div class="row" style="display: none;" id="jsjDiv">
+ <div class="col-sm-6">
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="jsj" id="jsj1" disabled value="1" ${1 == item.isTransferFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="jsj1">
+ <div style="position: relative;top: -8px;">
+ <span>按比例抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" disabled class="form-control" id="jsjPercent" name="jsjPercent" disabled
+ @if(1 == item.isTransferFixedOrProportional){
+ value="${item.transferMoney}"
+ @}
+ >
+ <span>%</span>
+ </div>
+ </label>
+ </div>
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="jsj" id="jsj2" disabled value="2" ${2 == item.isTransferFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="jsj2">
+ <div style="position: relative;top: -8px;">
+ <span>按固定金额抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" disabled class="form-control" id="jsjMoney" name="jsjMoney" disabled
+ @if(2 == item.isTransferFixedOrProportional){
+ value="${item.transferMoney}"
+ @}
+ >
+ <span>元</span>
+ </div>
+ </label>
+ </div>
+ </div>
+ </div>
+ </fieldset>
+ </div>
</fieldset>
</div>
</div>
diff --git a/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detailFranchisee.html b/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detailFranchisee.html
index cae5bf7..22dce82 100644
--- a/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detailFranchisee.html
+++ b/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detailFranchisee.html
@@ -196,6 +196,47 @@
包车
</label>
</div>
+
+ <div class="checkbox checkbox-success">
+ <input name="checkbox" id="checkbox7" disabled type="checkbox" value="7" ${1 == item.isTransfer ? 'checked=checked' : ''} >
+ <label for="checkbox7">
+ 接送机
+ </label>
+ <fieldset>
+ <div class="row" style="display: none;" id="jsjDiv">
+ <div class="col-sm-6">
+ <div class="checkbox checkbox-circle">
+ <input type="radio" disabled name="jsj" id="jsj1" value="1" ${1 == item.isTransferFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="jsj1">
+ <div style="position: relative;top: -8px;">
+ <span>按比例抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" disabled class="form-control" id="jsjPercent" name="jsjPercent"
+ @if(1 == item.isTransferFixedOrProportional){
+ value="${item.transferMoney}"
+ @}
+ >
+ <span>%</span>
+ </div>
+ </label>
+ </div>
+ <div class="checkbox checkbox-circle">
+ <input type="radio" disabled name="jsj" id="jsj2" value="2" ${2 == item.isTransferFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="jsj2">
+ <div style="position: relative;top: -8px;">
+ <span>按固定金额抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" disabled class="form-control" id="jsjMoney" name="jsjMoney"
+ @if(2 == item.isTransferFixedOrProportional){
+ value="${item.transferMoney}"
+ @}
+ >
+ <span>元</span>
+ </div>
+ </label>
+ </div>
+ </div>
+ </div>
+ </fieldset>
+ </div>
</fieldset>
</div>
</div>
@@ -228,14 +269,19 @@
FranchiseeInfoDlg.checkbox4();
FranchiseeInfoDlg.checkbox5();
FranchiseeInfoDlg.checkbox6();
+ FranchiseeInfoDlg.checkbox7();
var zc = $("input[name='zc']:checked").val();
+ var jsj = $("input[name='jsj']:checked").val();
var cz = $("input[name='cz']:checked").val();
var tcx = $("input[name='tcx']:checked").val();
var kcx = $("input[name='kcx']:checked").val();
if (zc == "" || zc == null || zc == undefined){
$("#zc1").attr("checked","checked")
}
+ if (jsj == "" || jsj == null || jsj == undefined){
+ $("#jsj1").attr("checked","checked")
+ }
if (cz == "" || cz == null || cz == undefined){
$("#cz1").attr("checked","checked")
}
diff --git a/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_edit.html b/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_edit.html
index 27d93c9..059679b 100644
--- a/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_edit.html
+++ b/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_edit.html
@@ -223,6 +223,46 @@
包车
</label>
</div>
+ <div class="checkbox checkbox-success">
+ <input name="checkbox" id="checkbox7" type="checkbox" value="7" ${1 == item.isTransfer ? 'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox7()">
+ <label for="checkbox7">
+ 接送机
+ </label>
+ <fieldset>
+ <div class="row" style="display: none;" id="jsjDiv">
+ <div class="col-sm-6">
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="jsj" id="jsj1" value="1" ${1 == item.isTransferFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="jsj1">
+ <div style="position: relative;top: -8px;">
+ <span>按比例抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="jsjPercent" name="jsjPercent"
+ @if(1 == item.isTransferFixedOrProportional){
+ value="${item.transferMoney}"
+ @}
+ >
+ <span>%</span>
+ </div>
+ </label>
+ </div>
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="jsj" id="jsj2" value="2" ${2 == item.isTransferFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="jsj2">
+ <div style="position: relative;top: -8px;">
+ <span>按固定金额抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="jsjMoney" name="jsjMoney"
+ @if(2 == item.isTransferFixedOrProportional){
+ value="${item.transferMoney}"
+ @}
+ >
+ <span>元</span>
+ </div>
+ </label>
+ </div>
+ </div>
+ </div>
+ </fieldset>
+ </div>
</fieldset>
</div>
</div>
@@ -354,14 +394,19 @@
TCompanyInfoDlg.checkbox4();
TCompanyInfoDlg.checkbox5();
TCompanyInfoDlg.checkbox6();
+ TCompanyInfoDlg.checkbox7();
var zc = $("input[name='zc']:checked").val();
+ var jsj = $("input[name='jsj']:checked").val();
var cz = $("input[name='cz']:checked").val();
var tcx = $("input[name='tcx']:checked").val();
var kcx = $("input[name='kcx']:checked").val();
if (zc == "" || zc == null || zc == undefined){
$("#zc1").attr("checked","checked")
}
+ if (jsj == "" || jsj == null || jsj == undefined){
+ $("#jsj1").attr("checked","checked")
+ }
if (cz == "" || cz == null || cz == undefined){
$("#cz1").attr("checked","checked")
}
diff --git a/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_updateFranchisee.html b/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_updateFranchisee.html
index 2cf6ba1..1dca659 100644
--- a/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_updateFranchisee.html
+++ b/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_updateFranchisee.html
@@ -204,6 +204,47 @@
包车
</label>
</div>
+
+ <div class="checkbox checkbox-success">
+ <input name="checkbox" id="checkbox7" type="checkbox" value="7" ${1 == item.isTransfer ? 'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox7()">
+ <label for="checkbox7">
+ 接送机
+ </label>
+ <fieldset>
+ <div class="row" style="display: none;" id="jsjDiv">
+ <div class="col-sm-6">
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="jsj" id="jsj1" value="1" ${1 == item.isTransferFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="jsj1">
+ <div style="position: relative;top: -8px;">
+ <span>按比例抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="jsjPercent" name="jsjPercent"
+ @if(1 == item.isTransferFixedOrProportional){
+ value="${item.transferMoney}"
+ @}
+ >
+ <span>%</span>
+ </div>
+ </label>
+ </div>
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="jsj" id="jsj2" value="2" ${2 == item.isTransferFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="jsj2">
+ <div style="position: relative;top: -8px;">
+ <span>按固定金额抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="jsjMoney" name="jsjMoney"
+ @if(2 == item.isTransferFixedOrProportional){
+ value="${item.transferMoney}"
+ @}
+ >
+ <span>元</span>
+ </div>
+ </label>
+ </div>
+ </div>
+ </div>
+ </fieldset>
+ </div>
</fieldset>
</div>
</div>
@@ -260,14 +301,19 @@
FranchiseeInfoDlg.checkbox4();
FranchiseeInfoDlg.checkbox5();
FranchiseeInfoDlg.checkbox6();
+ FranchiseeInfoDlg.checkbox7();
var zc = $("input[name='zc']:checked").val();
+ var jsj = $("input[name='jsj']:checked").val();
var cz = $("input[name='cz']:checked").val();
var tcx = $("input[name='tcx']:checked").val();
var kcx = $("input[name='kcx']:checked").val();
if (zc == "" || zc == null || zc == undefined){
$("#zc1").attr("checked","checked")
}
+ if (jsj == "" || jsj == null || jsj == undefined){
+ $("#jsj1").attr("checked","checked")
+ }
if (cz == "" || cz == null || cz == undefined){
$("#cz1").attr("checked","checked")
}
diff --git a/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html b/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html
index 104ef2e..29eb75b 100644
--- a/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html
+++ b/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html
@@ -94,6 +94,10 @@
<input type="checkbox" name="serverBox" id="serverBox6" value="6">
<label for="serverBox6"> 包车 </label>
</div>
+ <div class="checkbox checkbox-success checkbox-inline">
+ <input type="checkbox" name="serverBox" id="serverBox7" value="7">
+ <label for="serverBox7"> 接送机 </label>
+ </div>
</div>
</fieldset>
</div>
diff --git a/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html b/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html
index 46f6b93..addcfa6 100644
--- a/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html
+++ b/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html
@@ -97,6 +97,10 @@
<input type="checkbox" name="serverBox" id="serverBox6" value="6" ${2 == six ? 'checked=checked' : ''}>
<label for="serverBox6"> 包车 </label>
</div>
+ <div class="checkbox checkbox-success checkbox-inline">
+ <input type="checkbox" name="serverBox" id="serverBox7" value="7" ${2 == seven ? 'checked=checked' : ''}>
+ <label for="serverBox7"> 接送机 </label>
+ </div>
</div>
</fieldset>
</div>
diff --git a/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_add.html b/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_add.html
index 0c1898c..bea9b39 100644
--- a/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_add.html
+++ b/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_add.html
@@ -62,6 +62,34 @@
</div>
</div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">机场/动车站点：</label>
+ <div class="col-sm-3" >
+ <#input id="businessSort" name=" " value="" />
+ </div>
+ <div class="col-sm-2">
+ <#button btnCss="info" name="添加站点" id="ensure" icon="fa-check" clickFun="addBusinessType()"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">已添加站点列表：</label>
+ <div class="col-sm-9">
+ <div style="height: 200px; border: 1px solid #e5e6e7;overflow-y: auto;">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead>
+ <tr>
+ <th style="width: 300px;">添加时间</th>
+ <th style="width: 300px;">经营业务</th>
+ <th style="width: 300px;">排序</th>
+ <th style="width: 100px;">操作</th>
+ </tr>
+ </thead>
+ <tbody id="site">
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
</div>
</div>
diff --git a/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html b/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html
index 6bcc3b3..6288814 100644
--- a/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html
+++ b/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html
@@ -68,7 +68,7 @@
</div>
</div>
- <div class="form-group">
+ <!-- <div class="form-group">
<label class="col-sm-2 control-label">专车改派：</label>
<div class="col-sm-10">
<div class="form-group">
@@ -82,28 +82,26 @@
</div>
</div>
</div>
- <!--
<div class="form-group">
- <label class="col-sm-2 control-label">出租车改派：</label>
+ <label class="col-sm-2 control-label">接送机改派：</label>
<div class="col-sm-10">
<div class="form-group">
<div class="col-sm-9">
- <input type="checkbox" class="js-switch1" id="isTaxiCar"
+ <input type="checkbox" class="js-switch1" id="isTransfer"
@if(isNotEmpty(reformist)){
- ${1 == reformist.isTaxiCar ? '' : 'checked=checked'}
+ ${1 == reformist.isTransfer ? '' : 'checked=checked'}
@}
/>
</div>
</div>
</div>
- </div>
- -->
+ </div>-->
<div class="ibox-title" >
<h3>推单设置:</h3>
</div>
<div class="form-group">
- <label class="col-sm-2 control-label">推单：</label>
+ <label class="col-sm-2 control-label">专车推单：</label>
<div class="col-sm-10">
第一轮推单：推单距离为 <input type="text" oninput="checkIsDouble(this)"
@if(isNotEmpty(zcOne)){
@@ -175,81 +173,79 @@
<br/>
</div>
</div>
- <!--
<div class="form-group">
- <label class="col-sm-2 control-label">出租车推单：</label>
+ <label class="col-sm-2 control-label">接送机推单：</label>
<div class="col-sm-10">
第一轮推单：推单距离为 <input type="text" oninput="checkIsDouble(this)"
- @if(isNotEmpty(czcOne)){
- value="${czcOne.pushDistance}"
+ @if(isNotEmpty(jsjOne)){
+ value="${jsjOne.pushDistance}"
@}else{
value=""
@}
- name="czc1" id="czc1" class="form-control newWidth" /> 公里，
+ name="jsj1" id="jsj1" class="form-control newWidth" /> 公里，
推单时间为 <input type="text" oninput="checkIsInt(this)"
- @if(isNotEmpty(czcOne)){
- value="${czcOne.pushTime}"
+ @if(isNotEmpty(jsjOne)){
+ value="${jsjOne.pushTime}"
@}else{
value=""
@}
- name="czc2" id="czc2" class="form-control newWidth" /> 秒钟；
+ name="jsj2" id="jsj2" class="form-control newWidth" /> 秒钟；
每次推所有司机的 <input type="text" oninput="checkIsDouble(this)"
- @if(isNotEmpty(czcOne)){
- value="${czcOne.driverProportion}"
+ @if(isNotEmpty(jsjOne)){
+ value="${jsjOne.driverProportion}"
@}else{
value=""
@}
- name="czc3" id="czc3" class="form-control newWidth" /> %
+ name="jsj3" id="jsj3" class="form-control newWidth" /> %
<br/>
<br/>
第二轮推单：推单距离为 <input type="text" oninput="checkIsDouble(this)"
- @if(isNotEmpty(czcTwo)){
- value="${czcTwo.pushDistance}"
+ @if(isNotEmpty(jsjTwo)){
+ value="${jsjTwo.pushDistance}"
@}else{
value=""
@}
- name="czc4" id="czc4" class="form-control newWidth" /> 公里，
+ name="jsj4" id="jsj4" class="form-control newWidth" /> 公里，
推单时间为 <input type="text" oninput="checkIsInt(this)"
- @if(isNotEmpty(czcTwo)){
- value="${czcTwo.pushTime}"
+ @if(isNotEmpty(jsjTwo)){
+ value="${jsjTwo.pushTime}"
@}else{
value=""
@}
- name="czc5" id="czc5" class="form-control newWidth" /> 秒钟；
+ name="jsj5" id="jsj5" class="form-control newWidth" /> 秒钟；
每次推所有司机的 <input type="text" oninput="checkIsDouble(this)"
- @if(isNotEmpty(czcTwo)){
- value="${czcTwo.driverProportion}"
+ @if(isNotEmpty(jsjTwo)){
+ value="${jsjTwo.driverProportion}"
@}else{
value=""
@}
- name="czc6" id="czc6" class="form-control newWidth" /> %
+ name="jsj6" id="jsj6" class="form-control newWidth" /> %
<br/>
<br/>
第三轮推单：推单距离为 <input type="text" oninput="checkIsDouble(this)"
- @if(isNotEmpty(czcThree)){
- value="${czcThree.pushDistance}"
+ @if(isNotEmpty(jsjThree)){
+ value="${jsjThree.pushDistance}"
@}else{
value=""
@}
- name="czc7" id="czc7" class="form-control newWidth" /> 公里，
+ name="jsj7" id="jsj7" class="form-control newWidth" /> 公里，
推单时间为 <input type="text" oninput="checkIsInt(this)"
- @if(isNotEmpty(czcThree)){
- value="${czcThree.pushTime}"
+ @if(isNotEmpty(jsjThree)){
+ value="${jsjThree.pushTime}"
@}else{
value=""
@}
- name="czc8" id="czc8" class="form-control newWidth" /> 秒钟；
+ name="jsj8" id="jsj8" class="form-control newWidth" /> 秒钟；
每次推所有司机的 <input type="text" oninput="checkIsDouble(this)"
- @if(isNotEmpty(czcThree)){
- value="${czcThree.driverProportion}"
+ @if(isNotEmpty(jsjThree)){
+ value="${jsjThree.driverProportion}"
@}else{
value=""
@}
- name="czc9" id="czc9" class="form-control newWidth" /> %
+ name="jsj9" id="jsj9" class="form-control newWidth" /> %
<br/>
</div>
</div>
- -->
<div class="form-group">
<label class="col-sm-2 control-label">取消设置：</label>
<div class="col-sm-10">
@@ -268,9 +264,8 @@
@}
name="ptCancel2" id="ptCancel2" class="form-control newWidth" /> 元取消费用；
<br/>
- <!--
<br/>
- 出租车订单取消规则：出租车订单在司机接单 <input type="text" oninput="checkIsInt(this)"
+ 接送机订单取消规则：接送机订单在司机接单 <input type="text" oninput="checkIsInt(this)"
@if(isNotEmpty(ptCancel2)){
value="${ptCancel2.minuteNum}"
@}else{
@@ -285,7 +280,6 @@
@}
name="ptCancel4" id="ptCancel4" class="form-control newWidth" /> 元取消费用；
<br/>
- -->
</div>
</div>
<div class="form-group">
@@ -306,9 +300,8 @@
@}
name="yyCancel2" id="yyCancel2" class="form-control newWidth" /> 元取消费用；
<br/>
- <!--
<br/>
- 出租车订单取消规则：出租车订单在司机接单 <input type="text" oninput="checkIsInt(this)"
+ 接送机订单取消规则：接送机订单在司机接单 <input type="text" oninput="checkIsInt(this)"
@if(isNotEmpty(yyCancel2)){
value="${yyCancel2.minuteNum}"
@}else{
@@ -323,12 +316,11 @@
@}
name="yyCancel4" id="yyCancel4" class="form-control newWidth" /> 元取消费用；
<br/>
- -->
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">电话设置：</label>
- <div class="col-sm-10">
+ <div class="col-sm-3">
报警电话： <input type="text"
@if(isNotEmpty(phone1)){
value="${phone1.phone}"
@@ -356,6 +348,12 @@
name="phone3" id="phone3" class="form-control newWidth" />
<br/>
</div>
+ <div class="col-sm-3">
+ <#avatar id="userQrCode" name="用户端客服二维码" avatarImg="${reformist.userQrCode}"/>
+ </div>
+ <div class="col-sm-3">
+ <#avatar id="driverQrCode" name="司机端客服二维码" avatarImg="${reformist.driverQrCode}"/>
+ </div>
</div>
</div>
</div>
@@ -381,6 +379,16 @@
$("#three1").attr("checked","checked");
}
threeClick($("input[name='three']:checked").val());
+
+
+ // 初始化图片上传
+ var userQrCode = new $WebUpload("userQrCode");
+ userQrCode.setUploadBarId("progressBar");
+ userQrCode.init();
+ var driverQrCode = new $WebUpload("driverQrCode");
+ driverQrCode.setUploadBarId("progressBar");
+ driverQrCode.init();
+
});
//人脸识别打开按钮被点击
@@ -418,18 +426,25 @@
var three = $("input[name='three']:checked").val();
var openValue = $("#openValue").val();
- var isSpecialCar = $("#isSpecialCar").is(":checked");
- if (isSpecialCar){
- isSpecialCar = 2;
- } else {
- isSpecialCar = 1;
- }
+ // var isSpecialCar = $("#isSpecialCar").is(":checked");
+ // if (isSpecialCar){
+ // isSpecialCar = 2;
+ // } else {
+ // isSpecialCar = 1;
+ // }
var isTaxiCar = $("#isTaxiCar").is(":checked");
if (isTaxiCar){
isTaxiCar = 2;
} else {
isTaxiCar = 1;
}
+
+ // var isTransfer = $("#isTransfer").is(":checked");
+ // if (isTransfer){
+ // isTransfer = 2;
+ // } else {
+ // isTransfer = 1;
+ // }
var zc1 = $("#zc1").val().trim();
var zc2 = $("#zc2").val().trim();
@@ -441,37 +456,39 @@
var zc8 = $("#zc8").val().trim();
var zc9 = $("#zc9").val().trim();
- // var czc1 = $("#czc1").val().trim();
- // var czc2 = $("#czc2").val().trim();
- // var czc3 = $("#czc3").val().trim();
- // var czc4 = $("#czc4").val().trim();
- // var czc5 = $("#czc5").val().trim();
- // var czc6 = $("#czc6").val().trim();
- // var czc7 = $("#czc7").val().trim();
- // var czc8 = $("#czc8").val().trim();
- // var czc9 = $("#czc9").val().trim();
+ var jsj1 = $("#jsj1").val().trim();
+ var jsj2 = $("#jsj2").val().trim();
+ var jsj3 = $("#jsj3").val().trim();
+ var jsj4 = $("#jsj4").val().trim();
+ var jsj5 = $("#jsj5").val().trim();
+ var jsj6 = $("#jsj6").val().trim();
+ var jsj7 = $("#jsj7").val().trim();
+ var jsj8 = $("#jsj8").val().trim();
+ var jsj9 = $("#jsj9").val().trim();
var ptCancel1 = $("#ptCancel1").val().trim();
var ptCancel2 = $("#ptCancel2").val().trim();
- // var ptCancel3 = $("#ptCancel3").val().trim();
- // var ptCancel4 = $("#ptCancel4").val().trim();
+ var ptCancel3 = $("#ptCancel3").val().trim();
+ var ptCancel4 = $("#ptCancel4").val().trim();
// var ptCancel5 = $("#ptCancel5").val().trim();
// var ptCancel6 = $("#ptCancel6").val().trim();
var yyCancel1 = $("#yyCancel1").val().trim();
var yyCancel2 = $("#yyCancel2").val().trim();
- // var yyCancel3 = $("#yyCancel3").val().trim();
- // var yyCancel4 = $("#yyCancel4").val().trim();
+ var yyCancel3 = $("#yyCancel3").val().trim();
+ var yyCancel4 = $("#yyCancel4").val().trim();
var phone1 = $("#phone1").val().trim();
var phone2 = $("#phone2").val().trim();
var phone3 = $("#phone3").val().trim();
+ var userQrCode = $("#userQrCode").val().trim();
+ var driverQrCode = $("#driverQrCode").val().trim();
if ("" == one || "" == two || "" == three
|| "" == zc1 || "" == zc2 || "" == zc3 || "" == zc4 || "" == zc5 || "" == zc6 || "" == zc7 || "" == zc8 || "" == zc9
- /*|| "" == czc1 || "" == czc2 || "" == czc3 || "" == czc4 || "" == czc5 || "" == czc6 || "" == czc7 || "" == czc8 || "" == czc9
- || "" == ptCancel1 || "" == ptCancel2 || "" == ptCancel3 || "" == ptCancel4 || "" == ptCancel5 || "" == ptCancel6*/
- || "" == yyCancel1 || "" == yyCancel2 /*|| "" == yyCancel3 || "" == yyCancel4*/
+ || "" == jsj1 || "" == jsj2 || "" == jsj3 || "" == jsj4 || "" == jsj5 || "" == jsj6 || "" == jsj7 || "" == jsj8 || "" == jsj9
+ || "" == ptCancel1 || "" == ptCancel2 || "" == ptCancel3 || "" == ptCancel4 /*|| "" == ptCancel5 || "" == ptCancel6*/
+ || "" == yyCancel1 || "" == yyCancel2 || "" == yyCancel3 || "" == yyCancel4
|| "" == phone1 || "" == phone2 ) {
Feng.info("输入框不能为空!");
return;
@@ -489,12 +506,12 @@
|| !regDouble.test(zc4) || !regInt.test(zc5) || !regDouble.test(zc6)
|| !regDouble.test(zc7) || !regInt.test(zc8) || !regDouble.test(zc9)
- // || !regDouble.test(czc1) || !regInt.test(czc2) || !regDouble.test(czc3)
- // || !regDouble.test(czc4) || !regInt.test(czc5) || !regDouble.test(czc6)
- // || !regDouble.test(czc7) || !regInt.test(czc8) || !regDouble.test(czc9)
+ || !regDouble.test(jsj1) || !regInt.test(jsj2) || !regDouble.test(jsj3)
+ || !regDouble.test(jsj4) || !regInt.test(jsj5) || !regDouble.test(jsj6)
+ || !regDouble.test(jsj7) || !regInt.test(jsj8) || !regDouble.test(jsj9)
- || !regInt.test(ptCancel1) || !regDouble.test(ptCancel2) /*|| !regInt.test(ptCancel3) || !regDouble.test(ptCancel4)|| !regInt.test(ptCancel5) || !regDouble.test(ptCancel6)*/
- || !regInt.test(yyCancel1) || !regDouble.test(yyCancel2) /*|| !regInt.test(yyCancel3) || !regDouble.test(yyCancel4)*/) {
+ || !regInt.test(ptCancel1) || !regDouble.test(ptCancel2) || !regInt.test(ptCancel3) || !regDouble.test(ptCancel4) /*|| !regInt.test(ptCancel5) || !regDouble.test(ptCancel6)*/
+ || !regInt.test(yyCancel1) || !regDouble.test(yyCancel2) || !regInt.test(yyCancel3) || !regDouble.test(yyCancel4)) {
Feng.info("格式不正确!");
return ;
}
@@ -515,8 +532,9 @@
ajax.set("openValue",0);
}
- ajax.set("isSpecialCar", isSpecialCar);
- ajax.set("isTaxiCar", isTaxiCar);
+ ajax.set("isSpecialCar", 0);
+ ajax.set("isTaxiCar", 0);
+ ajax.set("isTransfer", 0);
ajax.set("zc1", zc1);
ajax.set("zc2", zc2);
@@ -528,31 +546,33 @@
ajax.set("zc8", zc8);
ajax.set("zc9", zc9);
- ajax.set("czc1", 0);
- ajax.set("czc2", 0);
- ajax.set("czc3", 0);
- ajax.set("czc4", 0);
- ajax.set("czc5", 0);
- ajax.set("czc6", 0);
- ajax.set("czc7", 0);
- ajax.set("czc8", 0);
- ajax.set("czc9", 0);
+ ajax.set("jsj1", jsj1);
+ ajax.set("jsj2", jsj2);
+ ajax.set("jsj3", jsj3);
+ ajax.set("jsj4", jsj4);
+ ajax.set("jsj5", jsj5);
+ ajax.set("jsj6", jsj6);
+ ajax.set("jsj7", jsj7);
+ ajax.set("jsj8", jsj8);
+ ajax.set("jsj9", jsj9);
ajax.set("ptCancel1", ptCancel1);
ajax.set("ptCancel2", ptCancel2);
- ajax.set("ptCancel3", 0);
- ajax.set("ptCancel4", 0);
+ ajax.set("ptCancel3", ptCancel3);
+ ajax.set("ptCancel4", ptCancel4);
ajax.set("ptCancel5", 0);
ajax.set("ptCancel6", 0);
ajax.set("yyCancel1", yyCancel1);
ajax.set("yyCancel2", yyCancel2);
- ajax.set("yyCancel3", 0);
- ajax.set("yyCancel4", 0);
+ ajax.set("yyCancel3", yyCancel3);
+ ajax.set("yyCancel4", yyCancel4);
ajax.set("phone1", phone1);
ajax.set("phone2", phone2);
ajax.set("phone3", phone3);
+ ajax.set("userQrCode", userQrCode);
+ ajax.set("driverQrCode", driverQrCode);
ajax.start();
}
diff --git a/ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tCar/tCar_info.js b/ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tCar/tCar_info.js
index d0a86cd..2fe8973 100644
--- a/ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tCar/tCar_info.js
+++ b/ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tCar/tCar_info.js
@@ -375,6 +375,7 @@
ajax.set("serverBox",serverBox.toString());
ajax.set("zcModel",$("#zcModel").val());
ajax.set("kcModel",$("#kcModel").val());
+ ajax.set("jsjModel",$("#jsjModel").val());
ajax.set("roleType",roleType);
if (1 == roleType){
ajax.set("companyType",companyType);
@@ -446,6 +447,7 @@
ajax.set("serverBox",serverBox.toString());
ajax.set("zcModel",$("#zcModel").val());
ajax.set("kcModel",$("#kcModel").val());
+ ajax.set("jsjModel",$("#jsjModel").val());
ajax.set("roleType",roleType);
if (1 == roleType){
ajax.set("companyType",companyType);
@@ -548,3 +550,16 @@
$("#kcModelDiv").hide();
}
}
+
+
+/**
+ * 接送机服务被点击
+ */
+TCarInfoDlg.jsjServerClick = function () {
+ var serverBox7 = $('#serverBox7').prop('checked');
+ if (serverBox7){
+ $("#jsjModelDiv").show();
+ } else {
+ $("#jsjModelDiv").hide();
+ }
+}
diff --git a/ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/franchisee_info.js b/ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/franchisee_info.js
index 26cf6d9..4b7d170 100644
--- a/ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/franchisee_info.js
+++ b/ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/franchisee_info.js
@@ -275,6 +275,29 @@
}
}
var checkbox6 = $('#checkbox6').prop('checked');
+ var checkbox7 = $('#checkbox7').prop('checked');
+ if (checkbox7) {
+ var jsj = $("input[name='jsj']:checked").val();
+ if (1 == jsj){
+ var jsjPercent = $("#jsjPercent").val();
+ if ("" == jsjPercent){
+ Feng.info("接送机比例抽成不能为空!");
+ return;
+ }else if (!regDouble.test(jsjPercent)) {
+ Feng.info("接送机比例抽成格式不正确!");
+ return;
+ }
+ }else if (2 == jsj){
+ var jsjMoney = $("#jsjMoney").val();
+ if ("" == jsjMoney){
+ Feng.info("接送机固定金额抽成不能为空!");
+ return;
+ }else if (!regDouble.test(jsjMoney)) {
+ Feng.info("接送机固定金额抽成格式不正确!");
+ return;
+ }
+ }
+ }
var isNeedFerry = $("input[name='isNeedFerry']:checked").val();
//提交信息
@@ -347,6 +370,18 @@
ajax.set("isCharter",1);
}else{
ajax.set("isCharter",2);
+ }
+ if (checkbox7){
+ var jsj = $("input[name='jsj']:checked").val();
+ ajax.set("isTransferFixedOrProportional",jsj);
+ if (1 == jsj){
+ ajax.set("transferMoney",$("#jsjPercent").val());
+ }else if (2 == jsj) {
+ ajax.set("transferMoney",$("#jsjMoney").val());
+ }
+ ajax.set("isTransfer",1);
+ }else{
+ ajax.set("isTransfer",2);
}
ajax.set("isNeedFerry",isNeedFerry);
ajax.set("account",$("#account").val());
@@ -466,7 +501,29 @@
}
}
var checkbox6 = $('#checkbox6').prop('checked');
-
+ var checkbox7 = $('#checkbox7').prop('checked');
+ if (checkbox7) {
+ var jsj = $("input[name='jsj']:checked").val();
+ if (1 == jsj){
+ var jsjPercent = $("#jsjPercent").val();
+ if ("" == jsjPercent){
+ Feng.info("接送机比例抽成不能为空!");
+ return;
+ }else if (!regDouble.test(jsjPercent)) {
+ Feng.info("接送机比例抽成格式不正确!");
+ return;
+ }
+ }else if (2 == jsj){
+ var jsjMoney = $("#jsjMoney").val();
+ if ("" == jsjMoney){
+ Feng.info("接送机固定金额抽成不能为空!");
+ return;
+ }else if (!regDouble.test(jsjMoney)) {
+ Feng.info("接送机固定金额抽成格式不正确!");
+ return;
+ }
+ }
+ }
var isNeedFerry = $("input[name='isNeedFerry']:checked").val();
//提交信息
var ajax = new $ax(Feng.ctxPath + "/tCompany/updateFranchisee", function(data){
@@ -539,6 +596,18 @@
}else{
ajax.set("isCharter",2);
}
+ if (checkbox7){
+ var jsj = $("input[name='jsj']:checked").val();
+ ajax.set("isTransferFixedOrProportional",jsj);
+ if (1 == jsj){
+ ajax.set("transferMoney",$("#jsjPercent").val());
+ }else if (2 == jsj) {
+ ajax.set("transferMoney",$("#jsjMoney").val());
+ }
+ ajax.set("isTransfer",1);
+ }else{
+ ajax.set("isTransfer",2);
+ }
ajax.set("isNeedFerry",isNeedFerry);
ajax.set("account",$("#account").val());
ajax.set("password",$("#password").val());
@@ -604,3 +673,12 @@
$("#bcDiv").hide();
}
}
+//接送机
+FranchiseeInfoDlg.checkbox7 = function () {
+ var checkbox7 = $('#checkbox7').prop('checked');
+ if (checkbox7){
+ $("#jsjDiv").show();
+ } else {
+ $("#jsjDiv").hide();
+ }
+}
diff --git a/ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/tCompany_info.js b/ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/tCompany_info.js
index 1e3d9a5..56e1699 100644
--- a/ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/tCompany_info.js
+++ b/ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/tCompany_info.js
@@ -268,6 +268,29 @@
}
}
var checkbox6 = $('#checkbox6').prop('checked');
+ var checkbox7 = $('#checkbox7').prop('checked');
+ if (checkbox7) {
+ var jsj = $("input[name='jsj']:checked").val();
+ if (1 == jsj){
+ var jsjPercent = $("#jsjPercent").val();
+ if ("" == jsjPercent){
+ Feng.info("接送机比例抽成不能为空!");
+ return;
+ }else if (!regDouble.test(jsjPercent)) {
+ Feng.info("接送机比例抽成格式不正确!");
+ return;
+ }
+ }else if (2 == jsj){
+ var jsjMoney = $("#jsjMoney").val();
+ if ("" == jsjMoney){
+ Feng.info("接送机固定金额抽成不能为空!");
+ return;
+ }else if (!regDouble.test(jsjMoney)) {
+ Feng.info("接送机固定金额抽成格式不正确!");
+ return;
+ }
+ }
+ }
var subArr=[];
$(".timeClass").each(function () {
@@ -353,6 +376,18 @@
ajax.set("isCharter",1);
}else{
ajax.set("isCharter",2);
+ }
+ if (checkbox7){
+ var jsj = $("input[name='jsj']:checked").val();
+ ajax.set("isTransferFixedOrProportional",jsj);
+ if (1 == jsj){
+ ajax.set("transferMoney",$("#jsjPercent").val());
+ }else if (2 == jsj) {
+ ajax.set("transferMoney",$("#jsjMoney").val());
+ }
+ ajax.set("isTransfer",1);
+ }else{
+ ajax.set("isTransfer",2);
}
ajax.set("isNeedFerry",isNeedFerry);
@@ -474,7 +509,29 @@
}
}
var checkbox6 = $('#checkbox6').prop('checked');
-
+ var checkbox7 = $('#checkbox7').prop('checked');
+ if (checkbox7) {
+ var jsj = $("input[name='jsj']:checked").val();
+ if (1 == jsj){
+ var jsjPercent = $("#jsjPercent").val();
+ if ("" == jsjPercent){
+ Feng.info("接送机比例抽成不能为空!");
+ return;
+ }else if (!regDouble.test(jsjPercent)) {
+ Feng.info("接送机比例抽成格式不正确!");
+ return;
+ }
+ }else if (2 == jsj){
+ var jsjMoney = $("#jsjMoney").val();
+ if ("" == jsjMoney){
+ Feng.info("接送机固定金额抽成不能为空!");
+ return;
+ }else if (!regDouble.test(jsjMoney)) {
+ Feng.info("接送机固定金额抽成格式不正确!");
+ return;
+ }
+ }
+ }
var subArr=[];
$(".timeClass").each(function () {
subArr.push({
@@ -560,6 +617,18 @@
}else{
ajax.set("isCharter",2);
}
+ if (checkbox7){
+ var jsj = $("input[name='jsj']:checked").val();
+ ajax.set("isTransferFixedOrProportional",jsj);
+ if (1 == jsj){
+ ajax.set("transferMoney",$("#jsjPercent").val());
+ }else if (2 == jsj) {
+ ajax.set("transferMoney",$("#jsjMoney").val());
+ }
+ ajax.set("isTransfer",1);
+ }else{
+ ajax.set("isTransfer",2);
+ }
ajax.set("isNeedFerry",isNeedFerry);
ajax.set("subArr",JSON.stringify(subArr));
@@ -634,6 +703,15 @@
$("#bcDiv").hide();
}
}
+//接送机
+TCompanyInfoDlg.checkbox7 = function () {
+ var checkbox7 = $('#checkbox7').prop('checked');
+ if (checkbox7){
+ $("#jsjDiv").show();
+ } else {
+ $("#jsjDiv").hide();
+ }
+}
//省改变
TCompanyInfoDlg.provinceChange = function (e) {
var provinceCode=$(e).val();
diff --git a/ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tInvoice/tInvoice.js b/ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tInvoice/tInvoice.js
index 269c576..bca7775 100644
--- a/ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tInvoice/tInvoice.js
+++ b/ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tInvoice/tInvoice.js
@@ -25,6 +25,19 @@
return btn;
}
},
+ {title: '发票类型', field: 'invoiceType', visible: true, align: 'center', valign: 'middle',
+ formatter: function (value, row) {
+ var btn = "";
+ if(row.invoiceType != '' && row.invoiceType != null) {
+ if (row.invoiceType == 1){
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="个人发票" onfocus="TUser.tooltip()">普票</p>']
+ } else if (row.invoiceType == 2){
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="单位发票" onfocus="TUser.tooltip()">专票</p>']
+ }
+ }
+ return btn;
+ }
+ },
{title: '抬头类型', field: 'type', visible: true, align: 'center', valign: 'middle',
formatter: function (value, row) {
var btn = "";
--
Gitblit v1.7.1