入离职调整

pages/human/enrollment/registration/EnrollmentRegistrationAddForm.vue

@@ -43,7 +43,7 @@
 			     </el-date-picker>
 			</u-form-item>
 			
-			<u-form-item label="政治面貌" borderBottom prop="politicalOutlook" >
+			<u-form-item label="政治面貌" borderBottom prop="politicalOutlook" :required="true">
 				<jp-picker v-model="inputForm.politicalOutlook" rangeKey="label" rangeValue="value" :range="[
 						        { label: '中共党员', value: '1' },
 						        { label: '中共预备党员', value: '2' },
@@ -61,15 +61,15 @@
 						    ]"></jp-picker>
 			</u-form-item>
 			
-			<u-form-item label="籍贯" borderBottom prop="nativePlace" >
+			<u-form-item label="籍贯" borderBottom prop="nativePlace" :required="true">
 			     <u--input placeholder='请填写籍贯'  v-model="inputForm.nativePlace"></u--input>
 			</u-form-item>
 			
-			<u-form-item label="民族" borderBottom prop="nation" >
+			<u-form-item label="民族" borderBottom prop="nation" :required="true">
 			     <u--input placeholder='请填写民族'  v-model="inputForm.nation"></u--input>
 			</u-form-item>
 			
-			<u-form-item label="婚姻状况" borderBottom prop="maritalStatus" >
+			<u-form-item label="婚姻状况" borderBottom prop="maritalStatus" :required="true">
 <!--			     <u&#45;&#45;input placeholder='请填写婚姻状况'  v-model="inputForm.maritalStatus"></u&#45;&#45;input>-->
 				<jp-picker v-model="inputForm.maritalStatus" rangeKey="label" rangeValue="value" :range="[
 						        { label: '未婚', value: '1' },
@@ -83,23 +83,23 @@
 			     <u--input placeholder='请填写联系电话' @blur="mobilePhoneOnly(inputForm.mobilePhone)" maxlength="11" v-model="inputForm.mobilePhone"></u--input>
 			</u-form-item>
 			
-			<u-form-item label="家庭住址" borderBottom prop="homeAddress" >
+			<u-form-item label="家庭住址" borderBottom prop="homeAddress" :required="true">
 			     <u--input placeholder='请填写家庭住址'  v-model="inputForm.homeAddress"></u--input>
 			</u-form-item>
 			
-			<u-form-item label="常住住址" borderBottom prop="permanentAddress" >
+			<u-form-item label="常住住址" borderBottom prop="permanentAddress" :required="true">
 			     <u--input placeholder='请填写常住住址'  v-model="inputForm.permanentAddress"></u--input>
 			</u-form-item>
 			
-			<u-form-item label="毕业院校" borderBottom prop="graduatedFrom" >
+			<u-form-item label="毕业院校" borderBottom prop="graduatedFrom" :required="true">
 			     <u--input placeholder='请填写毕业院校'  v-model="inputForm.graduatedFrom"></u--input>
 			</u-form-item>
 			
-			<u-form-item label="专业" borderBottom prop="speciality" >
+			<u-form-item label="专业" borderBottom prop="speciality" :required="true">
 			     <u--input placeholder='请填写专业'  v-model="inputForm.speciality"></u--input>
 			</u-form-item>
 			
-			<u-form-item label="开始时间" borderBottom prop="startTime">
+			<u-form-item label="开始时间" borderBottom prop="startTime" :required="true">
 			     <el-date-picker
 			     	v-model="inputForm.startTime"
 			     	type="date"
@@ -111,7 +111,7 @@
 			     </el-date-picker>
 			</u-form-item>
 			
-			<u-form-item label="毕业时间" borderBottom prop="endTime">
+			<u-form-item label="毕业时间" borderBottom prop="endTime" :required="true">
 			     <el-date-picker
 			     	v-model="inputForm.endTime"
 			     	type="date"
@@ -123,7 +123,7 @@
 			     </el-date-picker>
 			</u-form-item>
 			
-			<u-form-item label="学历" borderBottom prop="education" >
+			<u-form-item label="学历" borderBottom prop="education" :required="true">
 				<jp-picker v-model="inputForm.education" rangeKey="label" rangeValue="value" :range="[
 						        { label: '小学', value: '1' },
 						        { label: '初中', value: '2' },
@@ -134,7 +134,7 @@
 						    ]"></jp-picker>
 			</u-form-item>
 			
