diff --git a/components.d.ts b/components.d.ts index 6458938..11049e1 100644 --- a/components.d.ts +++ b/components.d.ts @@ -11,7 +11,6 @@ declare module 'vue' { BasicModal: typeof import('./src/components/Modal/BasicModal.vue')['default'] DataHeader: typeof import('./src/components/DataHeader/index.vue')['default'] NAvatar: typeof import('naive-ui')['NAvatar'] - NBackTop: typeof import('naive-ui')['NBackTop'] NButton: typeof import('naive-ui')['NButton'] NCard: typeof import('naive-ui')['NCard'] NCheckbox: typeof import('naive-ui')['NCheckbox'] @@ -22,8 +21,6 @@ declare module 'vue' { NDialogProvider: typeof import('naive-ui')['NDialogProvider'] NDivider: typeof import('naive-ui')['NDivider'] NDropdown: typeof import('naive-ui')['NDropdown'] - NEllipsis: typeof import('naive-ui')['NEllipsis'] - NEmpty: typeof import('naive-ui')['NEmpty'] NForm: typeof import('naive-ui')['NForm'] NFormItem: typeof import('naive-ui')['NFormItem'] NGi: typeof import('naive-ui')['NGi'] @@ -35,7 +32,6 @@ declare module 'vue' { NModal: typeof import('naive-ui')['NModal'] NNotificationProvider: typeof import('naive-ui')['NNotificationProvider'] NotPassed: typeof import('./src/components/NotPassed.vue')['default'] - NPopconfirm: typeof import('naive-ui')['NPopconfirm'] NPopover: typeof import('naive-ui')['NPopover'] NPopselect: typeof import('naive-ui')['NPopselect'] NProgress: typeof import('naive-ui')['NProgress'] @@ -45,11 +41,7 @@ declare module 'vue' { NSpace: typeof import('naive-ui')['NSpace'] NSpin: typeof import('naive-ui')['NSpin'] NSwitch: typeof import('naive-ui')['NSwitch'] - NTabPane: typeof import('naive-ui')['NTabPane'] - NTabs: typeof import('naive-ui')['NTabs'] NTag: typeof import('naive-ui')['NTag'] - NTimeline: typeof import('naive-ui')['NTimeline'] - NTimelineItem: typeof import('naive-ui')['NTimelineItem'] NTooltip: typeof import('naive-ui')['NTooltip'] NUpload: typeof import('naive-ui')['NUpload'] NUploadDragger: typeof import('naive-ui')['NUploadDragger'] diff --git a/src/api/final/index.ts b/src/api/final/index.ts index d5eae04..c60dce5 100644 --- a/src/api/final/index.ts +++ b/src/api/final/index.ts @@ -14,7 +14,7 @@ export async function getFinalList(params: FinalParam) { Object.keys(notEmptyParams).forEach((key) => { const val = notEmptyParams[key] - if (key === 'izuptime') { + if (key === 'izyear') { const start = formatToDate2(val[0]) const end = formatToDate2(val[1]) notEmptyParams[key] = `${start}-${end}` diff --git a/src/config/1.json b/src/config/1.json index 911d159..3c8e5e6 100644 --- a/src/config/1.json +++ b/src/config/1.json @@ -27,11 +27,11 @@ export const asideMap: Recordable = { key: 'izstatus', component: PlanVue, // todo }, - izuptime: { + izyear: { label: '提报时间', defaultValue: null, isDefaultFilter: false, - key: 'izuptime', + key: 'izyear', component: TimeVue, }, iztaskrrom: { diff --git a/src/config/final.ts b/src/config/final.ts index a258f4b..b3b466d 100644 --- a/src/config/final.ts +++ b/src/config/final.ts @@ -1,5 +1,6 @@ import type { AsideEntity } from './aside' import { IzApprovalStatus, IzCustomlevel, IzCustomname, IzCustomtype, IzProductVue, IzProjectVue, IzProjecttype, IzShowAll, IzStatus, IzVisitcity, IzfirmVue, IztaskrromVue, IzvisitproVue, PictureDownloadVue, PlanVue, ReportUserVue, TimeVue } from '@/views/home/aside/comp/items' +import { defineAsyncComponent } from "vue" export interface RowData { id: string @@ -83,49 +84,56 @@ export const asideMap: Recordable = { defaultValue: null, isDefaultFilter: true, key: 'izupuser', - component: ReportUserVue, + // component: ReportUserVue, + component: defineAsyncComponent(() => import("@/views/home/aside/comp/items/ReportUser.vue")), }, izproject: { label: '所属项目', defaultValue: null, isDefaultFilter: true, key: 'izproject', - component: IzProjectVue, + // component: IzProjectVue, + component: defineAsyncComponent(() => import("@/views/home/aside/comp/items/IzProject.vue")), }, izplan: { label: '所属计划', defaultValue: null, isDefaultFilter: true, key: 'izplan', - component: PlanVue, + // component: PlanVue, + component: defineAsyncComponent(() => import("@/views/home/aside/comp/items/Plan.vue")), }, izstatus: { label: '审批状态', defaultValue: null, isDefaultFilter: false, key: 'izstatus', - component: IzStatus, // todo + // component: IzStatus, // todo + component: defineAsyncComponent(() => import("@/views/home/aside/comp/items/IzStatus.vue")), }, - izuptime: { + izyear: { label: '提报时间', defaultValue: null, isDefaultFilter: false, - key: 'izuptime', - component: TimeVue, + key: 'izyear', + // component: TimeVue, + component: defineAsyncComponent(() => import("@/views/home/aside/comp/items/Time.vue")), }, iztaskrrom: { label: '任务来源', defaultValue: null, isDefaultFilter: false, key: 'iztaskrrom', - component: IztaskrromVue, + // component: IztaskrromVue, + component: defineAsyncComponent(() => import("@/views/home/aside/comp/items/Iztaskrrom.vue")), }, izshowall: { label: '显示全部任务数据', defaultValue: false, isDefaultFilter: false, key: 'izshowall', - component: IzShowAll, + // component: IzShowAll, + component: defineAsyncComponent(() => import("@/views/home/aside/comp/items/IzShowAll.vue")), inFilterList: false, }, } @@ -137,90 +145,103 @@ export const asideTaskMap: Recordable = { defaultValue: null, isDefaultFilter: true, key: 'izApprovalStatus', - component: IzApprovalStatus, // todo + // component: IzApprovalStatus, // todo + component: defineAsyncComponent(() => import("@/views/home/aside/comp/items/IzApprovalStatus.vue")), }, izuptime: { label: '提报时间', defaultValue: null, isDefaultFilter: true, key: 'izuptime', - component: TimeVue, + // component: TimeVue, + component: defineAsyncComponent(() => import("@/views/home/aside/comp/items/Time.vue")), }, izupuser: { label: '提报人', defaultValue: null, isDefaultFilter: true, key: 'izupuser', - component: ReportUserVue, + // component: ReportUserVue, + component: defineAsyncComponent(() => import("@/views/home/aside/comp/items/ReportUser.vue")), }, iztaskrrom: { label: '任务来源', defaultValue: null, isDefaultFilter: true, key: 'iztaskrrom', - component: IztaskrromVue, + // component: IztaskrromVue, + component: defineAsyncComponent(() => import("@/views/home/aside/comp/items/Iztaskrrom.vue")), }, izcustomname: { label: '拜访客户', defaultValue: null, isDefaultFilter: true, key: 'izcustomname', - component: IzCustomname, + // component: IzCustomname, + component: defineAsyncComponent(() => import("@/views/home/aside/comp/items/IzCustomname.vue")), }, izcustomtype: { label: '客户类型', defaultValue: null, isDefaultFilter: true, key: 'izcustomtype', - component: IzCustomtype, + // component: IzCustomtype, + component: defineAsyncComponent(() => import("@/views/home/aside/comp/items/IzCustomtype.vue")), }, izproject: { label: '所属项目', defaultValue: null, isDefaultFilter: true, key: 'izproject', - component: IzProjectVue, + // component: IzProjectVue, + component: defineAsyncComponent(() => import("@/views/home/aside/comp/items/IzProject.vue")), }, izvisitpro: { label: '拜访省份/直辖市', defaultValue: null, isDefaultFilter: true, key: 'izvisitpro', - component: IzVisitcity, + // component: IzVisitcity, + component: defineAsyncComponent(() => import("@/views/home/aside/comp/items/IzVisitcity.vue")), }, izcustomlevel: { label: '客户级别', defaultValue: null, isDefaultFilter: true, key: 'izcustomlevel', - component: IzCustomlevel, + // component: IzCustomlevel, + component: defineAsyncComponent(() => import("@/views/home/aside/comp/items/IzCustomlevel.vue")), }, izprojecttype: { label: '项目类别', defaultValue: null, isDefaultFilter: true, key: 'izprojecttype', - component: IzProjecttype, + // component: IzProjecttype, + component: defineAsyncComponent(() => import("@/views/home/aside/comp/items/IzProjecttype.vue")), }, izproductname: { label: '产品名称', defaultValue: null, isDefaultFilter: true, key: 'izproductname', - component: IzProductVue, + // component: IzProductVue, + component: defineAsyncComponent(() => import("@/views/home/aside/comp/items/IzProduct.vue")), }, izvisitcity: { label: '拜访城市', defaultValue: null, isDefaultFilter: true, key: 'izvisitcity', - component: IzvisitproVue, + // component: IzvisitproVue, + component: defineAsyncComponent(() => import("@/views/home/aside/comp/items/Izvisitpro.vue")), }, izfirm: { label: '厂商', defaultValue: null, isDefaultFilter: true, key: 'izfirm', - component: IzfirmVue, + // component: IzfirmVue, + component: defineAsyncComponent(() => import("@/views/home/aside/comp/items/Izfirm.vue")), }, } diff --git a/src/layout/components/Header/RecycleModal.vue b/src/layout/components/Header/RecycleModal.vue index 0a061f0..c9f9b7c 100644 --- a/src/layout/components/Header/RecycleModal.vue +++ b/src/layout/components/Header/RecycleModal.vue @@ -111,6 +111,12 @@ const layout = debounce(() => { const clientHeight = el.value!.clientHeight const top = scrollHeight - clientHeight - 20 el.value!.scrollTo({ top, behavior: 'instant' }) + // let height = 800 - 15; + // const screenWidth = window.screen.width; + // if(screenWidth <= 1920) { + // height = 600 - 15; + // } + // el.value!.scrollTo({ top: height, behavior: 'instant' }) loading = false console.log("loading---------------", loading); }) diff --git a/src/views/final/comp/NewFilterModal.vue b/src/views/final/comp/NewFilterModal.vue index a5ee562..5687a90 100644 --- a/src/views/final/comp/NewFilterModal.vue +++ b/src/views/final/comp/NewFilterModal.vue @@ -126,7 +126,7 @@ function handleSumbit(e: MouseEvent) { } function formatValue(searchfield: string, searchvalue: any) { - if (searchfield === "izuptime") { + if (searchfield === "izyear") { const start = formatToDate2(searchvalue[0]); const end = formatToDate2(searchvalue[1]); return `${start}-${end}`; @@ -138,7 +138,7 @@ function formatValue(searchfield: string, searchvalue: any) { // 编辑前前转换为服务端格式 function unformatValue(searchfield: string, searchvalue: any) { // 2022/01/03-2023/02/04 - if (searchfield === "izuptime") { + if (searchfield === "izyear") { const dataStrs = searchvalue.split("-"); const start = formatToDate3(dataStrs[0]); const end = formatToDate3(dataStrs[1]); @@ -329,7 +329,7 @@ defineExpose({ placeholder="请选择" :options="operatorOptions" /> - + { configStore.setSearchValue(searchKeyword.value); + finalStore.setSearchValue(searchKeyword.value); emit('inputChange', searchKeyword.value); } const close = () => { searchKeyword.value = ""; configStore.setSearchValue(searchKeyword.value); + finalStore.setSearchValue(searchKeyword.value); emit('close'); }