From 6a06e3c49b62fea9353cf94f15a327c6b43a8929 Mon Sep 17 00:00:00 2001 From: dx <1242347652@qq.com> Date: Fri, 21 Mar 2025 09:47:07 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/enterprises/index.vue | 369 +++++++++++++++++--------------- src/views/task/index.vue | 2 +- 2 files changed, 197 insertions(+), 174 deletions(-) diff --git a/src/views/enterprises/index.vue b/src/views/enterprises/index.vue index a91e490..ee51093 100644 --- a/src/views/enterprises/index.vue +++ b/src/views/enterprises/index.vue @@ -1,167 +1,195 @@ - diff --git a/src/views/task/index.vue b/src/views/task/index.vue index f614634..78b9168 100644 --- a/src/views/task/index.vue +++ b/src/views/task/index.vue @@ -32,7 +32,7 @@ - + Date: Fri, 21 Mar 2025 10:14:35 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=94=A8=E6=88=B7=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/user/UserForm.vue | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/views/system/user/UserForm.vue b/src/views/system/user/UserForm.vue index 8f609aa..a904f14 100644 --- a/src/views/system/user/UserForm.vue +++ b/src/views/system/user/UserForm.vue @@ -28,17 +28,6 @@ /> - - - - - - From 43f4420b35bdf12f4b96d6c389a2e133a65e212a Mon Sep 17 00:00:00 2001 From: dx <1242347652@qq.com> Date: Fri, 21 Mar 2025 16:06:01 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=B8=93=E7=AE=A1=E5=91=98,=20=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/user/index.ts | 11 +++++++++-- src/views/enterprises/index.vue | 7 +++++++ src/views/task/index.vue | 17 +++++++++++++---- 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/src/api/system/user/index.ts b/src/api/system/user/index.ts index 9e9a8b4..3c5ca2e 100644 --- a/src/api/system/user/index.ts +++ b/src/api/system/user/index.ts @@ -117,8 +117,15 @@ export const getExamieList = (audit: number) => { * 审核用户 */ export function examineUser(data) { + return request.put({url: '/system/user/user_audit', data}) +} - console.log('data=>', data) +// 专管员列表 +export const getEnterpriseManager = () => { + return request.get({ url: '/system/user/enterprise_manager_list' }) +} - return request.put({url: '/system/user/user_audit', data}) +// 发布列表 +export const deptByMenu = () => { + return request.get({ url: '/system/user/deptByMenu' }) } diff --git a/src/views/enterprises/index.vue b/src/views/enterprises/index.vue index bdb6b79..bf23bd6 100644 --- a/src/views/enterprises/index.vue +++ b/src/views/enterprises/index.vue @@ -161,6 +161,8 @@ import { getStrDictOptions, DICT_TYPE, getDictLabel } from '@/utils/dict' import { dateFormatter } from '@/utils/formatTime' import download from '@/utils/download' import { EnterprisesApi, EnterprisesVO } from '@/api/enterprises' +import { getEnterpriseManager } from '@/api/system/user' + import { TagLibraryApi } from '@/api/system/taglibrary' /** 企业 列表 */ defineOptions({ name: 'Enterprises' }) @@ -245,6 +247,11 @@ const getTypList = async () => { } getTypList() + +const getUserList = async () => { + // awitgetEnterpriseManager +} + /** 初始化 **/ onMounted(() => { getList() diff --git a/src/views/task/index.vue b/src/views/task/index.vue index 78b9168..259520e 100644 --- a/src/views/task/index.vue +++ b/src/views/task/index.vue @@ -32,11 +32,11 @@ - + @@ -153,6 +153,7 @@ import download from '@/utils/download' import { TaskInfoApi, TaskInfoVO } from '@/api/system/taskinfo' import TaskInfoForm from './TaskInfoForm.vue' import { TagLibraryApi } from '@/api/system/taglibrary' +import { deptByMenu } from '@/api/system/user' /** 任务表，用于存储所有的任务信息，任务可由不同用户创建并管理。 列表 */ defineOptions({ name: 'TaskList' }) @@ -182,7 +183,8 @@ const queryParams = reactive({ parentType: undefined, taskStep: undefined, taskTotal: undefined, - selectWeek: undefined + selectWeek: undefined, + deptId: undefined }) const queryFormRef = ref() // 搜索的表单 const exportLoading = ref(false) // 导出的加载中 @@ -274,9 +276,16 @@ const handleExport = async () => { } } +const createDeptList = ref() +const getCreateDept = async () => { + const data = await deptByMenu() + createDeptList.value = data +} + /** 初始化 **/ onMounted(() => { getList() + getCreateDept() })