diff --git a/src/api/home/main.ts b/src/api/home/main.ts index 5ef20a6..60e6f24 100644 --- a/src/api/home/main.ts +++ b/src/api/home/main.ts @@ -117,9 +117,10 @@ export async function getPictureList(params: any): Promise { headers: { 'Content-Type': ContentTypeEnum.FORM_DATA }, }) - const { data: { records, pages } } = res + const { data: { records, pages, total } } = res return { pageCount: pages, data: records, + total, } } diff --git a/src/api/work/work.ts b/src/api/work/work.ts index c84322f..78e6923 100644 --- a/src/api/work/work.ts +++ b/src/api/work/work.ts @@ -77,7 +77,6 @@ export async function getTaskDetailPictureList(packageid: string, taskchildpictu }) const { data: { records, pages, total } } = res - debugger // 精简一下数据 const list = records.map((item) => { diff --git a/src/views/final/comp/Action.vue b/src/views/final/comp/Action.vue index a9e46d2..b50e98f 100644 --- a/src/views/final/comp/Action.vue +++ b/src/views/final/comp/Action.vue @@ -17,8 +17,9 @@ const props = defineProps({ }) const actionConfig = { - 1: [{ label: '查看', key: 'view' }, { label: '重置审批', key: 'reset' }], - 5: [{ label: '通过', key: 'approval' }, { label: '不通过', key: 'reject' }, { label: '重置审批', key: 'reset' }], + 3: [{ label: '查看', key: 'view' }, { label: '重置审批', key: 'reset' }], + 4: [{ label: '查看', key: 'view' }, { label: '重置审批', key: 'reset' }], + 2: [{ label: '通过', key: 'approval' }, { label: '不通过', key: 'reject' }, { label: '重置审批', key: 'reset' }], } const actions = computed(() => { diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue index 35148cf..523d33c 100644 --- a/src/views/home/content/Content.vue +++ b/src/views/home/content/Content.vue @@ -34,6 +34,7 @@ const generateModalRef = ref(null) const LoginSuccessModalRef = ref(null) const loading = ref(false) const message = useMessage() +const totalCount = ref(0) let canloadMore = true let filterId = null @@ -130,7 +131,8 @@ async function featchList() { const asideParams = unref(configStore.getAsideValue) const params = filterId ? { userSearchId: filterId } : asideParams const result = await getPictureList({ ...pagination, ...contentParams, ...params }) - const { data, pageCount } = result + const { data, pageCount, total } = result + totalCount.value = total canloadMore = pageCount >= pagination.pageNo && pageCount > 0 const list = data.map((item) => { @@ -242,10 +244,6 @@ async function refreshHandler(filtersearchId?: any) { function getAvatar(url: string): string { return url ? getImgUrl(url) : avatar } - -const totalCount = computed(() => { - return listData.value.length -})