用户信息功能调整

src/views/common/UpLoadComponentCardStyle.vue

@@ -339,8 +339,6 @@ export default {
           return
         }
 
-        console.log();
-
         if (this.fileTypes && this.fileTypes.length > 0) {
 
           let uploadTypeFlag = this.isAllowedImageType(file.name);

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

@@ -1111,13 +1111,17 @@
 												</div>
 											</template>
 											<el-descriptions title="" border>
-												<el-descriptions-item label="名称：">{{ item.name
+												<el-descriptions-item label="职称名称：">{{
+													$dictUtils.getDictLabel('professional_certificate', item.name, '-')
+													}}</el-descriptions-item>
+												<el-descriptions-item label="职称等级：">{{ item.proficiency
 												}}</el-descriptions-item>
-												<el-descriptions-item label="掌握程度：">{{ item.proficiency
+												<el-descriptions-item label="取得日期：">{{
+													handleDateFormatter(item.obtainDate)
 												}}</el-descriptions-item>
-												<el-descriptions-item label="种类：">{{ item.category
+												<el-descriptions-item label="取得途径：">{{ item.category
 												}}</el-descriptions-item>
-												<el-descriptions-item label="使用时间（月）：">{{ item.usageTime
+												<el-descriptions-item label="审批单位：">{{ item.usageTime
 												}}</el-descriptions-item>
 												<el-descriptions-item label="附件：">
 													<AttachmentView :fileList="item.files">
@@ -1238,10 +1242,10 @@
 												}}</el-descriptions-item>
 												<el-descriptions-item label="手机号码：">{{ item.mobile
 												}}</el-descriptions-item>
-												<el-descriptions-item label="工作单位：">{{ item.workUnit
+												<!-- <el-descriptions-item label="工作单位：">{{ item.workUnit
 												}}</el-descriptions-item>
 												<el-descriptions-item label="联系电话：">{{ item.contactNumber
-												}}</el-descriptions-item>
+												}}</el-descriptions-item> -->
 											</el-descriptions>
 										</el-collapse-item>
 									</div>

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

@@ -164,12 +164,12 @@
 
 			<el-row :gutter="26">
 				<el-col :span="12">
-					<el-form-item label="身份证正面" prop="idCardFront" :rules="[]">
+					<el-form-item label="身份证人像面" prop="idCardFront" :rules="[]">
 						<UpLoadComponent ref="idCardFront"></UpLoadComponent>
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
-					<el-form-item label="身份证反面" prop="idCardBack" :rules="[]">
+					<el-form-item label="身份证国徽面" prop="idCardBack" :rules="[]">
 						<UpLoadComponent ref="idCardBack"></UpLoadComponent>
 					</el-form-item>
 				</el-col>
@@ -395,7 +395,7 @@
 			<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" />
@@ -460,7 +460,7 @@
 								</div>
 							</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>
@@ -469,7 +469,7 @@
 			<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" />
@@ -499,13 +499,17 @@
 											</div>
 										</template>
 										<el-descriptions title="" border>
-											<el-descriptions-item label="名称：">{{ item.name
+											<el-descriptions-item label="职称名称：">{{
+												$dictUtils.getDictLabel('professional_certificate', item.name, '-')
+												}}</el-descriptions-item>
+
+											<el-descriptions-item label="职称等级：">{{ item.proficiency
 											}}</el-descriptions-item>
-											<el-descriptions-item label="掌握程度：">{{ item.proficiency
+											<el-descriptions-item label="取得日期：">{{ handleDateFormatter(item.obtainDate)
 											}}</el-descriptions-item>
-											<el-descriptions-item label="种类：">{{ item.category
+											<el-descriptions-item label="取得途径：">{{ item.category
 											}}</el-descriptions-item>
-											<el-descriptions-item label="使用时间（月）：">{{ item.usageTime
+											<el-descriptions-item label="审批单位：">{{ item.usageTime
 											}}</el-descriptions-item>
 											<el-descriptions-item label="附件：">
 												<AttachmentView :fileList="item.files">
@@ -626,10 +630,10 @@
 											}}</el-descriptions-item>
 											<el-descriptions-item label="手机号码：">{{ item.mobile
 											}}</el-descriptions-item>
-											<el-descriptions-item label="工作单位：">{{ item.workUnit
+											<!-- <el-descriptions-item label="工作单位：">{{ item.workUnit
 											}}</el-descriptions-item>
 											<el-descriptions-item label="联系电话：">{{ item.contactNumber
-											}}</el-descriptions-item>
+											}}</el-descriptions-item> -->
 										</el-descriptions>
 									</el-collapse-item>
 								</div>

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

@@ -220,12 +220,12 @@ export default {
 							this.inputForm.certificateAttachment = []
 						}
 						this.changeType(this.inputForm.type)
-						this.$refs.upLoadComponent.newUpload(method, this.inputForm.certificateAttachment, 'certificate', null, null, null, null, null, [...this.fileType])
+						this.$refs.upLoadComponent.newUpload(method, this.inputForm.certificateAttachment, 'certificate', 50, null, null, null, null)
 						this.loading = false
 					})
 				} else {
 					this.inputForm.id = id
-					this.$refs.upLoadComponent.newUpload(method, this.inputForm.certificateAttachment, 'certificate', null, null, null, null, null, [...this.fileType])
+					this.$refs.upLoadComponent.newUpload(method, this.inputForm.certificateAttachment, 'certificate', 50, null, null, null, null)
 					this.loading = false
 				}
 			})

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

@@ -355,14 +355,14 @@ export default {
 						if (!this.inputForm.degreeFile) {
 							this.inputForm.degreeFile = []
 						}
-						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.$refs.educationUploadComponent.newUpload(method, this.inputForm.educationFile, 'education', 50, null, null, null, null, [...this.fileType])
+						this.$refs.degreeUploadComponent.newUpload(method, this.inputForm.degreeFile, 'degree', 50, null, null, null, null, [...this.fileType])
 						this.loading = false
 					})
 				} else {
 					this.inputForm.id = id
-					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.$refs.educationUploadComponent.newUpload(method, this.inputForm.educationFile, 'education', 50, null, null, null, null, [...this.fileType])
+					this.$refs.degreeUploadComponent.newUpload(method, this.inputForm.degreeFile, 'degree', 50, null, null, null, null, [...this.fileType])
 					this.loading = false
 				}
 			})

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

@@ -41,7 +41,7 @@
 						</el-form-item>
 					</el-col>
 
-					<el-col :span="12">
+					<!-- <el-col :span="12">
 						<el-form-item label="工作单位" prop="workUnit">
 							<el-input v-model="inputForm.workUnit" placeholder="请输入工作单位"></el-input>
 						</el-form-item>
@@ -51,7 +51,7 @@
 						<el-form-item label="联系电话" prop="contactNumber">
 							<el-input v-model="inputForm.contactNumber" placeholder="请输入联系电话"></el-input>
 						</el-form-item>
-					</el-col>
+					</el-col> -->
 
 
 				</el-row>
@@ -109,9 +109,9 @@ export default {
 				relation: [
 					{ required: true, message: '请输入与本人关系', trigger: 'blur' },
 				],
-				contactNumber: [
-					{ required: true, message: '请输入联系电话', trigger: 'blur' },
-				]
+				// contactNumber: [
+				// 	{ required: true, message: '请输入联系电话', trigger: 'blur' },
+				// ]
 			}
 		}
 	},

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

@@ -209,12 +209,12 @@ export default {
 					}).then(res => {
 						this.inputForm = this.recover(this.inputForm, res)
 						this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
-						this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'laborContract')
+						this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'laborContract', 50)
 						this.loading = false
 					})
 				} else {
 					this.inputForm.id = id
-					this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'laborContract')
+					this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'laborContract', 50)
 					this.loading = false
 				}
 			})

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

