用户信息调整

src/views/common/UpLoadComponentCardStyle.vue

@@ -14,7 +14,7 @@
       </template>
       <template #tip>
         <div class="el-upload__tip" style="color: red;">
-          只可上传1个文件
+          仅支持上传1个文件{{ tips }}
         </div>
       </template>
     </el-upload>
@@ -120,6 +120,7 @@ import moment from 'moment'
 export default {
   data() {
     return {
+      tips: "",
       uploadKey: '',
       progressFlag: false,
       loadProgress: 0,
@@ -246,6 +247,7 @@ export default {
       if (fileTypes !== undefined && fileTypes !== null && fileTypes.length > 0) {
 
         this.fileTypes = [...fileTypes]
+        this.tips = `，且文件格式限于：${this.fileTypes.map(type => type.toUpperCase()).join("，")}`
       } else {
         this.fileTypes = []
       }
@@ -343,7 +345,7 @@ export default {
 
           let uploadTypeFlag = this.isAllowedImageType(file.name);
           if (!uploadTypeFlag) {
-            this.$message.warning(`上传的文件类型不符合要求，请选择正确的文件类型`);
+            this.$message.warning(`上传失败，文件格式限于：${this.fileTypes.map(type => type.toUpperCase()).join("，")}`);
             return;
           }
         }

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

@@ -1002,11 +1002,11 @@
 						</el-row>
 					</el-collapse-transition>
 				</el-card>
-				<!-- 资质证书 -->
+				<!-- 执业资格证书 -->
 				<el-card style="width: 100%" shadow="hover" class="card-info">
 					<template #header>
 						<el-divider content-position="left"><i class="el-icon-document"></i> <span
-								style="font-weight: 900; font-size: 16px; color: #606266;">资质证书</span>
+								style="font-weight: 900; font-size: 16px; color: #606266;">执业资格证书</span>
 							<el-divider direction="vertical" />
 							<el-button type="primary" @click="addCertificate()">新增</el-button>
 							<el-divider direction="vertical" />
@@ -1072,16 +1072,16 @@
 									</div>
 								</el-collapse>
 								<el-empty image-size="80px" style="margin-top: 0 !important;padding: 0 !important;"
-									v-else description="暂无资质证书"></el-empty>
+									v-else description="暂无执业资格证书"></el-empty>
 							</el-col>
 						</el-row>
 					</el-collapse-transition>
 				</el-card>
-				<!-- 专业技能 -->
+				<!-- 职称证书 -->
 				<el-card style="width: 100%" shadow="hover" class="card-info">
 					<template #header>
 						<el-divider content-position="left"><i class="el-icon-document"></i> <span
-								style="font-weight: 900; font-size: 16px; color: #606266;">专业技能</span>
+								style="font-weight: 900; font-size: 16px; color: #606266;">职称证书</span>
 							<el-divider direction="vertical" />
 							<el-button type="primary" @click="addSkill()">新增</el-button>
 							<el-divider direction="vertical" />
@@ -1128,16 +1128,16 @@
 									</div>
 								</el-collapse>
 								<el-empty image-size="80px" style="margin-top: 0 !important;padding: 0 !important;"
-									v-else description="暂无专业技能"></el-empty>
+									v-else description="暂无职称证书"></el-empty>
 							</el-col>
 						</el-row>
 					</el-collapse-transition>
 				</el-card>
-				<!-- 语言能力 -->
+				<!-- 外语语种 -->
 				<el-card style="width: 100%" shadow="hover" class="card-info">
 					<template #header>
 						<el-divider content-position="left"><i class="el-icon-document"></i> <span
-								style="font-weight: 900; font-size: 16px; color: #606266;">语言能力</span>
+								style="font-weight: 900; font-size: 16px; color: #606266;">外语语种</span>
 							<el-divider direction="vertical" />
 							<el-button type="primary" @click="addLanguage()">新增</el-button>
 							<el-divider direction="vertical" />
@@ -1188,16 +1188,16 @@
 									</div>
 								</el-collapse>
 								<el-empty image-size="80px" style="margin-top: 0 !important;padding: 0 !important;"
-									v-else description="暂无语言能力信息"></el-empty>
+									v-else description="暂无外语语种信息"></el-empty>
 							</el-col>
 						</el-row>
 					</el-collapse-transition>
 				</el-card>
-				<!-- 家庭成员 -->
+				<!-- 家庭情况 -->
 				<el-card style="width: 100%" shadow="hover" class="card-info">
 					<template #header>
 						<el-divider content-position="left"><i class="el-icon-document"></i> <span
-								style="font-weight: 900; font-size: 16px; color: #606266;">家庭成员</span>
+								style="font-weight: 900; font-size: 16px; color: #606266;">家庭情况</span>
 							<el-divider direction="vertical" />
 							<el-button type="primary" @click="addFamily()">新增</el-button>
 							<el-divider direction="vertical" />
@@ -1247,7 +1247,7 @@
 									</div>
 								</el-collapse>
 								<el-empty image-size="80px" style="margin-top: 0 !important;padding: 0 !important;"
-									v-else description="暂无家庭成员信息"></el-empty>
+									v-else description="暂无家庭情况信息"></el-empty>
 							</el-col>
 						</el-row>
 					</el-collapse-transition>
@@ -1400,13 +1400,13 @@
 			<WorkInfo ref="WorkInfo" @addWorkInfo="handleAddWorkInfo"></WorkInfo>
 			<!-- 培训经历 -->
 			<TrainingInfo ref="TrainingInfo" @addTrainingInfo="handleAddTrainingInfo"></TrainingInfo>
-			<!-- 资质证书 -->
+			<!-- 执业资格证书 -->
 			<CertificateInfo ref="certificateInfo" @addCertificateInfo="handleAddCertificateInfo"></CertificateInfo>
-			<!-- 专业技能 -->
+			<!-- 职称证书 -->
 			<SkillInfo ref="skillInfo" @addSkillInfo="handleAddSkillInfo"></SkillInfo>
-			<!--语言能力 -->
+			<!--外语语种 -->
 			<LanguageInfo ref="languageInfo" @addLanguageInfo="handleAddLanguageInfo"></LanguageInfo>
-			<!-- 家庭成员 -->
+			<!-- 家庭情况 -->
 			<FamilyInfo ref="familyInfo" @addFamilyInfo="handleAddFamilyInfo"></FamilyInfo>
 			<!-- 表彰与奖励 -->
 			<RewardInfo ref="rewardInfo" @addRewardInfo="handleAddRewardInfo"></RewardInfo>
@@ -1586,11 +1586,11 @@ export default {
 						files: []
 					}
 				],
-				// 资质证书
+				// 执业资格证书
 				certificateInfoList: [
 
 				],
-				// 专业技能
+				// 职称证书
 				skillInfoList: [
 					{
 						enrollmentRegistrationId: '',
@@ -1872,15 +1872,15 @@ export default {
 					if (this.commonJS.isEmpty(this.inputForm.certificateInfoList)) {
 						this.inputForm.certificateInfoList = []
 					}
-					// 专业技能
+					// 职称证书
 					if (this.commonJS.isEmpty(this.inputForm.skillInfoList)) {
 						this.inputForm.skillInfoList = []
 					}
-					// 语言能力
+					// 外语语种
 					if (this.commonJS.isEmpty(this.inputForm.languageInfoList)) {
 						this.inputForm.languageInfoList = []
 					}
-					// 家庭成员
+					// 家庭情况
 					if (this.commonJS.isEmpty(this.inputForm.familyInfoList)) {
 						this.inputForm.familyInfoList = []
 					}
@@ -2504,7 +2504,7 @@ export default {
 				this.activeNames[2] = this.inputForm.trainingInfoList.map(item => item.id)
 			})
 		},
-		//资质证书处理
+		//执业资格证书处理
 		addCertificate() {
 			this.$refs.certificateInfo.init("add", null, this.inputForm.userId)
 		},
@@ -2512,7 +2512,7 @@ export default {
 			this.$refs.certificateInfo.init("edit", id, this.inputForm.userId)
 		},
 		delCertificate(id) {
-			this.$confirm('确定删除此条资质证书信息吗?', '提示', {
+			this.$confirm('确定删除此条执业资格证书信息吗?', '提示', {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',
 				type: 'warning'
@@ -2539,7 +2539,7 @@ export default {
 				this.activeNames[3] = this.inputForm.certificateInfoList.map(item => item.id)
 			})
 		},
-		//专业技能处理
+		//职称证书处理
 		addSkill() {
 			this.$refs.skillInfo.init("add", null, this.inputForm.userId)
 		},
@@ -2547,7 +2547,7 @@ export default {
 			this.$refs.skillInfo.init("edit", id, this.inputForm.userId)
 		},
 		delSkill(id) {
-			this.$confirm('确定删除此条专业技能信息吗?', '提示', {
+			this.$confirm('确定删除此条职称证书信息吗?', '提示', {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',
 				type: 'warning'
@@ -2574,7 +2574,7 @@ export default {
 				this.activeNames[4] = this.inputForm.skillInfoList.map(item => item.id)
 			})
 		},
-		//语言能力处理
+		//外语语种处理
 		addLanguage() {
 			this.$refs.languageInfo.init("add", null, this.inputForm.userId)
 		},
@@ -2582,7 +2582,7 @@ export default {
 			this.$refs.languageInfo.init("edit", id, this.inputForm.userId)
 		},
 		delLanguage(id) {
-			this.$confirm('确定删除此条语言能力信息吗?', '提示', {
+			this.$confirm('确定删除此条外语语种信息吗?', '提示', {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',
 				type: 'warning'
@@ -2609,7 +2609,7 @@ export default {
 				this.activeNames[5] = this.inputForm.languageInfoList.map(item => item.id)
 			})
 		},
-		//家庭成员处理
+		//家庭情况处理
 		addFamily() {
 			this.$refs.familyInfo.init("add", null, this.inputForm.userId)
 		},
@@ -2617,7 +2617,7 @@ export default {
 			this.$refs.familyInfo.init("edit", id, this.inputForm.userId)
 		},
 		delFamily(id) {
-			this.$confirm('确定删除此条家庭成员信息吗?', '提示', {
+			this.$confirm('确定删除此条家庭情况信息吗?', '提示', {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',
 				type: 'warning'

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

@@ -134,7 +134,9 @@ export default {
 					{ type: 'date', required: true, message: '请选择获得日期', trigger: 'change' }
 				],
 
-			}
+			},
+			fileType: ['jpg', 'jpeg', 'png', 'webp'],
+
 		}
 	},
 	created() {
@@ -197,11 +199,11 @@ export default {
 				certificateAttachment: []     // 证书附件
 			}
 			if (method === 'add') {
-				this.title = `新增资质证书`
+				this.title = `新增执业资格证书`
 			} else if (method === 'edit') {
-				this.title = '修改资质证书'
+				this.title = '修改执业资格证书'
 			} else if (method === 'view') {
-				this.title = '查看资质证书'
+				this.title = '查看执业资格证书'
 			}
 			this.inputForm.id = id
 			this.inputForm.userId = reId
@@ -218,12 +220,12 @@ export default {
 							this.inputForm.certificateAttachment = []
 						}
 						this.changeType(this.inputForm.type)
-						this.$refs.upLoadComponent.newUpload(method, this.inputForm.certificateAttachment, 'certificate')
+						this.$refs.upLoadComponent.newUpload(method, this.inputForm.certificateAttachment, 'certificate', null, null, null, null, null, [...this.fileType])
 						this.loading = false
 					})
 				} else {
 					this.inputForm.id = id
-					this.$refs.upLoadComponent.newUpload(method, this.inputForm.certificateAttachment, 'certificate')
+					this.$refs.upLoadComponent.newUpload(method, this.inputForm.certificateAttachment, 'certificate', null, null, null, null, null, [...this.fileType])
 					this.loading = false
 				}
 			})

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

@@ -244,7 +244,9 @@ export default {
 				// degreeFile: [
 				// 	{ required: true, message: '请上传学位附件', trigger: 'change' }
 				// ]
-			}
+			},
+			fileType: ['jpg', 'jpeg', 'png', 'webp'],
+
 		}
 	},
 	created() {
@@ -353,14 +355,14 @@ export default {
 						if (!this.inputForm.degreeFile) {
 							this.inputForm.degreeFile = []
 						}
-						this.$refs.educationUploadComponent.newUpload(method, this.inputForm.educationFile, 'education')
-						this.$refs.degreeUploadComponent.newUpload(method, this.inputForm.degreeFile, 'degree')
+						this.$refs.educationUploadComponent.newUpload(method, this.inputForm.educationFile, 'education', null, null, null, null, null, [...this.fileType])
+						this.$refs.degreeUploadComponent.newUpload(method, this.inputForm.degreeFile, 'degree', null, null, null, null, null, [...this.fileType])
 						this.loading = false
 					})
 				} else {
 					this.inputForm.id = id
-					this.$refs.educationUploadComponent.newUpload(method, this.inputForm.educationFile, 'education')
-					this.$refs.degreeUploadComponent.newUpload(method, this.inputForm.degreeFile, 'degree')
+					this.$refs.educationUploadComponent.newUpload(method, this.inputForm.educationFile, 'education', null, null, null, null, null, [...this.fileType])
+					this.$refs.degreeUploadComponent.newUpload(method, this.inputForm.degreeFile, 'degree', null, null, null, null, null, [...this.fileType])
 					this.loading = false
 				}
 			})

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

@@ -170,11 +170,11 @@ export default {
 				contactNumber: ''    // 联系电话
 			}
 			if (method === 'add') {
-				this.title = `新增家庭成员`
+				this.title = `新增家庭情况`
 			} else if (method === 'edit') {
-				this.title = '修改家庭成员'
+				this.title = '修改家庭情况'
 			} else if (method === 'view') {
-				this.title = '查看家庭成员'
+				this.title = '查看家庭情况'
 			}
 			this.inputForm.id = id
 			this.inputForm.userId = reId

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

@@ -103,7 +103,9 @@ export default {
 				language: [
 					{ required: true, message: '请输入语言', trigger: 'blur' }
 				],
-			}
+			},
+			fileType: ['jpg', 'jpeg', 'png', 'webp'],
+
 		}
 	},
 	created() {
@@ -162,11 +164,11 @@ export default {
 				files: []
 			}
 			if (method === 'add') {
-				this.title = `新增语言能力`
+				this.title = `新增外语语种`
 			} else if (method === 'edit') {
-				this.title = '修改语言能力'
+				this.title = '修改外语语种'
 			} else if (method === 'view') {
-				this.title = '查看语言能力'
+				this.title = '查看外语语种'
 			}
 			this.inputForm.id = id
 			this.inputForm.userId = reId
@@ -182,12 +184,12 @@ export default {
 						if (!this.inputForm.files) {
 							this.inputForm.files = []
 						}
-						this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'language')
+						this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'language', null, null, null, null, null, [...this.fileType])
 						this.loading = false
 					})
 				} else {
 					this.inputForm.id = id
-					this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'language')
+					this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'language', null, null, null, null, null, [...this.fileType])
 					this.loading = false
 				}
 			})

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

