From 753c4aede53b07041841d9aa94859b59e366bd5d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 14 八月 2023 18:47:39 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/SuperSaveDriving
---
management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver_info.js | 253 +++++++++++++++++++++++++++++++++----------------
1 files changed, 169 insertions(+), 84 deletions(-)
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver_info.js b/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver_info.js
index 3180e08..e1339f2 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver_info.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver_info.js
@@ -1,8 +1,81 @@
/**
- * 初始化司机审核列表详情对话框
+ * 初始化详情对话框
*/
var TDriverInfoDlg = {
- tDriverInfoData : {}
+ tDriverInfoData : {},
+ validateFields: {
+ name: {
+ validators: {
+ notEmpty: {
+ message: '姓名不能为空'
+ },
+ regexp: {
+ regexp: /^[\u4E00-\u9FA5A-Za-z\s]+$/,
+ message: '不能输入特殊字符和数字'
+ }
+ }
+ },
+ phone: {
+ validators: {
+ notEmpty: {
+ message: '手机号不能为空'
+ },
+ regexp: {
+ regexp: /^1[3-9]\d{9}$/,
+ message: '请输入合法手机号'
+ }
+ }
+ },
+ emergencyContact: {
+ validators: {
+ notEmpty: {
+ message: '紧急联系人姓名不能为空'
+ },
+ regexp: {
+ regexp: /^[\u4E00-\u9FA5A-Za-z\s]+$/,
+ message: '不能输入特殊字符和数字'
+ }
+ }
+ },
+ emergencyPhone: {
+ validators: {
+ notEmpty: {
+ message: '紧急联系人电话不能为空'
+ },
+ regexp: {
+ regexp: /^1[3-9]\d{9}$/,
+ message: '请输入合法手机号'
+ }
+ }
+ },
+ area: {
+ validators: {
+ notEmpty: {
+ message: '请选择服务区域'
+ }
+ }
+ },
+ idcard: {
+ validators: {
+ notEmpty: {
+ message: '身份证号码不能为空'
+ },
+ regexp: {
+ regexp: /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/,
+ message: '请输入合法身份证号码'
+ }
+ }
+ },
+ }
+};
+
+/**
+ * 验证数据是否为空
+ */
+TDriverInfoDlg.validate = function () {
+ $('#driverInfoForm').data("bootstrapValidator").resetForm();
+ $('#driverInfoForm').bootstrapValidator('validate');
+ return $("#driverInfoForm").data('bootstrapValidator').isValid();
};
/**
@@ -40,91 +113,48 @@
parent.layer.close(window.parent.TDriver.layerIndex);
}
+TDriverInfoDlg.closeException = function() {
+ parent.layer.close(window.parent.TDriverException.layerIndex);
+}
+
/**
* 收集数据
*/
TDriverInfoDlg.collectData = function() {
this
.set('id')
- .set('account')
- .set('jobNumber')
+ .set('code')
+ .set('name')
+ .set('avatar')
.set('phone')
.set('password')
- .set('name')
.set('sex')
- .set('idCard')
- .set('companyId')
- .set('headImgUrl')
- .set('faceImgUrl')
- .set('idCardImgUrl1')
- .set('idCardImgUrl2')
- .set('placeOfEmployment')
- .set('birthday')
- .set('bankCardNumber')
- .set('driverNationality')
- .set('driverNation')
- .set('driverMaritalStatus')
- .set('driverLanguageLevel')
- .set('driverEducation')
- .set('driverCensus')
- .set('driverAddress')
- .set('driverContactAddress')
- .set('licenseCode')
- .set('licenselImgUrl')
- .set('driverAge')
- .set('driveCard')
- .set('driveCardImgUrl')
- .set('driverType')
- .set('getDriverLicenseDate')
- .set('driverLicenseOn')
- .set('driverLicenseOff')
- .set('taxiDriver')
- .set('taxiAptitudeCard')
- .set('networkCarlssueImg')
- .set('networkCarlssueOrganization')
- .set('networkCarlssueDate')
- .set('getNetworkCarProofDate')
- .set('networkCarProofOn')
- .set('networkCarProofOff')
- .set('registerDate')
- .set('fullTimeDriver')
- .set('inDriverBlacklist')
- .set('commercialType')
- .set('contractCompany')
- .set('contractOn')
- .set('contractOff')
+ .set('source')
.set('emergencyContact')
- .set('emergencyContactPhone')
- .set('emergencyContactAddress')
- .set('remark')
- .set('isPlatCar')
- .set('carId')
- .set('authState')
- .set('state')
- .set('flag')
- .set('insertTime')
- .set('insertUser')
- .set('updateTime')
- .set('updateUser')
- .set('addType');
-}
-
-/**
- * 审核操作
- */
-TDriverInfoDlg.authOpt = function(){
- var authState = $("input[name='authState']:checked").val();
- //提交信息
- var ajax = new $ax(Feng.ctxPath + "/tDriver/authOpt", function(data){
- Feng.success("操作成功!");
- window.parent.TDriver.table.refresh();
- TDriverInfoDlg.close();
- },function(data){
- Feng.error("操作失败!" + data.responseJSON.message + "!");
- });
- ajax.set("id",$("#id").val());
- ajax.set("authState",authState);
- ajax.start();
+ .set('emergencyPhone')
+ .set('driverLicenseNumber')
+ .set('driverLicense')
+ .set('idcard')
+ .set('idcardFront')
+ .set('idcardBack')
+ .set('inviterType')
+ .set('inviterId')
+ .set('inviterName')
+ .set('inviterPhone')
+ .set('agentId')
+ .set('branchOfficeId')
+ .set('balance')
+ .set('approvalStatus')
+ .set('approvalNotes')
+ .set('approvalUserId')
+ .set('approvalTime')
+ .set('serverStatus')
+ .set('integral')
+ .set('firstCertificateTime')
+ .set('status')
+ .set('area')
+ .set('areaId')
+ .set('createTime');
}
/**
@@ -135,14 +165,42 @@
this.clearData();
this.collectData();
+ if(!this.validate()){
+ return ;
+ }
+
+ var idcardFront = $("#idcardFront").val();
+ if ("" == idcardFront){
+ Feng.info("请上传身份证正面照");
+ return;
+ }
+
+ var idcardBack = $("#idcardBack").val();
+ if ("" == idcardBack){
+ Feng.info("请上传身份证背面照");
+ return;
+ }
+
+ var driverLicense = $("#driverLicense").val();
+ if ("" == driverLicense){
+ Feng.info("请上传驾驶证");
+ return;
+ }
+
//提交信息
var ajax = new $ax(Feng.ctxPath + "/tDriver/add", function(data){
- Feng.success("添加成功!");
- window.parent.TDriver.table.refresh();
- TDriverInfoDlg.close();
+ if(data.code == 500){
+ Feng.error("添加失败!" + data.message + "!");
+ return false;
+ }else {
+ Feng.success("添加成功!");
+ window.parent.TDriver.table.refresh();
+ TDriverInfoDlg.close();
+ }
},function(data){
Feng.error("添加失败!" + data.responseJSON.message + "!");
});
+ console.log(this.tDriverInfoData)
ajax.set(this.tDriverInfoData);
ajax.start();
}
@@ -155,11 +213,38 @@
this.clearData();
this.collectData();
+ if(!this.validate()){
+ return ;
+ }
+
+ var idcardFront = $("#idcardFront").val();
+ if ("" == idcardFront){
+ Feng.info("请上传身份证正面照");
+ return;
+ }
+
+ var idcardBack = $("#idcardBack").val();
+ if ("" == idcardBack){
+ Feng.info("请上传身份证背面照");
+ return;
+ }
+
+ var driverLicense = $("#driverLicense").val();
+ if ("" == driverLicense){
+ Feng.info("请上传驾驶证");
+ return;
+ }
+
//提交信息
var ajax = new $ax(Feng.ctxPath + "/tDriver/update", function(data){
- Feng.success("修改成功!");
- window.parent.TDriver.table.refresh();
- TDriverInfoDlg.close();
+ if(data.code == 500){
+ Feng.error("修改失败!" + data.message + "!");
+ return false;
+ }else {
+ Feng.success("修改成功!");
+ window.parent.TDriver.table.refresh();
+ TDriverInfoDlg.close();
+ }
},function(data){
Feng.error("修改失败!" + data.responseJSON.message + "!");
});
@@ -168,5 +253,5 @@
}
$(function() {
-
+ Feng.initValidator("driverInfoForm", TDriverInfoDlg.validateFields);
});
--
Gitblit v1.7.1