-			<u-form-item label="学历性质" borderBottom prop="educationNature" >
+			<u-form-item label="学历性质" borderBottom prop="educationNature" :required="true">
 				<jp-picker v-model="inputForm.educationNature" rangeKey="label" rangeValue="value" :range="[
 						        { label: '统招全日制学历', value: '1' },
 						        { label: '国家开放大学', value: '2' },
@@ -144,33 +144,36 @@
 						    ]"></jp-picker>
 			</u-form-item>
 			
-			<u-form-item label="是否毕业" borderBottom prop="graduatedOrNot" >
+			<u-form-item label="是否毕业" borderBottom prop="graduatedOrNot" :required="true">
 				<jp-picker v-model="inputForm.graduatedOrNot" rangeKey="label" rangeValue="value" :range="[
 						        { label: '是', value: '1' },
 						        { label: '否', value: '2' },
 						    ]"></jp-picker>
 			</u-form-item>
 			
-			<u-form-item label="英语等级" borderBottom prop="englishLevel" >
+			<u-form-item label="英语等级" borderBottom prop="englishLevel" :required="true">
 				<jp-picker v-model="inputForm.englishLevel" rangeKey="label" rangeValue="value" :range="[
 						        { label: 'CET-4', value: '1' },
 						        { label: 'CET-6', value: '2' },
 						        { label: 'TEM-4', value: '3' },
 						        { label: 'TEM-8', value: '4' },
+						        { label: 'PRETCO', value: '5' },
+						        { label: '无', value: '6' },
 						    ]"></jp-picker>
 			</u-form-item>
 			
-			<u-form-item label="计算机等级" borderBottom prop="ncre" >
+			<u-form-item label="计算机等级" borderBottom prop="ncre" :required="true">
 				<jp-picker v-model="inputForm.ncre" rangeKey="label" rangeValue="value" :range="[
 						        { label: '一级', value: '1' },
 						        { label: '二级', value: '2' },
 						        { label: '三级', value: '3' },
 						        { label: '四级', value: '4' },
+						        { label: '无', value: '5' },
 						    ]"></jp-picker>
 			</u-form-item>
 			
-			<u-form-item label="个人简介" borderBottom prop="remarks">
-			    <u--textarea  placeholder='请填写简介'  v-model="inputForm.remarks" ></u--textarea>
+			<u-form-item label="个人简历" borderBottom prop="remarks">
+			    <u--textarea  placeholder='请填写个人简历'  v-model="inputForm.remarks" ></u--textarea>
 			</u-form-item>
 			
 			<u-form-item label="社保编号(选填)" borderBottom prop="socialSecurityNumber">
@@ -305,6 +308,111 @@
 							trigger: ['blur']
 						}
 					],
+					'politicalOutlook': [
+						{
+							required: true,
+							message: '政治面貌不能为空',
+							trigger: ['blur', 'change']
+						},
+					],
+					'nativePlace': [
+						{
+							required: true,
+							message: '籍贯不能为空',
+							trigger: ['blur', 'change']
+						},
+					],
+					'nation': [
+						{
+							required: true,
+							message: '民族不能为空',
+							trigger: ['blur', 'change']
+						},
+					],
+					'maritalStatus': [
+						{
+							required: true,
+							message: '婚姻状况不能为空',
+							trigger: ['blur', 'change']
+						},
+					],
+					'homeAddress': [
+						{
+							required: true,
+							message: '家庭住址不能为空',
+							trigger: ['blur', 'change']
+						},
+					],
+					'permanentAddress': [
+						{
+							required: true,
+							message: '常住住址不能为空',
+							trigger: ['blur', 'change']
+						},
+					],
+					'graduatedFrom': [
+						{
+							required: true,
+							message: '毕业院校不能为空',
+							trigger: ['blur', 'change']
+						},
+					],
+					'speciality': [
+						{
+							required: true,
+							message: '专业不能为空',
+							trigger: ['blur', 'change']
+						},
+					],
+					'startTime': [
+						{
+							required: true,
+							message: '开始时间不能为空',
+							trigger: ['blur', 'change']
+						},
+					],
+					'endTime': [
+						{
+							required: true,
+							message: '毕业时间不能为空',
+							trigger: ['blur', 'change']
+						},
+					],
+					'education': [
+						{
+							required: true,
+							message: '学历不能为空',
+							trigger: ['blur', 'change']
+						},
+					],
+					'educationNature': [
+						{
+							required: true,
+							message: '学历性质不能为空',
+							trigger: ['blur', 'change']
+						},
+					],
+					'graduatedOrNot': [
+						{
+							required: true,
+							message: '是否毕业不能为空',
+							trigger: ['blur', 'change']
+						},
+					],
+					'englishLevel': [
+						{
+							required: true,
+							message: '英语等级不能为空',
+							trigger: ['blur', 'change']
+						},
+					],
+					'ncre': [
+						{
+							required: true,
+							message: '计算机等级不能为空',
+							trigger: ['blur', 'change']
+						},
+					],
 				}
 			}
 		},
