个人信息调整

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

@@ -800,10 +800,10 @@
 					<el-collapse-transition>
 						<el-row :gutter="26" v-if="changeFlag[0]">
 							<el-col :span="24">
-								<el-collapse v-model="eduActiveNames" @change="handleEduInfoChange"
+								<el-collapse v-model="activeNames[0]" @change="handleEduInfoChange"
 									v-if="inputForm.eduInfoList && inputForm.eduInfoList.length > 0">
 									<div style="padding: 0 30px;" v-for="(item, index) in inputForm.eduInfoList">
-										<el-collapse-item>
+										<el-collapse-item :name="item.id">
 											<template #title="{ isActive }">
 												<div class="collapseTitle">
 													<span style="font-size: 16px;"> {{
@@ -900,10 +900,10 @@
 					<el-collapse-transition>
 						<el-row :gutter="26" v-if="changeFlag[1]">
 							<el-col :span="24">
-								<el-collapse v-model="workActiveNames" @change="handleEduInfoChange"
+								<el-collapse v-model="activeNames[1]" @change="handleEduInfoChange"
 									v-if="inputForm.workInfoList && inputForm.workInfoList.length > 0">
 									<div style="padding: 0 30px;" v-for="(item, index) in inputForm.workInfoList">
-										<el-collapse-item>
+										<el-collapse-item :name="item.id">
 											<template #title="{ isActive }">
 												<div class="collapseTitle">
 													<span style="font-size: 16px;"> {{ item.companyName + ' - ' +
@@ -965,10 +965,10 @@
 					<el-collapse-transition>
 						<el-row :gutter="26" v-if="changeFlag[2]">
 							<el-col :span="24">
-								<el-collapse v-model="workActiveNames" @change="handleEduInfoChange"
+								<el-collapse v-model="activeNames[2]" @change="handleEduInfoChange"
 									v-if="inputForm.trainingInfoList && inputForm.trainingInfoList.length > 0">
 									<div style="padding: 0 30px;" v-for="(item, index) in inputForm.trainingInfoList">
-										<el-collapse-item>
+										<el-collapse-item :name="item.id">
 											<template #title="{ isActive }">
 												<div class="collapseTitle">
 													<span style="font-size: 16px;"> {{ item.name + ' - ' +
@@ -1018,11 +1018,11 @@
 					<el-collapse-transition>
 						<el-row :gutter="26" v-if="changeFlag[3]">
 							<el-col :span="24">
-								<el-collapse v-model="workActiveNames" @change="handleEduInfoChange"
+								<el-collapse v-model="activeNames[3]" @change="handleEduInfoChange"
 									v-if="inputForm.certificateInfoList && inputForm.certificateInfoList.length > 0">
 									<div style="padding: 0 30px;"
 										v-for="(item, index) in inputForm.certificateInfoList">
-										<el-collapse-item>
+										<el-collapse-item :name="item.id">
 											<template #title="{ isActive }">
 												<div class="collapseTitle">
 													<span style="font-size: 16px;"> {{
@@ -1093,9 +1093,10 @@
 					<el-collapse-transition>
 						<el-row :gutter="26" v-if="changeFlag[4]">
 							<el-col :span="24">
-								<el-collapse v-if="inputForm.skillInfoList && inputForm.skillInfoList.length > 0">
+								<el-collapse v-model="activeNames[4]"
+									v-if="inputForm.skillInfoList && inputForm.skillInfoList.length > 0">
 									<div style="padding: 0 30px;" v-for="(item, index) in inputForm.skillInfoList">
-										<el-collapse-item>
+										<el-collapse-item :name="item.id">
 											<template #title="{ isActive }">
 												<div class="collapseTitle">
 													<span style="font-size: 16px;"> {{ item.name }}</span>
@@ -1148,9 +1149,10 @@
 					<el-collapse-transition>
 						<el-row :gutter="26" v-if="changeFlag[5]">
 							<el-col :span="24">
-								<el-collapse v-if="inputForm.languageInfoList && inputForm.languageInfoList.length > 0">
+								<el-collapse v-model="activeNames[5]"
+									v-if="inputForm.languageInfoList && inputForm.languageInfoList.length > 0">
 									<div style="padding: 0 30px;" v-for="(item, index) in inputForm.languageInfoList">
-										<el-collapse-item>
+										<el-collapse-item :name="item.id">
 											<template #title="{ isActive }">
 												<div class="collapseTitle">
 													<span style="font-size: 16px;"> {{ item.language }}</span>
@@ -1207,9 +1209,10 @@
 					<el-collapse-transition>
 						<el-row :gutter="26" v-if="changeFlag[6]">
 							<el-col :span="24">
-								<el-collapse v-if="inputForm.familyInfoList && inputForm.familyInfoList.length > 0">
+								<el-collapse v-model="activeNames[6]"
+									v-if="inputForm.familyInfoList && inputForm.familyInfoList.length > 0">
 									<div style="padding: 0 30px;" v-for="(item, index) in inputForm.familyInfoList">
-										<el-collapse-item>
+										<el-collapse-item :name="item.id">
 											<template #title="{ isActive }">
 												<div class="collapseTitle">
 													<span style="font-size: 16px;"> {{ item.relation + "-" }}</span>
@@ -1265,9 +1268,10 @@
 					<el-collapse-transition>
 						<el-row :gutter="26" v-if="changeFlag[7]">
 							<el-col :span="24">
-								<el-collapse v-if="inputForm.rewardInfoList && inputForm.rewardInfoList.length > 0">
+								<el-collapse v-model="activeNames[7]"
+									v-if="inputForm.rewardInfoList && inputForm.rewardInfoList.length > 0">
 									<div style="padding: 0 30px;" v-for="(item, index) in inputForm.rewardInfoList">
-										<el-collapse-item>
+										<el-collapse-item :name="item.id">
 											<template #title="{ isActive }">
 												<div class="collapseTitle">
 													<span style="font-size: 16px;"> {{ item.name }}</span>
@@ -1320,11 +1324,11 @@
 					<el-collapse-transition>
 						<el-row :gutter="26" v-if="changeFlag[8]">
 							<el-col :span="24">
-								<el-collapse
+								<el-collapse v-model="activeNames[8]"
 									v-if="inputForm.laborContractInfoList && inputForm.laborContractInfoList.length > 0">
 									<div style="padding: 0 30px;"
 										v-for="(item, index) in inputForm.laborContractInfoList">
-										<el-collapse-item>
+										<el-collapse-item :name="item.id">
 											<template #title="{ isActive }">
 												<div class="collapseTitle">
 													<span style="font-size: 16px;"> {{
@@ -1348,8 +1352,8 @@
 													$dictUtils.getDictLabel("labor_contract_type", item.type,
 														'-')
 												}}</el-descriptions-item>
-												<el-descriptions-item label="合同编号：">{{ item.code
-												}}</el-descriptions-item>
+												<!-- <el-descriptions-item label="合同编号：">{{ item.code
+												}}</el-descriptions-item> -->
 												<el-descriptions-item label="合同期限：">{{
 													$dictUtils.getDictLabel("labor_contract_term",
 														item.term,
@@ -1364,9 +1368,9 @@
 												<el-descriptions-item label="试用期结束日期：">{{
 													handleDateFormatter(item.trialEndDate)
 												}}</el-descriptions-item>
-												<el-descriptions-item label="办理日期：">{{
+												<!-- <el-descriptions-item label="办理日期：">{{
 													handleDateFormatter(item.processeDate)
-												}}</el-descriptions-item>
+												}}</el-descriptions-item> -->
 												<el-descriptions-item label="附件：">
 													<AttachmentView :fileList="item.files">
 													</AttachmentView>
@@ -1625,14 +1629,14 @@ export default {
 				],
 				laborContractInfoList: []
 			},
-			workActiveNames: [],
-			eduActiveNames: [],
 			keyWatch: '',
 			roleList: [],
 			postList: [],
 			changeFlag: [
 				true, true, true, true, true, true, true, true, true
-			]
+			],
+			activeNames: []
+
 
 		}
 	},
@@ -1892,6 +1896,16 @@ export default {
 					this.inputForm.certificateInfoList.forEach(temp => {
 						this.changeType(temp.type, temp)
 					})
+					// 展开所有
+					this.activeNames[0] = this.inputForm.eduInfoList.map(item => item.id)
+					this.activeNames[1] = this.inputForm.workInfoList.map(item => item.id)
+					this.activeNames[2] = this.inputForm.trainingInfoList.map(item => item.id)
+					this.activeNames[3] = this.inputForm.certificateInfoList.map(item => item.id)
+					this.activeNames[4] = this.inputForm.skillInfoList.map(item => item.id)
+					this.activeNames[5] = this.inputForm.languageInfoList.map(item => item.id)
+					this.activeNames[6] = this.inputForm.familyInfoList.map(item => item.id)
+					this.activeNames[7] = this.inputForm.rewardInfoList.map(item => item.id)
+					this.activeNames[8] = this.inputForm.laborContractInfoList.map(item => item.id)
 					if (this.commonJS.isNotEmpty(this.inputForm.socialSecurityPictureFront)) {
 						await this.ossService.getTemporaryUrl(this.inputForm.socialSecurityPictureFront).then((data) => {
 							let file = {

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

@@ -190,9 +190,10 @@
 				<el-collapse-transition>
 					<el-row :gutter="26" v-if="changeFlag[0]">
 						<el-col :span="24">
-							<el-collapse v-if="inputForm.eduInfoList && inputForm.eduInfoList.length > 0">
+							<el-collapse v-model="activeNames[0]"
+								v-if="inputForm.eduInfoList && inputForm.eduInfoList.length > 0">
 								<div style="padding: 0 30px;" v-for="(item, index) in inputForm.eduInfoList">
-									<el-collapse-item>
+									<el-collapse-item :name="item.id">
 										<template #title="{ isActive }">
 											<div class="collapseTitle">
 												<span style="font-size: 16px;"> {{
@@ -288,9 +289,10 @@
 				<el-collapse-transition>
 					<el-row :gutter="26" v-if="changeFlag[1]">
 						<el-col :span="24">
-							<el-collapse v-if="inputForm.workInfoList && inputForm.workInfoList.length > 0">
+							<el-collapse v-model="activeNames[1]"
+								v-if="inputForm.workInfoList && inputForm.workInfoList.length > 0">
 								<div style="padding: 0 30px;" v-for="(item, index) in inputForm.workInfoList">
-									<el-collapse-item>
+									<el-collapse-item :name="item.id">
 										<template #title="{ isActive }">
 											<div class="collapseTitle">
 												<span style="font-size: 16px;"> {{ item.companyName + ' - ' +
@@ -352,9 +354,10 @@
 				<el-collapse-transition>
 					<el-row :gutter="26" v-if="changeFlag[2]">
 						<el-col :span="24">
-							<el-collapse v-if="inputForm.trainingInfoList && inputForm.trainingInfoList.length > 0">
+							<el-collapse v-model="activeNames[2]"
+								v-if="inputForm.trainingInfoList && inputForm.trainingInfoList.length > 0">
 								<div style="padding: 0 30px;" v-for="(item, index) in inputForm.trainingInfoList">
-									<el-collapse-item>
+									<el-collapse-item :name="item.id">
 										<template #title="{ isActive }">
 											<div class="collapseTitle">
 												<span style="font-size: 16px;"> {{ item.name + ' - ' +
@@ -404,10 +407,10 @@
 				<el-collapse-transition>
 					<el-row :gutter="26" v-if="changeFlag[3]">
 						<el-col :span="24">
-							<el-collapse @change="handleChange"
+							<el-collapse v-model="activeNames[3]" @change="handleChange"
 								v-if="inputForm.certificateInfoList && inputForm.certificateInfoList.length > 0">
 								<div style="padding: 0 30px;" v-for="(item, index) in inputForm.certificateInfoList">
-									<el-collapse-item>
+									<el-collapse-item :name="item.id">
 										<template #title="{ isActive }">
 											<div class="collapseTitle">
 												<span style="font-size: 16px;"> {{
@@ -478,9 +481,10 @@
 				<el-collapse-transition>
 					<el-row :gutter="26" v-if="changeFlag[4]">
 						<el-col :span="24">
-							<el-collapse v-if="inputForm.skillInfoList && inputForm.skillInfoList.length > 0">
+							<el-collapse v-model="activeNames[4]"
+								v-if="inputForm.skillInfoList && inputForm.skillInfoList.length > 0">
 								<div style="padding: 0 30px;" v-for="(item, index) in inputForm.skillInfoList">
-									<el-collapse-item>
+									<el-collapse-item :name="item.id">
 										<template #title="{ isActive }">
 											<div class="collapseTitle">
 												<span style="font-size: 16px;"> {{ item.name }}</span>
@@ -533,9 +537,10 @@
 				<el-collapse-transition>
 					<el-row :gutter="26" v-if="changeFlag[5]">
 						<el-col :span="24">
-							<el-collapse v-if="inputForm.languageInfoList && inputForm.languageInfoList.length > 0">
+							<el-collapse v-model="activeNames[5]"
+								v-if="inputForm.languageInfoList && inputForm.languageInfoList.length > 0">
 								<div style="padding: 0 30px;" v-for="(item, index) in inputForm.languageInfoList">
-									<el-collapse-item>
+									<el-collapse-item :name="item.id">
 										<template #title="{ isActive }">
 											<div class="collapseTitle">
 												<span style="font-size: 16px;"> {{ item.language }}</span>
@@ -592,9 +597,10 @@
 				<el-collapse-transition>
 					<el-row :gutter="26" v-if="changeFlag[6]">
 						<el-col :span="24">
-							<el-collapse v-if="inputForm.familyInfoList && inputForm.familyInfoList.length > 0">
+							<el-collapse v-model="activeNames[6]"
+								v-if="inputForm.familyInfoList && inputForm.familyInfoList.length > 0">
 								<div style="padding: 0 30px;" v-for="(item, index) in inputForm.familyInfoList">
-									<el-collapse-item>
+									<el-collapse-item :name="item.id">
 										<template #title="{ isActive }">
 											<div class="collapseTitle">
 												<span style="font-size: 16px;"> {{ item.relation + "-" }}</span>
@@ -650,9 +656,10 @@
 				<el-collapse-transition>
 					<el-row :gutter="26" v-if="changeFlag[7]">
 						<el-col :span="24">
-							<el-collapse v-if="inputForm.rewardInfoList && inputForm.rewardInfoList.length > 0">
+							<el-collapse v-model="activeNames[7]"
+								v-if="inputForm.rewardInfoList && inputForm.rewardInfoList.length > 0">
 								<div style="padding: 0 30px;" v-for="(item, index) in inputForm.rewardInfoList">
-									<el-collapse-item>
+									<el-collapse-item :name="item.id">
 										<template #title="{ isActive }">
 											<div class="collapseTitle">
 												<span style="font-size: 16px;"> {{ item.name }}</span>
@@ -812,7 +819,8 @@ export default {
 			keyWatch: '',
 			changeFlag: [
 				true, true, true, true, true, true, true, true
-			]
+			],
+			activeNames: []
 		}
 	},
 	created() {
@@ -1059,6 +1067,14 @@ export default {
 					this.inputForm.certificateInfoList.forEach(temp => {
 						this.changeType(temp.type, temp)
 					})
+					this.activeNames[0] = this.inputForm.eduInfoList.map(item => item.id)
+					this.activeNames[1] = this.inputForm.workInfoList.map(item => item.id)
+					this.activeNames[2] = this.inputForm.trainingInfoList.map(item => item.id)
+					this.activeNames[3] = this.inputForm.certificateInfoList.map(item => item.id)
+					this.activeNames[4] = this.inputForm.skillInfoList.map(item => item.id)
+					this.activeNames[5] = this.inputForm.languageInfoList.map(item => item.id)
+					this.activeNames[6] = this.inputForm.familyInfoList.map(item => item.id)
+					this.activeNames[7] = this.inputForm.rewardInfoList.map(item => item.id)
 					//后面的fileType是限制上传类型
 					this.$refs.idCardFront.newUpload('view', this.inputForm.idCardFront, 'idCard', null, null, null, null, null, [...this.fileType])
 					this.$refs.idCardBack.newUpload('view', this.inputForm.idCardBack, 'idCard', null, null, null, null, null, [...this.fileType])

src/views/human/enrollment/registration/components/LaborContractInfo.vue

@@ -18,12 +18,12 @@
 							</el-select>
 						</el-form-item>
 					</el-col>
-
+					<!-- 
 					<el-col :span="12">
 						<el-form-item label="合同编号" prop="code">
 							<el-input v-model="inputForm.code" placeholder="请输入合同编号"></el-input>
 						</el-form-item>
-					</el-col>
+					</el-col> -->
 
 
 					<el-col :span="12">
@@ -60,12 +60,12 @@
 						</el-form-item>
 					</el-col>
 
-					<el-col :span="12">
+					<!-- <el-col :span="12">
 						<el-form-item label="办理日期" prop="processeDate">
 							<el-date-picker v-model="inputForm.processeDate" type="date" placeholder="请选择办理日期"
 								style="width: 100%;"></el-date-picker>
 						</el-form-item>
-					</el-col>
+					</el-col> -->
 
 					<el-col :span="12">
 						<el-form-item label="附件" prop="degreeFile">

src/views/sys/user/UserInfo.vue

@@ -902,9 +902,10 @@
 							<el-collapse-transition>
 								<el-row :gutter="26" v-if="changeFlag[0]">
 									<el-col :span="24">
-										<el-collapse v-if="eduInfoList && eduInfoList.length > 0">
+										<el-collapse v-if="eduInfoList && eduInfoList.length > 0"
+											v-model="activeNames[0]">
 											<div style="padding: 0 30px;" v-for="(item, index) in eduInfoList">
-												<el-collapse-item>
+												<el-collapse-item :name="item.id">
 													<template #title="{ isActive }">
 														<div class="collapseTitle">
 															<span style="font-size: 16px;"> {{
@@ -1016,9 +1017,10 @@
 							<el-collapse-transition>
 								<el-row :gutter="26" v-if="changeFlag[1]">
 									<el-col :span="24">
-										<el-collapse v-if="workInfoList && workInfoList.length > 0">
+										<el-collapse v-model="activeNames[1]"
+											v-if="workInfoList && workInfoList.length > 0">
 											<div style="padding: 0 30px;" v-for="(item, index) in workInfoList">
-												<el-collapse-item>
+												<el-collapse-item :name="item.id">
 													<template #title="{ isActive }">
 														<div class="collapseTitle">
 															<span style="font-size: 16px;"> {{ item.companyName
@@ -1092,9 +1094,10 @@
 							<el-collapse-transition>
 								<el-row :gutter="26" v-if="changeFlag[2]">
 									<el-col :span="24">
-										<el-collapse v-if="trainingInfoList && trainingInfoList.length > 0">
+										<el-collapse v-model="activeNames[2]"
+											v-if="trainingInfoList && trainingInfoList.length > 0">
 											<div style="padding: 0 30px;" v-for="(item, index) in trainingInfoList">
-												<el-collapse-item>
+												<el-collapse-item :name="item.id">
 													<template #title="{ isActive }">
 														<div class="collapseTitle">
 															<span style="font-size: 16px;"> {{ item.name + ' - '
@@ -1154,9 +1157,10 @@
 							<el-collapse-transition>
 								<el-row :gutter="26" v-if="changeFlag[3]">
 									<el-col :span="24">
-										<el-collapse v-if="certificateInfoList && certificateInfoList.length > 0">
+										<el-collapse v-model="activeNames[3]"
+											v-if="certificateInfoList && certificateInfoList.length > 0">
 											<div style="padding: 0 30px;" v-for="(item, index) in certificateInfoList">
-												<el-collapse-item>
+												<el-collapse-item :name="item.id">
 													<template #title="{ isActive }">
 														<div class="collapseTitle">
 															<span style="font-size: 16px;"> {{
@@ -1235,9 +1239,10 @@
 							<el-collapse-transition>
 								<el-row :gutter="26" v-if="changeFlag[4]">
 									<el-col :span="24">
-										<el-collapse v-if="skillInfoList && skillInfoList.length > 0">
+										<el-collapse v-model="activeNames[4]"
+											v-if="skillInfoList && skillInfoList.length > 0">
 											<div style="padding: 0 30px;" v-for="(item, index) in skillInfoList">
-												<el-collapse-item>
+												<el-collapse-item :name="item.id">
 													<template #title="{ isActive }">
 														<div class="collapseTitle">
 															<span style="font-size: 16px;"> {{ item.name
@@ -1298,9 +1303,10 @@
 							<el-collapse-transition>
 								<el-row :gutter="26" v-if="changeFlag[5]">
 									<el-col :span="24">
-										<el-collapse v-if="languageInfoList && languageInfoList.length > 0">
+										<el-collapse v-model="activeNames[5]"
+											v-if="languageInfoList && languageInfoList.length > 0">
 											<div style="padding: 0 30px;" v-for="(item, index) in languageInfoList">
-												<el-collapse-item>
+												<el-collapse-item :name="item.id">
 													<template #title="{ isActive }">
 														<div class="collapseTitle">
 															<span style="font-size: 16px;"> {{ item.language
@@ -1368,9 +1374,10 @@
 							<el-collapse-transition>
 								<el-row :gutter="26" v-if="changeFlag[6]">
 									<el-col :span="24">
-										<el-collapse v-if="familyInfoList && familyInfoList.length > 0">
+										<el-collapse v-model="activeNames[6]"
+											v-if="familyInfoList && familyInfoList.length > 0">
 											<div style="padding: 0 30px;" v-for="(item, index) in familyInfoList">
-												<el-collapse-item>
+												<el-collapse-item :name="item.id">
 													<template #title="{ isActive }">
 														<div class="collapseTitle">
 															<span style="font-size: 16px;"> {{ item.relation +
@@ -1436,9 +1443,10 @@
 							<el-collapse-transition>
 								<el-row :gutter="26" v-if="changeFlag[7]">
 									<el-col :span="24">
-										<el-collapse v-if="rewardInfoList && rewardInfoList.length > 0">
+										<el-collapse v-model="activeNames[7]"
+											v-if="rewardInfoList && rewardInfoList.length > 0">
 											<div style="padding: 0 30px;" v-for="(item, index) in rewardInfoList">
-												<el-collapse-item>
+												<el-collapse-item :name="item.id">
 													<template #title="{ isActive }">
 														<div class="collapseTitle">
 															<span style="font-size: 16px;"> {{ item.name
@@ -1497,10 +1505,11 @@
 							<el-collapse-transition>
 								<el-row :gutter="26" v-if="changeFlag[8]">
 									<el-col :span="24">
-										<el-collapse v-if="laborContractInfoList && laborContractInfoList.length > 0">
+										<el-collapse v-model="activeNames[8]"
+											v-if="laborContractInfoList && laborContractInfoList.length > 0">
 											<div style="padding: 0 30px;"
 												v-for="(item, index) in laborContractInfoList">
-												<el-collapse-item>
+												<el-collapse-item :name="item.id">
 													<template #title="{ isActive }">
 														<div class="collapseTitle">
 															<span style="font-size: 16px;"> {{
@@ -1520,8 +1529,8 @@
 															$dictUtils.getDictLabel("labor_contract_type", item.type,
 																'-')
 														}}</el-descriptions-item>
-														<el-descriptions-item label="合同编号：">{{ item.code
-														}}</el-descriptions-item>
+														<!-- <el-descriptions-item label="合同编号：">{{ item.code
+														}}</el-descriptions-item> -->
 														<el-descriptions-item label="合同期限：">{{
 															$dictUtils.getDictLabel("labor_contract_term",
 																item.term,
@@ -1536,9 +1545,9 @@
 														<el-descriptions-item label="试用期结束日期：">{{
 															handleDateFormatter(item.trialEndDate)
 														}}</el-descriptions-item>
-														<el-descriptions-item label="办理日期：">{{
+														<!-- <el-descriptions-item label="办理日期：">{{
 															handleDateFormatter(item.processeDate)
-														}}</el-descriptions-item>
+														}}</el-descriptions-item> -->
 														<el-descriptions-item label="附件：">
 															<AttachmentView :fileList="item.files">
 															</AttachmentView>
@@ -2021,6 +2030,7 @@ export default {
 			changeFlag: [
 				true, true, true, true, true, true, true, true, true
 			],
+			activeNames: [],
 			//教育经历
 			eduInfoList: [
 
@@ -2202,6 +2212,16 @@ export default {
 				this.certificateInfoList.forEach(temp => {
 					this.changeType(temp.type, temp)
 				})
+				this.activeNames[0] = this.eduInfoList.map(item => item.id)
+				this.activeNames[1] = this.workInfoList.map(item => item.id)
+				this.activeNames[2] = this.trainingInfoList.map(item => item.id)
+				this.activeNames[3] = this.certificateInfoList.map(item => item.id)
+				this.activeNames[4] = this.skillInfoList.map(item => item.id)
+				this.activeNames[5] = this.languageInfoList.map(item => item.id)
+				this.activeNames[6] = this.familyInfoList.map(item => item.id)
+				this.activeNames[7] = this.rewardInfoList.map(item => item.id)
+				this.activeNames[8] = this.laborContractInfoList.map(item => item.id)
+
 				//后面的fileType是限制上传类型
 				this.$refs.idCardFront.newUpload('edit', this.generalForm.idCardFront, 'idCard', null, null, null, null, null, [...this.fileType])
 				this.$refs.idCardBack.newUpload('edit', this.generalForm.idCardBack, 'idCard', null, null, null, null, null, [...this.fileType])
@@ -2312,6 +2332,15 @@ export default {
 					this.laborContractInfoList = data.laborContractInfoList
 					this.workInfoList = data.workInfoList
 					this.concatForm.email = data.email
+					this.activeNames[0] = this.eduInfoList.map(item => item.id)
+					this.activeNames[1] = this.workInfoList.map(item => item.id)
+					this.activeNames[2] = this.trainingInfoList.map(item => item.id)
+					this.activeNames[3] = this.certificateInfoList.map(item => item.id)
+					this.activeNames[4] = this.skillInfoList.map(item => item.id)
+					this.activeNames[5] = this.languageInfoList.map(item => item.id)
+					this.activeNames[6] = this.familyInfoList.map(item => item.id)
+					this.activeNames[7] = this.rewardInfoList.map(item => item.id)
+					this.activeNames[8] = this.laborContractInfoList.map(item => item.id)
 					if (this.commonJS.isEmpty(this.generalForm.idCardFront)) {
 						this.generalForm.idCardFront = []
 					}
@@ -3074,7 +3103,6 @@ export default {
 				let obj = this.$dictUtils.getDictList('sys_cert_profession_cost').find(item => {
 					return item.value == row.profession
 				})
-				console.log(obj);
 				if (obj) {
 					row.profession = obj.label
 				}