From 0eccf24c5350962baec3beb8754775657ccfa7e2 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 13 Sep 2023 15:48:53 +0800
Subject: [PATCH] 人员，设备
---
src/pages/page-web/projects/members.vue | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/src/pages/page-web/projects/members.vue b/src/pages/page-web/projects/members.vue
index c0e0bad..18da6e7 100644
--- a/src/pages/page-web/projects/members.vue
+++ b/src/pages/page-web/projects/members.vue
@@ -43,9 +43,10 @@
import { TableState } from 'ant-design-vue/lib/table/interface'
import { onMounted, reactive, Ref, ref, UnwrapRef } from 'vue'
import { IPage } from '/@/api/http/type'
-import { getAllUsersInfo, updateUserInfo } from '/@/api/manage'
+import { getAllUsersInfo, getUserPage, updateUserInfo } from '/@/api/manage'
import { ELocalStorageKey } from '/@/types'
import { EditOutlined, DeleteOutlined, CheckOutlined, CloseOutlined } from '@ant-design/icons-vue'
+import { useMyStore } from '/@/store'
export interface Member {
user_id: string
@@ -62,11 +63,11 @@
}
const columns = [
{ title: '账号', dataIndex: 'username', width: 150, sorter: (a: Member, b: Member) => a.username.localeCompare(b.username), className: 'titleStyle' },
- { title: '人员组织名称', dataIndex: 'organization_name', sorter: (a: Member, b: Member) => a.organization_name.localeCompare(b.organization_name), width: 150, className: 'titleStyle' },
- { title: '用户角色', dataIndex: 'user_role', width: 150, className: 'titleStyle', slots: { customRender: 'user_role' } },
- { title: '所属项目', dataIndex: 'project', width: 150, className: 'titleStyle' },
+ { title: '人员组织名称', dataIndex: 'deptName', sorter: (a: Member, b: Member) => a.organization_name.localeCompare(b.organization_name), width: 150, className: 'titleStyle' },
+ { title: '用户角色', dataIndex: 'roleName', width: 150, className: 'titleStyle', slots: { customRender: 'user_role' } },
+ { title: '所属项目', dataIndex: 'projectName', width: 150, className: 'titleStyle' },
{ title: '加入方式', dataIndex: 'join_way', width: 150, className: 'titleStyle', slots: { customRender: 'join_way' } },
- { title: '加入时间', dataIndex: 'create_time', width: 150, sorter: (a: Member, b: Member) => a.create_time.localeCompare(b.create_time), className: 'titleStyle' },
+ { title: '加入时间', dataIndex: 'createTime', width: 150, sorter: (a: Member, b: Member) => a.create_time.localeCompare(b.create_time), className: 'titleStyle' },
{ title: '操作', dataIndex: 'action', width: 70, className: 'titleStyle', slots: { customRender: 'action' } },
]
@@ -104,23 +105,28 @@
page_size: 50
}
const workspaceId: string = localStorage.getItem(ELocalStorageKey.WorkspaceId)!
+const store = useMyStore()
+const projectId:string = store.state.common.projectId
onMounted(() => {
- getAllUsers(workspaceId, body)
+ getAllUsers({ projectId }, body)
})
function refreshData (page: Pagination) {
body.page = page?.current!
body.page_size = page?.pageSize!
- getAllUsers(workspaceId, body)
+ getAllUsers({ projectId }, body)
}
-function getAllUsers (workspaceId: string, page: IPage) {
- getAllUsersInfo(workspaceId, page).then(res => {
- const userList: Member[] = res.data.list
- data.member = userList
- paginationProp.total = res.data.pagination.total
- paginationProp.current = res.data.pagination.page
+function getAllUsers (params:any, page: IPage) {
+ getUserPage(params, page).then(res => {
+ const resData = res.data
+ data.member = resData.list
+
+ paginationProp.total = resData.total
+ paginationProp.current = resData.pageNum
+ }).catch(err => {
+ console.log(err)
})
}
--
Gitblit v1.9.3