入职修改调整

src/views/human/enrollment/registration/EnrollmentRegistrationEditForm.vue

@@ -17,29 +17,25 @@
 						<el-divider content-position="left"><i class="el-icon-document"></i> 基础信息</el-divider>
 						<el-row :gutter="26">
 							<el-col :span="12">
-								<el-form-item label="姓名" prop="name" :rules="[{required: true, message: '姓名不能为空', trigger: 'blur'}]">
+								<el-form-item label="姓名" prop="name" >
 									<el-input v-model="inputForm.name"></el-input>
 								</el-form-item>
 							</el-col>
 							<el-col :span="12">
 								<el-form-item label="性别" prop="sex"
-											  :rules="[
-								  	{required: true, message: '性别不能为空', trigger: 'change'}
-                 ]">
+											  >
 									<el-radio-group v-model="inputForm.sex">
 										<el-radio v-for="item in $dictUtils.getDictList('sex')" :label="item.value" :key="item.value">{{item.label}}</el-radio>
 									</el-radio-group>
 								</el-form-item>
 							</el-col>
 							<el-col :span="12">
-								<el-form-item label="年龄" prop="age" :rules="[{required: true, message: '年龄不能为空', trigger: 'change'}]">
+								<el-form-item label="年龄" prop="age" >
 									<el-input v-model="inputForm.age" type="number"></el-input>
 								</el-form-item>
 							</el-col>
 							<el-col :span="12">
-								<el-form-item label="出生日期" prop="birthday" :rules="[
-                  {required: true, message:'请填写出生日期', trigger: 'blur'}
-               ]">
+								<el-form-item label="出生日期" prop="birthday">
 									<el-date-picker
 										style="width: 100%"
 										v-model="inputForm.birthday"
@@ -86,12 +82,12 @@
 
 							</el-col>
 							<el-col :span="12">
-								<el-form-item label="联系电话" prop="mobilePhone" :rules="[{required: true, message: '联系电话不能为空', trigger: 'change'}]">
+								<el-form-item label="联系电话" prop="mobilePhone" >
 									<el-input v-model="inputForm.mobilePhone" @blur="mobilePhoneOnly(inputForm.mobilePhone)"></el-input>
 								</el-form-item>
 							</el-col>
 							<el-col :span="12">
-								<el-form-item label="身份证号码" prop="idCard" :rules="[{required: true,validator: validator.isCardId, trigger:'blur'}]">
+								<el-form-item label="身份证号码" prop="idCard">
 									<el-input v-model="inputForm.idCard" @blur="idCardOnly(inputForm.idCard)"></el-input>
 								</el-form-item>
 							</el-col>
@@ -285,7 +281,7 @@
 								</el-row>
 							</el-form>
 							<el-form v-else-if="inputForm.type !== '0'" style="width: 100%" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"
-									:disabled="true"
+
 									 label-width="110px" @submit.native.prevent>
 								<el-row :gutter="26">
 									<el-col :span="12">
@@ -344,9 +340,7 @@
 										</el-form-item>
 									</el-col>
 									<el-col :span="12">
-										<el-form-item label="合同结束日期" prop="contractEndDate" :rules="[
-                  {required: true, message:'请填写合同结束日期', trigger: 'blur'}
-               ]">
+										<el-form-item label="合同结束日期" prop="contractEndDate">
 											<el-date-picker
 												style="width: 100%"
 												v-model="inputForm.contractEndDate"
@@ -573,19 +567,17 @@
 						<el-divider content-position="left"><i class="el-icon-document"></i> 中信银行卡信息</el-divider>
 						<el-row :gutter="26">
 							<el-col :span="12">
-								<el-form-item label="中信银行卡号" prop="zxBankCardNumber" :rules="[{required: true, message: '中信银行卡号不能为空', trigger: 'blur'}]">
+								<el-form-item label="中信银行卡号" prop="zxBankCardNumber" >
 									<el-input v-model="inputForm.zxBankCardNumber" @change="checkBankNumber(inputForm.zxBankCardNumber,'zx')" maxlength="19"></el-input>
 								</el-form-item>
 							</el-col>
 							<el-col :span="12">
