From eb01fa3052576eb05faa83bb6b094aa5f85a4408 Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期日, 19 十月 2025 17:29:38 +0800 Subject: [PATCH] Merge branch 'dev-1.2.0.1' of http://120.26.58.240:8888/r/flexJobMiniApp into dev-1.2.0.1 --- packages/hooks/task.ts | 37 ++++++++++++++++++++++++++++++++++--- 1 files changed, 34 insertions(+), 3 deletions(-) diff --git a/packages/hooks/task.ts b/packages/hooks/task.ts index 8257f5f..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,12 +75,12 @@ rows: 20, page: pageParam, orderInput: [ + { property: 'releaseStatus', order: EnumPagedListOrder.Asc }, queryState.orderType === HomeOrderType.Recommend && { - property: 'recommendStatus', + property: 'recommendTime', order: EnumPagedListOrder.Desc, }, { property: 'createdTime', order: EnumPagedListOrder.Desc }, - { property: 'releaseStatus', order: EnumPagedListOrder.Asc }, ].filter(Boolean), }, keywords: queryState.searchValueTrim, @@ -180,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