diff --git a/src/router/index.js b/src/router/index.js index 8374248..54fad85 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -117,7 +117,7 @@ export const dynamicRoutes = [ path: ':Id(\\d+)?/:node', component: () => import('@/views/qualification/escTask/components/QualificationReApplyForm'), name: 'qualificationReApplyForm', - meta: { title: 'ESC重新申请申请', activeMenu: '/qualification/escTask' } + meta: { title: 'ESC重新申请资质', activeMenu: '/qualification/escTask' } } ] }, @@ -135,6 +135,21 @@ export const dynamicRoutes = [ } ] }, + + { + path: '/qualification/escTask/LableReApplyForm', + component: Layout, + hidden: true, + permissions: ['qualification:escTask:qualificationApply'], + children: [ + { + path: ':Id(\\d+)?', + component: () => import('@/views/qualification/escTask/components/LableReApplyForm'), + name: 'LableReApplyForm', + meta: { title: 'ESC重新申请标签', activeMenu: '/qualification/escTask' } + } + ] + }, { path: '/qualification/viewDetail', component: Layout, diff --git a/src/views/labelManage/adminApproval/approvalDetail.vue b/src/views/labelManage/adminApproval/approvalDetail.vue index 7c8ada2..4ae573a 100644 --- a/src/views/labelManage/adminApproval/approvalDetail.vue +++ b/src/views/labelManage/adminApproval/approvalDetail.vue @@ -147,8 +147,8 @@ 提交申请 ESC审核通过 ESC驳回 - 培训中心审核通过 - 培训中心驳回 + 标签审核员审核通过 + 标签审核员驳回 用户重新申请 ESC代替用户重新申请 diff --git a/src/views/labelManage/adminApproval/approvalForm.vue b/src/views/labelManage/adminApproval/approvalForm.vue index d061d6f..d26ad71 100644 --- a/src/views/labelManage/adminApproval/approvalForm.vue +++ b/src/views/labelManage/adminApproval/approvalForm.vue @@ -146,8 +146,8 @@ 提交申请 ESC审核通过 ESC驳回 - 培训中心审核通过 - 培训中心驳回 + 标签审核员审核通过 + 标签审核员驳回 用户重新申请 ESC代替用户重新申请 diff --git a/src/views/labelManage/escApproval/approvalDetail.vue b/src/views/labelManage/escApproval/approvalDetail.vue index a55f1e0..9bfd5bd 100644 --- a/src/views/labelManage/escApproval/approvalDetail.vue +++ b/src/views/labelManage/escApproval/approvalDetail.vue @@ -147,8 +147,8 @@ 提交申请 ESC审核通过 ESC驳回 - 培训中心审核通过 - 培训中心驳回 + 标签审核员审核通过 + 标签审核员驳回 用户重新申请 ESC代替用户重新申请 diff --git a/src/views/labelManage/escApproval/approvalForm.vue b/src/views/labelManage/escApproval/approvalForm.vue index 96ef732..3a8e4a9 100644 --- a/src/views/labelManage/escApproval/approvalForm.vue +++ b/src/views/labelManage/escApproval/approvalForm.vue @@ -146,8 +146,8 @@ 提交申请 ESC审核通过 ESC驳回 - 培训中心审核通过 - 培训中心驳回 + 标签审核员审核通过 + 标签审核员驳回 用户重新申请 ESC代替用户重新申请 diff --git a/src/views/qualification/escTask/components/LableApply.vue b/src/views/qualification/escTask/components/LableApply.vue index ea3aebb..0bbd9bc 100644 --- a/src/views/qualification/escTask/components/LableApply.vue +++ b/src/views/qualification/escTask/components/LableApply.vue @@ -175,6 +175,7 @@ const handleOpenApplyForm = () => { // 重新申请资质表单 const handleReplay = (record) => { + router.push('/qualification/escTask/LableReApplyForm/' + record.id) // router.push({ // name: 'qualificationReApplyForm', // params: { Id: record.id, node: record.node } // 传递两个参数 diff --git a/src/views/qualification/escTask/components/LableApplyForm.vue b/src/views/qualification/escTask/components/LableApplyForm.vue index d649104..a56e375 100644 --- a/src/views/qualification/escTask/components/LableApplyForm.vue +++ b/src/views/qualification/escTask/components/LableApplyForm.vue @@ -171,6 +171,17 @@ const queryParams = ref({ pageSize: 10, }) const requiredQualifications = ref([]) +// Define the qualifications mapping +const qualificationsMap = { + 'SH': ['电工证', 'SH'], + 'ES': ['电工证', 'ES'], + 'ESC': ['电工证', 'ESC'], + 'CESC': ['电工证', 'CESC'], + 'SH+LLP': ['电工证', 'SH', 'LLP', '急救证'], + 'ES+LLP': ['电工证', 'ES', 'LLP', '急救证'], + 'ESC+LLP': ['电工证', 'ESC', 'LLP', '急救证'], + 'CESC+LLP': ['电工证', 'CESC', 'LLP', '急救证'] +}; const loading = ref(true) const tableData = ref([]) const baseUrl = import.meta.env.VITE_APP_BASE_API @@ -258,33 +269,23 @@ const selectChanged = async (value) => { ruleForm.value.dependencyId = curUser.dependencyId; ruleForm.value.escUserName = curUser.escUserName; - loading.value = true; - const res = await getUserQualification(); - console.log('获取接口完毕', res); - loading.value = false; - // Filter the data - tableData.value = res.filter(item => - requiredQualifications.value.some(qualification => - item.qualificationName === qualification - )) - + if (ruleForm.value.labelId) { + requiredQualifications.value = qualificationsMap[ruleForm.value.labelId] || []; + loading.value = true; + const res = await getUserQualification(); + console.log('获取接口完毕', res); + loading.value = false; + // Filter the data + tableData.value = res.filter(item => + requiredQualifications.value.some(qualification => + item.qualificationName === qualification + )) + } } // 申请标签选择 -const handleChoseLabl = async (val) => { +const handleChoseLabl = async (val) => { try { - // Define the qualifications mapping - const qualificationsMap = { - 'SH': ['电工证', 'SH'], - 'ES': ['电工证', 'ES'], - 'ESC': ['电工证', 'ESC'], - 'CESC': ['电工证', 'CESC'], - 'SH+LLP': ['电工证', 'SH', 'LLP', '急救证'], - 'ES+LLP': ['电工证', 'ES', 'LLP', '急救证'], - 'ESC+LLP': ['电工证', 'ESC', 'LLP', '急救证'], - 'CESC+LLP': ['电工证', 'CESC', 'LLP', '急救证'] - }; - // Get the required qualifications or default to empty array requiredQualifications.value = qualificationsMap[val] || []; console.log('rwerwe', requiredQualifications) diff --git a/src/views/qualification/escTask/components/LableReApplyForm.vue b/src/views/qualification/escTask/components/LableReApplyForm.vue new file mode 100644 index 0000000..606303b --- /dev/null +++ b/src/views/qualification/escTask/components/LableReApplyForm.vue @@ -0,0 +1,590 @@ + + + \ No newline at end of file diff --git a/src/views/qualification/escTask/components/QualificationReApplyForm.vue b/src/views/qualification/escTask/components/QualificationReApplyForm.vue index d16894b..ef17274 100644 --- a/src/views/qualification/escTask/components/QualificationReApplyForm.vue +++ b/src/views/qualification/escTask/components/QualificationReApplyForm.vue @@ -469,8 +469,7 @@ onMounted(() => { getSysSectionData() const id = route.params && route.params.Id const node = route.params && route.params.node; - if (id) { - ruleForm.value.id = id + if (id) { getQualificationInfo(id, node) } }); diff --git a/src/views/qualification/myQualifications/components/LableDetaiForm.vue b/src/views/qualification/myQualifications/components/LableDetaiForm.vue index dbf1af6..246ff3c 100644 --- a/src/views/qualification/myQualifications/components/LableDetaiForm.vue +++ b/src/views/qualification/myQualifications/components/LableDetaiForm.vue @@ -147,8 +147,8 @@ 提交申请 ESC审核通过 ESC驳回 - 培训中心审核通过 - 培训中心驳回 + 标签审核员审核通过 + 标签审核员驳回 用户重新申请 ESC代替用户重新申请