From e006264e926df1fd089a92a017cfd2b53c4fa2dc Mon Sep 17 00:00:00 2001
From: 曾富康 <1067864236@qq.com>
Date: 星期二, 16 六月 2026 16:57:51 +0800
Subject: [PATCH] 后台新增：司机列表字段
---
ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java | 65 ++++++++++++++++
ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCompanyMapper.xml | 3
ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java | 8 ++
ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_edit.html | 13 +++
ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java | 5 +
ManagementYKDTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver.js | 11 ++
ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCompany.java | 13 +++
ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_look.html | 41 ++++++++++
ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml | 12 ++
ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detail.html | 1
ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html | 7 +
ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html | 7 +
ManagementYKDTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver_info.js | 11 ++
ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_add.html | 13 +++
ManagementYKDTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/tCompany_info.js | 5 +
ManagementYKDTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver.js | 11 ++
16 files changed, 222 insertions(+), 4 deletions(-)
diff --git a/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java b/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java
index 248ebe5..9ef91c0 100644
--- a/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java
+++ b/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java
@@ -401,6 +401,10 @@
if (commissionError != null) {
return commissionError;
}
+ // 新用户优先派单默认否，兼容旧页面或接口未传值的情况
+ if (tCompany.getNewUserPriorityDispatch() == null) {
+ tCompany.setNewUserPriorityDispatch(0);
+ }
tCompany.setIsNeedFerry(2);
tCompany.setType(2); //2：分公司
tCompany.setState(0); //0：正常
@@ -572,6 +576,10 @@
return commissionError;
}
TCompany oldCompany = tCompanyService.selectById(tCompany.getId());
+ // 新用户优先派单默认否，兼容旧页面或接口未传值的情况
+ if (tCompany.getNewUserPriorityDispatch() == null) {
+ tCompany.setNewUserPriorityDispatch(0);
+ }
tCompany.setIsNeedFerry(2);
User user = userService.selectById(userId);
if(null != user && ToolUtil.isNotEmpty(password)){
diff --git a/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java b/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
index 6b44ce1..b5e7a56 100644
--- a/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
+++ b/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
@@ -1131,6 +1131,11 @@
obj.setIdCardImgUrl2(tDriver.getIdCardImgUrl2());
obj.setDriverAddress(tDriver.getDriverAddress());
obj.setTaxiAptitudeCard(tDriver.getTaxiAptitudeCard());
+ obj.setEnterpriseName(tDriver.getEnterpriseName());
+ obj.setQualificationCertificateNumber(tDriver.getQualificationCertificateNumber());
+ obj.setQualificationCertificateImg(tDriver.getQualificationCertificateImg());
+ obj.setVehicleOperationCertificateNumber(tDriver.getVehicleOperationCertificateNumber());
+ obj.setVehicleOperationCertificateImg(tDriver.getVehicleOperationCertificateImg());
obj.setJobNumber(tDriver.getJobNumber());
obj.setAccount(tDriver.getPhone());
obj.setPassword(tDriver.getPassword());
diff --git a/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCompanyMapper.xml b/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCompanyMapper.xml
index 0a38ad2..ec2a4b6 100644
--- a/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCompanyMapper.xml
+++ b/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCompanyMapper.xml
@@ -25,6 +25,7 @@
<result column="isCanModifyAmount" property="isCanModifyAmount" />
<result column="isOfflinePay" property="isOfflinePay" />
<result column="isOpenDriverSelfTrip" property="isOpenDriverSelfTrip" />
+ <result column="newUserPriorityDispatch" property="newUserPriorityDispatch" />
<result column="name" property="name" />
<result column="type" property="type" />
<result column="superiorId" property="superiorId" />
@@ -68,7 +69,7 @@
<sql id="Base_Column_List">
id, isSpe, isTaxi, isCross, isCrossLogistics, isSameLogistics, isCharter, isSpeFixedOrProportional, isTaxiFixedOrProportional,
isCrossLogisticsFixedOrProportional, isSameLogisticsFixedOrProportional, speMoney, taxiMoney, crossMoney, crossLogisticsMoney, sameLogisticsMoney,
- isNeedFerry, isCanSelectSeat, isCanModifyAmount, isOfflinePay, isOpenDriverSelfTrip, name, type, superiorId, principalName, principalPhone, adminName, adminPhone, urgentPhoen, setupTime, identifier, addressCode,
+ isNeedFerry, isCanSelectSeat, isCanModifyAmount, isOfflinePay, isOpenDriverSelfTrip, newUserPriorityDispatch, name, type, superiorId, principalName, principalPhone, adminName, adminPhone, urgentPhoen, setupTime, identifier, addressCode,
businessScope, contactAddress, documentAddress, economicType, regCapital, legalName, legalId, legalPhone, legalPhotoUrl, licensingAgency, licenseTime,
licenseStartTime, licenseEndTime, licenseNumber, carNum, driverNum, mac, state, flag, upload, insertTime, detailAddress, companyInfo, scale, cross
</sql>
diff --git a/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml b/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml
index 5c24b10..aa5d0c4 100644
--- a/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml
+++ b/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml
@@ -38,6 +38,11 @@
<result column="taxiDriver" property="taxiDriver" />
<result column="taxiAptitudeCard" property="taxiAptitudeCard" />
<result column="networkCarlssueImg" property="networkCarlssueImg" />
+ <result column="enterpriseName" property="enterpriseName" />
+ <result column="qualificationCertificateNumber" property="qualificationCertificateNumber" />
+ <result column="qualificationCertificateImg" property="qualificationCertificateImg" />
+ <result column="vehicleOperationCertificateNumber" property="vehicleOperationCertificateNumber" />
+ <result column="vehicleOperationCertificateImg" property="vehicleOperationCertificateImg" />
<result column="networkCarlssueOrganization" property="networkCarlssueOrganization" />
<result column="networkCarlssueDate" property="networkCarlssueDate" />
<result column="getNetworkCarProofDate" property="getNetworkCarProofDate" />
@@ -70,7 +75,7 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- id, account, jobNumber, phone, password, name, sex, idCard, companyId, headImgUrl, faceImgUrl, idCardImgUrl1, idCardImgUrl2, placeOfEmployment, birthday, bankCardNumber, driverNationality, driverNation, driverMaritalStatus, driverLanguageLevel, driverEducation, driverCensus, driverAddress, driverContactAddress, licenseCode, licenselImgUrl, driverAge, driveCard, driveCardImgUrl, driverType, getDriverLicenseDate, driverLicenseOn, driverLicenseOff, taxiDriver, taxiAptitudeCard, networkCarlssueImg, networkCarlssueOrganization, networkCarlssueDate, getNetworkCarProofDate, networkCarProofOn, networkCarProofOff, registerDate, fullTimeDriver, inDriverBlacklist, commercialType, contractCompany, contractOn, contractOff, emergencyContact, emergencyContactPhone, emergencyContactAddress, remark, isPlatCar, carId, authState, state, flag, insertTime, insertUser, updateTime, updateUser, addType
+ id, account, jobNumber, phone, password, name, sex, idCard, companyId, headImgUrl, faceImgUrl, idCardImgUrl1, idCardImgUrl2, placeOfEmployment, birthday, bankCardNumber, driverNationality, driverNation, driverMaritalStatus, driverLanguageLevel, driverEducation, driverCensus, driverAddress, driverContactAddress, licenseCode, licenselImgUrl, driverAge, driveCard, driveCardImgUrl, driverType, getDriverLicenseDate, driverLicenseOn, driverLicenseOff, taxiDriver, taxiAptitudeCard, networkCarlssueImg, enterpriseName, qualificationCertificateNumber, qualificationCertificateImg, vehicleOperationCertificateNumber, vehicleOperationCertificateImg, networkCarlssueOrganization, networkCarlssueDate, getNetworkCarProofDate, networkCarProofOn, networkCarProofOff, registerDate, fullTimeDriver, inDriverBlacklist, commercialType, contractCompany, contractOn, contractOff, emergencyContact, emergencyContactPhone, emergencyContactAddress, remark, isPlatCar, carId, authState, state, flag, insertTime, insertUser, updateTime, updateUser, addType
</sql>
<!--根据条件查询待审核司机列表-->
@@ -121,6 +126,11 @@
case when dd.addType = 1 then '司机注册' when dd.addType = 2 then '平台添加' when dd.addType = 3 then '分公司添加' when dd.addType = 4 then '加盟商添加' else '' end as addTypeStr,
case when dd.sex = 1 then '男' when dd.sex = 2 then '女' else '' end as sexStr,
case when dd.authState = 1 then '待审核' when dd.authState = 2 then '正常' when dd.authState = 3 then '冻结' when dd.authState = 4 then '已拒绝' end as authStateStr,
+ dd.enterpriseName as enterpriseName,
+ dd.qualificationCertificateNumber as qualificationCertificateNumber,
+ dd.qualificationCertificateImg as qualificationCertificateImg,
+ dd.vehicleOperationCertificateNumber as vehicleOperationCertificateNumber,
+ dd.vehicleOperationCertificateImg as vehicleOperationCertificateImg,
dd.* from t_driver as dd
LEFT JOIN (select * from t_company where flag != 3) as cc on cc.id = dd.companyId
LEFT JOIN (
diff --git a/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCompany.java b/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCompany.java
index 58ade6d..2a9e0b3 100644
--- a/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCompany.java
+++ b/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCompany.java
@@ -119,6 +119,10 @@
*/
private Integer isOpenDriverSelfTrip;
/**
+ * 新用户优先派单（0=否，1=是）
+ */
+ private Integer newUserPriorityDispatch;
+ /**
* 企业名称
*/
private String name;
@@ -585,6 +589,14 @@
this.isOpenDriverSelfTrip = isOpenDriverSelfTrip;
}
+ public Integer getNewUserPriorityDispatch() {
+ return newUserPriorityDispatch;
+ }
+
+ public void setNewUserPriorityDispatch(Integer newUserPriorityDispatch) {
+ this.newUserPriorityDispatch = newUserPriorityDispatch;
+ }
+
public String getName() {
return name;
}
@@ -973,6 +985,7 @@
", isCanModifyAmount=" + isCanModifyAmount +
", isOfflinePay=" + isOfflinePay +
", isOpenDriverSelfTrip=" + isOpenDriverSelfTrip +
+ ", newUserPriorityDispatch=" + newUserPriorityDispatch +
", name=" + name +
", type=" + type +
", superiorId=" + superiorId +
diff --git a/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java b/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java
index 8d9eb8a..0ac4c99 100644
--- a/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java
+++ b/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java
@@ -166,6 +166,26 @@
*/
private String networkCarlssueImg;
/**
+ * 所属企业
+ */
+ private String enterpriseName;
+ /**
+ * 从业资格证号码
+ */
+ private String qualificationCertificateNumber;
+ /**
+ * 从业资格证图片
+ */
+ private String qualificationCertificateImg;
+ /**
+ * 车辆运营证号码
+ */
+ private String vehicleOperationCertificateNumber;
+ /**
+ * 车辆运营证图片
+ */
+ private String vehicleOperationCertificateImg;
+ /**
* 网络预约出租车驾驶员证发证机构
*/
private String networkCarlssueOrganization;
@@ -617,6 +637,46 @@
this.networkCarlssueImg = networkCarlssueImg;
}
+ public String getEnterpriseName() {
+ return enterpriseName;
+ }
+
+ public void setEnterpriseName(String enterpriseName) {
+ this.enterpriseName = enterpriseName;
+ }
+
+ public String getQualificationCertificateNumber() {
+ return qualificationCertificateNumber;
+ }
+
+ public void setQualificationCertificateNumber(String qualificationCertificateNumber) {
+ this.qualificationCertificateNumber = qualificationCertificateNumber;
+ }
+
+ public String getQualificationCertificateImg() {
+ return qualificationCertificateImg;
+ }
+
+ public void setQualificationCertificateImg(String qualificationCertificateImg) {
+ this.qualificationCertificateImg = qualificationCertificateImg;
+ }
+
+ public String getVehicleOperationCertificateNumber() {
+ return vehicleOperationCertificateNumber;
+ }
+
+ public void setVehicleOperationCertificateNumber(String vehicleOperationCertificateNumber) {
+ this.vehicleOperationCertificateNumber = vehicleOperationCertificateNumber;
+ }
+
+ public String getVehicleOperationCertificateImg() {
+ return vehicleOperationCertificateImg;
+ }
+
+ public void setVehicleOperationCertificateImg(String vehicleOperationCertificateImg) {
+ this.vehicleOperationCertificateImg = vehicleOperationCertificateImg;
+ }
+
public String getNetworkCarlssueOrganization() {
return networkCarlssueOrganization;
}
@@ -923,6 +983,11 @@
", taxiDriver=" + taxiDriver +
", taxiAptitudeCard=" + taxiAptitudeCard +
", networkCarlssueImg=" + networkCarlssueImg +
+ ", enterpriseName=" + enterpriseName +
+ ", qualificationCertificateNumber=" + qualificationCertificateNumber +
+ ", qualificationCertificateImg=" + qualificationCertificateImg +
+ ", vehicleOperationCertificateNumber=" + vehicleOperationCertificateNumber +
+ ", vehicleOperationCertificateImg=" + vehicleOperationCertificateImg +
", networkCarlssueOrganization=" + networkCarlssueOrganization +
", networkCarlssueDate=" + networkCarlssueDate +
", getNetworkCarProofDate=" + getNetworkCarProofDate +
diff --git a/ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_add.html b/ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_add.html
index dfe38f1..b7fed26 100644
--- a/ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_add.html
+++ b/ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_add.html
@@ -237,6 +237,19 @@
</div>
</div>
</div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">新用户优先派单：</label>
+ <div class="col-sm-9" style="display: flex;align-items: center;">
+ <div class="radio radio-info radio-inline">
+ <input id="newUserPriorityDispatch1" name="newUserPriorityDispatch" type="radio" value="1">
+ <label for="newUserPriorityDispatch1"> 是 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input checked="" id="newUserPriorityDispatch0" name="newUserPriorityDispatch" type="radio" value="0">
+ <label for="newUserPriorityDispatch0"> 否 </label>
+ </div>
+ </div>
+ </div>
<div class="form-group" style="display: none;">
<label class="col-sm-2 control-label">是否需要摆渡车：</label>
<div class="col-sm-9" style="display: flex;align-items: center;">
diff --git a/ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detail.html b/ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detail.html
index 1540534..39f589c 100644
--- a/ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detail.html
+++ b/ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detail.html
@@ -61,6 +61,7 @@
<#label id="legalPhone" name="法人代表电话" value="${item.legalPhone}"/>
<#label id="businessScope" name="经营范围" value="${item.businessScope}"/>
<#label id="paymentDays" name="分账账期" value="${item.paymentDays}"/>
+ <#label id="newUserPriorityDispatch" name="新用户优先派单" value="${1 == item.newUserPriorityDispatch ? '是' : '否'}"/>
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人身份<br>证照片(反面)：</label>
<div class="col-sm-9">
diff --git a/ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_edit.html b/ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_edit.html
index 97613a4..71bc6ec 100644
--- a/ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_edit.html
+++ b/ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_edit.html
@@ -251,6 +251,19 @@
</div>
</div>
</div>
+ <div class="form-group col-sm-12">
+ <label class="col-sm-2 control-label">新用户优先派单：</label>
+ <div class="col-sm-9" style="display: flex;align-items: center;">
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="newUserPriorityDispatch1" value="1" name="newUserPriorityDispatch" ${1 == item.newUserPriorityDispatch ? 'checked=checked' : ''}>
+ <label for="newUserPriorityDispatch1"> 是 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="newUserPriorityDispatch0" value="0" name="newUserPriorityDispatch" ${1 != item.newUserPriorityDispatch ? 'checked=checked' : ''}>
+ <label for="newUserPriorityDispatch0"> 否 </label>
+ </div>
+ </div>
+ </div>
<div class="form-group col-sm-12" style="display: none;">
<label class="col-sm-2 control-label">是否需要摆渡车：</label>
<div class="col-sm-9" style="display: flex;align-items: center;">
diff --git a/ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html b/ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html
index 678a87d..63808e2 100644
--- a/ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html
+++ b/ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html
@@ -96,6 +96,11 @@
<#input id="driverAddress" name="居住地址" />
<#input id="taxiAptitudeCard" name="出租车资格证号" />
<#avatar id="networkCarlssueImg" name="网约车资格证照片：" />
+ <#input id="enterpriseName" name="所属企业" />
+ <#input id="qualificationCertificateNumber" name="从业资格证号码" />
+ <#avatar id="qualificationCertificateImg" name="从业资格证图片：" />
+ <#input id="vehicleOperationCertificateNumber" name="车辆运营证号码" />
+ <#avatar id="vehicleOperationCertificateImg" name="车辆运营证图片：" />
<#input id="jobNumber" name="工号(选填)" />
<div class="form-group">
<fieldset>
@@ -255,7 +260,7 @@
</div>
</div>
-<script src="${ctxPath}/static/modular/system/tDriver/yesDriver_info.js"></script>
+<script src="${ctxPath}/static/modular/system/tDriver/yesDriver_info.js?v=2026061601"></script>
<script>
laydate.render({
diff --git a/ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html b/ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html
index 783877f..8971817 100644
--- a/ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html
+++ b/ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html
@@ -104,6 +104,11 @@
<#avatar id="idCardImgUrl2" name="身份证背面照：" avatarImg="${item.idCardImgUrl2}"/>
<#input id="driverAddress" name="居住地址" value="${item.driverAddress}"/>
<#input id="taxiAptitudeCard" name="出租车资格证号" value="${item.taxiAptitudeCard}"/>
+ <#input id="enterpriseName" name="所属企业" value="${item.enterpriseName}"/>
+ <#input id="qualificationCertificateNumber" name="从业资格证号码" value="${item.qualificationCertificateNumber}"/>
+ <#avatar id="qualificationCertificateImg" name="从业资格证图片：" avatarImg="${item.qualificationCertificateImg}"/>
+ <#input id="vehicleOperationCertificateNumber" name="车辆运营证号码" value="${item.vehicleOperationCertificateNumber}"/>
+ <#avatar id="vehicleOperationCertificateImg" name="车辆运营证图片：" avatarImg="${item.vehicleOperationCertificateImg}"/>
<#input id="jobNumber" name="工号(选填)" value="${item.jobNumber}"/>
<div class="form-group">
<fieldset>
@@ -268,7 +273,7 @@
</div>
</div>
-<script src="${ctxPath}/static/modular/system/tDriver/yesDriver_info.js"></script>
+<script src="${ctxPath}/static/modular/system/tDriver/yesDriver_info.js?v=2026061601"></script>
<script type="application/javascript">
laydate.render({
elem: '#getDriverLicenseDate'
diff --git a/ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_look.html b/ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_look.html
index c5dcc64..f25b491 100644
--- a/ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_look.html
+++ b/ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_look.html
@@ -31,6 +31,27 @@
<#label id="idCard" name="身份证号码" value="${item.idCard}"/>
<#label id="driverAddress" name="居住地址" value="${item.driverAddress}"/>
<#label id="taxiAptitudeCard" name="出租车资格证号" value="${item.taxiAptitudeCard}"/>
+ <#label id="enterpriseName" name="所属企业" value="${item.enterpriseName}"/>
+ <#label id="qualificationCertificateNumber" name="从业资格证号码" value="${item.qualificationCertificateNumber}"/>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">从业资格证图片：</label>
+ <div class="col-sm-9">
+ <div class="form-group">
+ <div class="col-sm-6">
+ <div id="qualificationCertificateImgPreId">
+ <div>
+ @if(isEmpty(item.qualificationCertificateImg)){
+ <img onclick="lookBigImg('${ctxPath}/static/img/NoPIC.png')" src="${ctxPath}/static/img/NoPIC.png" style="width:150px;">
+ @}else{
+ <img onclick="lookBigImg('${item.qualificationCertificateImg}')" src="${item.qualificationCertificateImg}" style="width:150px;">
+ @}
+ </div>
+ </div>
+ </div>
+ <input type="hidden" id="qualificationCertificateImg" name="qualificationCertificateImg" value="${item.qualificationCertificateImg}"/>
+ </div>
+ </div>
+ </div>
<#label id="placeOfPractice" name="从业地" value="${placeOfPractice}"/>
<#label id="serverStr" name="服务模式" value="${item.serverStr}"/>
<#label id="authStateStr" name="审核结果" value="${item.authStateStr}"/>
@@ -58,6 +79,26 @@
</div>
<#label id="companyName" name="所属机构" value="${item.companyName}"/>
<#label id="driverAge" name="驾龄" value="${item.driverAge}"/>
+ <#label id="vehicleOperationCertificateNumber" name="车辆运营证号码" value="${item.vehicleOperationCertificateNumber}"/>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">车辆运营证图片：</label>
+ <div class="col-sm-9">
+ <div class="form-group">
+ <div class="col-sm-6">
+ <div id="vehicleOperationCertificateImgPreId">
+ <div>
+ @if(isEmpty(item.vehicleOperationCertificateImg)){
+ <img onclick="lookBigImg('${ctxPath}/static/img/NoPIC.png')" src="${ctxPath}/static/img/NoPIC.png" style="width:150px;">
+ @}else{
+ <img onclick="lookBigImg('${item.vehicleOperationCertificateImg}')" src="${item.vehicleOperationCertificateImg}" style="width:150px;">
+ @}
+ </div>
+ </div>
+ </div>
+ <input type="hidden" id="vehicleOperationCertificateImg" name="vehicleOperationCertificateImg" value="${item.vehicleOperationCertificateImg}"/>
+ </div>
+ </div>
+ </div>
<div class="form-group">
<label class="col-sm-3 control-label">身份证正面：</label>
<div class="col-sm-9">
diff --git a/ManagementYKDTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/tCompany_info.js b/ManagementYKDTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/tCompany_info.js
index ecd204c..1b35b19 100644
--- a/ManagementYKDTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/tCompany_info.js
+++ b/ManagementYKDTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/tCompany_info.js
@@ -184,6 +184,7 @@
.set('crossLogisticsMoney')
.set('sameLogisticsMoney')
.set('isNeedFerry')
+ .set('newUserPriorityDispatch', $("input[name='newUserPriorityDispatch']:checked").val())
.set('name')
.set('type')
.set('superiorId')
@@ -356,6 +357,7 @@
var isCanModifyAmount = $("#isCanModifyAmount").is(":checked") ? 1 : 2;
var isOfflinePay = $("#isOfflinePay").is(":checked") ? 1 : 2;
var isOpenDriverSelfTrip = $("input[name='isOpenDriverSelfTrip']:checked").val();
+ var newUserPriorityDispatch = $("input[name='newUserPriorityDispatch']:checked").val() || 0;
//提交信息
var ajax = new $ax(Feng.ctxPath + "/tCompany/add", function(data){
if (TCompanyInfoDlg.hasSubmitError(data)){
@@ -455,6 +457,7 @@
ajax.set("isCanModifyAmount",isCanModifyAmount);
ajax.set("isOfflinePay",isOfflinePay);
ajax.set("isOpenDriverSelfTrip",isOpenDriverSelfTrip);
+ ajax.set("newUserPriorityDispatch",newUserPriorityDispatch);
ajax.set("subArr",JSON.stringify(subArr));
ajax.set("account",$("#account").val());
@@ -597,6 +600,7 @@
var isCanModifyAmount = $("#isCanModifyAmount").is(":checked") ? 1 : 2;
var isOfflinePay = $("#isOfflinePay").is(":checked") ? 1 : 2;
var isOpenDriverSelfTrip = $("input[name='isOpenDriverSelfTrip']:checked").val();
+ var newUserPriorityDispatch = $("input[name='newUserPriorityDispatch']:checked").val() || 0;
//提交信息
var ajax = new $ax(Feng.ctxPath + "/tCompany/update", function(data){
if (TCompanyInfoDlg.hasSubmitError(data)){
@@ -692,6 +696,7 @@
ajax.set("isCanModifyAmount",isCanModifyAmount);
ajax.set("isOfflinePay",isOfflinePay);
ajax.set("isOpenDriverSelfTrip",isOpenDriverSelfTrip);
+ ajax.set("newUserPriorityDispatch",newUserPriorityDispatch);
ajax.set("subArr",JSON.stringify(subArr));
ajax.set("account",$("#account").val());
diff --git a/ManagementYKDTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver.js b/ManagementYKDTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver.js
index b09ec09..33a55cc 100644
--- a/ManagementYKDTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver.js
+++ b/ManagementYKDTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver.js
@@ -84,6 +84,17 @@
return btn;
}
},
+ {title: '所属企业', field: 'enterpriseName', visible: true, align: 'center', valign: 'middle',
+ formatter: function (value, row) {
+ var btn = "";
+ if(row.enterpriseName != '' && row.enterpriseName != null) {
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.enterpriseName + '" onfocus="TUser.tooltip()">' + row.enterpriseName + '</p>']
+ }else{
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="-" onfocus="TUser.tooltip()">-</p>']
+ }
+ return btn;
+ }
+ },
{title: '登录账号【手机号】', field: 'phone', visible: true, align: 'center', valign: 'middle',
formatter: function (value, row) {
var btn = "";
diff --git a/ManagementYKDTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver.js b/ManagementYKDTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver.js
index 120e4e2..a918f0f 100644
--- a/ManagementYKDTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver.js
+++ b/ManagementYKDTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver.js
@@ -106,6 +106,17 @@
return btn;
}
},
+ {title: '所属<br/>企业', field: 'enterpriseName', visible: true, align: 'center', valign: 'middle',width:'8%',
+ formatter: function (value, row) {
+ var btn = "";
+ if(row.enterpriseName != '' && row.enterpriseName != null) {
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.enterpriseName + '" onfocus="TUser.tooltip()">' + row.enterpriseName + '</p>']
+ }else{
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="-" onfocus="TUser.tooltip()">-</p>']
+ }
+ return btn;
+ }
+ },
{title: '当前车辆', field: 'carLicensePlate', visible: true, align: 'center', valign: 'middle',width:'7%',
formatter: function (value, row) {
var btn = "";
diff --git a/ManagementYKDTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver_info.js b/ManagementYKDTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver_info.js
index 33a9c66..a9a7106 100644
--- a/ManagementYKDTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver_info.js
+++ b/ManagementYKDTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver_info.js
@@ -363,6 +363,11 @@
.set('taxiDriver')
.set('taxiAptitudeCard')
.set('networkCarlssueImg')
+ .set('enterpriseName')
+ .set('qualificationCertificateNumber')
+ .set('qualificationCertificateImg')
+ .set('vehicleOperationCertificateNumber')
+ .set('vehicleOperationCertificateImg')
.set('networkCarlssueOrganization')
.set('networkCarlssueDate')
.set('getNetworkCarProofDate')
@@ -713,6 +718,12 @@
var driveCardImgUrl = new $WebUpload("driveCardImgUrl");
driveCardImgUrl.setUploadBarId("progressBar");
driveCardImgUrl.init();
+ var qualificationCertificateImg = new $WebUpload("qualificationCertificateImg");
+ qualificationCertificateImg.setUploadBarId("progressBar");
+ qualificationCertificateImg.init();
+ var vehicleOperationCertificateImg = new $WebUpload("vehicleOperationCertificateImg");
+ vehicleOperationCertificateImg.setUploadBarId("progressBar");
+ vehicleOperationCertificateImg.init();
var networkCarlssueImg = new $WebUpload("networkCarlssueImg");
networkCarlssueImg.setUploadBarId("progressBar");
networkCarlssueImg.init();
--
Gitblit v1.7.1