Forráskód Böngészése

人员信息身份证验证和部分基础信息调整

徐滕 4 napja
szülő
commit
5eea7fb730

+ 2 - 2
src/api/human/enrollment/EnrollmentRegistrationService.js

@@ -149,11 +149,11 @@ export default {
 			params: { id: id },
 		});
 	},
-	findIdCardOnly(idCard) {
+	findIdCardOnly(idCard,id) {
 		return request({
 			url: prefix + "/enrollmentRegistration/findIdCardOnly",
 			method: "get",
-			params: { idCard: idCard },
+			params: { idCard: idCard,id:id },
 		});
 	},
 	findMobilePhoneOnly(mobilePhone) {

+ 29 - 6
src/views/human/enrollment/registration/EnrollmentRegistrationAddForm.vue

@@ -12,7 +12,7 @@
 				</el-col>
 				<el-col :span="12">
 					<el-form-item label="身份证号码" prop="idCard" :rules="[{required: true,validator: validator.isCardId, trigger:'blur'}]">
-						<el-input v-model="inputForm.idCard" @blur="idCardOnly(inputForm.idCard)"></el-input>
+						<el-input v-model="inputForm.idCard" @blur="idCardOnly(inputForm.idCard,inputForm.id)"></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
@@ -57,13 +57,33 @@
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
-					<el-form-item label="籍贯" prop="nativePlace" :rules="[]">
-						<el-input v-model="inputForm.nativePlace"></el-input>
+					<el-form-item label="籍贯" prop="nativePlace"
+								  :rules="[
+											{required: true, message:'籍贯不能为空', trigger:'change'}
+											 ]">
+						<SelectTree
+							ref="areaTree"
+							:props="{
+												  value: 'id',             // ID字段名
+												  label: 'name',         // 显示名称
+												  children: 'children'    // 子级字段名
+											}"
+							url="/system-server/sys/area/treeData"
+							:value="inputForm.nativePlace"
+							:clearable="true"
+							size="large"
+							:accordion="true"
+							@getValue="(value) => {inputForm.nativePlace=value}"/>
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
 					<el-form-item label="民族" prop="nation" :rules="[]">
-						<el-input v-model="inputForm.nation"></el-input>
+						<el-select v-model="inputForm.nation" placeholder="请选择民族" clearable
+								   style="width: 100%;">
+							<el-option v-for="item in $dictUtils.getDictList('sys_nation')"
+									   :key="item.value" :label="item.label" :value="item.value">
+							</el-option>
+						</el-select>
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
@@ -975,8 +995,8 @@
 				}
 			},
 			//身份证号码唯一性判断
