From 4356e499eafeac0ee48a7d607e4dbaceb68ecb00 Mon Sep 17 00:00:00 2001 From: Dragon <> Date: Mon, 8 Apr 2024 15:52:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E6=A3=80=E7=B4=A2-=E9=AB=98?= =?UTF-8?q?=E7=BA=A7=E6=A3=80=E7=B4=A2=E5=8A=9F=E8=83=BD-=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=85=A8=E9=83=A8=E4=BB=BB=E5=8A=A1=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/final.ts | 11 ++--- src/views/final/content/Content.vue | 3 +- src/views/home/aside/comp/items/IzShowAll.vue | 46 +++++++++++++++++++ src/views/home/aside/comp/items/index.ts | 4 +- 4 files changed, 55 insertions(+), 9 deletions(-) create mode 100644 src/views/home/aside/comp/items/IzShowAll.vue diff --git a/src/config/final.ts b/src/config/final.ts index 2b6a2e5..2df2d66 100644 --- a/src/config/final.ts +++ b/src/config/final.ts @@ -1,5 +1,5 @@ import type { AsideEntity } from './aside' -import { IzApprovalStatus, IzProjectVue, IzStatus, IztaskrromVue, PictureDownloadVue, PlanVue, ReportUserVue, TimeVue, IzCustomname, IzCustomtype, IzVisitcity, IzCustomlevel, IzProjecttype, IzProductVue, IzvisitproVue, IzfirmVue } from '@/views/home/aside/comp/items' +import { IzApprovalStatus, IzCustomlevel, IzCustomname, IzCustomtype, IzProductVue, IzProjectVue, IzProjecttype, IzShowAll, IzStatus, IzVisitcity, IzfirmVue, IztaskrromVue, IzvisitproVue, PictureDownloadVue, PlanVue, ReportUserVue, TimeVue } from '@/views/home/aside/comp/items' export interface RowData { id: string @@ -125,12 +125,11 @@ export const asideMap: Recordable = { defaultValue: true, isDefaultFilter: false, key: 'izshowall', - component: PictureDownloadVue, + component: IzShowAll, inFilterList: false, }, } - // 审批添加筛选配置 (左侧) export const asideTaskMap: Recordable = { izstatus: { @@ -194,7 +193,7 @@ export const asideTaskMap: Recordable = { defaultValue: null, isDefaultFilter: true, key: 'izcustomlevel', - component: IzCustomlevel + component: IzCustomlevel, }, izprojecttype: { label: '项目类别', @@ -223,5 +222,5 @@ export const asideTaskMap: Recordable = { isDefaultFilter: true, key: 'izfirm', component: IzfirmVue, - } -} \ No newline at end of file + }, +} diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue index 2eb7a2c..1ae455c 100644 --- a/src/views/final/content/Content.vue +++ b/src/views/final/content/Content.vue @@ -468,7 +468,8 @@ const finalStore = useFinal() async function query(page: number, pageSize: number, filterId?: any, taskName?: string) { const asideParmas = unref(finalStore.getAsideValue) // 有过滤配置的时候优先使用过滤配置,不要使用左侧参数 - const params = filterId ? { userSearchId: filterId } : asideParmas + let params = filterId ? { userSearchId: filterId } : asideParmas + params = params.izshowall ? {} : params const result = await getFinalList({ sortorder: sortorder.value, pageSize, diff --git a/src/views/home/aside/comp/items/IzShowAll.vue b/src/views/home/aside/comp/items/IzShowAll.vue new file mode 100644 index 0000000..37908b4 --- /dev/null +++ b/src/views/home/aside/comp/items/IzShowAll.vue @@ -0,0 +1,46 @@ + + + + + diff --git a/src/views/home/aside/comp/items/index.ts b/src/views/home/aside/comp/items/index.ts index 22655ea..7af0d65 100644 --- a/src/views/home/aside/comp/items/index.ts +++ b/src/views/home/aside/comp/items/index.ts @@ -20,6 +20,6 @@ import ReportUserVue from './ReportUser.vue' import SimilarityVue from './Similarity.vue' import TimeVue from './Time.vue' import IzApprovalStatus from './IzApprovalStatus.vue' +import IzShowAll from './IzShowAll.vue' -export { IzProjecttype, IzStatus, IzVisitcity, IzCustomlevel, IzCustomtype, IzCustomname, IzfirmVue, IzProductVue, IzvisitproVue, IztaskstatusVue, IztaskrromVue, IzProjectVue, PictureDownloadVue, PictureUploadVue, PlaceHolderVue, RegionVue, SimilarityVue, ReportUserVue, PlanVue, PictureTypeVue, TimeVue, IzApprovalStatus } - +export { IzProjecttype, IzStatus, IzVisitcity, IzCustomlevel, IzCustomtype, IzCustomname, IzfirmVue, IzProductVue, IzvisitproVue, IztaskstatusVue, IztaskrromVue, IzProjectVue, PictureDownloadVue, PictureUploadVue, PlaceHolderVue, RegionVue, SimilarityVue, ReportUserVue, PlanVue, PictureTypeVue, TimeVue, IzApprovalStatus, IzShowAll }