入职与社保跳转

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

@@ -109,7 +109,6 @@
 				</el-col>
 				<el-col :span="12">
 					<el-form-item label="开始时间" prop="startTime" :rules="[
-                  {required: true, message:'请填写开始时间', trigger: 'blur'}
                ]">
 						<el-date-picker
 							style="width: 100%"
@@ -122,7 +121,6 @@
 				</el-col>
 				<el-col :span="12">
 					<el-form-item label="毕业时间" prop="endTime" :rules="[
-                  {required: true, message:'请填写毕业时间', trigger: 'blur'}
                ]">
 						<el-date-picker
 							style="width: 100%"
@@ -220,6 +218,21 @@
 							</el-form-item>
 						</el-col>
 						<el-col :span="12">
+							<el-form-item label="员工类型" prop="onJobStatus" :rules="[
+								{required: true, message:'请选择员工类型', trigger: 'blur'}
+							]">
+								<!--						<el-input v-model="inputForm.politicalOutlook"></el-input>-->
+								<el-select v-model="inputForm.onJobStatus" placeholder="请选择员工类型" style="width:100%;">
+									<el-option
+										v-for="item in $dictUtils.getDictList('on_job_status')"
+										:key="item.value"
+										:label="item.label"
+										:value="item.value">
+									</el-option>
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :span="12">
 							<el-form-item label="进所日期" prop="entryDate" :rules="[
                   {required: true, message:'请填写进所日期', trigger: 'blur'}
                ]">
@@ -269,6 +282,19 @@
 							</el-form-item>
 						</el-col>
 						<el-col :span="12">
+							<el-form-item label="员工类型" prop="onJobStatus" :rules="[]">
+								<!--						<el-input v-model="inputForm.politicalOutlook"></el-input>-->
+								<el-select v-model="inputForm.onJobStatus" placeholder="请选择员工类型" style="width:100%;">
+									<el-option
+										v-for="item in $dictUtils.getDictList('on_job_status')"
+										:key="item.value"
+										:label="item.label"
+										:value="item.value">
+									</el-option>
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :span="12">
 							<el-form-item label="进所日期" prop="entryDate" :rules="[
                ]">
 								<el-date-picker
@@ -578,6 +604,7 @@
 					contractStartDate: '',
 					remarks: '',
 					type: '',
+					onJobStatus: '',
 					socialSecurityNumber: '',
 					socialSecurityBankNumber: '',
 					socialSecurityPictureFront: '',
@@ -715,6 +742,7 @@
 					contractStartDate: '',
 					remarks: '',
 					type: '',
+					onJobStatus: '',
 					socialSecurityNumber: '',
 					socialSecurityBankNumber: '',
 					socialSecurityPictureFront: '',

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

@@ -120,7 +120,6 @@
 							</el-col>
 							<el-col :span="12">
 								<el-form-item label="开始时间" prop="startTime" :rules="[
-                  {required: true, message:'请填写开始时间', trigger: 'blur'}
                ]">
 									<el-date-picker
 										style="width: 100%"
@@ -133,7 +132,6 @@
 							</el-col>
 							<el-col :span="12">
 								<el-form-item label="毕业时间" prop="endTime" :rules="[
-                  {required: true, message:'请填写毕业时间', trigger: 'blur'}
                ]">
 									<el-date-picker
 										style="width: 100%"
@@ -231,6 +229,21 @@
 										</el-form-item>
 									</el-col>
 									<el-col :span="12">
+										<el-form-item label="员工类型" prop="onJobStatus" :rules="[
+											{required: true, message:'请选择员工类型', trigger: 'blur'}
+										]">
+											<!--						<el-input v-model="inputForm.politicalOutlook"></el-input>-->
+											<el-select v-model="inputForm.onJobStatus" placeholder="请选择员工类型" style="width:100%;">
+												<el-option
+													v-for="item in $dictUtils.getDictList('on_job_status')"
+													:key="item.value"
+													:label="item.label"
+													:value="item.value">
+												</el-option>
+											</el-select>
+										</el-form-item>
+									</el-col>
+									<el-col :span="12">
 										<el-form-item label="进所日期" prop="entryDate" :rules="[
                   {required: true, message:'请填写进所日期', trigger: 'blur'}
                ]">
@@ -280,6 +293,20 @@
 										</el-form-item>
 									</el-col>
 									<el-col :span="12">
+										<el-form-item label="员工类型" prop="onJobStatus" :rules="[
+										]">
+											<!--						<el-input v-model="inputForm.politicalOutlook"></el-input>-->
+											<el-select v-model="inputForm.onJobStatus" placeholder="请选择员工类型" style="width:100%;">
+												<el-option
+													v-for="item in $dictUtils.getDictList('on_job_status')"
+													:key="item.value"
+													:label="item.label"
+													:value="item.value">
+												</el-option>
+											</el-select>
+										</el-form-item>
+									</el-col>
+									<el-col :span="12">
 										<el-form-item label="进所日期" prop="entryDate" :rules="[
                ]">
 											<el-date-picker

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

@@ -6,17 +6,23 @@
 			<el-divider content-position="left"><i class="el-icon-document"></i> 社保信息</el-divider>
 			<el-row :gutter="26" v-if="status === 'audit' || status === 'taskFormDetail'">
 				<el-col :span="12">
-					<el-form-item label="社保编号" prop="socialSecurityNumber" :rules="[]">
+					<el-form-item label="社保编号" prop="socialSecurityNumber" :rules="[
+						{required: true, message: '社保编号不能为空', trigger: 'blur'}
+					]">
 						<el-input v-model="inputForm.socialSecurityNumber" maxlength="10" @input="validateInput"></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
-					<el-form-item label="社保银行卡号" prop="socialSecurityBankNumber" :rules="[]">
+					<el-form-item label="社保银行卡号" prop="socialSecurityBankNumber" :rules="[
+						{required: true, message: '社保银行卡号不能为空', trigger: 'blur'}
+					]">
 						<el-input v-model="inputForm.socialSecurityBankNumber" @change="checkBankNumber(inputForm.socialSecurityBankNumber)" maxlength="19"></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
-					<el-form-item label="社保卡照片正面" prop="socialSecurityPictureFront" :rules="[]">
+					<el-form-item label="社保卡照片正面" prop="socialSecurityPictureFront" :rules="[
+						{required: true, message: '社保卡照片正面不能为空', trigger: 'blur'}
+					]">
 						<el-upload :action="`${$http.BASE_URL}/public-modules-server/oss/file/webUpload/upload`"
 								   :limit="limitNum"
 								   :disabled="hideUploadEdit"
@@ -63,7 +69,9 @@
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
-					<el-form-item label="社保卡照片反面" prop="socialSecurityPictureOpposite" :rules="[]">
+					<el-form-item label="社保卡照片反面" prop="socialSecurityPictureOpposite" :rules="[
+						{required: true, message: '社保卡照片反面不能为空', trigger: 'blur'}
+					]">
 						<el-upload :action="`${$http.BASE_URL}/public-modules-server/oss/file/webUpload/upload`"
 								   :limit="limitNum"
 								   :disabled="hideUploadEdit2"