-			idCardOnly(idCard) {
-				enrollmentRegistrationService.findIdCardOnly(idCard).then((data) => {
+			idCardOnly(idCard,id) {
+				enrollmentRegistrationService.findIdCardOnly(idCard,id).then((data) => {
 					if (data !== 0) {
 						this.$message.error('身份证号码已存在,请重新确认')
 						this.inputForm.idCard = ''
@@ -1010,6 +1030,9 @@
 						} else {
 							sex = '1'
 						}
+						//获取户籍所在地
+						const regionCode = idCard.substring(0, 6);
+						this.generalForm.nativePlace = regionCode
 						this.inputForm.age=age
 						this.inputForm.sex=sex
 						this.inputForm.birthday=birth

+ 29 - 6
src/views/human/enrollment/registration/EnrollmentRegistrationAddForm2.vue

@@ -12,7 +12,7 @@
 				</el-col>
 				<el-col :span="12">
 					<el-form-item label="身份证号码" prop="idCard" :rules="[{required: true,validator: validator.isCardId, trigger:'blur'}]">
-						<el-input v-model="inputForm.idCard" @blur="idCardOnly(inputForm.idCard)"></el-input>
+						<el-input v-model="inputForm.idCard" @blur="idCardOnly(inputForm.idCard,inputForm.id)"></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
@@ -57,13 +57,33 @@
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
-					<el-form-item label="籍贯" prop="nativePlace" :rules="[]">
-						<el-input v-model="inputForm.nativePlace"></el-input>
+					<el-form-item label="籍贯" prop="nativePlace"
+								  :rules="[
+											{required: true, message:'籍贯不能为空', trigger:'change'}
+											 ]">
+						<SelectTree
+							ref="areaTree"
+							:props="{
+												  value: 'id',             // ID字段名
+												  label: 'name',         // 显示名称
+												  children: 'children'    // 子级字段名
+											}"
+							url="/system-server/sys/area/treeData"
+							:value="inputForm.nativePlace"
+							:clearable="true"
+							size="large"
+							:accordion="true"
+							@getValue="(value) => {inputForm.nativePlace=value}"/>
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
 					<el-form-item label="民族" prop="nation" :rules="[]">
-						<el-input v-model="inputForm.nation"></el-input>
+						<el-select v-model="inputForm.nation" placeholder="请选择民族" clearable
+								   style="width: 100%;">
+							<el-option v-for="item in $dictUtils.getDictList('sys_nation')"
+									   :key="item.value" :label="item.label" :value="item.value">
+							</el-option>
+						</el-select>
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
@@ -711,8 +731,8 @@
 				}
 			},
 			//身份证号码唯一性判断
-			idCardOnly(idCard) {
-				enrollmentRegistrationService.findIdCardOnly(idCard).then((data) => {
+			idCardOnly(idCard,id) {
+				enrollmentRegistrationService.findIdCardOnly(idCard,id).then((data) => {
 					if (data !== 0) {
 						this.$message.error('身份证号码已存在,请重新确认')
 						this.inputForm.idCard = ''
@@ -746,6 +766,9 @@
 						} else {
 							sex = '1'
 						}
+						//获取户籍所在地
+						const regionCode = idCard.substring(0, 6);
+						this.generalForm.nativePlace = regionCode
 						this.inputForm.age=age
 						this.inputForm.sex=sex
 						this.inputForm.birthday=birth

+ 36 - 16
src/views/human/enrollment/registration/EnrollmentRegistrationEditForm.vue

@@ -2,14 +2,12 @@
 	<div>
 		<el-dialog :title="title" :close-on-click-modal="false" draggable width="1400px" height="500px" @close="close"
 			append-to-body v-model="visible">
-			<el-row>
-				<el-row>
 					<el-form :model="inputForm" ref="inputForm" v-loading="loading"
 						:class="method === 'view' ? 'readonly' : ''"
 						:disabled="status === 'audit' || status === 'taskFormDetail' || method === 'view'"
 						label-width="100px" @submit.native.prevent>
 
-						<el-divider content-position="left"><i class="el-icon-document"></i> 基础信息</el-divider>
+						<el-divider content-position="left"><i class="el-icon-document"></i> <span style="font-weight: 900; font-size: 16px; color: #606266;">基础信息</span></el-divider>
 						<el-row :gutter="26">
 							<el-col :span="12">
 								<el-form-item label="姓名" prop="name"
@@ -21,7 +19,7 @@
 								<el-form-item label="身份证号码" prop="idCard"
 									:rules="[{ required: true, validator: validator.isCardId, trigger: 'blur' }]">
 									<el-input v-model="inputForm.idCard"
-										@blur="idCardOnly(inputForm.idCard)"></el-input>
+										@blur="idCardOnly(inputForm.idCard,inputForm.id)"></el-input>
 								</el-form-item>
 							</el-col>
 							<el-col :span="12">
@@ -61,13 +59,33 @@
 								</el-form-item>
 							</el-col>
 							<el-col :span="12">
-								<el-form-item label="籍贯" prop="nativePlace" :rules="[]">
-									<el-input v-model="inputForm.nativePlace"></el-input>
+								<el-form-item label="籍贯" prop="nativePlace"
+											  :rules="[
+											{required: true, message:'籍贯不能为空', trigger:'change'}
+											 ]">
+									<SelectTree
+										ref="areaTree"
+										:props="{
+												  value: 'id',             // ID字段名
+												  label: 'name',         // 显示名称
+												  children: 'children'    // 子级字段名
+											}"
+										url="/system-server/sys/area/treeData"
+										:value="inputForm.nativePlace"
+										:clearable="true"
+										size="large"
+										:accordion="true"
+										@getValue="(value) => {inputForm.nativePlace=value}"/>
 								</el-form-item>
 							</el-col>
 							<el-col :span="12">
 								<el-form-item label="民族" prop="nation" :rules="[]">
-									<el-input v-model="inputForm.nation"></el-input>
+									<el-select v-model="inputForm.nation" placeholder="请选择民族" clearable
+											   style="width: 100%;">
+										<el-option v-for="item in $dictUtils.getDictList('sys_nation')"
+												   :key="item.value" :label="item.label" :value="item.value">
+										</el-option>
+									</el-select>
 								</el-form-item>
 							</el-col>
 							<el-col :span="12">
@@ -119,7 +137,7 @@
 								</el-form-item>
 							</el-col>
 						</el-row>
-						<el-divider content-position="left"><i class="el-icon-document"></i> 学历信息</el-divider>
+						<el-divider content-position="left"><i class="el-icon-document"></i> <span style="font-weight: 900; font-size: 16px; color: #606266;">学历信息</span></el-divider>
 						<el-row :gutter="26">
 							<el-col :span="12">
 								<el-form-item label="毕业院校" prop="graduatedFrom" :rules="[]">
@@ -204,7 +222,7 @@
 								</el-form-item>
 							</el-col>
 						</el-row>
-						<el-divider content-position="left"><i class="el-icon-document"></i> 部门信息</el-divider>
+						<el-divider content-position="left"><i class="el-icon-document"></i> <span style="font-weight: 900; font-size: 16px; color: #606266;">部门信息</span></el-divider>
 						<el-row :gutter="26">
 							<el-form v-if="status === 'audit'" style="width: 100%" :model="inputForm" ref="inputForm"
 								v-loading="loading" :class="method === 'view' ? 'readonly' : ''"
@@ -363,7 +381,7 @@
 								</el-row>
 							</el-form>
 						</el-row>
-						<el-divider content-position="left"><i class="el-icon-document"></i> 社保信息(选填)</el-divider>
+						<el-divider content-position="left"><i class="el-icon-document"></i> <span style="font-weight: 900; font-size: 16px; color: #606266;">社保信息</span>(选填)</el-divider>
 						<el-row :gutter="26" v-if="status === 'audit' || status === 'taskFormDetail'">
 							<el-col :span="12">
 								<el-form-item label="社保编号" prop="socialSecurityNumber" :rules="[]">
@@ -564,7 +582,7 @@
 								</el-form-item>
 							</el-col>
 						</el-row>
-						<el-divider content-position="left"><i class="el-icon-document"></i> 中信银行卡信息</el-divider>
+						<el-divider content-position="left"><i class="el-icon-document"></i> <span style="font-weight: 900; font-size: 16px; color: #606266;">中信银行卡信息</span></el-divider>
 						<el-row :gutter="26">
 							<el-col :span="12">
 								<el-form-item label="中信银行卡号" prop="zxBankCardNumber">
@@ -663,7 +681,7 @@
 								</el-form-item>
 							</el-col>
 						</el-row>
-						<el-divider content-position="left"><i class="el-icon-document"></i> 招商银行卡信息</el-divider>
+						<el-divider content-position="left"><i class="el-icon-document"></i> <span style="font-weight: 900; font-size: 16px; color: #606266;">招商银行卡信息</span></el-divider>
 						<el-row :gutter="26">
 							<el-col :span="12">
 								<el-form-item label="招商银行卡号" prop="gsBankCardNumber">
@@ -763,8 +781,7 @@
 							</el-col>
 						</el-row>
 
-					</el-form> </el-row>
-			</el-row>
+					</el-form>
 			<template #footer>
 				<span class="dialog-footer">
 					<el-button @click="close()" icon="el-icon-circle-close">关闭</el-button>
@@ -1325,8 +1342,8 @@ export default {
 			}
 		},
 		//身份证号码唯一性判断
-		idCardOnly(idCard) {
-			enrollmentRegistrationService.findIdCardOnly(idCard).then((data) => {
+		idCardOnly(idCard,id) {
+			enrollmentRegistrationService.findIdCardOnly(idCard,id).then((data) => {
 				if (data !== 0) {
 					this.$message.error('身份证号码已存在,请重新确认')
 					this.inputForm.idCard = ''
@@ -1360,6 +1377,9 @@ export default {
 					} else {
 						sex = '1'
 					}
+					//获取户籍所在地
+					const regionCode = idCard.substring(0, 6);
+					this.generalForm.nativePlace = regionCode
 					this.inputForm.age = age
 					this.inputForm.sex = sex
 					this.inputForm.birthday = birth

+ 7 - 1
src/views/human/enrollment/registration/EnrollmentRegistrationList.vue

@@ -125,7 +125,13 @@
 										}}
 									</template>
 								</vxe-column>
-								<vxe-column min-width="160" align="center" title="民族" field="nation"></vxe-column>
+
+								<vxe-column min-width="160" align="center" title="民族" field="nation">
+									<template #default="scope">
+										{{ $dictUtils.getDictLabel('sys_nation', scope.row.nation, '')
+										}}
+									</template>
+								</vxe-column>
 								<vxe-column min-width="160" align="center" title="所属部门"
 									field="departmentName"></vxe-column>
 								<vxe-column min-width="160" align="center" title="联系电话"

+ 3 - 3
src/views/human/practice/register/RegistrationAddForm.vue

@@ -22,7 +22,7 @@
 				</el-col>
 				<el-col :span="12">
 					<el-form-item label="身份证号码" prop="idCard" :rules="[{required: true,validator: validator.isCardId, trigger:'blur'}]">
-						<el-input v-model="inputForm.idCard" @blur="idCardOnly(inputForm.idCard)"></el-input>
+						<el-input v-model="inputForm.idCard" @blur="idCardOnly(inputForm.idCard, inputForm.id)"></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
@@ -621,8 +621,8 @@
 
 			},
 			//身份证号码唯一性判断
-			idCardOnly(idCard) {
-				registerService.findIdCardOnly(idCard).then((data) => {
+			idCardOnly(idCard,id) {
+				registerService.findIdCardOnly(idCard,id).then((data) => {
 					if (data !== 0) {
 						this.$message.error('身份证号码已存在,请重新确认')
 						this.inputForm.idCard = ''

+ 26 - 6
src/views/human/practice/register/RegistrationEditForm.vue

@@ -38,17 +38,37 @@
 							</el-col>
 							<el-col :span="12">
 								<el-form-item label="身份证号码" prop="idCard" :rules="[{required: true,validator: validator.isCardId, trigger:'blur'}]">
-									<el-input v-model="inputForm.idCard" @blur="idCardOnly(inputForm.idCard)"></el-input>
+									<el-input v-model="inputForm.idCard" @blur="idCardOnly(inputForm.idCard, inputForm.id)"></el-input>
 								</el-form-item>
 							</el-col>
 							<el-col :span="12">
-								<el-form-item label="出生地" prop="nativePlace" :rules="[]">
-									<el-input v-model="inputForm.nativePlace"></el-input>
+								<el-form-item label="籍贯" prop="nativePlace"
+											  :rules="[
+											{required: true, message:'籍贯不能为空', trigger:'change'}
+											 ]">
+									<SelectTree
+										ref="areaTree"
+										:props="{
+												  value: 'id',             // ID字段名
+												  label: 'name',         // 显示名称
+												  children: 'children'    // 子级字段名
+											}"
+										url="/system-server/sys/area/treeData"
+										:value="inputForm.nativePlace"
+										:clearable="true"
+										size="large"
+										:accordion="true"
+										@getValue="(value) => {inputForm.nativePlace=value}"/>
 								</el-form-item>
 							</el-col>
 							<el-col :span="12">
 								<el-form-item label="民族" prop="nation" :rules="[]">
-									<el-input v-model="inputForm.nation"></el-input>
+									<el-select v-model="inputForm.nation" placeholder="请选择民族" clearable
+											   style="width: 100%;">
+										<el-option v-for="item in $dictUtils.getDictList('sys_nation')"
+												   :key="item.value" :label="item.label" :value="item.value">
+										</el-option>
+									</el-select>
 								</el-form-item>
 							</el-col>
 							<el-col :span="12">
@@ -638,8 +658,8 @@
 
 			},
 			//身份证号码唯一性判断
-			idCardOnly(idCard) {
-				registerService.findIdCardOnly(idCard).then((data) => {
+			idCardOnly(idCard,id) {
+				registerService.findIdCardOnly(idCard,id).then((data) => {
 					if (data !== 0) {
 						this.$message.error('身份证号码已存在,请重新确认')
 						this.inputForm.idCard = ''

+ 76 - 30
src/views/sys/user/UserInfo.vue

@@ -107,7 +107,7 @@
 									<el-form-item label="身份证号码" prop="idCard"
 										:rules="[{ required: true, validator: validator.isCardId, trigger: 'blur' }]">
 										<el-input v-model="generalForm.idCard"
-											@blur="idCardOnly(generalForm.idCard)"></el-input>
+											@blur="idCardOnly(generalForm.idCard,generalForm.id)"></el-input>
 									</el-form-item>
 								</el-col>
 								<el-col :span="12">
@@ -115,7 +115,7 @@
 										{ required: true, message: '性别不能为空', trigger: 'change' }
 									]">
 										<el-radio-group v-model="generalForm.sex">
-											<el-radio v-for="item in $dictUtils.getDictList('sex')" :label="item.value"
+											<el-radio v-for="item in $dictUtils.getDictList('sex')" :label="item.value" :disabled="true"
 												:key="item.value">{{ item.label }}</el-radio>
 										</el-radio-group>
 									</el-form-item>
@@ -123,15 +123,15 @@
 								<el-col :span="12">
 									<el-form-item label="年龄" prop="age"
 										:rules="[{ required: true, message: '年龄不能为空', trigger: 'change' }]">
-										<el-input v-model="generalForm.age" type="number"></el-input>
+										<el-input v-model="generalForm.age" :disabled="true" 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-date-picker style="width: 100%" v-model="generalForm.birthday"
-											value-format="YYYY-MM-DD" placeholder="选择日期">
+										<el-date-picker style="width: 100%" v-model="generalForm.birthday" :disabled="true"
+														value-format="YYYY-MM-DD" placeholder="选择日期">
 										</el-date-picker>
 									</el-form-item>
 								</el-col>
@@ -146,16 +146,53 @@
 										</el-select>
 									</el-form-item>
 								</el-col>
-								<el-col :span="12">
+<!--								<el-col :span="12">
 									<el-form-item label="籍贯" prop="nativePlace" :rules="[]">
 										<el-input v-model="generalForm.nativePlace"></el-input>
 									</el-form-item>
-								</el-col>
+								</el-col>-->
+
 								<el-col :span="12">
+									<el-form-item label="籍贯" prop="nativePlace"
+												  :rules="[
+											{required: true, message:'籍贯不能为空', trigger:'change'}
+											 ]">
+											<SelectTree
+												ref="areaTree"
+												:props="{
+												  value: 'id',             // ID字段名
+												  label: 'name',         // 显示名称
+												  children: 'children'    // 子级字段名
+											}"
+											url="/system-server/sys/area/treeData"
+											:value="generalForm.nativePlace"
+											:clearable="true"
+											size="large"
+											:accordion="true"
+											@getValue="(value) => {generalForm.nativePlace=value}"/>
+									</el-form-item>
+								</el-col>
+
+
+
+
+<!--								<el-col :span="12">
 									<el-form-item label="民族" prop="nation" :rules="[]">
 										<el-input v-model="generalForm.nation"></el-input>
 									</el-form-item>
+								</el-col>-->
+
+								<el-col :span="12">
+									<el-form-item label="民族" prop="nation" :rules="[]">
+										<el-select v-model="generalForm.nation" placeholder="请选择民族" clearable
+												   style="width: 100%;">
+											<el-option v-for="item in $dictUtils.getDictList('sys_nation')"
+													   :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="maritalStatus" :rules="[]">
 										<el-select v-model="generalForm.maritalStatus" placeholder="请选择婚姻状况" clearable
@@ -168,6 +205,18 @@
 
 								</el-col>
 								<el-col :span="12">
+									<el-form-item label="邮箱" :rules="[
+										{
+											type: 'email',
+											message: '请输入正确的邮箱地址',
+											trigger: 'blur',
+										},
+									]" prop="email">
+										<el-input v-model="concatForm.email"></el-input>
+									</el-form-item>
+								</el-col>
+
+								<el-col :span="12">
 									<el-form-item label="联系电话" prop="mobilePhone"
 										:rules="[{ required: true, message: '联系电话不能为空', trigger: 'change' }]">
 										<el-input v-model="generalForm.mobilePhone"
@@ -187,6 +236,16 @@
 
 							</el-row>
 
+
+							<el-row :gutter="26">
+								<el-col :span="12">
+									<el-form-item label="个人简介" prop="remarks" :rules="[]">
+										<el-input type="textarea" maxlength="200" show-word-limit
+												  v-model="generalForm.remarks"></el-input>
+									</el-form-item>
+								</el-col>
+							</el-row>
+
 						</el-tab-pane>
 						<el-tab-pane label="学历信息">
 							<el-row :gutter="26">
@@ -265,14 +324,6 @@
 									</el-form-item>
 								</el-col>
 							</el-row>
-							<el-row :gutter="26">
-								<el-col :span="12">
-									<el-form-item label="个人简介" prop="remarks" :rules="[]">
-										<el-input type="textarea" maxlength="200" show-word-limit
-											v-model="generalForm.remarks"></el-input>
-									</el-form-item>
-								</el-col>
-							</el-row>
 						</el-tab-pane>
 						<el-tab-pane label="部门信息">
 							<el-row :gutter="26">
@@ -771,17 +822,9 @@
 							</el-form-item> -->
 						</el-form>
 					</el-tab-pane>
-					<el-tab-pane label="联系方式">
+<!--					<el-tab-pane label="联系方式">
 						<el-form :model="concatForm" ref="concatForm" label-width="100px">
-							<el-form-item label="邮箱" :rules="[
-								{
-									type: 'email',
-									message: '请输入正确的邮箱地址',
-									trigger: 'blur',
-								},
-							]" prop="email">
-								<el-input v-model="concatForm.email"></el-input>
-							</el-form-item>
+
 							<el-form-item label="手机" prop="mobile" :rules="[
 								{
 									validator: validator.isMobile,
@@ -798,11 +841,11 @@
 							]">
 								<el-input v-model="concatForm.phone"></el-input>
 							</el-form-item>
-							<!-- <el-form-item>
+							&lt;!&ndash; <el-form-item>
 								<el-button type="primary" @click="submitConcatForm()">保存</el-button>
-							</el-form-item> -->
+							</el-form-item> &ndash;&gt;
 						</el-form>
-					</el-tab-pane>
+					</el-tab-pane>-->
 					<!--<el-tab-pane label="修改密码">
 						<el-form
 							:rules="dataRule"
@@ -1432,8 +1475,8 @@ export default {
 			this.refreshList();
 		},
 		//身份证号码唯一性判断
-		idCardOnly(idCard) {
-			enrollmentRegistrationService.findIdCardOnly(idCard).then((data) => {
+		idCardOnly(idCard,id) {
+			enrollmentRegistrationService.findIdCardOnly(idCard,id).then((data) => {
 				if (data !== 0) {
 					this.$message.error('身份证号码已存在,请重新确认')
 					this.generalForm.idCard = ''
@@ -1467,6 +1510,9 @@ export default {
 					} else {
 						sex = '1'
 					}
+					//获取户籍所在地
+					const regionCode = idCard.substring(0, 6);
+					this.generalForm.nativePlace = regionCode
 					this.generalForm.age = age
 					this.generalForm.sex = sex
 					this.generalForm.birthday = birth