@@ -86,7 +86,9 @@ export default {
 				rewardDate: [
 					{ required: true, message: '请输入获奖日期', trigger: 'blur' }
 				],
-			}
+			},
+			fileType: ['jpg', 'jpeg', 'png', 'webp'],
+
 		}
 	},
 	created() {
@@ -163,12 +165,12 @@ export default {
 						if (!this.inputForm.files) {
 							this.inputForm.files = []
 						}
-						this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'reward')
+						this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'reward', null, null, null, null, null, [...this.fileType])
 						this.loading = false
 					})
 				} else {
 					this.inputForm.id = id
-					this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'reward')
+					this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'reward', null, null, null, null, null, [...this.fileType])
 					this.loading = false
 				}
 			})

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

@@ -85,7 +85,9 @@ export default {
 				name: [
 					{ required: true, message: '请输入名称', trigger: 'blur' }
 				],
-			}
+			},
+			fileType: ['jpg', 'jpeg', 'png', 'webp'],
+
 		}
 	},
 	created() {
@@ -142,11 +144,11 @@ export default {
 				files: []
 			}
 			if (method === 'add') {
-				this.title = `新增专业技能`
+				this.title = `新增职称证书`
 			} else if (method === 'edit') {
-				this.title = '修改专业技能'
+				this.title = '修改职称证书'
 			} else if (method === 'view') {
-				this.title = '查看专业技能'
+				this.title = '查看职称证书'
 			}
 			this.inputForm.id = id
 			this.inputForm.userId = reId
@@ -162,12 +164,12 @@ export default {
 						if (!this.inputForm.files) {
 							this.inputForm.files = []
 						}
-						this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'skill')
+						this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'skill', null, null, null, null, null, [...this.fileType])
 						this.loading = false
 					})
 				} else {
 					this.inputForm.id = id
-					this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'skill')
+					this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'skill', null, null, null, null, null, [...this.fileType])
 					this.loading = false
 				}
 			})

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

