diff --git a/pages/login/register/apply.vue b/pages/login/register/apply.vue index 1366031..7a9db8f 100644 --- a/pages/login/register/apply.vue +++ b/pages/login/register/apply.vue @@ -22,7 +22,7 @@ 人员类型 - {{formData.PERSONNEL_TYPENAME?formData.PERSONNEL_TYPENAME:'请选择'}} + {{formData.PERSONNEL_TYPE.join()}} diff --git a/pages/login/register/baseInfo.vue b/pages/login/register/baseInfo.vue index 67d7936..fb4e3fa 100644 --- a/pages/login/register/baseInfo.vue +++ b/pages/login/register/baseInfo.vue @@ -19,13 +19,28 @@ + 人员类型 + + + 文化程度 @@ -80,8 +95,10 @@ import { formatDate,validateIdCard,validateMobile,getLevel } from '../../../common/tool.js'; +import ZqsSelect from "../../../components/zqs-select/zqs-select.vue"; export default { name: "register_baseInfo", + components: {ZqsSelect}, props: { formData: { type: Object, @@ -142,6 +159,9 @@ import { this.formData[name] = e.detail.value this.$forceUpdate();//强制刷新 }, + changeSelect(e, name) { + this.$forceUpdate();//强制刷新 + }, pickerChangeData(e,name) { // 人员类型 if (name === 'PERSONNEL_TYPE') { @@ -172,7 +192,7 @@ import { }, validateData() { // 人员类型 - if (!this.formData.PERSONNEL_TYPE) { + if (this.formData.PERSONNEL_TYPE.length < 1) { uni.showToast({ icon: 'none', title: '请选择人员类型', diff --git a/pages/login/register/certificate.vue b/pages/login/register/certificate.vue index 5d9cf79..056a727 100644 --- a/pages/login/register/certificate.vue +++ b/pages/login/register/certificate.vue @@ -22,7 +22,7 @@ 人员类型 - {{formData.PERSONNEL_TYPENAME?formData.PERSONNEL_TYPENAME:'请选择'}} + {{formData.PERSONNEL_TYPE.join()}} @@ -635,57 +635,58 @@ export default { }); return false; } + if (this.formData.PERSONNEL_TYPE.find((item) => item === '驾驶员')) { + // 驾驶证 + if (this.fileData.driverLicense.length < 1) { + uni.showToast({ + icon: 'none', + title: '请上传驾驶证照片', + duration: 2000 + }); + return false; + } - // 驾驶证 - if (this.fileData.driverLicense.length < 1) { - uni.showToast({ - icon: 'none', - title: '请上传驾驶证照片', - duration: 2000 - }); - return false; + if (!this.formData.DRIVER_LICENSE_NO) { + uni.showToast({ + icon: 'none', + title: '请输入驾驶证号', + duration: 2000 + }); + return false; + } + if (this.formData.DRIVING_MODEL.length < 1) { + uni.showToast({ + icon: 'none', + title: '请选择准驾车型', + duration: 2000 + }); + return false; + } + if (!this.formData.DRIVER_LICENSE_ISSUE_DATE) { + uni.showToast({ + icon: 'none', + title: '请选择初次领证日期', + duration: 2000 + }); + return false; + } + if (!this.formData.DRIVER_LICENSE_VALIDITY_START || !this.formData.DRIVER_LICENSE_VALIDITY_END) { + uni.showToast({ + icon: 'none', + title: '请选择驾驶证有效期时间', + duration: 2000 + }); + return false; + } + if (!this.formData.DRIVER_LICENSE_ORGAN) { + uni.showToast({ + icon: 'none', + title: '请输入驾驶证的签发机关', + duration: 2000 + }); + return false; + } } - if (!this.formData.DRIVER_LICENSE_NO) { - uni.showToast({ - icon: 'none', - title: '请输入驾驶证号', - duration: 2000 - }); - return false; - } - if (this.formData.DRIVING_MODEL.length < 1) { - uni.showToast({ - icon: 'none', - title: '请选择准驾车型', - duration: 2000 - }); - return false; - } - if (!this.formData.DRIVER_LICENSE_ISSUE_DATE) { - uni.showToast({ - icon: 'none', - title: '请选择初次领证日期', - duration: 2000 - }); - return false; - } - if (!this.formData.DRIVER_LICENSE_VALIDITY_START || !this.formData.DRIVER_LICENSE_VALIDITY_END) { - uni.showToast({ - icon: 'none', - title: '请选择驾驶证有效期时间', - duration: 2000 - }); - return false; - } - if (!this.formData.DRIVER_LICENSE_ORGAN) { - uni.showToast({ - icon: 'none', - title: '请输入驾驶证的签发机关', - duration: 2000 - }); - return false; - } - // 从业资格证证 if (this.fileData.qualificationCertificate.length < 1) { uni.showToast({ diff --git a/pages/login/register/index.vue b/pages/login/register/index.vue index 766f3d5..cc9c666 100644 --- a/pages/login/register/index.vue +++ b/pages/login/register/index.vue @@ -89,7 +89,7 @@ SEXNAME: '', //人员类型 - PERSONNEL_TYPE: '', + PERSONNEL_TYPE: [], PERSONNEL_TYPENAME: '', // 政治面貌 POLITICAL_OUTLOOK: '',