From 771fc2166d19b1e67be34926e6336ba6ebb891d5 Mon Sep 17 00:00:00 2001 From: wangchengming <15110151257@163.com> Date: Mon, 7 Jul 2025 21:08:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=96=B0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=AF=B9=E6=8E=A5=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/user.js | 37 +-- src/router/index.js | 4 +- src/views/system/userApproval/index.vue | 7 +- .../userApproval/userApprovalDetail.vue | 237 ++++++------------ .../system/userApproval/userApprovalForm.vue | 234 ++++++++--------- 5 files changed, 215 insertions(+), 304 deletions(-) diff --git a/src/api/system/user.js b/src/api/system/user.js index 6ec4817..b4d02a6 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -52,6 +52,24 @@ export function checkRegisterUserList(data) { params: data }) } + +// 查询新用户审批记录 +export function userCheckRecordList(data) { + return request({ + url: '/admin/userCheckRecord/pageList', + method: 'post', + data: data + }) +} + +// 提交新用户审批 +export function checkRegisterUser(data) { + return request({ + url: '/system/user/checkRegisterUser', + method: 'post', + data: data + }) +} // 用户密码重置 export function resetUserPwd(userId, password) { @@ -167,22 +185,5 @@ 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 145aea8..57f9b17 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -306,13 +306,13 @@ export const dynamicRoutes = [ ] }, { - path: '/system/userApproval/userApprovalDetail', + path: '/system/userApprovalDetail', component: Layout, hidden: true, permissions: ['system:userApproval:approval'], children: [ { - path: '', + path: ':userId(\\d+)', component: () => import('@/views/system/userApproval/userApprovalDetail'), name: 'userApprovalDetail', meta: { title: '新用户审批详情', activeMenu: '/system/userApproval' } diff --git a/src/views/system/userApproval/index.vue b/src/views/system/userApproval/index.vue index 7d0529f..21129db 100644 --- a/src/views/system/userApproval/index.vue +++ b/src/views/system/userApproval/index.vue @@ -77,7 +77,7 @@ @@ -209,10 +209,11 @@ const resetQuery = () => { handleQuery() } -const handleView = () => { - router.push('/system/userApproval/userApprovalDetail') +const handleView = (record) => { + router.push('/system/userApprovalDetail/' + record.userId) } const handleApproval = (record) => { + console.log('审批', record) router.push('/system/userApprovalForm/' + record.userId) } diff --git a/src/views/system/userApproval/userApprovalDetail.vue b/src/views/system/userApproval/userApprovalDetail.vue index 3e7242e..e115667 100644 --- a/src/views/system/userApproval/userApprovalDetail.vue +++ b/src/views/system/userApproval/userApprovalDetail.vue @@ -13,70 +13,73 @@ - +
注册信息
- - ES - - - - - XXXX部门 - - - - - XXX科室 - - - - - NO.43242342 + + {{ detailForm.workNo ? detailForm.workNo : '-' }} - 管思成 + {{ detailForm.userName ? detailForm.userName : '-' }} - GuangSiCheng + {{ detailForm.englishName ? detailForm.englishName : '-' }} + + + + + {{ detailForm.dept ? detailForm.dept.deptName : '-' }} + + + + + {{ detailForm.sectionName ? detailForm.sectionName : '-' }} - XXX属地 + {{ detailForm.dependencyName ? detailForm.dependencyName : '-' }} - 赵文杰 + {{ detailForm.escUserName ? detailForm.escUserName : '-' }} - 2024-12-24 14:23 + {{ detailForm.createTime ? detailForm.createTime : '-' }} - 待审批 + +
-
+
审批记录
@@ -90,162 +93,79 @@ -
- -
审批信息
-
- - - - - 驳回 - 通过 - - - - - - - - - -
-
+
- 取消 - 提交 + 返回