@@ -184,12 +184,12 @@ export default {
 						if (!this.inputForm.files) {
 							this.inputForm.files = []
 						}
-						this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'language', null, null, null, null, null, [...this.fileType])
+						this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'language', 50, null, null, null, null, [...this.fileType])
 						this.loading = false
 					})
 				} else {
 					this.inputForm.id = id
-					this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'language', null, null, null, null, null, [...this.fileType])
+					this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'language', 50, null, null, null, null, [...this.fileType])
 					this.loading = false
 				}
 			})

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

@@ -165,12 +165,12 @@ export default {
 						if (!this.inputForm.files) {
 							this.inputForm.files = []
 						}
-						this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'reward', null, null, null, null, null, [...this.fileType])
+						this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'reward', 50, null, null, null, null, [...this.fileType])
 						this.loading = false
 					})
 				} else {
 					this.inputForm.id = id
-					this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'reward', null, null, null, null, null, [...this.fileType])
+					this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'reward', 50, null, null, null, null, [...this.fileType])
 					this.loading = false
 				}
 			})

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

@@ -8,26 +8,39 @@
 				@submit.native.prevent>
 				<el-row :gutter="26">
 					<el-col :span="12">
-						<el-form-item label="名称" prop="name">
-							<el-input v-model="inputForm.name" placeholder="请输入名称"></el-input>
+						<el-form-item label="职称名称" prop="name">
+							<el-select size="default" v-model="inputForm.name" placeholder="请选择职称名称"
+								style="width: 100%;">
+								<el-option v-for="item in $dictUtils.getDictList('professional_certificate')"
+									: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="proficiency">
-							<el-input v-model="inputForm.proficiency" placeholder="请输入掌握程度"></el-input>
+						<el-form-item label="职称等级" prop="proficiency">
+							<el-input v-model="inputForm.proficiency" placeholder="请输入职称等级"></el-input>
 						</el-form-item>
 					</el-col>
 
 					<el-col :span="12">
