From db00888ca969f714a8984a694ee80c892a3bd62a Mon Sep 17 00:00:00 2001 From: rd <1344903914@qq.com> Date: Tue, 22 Jul 2025 18:02:18 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/all/common.ts | 5 ++ src/api/all/propertyMarketing.ts | 26 +++++++++++ .../components/add-project-modal/stepFour.vue | 24 +++++----- .../components/filter-block/index.vue | 2 +- .../components/project-table/constants.ts | 8 ++-- .../components/project-table/index.vue | 2 +- .../project-manage/project-list/constants.ts | 6 +-- .../project-manage/project-list/index.vue | 46 ++++++------------- 8 files changed, 65 insertions(+), 54 deletions(-) diff --git a/src/api/all/common.ts b/src/api/all/common.ts index 9b210da..2a80ece 100644 --- a/src/api/all/common.ts +++ b/src/api/all/common.ts @@ -13,3 +13,8 @@ export const getCustomColumns = (params = {}) => { export const updateCustomColumns = (params = {}) => { return Http.put('/v1/custom-columns', params); }; + +// 获取企业用户列表 +export const getUserList = (params = {}) => { + return Http.get('/v1/users/list', params); +}; \ No newline at end of file diff --git a/src/api/all/propertyMarketing.ts b/src/api/all/propertyMarketing.ts index 5d3f115..fa65b7c 100644 --- a/src/api/all/propertyMarketing.ts +++ b/src/api/all/propertyMarketing.ts @@ -371,3 +371,29 @@ export const deleteSyncStatus = (id: string) => { export const getWorksList = (params = {}) => { return Http.get('/v1/works/list', params); }; + +// 项目管理-分页 +export const getProjects = (params = {}) => { + return Http.get('/v1/projects', params); +}; + +// 项目管理-删除 +export const deleteProject = (id: string) => { + return Http.delete(`/v1/projects/${id}`); +}; + +// 项目管理-添加 +export const postAddProject = (params: {}) => { + return Http.post('/v1/projects', params); +}; + +// 项目管理-修改 +export const putProject = (params = {}) => { + const { id, ...rest } = params as { id: string; [key: string]: any }; + return Http.put(`/v1/projects/${id}`, rest); +}; + +// 项目管理-详情 +export const getProjectDetail = (id: string) => { + return Http.get(`/v1/projects/${id}`); +}; diff --git a/src/views/property-marketing/project-manage/project-list/components/add-project-modal/stepFour.vue b/src/views/property-marketing/project-manage/project-list/components/add-project-modal/stepFour.vue index fa6c846..91cfa7e 100644 --- a/src/views/property-marketing/project-manage/project-list/components/add-project-modal/stepFour.vue +++ b/src/views/property-marketing/project-manage/project-list/components/add-project-modal/stepFour.vue @@ -36,7 +36,7 @@ @change="handleSearch" > - {{ item.name }} + {{ item.name || '-' }} @@ -115,6 +115,8 @@ import { formatTableField, exactFormatTime } from '@/utils/tools'; import { getPlacementAccountOperators, getWorksList } from '@/api/all/propertyMarketing'; +import { getUserList } from '@/api/all/common'; + import { useTableSelectionWithPagination } from '@/hooks/useTableSelectionWithPagination'; const TABLE_COLUMNS = [ @@ -178,21 +180,19 @@ const handleSearch = () => { }); }; -// const getOperators = async () => { -// const { code, data } = await getPlacementAccountOperators(); -// if (code === 200) { -// uploaders.value = data; -// } -// }; +const getUsers = async () => { + const { code, data } = await getUserList(); + if (code === 200) { + uploaders.value = data; + + console.log(uploaders.value); + } +}; const getTableData = async () => { const { code, data } = await getWorksList(); if (code === 200) { allData.value = data ?? []; dataSource.value = data ?? []; - uploaders.value = data.map( v => ({ - id: v.uploader?.id, - name: v.uploader?.name, - })) initSelect(); } }; @@ -217,7 +217,7 @@ const onDelete = (item) => { }; onMounted(() => { - // getOperators(); + getUsers(); getTableData(); }); diff --git a/src/views/property-marketing/project-manage/project-list/components/filter-block/index.vue b/src/views/property-marketing/project-manage/project-list/components/filter-block/index.vue index bb52cbe..d172b84 100644 --- a/src/views/property-marketing/project-manage/project-list/components/filter-block/index.vue +++ b/src/views/property-marketing/project-manage/project-list/components/filter-block/index.vue @@ -10,7 +10,7 @@ 项目名称