@@ -83,7 +83,9 @@ export default {
 				trainingInstitution: [
 					{ required: true, message: '请输入培训机构', trigger: 'blur' }
 				],
-			}
+			},
+			fileType: ['jpg', 'jpeg', 'png', 'webp'],
+
 		}
 	},
 	created() {
@@ -159,12 +161,12 @@ export default {
 						if (!this.inputForm.files) {
 							this.inputForm.files = []
 						}
-						this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'training')
+						this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'training', null, null, null, null, null, [...this.fileType])
 						this.loading = false
 					})
 				} else {
 					this.inputForm.id = id
-					this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'training')
+					this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'training', null, null, null, null, null, [...this.fileType])
 					this.loading = false
 				}
 			})

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

@@ -113,7 +113,7 @@ export default {
 				isCurrentCompanyExperience: [
 					{ required: true, message: '请选择是否本单位经历', trigger: 'change' },
 				]
-			}
+			},
 		}
 	},
 	created() {

src/views/sys/user/UserInfo.vue

@@ -1143,12 +1143,12 @@
 							</el-collapse-transition>
 						</el-card>
 					</el-tab-pane>
-					<el-tab-pane label="资质证书">
-						<!-- 资质证书 -->
+					<el-tab-pane label="执业资格证书">
+						<!-- 执业资格证书 -->
 						<el-card style="width: 100%" shadow="hover" class="card-info">
 							<template #header>
 								<el-divider content-position="left"><i class="el-icon-document"></i> <span
-										style="font-weight: 900; font-size: 16px; color: #606266;">资质证书</span>
+										style="font-weight: 900; font-size: 16px; color: #606266;">执业资格证书</span>
 									<el-divider direction="vertical" />
 									<el-button type="primary" @click="addCertificate()"
 										:disabled="auditStatus == 2">新增</el-button>
@@ -1219,18 +1219,18 @@
 										</el-collapse>
 										<el-empty image-size="80px"
 											style="margin-top: 0 !important;padding: 0 !important;" v-else
-											description="暂无资质证书"></el-empty>
+											description="暂无执业资格证书"></el-empty>
 									</el-col>
 								</el-row>
 							</el-collapse-transition>
 						</el-card>
 					</el-tab-pane>
-					<el-tab-pane label="专业技能">
+					<el-tab-pane label="职称证书">
 						<!-- 专业技能 -->
 						<el-card style="width: 100%" shadow="hover" class="card-info">
 							<template #header>
 								<el-divider content-position="left"><i class="el-icon-document"></i> <span
-										style="font-weight: 900; font-size: 16px; color: #606266;">专业技能</span>
+										style="font-weight: 900; font-size: 16px; color: #606266;">职称证书</span>
 									<el-divider direction="vertical" />
 									<el-button type="primary" @click="addSkill()"
 										:disabled="auditStatus == 2">新增</el-button>
@@ -1283,18 +1283,18 @@
 										</el-collapse>
 										<el-empty image-size="80px"
 											style="margin-top: 0 !important;padding: 0 !important;" v-else
-											description="暂无专业技能"></el-empty>
+											description="暂无职称证书"></el-empty>
 									</el-col>
 								</el-row>
 							</el-collapse-transition>
 						</el-card>
 					</el-tab-pane>
-					<el-tab-pane label="语言能力">
-						<!-- 语言能力 -->
+					<el-tab-pane label="外语语种">
+						<!-- 外语语种 -->
 						<el-card style="width: 100%" shadow="hover" class="card-info">
 							<template #header>
 								<el-divider content-position="left"><i class="el-icon-document"></i> <span
-										style="font-weight: 900; font-size: 16px; color: #606266;">语言能力</span>
+										style="font-weight: 900; font-size: 16px; color: #606266;">外语语种</span>
 									<el-divider direction="vertical" />
 									<el-button type="primary" @click="addLanguage()"
 										:disabled="auditStatus == 2">新增</el-button>
@@ -1354,18 +1354,18 @@
 										</el-collapse>
 										<el-empty image-size="80px"
 											style="margin-top: 0 !important;padding: 0 !important;" v-else
-											description="暂无语言能力信息"></el-empty>
+											description="暂无外语语种信息"></el-empty>
 									</el-col>
 								</el-row>
 							</el-collapse-transition>
 						</el-card>
 					</el-tab-pane>
-					<el-tab-pane label="家庭成员">
-						<!-- 家庭成员 -->
+					<el-tab-pane label="家庭情况">
+						<!-- 家庭情况 -->
 						<el-card style="width: 100%" shadow="hover" class="card-info">
 							<template #header>
 								<el-divider content-position="left"><i class="el-icon-document"></i> <span
-										style="font-weight: 900; font-size: 16px; color: #606266;">家庭成员</span>
+										style="font-weight: 900; font-size: 16px; color: #606266;">家庭情况</span>
 									<el-divider direction="vertical" />
 									<el-button type="primary" @click="addFamily()"
 										:disabled="auditStatus == 2">新增</el-button>
@@ -1424,7 +1424,7 @@
 										</el-collapse>
 										<el-empty image-size="80px"
 											style="margin-top: 0 !important;padding: 0 !important;" v-else
-											description="暂无家庭成员信息"></el-empty>
+											description="暂无家庭情况信息"></el-empty>
 									</el-col>
 								</el-row>
 							</el-collapse-transition>
@@ -1779,13 +1779,13 @@
 		<WorkInfo ref="WorkInfo" @addWorkInfo="handleAddWorkInfo"></WorkInfo>
 		<!-- 培训经历 -->
 		<TrainingInfo ref="TrainingInfo" @addTrainingInfo="handleAddTrainingInfo"></TrainingInfo>
-		<!-- 资质证书 -->
+		<!-- 执业资格证书 -->
 		<CertificateInfo ref="certificateInfo" @addCertificateInfo="handleAddCertificateInfo"></CertificateInfo>
-		<!-- 专业技能 -->
+		<!-- 职称证书 -->
 		<SkillInfo ref="skillInfo" @addSkillInfo="handleAddSkillInfo"></SkillInfo>
-		<!--语言能力 -->
+		<!--外语语种 -->
 		<LanguageInfo ref="languageInfo" @addLanguageInfo="handleAddLanguageInfo"></LanguageInfo>
-		<!-- 家庭成员 -->
+		<!-- 家庭情况 -->
 		<FamilyInfo ref="familyInfo" @addFamilyInfo="handleAddFamilyInfo"></FamilyInfo>
 		<!-- 表彰与奖励 -->
 		<RewardInfo ref="rewardInfo" @addRewardInfo="handleAddRewardInfo"></RewardInfo>
@@ -2191,11 +2191,11 @@ export default {
 				if (this.commonJS.isNotEmpty(data.skillInfoList)) {
 					this.skillInfoList = data.skillInfoList
 				}
-				// 语言能力
+				// 外语语种
 				if (this.commonJS.isNotEmpty(data.languageInfoList)) {
 					this.languageInfoList = data.languageInfoList
 				}
-				// 家庭成员
+				// 家庭情况
 				if (this.commonJS.isNotEmpty(data.familyInfoList)) {
 					this.familyInfoList = data.familyInfoList
 				}
@@ -2934,7 +2934,7 @@ export default {
 			this.$refs.certificateInfo.init("edit", row, this.userId)
 		},
 		delCertificate(id) {
-			this.$confirm('确定删除此条资质证书信息吗?', '提示', {
+			this.$confirm('确定删除此条执业资格证书信息吗?', '提示', {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',
 				type: 'warning'
@@ -2966,7 +2966,7 @@ export default {
 				this.certificateInfoList = res
 			})
 		},
-		//专业技能处理
+		//职称证书处理
 		addSkill() {
 			this.$refs.skillInfo.init("add", null, this.userId)
 		},
@@ -2974,7 +2974,7 @@ export default {
 			this.$refs.skillInfo.init("edit", row, this.userId)
 		},
 		delSkill(id) {
-			this.$confirm('确定删除此条专业技能信息吗?', '提示', {
+			this.$confirm('确定删除此条职称证书信息吗?', '提示', {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',
 				type: 'warning'
@@ -3006,7 +3006,7 @@ export default {
 				this.skillInfoList = res
 			})
 		},
-		//语言能力处理
+		//外语语种处理
 		addLanguage() {
 			this.$refs.languageInfo.init("add", null, this.userId)
 		},
@@ -3014,7 +3014,7 @@ export default {
 			this.$refs.languageInfo.init("edit", row, this.userId)
 		},
 		delLanguage(id) {
-			this.$confirm('确定删除此条语言能力信息吗?', '提示', {
+			this.$confirm('确定删除此条外语语种信息吗?', '提示', {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',
 				type: 'warning'
@@ -3046,7 +3046,7 @@ export default {
 				this.languageInfoList = res
 			})
 		},
-		//家庭成员处理
+		//家庭情况处理
 		addFamily() {
 			this.$refs.familyInfo.init("add", null, this.userId)
 		},
@@ -3054,7 +3054,7 @@ export default {
 			this.$refs.familyInfo.init("edit", row, this.userId)
 		},
 		delFamily(id) {
-			this.$confirm('确定删除此条家庭成员信息吗?', '提示', {
+			this.$confirm('确定删除此条家庭情况信息吗?', '提示', {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',
 				type: 'warning'

src/views/sys/user/components/CertificateInfo.vue

@@ -134,7 +134,8 @@ export default {
 					{ type: 'date', required: true, message: '请选择获得日期', trigger: 'change' }
 				],
 
-			}
+			},
+			fileType: ['jpg', 'jpeg', 'png', 'webp'],
 		}
 	},
 	created() {
@@ -208,11 +209,11 @@ export default {
 				certificateAttachment: []     // 证书附件
 			}
 			if (method === 'add') {
-				this.title = `新增资质证书`
+				this.title = `新增执业资格证书`
 			} else if (method === 'edit') {
-				this.title = '修改资质证书'
+				this.title = '修改执业资格证书'
 			} else if (method === 'view') {
-				this.title = '查看资质证书'
+				this.title = '查看执业资格证书'
 			}
 			this.inputForm.userId = reId
 			this.visible = true
@@ -225,11 +226,11 @@ export default {
 						this.inputForm.certificateAttachment = []
 					}
 					this.changeType(this.inputForm.type)
-					this.$refs.upLoadComponent.newUpload(method, this.inputForm.certificateAttachment, 'certificate')
+					this.$refs.upLoadComponent.newUpload(method, this.inputForm.certificateAttachment, 'certificate', null, null, null, null, null, [...this.fileType])
 					this.loading = false
 				} else {
 					this.inputForm.id = this.generateFallbackId()
-					this.$refs.upLoadComponent.newUpload(method, this.inputForm.certificateAttachment, 'certificate')
+					this.$refs.upLoadComponent.newUpload(method, this.inputForm.certificateAttachment, 'certificate', null, null, null, null, null, [...this.fileType])
 					this.loading = false
 				}
 			})

src/views/sys/user/components/EducationInfo.vue

@@ -245,7 +245,8 @@ export default {
 				// degreeFile: [
 				// 	{ required: true, message: '请上传学位附件', trigger: 'change' }
 				// ]
-			}
+			},
+			fileType: ['jpg', 'jpeg', 'png', 'webp'],
 		}
 	},
 	created() {
@@ -326,7 +327,6 @@ export default {
 			this.loading = true
 			this.$nextTick(() => {
 				if (row && row.id) {
-					console.log("修改");
 					console.log(this.recover(this.inputForm, row));
 					console.log(this.recover(this.inputForm, row));
 					console.log(this.recover(this.inputForm, row));
@@ -343,15 +343,14 @@ export default {
 					if (!this.inputForm.degreeFile) {
 						this.inputForm.degreeFile = []
 					}
-					this.$refs.educationUploadComponent.newUpload(method, this.inputForm.educationFile, 'education')
-					this.$refs.degreeUploadComponent.newUpload(method, this.inputForm.degreeFile, 'degree')
+					this.$refs.educationUploadComponent.newUpload(method, this.inputForm.educationFile, 'education', null, null, null, null, null, [...this.fileType])
+					this.$refs.degreeUploadComponent.newUpload(method, this.inputForm.degreeFile, 'degree', null, null, null, null, null, [...this.fileType])
 					this.loading = false
 					// })
 				} else {
-					console.log("新增");
 					this.inputForm.id = this.generateFallbackId()
-					this.$refs.educationUploadComponent.newUpload(method, this.inputForm.educationFile, 'education')
-					this.$refs.degreeUploadComponent.newUpload(method, this.inputForm.degreeFile, 'degree')
+					this.$refs.educationUploadComponent.newUpload(method, this.inputForm.educationFile, 'education', null, null, null, null, null, [...this.fileType])
+					this.$refs.degreeUploadComponent.newUpload(method, this.inputForm.degreeFile, 'degree', null, null, null, null, null, [...this.fileType])
 					this.loading = false
 					console.log(this.inputForm.id);
 					console.log(this.inputForm.id);

src/views/sys/user/components/FamilyInfo.vue

@@ -113,7 +113,7 @@ export default {
 				contactNumber: [
 					{ required: true, message: '请输入联系电话', trigger: 'blur' },
 				]
-			}
+			},
 		}
 	},
 	created() {
@@ -172,11 +172,11 @@ export default {
 				contactNumber: ''    // 联系电话
 			}
 			if (method === 'add') {
-				this.title = `新增家庭成员`
+				this.title = `新增家庭情况`
 			} else if (method === 'edit') {
-				this.title = '修改家庭成员'
+				this.title = '修改家庭情况'
 			} else if (method === 'view') {
-				this.title = '查看家庭成员'
+				this.title = '查看家庭情况'
 			}
 			this.inputForm.userId = reId
 			this.visible = true

src/views/sys/user/components/LanguageInfo.vue

@@ -104,7 +104,8 @@ export default {
 				language: [
 					{ required: true, message: '请输入语言', trigger: 'blur' }
 				],
-			}
+			},
+			fileType: ['jpg', 'jpeg', 'png', 'webp'],
 		}
 	},
 	created() {
@@ -164,11 +165,11 @@ export default {
 				files: []
 			}
 			if (method === 'add') {
-				this.title = `新增语言能力`
+				this.title = `新增外语语种`
 			} else if (method === 'edit') {
-				this.title = '修改语言能力'
+				this.title = '修改外语语种'
 			} else if (method === 'view') {
-				this.title = '查看语言能力'
+				this.title = '查看外语语种'
 			}
 			this.inputForm.userId = reId
 			this.visible = true
@@ -181,11 +182,11 @@ export default {
 					if (!this.inputForm.files) {
 						this.inputForm.files = []
 					}
-					this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'language')
+					this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'language', null, null, null, null, null, [...this.fileType])
 					this.loading = false
 				} else {
 					this.inputForm.id = this.generateFallbackId()
-					this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'language')
+					this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'language', null, null, null, null, null, [...this.fileType])
 					this.loading = false
 				}
 			})

src/views/sys/user/components/RewardInfo.vue

@@ -87,7 +87,9 @@ export default {
 				rewardDate: [
 					{ required: true, message: '请输入获奖日期', trigger: 'blur' }
 				],
-			}
+			},
+			fileType: ['jpg', 'jpeg', 'png', 'webp'],
+
 		}
 	},
 	created() {
@@ -162,11 +164,11 @@ export default {
 					if (!this.inputForm.files) {
 						this.inputForm.files = []
 					}
-					this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'reward')
+					this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'reward', null, null, null, null, null, [...this.fileType])
 					this.loading = false
 				} else {
 					this.inputForm.id = this.generateFallbackId()
-					this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'reward')
+					this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'reward', null, null, null, null, null, [...this.fileType])
 					this.loading = false
 				}
 			})