-						<el-form-item label="种类" prop="category">
-							<el-input v-model="inputForm.category" placeholder="请输入种类"></el-input>
+						<el-form-item label="取得日期" prop="obtainDate">
+							<el-date-picker v-model="inputForm.obtainDate" type="date" placeholder="请选择取得日期"
+								style="width: 100%;">
+							</el-date-picker>
 						</el-form-item>
 					</el-col>
 
 					<el-col :span="12">
-						<el-form-item label="使用时间（月）" prop="usageTime">
-							<el-input v-model="inputForm.usageTime" placeholder="请输入使用时间（月）"></el-input>
+						<el-form-item label="取得途径" prop="category">
+							<el-input v-model="inputForm.category" placeholder="请输入取得途径"></el-input>
+						</el-form-item>
+					</el-col>
+
+					<el-col :span="12">
+						<el-form-item label="审批单位" prop="usageTime">
+							<el-input v-model="inputForm.usageTime" placeholder="请输入审批单位"></el-input>
 						</el-form-item>
 					</el-col>
 					<el-col :span="24">
@@ -74,16 +87,29 @@ export default {
 			visible: false,
 			loading: false,
 			inputForm: {
-				name: '',              // 名称
-				proficiency: '',       // 掌握程度
-				category: '',          // 种类
-				usageTime: '',          // 使用时间
+				name: '',
+				proficiency: '',
+				category: '',
+				obtainDate: "",
+				usageTime: '',
 				files: []
 			},
 			keyWatch: '',
 			rules: {
 				name: [
-					{ required: true, message: '请输入名称', trigger: 'blur' }
+					{ required: true, message: '请输入职称名称', trigger: 'blur' }
+				],
+				proficiency: [
+					{ required: true, message: '请输入职称等级', trigger: 'blur' }
+				],
+				category: [
+					{ required: true, message: '请输入取得途径', trigger: 'blur' }
+				],
+				obtainDate: [
+					{ required: true, message: '请输入取得日期', trigger: 'blur' }
+				],
+				usageTime: [
+					{ required: true, message: '请输入审批单位', trigger: 'blur' }
 				],
 			},
 			fileType: ['jpg', 'jpeg', 'png', 'webp'],
@@ -137,10 +163,11 @@ export default {
 		init(method, id, reId) {
 			this.method = method
 			this.inputForm = {
-				name: '',              // 名称
-				proficiency: '',       // 掌握程度
-				category: '',          // 种类
-				usageTime: '',          // 使用时间
+				name: '',
+				proficiency: '',
+				category: '',
+				obtainDate: "",
+				usageTime: '',
 				files: []
 			}
 			if (method === 'add') {
@@ -164,12 +191,12 @@ export default {
 						if (!this.inputForm.files) {
 							this.inputForm.files = []
 						}
-						this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'skill', null, null, null, null, null, [...this.fileType])
+						this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'skill', 50, null, null, null, null, [...this.fileType])
 						this.loading = false
 					})
 				} else {
 					this.inputForm.id = id
-					this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'skill', null, null, null, null, null, [...this.fileType])
+					this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'skill', 50, null, null, null, null, [...this.fileType])
 					this.loading = false
 				}
 			})
