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/constants/enterpriseWallet.ts | 6 ++++++
apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue | 9 +++++++--
packages/hooks/task.ts | 33 ++++++++++++++++++++++++++++++++-
3 files changed, 45 insertions(+), 3 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
index a29def6..03e7999 100644
--- a/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
@@ -252,7 +252,7 @@
<ChooseInputWithPicker
v-model="form.settlementAccess"
placeholder="璇烽�夋嫨缁撶畻鏂瑰紡"
- :value-enum="EnumEnterpriseWalletAccessText"
+ :value-enum="settlementAccessList"
:disabled="isEdit"
/>
</nut-form-item>
@@ -297,7 +297,11 @@
import { FormRules } from '@nutui/nutui-taro/dist/types/__VUE/form/types';
import Taro from '@tarojs/taro';
import { goBack } from '@/utils';
-import { useAllAreaList, useDictionaryDataSelect } from '@12333/hooks';
+import {
+ useAllAreaList,
+ useDictionaryDataSelect,
+ useEnterpriseWalletAccessSelect,
+} from '@12333/hooks';
import { useQuery } from '@tanstack/vue-query';
import dayjs from 'dayjs';
@@ -307,6 +311,7 @@
const { userDetail } = useUser();
const { findAreaNameFromCode } = useAllAreaList();
+const { settlementAccessList } = useEnterpriseWalletAccessSelect();
const router = Taro.useRouter();
const taskId = router.params?.id ?? '';
const isEdit = !!taskId;
diff --git a/packages/constants/enterpriseWallet.ts b/packages/constants/enterpriseWallet.ts
index 0bf7b97..7321077 100644
--- a/packages/constants/enterpriseWallet.ts
+++ b/packages/constants/enterpriseWallet.ts
@@ -9,3 +9,9 @@
[EnumEnterpriseWalletAccess.PingAnPay]: '骞冲畨閾惰',
[EnumEnterpriseWalletAccess.WeChatPay]: '寰俊',
};
+
+export const EnumEnterpriseWalletAccessTextForSettle = {
+ [EnumEnterpriseWalletAccess.Alipay]: '浼佷笟鏀粯瀹濈粨绠�',
+ [EnumEnterpriseWalletAccess.PingAnPay]: '骞冲畨閾惰缁撶畻',
+ [EnumEnterpriseWalletAccess.WeChatPay]: '寰俊缁撶畻',
+};
diff --git a/packages/hooks/task.ts b/packages/hooks/task.ts
index 3480293..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';
@@ -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