src/views/sys/user/components/SkillInfo.vue

@@ -86,7 +86,9 @@ export default {
 				name: [
 					{ required: true, message: '请输入名称', trigger: 'blur' }
 				],
-			}
+			},
+			fileType: ['jpg', 'jpeg', 'png', 'webp'],
+
 		}
 	},
 	created() {
@@ -144,11 +146,11 @@ export default {
 				files: []
 			}
 			if (method === 'add') {
-				this.title = `新增专业技能`
+				this.title = `新增职称证书`
 			} else if (method === 'edit') {
-				this.title = '修改专业技能'
+				this.title = '修改职称证书'
 			} else if (method === 'view') {
-				this.title = '查看专业技能'
+				this.title = '查看职称证书'
 			}
 			this.inputForm.userId = reId
 			this.visible = true
@@ -160,11 +162,11 @@ export default {
 					if (!this.inputForm.files) {
 						this.inputForm.files = []
 					}
-					this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'skill')
+					this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'skill', null, null, null, null, null, [...this.fileType])
 					this.loading = false
 				} else {
 					this.inputForm.id = this.generateFallbackId()
-					this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'skill')
+					this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'skill', null, null, null, null, null, [...this.fileType])
 					this.loading = false
 				}
 			})

src/views/sys/user/components/TrainingInfo.vue

@@ -85,7 +85,9 @@ export default {
 					{ required: true, message: '请输入培训机构', trigger: 'blur' }
 				],
 
-			}
+			},
+			fileType: ['jpg', 'jpeg', 'png', 'webp'],
+
 		}
 	},
 	created() {
@@ -158,11 +160,11 @@ export default {
 					if (!this.inputForm.files) {
 						this.inputForm.files = []
 					}
-					this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'training')
+					this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'training', null, null, null, null, null, [...this.fileType])
 					this.loading = false
 				} else {
 					this.inputForm.id = this.generateFallbackId()
-					this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'training')
+					this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'training', null, null, null, null, null, [...this.fileType])
 					this.loading = false
 				}
 			})

src/views/sys/user/components/WorkInfo.vue

@@ -112,7 +112,7 @@ export default {
 				isCurrentCompanyExperience: [
 					{ required: true, message: '请选择是否本单位经历', trigger: 'change' },
 				]
-			}
+			},
 		}
 	},
 	created() {