@@ -181,6 +208,7 @@ export default {
 			}
 			this.$refs['inputForm'].validate((valid) => {
 				if (valid) {
+					this.inputForm.obtainDate = new Date(this.inputForm.obtainDate).getTime(); // 转为时间戳
 					this.inputForm.files = this.$refs.upLoadComponent.getDataList()
 					this.inputForm.status = "5"
 					enrollmentRegistrationService.saveSkillInfo(this.inputForm).then(res => {

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

@@ -161,12 +161,12 @@ export default {
 						if (!this.inputForm.files) {
 							this.inputForm.files = []
 						}
-						this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'training', null, null, null, null, null, [...this.fileType])
+						this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'training', 50, null, null, null, null, [...this.fileType])
 						this.loading = false
 					})
 				} else {
 					this.inputForm.id = id
-					this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'training', null, null, null, null, null, [...this.fileType])
+					this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'training', 50, null, null, null, null, [...this.fileType])
 					this.loading = false
 				}
 			})

src/views/sys/user/UserInfo.vue

@@ -314,12 +314,12 @@
 
 							<el-row :gutter="26">
 								<el-col :span="12">
-									<el-form-item label="身份证正面" prop="idCardFront" :rules="[]">
+									<el-form-item label="身份证人像面" prop="idCardFront" :rules="[]">
 										<UpLoadComponent ref="idCardFront"></UpLoadComponent>
 									</el-form-item>
 								</el-col>
 								<el-col :span="12">
-									<el-form-item label="身份证反面" prop="idCardBack" :rules="[]">
+									<el-form-item label="身份证国徽面" prop="idCardBack" :rules="[]">
 										<UpLoadComponent ref="idCardBack"></UpLoadComponent>
 									</el-form-item>
 								</el-col>
@@ -1265,16 +1265,21 @@
 														</div>
 													</template>
 													<el-descriptions title="" border>
