|
@@ -1004,7 +1004,8 @@ import { apiBaseUrl } from '@/common/config.js';
|
|
|
return Object.keys(this.safeFamilyFieldsConfig).length === 0 || this.safeFamilyFieldsConfig.phone?.visible !== false;
|
|
return Object.keys(this.safeFamilyFieldsConfig).length === 0 || this.safeFamilyFieldsConfig.phone?.visible !== false;
|
|
|
},
|
|
},
|
|
|
showFamilyisEmergency(){
|
|
showFamilyisEmergency(){
|
|
|
- this.safeFamilyFieldsConfig.family_contact_person?.visible !== false;
|
|
|
|
|
|
|
+ // this.safeFamilyFieldsConfig.family_contact_person?.visible !== false;
|
|
|
|
|
+ return Object.keys(this.safeFamilyFieldsConfig).length === 0 || this.safeFamilyFieldsConfig.family_contact_person?.visible !== false;
|
|
|
},
|
|
},
|
|
|
// 教育经历字段显示控制
|
|
// 教育经历字段显示控制
|
|
|
showEducationTimeField() {
|
|
showEducationTimeField() {
|
|
@@ -1036,7 +1037,7 @@ import { apiBaseUrl } from '@/common/config.js';
|
|
|
return Object.keys(this.safeWorkFieldsConfig).length === 0 || this.safeWorkFieldsConfig.position?.visible !== false;
|
|
return Object.keys(this.safeWorkFieldsConfig).length === 0 || this.safeWorkFieldsConfig.position?.visible !== false;
|
|
|
},
|
|
},
|
|
|
showWorkMonthlySalary(){
|
|
showWorkMonthlySalary(){
|
|
|
- return this.safeWorkFieldsConfig.monthly_income?.visible
|
|
|
|
|
|
|
+ return this.safeWorkFieldsConfig.monthly_salary?.visible
|
|
|
},
|
|
},
|
|
|
showWorkSupervisor(){
|
|
showWorkSupervisor(){
|
|
|
return this.safeWorkFieldsConfig.direct_supervisor?.visible
|
|
return this.safeWorkFieldsConfig.direct_supervisor?.visible
|
|
@@ -1349,10 +1350,11 @@ import { apiBaseUrl } from '@/common/config.js';
|
|
|
// if (this.shouldValidateField('phone', 'family') && !this.familyMemberForm.phone) {
|
|
// if (this.shouldValidateField('phone', 'family') && !this.familyMemberForm.phone) {
|
|
|
// this.familyMemberErrors.phone = '请输入联系电话';
|
|
// this.familyMemberErrors.phone = '请输入联系电话';
|
|
|
// isValid = false;
|
|
// isValid = false;
|
|
|
- // } else if (this.shouldValidateField('phone', 'family') && this.familyMemberForm.phone && !/^1[3-9]\d{9}$/.test(this.familyMemberForm.phone)) {
|
|
|
|
|
- // this.familyMemberErrors.phone = '请输入正确的手机号';
|
|
|
|
|
- // isValid = false;
|
|
|
|
|
- // }
|
|
|
|
|
|
|
+ // } else
|
|
|
|
|
+ if (this.shouldValidateField('phone', 'family') && this.familyMemberForm.phone && !/^1[3-9]\d{9}$/.test(this.familyMemberForm.phone)) {
|
|
|
|
|
+ this.familyMemberErrors.phone = '请输入正确的手机号';
|
|
|
|
|
+ isValid = false;
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
if (!isValid) {
|
|
if (!isValid) {
|
|
|
uni.showToast({
|
|
uni.showToast({
|
|
@@ -1654,25 +1656,25 @@ import { apiBaseUrl } from '@/common/config.js';
|
|
|
isValid = false;
|
|
isValid = false;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- // if (this.shouldValidateField('department', 'work') && !this.workForm.department) {
|
|
|
|
|
- // this.workErrors.department = '请输入任职部门';
|
|
|
|
|
- // isValid = false;
|
|
|
|
|
- // }
|
|
|
|
|
|
|
+ if (this.shouldValidateField('department', 'work') && !this.workForm.department) {
|
|
|
|
|
+ this.workErrors.department = '请输入任职部门';
|
|
|
|
|
+ isValid = false;
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
- // if (this.shouldValidateField('position', 'work') && !this.workForm.position) {
|
|
|
|
|
- // this.workErrors.position = '请输入担任职务';
|
|
|
|
|
- // isValid = false;
|
|
|
|
|
- // }
|
|
|
|
|
|
|
+ if (this.shouldValidateField('position', 'work') && !this.workForm.position) {
|
|
|
|
|
+ this.workErrors.position = '请输入担任职务';
|
|
|
|
|
+ isValid = false;
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
if (this.shouldValidateField('employeeCount', 'work') && !this.workForm.employeeCount) {
|
|
if (this.shouldValidateField('employeeCount', 'work') && !this.workForm.employeeCount) {
|
|
|
this.workErrors.employeeCount = '请输入单位人数';
|
|
this.workErrors.employeeCount = '请输入单位人数';
|
|
|
isValid = false;
|
|
isValid = false;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- // if (this.shouldValidateField('monthlySalary', 'work') && !this.workForm.monthlySalary) {
|
|
|
|
|
- // this.workErrors.monthlySalary = '请输入月薪';
|
|
|
|
|
- // isValid = false;
|
|
|
|
|
- // }
|
|
|
|
|
|
|
+ if (this.shouldValidateField('monthlySalary', 'work') && !this.workForm.monthlySalary) {
|
|
|
|
|
+ this.workErrors.monthlySalary = '请输入月总收入';
|
|
|
|
|
+ isValid = false;
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
// if (this.shouldValidateField('supervisor', 'work') && !this.workForm.supervisor) {
|
|
// if (this.shouldValidateField('supervisor', 'work') && !this.workForm.supervisor) {
|
|
|
// this.workErrors.supervisor = '请输入直属上级';
|
|
// this.workErrors.supervisor = '请输入直属上级';
|