diff --git a/src/api/qualification/myQualifications.js b/src/api/qualification/myQualifications.js index b2d5618..9f8049b 100644 --- a/src/api/qualification/myQualifications.js +++ b/src/api/qualification/myQualifications.js @@ -78,9 +78,8 @@ export function updateBusUserQualification(query) { method: 'post', data: query }) -} +} - // 查询一条资质申请记录详情 export function getBusUserQualificationDetail(query) { return request({ @@ -98,7 +97,14 @@ export function getBusUserQualificationRecord(query) { data: query }) } - +// ESC/培训中心审批 +export function updateStatusBusUserQualification(query) { + return request({ + url: '/admin/busUserQualification/updateStatus', + method: 'post', + data: query + }) +} // 删除资质申请记录 export function deleteBusUserQualification(busQualificationId) { return request({ diff --git a/src/router/index.js b/src/router/index.js index 465a463..6501920 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -122,7 +122,21 @@ export const dynamicRoutes = [ ] }, { - path: '/qualification/escApproval/approvalDetail', + path: '/qualification/approvalForm', + component: Layout, + hidden: true, + permissions: ['qualification:escApproval:approvalDetail'], + children: [ + { + path: ':Id(\\d+)?', + component: () => import('@/views/qualification/escApproval/approvalForm'), + name: 'escApprovalForm', + meta: { title: 'ESC审批', activeMenu: '/qualification/escApproval' } + } + ] + }, + { + path: '/qualification/approvalDetail', component: Layout, hidden: true, permissions: ['qualification:escApproval:approvalDetail'], @@ -131,7 +145,7 @@ export const dynamicRoutes = [ path: ':Id(\\d+)?', component: () => import('@/views/qualification/escApproval/approvalDetail'), name: 'escApprovalDetail', - meta: { title: 'ESC审批', activeMenu: '/qualification/escApproval' } + meta: { title: 'ESC审批详情', activeMenu: '/qualification/escApproval' } } ] }, @@ -162,7 +176,7 @@ export const dynamicRoutes = [ meta: { title: '车型培训记录维护', activeMenu: '/qualification/vehicleTrain' } } ] - }, + }, { path: '/qualification/vehicleTrain/importForm', component: Layout, diff --git a/src/views/qualification/escApproval/approvalDetail.vue b/src/views/qualification/escApproval/approvalDetail.vue index 8779577..6e9d586 100644 --- a/src/views/qualification/escApproval/approvalDetail.vue +++ b/src/views/qualification/escApproval/approvalDetail.vue @@ -73,8 +73,10 @@ - - - + + + + + - - -
审批信息
-
- - - - - 驳回 - 通过 - - - - - - - - - -
-
+
- 取消 - 提交 + 返回 +
+ + + + Preview Image +
+ +
+
- - - Preview Image -
- -
-
\ No newline at end of file diff --git a/src/views/qualification/escApproval/index.vue b/src/views/qualification/escApproval/index.vue index 614a18c..e304741 100644 --- a/src/views/qualification/escApproval/index.vue +++ b/src/views/qualification/escApproval/index.vue @@ -25,10 +25,10 @@
- 展开 + 展开 - 折叠 + 折叠 @@ -69,19 +69,22 @@ - + - + @@ -113,7 +116,7 @@ const queryParams = ref({ endTime: undefined }) const loading = ref(true) -const total = ref("") +const total = ref(0) const tableData = ref([]) const handleFlod = () => { unfoldFlag.value = !unfoldFlag.value @@ -187,7 +190,7 @@ const handleQuery = () => { /** 重置按钮操作 */ const resetQuery = () => { - dateRange.value = [] + dateRange.value = [] queryParams.value.userId = undefined queryParams.value.deptId = undefined queryParams.value.state = undefined @@ -202,11 +205,11 @@ const handleOpenApplyForm = () => { } const handleView = (record) => { - router.push('/qualification/escApproval/approvalDetail/' + record.id) + router.push('/qualification/approvalDetail/' + record.id) } const handleApproval = (record) => { console.log('主键', record) - router.push('/qualification/escApproval/approvalDetail/' + record.id) + router.push('/qualification/approvalForm/' + record.id) }