-														<el-descriptions-item label="名称：">{{ item.name
+														<el-descriptions-item label="职称名称：">{{
+															$dictUtils.getDictLabel('professional_certificate',
+																item.name, '-')
+															}}</el-descriptions-item>
+														<el-descriptions-item label="职称等级：">{{ item.proficiency
 														}}</el-descriptions-item>
-														<el-descriptions-item label="掌握程度：">{{ item.proficiency
+														<el-descriptions-item label="取得日期：">{{
+															handleDateFormatter(item.obtainDate)
 														}}</el-descriptions-item>
-														<el-descriptions-item label="种类：">{{ item.category
+														<el-descriptions-item label="取得途径：">{{ item.category
 														}}</el-descriptions-item>
-														<el-descriptions-item label="使用时间（月）：">{{ item.usageTime
+														<el-descriptions-item label="审批单位：">{{ item.usageTime
 														}}</el-descriptions-item>
 														<el-descriptions-item label="附件：">
-															<AttachmentView :key="uploadKey" :fileList="item.files">
+															<AttachmentView :fileList="item.files">
 															</AttachmentView>
 														</el-descriptions-item>
 													</el-descriptions>
@@ -1413,11 +1418,11 @@
 														}}</el-descriptions-item>
 														<el-descriptions-item label="手机号码：">{{ item.mobile
 														}}</el-descriptions-item>
-														<el-descriptions-item label="工作单位：">{{ item.workUnit
+														<!-- <el-descriptions-item label="工作单位：">{{ item.workUnit
 														}}</el-descriptions-item>
 														<el-descriptions-item label="联系电话：">{{
 															item.contactNumber
-														}}</el-descriptions-item>
+														}}</el-descriptions-item> -->
 													</el-descriptions>
 												</el-collapse-item>
 											</div>

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

@@ -226,11 +226,11 @@ export default {
 						this.inputForm.certificateAttachment = []
 					}
 					this.changeType(this.inputForm.type)
-					this.$refs.upLoadComponent.newUpload(method, this.inputForm.certificateAttachment, 'certificate', null, null, null, null, null, [...this.fileType])
+					this.$refs.upLoadComponent.newUpload(method, this.inputForm.certificateAttachment, 'certificate', 50, null, null, null, null)
 					this.loading = false
 				} else {
 					this.inputForm.id = this.generateFallbackId()
-					this.$refs.upLoadComponent.newUpload(method, this.inputForm.certificateAttachment, 'certificate', null, null, null, null, null, [...this.fileType])
+					this.$refs.upLoadComponent.newUpload(method, this.inputForm.certificateAttachment, 'certificate', 50, null, null, null, null)
 					this.loading = false
 				}
 			})

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

@@ -343,14 +343,14 @@ export default {
 					if (!this.inputForm.degreeFile) {
 						this.inputForm.degreeFile = []
 					}
-					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.$refs.educationUploadComponent.newUpload(method, this.inputForm.educationFile, 'education', 50, null, null, null, null, [...this.fileType])
+					this.$refs.degreeUploadComponent.newUpload(method, this.inputForm.degreeFile, 'degree', 50, null, null, null, null, [...this.fileType])
 					this.loading = false
 					// })
 				} else {
 					this.inputForm.id = this.generateFallbackId()
-					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.$refs.educationUploadComponent.newUpload(method, this.inputForm.educationFile, 'education', 50, null, null, null, null, [...this.fileType])
+					this.$refs.degreeUploadComponent.newUpload(method, this.inputForm.degreeFile, 'degree', 50, 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

@@ -40,7 +40,7 @@
 							<el-input v-model="inputForm.mobile" placeholder="请输入手机号码"></el-input>
 						</el-form-item>
 					</el-col>
-
+					<!-- 
 					<el-col :span="12">
 						<el-form-item label="工作单位" prop="workUnit">
 							<el-input v-model="inputForm.workUnit" placeholder="请输入工作单位"></el-input>
@@ -51,7 +51,7 @@
 						<el-form-item label="联系电话" prop="contactNumber">
 							<el-input v-model="inputForm.contactNumber" placeholder="请输入联系电话"></el-input>
 						</el-form-item>
-					</el-col>
+					</el-col> -->
 
 
 				</el-row>
@@ -110,9 +110,9 @@ export default {
 				relation: [
 					{ required: true, message: '请输入与本人关系', trigger: 'blur' },
 				],
-				contactNumber: [
-					{ required: true, message: '请输入联系电话', trigger: 'blur' },
-				]
+				// contactNumber: [
+				// 	{ required: true, message: '请输入联系电话', trigger: 'blur' },
+				// ]
 			},
 		}
 	},

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

@@ -182,11 +182,11 @@ export default {
 					if (!this.inputForm.files) {
 						this.inputForm.files = []
 					}
-					this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'language', null, null, null, null, null, [...this.fileType])
+					this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'language', 50, null, null, null, null, [...this.fileType])
 					this.loading = false
 				} else {
 					this.inputForm.id = this.generateFallbackId()
-					this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'language', null, null, null, null, null, [...this.fileType])
+					this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'language', 50, null, null, null, null, [...this.fileType])
 					this.loading = false
 				}
 			})

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

@@ -164,11 +164,11 @@ export default {
 					if (!this.inputForm.files) {
 						this.inputForm.files = []
 					}
-					this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'reward', null, null, null, null, null, [...this.fileType])
+					this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'reward', 50, null, null, null, null, [...this.fileType])
 					this.loading = false
 				} else {
 					this.inputForm.id = this.generateFallbackId()
-					this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'reward', null, null, null, null, null, [...this.fileType])
+					this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'reward', 50, null, null, null, null, [...this.fileType])
 					this.loading = false
 				}
 			})

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

@@ -8,26 +8,39 @@
 				@submit.native.prevent>
 				<el-row :gutter="26">
 					<el-col :span="12">
-						<el-form-item label="名称" prop="name">
-							<el-input v-model="inputForm.name" placeholder="请输入名称"></el-input>
+						<el-form-item label="职称名称" prop="name">
+							<el-select size="default" v-model="inputForm.name" placeholder="请选择职称名称"
+								style="width: 100%;">
+								<el-option v-for="item in $dictUtils.getDictList('professional_certificate')"
+									: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="proficiency">
-							<el-input v-model="inputForm.proficiency" placeholder="请输入掌握程度"></el-input>
+						<el-form-item label="职称等级" prop="proficiency">
+							<el-input v-model="inputForm.proficiency" placeholder="请输入职称等级"></el-input>
 						</el-form-item>
 					</el-col>
 
 					<el-col :span="12">