-								<el-form-item label="开户行" prop="zxAccountHolder" :rules="[{required: true, message: '开户行不能为空', trigger: 'blur'}]">
+								<el-form-item label="开户行" prop="zxAccountHolder" >
 									<el-input v-model="inputForm.zxAccountHolder" ></el-input>
 								</el-form-item>
 							</el-col>
 							<el-col :span="12">
-								<el-form-item label="银行卡正面" prop="accountHolderFront" :rules="[
-						{required: true, message: '银行卡正面不能为空', trigger: 'blur'}
-					]">
+								<el-form-item label="银行卡正面" prop="accountHolderFront">
 									<el-upload :action="`${$http.BASE_URL}/public-modules-server/oss/file/webUpload/upload`"
 											   :limit="limitNum"
 											   :disabled="bankHideUploadEdit"
@@ -630,9 +622,7 @@
 								</el-form-item>
 							</el-col>
 							<el-col :span="12">
-								<el-form-item label="银行卡反面" prop="accountHolderOpposite" :rules="[
-						{required: true, message: '银行卡反面不能为空', trigger: 'blur'}
-					]">
+								<el-form-item label="银行卡反面" prop="accountHolderOpposite">
 									<el-upload :action="`${$http.BASE_URL}/public-modules-server/oss/file/webUpload/upload`"
 											   :limit="limitNum"
 											   :disabled="bankHideUploadEdit2"
@@ -680,19 +670,17 @@
 						<el-divider content-position="left"><i class="el-icon-document"></i> 工商银行卡信息</el-divider>
 						<el-row :gutter="26">
 							<el-col :span="12">
-								<el-form-item label="工商银行卡号" prop="gsBankCardNumber" :rules="[{required: true, message: '工商银行卡号不能为空', trigger: 'blur'}]">
+								<el-form-item label="工商银行卡号" prop="gsBankCardNumber">
 									<el-input v-model="inputForm.gsBankCardNumber" @change="checkBankNumber(inputForm.gsBankCardNumber,'gs')" maxlength="19"></el-input>
 								</el-form-item>
 							</el-col>
 							<el-col :span="12">
-								<el-form-item label="开户行" prop="gsAccountHolder" :rules="[{required: true, message: '开户行不能为空', trigger: 'blur'}]">
+								<el-form-item label="开户行" prop="gsAccountHolder">
 									<el-input v-model="inputForm.gsAccountHolder" ></el-input>
 								</el-form-item>
 							</el-col>
 							<el-col :span="12">
-								<el-form-item label="银行卡正面" prop="gsAccountHolderFront" :rules="[
-						{required: true, message: '银行卡正面不能为空', trigger: 'blur'}
-					]">
+								<el-form-item label="银行卡正面" prop="gsAccountHolderFront">
 									<el-upload :action="`${$http.BASE_URL}/public-modules-server/oss/file/webUpload/upload`"
 											   :limit="limitNum"
 											   :disabled="gsHideUploadEdit"
@@ -737,9 +725,7 @@
 								</el-form-item>
 							</el-col>
 							<el-col :span="12">
-								<el-form-item label="银行卡反面" prop="gsAccountHolderOpposite" :rules="[
-						{required: true, message: '银行卡反面不能为空', trigger: 'blur'}
-					]">
+								<el-form-item label="银行卡反面" prop="gsAccountHolderOpposite">
 									<el-upload :action="`${$http.BASE_URL}/public-modules-server/oss/file/webUpload/upload`"
 											   :limit="limitNum"
 											   :disabled="gsHideUploadEdit2"
