Browse Source

用户信息审批历史数据查询处理

huangguoce 1 month ago
parent
commit
70cb12a9e3

+ 3 - 1
src/views/human/enrollment/registration/EnrollmentRegistrationEditForm.vue

@@ -1113,7 +1113,9 @@
 										<el-collapse-item :name="item.id">
 											<template #title="{ isActive }">
 												<div class="collapseTitle">
-													<span style="font-size: 16px;"> {{ item.name }}</span>
+													<span style="font-size: 16px;"> {{
+														$dictUtils.getDictLabel('professional_certificate',
+															item.name, '-')}}</span>
 													<span style="font-size: 16px;" v-if="item.proficiency"> {{ ' - ' +
 														item.proficiency }}</span>
 													<div style="margin-left: auto;">

+ 12 - 4
src/views/human/enrollment/registration/EnrollmentUserInfoAuditForm.vue

@@ -487,7 +487,9 @@
 									<el-collapse-item :name="item.id">
 										<template #title="{ isActive }">
 											<div class="collapseTitle">
-												<span style="font-size: 16px;"> {{ item.name }}</span>
+												<span style="font-size: 16px;"> {{
+													$dictUtils.getDictLabel('professional_certificate',
+														item.name, '-') }}</span>
 												<span style="font-size: 16px;" v-if="item.proficiency"> {{ ' - ' +
 													item.proficiency }}</span>
 												<div style="margin-left: auto;">
@@ -1065,14 +1067,21 @@ export default {
 			}
 			this.inputForm.id = id
 			this.visible = true
-			this.loading = false
 			this.$nextTick(() => {
 				this.$refs.idCardFront.clearUpload()
 				this.$refs.idCardBack.clearUpload()
 				this.loading = true
+				let status = 2
+				let flag = ""
+				// 对查看流程历史数据做判断
+				if (this.status == "taskFormDetail") {
+					status = 5
+					flag = 1
+				}
 				enrollmentRegistrationService.findAuditInfoById({
 					id: this.inputForm.id,
-					status: 2
+					status: status,
+					flag: flag
 				}).then(async (data) => {
 					if (this.status === 'audit' || this.status === 'taskFormDetail') {
 						method = 'view'
@@ -1152,7 +1161,6 @@ export default {
 					this.$refs.idCardBack.newUpload('view', this.inputForm.idCardBack, 'idCard', null, null, null, null, null, [...this.fileType])
 					this.loading = false
 				})
-
 			})
 		},
 		// 表单提交