-						<el-form-item label="种类" prop="category">
-							<el-input v-model="inputForm.category" placeholder="请输入种类"></el-input>
+						<el-form-item label="取得日期" prop="obtainDate">
+							<el-date-picker v-model="inputForm.obtainDate" type="date" placeholder="请选择取得日期"
+								style="width: 100%;">
+							</el-date-picker>
 						</el-form-item>
 					</el-col>
 
 					<el-col :span="12">
-						<el-form-item label="使用时间（月）" prop="usageTime">
-							<el-input v-model="inputForm.usageTime" placeholder="请输入使用时间（月）"></el-input>
+						<el-form-item label="取得途径" prop="category">
+							<el-input v-model="inputForm.category" placeholder="请输入取得途径"></el-input>
+						</el-form-item>
+					</el-col>
+
+					<el-col :span="12">
+						<el-form-item label="审批单位" prop="usageTime">
+							<el-input v-model="inputForm.usageTime" placeholder="请输入审批单位"></el-input>
 						</el-form-item>
 					</el-col>
 					<el-col :span="24">
@@ -75,16 +88,29 @@ export default {
 			loading: false,
 			inputForm: {
 				id: "",
-				name: '',              // 名称
-				proficiency: '',       // 掌握程度
-				category: '',          // 种类
-				usageTime: '',          // 使用时间
+				name: '',
+				proficiency: '',
+				category: '',
+				obtainDate: "",
+				usageTime: '',
 				files: []
 			},
 			keyWatch: '',
 			rules: {
 				name: [
-					{ required: true, message: '请输入名称', trigger: 'blur' }
+					{ required: true, message: '请输入职称名称', trigger: 'blur' }
+				],
+				proficiency: [
+					{ required: true, message: '请输入职称等级', trigger: 'blur' }
+				],
+				category: [
+					{ required: true, message: '请输入取得途径', trigger: 'blur' }
+				],
+				obtainDate: [
+					{ required: true, message: '请输入取得日期', trigger: 'blur' }
+				],
+				usageTime: [
+					{ required: true, message: '请输入审批单位', trigger: 'blur' }
 				],
 			},
 			fileType: ['jpg', 'jpeg', 'png', 'webp'],
@@ -139,10 +165,11 @@ export default {
 			this.method = method
 			this.inputForm = {
 				id: "",
-				name: '',              // 名称
-				proficiency: '',       // 掌握程度
-				category: '',          // 种类
-				usageTime: '',          // 使用时间
+				name: '',
+				proficiency: '',
+				category: '',
+				obtainDate: "",
+				usageTime: '',
 				files: []
 			}
 			if (method === 'add') {
@@ -162,11 +189,11 @@ export default {
 					if (!this.inputForm.files) {
 						this.inputForm.files = []
 					}
-					this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'skill', null, null, null, null, null, [...this.fileType])
+					this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'skill', 50, null, null, null, null, [...this.fileType])
 					this.loading = false
 				} else {
 					this.inputForm.id = this.generateFallbackId()
-					this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'skill', null, null, null, null, null, [...this.fileType])
+					this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'skill', 50, null, null, null, null, [...this.fileType])
 					this.loading = false
 				}
 			})
@@ -178,6 +205,7 @@ export default {
 			}
 			this.$refs['inputForm'].validate((valid) => {
 				if (valid) {
+					this.inputForm.obtainDate = new Date(this.inputForm.obtainDate).getTime(); // 转为时间戳
 					this.inputForm.files = this.$refs.upLoadComponent.getDataList()
 					this.$emit("addSkillInfo", JSON.parse(JSON.stringify(this.inputForm)))
 					this.close()

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

@@ -160,11 +160,11 @@ export default {
 					if (!this.inputForm.files) {
 						this.inputForm.files = []
 					}
-					this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'training', null, null, null, null, null, [...this.fileType])
+					this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'training', 50, null, null, null, null, [...this.fileType])
 					this.loading = false
 				} else {
 					this.inputForm.id = this.generateFallbackId()
-					this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'training', null, null, null, null, null, [...this.fileType])
+					this.$refs.upLoadComponent.newUpload(method, this.inputForm.files, 'training', 50, null, null, null, null, [...this.fileType])
 					this.loading = false
 				}
 			})