diff --git a/src/api/system/user.js b/src/api/system/user.js index 6ee6041..6ec4817 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -167,4 +167,22 @@ export function resetPwd(params) { data: params }) } + +// 获取用户审批记录 +export function getUserApplyRecord(params) { + return request({ + url: '/admin/userCheckRecord/pageList', + method: 'post', + data: params + }) +} + +// 用户注册审核 +export function submitUserApply(params) { + return request({ + url: '/system/user/checkRegisterUser', + method: 'post', + data: params + }) +} \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 188530d..145aea8 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -292,6 +292,20 @@ export const dynamicRoutes = [ }, { + path: '/system/userApprovalForm', + component: Layout, + hidden: true, + permissions: ['system:userApproval:approval'], + children: [ + { + path: ':userId(\\d+)', + component: () => import('@/views/system/userApproval/userApprovalForm'), + name: 'userApprovalForm', + meta: { title: '新用户审批', activeMenu: '/system/userApproval' } + } + ] + }, + { path: '/system/userApproval/userApprovalDetail', component: Layout, hidden: true, @@ -301,7 +315,7 @@ export const dynamicRoutes = [ path: '', component: () => import('@/views/system/userApproval/userApprovalDetail'), name: 'userApprovalDetail', - meta: { title: '新用户审批', activeMenu: '/system/userApproval' } + meta: { title: '新用户审批详情', activeMenu: '/system/userApproval' } } ] }, diff --git a/src/views/system/locality/index.vue b/src/views/system/locality/index.vue index 1665bfb..8b1b4be 100644 --- a/src/views/system/locality/index.vue +++ b/src/views/system/locality/index.vue @@ -36,7 +36,7 @@ - + diff --git a/src/views/system/userApproval/index.vue b/src/views/system/userApproval/index.vue index fb55d89..1fe20f1 100644 --- a/src/views/system/userApproval/index.vue +++ b/src/views/system/userApproval/index.vue @@ -58,7 +58,7 @@ - + @@ -93,7 +93,6 @@ import { useRouter } from 'vue-router' import Breadcrumb from '@/components/Breadcrumb' import { deptTreeSelect, listUser, checkRegisterUserList } from "@/api/system/user" import { getBusDependencyPage } from "@/api/system/dependency" - const { proxy } = getCurrentInstance() const router = useRouter() const loading = ref(true) @@ -211,8 +210,8 @@ const resetQuery = () => { const handleView = () => { router.push('/system/userApproval/userApprovalDetail') } -const handleApproval = () => { - router.push('/system/userApproval/userApprovalDetail') +const handleApproval = (record) => { + router.push('/system/userApprovalForm/' + record.userId) } \ No newline at end of file