diff --git a/src/api/qualification/myQualifications.js b/src/api/qualification/myQualifications.js index 9f8049b..247c9d5 100644 --- a/src/api/qualification/myQualifications.js +++ b/src/api/qualification/myQualifications.js @@ -112,3 +112,12 @@ export function deleteBusUserQualification(busQualificationId) { method: 'post' }) } + +// 重新申请资质 +export function reApplyBusUserQualification(query) { + return request({ + url: '/admin/busUserQualification/reApply', + method: 'post', + data: query + }) +} diff --git a/src/router/index.js b/src/router/index.js index 6501920..9d68029 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -120,6 +120,20 @@ export const dynamicRoutes = [ meta: { title: '标签申请', activeMenu: '/qualification/escTask' } } ] + }, + { + path: '/qualification/myQualifications/viewDetail', + component: Layout, + hidden: true, + permissions: ['qualification:escApproval:approvalDetail'], + children: [ + { + path: ':Id(\\d+)?', + component: () => import('@/views/qualification/myQualifications/components/QualificationDetailForm'), + name: 'myApprovalDetail', + meta: { title: '我的资质查看详情' } + } + ] }, { path: '/qualification/approvalForm', @@ -150,16 +164,31 @@ export const dynamicRoutes = [ ] }, { - path: '/qualification/trainApproval/approvalDetail', + path: '/qualification/trainApprovalForm', component: Layout, hidden: true, permissions: ['qualification:trainApproval:approvalDetail'], children: [ { - path: '', + path: ':Id(\\d+)?', + component: () => import('@/views/qualification/trainApproval/approvalForm'), + name: 'trainApprovalForm', + meta: { title: '培训中心审批', activeMenu: '/qualification/trainApproval' } + } + ] + }, + + { + path: '/qualification/trainApprovalDetail', + component: Layout, + hidden: true, + permissions: ['qualification:trainApproval:approvalDetail'], + children: [ + { + path: ':Id(\\d+)?', component: () => import('@/views/qualification/trainApproval/approvalDetail'), name: 'trainApprovalDetail', - meta: { title: '培训中心审批', activeMenu: '/qualification/trainApproval' } + meta: { title: '培训中心审批详情', activeMenu: '/qualification/trainApproval' } } ] }, diff --git a/src/views/qualification/escApproval/index.vue b/src/views/qualification/escApproval/index.vue index e304741..e0b27bf 100644 --- a/src/views/qualification/escApproval/index.vue +++ b/src/views/qualification/escApproval/index.vue @@ -71,7 +71,7 @@ \ No newline at end of file diff --git a/src/views/qualification/trainApproval/approvalDetail.vue b/src/views/qualification/trainApproval/approvalDetail.vue index 827f125..48815ef 100644 --- a/src/views/qualification/trainApproval/approvalDetail.vue +++ b/src/views/qualification/trainApproval/approvalDetail.vue @@ -13,142 +13,328 @@ - +
- - ES + + {{ detailForm.sourceQualificationName ? detailForm.sourceQualificationName : + '-' }} - - XXXX部门 + + {{ detailForm.deptName ? detailForm.deptName : '-' }} - - XXX科室 + + {{ detailForm.sectionName ? detailForm.sectionName : '-' }} - - NO.43242342 + + {{ detailForm.workNo ? detailForm.workNo : '-' }} - - 管思成 + + {{ detailForm.userName ? detailForm.userName : '-' }} - - GuangSiCheng + + {{ detailForm.englishName ? detailForm.englishName : '-' }} - - XXX属地 + + {{ detailForm.dependencyName ? detailForm.dependencyName : '-' }} - - 赵文杰 + + {{ detailForm.escUserName ? detailForm.escUserName : '-' }} - - 2024-12-24 14:23 + + {{ detailForm.createTime ? detailForm.createTime : '-' }} - 待审批 + +
- +
前置条件
-
- - - - 2023-12-06 - - - - - 2027-12-06 - - - - - 正常 - - - - - - 紧急 - 一般 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+
+ + + + + + + + + + + + + + + + + + + + + 紧急 + 一般 + + + + + + - + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + 紧急 + 一般 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + 紧急 + 一般 + + + + + + + + + + + + + + + + + + + +
+
+ + + + + 非电池生产线员工 + 电池生产线员工 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
审批记录
@@ -159,116 +345,191 @@ {{ scope.$index + 1 }} - - - + + + + + -
- -
审批信息
-
- - - - - 驳回 - 通过 - - - - - - - - - -
-
+
- 取消 - 提交 + 返回 +
- + + + Preview Image +
+ +
+
+ \ No newline at end of file diff --git a/src/views/qualification/trainApproval/approvalForm.vue b/src/views/qualification/trainApproval/approvalForm.vue new file mode 100644 index 0000000..8bd8875 --- /dev/null +++ b/src/views/qualification/trainApproval/approvalForm.vue @@ -0,0 +1,885 @@ + + + \ No newline at end of file diff --git a/src/views/qualification/trainApproval/index.vue b/src/views/qualification/trainApproval/index.vue index d4f4dd1..8d0b60e 100644 --- a/src/views/qualification/trainApproval/index.vue +++ b/src/views/qualification/trainApproval/index.vue @@ -2,28 +2,33 @@
- + - - + + - - - - + + + + + - + + + - 展开 + 展开 - 折叠 + 折叠 @@ -35,12 +40,10 @@ - - - - - + + @@ -53,187 +56,160 @@
- + - - - - - - - - + + + + + + + + - + - +