From 43c5f55acde13b7f8d79b2aeaa28dd7f0f800bde Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期一, 10 十一月 2025 14:41:59 +0800
Subject: [PATCH] fix: bug
---
src/services/api/index.ts | 6 +
src/services/api/typings.d.ts | 79 +++++++++++++++----
src/constants/apiEnum.ts | 40 +++++----
src/views/FinanceManage/EnterpriseBalanceManageDetail.vue | 29 +++++++
src/services/api/eventUtils.ts | 15 +++
src/services/api/user.ts | 15 +++
6 files changed, 144 insertions(+), 40 deletions(-)
diff --git a/src/constants/apiEnum.ts b/src/constants/apiEnum.ts
index fddf11c..975e0ca 100644
--- a/src/constants/apiEnum.ts
+++ b/src/constants/apiEnum.ts
@@ -401,44 +401,46 @@
CommonServerCodeUrls = 4,
/**鏂囦欢 */
CommonServerFileUtils = 5,
+ /**浜嬩欢 */
+ CommonServerEventUtils = 6,
/**鏂囧瓧璇嗗埆 */
- CommonServerOcrUtils = 6,
+ CommonServerOcrUtils = 7,
/**鏃ュ織璁板綍 */
- CommonServerLogRecords = 7,
+ CommonServerLogRecords = 8,
/**鍚屾鏁版嵁搴� */
- CommonServerSyncDatabase = 8,
+ CommonServerSyncDatabase = 9,
/**鐭俊宸ュ叿 */
- CommonServerSmsUtils = 9,
+ CommonServerSmsUtils = 10,
/**閰嶇疆 */
- CommonServerSettings = 10,
+ CommonServerSettings = 11,
/**鐢ㄦ埛璁よ瘉 */
- UserServerAuth = 11,
+ UserServerAuth = 12,
/**鐢ㄦ埛鑿滃崟 */
- UserServerMenu = 12,
+ UserServerMenu = 13,
/**鐢ㄦ埛璧勬簮 */
- UserServerResource = 13,
+ UserServerResource = 14,
/**鐢ㄦ埛瑙掕壊 */
- UserServerRole = 14,
+ UserServerRole = 15,
/**鐢ㄦ埛淇℃伅 */
- UserServerUser = 15,
+ UserServerUser = 16,
/**鐢ㄦ埛閽卞寘 */
- UserServerUserWallet = 16,
+ UserServerUserWallet = 17,
/**鐢靛瓙绛� */
- UserServerElectronSign = 17,
+ UserServerElectronSign = 18,
/**鐢ㄦ埛绠�鍘� */
- UserServerUserResume = 18,
+ UserServerUserResume = 19,
/**浼佷笟淇℃伅 */
- UserServerEnterprise = 19,
+ UserServerEnterprise = 20,
/**浼佷笟閽卞寘 */
- UserServerEnterpriseWallet = 20,
+ UserServerEnterpriseWallet = 21,
/**浼佷笟鍚堜綔閽卞寘 */
- UserServerEnterpriseCooperationWallet = 21,
+ UserServerEnterpriseCooperationWallet = 22,
/**鐏靛伐淇℃伅 */
- UserServerEnterpriseEmployee = 22,
+ UserServerEnterpriseEmployee = 23,
/**鐢靛瓙绛� */
- ElectronSignServerElectronSign = 23,
+ ElectronSignServerElectronSign = 24,
/**鐢靛瓙绛� */
- ToolServerSms = 24,
+ ToolServerSms = 25,
}
/** 璧勬簮璇锋眰鏂瑰紡 */
diff --git a/src/services/api/eventUtils.ts b/src/services/api/eventUtils.ts
new file mode 100644
index 0000000..28ccc69
--- /dev/null
+++ b/src/services/api/eventUtils.ts
@@ -0,0 +1,15 @@
+/* eslint-disable */
+// @ts-ignore
+import { request } from '@/utils/request';
+
+/** 娴嬭瘯浜嬩欢 POST /api/common/eventUtils/testEvent */
+export async function testEvent(body: API.TestEventCommand, options?: API.RequestConfig) {
+ return request<boolean>('/api/common/eventUtils/testEvent', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
diff --git a/src/services/api/index.ts b/src/services/api/index.ts
index 20f31ac..6987f77 100644
--- a/src/services/api/index.ts
+++ b/src/services/api/index.ts
@@ -10,7 +10,6 @@
import * as enterpriseWallet from './enterpriseWallet';
import * as ocrUtils from './ocrUtils';
import * as resource from './resource';
-import * as enterpriseCooperationWallet from './enterpriseCooperationWallet';
import * as logRecords from './logRecords';
import * as dictionary from './dictionary';
import * as taskCheckReceive from './taskCheckReceive';
@@ -18,6 +17,7 @@
import * as userResume from './userResume';
import * as auth from './auth';
import * as taskUser from './taskUser';
+import * as enterpriseCooperationWallet from './enterpriseCooperationWallet';
import * as codeUrl from './codeUrl';
import * as syncDatabase from './syncDatabase';
import * as menu from './menu';
@@ -25,6 +25,7 @@
import * as userWallet from './userWallet';
import * as fileUtils from './fileUtils';
import * as settings from './settings';
+import * as eventUtils from './eventUtils';
export default {
enterprise,
enterpriseEmployee,
@@ -34,7 +35,6 @@
enterpriseWallet,
ocrUtils,
resource,
- enterpriseCooperationWallet,
logRecords,
dictionary,
taskCheckReceive,
@@ -42,6 +42,7 @@
userResume,
auth,
taskUser,
+ enterpriseCooperationWallet,
codeUrl,
syncDatabase,
menu,
@@ -49,4 +50,5 @@
userWallet,
fileUtils,
settings,
+ eventUtils,
};
diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index d348906..7f4985b 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -1116,44 +1116,46 @@
CommonServerCodeUrls = 4,
/**鏂囦欢 */
CommonServerFileUtils = 5,
+ /**浜嬩欢 */
+ CommonServerEventUtils = 6,
/**鏂囧瓧璇嗗埆 */
- CommonServerOcrUtils = 6,
+ CommonServerOcrUtils = 7,
/**鏃ュ織璁板綍 */
- CommonServerLogRecords = 7,
+ CommonServerLogRecords = 8,
/**鍚屾鏁版嵁搴� */
- CommonServerSyncDatabase = 8,
+ CommonServerSyncDatabase = 9,
/**鐭俊宸ュ叿 */
- CommonServerSmsUtils = 9,
+ CommonServerSmsUtils = 10,
/**閰嶇疆 */
- CommonServerSettings = 10,
+ CommonServerSettings = 11,
/**鐢ㄦ埛璁よ瘉 */
- UserServerAuth = 11,
+ UserServerAuth = 12,
/**鐢ㄦ埛鑿滃崟 */
- UserServerMenu = 12,
+ UserServerMenu = 13,
/**鐢ㄦ埛璧勬簮 */
- UserServerResource = 13,
+ UserServerResource = 14,
/**鐢ㄦ埛瑙掕壊 */
- UserServerRole = 14,
+ UserServerRole = 15,
/**鐢ㄦ埛淇℃伅 */
- UserServerUser = 15,
+ UserServerUser = 16,
/**鐢ㄦ埛閽卞寘 */
- UserServerUserWallet = 16,
+ UserServerUserWallet = 17,
/**鐢靛瓙绛� */
- UserServerElectronSign = 17,
+ UserServerElectronSign = 18,
/**鐢ㄦ埛绠�鍘� */
- UserServerUserResume = 18,
+ UserServerUserResume = 19,
/**浼佷笟淇℃伅 */
- UserServerEnterprise = 19,
+ UserServerEnterprise = 20,
/**浼佷笟閽卞寘 */
- UserServerEnterpriseWallet = 20,
+ UserServerEnterpriseWallet = 21,
/**浼佷笟鍚堜綔閽卞寘 */
- UserServerEnterpriseCooperationWallet = 21,
+ UserServerEnterpriseCooperationWallet = 22,
/**鐏靛伐淇℃伅 */
- UserServerEnterpriseEmployee = 22,
+ UserServerEnterpriseEmployee = 23,
/**鐢靛瓙绛� */
- ElectronSignServerElectronSign = 23,
+ ElectronSignServerElectronSign = 24,
/**鐢靛瓙绛� */
- ToolServerSms = 24,
+ ToolServerSms = 25,
}
enum EnumResourceMethod {
@@ -1562,6 +1564,20 @@
createdTimeEnd?: string;
}
+ interface ExportPersonalUserTransactionEreceiptsCommand {
+ /** 鍏抽敭瀛� */
+ keywords?: string;
+ transactionStatus?: EnumWalletTransactionStatus;
+ /** 鍒涘缓鏃堕棿-璧峰 */
+ createdTimeStart?: string;
+ /** 鍒涘缓鏃堕棿-鎴 */
+ createdTimeEnd?: string;
+ /** 鐢ㄦ埛Id */
+ userId?: string;
+ /** 浼佷笟閽卞寘Id */
+ enterpriseWalletId?: string;
+ }
+
interface ExportTaskCheckReceiveTaskUsersCommand {
/** 浠诲姟Id */
id?: string;
@@ -1686,6 +1702,25 @@
/** 閿欒鐮� */
errorCode?: string;
data?: EnterpriseUserElectronSignCommandResult;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
+ interface FriendlyResultFileContentResult {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ /** 鏁版嵁 */
+ data?: string;
/** 鎵ц鎴愬姛 */
success?: boolean;
/** 閿欒淇℃伅 */
@@ -6830,6 +6865,8 @@
billingMethod?: EnumBillingMethod;
/** 鏈嶅姟璐� */
serviceFee?: number;
+ /** 棰勮鏈嶅姟璐� */
+ estimatedServiceFee?: number;
/** 鏍稿畾宸ユ椂 */
verifyWorkHours?: number;
/** 瓒呮椂鏈嶅姟璐� */
@@ -8323,6 +8360,8 @@
billingMethod: EnumBillingMethod;
/** 鏈嶅姟璐� */
serviceFee?: number;
+ /** 棰勮鏈嶅姟璐� */
+ estimatedServiceFee?: number;
/** 鏍稿畾宸ユ椂 */
verifyWorkHours?: number;
/** 瓒呮椂鏈嶅姟璐� */
@@ -8865,6 +8904,8 @@
remark?: string;
}
+ type TestEventCommand = Record<string, any>;
+
interface UpdateEnterpriseWeChatPayWalletBankAccountInfoCommand {
/** 浼佷笟Id */
enterpriseId?: string;
diff --git a/src/services/api/user.ts b/src/services/api/user.ts
index 00b2379..f378be8 100644
--- a/src/services/api/user.ts
+++ b/src/services/api/user.ts
@@ -47,6 +47,21 @@
});
}
+/** 瀵煎嚭涓汉鐢ㄦ埛鏀舵敮鏄庣粏鐢靛瓙鍥炲崟 POST /api/user/user/exportPersonalUserTransactionEreceipts */
+export async function exportPersonalUserTransactionEreceipts(
+ body: API.ExportPersonalUserTransactionEreceiptsCommand,
+ options?: API.RequestConfig
+) {
+ return request<string>('/api/user/user/exportPersonalUserTransactionEreceipts', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
/** 鏌ヨ涓汉鐢ㄦ埛閾惰鍗′俊鎭� GET /api/user/user/getPersonalUserBankCard */
export async function getPersonalUserBankCard(
// 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
diff --git a/src/views/FinanceManage/EnterpriseBalanceManageDetail.vue b/src/views/FinanceManage/EnterpriseBalanceManageDetail.vue
index dad3e0e..38b7c5e 100644
--- a/src/views/FinanceManage/EnterpriseBalanceManageDetail.vue
+++ b/src/views/FinanceManage/EnterpriseBalanceManageDetail.vue
@@ -41,6 +41,9 @@
</QueryFilterItem>
</template>
<template #btn>
+ <el-button type="primary" @click="exportPersonalUserTransactionEreceipts()"
+ >鍥炲崟瀵煎嚭</el-button
+ >
<el-button type="primary" @click="handleExport()">瀵煎嚭</el-button>
</template>
</ProTableQueryFilterBar>
@@ -174,6 +177,32 @@
{ leading: true, trailing: false }
);
+const exportPersonalUserTransactionEreceipts = _.debounce(
+ async () => {
+ if (paginationState.total === 0) {
+ Message.warnMessage('娌℃湁鏁版嵁鍙互瀵煎嚭鍝');
+ return;
+ }
+ try {
+ let params: API.ExportPersonalUserTransactionEreceiptsCommand = {
+ enterpriseWalletId: id,
+ createdTimeStart: format(extraParamState.creationTime?.[0] ?? '', 'YYYY-MM-DD 00:00:00'),
+ createdTimeEnd: format(extraParamState.creationTime?.[1] ?? '', 'YYYY-MM-DD 23:59:59'),
+ };
+ let res = await userServices.exportPersonalUserTransactionEreceipts(params, {
+ responseType: 'blob',
+ getResponse: true,
+ });
+ if (res) {
+ // @ts-ignore
+ downloadFile(res?.data, `鐢靛瓙鍥炲崟`, 'zip');
+ }
+ } catch (error) {}
+ },
+ 1000,
+ { leading: true, trailing: false }
+);
+
onMounted(() => {
state.loading = false;
getList();
--
Gitblit v1.9.1