From 7a854943c88e9eddcbb9614b95b2e4fc03286e1e Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 31 十月 2025 13:52:12 +0800
Subject: [PATCH] fix: bug
---
packages/services/apiV2/index.ts | 4 +-
packages/services/apiV2/enterpriseWallet.ts | 2 -
apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue | 6 ++
packages/services/apiV2/task.ts | 30 +++++++++++++++
packages/services/apiV2/typings.d.ts | 49 ++++++++++++++++++++++--
packages/constants/apiEnum.ts | 10 +++++
packages/hooks/task.ts | 13 ++++--
7 files changed, 101 insertions(+), 13 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
index 24fa7fa..969eace 100644
--- a/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
@@ -355,7 +355,7 @@
const { userDetail } = useUser();
const { findAreaNameFromCode } = useAllAreaList();
-const { settlementAccessList } = useEnterpriseWalletAccessSelect();
+
const { supplierEnterpriseSelect } = useGetSupplierEnterpriseSelect();
const router = Taro.useRouter();
const taskId = router.params?.id ?? '';
@@ -508,6 +508,10 @@
],
});
+const { settlementAccessList } = useEnterpriseWalletAccessSelect({
+ supplierEnterpriseId: computed(() => form.supplierEnterpriseId),
+});
+
const {
isLoading,
isError,
diff --git a/packages/constants/apiEnum.ts b/packages/constants/apiEnum.ts
index a3105e5..4a29a7f 100644
--- a/packages/constants/apiEnum.ts
+++ b/packages/constants/apiEnum.ts
@@ -491,6 +491,16 @@
Fail = 30,
}
+/** 浠诲姟鎶ュ悕鐘舵�� */
+export enum EnumTaskApplyStatus {
+ /**寰呭紑濮� */
+ Wait = 10,
+ /**杩涜涓� */
+ InProcess = 20,
+ /**宸茬粨鏉� */
+ End = 21,
+}
+
/** 浠诲姟楠屾敹鏂瑰紡 */
export enum EnumTaskCheckReceiveMethod {
/**浜哄伐绛惧埌 */
diff --git a/packages/hooks/task.ts b/packages/hooks/task.ts
index 4f9edb4..f86c812 100644
--- a/packages/hooks/task.ts
+++ b/packages/hooks/task.ts
@@ -13,7 +13,7 @@
} from '@12333/constants';
import _ from 'lodash';
import { trim } from '@12333/utils';
-import { computed, MaybeRef, reactive, ref, unref } from 'vue';
+import { computed, MaybeRef, reactive, Ref, ref, unref } from 'vue';
import * as taskServices from '@12333/services/apiV2/task';
import * as enterpriseWalletServices from '@12333/services/apiV2/enterpriseWallet';
import dayjs from 'dayjs';
@@ -193,12 +193,17 @@
};
}
-export function useEnterpriseWalletAccessSelect() {
+type EnterpriseWalletAccessSelectOptions = {
+ supplierEnterpriseId: MaybeRef<string>;
+};
+
+export function useEnterpriseWalletAccessSelect(options: EnterpriseWalletAccessSelectOptions) {
+ const { supplierEnterpriseId } = options;
const { data } = useQuery({
- queryKey: ['enterpriseWalletServices/getEnterpriseWalletAccessSelect'],
+ queryKey: ['enterpriseWalletServices/getEnterpriseWalletAccessSelect', supplierEnterpriseId],
queryFn: () => {
return enterpriseWalletServices.getEnterpriseWalletAccessSelect(
- {},
+ { supplierEnterpriseId: unref(supplierEnterpriseId) },
{
showLoading: false,
}
diff --git a/packages/services/apiV2/enterpriseWallet.ts b/packages/services/apiV2/enterpriseWallet.ts
index b146c99..603bc5b 100644
--- a/packages/services/apiV2/enterpriseWallet.ts
+++ b/packages/services/apiV2/enterpriseWallet.ts
@@ -266,8 +266,6 @@
method: 'GET',
params: {
...params,
- request: undefined,
- ...params['request'],
},
...(options || {}),
}
diff --git a/packages/services/apiV2/index.ts b/packages/services/apiV2/index.ts
index 522d40c..71aabd5 100644
--- a/packages/services/apiV2/index.ts
+++ b/packages/services/apiV2/index.ts
@@ -2,13 +2,13 @@
/* eslint-disable */
// API 鏇存柊鏃堕棿锛�
// API 鍞竴鏍囪瘑锛�
+import * as enterprise from './enterprise';
import * as enterpriseEmployee from './enterpriseEmployee';
import * as user from './user';
import * as role from './role';
import * as task from './task';
import * as enterpriseWallet from './enterpriseWallet';
import * as ocrUtils from './ocrUtils';
-import * as enterprise from './enterprise';
import * as resource from './resource';
import * as logRecords from './logRecords';
import * as dictionary from './dictionary';
@@ -25,13 +25,13 @@
import * as fileUtils from './fileUtils';
import * as settings from './settings';
export default {
+ enterprise,
enterpriseEmployee,
user,
role,
task,
enterpriseWallet,
ocrUtils,
- enterprise,
resource,
logRecords,
dictionary,
diff --git a/packages/services/apiV2/task.ts b/packages/services/apiV2/task.ts
index 84167b8..5c4cfaa 100644
--- a/packages/services/apiV2/task.ts
+++ b/packages/services/apiV2/task.ts
@@ -2,6 +2,21 @@
// @ts-ignore
import { request } from '@/utils/request';
+/** 鍐嶆纭缁撶畻 POST /api/flexjob/task/againSureTaskSettlementOrderRoster */
+export async function againSureTaskSettlementOrderRoster(
+ body: API.AgainSureTaskSettlementOrderRosterCommand,
+ options?: API.RequestConfig
+) {
+ return request<string>('/api/flexjob/task/againSureTaskSettlementOrderRoster', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
/** 瀹℃牳浠诲姟缁撶畻 POST /api/flexjob/task/auditTaskSettlement */
export async function auditTaskSettlement(
body: API.AuditTaskSettlementCommand,
@@ -59,6 +74,21 @@
});
}
+/** 瀵煎嚭缁撶畻璁㈠崟 POST /api/flexjob/task/exportTaskSettlementOrders */
+export async function exportTaskSettlementOrders(
+ body: API.ExportTaskSettlementOrdersCommand,
+ options?: API.RequestConfig
+) {
+ return request<string>('/api/flexjob/task/exportTaskSettlementOrders', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
/** 鏌ヨ寮�鏀句换鍔″垎椤靛垪琛� POST /api/flexjob/task/getOpenTaskInfos */
export async function getOpenTaskInfos(
body: API.GetOpenTaskInfosQuery,
diff --git a/packages/services/apiV2/typings.d.ts b/packages/services/apiV2/typings.d.ts
index 750820f..1e9379a 100644
--- a/packages/services/apiV2/typings.d.ts
+++ b/packages/services/apiV2/typings.d.ts
@@ -3,6 +3,11 @@
[key: string]: any;
}
+ interface AgainSureTaskSettlementOrderRosterCommand {
+ /** 鍚嶅崟Id */
+ id?: string;
+ }
+
interface APIcheckHealthParams {
/** 鍋ュ悍鏍￠獙 */
request?: CheckHealthQuery;
@@ -113,8 +118,8 @@
}
interface APIgetEnterpriseWalletAccessSelectParams {
- /** 鏌ヨ宸茬绾︿紒涓氶挶鍖呴�氶亾閫夋嫨鍣ㄦ暟鎹� */
- request?: GetEnterpriseWalletAccessSelectQuery;
+ /** 渚涘簲鍟咺d */
+ supplierEnterpriseId?: string;
}
interface APIgetEnterpriseWalletExpandindirectOrderParams {
@@ -1154,6 +1159,15 @@
Fail = 30,
}
+ enum EnumTaskApplyStatus {
+ /**寰呭紑濮� */
+ Wait = 10,
+ /**杩涜涓� */
+ InProcess = 20,
+ /**宸茬粨鏉� */
+ End = 21,
+ }
+
enum EnumTaskCheckReceiveMethod {
/**浜哄伐绛惧埌 */
CheckIn = 10,
@@ -1502,6 +1516,21 @@
interface ExportTaskSettlementOrderRostersCommand {
/** 缁撶畻璁㈠崟Id */
id?: string;
+ }
+
+ interface ExportTaskSettlementOrdersCommand {
+ /** 鍏抽敭瀛� */
+ keywords?: string;
+ /** 浠诲姟Id */
+ taskInfoId?: string;
+ paymentStatus?: GetSettlementTasksQueryPaymentStatus;
+ settlementOrderStatus?: EnumTaskSettlementOrderStatus;
+ settlementStatus?: EnumTaskSettlementStatus;
+ checkReceiveStatus?: EnumTaskCheckReceiveStatus;
+ /** 缁撶畻鏃堕棿-璧峰 */
+ settlementTimeBegin?: string;
+ /** 缁撶畻鏃堕棿-鎴 */
+ settlementTimeEnd?: string;
}
interface FriendlyResultBatchEnterpriseSignContractCommandResult {
@@ -4603,6 +4632,7 @@
interface GetEnterprisesQueryResultItem {
/** Id */
id?: string;
+ type?: EnumEnterpriseType;
/** 浼佷笟鍏ㄧО */
enterpriseName?: string;
/** 娉曚汉濮撳悕 */
@@ -4624,8 +4654,6 @@
/** 鏄惁宸查厤缃� */
isConfigured?: boolean;
}
-
- type GetEnterpriseWalletAccessSelectQuery = Record<string, any>;
interface GetEnterpriseWalletAccessSelectQueryOption {
/** Id */
@@ -5802,8 +5830,15 @@
balance?: number;
/** 浼佷笟鍚嶇О */
enterpriseName?: string;
+ /** 渚涘簲鍟� */
+ supplierEnterpriseName?: string;
/** 浠诲姟鍚嶇О */
taskName?: string;
+ /** 浠诲姟鍗曞彿 */
+ taskCode?: string;
+ /** 缁撶畻鍗曞彿 */
+ settlementCode?: string;
+ settlementAccess?: EnumEnterpriseWalletAccess;
/** 缁撶畻鍗曞悕绉� */
settlementOrderName?: string;
settlementStatus?: EnumTaskSettlementStatus;
@@ -6118,6 +6153,8 @@
/** 浠诲姟鍗曞彿 */
code?: string;
checkReceiveStatus?: EnumTaskCheckReceiveStatus;
+ /** 缁撶畻鍗曞彿 */
+ settlementCode?: string;
settlementOrderStatus?: EnumTaskSettlementOrderStatus;
/** 缁撶畻鍗曞悕绉� */
settlementOrderName?: string;
@@ -6136,7 +6173,10 @@
settlementRemark?: string;
/** 缁撶畻浜烘暟 */
settlementUserCount?: number;
+ settlementAccess?: EnumEnterpriseWalletAccess;
auditStatus?: EnumTaskSettlementAuditStatus;
+ /** 鎿嶄綔浜� */
+ operator?: string;
}
interface GetSettlementTasksQueryResultObjectData {
@@ -6618,6 +6658,7 @@
applyBeginTime?: string;
/** 鎶ュ悕缁撴潫鏃堕棿 */
applyEndTime?: string;
+ applyStatus?: EnumTaskApplyStatus;
checkReceiveMethod?: EnumTaskCheckReceiveMethod;
paymentMethod?: EnumTaskPaymentMethod;
settlementAccess?: EnumEnterpriseWalletAccess;
--
Gitblit v1.9.1