@@ -406,16 +514,19 @@
 						})
 					}
 				})
-				await enrollmentRegistrationService.findMobilePhoneOnly(this.inputForm.mobilePhone).then((data) => {
-					if (data !== 0) {
-						uni.showToast({
-							title: '联系电话已存在，请重新填写',
-							icon: "none",
-							duration:2000
-						})
-						this.inputForm.mobilePhone = ''
-					}
-				})
+				if (this.isNotEmpty(this.inputForm.mobilePhone)) {
+					await enrollmentRegistrationService.findMobilePhoneOnly(this.inputForm.mobilePhone).then((data) => {
+						if (data !== 0) {
+							uni.showToast({
+								title: '联系电话已存在，请重新填写',
+								icon: "none",
+								duration:2000
+							})
+							this.inputForm.mobilePhone = ''
+						}
+					})
+				}
+
 
 				this.$refs.inputForm.validate().then(res => {
 					uni.showLoading()
@@ -462,19 +573,24 @@
 			},
 			//联系电话唯一性判断
 			mobilePhoneOnly(mobilePhone) {
-				enrollmentRegistrationService.findMobilePhoneOnly(mobilePhone).then((data) => {
-					if (data !== 0) {
-						// this.$message.error('手机码已存在，请重新确认')
-						// this.inputForm.mobilePhone = ''
-						// throw new Error('联系电话已存在，请重新确认')
-						uni.showToast({
-							title: '联系电话已存在，请重新确认',
-							icon: "none",
-							duration:2000
-						})
-						this.inputForm.mobilePhone = ''
-					}
-				})
+				if (this.isEmpty(mobilePhone)) {
+
+				} else {
+					enrollmentRegistrationService.findMobilePhoneOnly(mobilePhone).then((data) => {
+						if (data !== 0) {
+							// this.$message.error('手机码已存在，请重新确认')
+							// this.inputForm.mobilePhone = ''
+							// throw new Error('联系电话已存在，请重新确认')
+							uni.showToast({
+								title: '联系电话已存在，请重新确认',
+								icon: "none",
+								duration:2000
+							})
+							this.inputForm.mobilePhone = ''
+						}
+					})
+				}
+
 
 			},
 			isEmpty(value) {

pages/human/practice/register/RegistrationAddForm.vue

@@ -23,10 +23,10 @@
 						    ]"></jp-picker>
 			</u-form-item>
 			
-			<u-form-item label="出生地" borderBottom prop="nativePlace" >
+			<u-form-item label="出生地" borderBottom prop="nativePlace" :required="true">
 			     <u--input placeholder='请填写出生地'  v-model="inputForm.nativePlace"></u--input>
 			</u-form-item>
-			<u-form-item label="民族" borderBottom prop="nation" >
+			<u-form-item label="民族" borderBottom prop="nation" :required="true">
 			     <u--input placeholder='请填写民族'  v-model="inputForm.nation"></u--input>
 			</u-form-item>
 			<u-form-item label="政治面貌" borderBottom prop="politicalOutlook" >
@@ -47,10 +47,10 @@
 						        { label: '群众', value: '13' },
 						    ]"></jp-picker>
 			</u-form-item>
-			<u-form-item label="毕业院校" borderBottom prop="graduatedFrom" >
+			<u-form-item label="毕业院校" borderBottom prop="graduatedFrom" :required="true">
 			     <u--input placeholder='请填写毕业院校'  v-model="inputForm.graduatedFrom"></u--input>
 			</u-form-item>
-			<u-form-item label="专业" borderBottom prop="speciality" >
+			<u-form-item label="专业" borderBottom prop="speciality" :required="true">
 			     <u--input placeholder='请填写专业'  v-model="inputForm.speciality"></u--input>
 			</u-form-item>
 			<u-form-item label="联系电话" borderBottom prop="mobilePhone" :required="true">
