From 53562814add61acfdc02d6b25dae6324f6fd5f92 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 18 五月 2023 16:38:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver_info.js | 64 +++++++++++++++++++++----------
1 files changed, 43 insertions(+), 21 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver_info.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver_info.js
index bac7e1a..653972d 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver_info.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver_info.js
@@ -346,7 +346,8 @@
.set('licenselImgUrl')
.set('driverAge')
.set('driveCard')
- .set('driveCardImgUrl')
+ .set('driveCardImgUrl1')
+ .set('driveCardImgUrl2')
.set('driverType')
.set('getDriverLicenseDate')
.set('driverLicenseOn')
@@ -379,7 +380,9 @@
.set('insertUser')
.set('updateTime')
.set('updateUser')
- .set('addType');
+ .set('addType')
+ .set('birthday')
+ .set('email');
}
/**
@@ -389,9 +392,9 @@
this.clearData();
this.collectData();
- if(!this.validate()){
- return ;
- }
+ // if(!this.validate()){
+ // return ;
+ // }
var roleType = $("#roleType").val(); //1=平台 2=分公司 3=加盟商
var companyType = $("input[name='companyType']:checked").val();
if (1 == roleType){
@@ -411,13 +414,18 @@
return;
}
var faceImgUrl = $("#faceImgUrl").val();
- if ("" == faceImgUrl){
- Feng.info("请上传人脸识别照片");
+ // if ("" == faceImgUrl){
+ // Feng.info("请上传人脸识别照片");
+ // return;
+ // }
+ var driveCardImgUrl1 = $("#driveCardImgUrl1").val();
+ if ("" == driveCardImgUrl1){
+ Feng.info("请上传驾驶证正面照片");
return;
}
- var driveCardImgUrl = $("#driveCardImgUrl").val();
- if ("" == driveCardImgUrl){
- Feng.info("请上传驾驶证照片");
+ var driveCardImgUrl2 = $("#driveCardImgUrl2").val();
+ if ("" == driveCardImgUrl2){
+ Feng.info("请上传驾驶证背面照片");
return;
}
var serverBox =[];
@@ -486,9 +494,9 @@
this.clearData();
this.collectData();
- if(!this.validate()){
- return ;
- }
+ // if(!this.validate()){
+ // return ;
+ // }
var roleType = $("#roleType").val(); //1=平台 2=分公司 3=加盟商
var companyType = $("input[name='companyType']:checked").val();
if (1 == roleType){
@@ -507,13 +515,18 @@
return;
}
var faceImgUrl = $("#faceImgUrl").val();
- if ("" == faceImgUrl){
- Feng.info("请上传人脸识别照片");
+ // if ("" == faceImgUrl){
+ // Feng.info("请上传人脸识别照片");
+ // return;
+ // }
+ var driveCardImgUrl1 = $("#driveCardImgUrl1").val();
+ if ("" == driveCardImgUrl1){
+ Feng.info("请上传驾驶证正面照片");
return;
}
- var driveCardImgUrl = $("#driveCardImgUrl").val();
- if ("" == driveCardImgUrl){
- Feng.info("请上传驾驶证照片");
+ var driveCardImgUrl2 = $("#driveCardImgUrl2").val();
+ if ("" == driveCardImgUrl2){
+ Feng.info("请上传驾驶证背面照片");
return;
}
var serverBox =[];
@@ -584,12 +597,21 @@
var faceImgUrl = new $WebUpload("faceImgUrl");
faceImgUrl.setUploadBarId("progressBar");
faceImgUrl.init();
- var driveCardImgUrl = new $WebUpload("driveCardImgUrl");
- driveCardImgUrl.setUploadBarId("progressBar");
- driveCardImgUrl.init();
+ var driveCardImgUrl1 = new $WebUpload("driveCardImgUrl1");
+ driveCardImgUrl1.setUploadBarId("progressBar");
+ driveCardImgUrl1.init();
+ var driveCardImgUrl2 = new $WebUpload("driveCardImgUrl2");
+ driveCardImgUrl2.setUploadBarId("progressBar");
+ driveCardImgUrl2.init();
var networkCarlssueImg = new $WebUpload("networkCarlssueImg");
networkCarlssueImg.setUploadBarId("progressBar");
networkCarlssueImg.init();
+ var idCardImgUrl1 = new $WebUpload("idCardImgUrl1");
+ idCardImgUrl1.setUploadBarId("progressBar");
+ idCardImgUrl1.init();
+ var idCardImgUrl2 = new $WebUpload("idCardImgUrl2");
+ idCardImgUrl2.setUploadBarId("progressBar");
+ idCardImgUrl2.init();
});
/**
--
Gitblit v1.7.1