@@ -1133,37 +1119,37 @@
 				this.$refs['inputForm'].validate((valid) => {
 					if (valid) {
 						this.loading = true
-						if (this.commonJS.isEmpty(this.inputForm.idCard)) {
-							this.loading = false
-							this.$message.error('身份证号码不能为空')
-							throw new Error('身份证号码不能为空')
-						}
-						if (!this.validateXG.isPhoneOrMobile(this.inputForm.mobilePhone)) {
-							this.$message.error('”联系电话“填写不正确，请重新填写')
-							this.loading = false
-							this.inputForm.mobilePhone = ''
-							throw new Error('”联系电话“填写不正确，请重新填写')
-						}
-
-						if (this.commonJS.isNotEmpty(this.inputForm.socialSecurityNumber) && (this.commonJS.isEmpty(this.inputForm.socialSecurityBankNumber) || this.commonJS.isEmpty(this.inputForm.socialSecurityPictureFront))) {
-							this.loading = false
-							this.$message.error('社保银行卡号与社保卡照片不能为空');
-							throw new Error('社保银行卡号与社保卡照片不能为空')
-						}
-						if (this.commonJS.isNotEmpty(this.inputForm.socialSecurityBankNumber) && (this.commonJS.isEmpty(this.inputForm.socialSecurityNumber) || this.commonJS.isEmpty(this.inputForm.socialSecurityPictureFront))) {
-							this.loading = false
-							this.$message.error('社保编号与社保卡照片不能为空');
-							throw new Error('社保编号与社保卡照片不能为空')
-						}
-						if (this.commonJS.isNotEmpty(this.inputForm.socialSecurityPictureFront) && (this.commonJS.isEmpty(this.inputForm.socialSecurityNumber) || this.commonJS.isEmpty(this.inputForm.socialSecurityBankNumber))) {
-							this.loading = false
-							this.$message.error('社保编号与社保银行卡号不能为空');
-							throw new Error('社保编号与社保银行卡号不能为空')
-						}
+						// if (this.commonJS.isEmpty(this.inputForm.idCard)) {
+						// 	this.loading = false
+						// 	this.$message.error('身份证号码不能为空')
+						// 	throw new Error('身份证号码不能为空')
+						// }
+						// if (!this.validateXG.isPhoneOrMobile(this.inputForm.mobilePhone)) {
+						// 	this.$message.error('”联系电话“填写不正确，请重新填写')
+						// 	this.loading = false
+						// 	this.inputForm.mobilePhone = ''
+						// 	throw new Error('”联系电话“填写不正确，请重新填写')
+						// }
+						//
+						// if (this.commonJS.isNotEmpty(this.inputForm.socialSecurityNumber) && (this.commonJS.isEmpty(this.inputForm.socialSecurityBankNumber) || this.commonJS.isEmpty(this.inputForm.socialSecurityPictureFront))) {
+						// 	this.loading = false
+						// 	this.$message.error('社保银行卡号与社保卡照片不能为空');
+						// 	throw new Error('社保银行卡号与社保卡照片不能为空')
+						// }
+						// if (this.commonJS.isNotEmpty(this.inputForm.socialSecurityBankNumber) && (this.commonJS.isEmpty(this.inputForm.socialSecurityNumber) || this.commonJS.isEmpty(this.inputForm.socialSecurityPictureFront))) {
+						// 	this.loading = false
+						// 	this.$message.error('社保编号与社保卡照片不能为空');
+						// 	throw new Error('社保编号与社保卡照片不能为空')
+						// }
+						// if (this.commonJS.isNotEmpty(this.inputForm.socialSecurityPictureFront) && (this.commonJS.isEmpty(this.inputForm.socialSecurityNumber) || this.commonJS.isEmpty(this.inputForm.socialSecurityBankNumber))) {
+						// 	this.loading = false
+						// 	this.$message.error('社保编号与社保银行卡号不能为空');
+						// 	throw new Error('社保编号与社保银行卡号不能为空')
+						// }
 						// this.inputForm.id = this.businessId
 						enrollmentRegistrationService.updateInfo(this.inputForm).then((data) => {
 							this.close()
-							this.$message.success(data)
+							this.$message.success(data.msg)
 							this.$emit('refreshDataList')
 							this.loading = false
 						}).catch(() => {