diff --git a/src/api/dictionary/index.ts b/src/api/dictionary/index.ts
index 91bfe28..a97ca0c 100644
--- a/src/api/dictionary/index.ts
+++ b/src/api/dictionary/index.ts
@@ -1,5 +1,5 @@
 import { http } from '@/utils/http/axios'
-import type { PageParam } from '/#/api'
+import type { BusinessParam, PageParam } from '/#/api'
 
 /**
  * 获取地区列表
@@ -315,3 +315,69 @@ export async function getBackList() {
   const list = res.data
   return list
 }
+
+/**
+ * 业务字典查询接口
+ * @returns
+ */
+export async function getBusinessList(field: string, page: PageParam = { pageNo: 1, pageSize: 200 }) {
+  const res = await http.request({
+    url: `/ocr/dictionary/getDictionaryByField`,
+    method: 'get',
+    params: { ...page, field },
+  })
+
+  const { otherMessage: { records } } = res
+  return records.map((record) => {
+    return {
+      label: record.lable || 'todo',
+      value: record.value || 'todo',
+    }
+  })
+}
+
+/**
+ * 业务字典查询接口
+ * @returns
+ */
+export async function getSystemList(code: string) {
+  const res = await http.request({
+    url: `/static/admin/web/distionary/bytypecode`,
+    method: 'get',
+    params: { code },
+  })
+
+  const { otherMessage: { records } } = res
+  return records.map((record) => {
+    return {
+      label: record.lable || 'todo',
+      value: record.value || 'todo',
+    }
+  })
+}
+
+/**
+ * 获取筛选关系字典
+ * @returns
+ */
+export async function getRelationTypeList() {
+  const res = await http.request({
+    url: `/static/admin/web/distionary/bytypecode/searchRelationType`,
+    method: 'get',
+  })
+
+  return res.data[0].distionaryList
+}
+
+/**
+ * 获取审核状态字典
+ * @returns
+ */
+export async function getizstatusList() {
+  const res = await http.request({
+    url: `/static/admin/web/distionary/bytypecode/izstatus`,
+    method: 'get',
+  })
+
+  return res.data[0].distionaryList
+}
diff --git a/src/api/home/filter.ts b/src/api/home/filter.ts
index 7287f1b..353a0b1 100644
--- a/src/api/home/filter.ts
+++ b/src/api/home/filter.ts
@@ -6,13 +6,14 @@ import type { FilterCondition, FilterParam, FilterSearchParam, FilterUpdate, Pag
  * @param params
  * @returns 1
  */
-export async function getConditionList(params: PageParam, searchParam: FilterSearchParam): Promise<any> {
+export async function getConditionList(page: PageParam, searchParam: FilterSearchParam, type: number): Promise<any> {
   const res = await http.request({
     url: `/ocr/ocrUsersearch/list?`,
     method: 'get',
     params: {
-      ...params,
+      ...page,
       search_searchname: JSON.stringify(searchParam.search_searchname),
+      type,
     },
   })
 
@@ -56,7 +57,7 @@ export async function updateCondition(params: FilterUpdate) {
 export async function deleteCondition(params: { ids: string }) {
   return http.request({
     url: `/ocr/ocrUsersearch/deleteBatch`,
-    method: 'delete',
+    method: 'get',
     params,
   })
 }
@@ -65,10 +66,11 @@ export async function deleteCondition(params: { ids: string }) {
  * 获取设置为显示的筛选
  * @returns
  */
-export async function getFilter(): Promise<any> {
+export async function getFilter(type: number): Promise<any> {
   return http.request({
     url: `/ocr/ocrSearchmanager/query`,
     method: 'get',
+    params: { type },
   })
 }
 
diff --git a/src/api/task/task.ts b/src/api/task/task.ts
index 1d711d0..1be74e1 100644
--- a/src/api/task/task.ts
+++ b/src/api/task/task.ts
@@ -7,11 +7,11 @@ import { ContentTypeEnum } from '@/enums/httpEnum'
  * 获取审核列表
  * @returns
  */
-export async function getApprovalList(params: PageParam, assigneeId: string) {
+export async function getApprovalList(page: PageParam, assigneeId: string) {
   const res = await http.request({
-    url: `/flow/task/listdata`,
+    url: `/flow/task/listalldata`,
     method: 'get',
-    params: { ...params, assigneeId },
+    params: { pageSize: page.pageSize, currPage: page.pageNo, assigneeId },
   })
 
   const { data: { list, totalPage } } = res
diff --git a/src/assets/images/avatar.jpg b/src/assets/images/avatar.jpg
new file mode 100644
index 0000000..428ae6e
Binary files /dev/null and b/src/assets/images/avatar.jpg differ
diff --git a/src/config/1.json b/src/config/1.json
new file mode 100644
index 0000000..911d159
--- /dev/null
+++ b/src/config/1.json
@@ -0,0 +1,52 @@
+export const asideMap: Recordable<AsideEntity> = {
+  izupuser: {
+    label: '提报人',
+    defaultValue: null,
+    isDefaultFilter: true,
+    key: 'izupuser',
+    component: ReportUserVue,
+  },
+  izproject: {
+    label: '所属项目',
+    defaultValue: null,
+    isDefaultFilter: true,
+    key: 'izproject',
+    component: IzProjectVue,
+  },
+  izplan: {
+    label: '所属计划',
+    defaultValue: null,
+    isDefaultFilter: true,
+    key: 'izplan',
+    component: PlanVue,
+  },
+  izstatus: {
+    label: '审批状态',
+    defaultValue: null,
+    isDefaultFilter: false,
+    key: 'izstatus',
+    component: PlanVue, // todo
+  },
+  izuptime: {
+    label: '提报时间',
+    defaultValue: null,
+    isDefaultFilter: false,
+    key: 'izuptime',
+    component: TimeVue,
+  },
+  iztaskrrom: {
+    label: '任务来源',
+    defaultValue: null,
+    isDefaultFilter: false,
+    key: 'iztaskrrom',
+    component: IztaskrromVue,
+  },
+  izshowall: {
+    label: '显示全部任务数据',
+    defaultValue: true,
+    isDefaultFilter: false,
+    key: 'izshowall',
+    component: PictureDownloadVue,
+    inFilterList: false,
+  },
+}
diff --git a/src/config/aside.ts b/src/config/aside.ts
index 96d5bc2..1a1b6fd 100644
--- a/src/config/aside.ts
+++ b/src/config/aside.ts
@@ -42,13 +42,13 @@ export const asideMap: Recordable<AsideEntity> = {
     key: 'izplan',
     component: PlanVue,
   },
-  // izsimilarity: {
-  //   label: '相似度阈值',
-  //   defaultValue: [0,100],
-  //   isDefaultFilter: false,
-  //   key: 'izsimilarity',
-  //   component: SimilarityVue,
-  // },
+  izsimilarity: {
+    label: '相似度阈值',
+    defaultValue: [0, 100],
+    isDefaultFilter: false,
+    key: 'izsimilarity',
+    component: SimilarityVue,
+  },
   izyear: {
     label: '年份',
     defaultValue: null,
@@ -69,6 +69,7 @@ export const asideMap: Recordable<AsideEntity> = {
     isDefaultFilter: false,
     key: 'izupload',
     component: PictureUploadVue,
+    inFilterList: false,
   },
   izcustomtype: {
     label: '客户类型',
diff --git a/src/config/final.ts b/src/config/final.ts
index 4edf17d..e338520 100644
--- a/src/config/final.ts
+++ b/src/config/final.ts
@@ -1,3 +1,6 @@
+import type { AsideEntity } from './aside'
+import { IzProjectVue, IztaskrromVue, PictureDownloadVue, PlanVue, ReportUserVue, TimeVue } from '@/views/home/aside/comp/items'
+
 export interface RowData {
   id: string
   fromtaskname: string
@@ -72,3 +75,57 @@ export function findKey(columns: any[], header: string) {
   const item = columns.find((column) => { return (column as any).title === header })
   return (item as any).key
 }
+
+// 终审左侧配置
+export const asideMap: Recordable<AsideEntity> = {
+  izupuser: {
+    label: '提报人',
+    defaultValue: null,
+    isDefaultFilter: true,
+    key: 'izupuser',
+    component: ReportUserVue,
+  },
+  izproject: {
+    label: '所属项目',
+    defaultValue: null,
+    isDefaultFilter: true,
+    key: 'izproject',
+    component: IzProjectVue,
+  },
+  izplan: {
+    label: '所属计划',
+    defaultValue: null,
+    isDefaultFilter: true,
+    key: 'izplan',
+    component: PlanVue,
+  },
+  izstatus: {
+    label: '审批状态',
+    defaultValue: null,
+    isDefaultFilter: false,
+    key: 'izstatus',
+    component: PlanVue, // todo
+  },
+  izuptime: {
+    label: '提报时间',
+    defaultValue: null,
+    isDefaultFilter: false,
+    key: 'izuptime',
+    component: TimeVue,
+  },
+  iztaskrrom: {
+    label: '任务来源',
+    defaultValue: null,
+    isDefaultFilter: false,
+    key: 'iztaskrrom',
+    component: IztaskrromVue,
+  },
+  izshowall: {
+    label: '显示全部任务数据',
+    defaultValue: true,
+    isDefaultFilter: false,
+    key: 'izshowall',
+    component: PictureDownloadVue,
+    inFilterList: false,
+  },
+}
diff --git a/src/store/modules/asideConfig.ts b/src/store/modules/asideConfig.ts
index 90e765f..721eb2a 100644
--- a/src/store/modules/asideConfig.ts
+++ b/src/store/modules/asideConfig.ts
@@ -7,7 +7,7 @@ import type { AsideConfig } from '/#/api'
 
 export interface ConfigState {
   systemConfig: AsideConfig | null
-  customConfig: any
+  customConfig: string[] | null
   asideValue: any
 }
 
@@ -22,7 +22,7 @@ export const useAsideConfigStore = defineStore({
     getConfig(): AsideConfig | null {
       return this.systemConfig
     },
-    getCustomConfig(): any {
+    getCustomConfig(): string[] | null {
       return this.customConfig
     },
     getAsideValue(): any {
@@ -33,9 +33,6 @@ export const useAsideConfigStore = defineStore({
     setConfig(config: AsideConfig) {
       this.systemConfig = config
     },
-    setCustomConfig(config: any) {
-      this.customConfig = config
-    },
     setAsideValue(value) {
       this.asideValue = value
     },
@@ -47,9 +44,11 @@ export const useAsideConfigStore = defineStore({
     },
     // 获取个性化配置
     async fetchCustomConfig() {
-      const response = await getFilter()
-      this.setCustomConfig(response.data)
-      return response.data
+      const res = await getFilter(0)
+      const { data } = res
+      const list = data && data.searchcount ? data.searchcount.split(',') : []
+      this.customConfig = list
+      return list
     },
   },
 })
diff --git a/src/store/modules/dictonary.ts b/src/store/modules/dictonary.ts
index 391ec58..ac5b6af 100644
--- a/src/store/modules/dictonary.ts
+++ b/src/store/modules/dictonary.ts
@@ -1,6 +1,6 @@
 import { defineStore } from 'pinia'
 import { store } from '@/store'
-import { getBackList, getIzCustomtypeList, getIzProjectList, getIzShowList, getIzcustomlevel, getIzfirmList, getIzproductnameList, getIzprojecttypeList, getIztaskrromList, getIztaskstatusList, getIzvisitcityList, getIzvisitproList, getPersonList, getPictureTypeList, getPlanList, getRegionList, getRejectList, getTFList, getizcustomnameList } from '@/api/dictionary'
+import { getBackList, getBusinessList, getIzShowList, getIztaskstatusList, getPictureTypeList, getRegionList, getRejectList, getRelationTypeList, getTFList, getizstatusList } from '@/api/dictionary'
 
 export interface DictionaryState {
   regionList: any
@@ -22,6 +22,8 @@ export interface DictionaryState {
   izvisitcityList: any
   rejectList: any
   backList: any
+  relationTypeList: any
+  izstatusList: any
 }
 
 export const useDictionaryStore = defineStore({
@@ -46,6 +48,8 @@ export const useDictionaryStore = defineStore({
     izvisitcityList: null,
     rejectList: null,
     backList: null,
+    relationTypeList: null,
+    izstatusList: null,
   }),
   getters: {
     getRegionList: (state) => {
@@ -112,14 +116,14 @@ export const useDictionaryStore = defineStore({
     },
     // 获取提报人列表
     async fetchPersionList() {
-      const list = await getPersonList()
-      this.personList = generateOptions(list, 'id', 'upname')
+      const list = await getBusinessList('person')
+      this.personList = list
       return this.personList
     },
     // 获取计划列表
     async fetchPlanList() {
-      const list = await getPlanList()
-      this.planList = generateOptions(list, 'id', 'planname')
+      const list = await getBusinessList('plan')
+      this.planList = list
       return this.planList
     },
     // 获取图片真假原因
@@ -134,71 +138,96 @@ export const useDictionaryStore = defineStore({
       this.izShowList = generateOptions2(list, 'id', 'classname')
       return this.izShowList
     },
+    // 所属项目
     async fetchIzProjectList() {
-      const list = await getIzProjectList()
-      this.izProjectList = generateOptions(list, 'id', 'categoryname')
+      const list = await getBusinessList('project')
+      this.izProjectList = list
       return this.izProjectList
     },
+    // 任务来源
     async fetchIztaskrromList() {
-      const list = await getIztaskrromList('1')
-      this.izCustomtypeList = generateOptions(list)
-      return this.izCustomtypeList
+      const list = await getBusinessList('iztaskrrom')
+      this.iztaskrromList = list
+      return this.iztaskrromList
     },
+    // 任务状态
     async fetchIztaskstatusList() {
-      const list = await getIztaskstatusList('1')
-      this.iztaskstatusList = generateOptions(list)
+      const list = await getBusinessList('iztaskstatus')
+      this.iztaskstatusList = list
       return this.iztaskstatusList
     },
+    // 地区(省信息)
     async fetchIzvisitproList() {
-      const list = await getIzvisitproList()
-      this.izvisitproList = generateOptions(list, 'id', 'proname')
+      const list = await getBusinessList('izvisitpro')
+      this.izvisitproList = list
       return this.izvisitproList
     },
+    // 厂商
     async fetchIzfirmList() {
-      const list = await getIzfirmList('1')
-      this.izfirmList = generateOptions(list)
+      const list = await getBusinessList('izfirm')
+      this.izfirmList = list
       return this.izfirmList
     },
+    // 产品名称
     async fetchIzproductnameList() {
-      const list = await getIzproductnameList('1')
-      this.izproductnameList = generateOptions(list)
+      const list = await getBusinessList('izproductname')
+      this.izproductnameList = list
       return this.izproductnameList
     },
+    // 客户名称
     async fetchizcustomnameList() {
-      const list = await getizcustomnameList('1')
-      this.izcustomnameList = generateOptions(list)
+      const list = await getBusinessList('izcustomname')
+      this.izcustomnameList = list
       return this.izcustomnameList
     },
+    // 客户类型
     async fetchIzCustomtypeList() {
-      const list = await getIzCustomtypeList()
-      this.izCustomtypeList = generateOptions(list)
+      const list = await getBusinessList('izcustomtype')
+      this.izCustomtypeList = list
       return this.izCustomtypeList
     },
+    // 客户级别
     async fetchIzcustomlevelList() {
-      const list = await getIzcustomlevel('1')
-      this.izcustomlevelList = generateOptions(list)
+      const list = await getBusinessList('izcustomlevel')
+      this.izcustomlevelList = list
       return this.izcustomlevelList
     },
+    // 项目类别
     async fetchizizprojecttypeList() {
-      const list = await getIzprojecttypeList('1')
-      this.izizprojecttypeList = generateOptions(list)
+      const list = await getBusinessList('izprojecttype')
+      this.izizprojecttypeList = list
       return this.izizprojecttypeList
     },
+    // 发布地区
     async fetchizvisitcityList() {
-      const list = await getIzvisitcityList()
-      this.izvisitcityList = generateOptions(list)
+      const list = await getBusinessList('izvisitcity')
+      this.izvisitcityList = list
       return this.izvisitcityList
     },
+    // 拒绝原因
     async fetchRejectList() {
       const list = await getRejectList()
       this.rejectList = generateOptions(list)
       return this.rejectList
     },
+    // 退回方式
     async fetchBackList() {
       const list = await getBackList()
       this.backList = generateOptions(list)
       return this.backList
     },
+    // 退回方式
+    async fetchRelationTypeList() {
+      const list = await getRelationTypeList()
+      this.relationTypeList = generateOptions2(list, 'content', 'name')
+      return this.relationTypeList
+    },
+    // 审核状态
+    async fetchizstatusListt() {
+      const list = await getizstatusList()
+      this.izstatusList = generateOptions2(list, 'codeno', 'name')
+      return this.backList
+    },
   },
 })
 
@@ -208,25 +237,25 @@ export function useDictionary() {
 }
 
 // label和value都是name,不用id
-function generateOptions(list: any[], idkey: string = 'id', namekey: string = 'name') {
+function generateOptions(list: any[], valueKey: string = 'id', labelKey: string = 'name') {
   const items = list || []
 
   return items.map((item) => {
     return {
-      label: item[namekey] || 'todo',
-      value: item[namekey] || 'todo',
+      label: item[labelKey] || 'todo',
+      value: item[labelKey] || 'todo',
     }
   })
 }
 
 // label是name,value是id
-function generateOptions2(list: any[], idkey: string = 'id', namekey: string = 'name') {
+function generateOptions2(list: any[], valueKey: string = 'id', labelKey: string = 'name') {
   const items = list || []
 
   return items.map((item) => {
     return {
-      label: item[namekey] || 'todo',
-      value: item[idkey] || 'todo',
+      label: item[labelKey] || 'todo',
+      value: item[valueKey] || 'todo',
     }
   })
 }
diff --git a/src/store/modules/final.ts b/src/store/modules/final.ts
new file mode 100644
index 0000000..909ff65
--- /dev/null
+++ b/src/store/modules/final.ts
@@ -0,0 +1,42 @@
+import { defineStore } from 'pinia'
+import { store } from '@/store'
+import { getFilter } from '@/api/home/filter'
+
+export interface ConfigState {
+  customConfig: string[] | null
+  asideValue: any
+}
+
+export const useFinalStore = defineStore({
+  id: 'app-final',
+  state: (): ConfigState => ({
+    customConfig: null,
+    asideValue: null,
+  }),
+  getters: {
+    getCustomConfig(): string[] | null {
+      return this.customConfig
+    },
+    getAsideValue(): any {
+      return this.asideValue
+    },
+  },
+  actions: {
+    setAsideValue(value) {
+      this.asideValue = value
+    },
+    // 获取终审个性化配置
+    async fetchCustomConfig() {
+      const res = await getFilter(1)
+      const { data } = res
+      const list = data && data.searchcount ? data.searchcount.split(',') : []
+      this.customConfig = list
+      return list
+    },
+  },
+})
+
+// Need to be used outside the setup
+export function useFinal() {
+  return useFinalStore(store)
+}
diff --git a/src/store/modules/task.ts b/src/store/modules/task.ts
index 26253d8..869f655 100644
--- a/src/store/modules/task.ts
+++ b/src/store/modules/task.ts
@@ -45,15 +45,15 @@ export const useTaskStore = defineStore({
     },
     async fetchApprovalList(pagination, id, refresh?: boolean) {
       const res = await getApprovalList(pagination, id)
-      this.setApprovalList(res.data)
 
       if (res.data.length > 0) {
+        this.setApprovalList(res.data)
         this.setActive(0)
         // 审批操作完成后，需要刷新，为防止activeId在刷新后值不变，通过此值刷新
         this.refresh = !this.refresh
       }
 
-      return res.data
+      return res
     },
     updateImmersion() {
       this.immersion = !this.immersion
diff --git a/src/views/final/aside/Aside.vue b/src/views/final/aside/Aside.vue
index d4efaf5..70ae259 100644
--- a/src/views/final/aside/Aside.vue
+++ b/src/views/final/aside/Aside.vue
@@ -1,21 +1,21 @@
 <script lang="ts" setup>
 import { computed, nextTick, onBeforeMount, onMounted, reactive, ref, shallowRef, unref, watch } from 'vue'
-import { CustomFilterModalVue, FilterModalVue, NewFilterModalVue } from '@/views/home/aside/comp/modals'
+import { CustomFilterModalVue } from '@/views/final/comp'
 import Search from '@/views/home/aside/comp/Search.vue'
 import AdvanceFilter from '@/views/home/aside/comp/AdvanceFilter.vue'
 import { getViewportOffset } from '@/utils/domUtils'
 import { useWindowSizeFn } from '@/hooks/event/useWindowSizeFn'
-import { useConfig } from '@/store/modules/asideConfig'
+import { useFinal } from '@/store/modules/final'
 import type { Filter } from '/#/home'
 import type { AsideEntity } from '@/config/aside'
-import { asideMap } from '@/config/aside'
+import { asideMap } from '@/config/final'
 import type { AsideConfig } from '/#/api'
 
-const configStore = useConfig()
+const finalStore = useFinal()
 
 // 所有左侧模块的值
 const asideValue: Record<keyof typeof asideMap, any> = reactive({})
-// 左侧某个模块是否显示: 显示需同时满足系统配置和个人配置
+// 左侧某个模块是否显示: 个人配置
 const asideVisible: Partial<Record<keyof AsideConfig, boolean>> = reactive({})
 // 当前显示的模块，按照数组顺序显示
 const showItems = shallowRef<{ key: string, config: AsideEntity }[]>([])
@@ -73,32 +73,37 @@ function computeSlideHeight() {
 useWindowSizeFn(computeSlideHeight, 280)
 
 onBeforeMount(async () => {
-  configStore.fetchConfig()
-  configStore.fetchCustomConfig()
+  finalStore.fetchCustomConfig()
 })
 
-configStore.$subscribe(() => {
-  const config = configStore.getConfig
-  const customConfig = configStore.getCustomConfig
+finalStore.$subscribe(() => {
+  const customConfig = finalStore.getCustomConfig
 
-  if (config === null || customConfig === null)
+  if (customConfig === null)
     return
 
-  const showKeys = customConfig.searchcount.split(',')
+  const showKeys: string[] = [...customConfig]
+  const defaultKeys = Object.keys(asideMap).filter(key => asideMap[key].isDefaultFilter)
+  showKeys.unshift(...defaultKeys)
 
-  Object.keys(config).forEach((key) => {
+  Object.keys(asideMap).forEach((key) => {
+    // 设置显示的或者默认显示的
     if (key.startsWith('iz'))
-      asideVisible[key] = showKeys.includes(key) && config[key] === 'Y'
+      asideVisible[key] = asideMap[key] && (showKeys.includes(key) || asideMap[key].isDefaultFilter)
   })
 
-  const items = showKeys.map((key: string) => {
-    const str = key.toLowerCase()
-
-    return {
-      key: str,
-      config: asideMap[str],
+  const items = showKeys.reduce((acc, key) => {
+    if (asideMap[key]) {
+      const config = {
+        key,
+        config: asideMap[key],
+      }
+      return [...acc, config]
     }
-  })
+    else {
+      return acc
+    }
+  }, [])
 
   showItems.value = items
 })
@@ -137,12 +142,7 @@ function filterHandler(filterList: Filter[]) {
     filerMap[key] = value
   }
 
-  Object.keys(asideValue).forEach((key) => {
-    if (Object.prototype.hasOwnProperty.call(filerMap, key))
-      asideValue[key] = filerMap[key]
-    else
-      asideValue[key] = asideMap[key].defaultValue
-  })
+  // TODO: 这里不需要赋值，直接以过滤条件为参数调用终审列表接口
 }
 
 function editFilter(filter: any) {
@@ -152,7 +152,7 @@ function editFilter(filter: any) {
 }
 
 watch(asideValue, (newVal) => {
-  configStore.setAsideValue(newVal)
+  finalStore.setAsideValue(newVal)
 })
 </script>
 
@@ -179,10 +179,6 @@ watch(asideValue, (newVal) => {
         v-model:value="asideValue[item.key]" :label="item.config.label"
       />
 
-      <!-- 过滤列表 -->
-      <FilterModalVue ref="filterModalRef" @edit-filter="editFilter" @show-new-filter="showModal(newFilterModalRef)" />
-      <!-- 新增过滤 -->
-      <NewFilterModalVue ref="newFilterModalRef" />
       <!-- 筛选 -->
       <CustomFilterModalVue ref="customModalRef" />
     </n-scrollbar>
@@ -217,7 +213,7 @@ watch(asideValue, (newVal) => {
     height: 100%;
     background: #507afd;
     position: absolute;
-    right: 0;
+    right: -2px;
     top: 0;
     z-index: 18;
   }
diff --git a/src/views/final/comp/CustomFilterModalVue.vue b/src/views/final/comp/CustomFilterModalVue.vue
new file mode 100644
index 0000000..1d8a67c
--- /dev/null
+++ b/src/views/final/comp/CustomFilterModalVue.vue
@@ -0,0 +1,417 @@
+<script lang="ts" setup>
+import { computed, ref, watch } from 'vue'
+import { VueDraggable } from 'vue-draggable-plus'
+import { debounce, difference } from 'lodash-es'
+import { setFilter } from '@/api/home/filter'
+import { asideMap } from '@/config/final'
+import { useFinal } from '@/store/modules/final'
+
+const show = ref(false)
+const checkAll = ref(false)
+const selectIds = ref<string[]>([])
+const finalStore = useFinal()
+
+function showModal() {
+  show.value = true
+}
+
+function closeModal() {
+  show.value = false
+}
+
+// 左侧隐藏列表
+const offList = ref<any[]>([])
+// 右侧显示列表
+const onList = ref<any[]>([])
+
+const allCount = computed(() => {
+  return `全部筛选(共${offList.value.length - 1}个)`
+})
+
+const selectCount = computed(() => {
+  return `全部筛选(共${onList.value.length}个)`
+})
+
+defineExpose({
+  showModal,
+})
+
+function generateDefaultList() {
+  return Object.keys(asideMap).reduce((acc, key) => {
+    const { label, isDefaultFilter } = asideMap[key]
+
+    // 默认开启配置
+    if (isDefaultFilter) {
+      const config = {
+        id: key,
+        name: label || '未配置',
+        fix: isDefaultFilter,
+        checked: true,
+      }
+      return [...acc, config]
+    }
+    else {
+      return acc
+    }
+  }, [])
+}
+
+function generatList(customConfig) {
+  const keys = Object.keys(asideMap)
+  let onList: object[] = []
+  const offList: object[] = []
+  const showKeys = customConfig.map((key: string) => key.toLowerCase())
+
+  for (const key of keys) {
+    if (!key.startsWith('iz') || asideMap[key] === undefined)
+      continue
+
+    const name = asideMap[key]?.label
+    const isDefaultFilter = asideMap[key]?.isDefaultFilter
+
+    // 不是默认配置
+    const isChecked = asideMap[key].isDefaultFilter || showKeys.includes(key)
+
+    offList.push({
+      id: key,
+      name: name || '未配置',
+      fix: isDefaultFilter,
+      checked: isChecked,
+    })
+
+    isChecked && selectIds.value.push(key)
+  }
+
+  onList = showKeys.reduce((acc, key) => {
+    const isDefaultFilter = asideMap[key]?.isDefaultFilter
+
+    // 把默认显示的过滤掉(理论上不会出现这种情况)
+    if (isDefaultFilter === false) {
+      const config = {
+        id: key,
+        name: asideMap[key].label || '未配置',
+        fix: asideMap[key].isDefaultFilter,
+      }
+      return [...acc, config]
+    }
+    else {
+      return acc
+    }
+  }, [])
+
+  const fixedList = generateDefaultList()
+  onList.unshift(...fixedList)
+  return { showList: onList, hideList: offList }
+}
+
+finalStore.$subscribe(() => {
+  const customConfig = finalStore.getCustomConfig
+
+  if (customConfig === null)
+    return
+
+  const { showList, hideList } = generatList(customConfig)
+  onList.value = showList
+  offList.value = hideList
+})
+
+async function handleSumbit(e: MouseEvent) {
+  e.preventDefault()
+
+  const param = onList.value.filter(item => !asideMap[item.id].isDefaultFilter).map((item) => {
+    return item.id
+  }).join(',')
+
+  await setFilter({ searchcount: param, type: 1 })
+  finalStore.fetchCustomConfig()
+  closeModal()
+}
+
+function onCheckAllChange(value) {
+  const ids: string[] = []
+
+  for (const item of offList.value) {
+    if (!item.fix) {
+      item.checked = value
+      ids.push(item.id)
+    }
+  }
+
+  selectIds.value = value ? ids : []
+}
+
+function onCheckChange(checked: any, item: any) {
+  const index = selectIds.value.indexOf(item.id)
+
+  item.checked = checked
+
+  if (index === -1 && checked)
+    selectIds.value.push(item.id)
+  else
+    selectIds.value.splice(index, 1)
+}
+
+const showIds = computed(() => {
+  return onList.value.map((item) => {
+    return item.id
+  })
+})
+
+watch(
+  () => selectIds.value.length,
+  (newVal, oldVal) => {
+    if (newVal === oldVal)
+      return
+
+    const action = newVal > oldVal ? 'add' : 'remove'
+    const diff = action === 'add' ? difference(selectIds.value, showIds.value) : difference(showIds.value, selectIds.value)
+
+    if (diff.length === 0)
+      return
+
+    if (action === 'add') {
+      for (const item of offList.value) {
+        if (!item.fix && diff.includes(item.id)) {
+          onList.value.push({
+            id: item.id,
+            name: item.name || '未配置',
+            fix: item.fix || false,
+          })
+        }
+      }
+    }
+    else {
+      const list = onList.value
+      for (let index = 0; index < list.length; index++) {
+        const item = list[index]
+        if (!item.fix && diff.includes(item.id)) {
+          list.splice(index, 1)
+          index--
+        }
+      }
+    }
+  },
+)
+
+watch(
+  () => showIds.value.length,
+  (newVal, oldVal) => {
+    if (newVal === oldVal)
+      return
+
+    const diff = difference(selectIds.value, showIds.value)
+
+    if (diff.length === 0)
+      return
+
+    for (const item of offList.value) {
+      if (!item.fix && diff.includes(item.id)) {
+        const index = selectIds.value.indexOf(item.id)
+        item.checked = false
+        selectIds.value.splice(index, 1)
+      }
+    }
+  },
+)
+
+function clearDragSource() {
+  onList.value = onList.value.filter((item) => {
+    return item.fix === true
+  })
+}
+
+function removeHandler(id: string) {
+  const index = onList.value.findIndex((item) => {
+    return item.id === id
+  })
+
+  if (index !== -1)
+    onList.value.splice(index, 1)
+}
+
+const offKeyword = ref('')
+const onKeyword = ref('')
+
+const leftInputHandler = debounce((keyword) => {
+  offKeyword.value = keyword
+}, 300)
+
+const rightInputHandler = debounce((keyword) => {
+  onKeyword.value = keyword
+}, 300)
+</script>
+
+<template>
+  <n-modal v-model:show="show" transform-origin="center" :mask-closable="false">
+    <n-card class="cardstyle" :bordered="false" size="huge" role="dialog" aria-modal="true">
+      <div class="wrapper">
+        <span class="wrapper-title">自定义筛选</span>
+        <div class="wrapper-bar">
+          <div class="wrapper-info">
+            <span :style="{ 'margin-left': '18px' }">筛选项信息</span>
+          </div>
+        </div>
+
+        <n-grid cols="24" class="mt-4 proCard" responsive="screen" :x-gap="24">
+          <n-grid-item span="11">
+            <NCard
+              :title="allCount" class="dragcardStyle" :segmented="{ content: true, footer: true }" size="small"
+              :bordered="false"
+            >
+              <div>
+                <n-input placeholder="搜索关键字" @input="leftInputHandler">
+                  <template #suffix>
+                    <SvgIcon size="14px" name="magnifying-1" />
+                  </template>
+                </n-input>
+                <n-scrollbar style="max-height: 500px;border: 1px solid #cad2dd;border-radius: 2px;">
+                  <div class="draggable-ul">
+                    <div class="draggable-li">
+                      <n-checkbox v-model:checked="checkAll" label="全部" @update:checked="onCheckAllChange" />
+                    </div>
+                    <div
+                      v-for="item in offList" v-show="item.name.includes(offKeyword)" :key="item.id"
+                      :class="{ 'disable-check': item.fix }" class="draggable-li"
+                    >
+                      <n-checkbox
+                        v-model:checked="item.checked" :label="item.name" :disabled="item.fix"
+                        @update:checked="onCheckChange($event, item)"
+                      />
+                    </div>
+                  </div>
+                </n-scrollbar>
+              </div>
+            </NCard>
+          </n-grid-item>
+          <n-grid-item style="display: flex;align-items: center;" span="2">
+            <SvgIcon size="20" name="switchsvg" />
+          </n-grid-item>
+          <n-grid-item span="11">
+            <NCard
+              :title="selectCount" class="dragcardStyle" :segmented="{ content: true, footer: true }" size="small"
+              :bordered="false"
+            >
+              <template #header-extra>
+                <span class="textbtnStyle" @click="clearDragSource">清空</span>
+              </template>
+              <div>
+                <n-input placeholder="搜索关键字" @input="rightInputHandler">
+                  <template #suffix>
+                    <SvgIcon size="14px" name="magnifying-1" />
+                  </template>
+                </n-input>
+                <n-scrollbar style="max-height: 500px;border: 1px solid #cad2dd;border-radius: 2px;" class="scroll">
+                  <VueDraggable v-model="onList" class="draggable-ul" filter=".draggable-li[draggable='false']" :animation="150" group="shared">
+                    <div
+                      v-for="item in onList" v-show="item.name.includes(onKeyword)" :key="item.id" :draggable="!item.fix"
+                      :class="{ fix: item.fix }" class="cursor-move draggable-li"
+                    >
+                      <SvgIcon v-show="!item.fix" name="drag" size="24" />
+                      <span class="ml-2">{{ item.name }}</span>
+                      <SvgIcon
+                        v-if="!item.fix" size="16px" style="display:block;margin-left: auto;cursor: pointer;"
+                        name="clear" @click="removeHandler(item.id)"
+                      />
+                    </div>
+                  </VueDraggable>
+                </n-scrollbar>
+              </div>
+            </NCard>
+          </n-grid-item>
+        </n-grid>
+      </div>
+      <template #footer>
+        <div class="wrapper-footer">
+          <n-button type="info" @click="handleSumbit">
+            确认
+          </n-button>
+          <n-button secondary style="margin-left:15px" @click="closeModal">
+            取消
+          </n-button>
+        </div>
+      </template>
+    </n-card>
+  </n-modal>
+</template>
+
+<style lang="less" scoped>
+.wrapper {
+  display: flex;
+  flex-direction: column;
+
+  &-title {
+    font-weight: bold;
+    font-size: 16px;
+  }
+
+  &-bar {
+    background-color: #e8e8e8;
+    width: 100%;
+    margin-top: 20px;
+  }
+
+  &-footer {
+    display: flex;
+    justify-content: flex-end;
+  }
+
+  &-info {
+    font-weight: bold;
+    position: relative;
+
+    &:before {
+      background-color: #1980FF;
+      content: "";
+      width: 5px;
+      border-radius: 2px;
+      top: 0;
+      bottom: 0;
+      position: absolute;
+    }
+  }
+}
+
+.dragcardStyle {
+  --n-padding-bottom: 0px !important;
+  --n-padding-left: 0px !important;
+}
+
+.cardstyle {
+  width: 620px;
+  height: 800px;
+  --n-padding-bottom: 20px;
+  --n-padding-left: 24px;
+}
+
+.textbtnStyle {
+  cursor: pointer;
+  color: #1980FF;
+}
+
+.draggable-ul {
+  width: 100%;
+  overflow: hidden;
+
+  .draggable-li {
+    width: 100%;
+    padding: 10px 16px;
+    color: #333;
+    border-bottom: 1px solid #efeff5;
+    display: flex;
+    align-items: center;
+  }
+
+  .disable-check {
+    color: gainsboro;
+  }
+}
+
+::v-deep(.n-card.n-card--content-segmented > .n-card__content:not(:first-child)) {
+  border: 0px;
+}
+
+::v-deep(.n-card > .n-card-header) {
+  --n-padding-top: 0px;
+  --n-padding-bottom: 12px
+}
+</style>
diff --git a/src/views/final/comp/index.ts b/src/views/final/comp/index.ts
index b4cd4cb..26f47eb 100644
--- a/src/views/final/comp/index.ts
+++ b/src/views/final/comp/index.ts
@@ -4,5 +4,6 @@ import RepeatModal from './RepeatModal.vue'
 import RepeatTaskTableModal from './RepeatTaskTableModal.vue'
 import Action from './Action.vue'
 import RejectModal from './RejectModal.vue'
+import CustomFilterModalVue from './CustomFilterModalVue.vue'
 
-export { CustomTabelModal, ImportExcelModal, RepeatModal, RepeatTaskTableModal, Action, RejectModal }
+export { CustomTabelModal, ImportExcelModal, RepeatModal, RepeatTaskTableModal, Action, RejectModal, CustomFilterModalVue }
diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index 61e66a2..4cf33b9 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -454,7 +454,7 @@ function reload() {
 <style lang="less" scoped>
 .wrapper {
   display: flex;
-  flex: auto;
+  flex: 1;
   overflow: hidden;
   flex-direction: column;
   box-sizing: border-box;
diff --git a/src/views/home/aside/Aside.vue b/src/views/home/aside/Aside.vue
index 9eac2a6..642039a 100644
--- a/src/views/home/aside/Aside.vue
+++ b/src/views/home/aside/Aside.vue
@@ -85,11 +85,13 @@ configStore.$subscribe(() => {
   if (config === null || customConfig === null)
     return
 
-  const showKeys = customConfig.searchcount.split(',')
+  const showKeys = [...customConfig].filter(key => !asideMap[key].isDefaultFilter)
+  const defaultKeys = Object.keys(asideMap).filter(key => asideMap[key].isDefaultFilter)
+  showKeys.unshift(...defaultKeys)
 
   Object.keys(config).forEach((key) => {
-    if (key.startsWith('iz'))
-      asideVisible[key] = showKeys.includes(key) && config[key] === 'Y'
+    if (key.startsWith('iz') && asideMap[key] !== undefined)
+      asideVisible[key] = (showKeys.includes(key) || asideMap[key].isDefaultFilter) && config[key] === 'Y'
   })
 
   const items = showKeys.reduce((acc, key) => {
diff --git a/src/views/home/aside/comp/AdvanceFilter.vue b/src/views/home/aside/comp/AdvanceFilter.vue
index 3adf9cd..9f10cb5 100644
--- a/src/views/home/aside/comp/AdvanceFilter.vue
+++ b/src/views/home/aside/comp/AdvanceFilter.vue
@@ -78,7 +78,7 @@ async function featchList() {
   loading = true
   try {
     const searchParam: FilterSearchParam = { search_searchname: { value: keyword.value, op: 'like', type: 'string' } }
-    const result = await getConditionList(pagination, searchParam)
+    const result = await getConditionList(pagination, searchParam, 0)
     const { data } = result
     // pagination.pageNo += 1
     // canloadMore = pageCount >= pagination.pageNo
diff --git a/src/views/home/aside/comp/Search.vue b/src/views/home/aside/comp/Search.vue
index 0503dee..ef20cdd 100644
--- a/src/views/home/aside/comp/Search.vue
+++ b/src/views/home/aside/comp/Search.vue
@@ -23,8 +23,7 @@ const inputHandler = debounce((keyword) => {
 
 configStore.$subscribe(() => {
   const customConfig = configStore.getCustomConfig
-  const searchcount = customConfig?.searchcount || ''
-  const keys = searchcount ? searchcount.split(',') : []
+  const keys = customConfig ? [...customConfig] : []
 
   if (keys.length === 0)
     return
diff --git a/src/views/home/aside/comp/modals/CustomFilterModal.vue b/src/views/home/aside/comp/modals/CustomFilterModal.vue
index e7d041e..09526e4 100644
--- a/src/views/home/aside/comp/modals/CustomFilterModal.vue
+++ b/src/views/home/aside/comp/modals/CustomFilterModal.vue
@@ -62,7 +62,7 @@ function generatList(config, customConfig) {
   const keys = Object.keys(config)
   let onList: object[] = []
   const offList: object[] = []
-  const showKeys = customConfig.searchcount.split(',').map((key: string) => key.toLowerCase())
+  const showKeys = [...customConfig]
 
   for (const key of keys) {
     if (!key.startsWith('iz') || config[key] === 'N' || asideMap[key] === undefined)
@@ -87,8 +87,10 @@ function generatList(config, customConfig) {
   }
 
   onList = showKeys.reduce((acc, key) => {
-    // 也需要系统配置开启（可能个人开启后，系统配置关闭）
-    if (config[key] === 'Y') {
+    const isDefaultFilter = asideMap[key]?.isDefaultFilter
+
+    // 也需要系统配置开启（可能个人开启后，系统配置关闭） && 把默认显示的过滤掉(理论上不会出现这种情况)
+    if (config[key] === 'Y' && isDefaultFilter === false) {
       const config = {
         id: key,
         name: asideMap[key].label || '未配置',
@@ -103,6 +105,7 @@ function generatList(config, customConfig) {
 
   const fixedList = generateDefaultList(config)
   offList.unshift(...fixedList)
+  onList.unshift(...fixedList)
   return { showList: onList, hideList: offList }
 }
 
@@ -121,11 +124,11 @@ configStore.$subscribe(() => {
 async function handleSumbit(e: MouseEvent) {
   e.preventDefault()
 
-  const param = onList.value.map((item) => {
+  const param = onList.value.filter(item => !asideMap[item.id].isDefaultFilter).map((item) => {
     return item.id
   }).join(',')
 
-  await setFilter({ searchcount: param })
+  await setFilter({ searchcount: param, type: 0 })
   configStore.fetchCustomConfig()
   closeModal()
 }
@@ -304,12 +307,12 @@ const rightInputHandler = debounce((keyword) => {
                   </template>
                 </n-input>
                 <n-scrollbar style="max-height: 500px;border: 1px solid #cad2dd;border-radius: 2px;" class="scroll">
-                  <VueDraggable v-model="onList" class="draggable-ul" :animation="150" group="shared">
+                  <VueDraggable v-model="onList" filter=".draggable-li[draggable='false']" class="draggable-ul" :animation="150" group="shared">
                     <div
-                      v-for="item in onList" v-show="item.name.includes(onKeyword)" :key="item.id" :class="{ fix: item.fix }"
+                      v-for="item in onList" v-show="item.name.includes(onKeyword)" :key="item.id" :draggable="!item.fix" :class="{ fix: item.fix }"
                       class="cursor-move draggable-li"
                     >
-                      <SvgIcon name="drag" size="24" />
+                      <SvgIcon v-show="!item.fix" name="drag" size="24" />
                       <span class="ml-2">{{ item.name }}</span>
                       <SvgIcon
                         v-if="!item.fix" size="16px" style="display:block;margin-left: auto;cursor: pointer;"
diff --git a/src/views/home/aside/comp/modals/FilterModal.vue b/src/views/home/aside/comp/modals/FilterModal.vue
index 7909d87..21c88e6 100644
--- a/src/views/home/aside/comp/modals/FilterModal.vue
+++ b/src/views/home/aside/comp/modals/FilterModal.vue
@@ -81,14 +81,14 @@ const loading = ref(true)
 const pagination = reactive({
   page: 1,
   pageCount: 1,
-  pageSize: 2,
+  pageSize: 10,
 })
 const tableData = ref<Array<RowData>>([])
 const keyword = ref('')
 
 async function query(page: number, pageSize: number) {
   const searchParam: FilterSearchParam = { search_searchname: { value: keyword.value, op: 'like', type: 'string' } }
-  const result = await getConditionList({ pageNo: page, pageSize }, searchParam)
+  const result = await getConditionList({ pageNo: page, pageSize }, searchParam, 0)
   const { data, pageCount } = result
   tableData.value = data
   pagination.page = page
@@ -99,7 +99,7 @@ async function query(page: number, pageSize: number) {
 function afterLeave() {
   pagination.page = 1
   pagination.pageCount = 1
-  pagination.pageSize = 5
+  pagination.pageSize = 10
 }
 
 const selectionIds = ref<DataTableRowKey[]>([])
@@ -239,7 +239,7 @@ defineExpose({
 
 const inputHandler = debounce((word) => {
   keyword.value = word
-  query(1, 10)
+  query(1, 5)
 }, 300)
 </script>
 
diff --git a/src/views/home/aside/comp/modals/NewFilterModal.vue b/src/views/home/aside/comp/modals/NewFilterModal.vue
index f0944e0..bfc78cc 100644
--- a/src/views/home/aside/comp/modals/NewFilterModal.vue
+++ b/src/views/home/aside/comp/modals/NewFilterModal.vue
@@ -1,11 +1,12 @@
 <script lang="ts" setup>
 import type { FormInst, FormItemRule, FormRules } from 'naive-ui'
-import { computed, defineOptions, reactive, ref, unref, watch } from 'vue'
+import { computed, defineOptions, onBeforeMount, reactive, ref, unref, watch } from 'vue'
 import { asideMap } from '@/config/aside'
 import { useDictionary } from '@/store/modules/dictonary'
 import { useConfig } from '@/store/modules/asideConfig'
 import type { FilterCondition } from '/#/api'
 import { addCondition, updateCondition } from '@/api/home/filter'
+import { formatToDate2 } from '@/utils/dateUtil'
 
 defineOptions({ name: 'NewFilterModal' })
 
@@ -95,24 +96,27 @@ const formValue = reactive<FormType>({
 
 function handleSumbit(e: MouseEvent) {
   e.preventDefault()
+  const v = formRef.value
   formRef.value?.validate((errors) => {
     if (errors)
       return
 
-    const list = formValue.conditions.map((item) => {
+    const list = formValue.conditions.map((item, index) => {
       const { type, operator, result } = item
 
       return {
         searchfield: type!,
         searchtype: operator!,
-        searchvalue: result!,
+        searchvalue: formatValue(type!, result),
+        searchRelationType: formValue.logic!,
+        orderNum: index + 1,
       }
     })
 
     const param: FilterCondition = {
       searchname: formValue.name!,
+      type: 0,
       ocrUsersearchchildList: list,
-      logic: formValue.logic!,
     }
 
     if (currentStatus.value === 'new')
@@ -123,6 +127,19 @@ function handleSumbit(e: MouseEvent) {
   })
 }
 
+function formatValue(searchfield: string, searchvalue: any) {
+  if (searchfield === 'izyear') {
+    const start = formatToDate2(searchvalue[0])
+    const end = formatToDate2(searchvalue[1])
+    return `${start}-${end}`
+  }
+
+  if (Array.isArray(searchvalue))
+    return searchvalue.join(',')
+
+  return searchvalue
+}
+
 function createCondition() {
   formValue.conditions.push({
     type: null,
@@ -152,16 +169,7 @@ const operatorOptions = [
   },
 ]
 
-const logicOptions = [
-  {
-    label: '与',
-    value: 'and',
-  },
-  {
-    label: '或',
-    value: 'or',
-  },
-]
+const logicOptions = ref([])
 
 const similarityOptions = [
   {
@@ -178,6 +186,14 @@ const similarityOptions = [
   },
 ]
 
+onBeforeMount(() => {
+  dicStore.fetchRelationTypeList()
+})
+
+watch(() => dicStore.relationTypeList, (newval) => {
+  logicOptions.value = newval
+})
+
 const resultOptions = ref<Option[]>([])
 
 function showModal() {
@@ -293,8 +309,7 @@ defineExpose({
                 />
               </n-space>
               <n-select
-                v-else v-model:value="item.result" style="margin-left: 8px;" placeholder="请选择"
-                :options="resultOptions"
+                v-else v-model:value="item.result" style="margin-left: 8px;" placeholder="请选择" :options="resultOptions"
               />
               <n-button :style="noBorderInput" icon-placement="right" @click="removeCondition(index)">
                 <template #icon>
diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue
index f100264..0da34f7 100644
--- a/src/views/home/content/Content.vue
+++ b/src/views/home/content/Content.vue
@@ -4,22 +4,17 @@ import imagesloaded from 'imagesloaded'
 import { debounce } from 'lodash-es'
 import Masonry from 'masonry-layout'
 import { useMessage } from 'naive-ui'
-import { computed, nextTick, onBeforeMount, onMounted, onUnmounted, onUpdated, reactive, ref, unref, watch } from 'vue'
+import { computed, nextTick, onMounted, onUnmounted, onUpdated, reactive, ref, unref, watch } from 'vue'
 import GeneratePackageModal from './modal/GeneratePackageModal.vue'
 import PackageSettingsModal from './modal/PackageSettingsModal.vue'
 import LoginSuccessModal from './modal/LoginSuccessModal.vue'
 import { getPictureList, oneClickCheck } from '@/api/home/main'
-import img1 from '@/assets/images/1.jpg'
-import img2 from '@/assets/images/2.jpg'
-import img3 from '@/assets/images/3.jpg'
-import img4 from '@/assets/images/4.jpg'
-import img5 from '@/assets/images/5.jpg'
+import avatar from '@/assets/images/avatar.jpg'
 import { timeOptions, viewOptions } from '@/config/home'
 import { useWindowSizeFn } from '@/hooks/event/useWindowSizeFn'
 import { useConfig } from '@/store/modules/asideConfig'
 import { getViewportOffset } from '@/utils/domUtils'
 import { hideDownload } from '@/utils/image'
-import { randomInt } from '@/utils/index'
 import emitter from '@/utils/mitt'
 import { getImgUrl } from '@/utils/urlUtils'
 
@@ -31,7 +26,7 @@ const el = ref<HTMLDivElement | null>(null)
 const viewMode = ref('masonry')
 const pagination = reactive({
   pageNo: 0,
-  pageSize: 30,
+  pageSize: 50,
 })
 const configStore = useConfig()
 const packageModalRef = ref(null)
@@ -72,15 +67,13 @@ const layout = debounce(() => {
 
   _imagesload = imagesloaded('.grid-item')
 
-  // _imagesload.on('always', (instance) => {
-  //   console.log('always')
-  // })
-
   _imagesload.on('done', (instance) => {
     (_masonry as any).layout()
+    if (!el.value)
+      return
     const scrollHeight = el.value!.scrollHeight
     const clientHeight = el.value!.clientHeight
-    const top = scrollHeight - clientHeight - 20
+    const top = scrollHeight - clientHeight - 100
     el.value!.scrollTo({ top, behavior: 'instant' })
     loading.value = false
   })
@@ -133,19 +126,6 @@ const viewLabel = computed(() => {
 
 const listData = ref<any[]>([])
 
-const urls = [
-  img1,
-  img2,
-  img3,
-  img4,
-  img5,
-]
-
-function randomUrl() {
-  const index = randomInt(0, urls.length)
-  return urls[index]
-}
-
 async function featchList() {
   loading.value = true
   try {
@@ -155,10 +135,9 @@ async function featchList() {
     }
 
     pagination.pageNo += 1
-    const result = await getPictureList({ ...pagination, ...contentParams })
-    // TODO：测试数据
-    // result.data = Array.from({ length: 30 })
-    // result.pageCount = 1
+
+    const filterParams = unref(configStore.getAsideValue)
+    const result = await getPictureList({ ...pagination, ...contentParams, ...filterParams })
     const { data, pageCount } = result
     canloadMore = pageCount >= pagination.pageNo && pageCount > 0
 
@@ -187,11 +166,6 @@ async function loadMore() {
   listData.value.push(...more)
 }
 
-// onBeforeMount(async () => {
-//   const list = await featchList()
-//   listData.value = list
-// })
-
 const gridHeight = computed(() => {
   return viewMode.value !== 'masonry' ? '145px' : ''
 })
@@ -251,10 +225,11 @@ watch(() => configStore.asideValue, (newVal, oldVal) => {
 }, { deep: true })
 
 async function refreshHandler() {
-  pagination.pageNo = 1
-  pagination.pageSize = 30
+  pagination.pageNo = 0
+  pagination.pageSize = 50
   listData.value.length = 0
   loading.value = true
+  canloadMore = true
 
   const contentParams = {
     search_month: timeRange.value,
@@ -277,35 +252,39 @@ async function refreshHandler() {
 
   listData.value = list
 }
+
+function getAvatar(url: string): string {
+  return url ? getImgUrl(url) : avatar
+}
 </script>
 
 <template>
   <div class="wrapper">
     <div class="wrapper-header">
-      <div class="wrapper-header-left">
+      <div class="left">
         <SvgIcon size="32" name="magnifying" />
-        <span class="wrapper-header-font">AI一键查重</span>
+        <span class="font">AI一键查重</span>
       </div>
       <SvgIcon style="cursor: pointer;" size="105" name="yijianchachong" @click="oneCheck" />
     </div>
     <div class="wrapper-content">
-      <div class="wrapper-content-form">
+      <div class="form">
         <n-popselect v-model:value="timeRange" :options="timeOptions" trigger="click">
-          <div class="wrapper-content-dropdown">
+          <div class="dropdown">
             <span>{{ timeLabel || '请选择' }}</span>
-            <SvgIcon class="wrapper-content-dropdown-gap" name="arrow-botton" size="14" />
+            <SvgIcon class="gap" name="arrow-botton" size="14" />
           </div>
         </n-popselect>
         <n-popselect v-model:value="viewMode" :options="viewOptions" trigger="click">
-          <div class="wrapper-content-dropdown">
+          <div class="dropdown">
             <span>{{ viewLabel || '请选择' }}</span>
-            <SvgIcon class="wrapper-content-dropdown-gap" name="arrow-botton" size="14" />
+            <SvgIcon class="gap" name="arrow-botton" size="14" />
           </div>
         </n-popselect>
       </div>
-      <div ref="el" class="scroll" :style="listStyle">
-        <!-- <n-scrollbar :on-scroll="scrollHandler"> -->
-        <n-spin :show="loading">
+      <n-spin :show="loading">
+        <div ref="el" class="scroll" :style="listStyle">
+          <!-- <n-scrollbar :on-scroll="scrollHandler"> -->
           <div ref="masonryRef" class="grid">
             <div v-for="(item, index) in listData" :key="index" :style="{ height: gridHeight }" class="grid-item">
               <!-- <div :style="{ 'background-color': randomColor(0.2) }" class="wrapper-content-item-img" /> -->
@@ -313,22 +292,25 @@ async function refreshHandler() {
                 class="wrapper-content-item-img" :class="{ 'wrapper-content-item-img-fit': viewMode !== 'masonry' }"
                 :src="item.imgUrl"
               > -->
-              <n-image class="wrapper-content-item-img" :img-props="{ onClick: hideDownload }" :class="{ 'wrapper-content-item-img-fit': viewMode !== 'masonry' }" :src="item.imgUrl" />
-              <div class="wrapper-content-item-info">
-                <div class="wrapper-content-item-info-left">
-                  <n-avatar :src="getImgUrl(item.uphead)" class="wrapper-content-item-info-avatar" round />
+              <n-image
+                class="img" :img-props="{ onClick: hideDownload }"
+                :class="{ 'img-fit': viewMode !== 'masonry' }" :src="item.imgUrl"
+              />
+              <div class="info">
+                <div class="left">
+                  <n-avatar :src="getAvatar(item.uphead)" class="avatar" round />
                   <span>{{ item.upname }}</span>
                 </div>
-                <div class="wrapper-content-item-info-right">
+                <div class="right">
                   <span :style="{ marginRight: '5px' }">分类</span>
                   <span>{{ item.ocrPictureclass?.classname }}</span>
                 </div>
               </div>
             </div>
           </div>
-        </n-spin>
-        <!-- </n-scrollbar> -->
-      </div>
+          <!-- </n-scrollbar> -->
+        </div>
+      </n-spin>
     </div>
     <PackageSettingsModal ref="packageModalRef" @commit="commitHandler" />
     <GeneratePackageModal ref="generateModalRef" />
@@ -357,12 +339,12 @@ async function refreshHandler() {
     border-radius: 3px;
     width: 100%;
 
-    &-left {
+    .left {
       display: flex;
       align-items: center;
     }
 
-    &-font {
+    .font {
       font-size: 18px;
       font-weight: bold;
       color: #333333;
@@ -379,55 +361,53 @@ async function refreshHandler() {
     border-radius: 3px;
     border: 1px solid rgb(239, 239, 245);
 
-    &-form {
+    .form {
       display: flex;
       align-items: center;
       font-size: 14px;
       padding-bottom: 16px;
     }
 
-    &-item {
-      &-img {
-        border-radius: 7px;
-        display: block;
-        height: calc(100% - 20px);
-      }
+    .img {
+      border-radius: 7px;
+      display: block;
+      height: calc(100% - 25px);
+    }
 
-      &-img-fit {
-        width: 100%;
-        object-fit: cover;
+    .img-fit {
+      width: 100%;
+      overflow: hidden;
+    }
+
+    .info {
+      display: flex;
+      justify-content: space-between;
+      margin-top: 4px;
+
+      .left {
+        display: flex;
+        align-items: center;
       }
 
-      &-info {
+      .right {
         display: flex;
-        justify-content: space-between;
-        margin-top: 4px;
-
-        &-left {
-          display: flex;
-          align-items: center;
-        }
-
-        &-right {
-          display: flex;
-          align-items: center;
-        }
-
-        &-avatar {
-          width: 15px;
-          height: 15px;
-          margin-right: 5px;
-        }
+        align-items: center;
+      }
+
+      .avatar {
+        width: 15px;
+        height: 15px;
+        margin-right: 5px;
       }
     }
 
-    &-dropdown {
+    .dropdown {
       display: flex;
       flex-direction: row;
       align-items: center;
       margin-right: 24px;
 
-      &-gap {
+      .gap {
         margin-left: 5px;
       }
     }
@@ -435,7 +415,8 @@ async function refreshHandler() {
     .grid-item {
       width: 182px;
       border-radius: 7px;
-      margin-bottom: 20px;
+      margin-bottom: 10px;
+      overflow: hidden;
     }
 
     .scroll {
diff --git a/src/views/login/components/Login.vue b/src/views/login/components/Login.vue
index d11e219..60f67de 100644
--- a/src/views/login/components/Login.vue
+++ b/src/views/login/components/Login.vue
@@ -7,9 +7,6 @@ import { useMessage } from 'naive-ui'
 import { PageEnum } from '@/enums/pageEnum'
 import { useUserStore } from '@/store/modules/user'
 import { ResultEnum } from '@/enums/httpEnum'
-import { getFilter, setFilter } from '@/api/home/filter'
-import { getConfig } from '@/api/system/user'
-import { asideMap } from '@/config/aside'
 import { getCode, smsLogin } from '@/api/login/login'
 
 const emit = defineEmits(['close', 'forget'])
@@ -79,20 +76,6 @@ function handleSubmit(e) {
         const { code, message: msg } = await userStore.login(params)
         if (code === ResultEnum.SUCCESS) {
           await userStore.getInformation()
-          const response = await getFilter()
-
-          // 添加个默认显示配置
-          if (response.data === null) {
-            const systemConfig = await getConfig()
-            const onList: string[] = []
-            Object.keys(systemConfig.data).forEach((key) => {
-            // 系统配置开启且个人配置开启
-              if (key.startsWith('iz') && systemConfig.data[key] === 'Y' && asideMap[key]?.isDefaultFilter)
-                onList.push(key)
-            })
-            await setFilter({ searchcount: onList.join(',') })
-          }
-
           message.destroyAll()
 
           const toPath = decodeURIComponent((route.query?.redirect || '/') as string)
@@ -134,19 +117,6 @@ function handleSmsSubmit(e) {
         if (code === ResultEnum.SUCCESS) {
         // const { code, message: msg } = await userStore.login(params)
           await userStore.getInformation()
-          const response = await getFilter()
-
-          // 添加个默认显示配置
-          if (response.data === null) {
-            const systemConfig = await getConfig()
-            const onList: string[] = []
-            Object.keys(systemConfig.data).forEach((key) => {
-            // 系统配置开启且个人配置开启
-              if (key.startsWith('iz') && systemConfig.data[key] === 'Y' && asideMap[key]?.isDefaultFilter)
-                onList.push(key)
-            })
-            await setFilter({ searchcount: onList.join(',') })
-          }
 
           message.destroyAll()
           const toPath = decodeURIComponent((route.query?.redirect || '/') as string)
diff --git a/src/views/login/index1.vue b/src/views/login/index1.vue
index 5d5ba56..316231e 100644
--- a/src/views/login/index1.vue
+++ b/src/views/login/index1.vue
@@ -6,9 +6,6 @@ import captcha from './captcha.vue'
 import { PageEnum } from '@/enums/pageEnum'
 import { useUserStore } from '@/store/modules/user'
 import { ResultEnum } from '@/enums/httpEnum'
-import { getFilter, setFilter } from '@/api/home/filter'
-import { getConfig } from '@/api/system/user'
-import { asideMap } from '@/config/aside'
 
 interface FormState {
   enterprisecode?: string
@@ -59,20 +56,6 @@ function handleSubmit(e) {
       try {
         const { code, message: msg } = await userStore.login(params)
         await userStore.getInformation()
-        const response = await getFilter()
-
-        // 添加个默认显示配置
-        if (response.data === null) {
-          const systemConfig = await getConfig()
-          const onList: string[] = []
-          Object.keys(systemConfig.data).forEach((key) => {
-            // 系统配置开启且个人配置开启
-            if (key.startsWith('iz') && systemConfig.data[key] === 'Y' && asideMap[key]?.isDefaultFilter)
-              onList.push(key)
-          })
-          await setFilter({ searchcount: onList.join(',') })
-        }
-
         message.destroyAll()
         if (code === ResultEnum.SUCCESS) {
           const toPath = decodeURIComponent((route.query?.redirect || '/') as string)
diff --git a/src/views/task/aside/Aside.vue b/src/views/task/aside/Aside.vue
index da5af29..4e0d068 100644
--- a/src/views/task/aside/Aside.vue
+++ b/src/views/task/aside/Aside.vue
@@ -1,19 +1,14 @@
 <script lang="ts" setup>
-import { useTaskStore } from '@/store/modules/task'
-import { useUser } from '@/store/modules/user'
-import emitter from '@/utils/mitt'
 import { computed, onBeforeMount, onMounted, onUnmounted, reactive, ref, unref, watch } from 'vue'
+import { debounce } from 'lodash-es'
 import TaskList from './TaskList.vue'
-import type { TaskListItem } from '/#/task'
+import { useTaskStore } from '@/store/modules/task'
+import { useUser } from '@/store/modules/user'
 
 const CustomFieldModalRef = ref(null)
 const collapse = ref(false)
 const taskStore = useTaskStore()
-const userStore = useUser()
-const pagination = reactive({
-  pageNo: 1,
-  pageSize: 10,
-})
+const taskListRef = ref<HTMLDivElement | null>(null)
 
 function collapseHandler() {
   collapse.value = !collapse.value
@@ -33,49 +28,30 @@ const collapseIcon = computed(() => {
   return collapse.value ? 'expand-cir' : 'collapse-cir'
 })
 
-const data = ref<TaskListItem[]>([])
-
-onBeforeMount(async () => {
-  const id = userStore.getUserInfo.id
-  const orderList = await taskStore.fetchApprovalList(pagination, id)
-  data.value = orderList
-})
-
-const count = computed(() => {
-  return data.value.length
-})
-
 const asideEnter = ref(false)
 
 const showCollapse = computed(() => {
   return collapse.value ? true : asideEnter.value
 })
 
-onMounted(() => {
-  emitter.on('refresh', refreshHandler)
-})
-
-onUnmounted(() => {
-  emitter.off('refresh', refreshHandler)
-})
-
-async function refreshHandler() {
-  pagination.pageNo = 1
-  pagination.pageSize = 10
-
-  const id = userStore.getUserInfo.id
-  const orderList = await taskStore.fetchApprovalList(pagination, id)
-  data.value = orderList
-}
-
 watch(() => taskStore.immersion, () => {
   collapse.value = true
 })
 
-function showFilterModal() {
+function showFilter() {
   const modal = unref(CustomFieldModalRef)! as any
   modal.showModal()
 }
+
+const showSearch = ref(false)
+
+function setShowSearch(value: boolean) {
+  showSearch.value = value
+}
+
+const inputHandler = debounce((word) => {
+  (taskListRef.value as any).search(word)
+}, 500)
 </script>
 
 <template>
@@ -86,16 +62,29 @@ function showFilterModal() {
       </div>
     </div>
     <div class="aside-header">
-      <div class="aside-header-left">
-        <svg-icon name="all-worksheet" size="32" />
-        <span class="aside-header-title">所有请求({{ count }})</span>
+      <div v-show="!showSearch" class="warpper">
+        <div class="left">
+          <svg-icon name="all-worksheet" size="32" />
+          <span style="margin-left: 8px;">所有请求</span>
+        </div>
+        <div class="right">
+          <SvgIcon
+            style="cursor: pointer;margin-left: 10px;" size="18" name="magnifying-1"
+            @click="setShowSearch(true)"
+          />
+          <SvgIcon style="cursor: pointer;margin-left: 10px;" size="18" name="filter" @click="showFilter" />
+        </div>
       </div>
-      <div class="aside-header-right">
-        <SvgIcon size="18" name="magnifying-1" />
-        <SvgIcon style="margin-left: 10px;cursor: pointer;" size="18" name="filter" @click="showFilterModal" />
+      <div v-show="showSearch" class="warpper">
+        <n-input style="flex: 1;height: 32px;" placeholder="请输入你需要搜索的内容" @input="inputHandler">
+          <template #suffix>
+            <SvgIcon size="14px" name="magnifying-1" />
+          </template>
+        </n-input>
+        <SvgIcon size="16px" style="margin-left: 6px;cursor: pointer;" name="clear" @click="setShowSearch(false)" />
       </div>
     </div>
-    <TaskList style="height: calc(100vh - 146px);" class="work-sheet-list" :data="data" :active-id="taskStore.getActiveId!" />
+    <TaskList ref="taskListRef" style="height: calc(100vh - 146px);" class="work-sheet-list" />
     <CustomFieldModal ref="CustomFieldModalRef" />
   </div>
 </template>
@@ -111,13 +100,16 @@ function showFilterModal() {
   box-sizing: border-box;
 
   &-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
     padding: 12px 16px;
     width: 100%;
     overflow: hidden;
 
+    .warpper {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+    }
+
     &-title {
       margin-left: 8px;
       color: #333333;
@@ -125,13 +117,13 @@ function showFilterModal() {
       font-weight: bold;
     }
 
-    &-left {
+    .left {
       display: flex;
       align-items: center;
       overflow: hidden;
     }
 
-    &-right {
+    .right {
       display: flex;
       align-items: center;
       overflow: hidden;
@@ -150,7 +142,7 @@ function showFilterModal() {
     height: 100%;
     background: #507afd;
     position: absolute;
-    right: 0;
+    right: -2px;
     top: 0;
   }
 
diff --git a/src/views/task/aside/TaskList.vue b/src/views/task/aside/TaskList.vue
index a98286a..ce0e7e4 100644
--- a/src/views/task/aside/TaskList.vue
+++ b/src/views/task/aside/TaskList.vue
@@ -1,33 +1,115 @@
 <script lang="ts" setup>
+import { onMounted, onUnmounted, reactive, ref, watch } from 'vue'
+import { useInfiniteScroll } from '@vueuse/core'
 import ListItem from './ListItem.vue'
 import { useTaskStore } from '@/store/modules/task'
+import { useUser } from '@/store/modules/user'
+import emitter from '@/utils/mitt'
 
 defineOptions({ name: 'WorkSheetList' })
 
-defineProps({
-  activeId: {
-    type: String,
-    required: true,
-  },
-  data: {
-    type: Object as PropType<any[]>,
-    required: true,
-  },
-})
-
 const taskStore = useTaskStore()
+const data = ref<any[]>([])
+const activeId = ref('')
+const el = ref<HTMLDivElement | null>(null)
+const keyword = ref('')
+const canloadMore = ref(true)
+const userStore = useUser()
+
+const pagination = reactive({
+  pageNo: 0,
+  pageSize: 10,
+})
 
 function selectHandler(id: string, index: number) {
   taskStore.setActive(index)
 }
+
+const { isLoading } = useInfiniteScroll(
+  el as any,
+  () => {
+    loadMore()
+  },
+  { distance: 10, interval: 300, canLoadMore: () => {
+    // console.log('canloadmore excuted!')
+    return canloadMore.value
+  } },
+)
+
+async function loadMore() {
+  if (isLoading.value || el.value == null)
+    return
+
+  const more = await fetchList()
+  data.value.push(...more)
+}
+
+async function fetchList() {
+  try {
+    pagination.pageNo += 1
+    const id = userStore.getUserInfo.id
+    const result = await taskStore.fetchApprovalList(pagination, id)
+    const { data, pageCount } = result
+    canloadMore.value = pageCount >= pagination.pageNo && pageCount !== 0
+    return data || []
+  }
+  catch (error) {
+    canloadMore.value = false
+    return []
+  }
+}
+
+watch(() => taskStore.activeId, (newVal) => {
+  activeId.value = newVal
+})
+
+function reset() {
+  pagination.pageNo = 0
+  pagination.pageSize = 10
+  canloadMore.value = true
+  data.value.length = 0
+}
+
+async function search(word: string) {
+  keyword.value = word
+  reset()
+  useInfiniteScroll(
+    el as any,
+    () => {
+      loadMore()
+    },
+    { distance: 10, canLoadMore: () => canloadMore.value },
+  )
+}
+
+onMounted(() => {
+  emitter.on('refresh', refreshHandler)
+})
+
+onUnmounted(() => {
+  emitter.off('refresh', refreshHandler)
+})
+
+async function refreshHandler() {
+  reset()
+  search('')
+}
+
+defineExpose({
+  search,
+})
 </script>
 
 <template>
-  <n-scrollbar class="wrapper">
-    <ListItem
-      v-for="(item, index) in data" :key="item.id" :selected="activeId === item.formid" :list-item="item"
-      @click="selectHandler(item.id, index)"
-    />
+  <n-scrollbar>
+    <n-spin :show="isLoading">
+      <div ref="el">
+        <ListItem
+          v-for="(item, index) in data" :key="item.id" :selected="activeId === item.formid" :list-item="item"
+          @click="selectHandler(item.id, index)"
+        />
+      </div>
+    </n-spin>
   </n-scrollbar>
 </template>
 
diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index bc550e5..8ece0bb 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -67,20 +67,20 @@ function validate(items: any[]) {
   if (items.length === 0)
     return '至少选中一个任务'
 
-  const useInfo = userStore.getUserInfo
-  const username = useInfo.loginname
+  // const useInfo = userStore.getUserInfo
+  // const username = useInfo.loginname
 
-  for (const item of items) {
-    const { iztrueorfalse, states, assignee } = item
-    if (iztrueorfalse === null)
-      return '未判别真假'
+  // for (const item of items) {
+  //   const { iztrueorfalse, states, assignee } = item
+  //   if (iztrueorfalse === null)
+  //     return '未判别真假'
 
-    else if (states !== 2)
-      return '审批状态不合法'
+  //   else if (states !== 2)
+  //     return '审批状态不合法'
 
-    else if (assignee !== username)
-      return '审批人不一致'
-  }
+  //   else if (assignee !== username)
+  //     return '审批人不一致'
+  // }
 
   return null
 }
diff --git a/src/views/worksheet/aside/Aside.vue b/src/views/worksheet/aside/Aside.vue
index fe59814..9fb9616 100644
--- a/src/views/worksheet/aside/Aside.vue
+++ b/src/views/worksheet/aside/Aside.vue
@@ -74,6 +74,9 @@ const showSearch = ref(false)
 
 function setShowSearch(value: boolean) {
   showSearch.value = value
+
+  if (value === false)
+    (packageListRef.value as any).search('')
 }
 
 const inputHandler = debounce((word) => {
diff --git a/src/views/worksheet/aside/WorkSheetList.vue b/src/views/worksheet/aside/WorkSheetList.vue
index 18efe52..0c859d2 100644
--- a/src/views/worksheet/aside/WorkSheetList.vue
+++ b/src/views/worksheet/aside/WorkSheetList.vue
@@ -36,7 +36,7 @@ async function loadMore() {
   if (isLoading.value || el.value == null)
     return
 
-  console.log('loadmore')
+  // console.log('loadmore')
   const more = await fetchList()
   data.value.push(...more)
 }
diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 974582b..0cd3d46 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -65,17 +65,17 @@ function validate(items: any[]) {
   if (items.length === 0)
     return '至少选中一个任务'
 
-  for (const item of items) {
-    const { iztrueorfalse, history, states } = item
-    if (iztrueorfalse !== null)
-      return '存在已经辨识过的任务'
+  // for (const item of items) {
+  //   const { iztrueorfalse, history, states } = item
+  //   if (iztrueorfalse !== null)
+  //     return '存在已经辨识过的任务'
 
-    else if (history)
-      return '包含历史数据'
+  //   else if (history)
+  //     return '包含历史数据'
 
-    else if (states !== 1 && states !== 2)
-      return '审批状态不合法'
-  }
+  //   else if (states !== 1 && states !== 2)
+  //     return '审批状态不合法'
+  // }
 
   return null
 }
diff --git a/types/api.d.ts b/types/api.d.ts
index 116d948..5fa6349 100644
--- a/types/api.d.ts
+++ b/types/api.d.ts
@@ -24,8 +24,8 @@ export interface ConditionEntry {
 
 export interface FilterCondition {
   searchname: string
+  type: number
   ocrUsersearchchildList: ConditionEntry[]
-  logic: string
 }
 
 export interface FilterUpdate extends FilterCondition {
@@ -33,6 +33,7 @@ export interface FilterUpdate extends FilterCondition {
 }
 
 export interface FilterParam {
+  type: number
   searchcount: string
 }
 
@@ -128,3 +129,9 @@ export interface ResetParam {
   fromid: string
   taskid: string
 }
+
+export interface BusinessParam {
+  pageNo: string
+  pageSize: string
+  field: string
+}