From ae51226ce036e0201e94b60ffa92b92e893767ee Mon Sep 17 00:00:00 2001 From: wupengfei <834520024@qq.com> Date: 星期日, 19 十月 2025 17:29:17 +0800 Subject: [PATCH] feat: 1.2.0.1 --- packages/hooks/task.ts | 46 ++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 40 insertions(+), 6 deletions(-) diff --git a/packages/hooks/task.ts b/packages/hooks/task.ts index a29fbb1..158df59 100644 --- a/packages/hooks/task.ts +++ b/packages/hooks/task.ts @@ -1,5 +1,7 @@ import { useInfiniteLoading } from '@12333/hooks'; +import { useQuery, useQueryClient } from '@tanstack/vue-query'; import { + EnumEnterpriseWalletAccessTextForSettle, EnumPagedListOrder, EnumSettlementCycle, EnumTaskCheckReceiveStatus, @@ -10,8 +12,9 @@ } from '@12333/constants'; import _ from 'lodash'; import { trim } from '@12333/utils'; -import { MaybeRef, reactive, ref, unref } from 'vue'; +import { computed, MaybeRef, reactive, ref, unref } from 'vue'; import * as taskServices from '@12333/services/apiV2/task'; +import * as enterpriseWalletServices from '@12333/services/apiV2/enterpriseWallet'; import dayjs from 'dayjs'; import * as taskCheckReceiveServices from '@12333/services/apiV2/taskCheckReceive'; @@ -72,10 +75,13 @@ rows: 20, page: pageParam, orderInput: [ - queryState.orderType === HomeOrderType.Recommend - ? { property: 'recommendStatus', order: EnumPagedListOrder.Desc } - : { property: 'createdTime', order: EnumPagedListOrder.Desc }, - ], + { property: 'releaseStatus', order: EnumPagedListOrder.Asc }, + queryState.orderType === HomeOrderType.Recommend && { + property: 'recommendTime', + order: EnumPagedListOrder.Desc, + }, + { property: 'createdTime', order: EnumPagedListOrder.Desc }, + ].filter(Boolean), }, keywords: queryState.searchValueTrim, cityCode: unref(cityCode), @@ -161,7 +167,7 @@ rows: 20, page: pageParam, }, - id: id, + taskInfoId: id, }; return taskCheckReceiveServices.getCheckReceiveTaskUserSubmits(params, { @@ -177,3 +183,31 @@ infiniteLoadingProps, }; } + +export function useEnterpriseWalletAccessSelect() { + const { data } = useQuery({ + queryKey: ['enterpriseWalletServices/getEnterpriseWalletAccessSelect'], + queryFn: () => { + return enterpriseWalletServices.getEnterpriseWalletAccessSelect( + {}, + { + showLoading: false, + } + ); + }, + placeholderData: () => [] as API.SelectOptionGuidGetEnterpriseWalletAccessSelectQueryOption[], + }); + + const enterpriseWalletAccessSelect = computed(() => data.value?.map((x) => x.data)); + + const settlementAccessList = computed(() => { + return enterpriseWalletAccessSelect.value?.length > 0 + ? enterpriseWalletAccessSelect.value.map((x) => ({ + label: EnumEnterpriseWalletAccessTextForSettle[x.access], + value: x.access, + })) + : []; + }); + + return { settlementAccessList }; +} -- Gitblit v1.9.1