From fb243f3345c6f3ed7e7c8c2d98c39b5afc782b9a Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期一, 20 十月 2025 10:24:40 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
packages/hooks/task.ts | 76 +++++++++++++++++++++++++++++++++++--
1 files changed, 71 insertions(+), 5 deletions(-)
diff --git a/packages/hooks/task.ts b/packages/hooks/task.ts
index d092212..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),
@@ -145,3 +151,63 @@
infiniteLoadingProps,
};
}
+
+type UseCheckReceiveTaskUserSubmitsOptions = {
+ id?: string;
+};
+
+export function useCheckReceiveTaskUserSubmits(
+ options: UseCheckReceiveTaskUserSubmitsOptions = {}
+) {
+ const { id } = options;
+ const { infiniteLoadingProps } = useInfiniteLoading(
+ ({ pageParam }) => {
+ let params: API.GetCheckReceiveTaskUserSubmitsQuery = {
+ pageModel: {
+ rows: 20,
+ page: pageParam,
+ },
+ taskInfoId: id,
+ };
+
+ return taskCheckReceiveServices.getCheckReceiveTaskUserSubmits(params, {
+ showLoading: false,
+ });
+ },
+ {
+ queryKey: ['taskCheckReceiveServices/getCheckReceiveTaskUserSubmits'],
+ }
+ );
+
+ return {
+ 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