- *证件号码:
+ *证件号码:
@@ -389,7 +389,7 @@
// type: 1,
visitinfo: "",
date: "",
- end_date:'',
+ end_date:'',
time:'',
visit_time_id: "",
visit_area_id: "",
@@ -617,7 +617,7 @@
this.form = {
visitinfo: "",
date: res?.date,
- end_date: res?.end_date,
+ end_date: res?.end_date,
time:res?.time,
visit_time_id: res?.visit_time_id,
visit_area_id: res?.visit_area_id,
@@ -701,7 +701,7 @@
this.adminList.map(e=>{
if(e.id==item){
this.form.accept_admin_id = e.id
- this.form.accpet_department_id = e.department_id
+ this.form.accpet_department_id = e.department_id
this.form.accompany_id = e.id
// if(this.visitAreaText=='非生产区'){
// this.form.accompany_id = e.id
@@ -728,17 +728,27 @@
},
submit() {
let that = this
- if(that.form.credent==1){
+ const isIdcardRequired = that.visitType == 2 || that.visitType == 3
+ const hasIdcard = !!that.form.idcard
+
+ // 施工人员、物流司机必须填写证件号
+ if (isIdcardRequired && !hasIdcard) {
+ this.$successMessage('证件号码不能为空', '', 'warning')
+ return
+ }
+
+ // 只要填写了证件号就进行格式校验(普通访客、施工、物流统一生效)
+ if (hasIdcard && that.form.credent == 1) {
const regtest = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/
- if(!regtest.test(that.form.idcard)){
- this.$successMessage('身份证格式错误', '','warning')
+ if (!regtest.test(that.form.idcard)) {
+ this.$successMessage('身份证格式错误', '', 'warning')
return
}
}
- if(that.form.credent==2){
+ if (hasIdcard && that.form.credent == 2) {
const regtest = /^([a-zA-z]|[0-9]){5,17}$/
- if(!regtest.test(that.form.idcard)){
- this.$successMessage('护照格式错误', '','warning')
+ if (!regtest.test(that.form.idcard)) {
+ this.$successMessage('护照格式错误', '', 'warning')
return
}
}