@@ -59,6 +59,28 @@
 			<u-form-item label="QQ号/微信号" borderBottom prop="qqNum" >
 			     <u--input placeholder='请填写QQ号/微信号'  v-model="inputForm.qqNum" :maxlength="20"></u--input>
 			</u-form-item>
+			<u-form-item label="实习开始时间" borderBottom prop="practiceStartDay" >
+				<el-date-picker
+						v-model="inputForm.practiceStartDay"
+						type="date"
+						placeholder="选择实习开始时间"
+						style="width:100%"
+						size="default"
+						placement="bottom-start"
+						clearable>
+				</el-date-picker>
+			</u-form-item>
+			<u-form-item label="实习结束时间" borderBottom prop="practiceCompleteDay" >
+				<el-date-picker
+						v-model="inputForm.practiceCompleteDay"
+						type="date"
+						placeholder="选择实习结束时间"
+						style="width:100%"
+						size="default"
+						placement="bottom-start"
+						clearable>
+				</el-date-picker>
+			</u-form-item>
 			<u-form-item label="简介" borderBottom prop="remarks">
 			    <u--textarea  placeholder='请填写简介' :maxlength="200" v-model="inputForm.remarks" ></u--textarea>
 			</u-form-item>
@@ -190,11 +212,40 @@
 				membersKey: '',
 				rules: {
 					  'sex': [
-					  {
+						  {
+								required: true,
+								message: '性别不能为空',
+								trigger: ['blur', 'change']
+						  }
+					  ],
+					  'nativePlace': [
+						  {
+								required: true,
+								message: '出生地不能为空',
+								trigger: ['blur', 'change']
+						  }
+					  ],
+					  'nation': [
+							{
+								required: true,
+								message: '民族不能为空',
+								trigger: ['blur', 'change']
+							}
+					  ],
+					  'graduatedFrom': [
+							{
+								required: true,
+								message: '毕业院校不能为空',
+								trigger: ['blur', 'change']
+							}
+					  ],
+					  'speciality': [
+						{
 							required: true,
-							message: '性别不能为空',
+							message: '专业不能为空',
 							trigger: ['blur', 'change']
-					  }],
+						}
+					  ],
 					  'name': [
 						  {
 							  required: true,
@@ -262,6 +313,7 @@
 			  }
 			},
 			async saveForm () {
+
 				await registerService.findIdCardOnly(this.inputForm.idCard).then((data) => {
 					if (data !== 0) {
 						uni.showToast({
@@ -271,6 +323,42 @@
 						})
 						this.inputForm.idCard = ''
 					}
+					if (this.isEmpty(this.inputForm.familyMembers)) {
+						uni.showToast({
+							title: '请至少填写一条家庭成员信息',
+							icon: "none",
+							duration:2000
+						})
+						throw new Error('请至少填写一条家庭成员信息')
+					} else {
+						this.inputForm.familyMembers.forEach((item, index) => {
+							if (this.isEmpty(item.callName)) {
+								uni.showToast({
+									title: '家庭成员明细中第' + (index + 1) + '条数据的 “称呼” 不能为空',
+									icon: "none",
+									duration:2000
+								})
+								throw new Error('家庭成员明细中第' + (index + 1) + '条数据的 “称呼” 不能为空')
+							}
+							if (this.isEmpty(item.name)) {
+								uni.showToast({
+									title: '家庭成员明细中第' + (index + 1) + '条数据的 “姓名” 不能为空',
+									icon: "none",
+									duration:2000
+								})
+								throw new Error('家庭成员明细中第' + (index + 1) + '条数据的 “姓名” 不能为空')
+							}
+							if (this.isEmpty(item.phone)) {
+								uni.showToast({
+									title: '家庭成员明细中第' + (index + 1) + '条数据的 “联系方式” 不能为空',
+									icon: "none",
+									duration:2000
+								})
+								throw new Error('家庭成员明细中第' + (index + 1) + '条数据的 “联系方式” 不能为空')
+							}
+						});
+
+					}
 				})
 				await enrollmentRegistrationService.findMobilePhoneOnly(this.inputForm.mobilePhone).then((data) => {
 					if (data !== 0) {
@@ -291,6 +379,9 @@
 						experience.endTime = this.formatDate(experience.endTime);
 					});
 
+					this.inputForm.practiceStartDay = this.formatDate(this.inputForm.practiceStartDay)
+					this.inputForm.practiceCompleteDay = this.formatDate(this.inputForm.practiceCompleteDay)
+
 					registerService.save(this.inputForm).then((data) => {
 						// 接口调用成功，隐藏加载动画
 						uni.hideLoading();