|
@@ -1346,13 +1346,13 @@ import { apiBaseUrl } from '@/common/config.js';
|
|
|
// isValid = false;
|
|
|
// }
|
|
|
|
|
|
- if (this.shouldValidateField('phone', 'family') && !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 (this.shouldValidateField('phone', 'family') && !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) {
|
|
|
uni.showToast({
|
|
@@ -1654,30 +1654,30 @@ import { apiBaseUrl } from '@/common/config.js';
|
|
|
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) {
|
|
|
this.workErrors.employeeCount = '请输入单位人数';
|
|
|
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) {
|
|
|
- this.workErrors.supervisor = '请输入直属上级';
|
|
|
- isValid = false;
|
|
|
- }
|
|
|
+ // if (this.shouldValidateField('supervisor', 'work') && !this.workForm.supervisor) {
|
|
|
+ // this.workErrors.supervisor = '请输入直属上级';
|
|
|
+ // isValid = false;
|
|
|
+ // }
|
|
|
|
|
|
// if (this.shouldValidateField('supervisorPhone', 'work') && !this.workForm.supervisorPhone) {
|
|
|
// this.workErrors.supervisorPhone = '请输入直属上级电话';
|
|
@@ -1974,9 +1974,9 @@ import { apiBaseUrl } from '@/common/config.js';
|
|
|
end_date: work.endTime,
|
|
|
company_name: work.companyName,
|
|
|
department: work.department,
|
|
|
- company_size: work.employeeCount,
|
|
|
+ company_size: parseInt(work.employeeCount)||0,
|
|
|
position: work.position,
|
|
|
- monthly_salary: work.monthlySalary,
|
|
|
+ monthly_salary: work.monthlySalary||0,
|
|
|
supervisor_name: work.supervisor,
|
|
|
supervisor_phone: work.supervisorPhone
|
|
|
}));
|