From bca0b691a317421595538c1646c218f0724fac63 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 05 九月 2025 09:16:30 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdmin
---
src/views/CPersonManage/components/CPersonDetailDialog.vue | 21
src/views/EnterpriseManage/components/ConfigureDialog.vue | 10
.eslintrc-auto-import.json | 6
src/services/api/typings.d.ts | 586 ++++++++++++++++++++----
src/views/FinanceManage/BalanceManage.vue | 135 +++++
src/views/FinanceManage/components/BalanceDetailDialog.vue | 141 ++++++
src/views/FinanceManage/components/FinanceDetailDialog.vue | 26
src/services/api/enterpriseWallet.ts | 171 ++++---
src/services/api/taskUser.ts | 18
src/views/EnterpriseManage/components/AlipayWalletOpen.vue | 24 +
src/services/api/task.ts | 75 +++
src/services/api/index.ts | 4
src/views/FinanceManage/FinanceManageList.vue | 53 --
auto-imports.d.ts | 16
src/constants/enterpriseEmployee.ts | 2
src/constants/apiEnum.ts | 78 +++
16 files changed, 1,109 insertions(+), 257 deletions(-)
diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json
index ab24bde..9a2cc44 100644
--- a/.eslintrc-auto-import.json
+++ b/.eslintrc-auto-import.json
@@ -41,7 +41,12 @@
"EnumEnterpriseCostType": true,
"EnumEnterpriseRealMethod": true,
"EnumEnterpriseWalletAccess": true,
+ "EnumEnterpriseWalletExpandindirectOrderFileType": true,
+ "EnumEnterpriseWalletExpandindirectOrderScene": true,
+ "EnumEnterpriseWalletExpandindirectOrderStatus": true,
"EnumEnterpriseWalletSignStatus": true,
+ "EnumEnterpriseWalletTransactionStatus": true,
+ "EnumEnterpriseWalletTransactionType": true,
"EnumMenuType": true,
"EnumMenuVisitLevel": true,
"EnumOcrAccess": true,
@@ -68,6 +73,7 @@
"EnumTaskRecommendStatusText": true,
"EnumTaskReleaseStatus": true,
"EnumTaskReleaseStatusText": true,
+ "EnumTaskSettlementOrderStatus": true,
"EnumTaskSettlementStatus": true,
"EnumTaskSettlementStatusText": true,
"EnumTaskStatus": true,
diff --git a/auto-imports.d.ts b/auto-imports.d.ts
index 2e3b160..12571b6 100644
--- a/auto-imports.d.ts
+++ b/auto-imports.d.ts
@@ -49,7 +49,12 @@
const EnumEnterpriseCostType: typeof import('./src/constants/apiEnum')['EnumEnterpriseCostType']
const EnumEnterpriseRealMethod: typeof import('./src/constants/apiEnum')['EnumEnterpriseRealMethod']
const EnumEnterpriseWalletAccess: typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletAccess']
+ const EnumEnterpriseWalletExpandindirectOrderFileType: typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletExpandindirectOrderFileType']
+ const EnumEnterpriseWalletExpandindirectOrderScene: typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletExpandindirectOrderScene']
+ const EnumEnterpriseWalletExpandindirectOrderStatus: typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletExpandindirectOrderStatus']
const EnumEnterpriseWalletSignStatus: typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletSignStatus']
+ const EnumEnterpriseWalletTransactionStatus: typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletTransactionStatus']
+ const EnumEnterpriseWalletTransactionType: typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletTransactionType']
const EnumMenuType: typeof import('./src/constants/apiEnum')['EnumMenuType']
const EnumMenuVisitLevel: typeof import('./src/constants/apiEnum')['EnumMenuVisitLevel']
const EnumOcrAccess: typeof import('./src/constants/apiEnum')['EnumOcrAccess']
@@ -77,6 +82,7 @@
const EnumTaskRecommendStatusText: typeof import('./src/constants/task')['EnumTaskRecommendStatusText']
const EnumTaskReleaseStatus: typeof import('./src/constants/apiEnum')['EnumTaskReleaseStatus']
const EnumTaskReleaseStatusText: typeof import('./src/constants/task')['EnumTaskReleaseStatusText']
+ const EnumTaskSettlementOrderStatus: typeof import('./src/constants/apiEnum')['EnumTaskSettlementOrderStatus']
const EnumTaskSettlementStatus: typeof import('./src/constants/apiEnum')['EnumTaskSettlementStatus']
const EnumTaskSettlementStatusText: typeof import('./src/constants/task')['EnumTaskSettlementStatusText']
const EnumTaskStatus: typeof import('./src/constants/apiEnum')['EnumTaskStatus']
@@ -277,7 +283,7 @@
export type { Component, Slot, Slots, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue'
import('vue')
// @ts-ignore
- export type { EnumBillingMethod, EnumClientType, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumEnterpriseCostStatus, EnumEnterpriseCostType, EnumEnterpriseRealMethod, EnumEnterpriseWalletAccess, EnumEnterpriseWalletSignStatus, EnumMenuType, EnumMenuVisitLevel, EnumOcrAccess, EnumPagedListOrder, EnumPayAccess, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumPersonalRealMethod, EnumPersonalUserRealStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumTaskCheckReceiveStatus, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumTaskUserArrangeStatus, EnumTaskUserHireStatus, EnumTaskUserSignContractStatus, EnumTaskUserSubmitCheckReceiveStatus, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton, EnumBillingMethod, EnumClientType, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumEnterpriseCostStatus, EnumEnterpriseCostType, EnumEnterpriseRealMethod, EnumEnterpriseWalletAccess, EnumEnterpriseWalletSignStatus, EnumMenuType, EnumMenuVisitLevel, EnumOcrAccess, EnumPagedListOrder, EnumPayAccess, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumPersonalRealMethod, EnumPersonalUserRealStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumTaskCheckReceiveStatus, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumTaskUserArrangeStatus, EnumTaskUserHireStatus, EnumTaskUserSignContractStatus, EnumTaskUserSubmitCheckReceiveStatus, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton } from './src/constants/apiEnum'
+ export type { EnumBillingMethod, EnumClientType, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumEnterpriseCostStatus, EnumEnterpriseCostType, EnumEnterpriseRealMethod, EnumEnterpriseWalletAccess, EnumEnterpriseWalletExpandindirectOrderFileType, EnumEnterpriseWalletExpandindirectOrderScene, EnumEnterpriseWalletExpandindirectOrderStatus, EnumEnterpriseWalletSignStatus, EnumEnterpriseWalletTransactionStatus, EnumEnterpriseWalletTransactionType, EnumMenuType, EnumMenuVisitLevel, EnumOcrAccess, EnumPagedListOrder, EnumPayAccess, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumPersonalRealMethod, EnumPersonalUserRealStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumTaskCheckReceiveStatus, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementOrderStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumTaskUserArrangeStatus, EnumTaskUserHireStatus, EnumTaskUserSignContractStatus, EnumTaskUserSubmitCheckReceiveStatus, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton, EnumBillingMethod, EnumClientType, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumEnterpriseCostStatus, EnumEnterpriseCostType, EnumEnterpriseRealMethod, EnumEnterpriseWalletAccess, EnumEnterpriseWalletExpandindirectOrderFileType, EnumEnterpriseWalletExpandindirectOrderScene, EnumEnterpriseWalletExpandindirectOrderStatus, EnumEnterpriseWalletSignStatus, EnumEnterpriseWalletTransactionStatus, EnumEnterpriseWalletTransactionType, EnumMenuType, EnumMenuVisitLevel, EnumOcrAccess, EnumPagedListOrder, EnumPayAccess, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumPersonalRealMethod, EnumPersonalUserRealStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumTaskCheckReceiveStatus, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementOrderStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumTaskUserArrangeStatus, EnumTaskUserHireStatus, EnumTaskUserSignContractStatus, EnumTaskUserSubmitCheckReceiveStatus, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton } from './src/constants/apiEnum'
import('./src/constants/apiEnum')
// @ts-ignore
export type { FlexWorkerEleSignEnum, FlexTaskWorkerHireEnum, FlexWorkerEleSignEnum, FlexTaskWorkerHireEnum } from './src/constants/cPerson'
@@ -359,7 +365,12 @@
readonly EnumEnterpriseCostType: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseCostType']>
readonly EnumEnterpriseRealMethod: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseRealMethod']>
readonly EnumEnterpriseWalletAccess: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletAccess']>
+ readonly EnumEnterpriseWalletExpandindirectOrderFileType: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletExpandindirectOrderFileType']>
+ readonly EnumEnterpriseWalletExpandindirectOrderScene: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletExpandindirectOrderScene']>
+ readonly EnumEnterpriseWalletExpandindirectOrderStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletExpandindirectOrderStatus']>
readonly EnumEnterpriseWalletSignStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletSignStatus']>
+ readonly EnumEnterpriseWalletTransactionStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletTransactionStatus']>
+ readonly EnumEnterpriseWalletTransactionType: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletTransactionType']>
readonly EnumMenuType: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumMenuType']>
readonly EnumMenuVisitLevel: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumMenuVisitLevel']>
readonly EnumOcrAccess: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumOcrAccess']>
@@ -386,6 +397,7 @@
readonly EnumTaskRecommendStatusText: UnwrapRef<typeof import('./src/constants/task')['EnumTaskRecommendStatusText']>
readonly EnumTaskReleaseStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskReleaseStatus']>
readonly EnumTaskReleaseStatusText: UnwrapRef<typeof import('./src/constants/task')['EnumTaskReleaseStatusText']>
+ readonly EnumTaskSettlementOrderStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskSettlementOrderStatus']>
readonly EnumTaskSettlementStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskSettlementStatus']>
readonly EnumTaskSettlementStatusText: UnwrapRef<typeof import('./src/constants/task')['EnumTaskSettlementStatusText']>
readonly EnumTaskStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskStatus']>
@@ -554,4 +566,4 @@
readonly watchPostEffect: UnwrapRef<typeof import('vue')['watchPostEffect']>
readonly watchSyncEffect: UnwrapRef<typeof import('vue')['watchSyncEffect']>
}
-}
\ No newline at end of file
+}
diff --git a/src/constants/apiEnum.ts b/src/constants/apiEnum.ts
index 3303086..1045c37 100644
--- a/src/constants/apiEnum.ts
+++ b/src/constants/apiEnum.ts
@@ -101,6 +101,50 @@
Alipay = 10,
}
+/** 浼佷笟閽卞寘浠h繘浠跺崟闄勪欢绫诲瀷 */
+export enum EnumEnterpriseWalletExpandindirectOrderFileType {
+ /**杞处鍦烘櫙鎴浘 */
+ Scene = 10,
+ /**鍟嗘埛琛屼笟璧勮川鍥剧墖鎴栧崗璁枃鏈� */
+ SceneQualification = 20,
+}
+
+/** 浼佷笟閽卞寘浠h繘浠跺満鏅� */
+export enum EnumEnterpriseWalletExpandindirectOrderScene {
+ /**鐜伴噾钀ラ攢 */
+ XIANJIN_YINGXIAO = 10,
+ /**琛屾斂琛ヨ创 */
+ XINGZHENG_BUTIE = 20,
+ /**淇濋櫓鐞嗚禂 */
+ BAOXIAN_LIPEI = 30,
+ /**浣i噾鎶ラ叕 */
+ YONGJIN_BAOCHOU = 40,
+ /**浼佷笟璧斾粯 */
+ QIYE_PEIFU = 50,
+ /**閲囪喘璐ф */
+ CAIGOU_HUOKUAN = 60,
+ /**浜屾墜鍥炴敹 */
+ ERSHOU_HUISHOU = 70,
+ /**鍏泭琛ュ姪 */
+ GONGYI_BUZHU = 80,
+ /**鍏朵粬鍦烘櫙 */
+ ZHUANZHANG_QITA = 90,
+}
+
+/** 浼佷笟閽卞寘浠h繘浠跺崟鐘舵�� */
+export enum EnumEnterpriseWalletExpandindirectOrderStatus {
+ /**瀹℃壒涓� */
+ PROCESSING = 10,
+ /**宸茬敓鏁� */
+ VALID = 20,
+ /**瀹℃壒涓嶉�氳繃 */
+ INVALID = 30,
+ /**宸插簾寮� */
+ DISUSE = 40,
+ /**宸叉挙閿� */
+ REVOKED = 50,
+}
+
/** 浼佷笟閽卞寘绛剧害鐘舵�� */
export enum EnumEnterpriseWalletSignStatus {
/**鐢宠涓� */
@@ -109,6 +153,30 @@
Normal = 100,
/**缁堟 */
Stop = 999,
+}
+
+/** 浼佷笟閽卞寘浜ゆ槗鐘舵�� */
+export enum EnumEnterpriseWalletTransactionStatus {
+ /**寰呮彁浜� */
+ WaitSubmit = 1,
+ /**寰呮敮浠� */
+ WaitPay = 10,
+ /**澶勭悊涓� */
+ Dealing = 20,
+ /**鎴愬姛 */
+ Success = 30,
+ /**閫�绁� */
+ Refund = 40,
+ /**澶辫触 */
+ Fail = 50,
+}
+
+/** 浼佷笟閽卞寘浜ゆ槗绫诲瀷 */
+export enum EnumEnterpriseWalletTransactionType {
+ /**鍏呭�� */
+ Recharge = 10,
+ /**杞处 */
+ Transfer = 20,
}
/** 鑿滃崟绫诲瀷 */
@@ -323,10 +391,20 @@
Stopped = 100,
}
+/** 浠诲姟缁撶畻鍗曠姸鎬� */
+export enum EnumTaskSettlementOrderStatus {
+ /**寰呬笂浼� */
+ Wait = 10,
+ /**宸蹭笂浼� */
+ Completed = 20,
+}
+
/** 浠诲姟缁撶畻鐘舵�� */
export enum EnumTaskSettlementStatus {
/**寰呯粨绠� */
Wait = 10,
+ /**缁撶畻涓� */
+ InProcess = 20,
/**宸茬粨绠� */
Completed = 30,
}
diff --git a/src/constants/enterpriseEmployee.ts b/src/constants/enterpriseEmployee.ts
index 5db63ff..d5bbd30 100644
--- a/src/constants/enterpriseEmployee.ts
+++ b/src/constants/enterpriseEmployee.ts
@@ -9,5 +9,5 @@
export const EnumTaskUserSignContractStatusText = {
[EnumTaskUserSignContractStatus.Wait]: '寰呯绾�',
[EnumTaskUserSignContractStatus.Pass]: '宸茬绾�',
- [EnumTaskUserSignContractStatus.Refuse]: '宸茶阿缁�',
+ [EnumTaskUserSignContractStatus.Stop]: '宸茶В绾�',
};
diff --git a/src/services/api/enterpriseWallet.ts b/src/services/api/enterpriseWallet.ts
index 663ce51..b03ba6d 100644
--- a/src/services/api/enterpriseWallet.ts
+++ b/src/services/api/enterpriseWallet.ts
@@ -2,21 +2,6 @@
// @ts-ignore
import { request } from '@/utils/request';
-/** 鏀粯瀹濊祫閲戜簩绾у晢鎴稫YB浠h繘浠� POST /api/user/enterpriseWallet/alipayFundExpandindirectCreate */
-export async function alipayFundExpandindirectCreate(
- body: API.AlipayFundExpandindirectCreateCommand,
- options?: API.RequestConfig
-) {
- return request<string>('/api/user/enterpriseWallet/alipayFundExpandindirectCreate', {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json-patch+json',
- },
- data: body,
- ...(options || {}),
- });
-}
-
/** 鏀粯瀹濊祫閲戜簩绾у晢鎴稫YB浠h繘浠剁姸鎬侀�氱煡 POST /api/user/enterpriseWallet/alipayFundExpandindirectCreateNotify */
export async function alipayFundExpandindirectCreateNotify(
body: {
@@ -62,22 +47,31 @@
});
}
-/** 鏀粯瀹濊祫閲戜簩绾у晢鎴稫YB浠h繘浠舵枃浠朵笂浼犳帴鍙� POST /api/user/enterpriseWallet/alipayFundExpandindirectImageUpload */
-export async function alipayFundExpandindirectImageUpload(
+/** 璧勯噾鍗曟嵁鐘舵�佸彉鏇撮�氱煡 POST /api/user/enterpriseWallet/alipayFundTransOrderChangedNotify */
+export async function alipayFundTransOrderChangedNotify(
body: {
- /** 浜у搧鐮� */
- ProductCode?: string;
- /** 鍦烘櫙鐮� */
- BizScene?: string;
+ /** 閫氱煡ID */
+ notify_id?: string;
+ /** 娑堟伅鍙戦�佹椂鐨勬湇鍔$鏃堕棿 */
+ utc_timestamp?: string;
+ /** 娑堟伅鎺ュ彛鍚嶇О */
+ msg_method?: string;
+ /** 娑堟伅鎺ュ彈鏂圭殑搴旂敤id */
+ app_id?: string;
+ /** 鐗堟湰鍙�(1.1鐗堟湰涓烘爣鍑嗘秷鎭�) */
+ version?: string;
+ /** 娑堟伅鎶ユ枃 */
+ biz_content?: string;
+ /** 绛惧悕 */
+ sign?: string;
+ /** 绛惧悕绫诲瀷 */
+ sign_type?: string;
+ /** 缂栫爜闆嗭紝璇ュ瓧绗﹂泦涓洪獙绛惧拰瑙e瘑鎵�闇�瑕佺殑瀛楃闆� */
+ charset?: string;
},
- File?: File,
options?: API.RequestConfig
) {
const formData = new FormData();
-
- if (File) {
- formData.append('File', File);
- }
Object.keys(body).forEach((ele) => {
const item = (body as any)[ele];
@@ -90,37 +84,10 @@
}
});
- return request<string>('/api/user/enterpriseWallet/alipayFundExpandindirectImageUpload', {
+ return request<boolean>('/api/user/enterpriseWallet/alipayFundTransOrderChangedNotify', {
method: 'POST',
data: formData,
requestType: 'form',
- ...(options || {}),
- });
-}
-
-/** 鏀粯瀹濊祫閲戜簩绾у晢鎴稫YB浠h繘浠跺崟鍙栨秷鎺ュ彛 POST /api/user/enterpriseWallet/alipayFundExpandindirectOrderCancel */
-export async function alipayFundExpandindirectOrderCancel(
- body: API.AlipayFundExpandindirectOrderCancelCommand,
- options?: API.RequestConfig
-) {
- return request<string>('/api/user/enterpriseWallet/alipayFundExpandindirectOrderCancel', {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json-patch+json',
- },
- data: body,
- ...(options || {}),
- });
-}
-
-/** 杞处 POST /api/user/enterpriseWallet/alipayTransfer */
-export async function alipayTransfer(body: API.AlipayTransferCommand, options?: API.RequestConfig) {
- return request<string>('/api/user/enterpriseWallet/alipayTransfer', {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json-patch+json',
- },
- data: body,
...(options || {}),
});
}
@@ -198,22 +165,34 @@
});
}
-/** 鏌ヨ鏀粯瀹濊祫閲戜簩绾у晢鎴稫YB浠h繘浠跺崟璇︽儏 GET /api/user/enterpriseWallet/getAlipayFundExpandindirectOrder */
-export async function getAlipayFundExpandindirectOrder(
- // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
- params: API.APIgetAlipayFundExpandindirectOrderParams,
+/** 鏀粯瀹濊祫閲戜簩绾у晢鎴稫YB浠h繘浠� POST /api/user/enterpriseWallet/enterpriseWalletExpandindirectCreate */
+export async function enterpriseWalletExpandindirectCreate(
+ body: API.EnterpriseWalletExpandindirectCreateCommand,
options?: API.RequestConfig
) {
- return request<API.GetAlipayFundExpandindirectOrderQueryResult>(
- '/api/user/enterpriseWallet/getAlipayFundExpandindirectOrder',
- {
- method: 'GET',
- params: {
- ...params,
- },
- ...(options || {}),
- }
- );
+ return request<string>('/api/user/enterpriseWallet/enterpriseWalletExpandindirectCreate', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
+/** 鏀粯瀹濊祫閲戜簩绾у晢鎴稫YB浠h繘浠跺崟鍙栨秷鎺ュ彛 POST /api/user/enterpriseWallet/enterpriseWalletExpandindirectOrderCancel */
+export async function enterpriseWalletExpandindirectOrderCancel(
+ body: API.EnterpriseWalletExpandindirectOrderCancelCommand,
+ options?: API.RequestConfig
+) {
+ return request<string>('/api/user/enterpriseWallet/enterpriseWalletExpandindirectOrderCancel', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
}
/** 鏀粯瀹濋�氱煡鍥炰紶 GET /api/user/enterpriseWallet/getAlipayNotify */
@@ -260,6 +239,42 @@
);
}
+/** 鏌ヨ鏀粯瀹濊祫閲戜簩绾у晢鎴稫YB浠h繘浠跺崟璇︽儏 GET /api/user/enterpriseWallet/getEnterpriseWalletExpandindirectOrder */
+export async function getEnterpriseWalletExpandindirectOrder(
+ // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
+ params: API.APIgetEnterpriseWalletExpandindirectOrderParams,
+ options?: API.RequestConfig
+) {
+ return request<API.GetEnterpriseWalletExpandindirectOrderQueryResult>(
+ '/api/user/enterpriseWallet/getEnterpriseWalletExpandindirectOrder',
+ {
+ method: 'GET',
+ params: {
+ ...params,
+ },
+ ...(options || {}),
+ }
+ );
+}
+
+/** 鏌ヨ浼佷笟閽卞寘浜ゆ槗璇︽儏 GET /api/user/enterpriseWallet/getEnterpriseWalletTransaction */
+export async function getEnterpriseWalletTransaction(
+ // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
+ params: API.APIgetEnterpriseWalletTransactionParams,
+ options?: API.RequestConfig
+) {
+ return request<API.GetEnterpriseWalletTransactionQueryResult>(
+ '/api/user/enterpriseWallet/getEnterpriseWalletTransaction',
+ {
+ method: 'GET',
+ params: {
+ ...params,
+ },
+ ...(options || {}),
+ }
+ );
+}
+
/** 寮�閫氫紒涓氶挶鍖� POST /api/user/enterpriseWallet/openEnterpriseWallet */
export async function openEnterpriseWallet(
body: API.OpenEnterpriseWalletCommand,
@@ -283,7 +298,25 @@
body: API.RechargeEnterpriseWalletCommand,
options?: API.RequestConfig
) {
- return request<string>('/api/user/enterpriseWallet/rechargeEnterpriseWallet', {
+ return request<API.RechargeEnterpriseWalletCommandResult>(
+ '/api/user/enterpriseWallet/rechargeEnterpriseWallet',
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ }
+ );
+}
+
+/** 浼佷笟閽卞寘杞处 POST /api/user/enterpriseWallet/transferEnterpriseWallet */
+export async function transferEnterpriseWallet(
+ body: API.TransferEnterpriseWalletCommand,
+ options?: API.RequestConfig
+) {
+ return request<string>('/api/user/enterpriseWallet/transferEnterpriseWallet', {
method: 'POST',
headers: {
'Content-Type': 'application/json-patch+json',
diff --git a/src/services/api/index.ts b/src/services/api/index.ts
index 96f40fc..76b273c 100644
--- a/src/services/api/index.ts
+++ b/src/services/api/index.ts
@@ -6,9 +6,9 @@
import * as user from './user';
import * as role from './role';
import * as ocrUtils from './ocrUtils';
+import * as task from './task';
import * as enterprise from './enterprise';
import * as resource from './resource';
-import * as task from './task';
import * as dictionary from './dictionary';
import * as enterpriseWallet from './enterpriseWallet';
import * as electronSign from './electronSign';
@@ -24,9 +24,9 @@
user,
role,
ocrUtils,
+ task,
enterprise,
resource,
- task,
dictionary,
enterpriseWallet,
electronSign,
diff --git a/src/services/api/task.ts b/src/services/api/task.ts
index 19f5179..573a56e 100644
--- a/src/services/api/task.ts
+++ b/src/services/api/task.ts
@@ -83,6 +83,36 @@
);
}
+/** 鏌ヨ缁撶畻鍗曡鎯� GET /api/flexjob/task/getSettlementTask */
+export async function getSettlementTask(
+ // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
+ params: API.APIgetSettlementTaskParams,
+ options?: API.RequestConfig
+) {
+ return request<API.GetSettlementTaskQueryResult>('/api/flexjob/task/getSettlementTask', {
+ method: 'GET',
+ params: {
+ ...params,
+ },
+ ...(options || {}),
+ });
+}
+
+/** 鏌ヨ缁撶畻浠诲姟鍒嗛〉鍒楄〃鏁版嵁 POST /api/flexjob/task/getSettlementTasks */
+export async function getSettlementTasks(
+ body: API.GetSettlementTasksQuery,
+ options?: API.RequestConfig
+) {
+ return request<API.GetSettlementTasksQueryResult>('/api/flexjob/task/getSettlementTasks', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
/** 鏌ヨ浠诲姟浼佷笟淇℃伅 GET /api/flexjob/task/getTaskEnterprise */
export async function getTaskEnterprise(
// 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
@@ -116,6 +146,21 @@
/** 鏌ヨ浠诲姟鍒嗛〉鍒楄〃 POST /api/flexjob/task/getTaskInfos */
export async function getTaskInfos(body: API.GetTaskInfosQuery, options?: API.RequestConfig) {
return request<API.GetTaskInfosQueryResult>('/api/flexjob/task/getTaskInfos', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
+/** 鎾ゅ洖缁撶畻 POST /api/flexjob/task/revokeTaskSettlementOrder */
+export async function revokeTaskSettlementOrder(
+ body: API.RevokeTaskSettlementOrderCommand,
+ options?: API.RequestConfig
+) {
+ return request<string>('/api/flexjob/task/revokeTaskSettlementOrder', {
method: 'POST',
headers: {
'Content-Type': 'application/json-patch+json',
@@ -166,3 +211,33 @@
...(options || {}),
});
}
+
+/** 纭缁撶畻 POST /api/flexjob/task/sureTaskSettlement */
+export async function sureTaskSettlement(
+ body: API.SureTaskSettlementCommand,
+ options?: API.RequestConfig
+) {
+ return request<string>('/api/flexjob/task/sureTaskSettlement', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
+/** 纭缁撶畻鍗� POST /api/flexjob/task/sureTaskSettlementOrder */
+export async function sureTaskSettlementOrder(
+ body: API.SureTaskSettlementOrderCommand,
+ options?: API.RequestConfig
+) {
+ return request<string>('/api/flexjob/task/sureTaskSettlementOrder', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
diff --git a/src/services/api/taskUser.ts b/src/services/api/taskUser.ts
index 0edd5de..85e1c78 100644
--- a/src/services/api/taskUser.ts
+++ b/src/services/api/taskUser.ts
@@ -56,6 +56,24 @@
});
}
+/** 鏌ヨ缁撶畻鍚嶅崟鍒嗛〉鍒楄〃鏁版嵁 POST /api/flexjob/taskUser/getSettlementTaskUsers */
+export async function getSettlementTaskUsers(
+ body: API.GetSettlementTaskUsersQuery,
+ options?: API.RequestConfig
+) {
+ return request<API.GetSettlementTaskUsersQueryResult>(
+ '/api/flexjob/taskUser/getSettlementTaskUsers',
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ }
+ );
+}
+
/** 鏌ヨ搴旇仒鎶ュ悕浜哄憳褰曠敤鐘舵�� GET /api/flexjob/taskUser/getTaskUserHireStatus */
export async function getTaskUserHireStatus(
// 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index 91549f7..5aa46b1 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -3,59 +3,9 @@
[key: string]: any;
}
- interface AlipayFundExpandindirectCreateCommand {
- /** 浜у搧鐮� */
- productCode?: string;
- /** 鍦烘櫙鐮� */
- bizScene?: string;
- /** 澶栭儴鍗曞彿 */
- outBizNo?: string;
- /** 浜岀骇鍟嗘埛淇℃伅-鏍囪瘑 */
- identity?: string;
- /** 浜岀骇鍟嗘埛淇℃伅-鏍囪瘑绫诲瀷 */
- identityType?: string;
- /** 浜岀骇鍟嗘埛淇℃伅-濮撳悕 */
- name?: string;
- /** 涓氬姟绫诲瀷 */
- bizType?: string;
- /** 鍘熻繘浠跺崟id */
- originalOrderId?: string;
- /** 璧勯噾璁拌处鏈殑涓氬姟鍦烘櫙 */
- sceneCode?: string;
- /** 杞处鍦烘櫙璇存槑 */
- sceneDirections?: string;
- /** 杞处鍦烘櫙鎴浘 */
- sceneImage?: string;
- /** 鍟嗘埛琛屼笟璧勮川鍥剧墖鎴栧崗璁枃鏈� */
- sceneQualificationImage?: string;
- sitesInfo?: AlipayFundExpandindirectCreateCommandSites;
- /** Id */
- id?: string;
- }
-
- interface AlipayFundExpandindirectCreateCommandSites {
- website?: string;
- app?: string;
- gongzh?: string;
- qita?: string;
- xchengxU_ZHI?: string;
- }
-
- interface AlipayFundExpandindirectOrderCancelCommand {
- /** 浠h繘浠跺崟Id */
- id?: string;
- }
-
- type AlipayTransferCommand = Record<string, any>;
-
interface APIcheckHealthParams {
/** 鍋ュ悍鏍¢獙 */
request?: CheckHealthQuery;
- }
-
- interface APIgetAlipayFundExpandindirectOrderParams {
- /** 浠h繘浠跺崟Id */
- id?: string;
}
interface APIgetAliyunOSSAcsParams {
@@ -153,11 +103,21 @@
id?: string;
}
+ interface APIgetEnterpriseWalletExpandindirectOrderParams {
+ /** 浼佷笟Id */
+ enterpriseId?: string;
+ }
+
interface APIgetEnterpriseWalletParams {
/** 浼佷笟Id */
enterpriseId?: string;
/** 閫氶亾 */
access?: EnumEnterpriseWalletAccess;
+ }
+
+ interface APIgetEnterpriseWalletTransactionParams {
+ /** 浜ゆ槗Id */
+ id?: string;
}
interface APIgetFileUrlParams {
@@ -220,6 +180,11 @@
interface APIgetRoleUserInfosParams {
/** 瑙掕壊Id */
roleId?: string;
+ }
+
+ interface APIgetSettlementTaskParams {
+ /** Id */
+ id?: string;
}
interface APIgetTaskEnterpriseParams {
@@ -373,6 +338,8 @@
type ClearTaskCollectCommand = Record<string, any>;
interface CloseEnterpriseWalletCommand {
+ /** 浼佷笟Id */
+ enterpriseId?: string;
access?: EnumEnterpriseWalletAccess;
}
@@ -460,6 +427,45 @@
signContractShortUrl?: string;
/** 绛剧讲鍚堝悓闀块摼鎺� */
signContractLongUrl?: string;
+ }
+
+ interface EnterpriseWalletExpandindirectCreateCommand {
+ /** 浼佷笟Id */
+ enterpriseId?: string;
+ /** 鏀粯瀹濈櫥褰曡处鍙� */
+ identity?: string;
+ /** 鏀粯瀹濆鍚� */
+ name?: string;
+ scene?: EnumEnterpriseWalletExpandindirectOrderScene;
+ /** 杞处鍦烘櫙璇存槑 */
+ sceneDirections?: string;
+ sitesInfo?: EnterpriseWalletExpandindirectCreateCommandSites;
+ /** 闄勪欢 */
+ files?: EnterpriseWalletExpandindirectCreateCommandFile[];
+ }
+
+ interface EnterpriseWalletExpandindirectCreateCommandFile {
+ type?: EnumEnterpriseWalletExpandindirectOrderFileType;
+ /** 闄勪欢 */
+ file?: string;
+ }
+
+ interface EnterpriseWalletExpandindirectCreateCommandSites {
+ /** 缃戠珯 */
+ website?: string;
+ /** APP */
+ app?: string;
+ /** 鍏紬鍙� */
+ gongzh?: string;
+ /** 鏀粯瀹濆皬绋嬪簭 */
+ xchengxU_ZHI?: string;
+ /** 鍏朵粬 */
+ qita?: string;
+ }
+
+ interface EnterpriseWalletExpandindirectOrderCancelCommand {
+ /** 浼佷笟Id */
+ enterpriseId?: string;
}
enum EnumBillingMethod {
@@ -550,6 +556,47 @@
Alipay = 10,
}
+ enum EnumEnterpriseWalletExpandindirectOrderFileType {
+ /**杞处鍦烘櫙鎴浘 */
+ Scene = 10,
+ /**鍟嗘埛琛屼笟璧勮川鍥剧墖鎴栧崗璁枃鏈� */
+ SceneQualification = 20,
+ }
+
+ enum EnumEnterpriseWalletExpandindirectOrderScene {
+ /**鐜伴噾钀ラ攢 */
+ XIANJIN_YINGXIAO = 10,
+ /**琛屾斂琛ヨ创 */
+ XINGZHENG_BUTIE = 20,
+ /**淇濋櫓鐞嗚禂 */
+ BAOXIAN_LIPEI = 30,
+ /**浣i噾鎶ラ叕 */
+ YONGJIN_BAOCHOU = 40,
+ /**浼佷笟璧斾粯 */
+ QIYE_PEIFU = 50,
+ /**閲囪喘璐ф */
+ CAIGOU_HUOKUAN = 60,
+ /**浜屾墜鍥炴敹 */
+ ERSHOU_HUISHOU = 70,
+ /**鍏泭琛ュ姪 */
+ GONGYI_BUZHU = 80,
+ /**鍏朵粬鍦烘櫙 */
+ ZHUANZHANG_QITA = 90,
+ }
+
+ enum EnumEnterpriseWalletExpandindirectOrderStatus {
+ /**瀹℃壒涓� */
+ PROCESSING = 10,
+ /**宸茬敓鏁� */
+ VALID = 20,
+ /**瀹℃壒涓嶉�氳繃 */
+ INVALID = 30,
+ /**宸插簾寮� */
+ DISUSE = 40,
+ /**宸叉挙閿� */
+ REVOKED = 50,
+ }
+
enum EnumEnterpriseWalletSignStatus {
/**鐢宠涓� */
Apply = 10,
@@ -557,6 +604,28 @@
Normal = 100,
/**缁堟 */
Stop = 999,
+ }
+
+ enum EnumEnterpriseWalletTransactionStatus {
+ /**寰呮彁浜� */
+ WaitSubmit = 1,
+ /**寰呮敮浠� */
+ WaitPay = 10,
+ /**澶勭悊涓� */
+ Dealing = 20,
+ /**鎴愬姛 */
+ Success = 30,
+ /**閫�绁� */
+ Refund = 40,
+ /**澶辫触 */
+ Fail = 50,
+ }
+
+ enum EnumEnterpriseWalletTransactionType {
+ /**鍏呭�� */
+ Recharge = 10,
+ /**杞处 */
+ Transfer = 20,
}
enum EnumMenuType {
@@ -753,9 +822,18 @@
Stopped = 100,
}
+ enum EnumTaskSettlementOrderStatus {
+ /**寰呬笂浼� */
+ Wait = 10,
+ /**宸蹭笂浼� */
+ Completed = 20,
+ }
+
enum EnumTaskSettlementStatus {
/**寰呯粨绠� */
Wait = 10,
+ /**缁撶畻涓� */
+ InProcess = 20,
/**宸茬粨绠� */
Completed = 30,
}
@@ -869,24 +947,6 @@
/** 閿欒鐮� */
errorCode?: string;
data?: EnterpriseUserElectronSignCommandResult;
- /** 鎵ц鎴愬姛 */
- success?: boolean;
- /** 閿欒淇℃伅 */
- msg?: any;
- /** 闄勫姞鏁版嵁 */
- extras?: any;
- /** 鏃堕棿鎴� */
- timestamp?: number;
- }
-
- interface FriendlyResultGetAlipayFundExpandindirectOrderQueryResult {
- /** 璺熻釜Id */
- traceId?: string;
- /** 鐘舵�佺爜 */
- code?: number;
- /** 閿欒鐮� */
- errorCode?: string;
- data?: GetAlipayFundExpandindirectOrderQueryResult;
/** 鎵ц鎴愬姛 */
success?: boolean;
/** 閿欒淇℃伅 */
@@ -1203,6 +1263,24 @@
timestamp?: number;
}
+ interface FriendlyResultGetEnterpriseWalletExpandindirectOrderQueryResult {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: GetEnterpriseWalletExpandindirectOrderQueryResult;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
interface FriendlyResultGetEnterpriseWalletQueryResult {
/** 璺熻釜Id */
traceId?: string;
@@ -1211,6 +1289,24 @@
/** 閿欒鐮� */
errorCode?: string;
data?: GetEnterpriseWalletQueryResult;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
+ interface FriendlyResultGetEnterpriseWalletTransactionQueryResult {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: GetEnterpriseWalletTransactionQueryResult;
/** 鎵ц鎴愬姛 */
success?: boolean;
/** 閿欒淇℃伅 */
@@ -1499,6 +1595,60 @@
/** 閿欒鐮� */
errorCode?: string;
data?: GetRoleQueryResult;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
+ interface FriendlyResultGetSettlementTaskQueryResult {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: GetSettlementTaskQueryResult;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
+ interface FriendlyResultGetSettlementTasksQueryResult {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: GetSettlementTasksQueryResult;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
+ interface FriendlyResultGetSettlementTaskUsersQueryResult {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: GetSettlementTaskUsersQueryResult;
/** 鎵ц鎴愬姛 */
success?: boolean;
/** 閿欒淇℃伅 */
@@ -2152,6 +2302,24 @@
timestamp?: number;
}
+ interface FriendlyResultRechargeEnterpriseWalletCommandResult {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: RechargeEnterpriseWalletCommandResult;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
interface FriendlyResultString {
/** 璺熻釜Id */
traceId?: string;
@@ -2187,50 +2355,6 @@
extras?: any;
/** 鏃堕棿鎴� */
timestamp?: number;
- }
-
- interface GetAlipayFundExpandindirectOrderQueryResult {
- /** Id */
- id?: string;
- /** 浜у搧鐮� */
- productCode?: string;
- /** 鍦烘櫙鐮� */
- bizScene?: string;
- /** 澶栭儴鍗曞彿 */
- outBizNo?: string;
- /** 浜岀骇鍟嗘埛淇℃伅-鏍囪瘑 */
- identity?: string;
- /** 浜岀骇鍟嗘埛淇℃伅-鏍囪瘑绫诲瀷 */
- identityType?: string;
- /** 浜岀骇鍟嗘埛淇℃伅-濮撳悕 */
- name?: string;
- /** 涓氬姟绫诲瀷 */
- bizType?: string;
- /** 鍘熻繘浠跺崟id */
- originalOrderId?: string;
- /** 璧勯噾璁拌处鏈殑涓氬姟鍦烘櫙 */
- sceneCode?: string;
- /** 杞处鍦烘櫙璇存槑 */
- sceneDirections?: string;
- /** 杞处鍦烘櫙鎴浘 */
- sceneImage?: string;
- /** 鍟嗘埛琛屼笟璧勮川鍥剧墖鎴栧崗璁枃鏈� */
- sceneQualificationImage?: string;
- /** 鍟嗘埛绔欑偣淇℃伅 */
- sites?: string;
- /** 杩涗欢鍗昳d */
- orderId?: string;
- /** 杩涗欢鍗曠姸鎬�
-瀹℃壒涓�: PROCESSING
-宸茬敓鏁�: VALID
-瀹℃壒涓嶉�氳繃: INVALID
-宸插簾寮�: DISUSE
-宸叉挙閿�: REVOKED */
- status?: string;
- /** 杩涗欢鍗曚换鍔″畬缁撴椂闂� */
- taskFinishTime?: string;
- /** 杩涗欢鍗曞鏍镐笉閫氳繃鍘熷洜 */
- riskReviewRemark?: string;
}
type GetAlipayNotifyCommand = Record<string, any>;
@@ -3008,6 +3132,49 @@
isConfigured?: boolean;
}
+ interface GetEnterpriseWalletExpandindirectOrderQueryResult {
+ /** 鍗曞彿 */
+ outBizNo?: string;
+ /** 鏀粯瀹濈櫥褰曡处鍙� */
+ identity?: string;
+ /** 鏀粯瀹濆鍚� */
+ name?: string;
+ scene?: EnumEnterpriseWalletExpandindirectOrderScene;
+ /** 杞处鍦烘櫙璇存槑 */
+ sceneDirections?: string;
+ /** 鍟嗘埛绔欑偣淇℃伅 */
+ sites?: string;
+ /** 杩涗欢鍗昳d */
+ orderId?: string;
+ orderStatus?: EnumEnterpriseWalletExpandindirectOrderStatus;
+ /** 杩涗欢鍗曚换鍔″畬缁撴椂闂� */
+ taskFinishTime?: string;
+ /** 杩涗欢鍗曞鏍镐笉閫氳繃鍘熷洜 */
+ riskReviewRemark?: string;
+ sitesInfo?: GetEnterpriseWalletExpandindirectOrderQueryResultSites;
+ /** 闄勪欢 */
+ files?: GetEnterpriseWalletExpandindirectOrderQueryResultFile[];
+ }
+
+ interface GetEnterpriseWalletExpandindirectOrderQueryResultFile {
+ type?: EnumEnterpriseWalletExpandindirectOrderFileType;
+ /** 闄勪欢 */
+ file?: string;
+ }
+
+ interface GetEnterpriseWalletExpandindirectOrderQueryResultSites {
+ /** 缃戠珯 */
+ website?: string;
+ /** APP */
+ app?: string;
+ /** 鍏紬鍙� */
+ gongzh?: string;
+ /** 鏀粯瀹濆皬绋嬪簭 */
+ xchengxU_ZHI?: string;
+ /** 鍏朵粬 */
+ qita?: string;
+ }
+
interface GetEnterpriseWalletQueryResult {
/** 閽卞寘Id */
id?: string;
@@ -3023,6 +3190,21 @@
/** 鍗忚澶辨晥鏃堕棿 */
invalidTime?: string;
signStatus?: EnumEnterpriseWalletSignStatus;
+ }
+
+ interface GetEnterpriseWalletTransactionQueryResult {
+ type?: EnumEnterpriseWalletTransactionType;
+ /** 璁㈠崟鍙� */
+ code?: string;
+ /** 閲戦 */
+ amount?: number;
+ /** 浣欓 */
+ balance?: number;
+ /** 澶囨敞 */
+ remark?: string;
+ /** 璁㈠崟鏀粯鏃堕棿 */
+ transDate?: string;
+ transactionStatus?: EnumEnterpriseWalletTransactionStatus;
}
interface GetExceptionLogsQuery {
@@ -3751,6 +3933,131 @@
isChecked?: boolean;
}
+ interface GetSettlementTaskQueryResult {
+ /** Id */
+ id?: string;
+ /** 浠诲姟鍚嶇О */
+ name?: string;
+ /** 浠诲姟鍗曞彿 */
+ code?: string;
+ settlementOrderStatus?: EnumTaskSettlementOrderStatus;
+ /** 缁撶畻鍗曞悕绉� */
+ settlementOrderName?: string;
+ /** 涓婁紶鏃堕棿 */
+ settlementOrderTime?: string;
+ /** 瀹炲彂閲戦 */
+ actualSettlementAmount?: number;
+ /** 缁撶畻閲戦 */
+ settlementAmount?: number;
+ settlementStatus?: EnumTaskSettlementStatus;
+ /** 缁撶畻鏃堕棿 */
+ settlementTime?: string;
+ /** 澶囨敞 */
+ settlementRemark?: string;
+ }
+
+ interface GetSettlementTasksQuery {
+ /** 鍏抽敭瀛� */
+ keywords?: string;
+ settlementOrderStatus?: EnumTaskSettlementOrderStatus;
+ settlementStatus?: EnumTaskSettlementStatus;
+ pageModel?: PagedListQueryPageModel;
+ }
+
+ interface GetSettlementTasksQueryResult {
+ pageModel?: PagedListQueryResultPageModel;
+ /** 鏁版嵁 */
+ data?: GetSettlementTasksQueryResultItem[];
+ }
+
+ interface GetSettlementTasksQueryResultItem {
+ /** 浠诲姟Id */
+ id?: string;
+ /** 浠诲姟鍚嶇О */
+ name?: string;
+ /** 浠诲姟鍗曞彿 */
+ code?: string;
+ settlementOrderStatus?: EnumTaskSettlementOrderStatus;
+ /** 缁撶畻鍗曞悕绉� */
+ settlementOrderName?: string;
+ /** 涓婁紶鏃堕棿 */
+ settlementOrderTime?: string;
+ /** 瀹炲彂閲戦 */
+ actualSettlementAmount?: number;
+ /** 缁撶畻閲戦 */
+ settlementAmount?: number;
+ settlementStatus?: EnumTaskSettlementStatus;
+ /** 缁撶畻鏃堕棿 */
+ settlementTime?: string;
+ /** 澶囨敞 */
+ settlementRemark?: string;
+ /** 缁撶畻浜烘暟 */
+ settlementUserCount?: number;
+ }
+
+ interface GetSettlementTaskUsersQuery {
+ /** 浠诲姟Id */
+ taskInfoId?: string;
+ /** 鍏抽敭瀛� */
+ keywords?: string;
+ /** 缁撶畻鍗曞湴鍧� */
+ settlementOrderUrl?: string;
+ pageModel?: PagedListQueryPageModel;
+ }
+
+ interface GetSettlementTaskUsersQueryResult {
+ /** 閿欒淇℃伅 */
+ errors?: GetSettlementTaskUsersQueryResultError[];
+ pageModel?: PagedListQueryResultPageModel;
+ /** 鏁版嵁 */
+ data?: GetSettlementTaskUsersQueryResultItem[];
+ }
+
+ interface GetSettlementTaskUsersQueryResultError {
+ /** 閿欒淇℃伅 */
+ errorMessage?: string;
+ /** 濮撳悕 */
+ name?: string;
+ /** 韬唤璇佸彿 */
+ identity?: string;
+ /** 缁撶畻閲戦 */
+ settlementAmount?: number;
+ /** 瀹炲彂閲戦 */
+ actualSettlementAmount?: number;
+ /** 鏀舵璐︽埛 */
+ receiveAccount?: string;
+ /** 鎵�灞為摱琛� */
+ bank?: string;
+ /** 寮�鎴锋敮琛屽悕绉� */
+ bankBranch?: string;
+ /** 浠诲姟鍚嶇О */
+ taskName?: string;
+ }
+
+ interface GetSettlementTaskUsersQueryResultItem {
+ /** 浠诲姟鐢ㄦ埛Id */
+ id?: string;
+ /** 濮撳悕 */
+ name?: string;
+ /** 韬唤璇佸彿 */
+ identity?: string;
+ /** 鎵嬫満鍙� */
+ contactPhoneNumber?: string;
+ checkReceiveStatus?: EnumTaskCheckReceiveStatus;
+ /** 鎵�灞為摱琛� */
+ bank?: string;
+ /** 寮�鎴锋敮琛屽悕绉� */
+ bankBranch?: string;
+ /** 鏀舵璐︽埛 */
+ receiveAccount?: string;
+ /** 缁撶畻閲戦 */
+ settlementAmount?: number;
+ /** 瀹炲彂閲戦 */
+ actualSettlementAmount?: number;
+ /** 缁撶畻鏃堕棿 */
+ settlementTime?: string;
+ }
+
interface GetTaskEnterpriseQueryResult {
/** 浼佷笟鍏ㄧО */
enterpriseName?: string;
@@ -4350,6 +4657,8 @@
}
interface OpenEnterpriseWalletCommand {
+ /** 浼佷笟Id */
+ enterpriseId?: string;
access?: EnumEnterpriseWalletAccess;
}
@@ -4464,9 +4773,18 @@
}
interface RechargeEnterpriseWalletCommand {
+ /** 浼佷笟Id */
+ enterpriseId?: string;
access?: EnumEnterpriseWalletAccess;
/** 閲戦 */
amount?: number;
+ /** 鍏呭�煎娉� */
+ remark?: string;
+ }
+
+ interface RechargeEnterpriseWalletCommandResult {
+ /** 鏀粯鍦板潃 */
+ payUrl?: string;
}
interface RegisterPersonalUserCommand {
@@ -4479,6 +4797,11 @@
interface ResendResourceCommand {
/** 璧勬簮鏃ュ織Id */
id?: string;
+ }
+
+ interface RevokeTaskSettlementOrderCommand {
+ /** 浠诲姟Id */
+ taskInfoId?: string;
}
interface SaveContractTemplateCommand {
@@ -4994,6 +5317,37 @@
files?: string[];
}
+ interface SureTaskSettlementCommand {
+ /** 浠诲姟Id */
+ taskInfoId?: string;
+ }
+
+ interface SureTaskSettlementOrderCommand {
+ /** 浠诲姟Id */
+ taskInfoId?: string;
+ /** 缁撶畻鍗曞湴鍧� */
+ settlementOrderUrl?: string;
+ /** 缁撶畻鍚嶅崟 */
+ taskInfoUsers?: SureTaskSettlementOrderCommandUser[];
+ }
+
+ interface SureTaskSettlementOrderCommandUser {
+ /** 浠诲姟鐢ㄦ埛Id */
+ id?: string;
+ /** 濮撳悕 */
+ name?: string;
+ /** 鎵�灞為摱琛� */
+ bank?: string;
+ /** 寮�鎴锋敮琛屽悕绉� */
+ bankBranch?: string;
+ /** 鏀舵璐︽埛 */
+ receiveAccount: string;
+ /** 缁撶畻閲戦 */
+ settlementAmount: number;
+ /** 瀹炲彂閲戦 */
+ actualSettlementAmount: number;
+ }
+
interface SyncElectronSignSettingsCommand {
/** 椤� */
items?: SyncElectronSignSettingsCommandItem[];
@@ -5117,6 +5471,14 @@
remark?: string;
}
+ interface TransferEnterpriseWalletCommand {
+ access?: EnumEnterpriseWalletAccess;
+ /** 閲戦 */
+ amount?: number;
+ /** 鍏呭�煎娉� */
+ remark?: string;
+ }
+
interface UpdatePhoneNumberVerifyCodeCommand {
/** 鎵嬫満鍙风爜 */
phoneNumber: string;
diff --git a/src/views/CPersonManage/components/CPersonDetailDialog.vue b/src/views/CPersonManage/components/CPersonDetailDialog.vue
index 0173529..cd5cb06 100644
--- a/src/views/CPersonManage/components/CPersonDetailDialog.vue
+++ b/src/views/CPersonManage/components/CPersonDetailDialog.vue
@@ -32,6 +32,17 @@
<ProTabPane lazy label="绛剧害璇︽儏" name="sign">
<ProDialogTableWrapper :height="400">
<ProTableV2 v-bind="proTableProps" :columns="column" :show-operation-column="false">
+ <template #contractUrl="{ row }">
+ <PreviewBtn
+ v-if="
+ row.userSignContractStatus === EnumTaskUserSignContractStatus.Pass &&
+ row.contractUrl
+ "
+ :show-download-btn="false"
+ :url="setOSSLink(row.contractUrl)"
+ >
+ </PreviewBtn>
+ </template>
</ProTableV2>
</ProDialogTableWrapper>
</ProTabPane>
@@ -60,6 +71,7 @@
ProFormRadio,
ProFormInputNumber,
defineColumns,
+ PreviewBtn,
} from '@bole-core/components';
import _ from 'lodash';
import * as userServices from '@/services/api/user';
@@ -68,7 +80,9 @@
EnumUserGenderTextForPerson,
EnumTaskUserHireStatusText,
EnumTaskUserSignContractStatusText,
+ EnumTaskUserSignContractStatus,
} from '@/constants';
+import { setOSSLink } from '@/utils';
defineOptions({
name: 'CPersonDetailDialog',
@@ -180,7 +194,12 @@
hireStatus: { type: 'enum', valueEnum: EnumTaskUserHireStatusText },
userSignContractStatus: { type: 'enum', valueEnum: EnumTaskUserSignContractStatusText },
enterpriseSignContractStatus: { type: 'enum', valueEnum: EnumTaskUserSignContractStatusText },
- contractUrl: { type: 'url' },
+ // contractUrl: {
+ // type: 'url',
+ // showDownloadBtn: false,
+ // formatter: (row: API.GetPersonalUserInfoSignContractsQueryResultItem) =>
+ // setOSSLink(row.contractUrl),
+ // },
},
}
);
diff --git a/src/views/EnterpriseManage/components/AlipayWalletOpen.vue b/src/views/EnterpriseManage/components/AlipayWalletOpen.vue
new file mode 100644
index 0000000..f375393
--- /dev/null
+++ b/src/views/EnterpriseManage/components/AlipayWalletOpen.vue
@@ -0,0 +1,24 @@
+<template>
+ <ProDialog title="鏀粯瀹濈绾�" v-model="visible" destroy-on-close draggable>
+ <iframe v-if="form.alipayUrl" width="100%" height="600px" :src="form.alipayUrl"></iframe>
+ </ProDialog>
+</template>
+
+<script setup lang="ts">
+import { ProDialog } from '@bole-core/components';
+
+defineOptions({
+ name: 'AlipayWalletOpen',
+});
+
+type Form = {
+ alipayUrl: string;
+};
+
+const form = defineModel<Form>('form');
+const visible = defineModel({ type: Boolean });
+</script>
+
+<style lang="scss" scoped>
+@use '@/style/common.scss' as *;
+</style>
diff --git a/src/views/EnterpriseManage/components/ConfigureDialog.vue b/src/views/EnterpriseManage/components/ConfigureDialog.vue
index 46b8b87..e094b3c 100644
--- a/src/views/EnterpriseManage/components/ConfigureDialog.vue
+++ b/src/views/EnterpriseManage/components/ConfigureDialog.vue
@@ -118,7 +118,7 @@
</span>
</template>
</ProDialog>
- <QrcodeDialog v-bind="dialogQrcodeProps"></QrcodeDialog>
+ <AlipayWalletOpen v-bind="dialogQrcodeProps"></AlipayWalletOpen>
</template>
<script setup lang="ts">
@@ -144,7 +144,7 @@
EnumElectronSignAccess,
} from '@/constants';
import * as enterpriseWalletServices from '@/services/api/enterpriseWallet';
-import QrcodeDialog from './QrcodeDialog.vue';
+import AlipayWalletOpen from './AlipayWalletOpen.vue';
defineOptions({
name: 'ConfigureDialog',
@@ -161,6 +161,7 @@
smsCost: number;
alipayAccount: string;
alipayMerchantId: string;
+ id: string;
};
const form = defineModel<Form>('form');
@@ -195,7 +196,7 @@
const { dialogProps: dialogQrcodeProps, handleAdd } = useFormDialog({
defaultFormParams: {
- qrcodeUrl: '',
+ alipayUrl: '',
},
});
@@ -203,11 +204,12 @@
try {
let params: API.OpenEnterpriseWalletCommand = {
access: EnumEnterpriseWalletAccess.Alipay,
+ enterpriseId: form.value.id,
};
let res = await enterpriseWalletServices.openEnterpriseWallet(params);
if (res) {
handleAdd({
- qrcodeUrl: res.signUrl,
+ alipayUrl: res.signUrl,
});
}
} catch (error) {}
diff --git a/src/views/FinanceManage/BalanceManage.vue b/src/views/FinanceManage/BalanceManage.vue
new file mode 100644
index 0000000..92ffa1d
--- /dev/null
+++ b/src/views/FinanceManage/BalanceManage.vue
@@ -0,0 +1,135 @@
+<template>
+ <LoadingLayout :loading="state.loading">
+ <AppContainer>
+ <ProTableQueryFilterBar @on-reset="reset">
+ <template #query>
+ <QueryFilterItem>
+ <FieldSelect
+ placeholder="鎵�灞炲叕鍙�"
+ v-model="extraParamState.status"
+ :value-enum="[]"
+ @change="getList()"
+ />
+ </QueryFilterItem>
+ <QueryFilterItem tip-content="浣欓鑼冨洿">
+ <el-input-number
+ v-model="extraParamState.minAmount"
+ placeholder="浣欓鏈�灏忛噾棰�"
+ size="small"
+ style="width: 150px"
+ :controls="false"
+ />~
+ <el-input-number
+ v-model="extraParamState.maxAmount"
+ placeholder="浣欓鏈�澶ч噾棰�"
+ size="small"
+ style="width: 150px"
+ :controls="false"
+ />
+ </QueryFilterItem>
+ <QueryFilterItem>
+ <SearchInput
+ v-model="extraParamState.keyword"
+ style="width: 260px"
+ placeholder="濮撳悕/鎵嬫満鍙�/韬唤璇佸彿"
+ @on-click-search="getList"
+ >
+ </SearchInput>
+ </QueryFilterItem>
+ </template>
+ </ProTableQueryFilterBar>
+ <ProTableV2 v-bind="proTableProps" :columns="column" :operationBtns="operationBtns">
+ </ProTableV2>
+ </AppContainer>
+ <BalanceDetailDialog v-bind="dialogProps" />
+ </LoadingLayout>
+</template>
+
+<script setup lang="ts">
+import {
+ ProTableQueryFilterBar,
+ OperationBtnType,
+ ProTableV2,
+ SearchInput,
+ LoadingLayout,
+ AppContainer,
+ QueryFilterItem,
+ useTable,
+ useFormDialog,
+ FieldSelect,
+} from '@bole-core/components';
+import { useAccess } from '@/hooks';
+import * as enterpriseServices from '@/services/api/enterprise';
+import BalanceDetailDialog from './components/BalanceDetailDialog.vue';
+
+defineOptions({
+ name: 'BalanceManage',
+});
+
+const operationBtnMap: Record<string, OperationBtnType> = {
+ detailBtn: { emits: { onClick: (role) => openDialog(role) } },
+};
+
+const { column, operationBtns } = useAccess({
+ operationBtnMap,
+});
+
+const router = useRouter();
+const BaseState = {
+ loading: true,
+};
+
+const state = reactive({ ...BaseState });
+
+onMounted(async () => {
+ await getList();
+ state.loading = false;
+});
+
+const {
+ getDataSource: getList,
+ proTableProps,
+ paginationState,
+ extraParamState,
+ reset,
+} = useTable(
+ async ({ pageIndex, pageSize }, extraParamState) => {
+ try {
+ let params: API.GetEnterprisesQuery = {
+ pageModel: {
+ rows: pageSize,
+ page: pageIndex,
+ orderInput: extraParamState.orderInput,
+ },
+ // searchKeys: extraParamState.keyword,
+ };
+ let res = await enterpriseServices.getEnterprises(params, {
+ showLoading: !state.loading,
+ });
+ return res;
+ } catch (error) {}
+ },
+ {
+ defaultExtraParams: {
+ keyword: '',
+ status: '',
+ minAmount: null as number,
+ maxAmount: null as number,
+ orderInput: [{ property: 'id', order: EnumPagedListOrder.Asc }],
+ },
+ columnsRenderProps: {},
+ }
+);
+
+const { dialogProps, handleEdit, editForm } = useFormDialog({
+ defaultFormParams: {
+ id: '',
+ },
+});
+
+function openDialog(row) {
+ handleEdit({
+ id: row.id,
+ });
+}
+</script>
diff --git a/src/views/FinanceManage/FinanceManageList.vue b/src/views/FinanceManage/FinanceManageList.vue
index fc1c742..183bcca 100644
--- a/src/views/FinanceManage/FinanceManageList.vue
+++ b/src/views/FinanceManage/FinanceManageList.vue
@@ -1,54 +1,6 @@
<template>
<LoadingLayout :loading="state.loading">
<AppContainer>
- <ProTableQueryFilterBar @on-reset="reset">
- <template #query>
- <QueryFilterItem tip-content="鍙戝竷鐘舵��">
- <FieldRadio
- v-model="extraParamState.status"
- :value-enum="[
- { value: true, label: '鍙戝竷涓�' },
- { value: false, label: '宸插仠姝�' },
- ]"
- buttonStyle
- showAllBtn
- @change="getList()"
- />
- </QueryFilterItem>
- <QueryFilterItem tip-content="鎺ㄨ崘鐘舵��">
- <FieldRadio
- v-model="extraParamState.status"
- :value-enum="[
- { value: true, label: '宸叉帹鑽�' },
- { value: false, label: '鏈帹鑽�' },
- ]"
- buttonStyle
- showAllBtn
- @change="getList()"
- />
- </QueryFilterItem>
- <QueryFilterItem tip-content="鍙戝竷鏃堕棿">
- <FieldDatePicker
- v-model="extraParamState.beginDate"
- type="daterange"
- range-separator="~"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- clearable
- @change="getList()"
- ></FieldDatePicker>
- </QueryFilterItem>
- <QueryFilterItem>
- <SearchInput
- v-model="extraParamState.keyword"
- style="width: 260px"
- placeholder="浠诲姟鍚嶇О"
- @on-click-search="getList"
- >
- </SearchInput>
- </QueryFilterItem>
- </template>
- </ProTableQueryFilterBar>
<ProTableV2 v-bind="proTableProps" :columns="column" :operationBtns="operationBtns">
</ProTableV2>
</AppContainer>
@@ -58,16 +10,11 @@
<script setup lang="ts">
import {
- ProTableQueryFilterBar,
OperationBtnType,
ProTableV2,
- SearchInput,
LoadingLayout,
AppContainer,
- QueryFilterItem,
useTable,
- FieldDatePicker,
- FieldRadio,
useFormDialog,
} from '@bole-core/components';
import { useAccess } from '@/hooks';
diff --git a/src/views/FinanceManage/components/BalanceDetailDialog.vue b/src/views/FinanceManage/components/BalanceDetailDialog.vue
new file mode 100644
index 0000000..a81d09f
--- /dev/null
+++ b/src/views/FinanceManage/components/BalanceDetailDialog.vue
@@ -0,0 +1,141 @@
+<template>
+ <ProDialog title="浣欓鏄庣粏" v-model="visible" destroy-on-close draggable>
+ <ProDialogTableWrapper :height="500">
+ <ProTableQueryFilterBar @on-reset="reset">
+ <template #query>
+ <QueryFilterItem>
+ <FieldSelect
+ v-model="extraParamState.status"
+ :valueEnum="[]"
+ clearable
+ filterable
+ placeholder="浜ゆ槗绫诲瀷"
+ />
+ </QueryFilterItem>
+ <QueryFilterItem tip-content="鏌ヨ鏃ユ湡">
+ <FieldDatePicker
+ v-model="extraParamState.creationTime"
+ type="daterange"
+ range-separator="~"
+ start-placeholder="璧峰鏃ユ湡"
+ end-placeholder="鎴鏃ユ湡"
+ clearable
+ @change="getList()"
+ ></FieldDatePicker>
+ </QueryFilterItem>
+ </template>
+ </ProTableQueryFilterBar>
+ <ProTableV2 v-bind="proTableProps" :columns="columns" :showOperationColumn="false">
+ </ProTableV2>
+ </ProDialogTableWrapper>
+ </ProDialog>
+</template>
+
+<script setup lang="ts">
+import {
+ defineColumns,
+ ProDialog,
+ useTable,
+ ProDialogTableWrapper,
+ QueryFilterItem,
+ FieldDatePicker,
+ FieldSelect,
+ ProTableV2,
+ ProTableQueryFilterBar,
+} from '@bole-core/components';
+import * as enterpriseServices from '@/services/api/enterprise';
+import { ModelValueType } from 'element-plus';
+
+defineOptions({
+ name: 'FinanceDetailDialog',
+});
+
+type Form = {
+ id?: string;
+};
+
+const visible = defineModel({ type: Boolean });
+const form = defineModel<Form>('form');
+
+const emit = defineEmits<{
+ (e: 'update:modelValue', value: boolean): void;
+ (e: 'onCancel'): void;
+}>();
+
+const columns = defineColumns([
+ {
+ id: '1',
+ enCode: 'name',
+ name: '浜ゆ槗鏃堕棿',
+ },
+ {
+ id: '2',
+ enCode: 'name',
+ name: '鏀跺叆',
+ },
+ {
+ id: '3',
+ enCode: 'name',
+ name: '鏀嚭',
+ },
+ {
+ id: '4',
+ enCode: 'name',
+ name: '璐︽埛浣欓',
+ },
+ {
+ id: '4',
+ enCode: 'name',
+ name: '瀵规柟甯愬彿/鎴峰悕',
+ },
+ {
+ id: '4',
+ enCode: 'name',
+ name: '鐢ㄩ��',
+ },
+]);
+
+watch(
+ () => visible.value,
+ (value) => {
+ if (value) {
+ getList();
+ }
+ }
+);
+
+const {
+ getDataSource: getList,
+ proTableProps,
+ paginationState,
+ extraParamState,
+ reset,
+} = useTable(
+ async ({ pageIndex, pageSize }, extraParamState) => {
+ try {
+ let params: API.GetEnterprisesQuery = {
+ pageModel: {
+ rows: pageSize,
+ page: pageIndex,
+ orderInput: extraParamState.orderInput,
+ },
+ // searchKeys: extraParamState.keyword,
+ };
+ let res = await enterpriseServices.getEnterprises(params);
+ return res;
+ } catch (error) {}
+ },
+ {
+ defaultExtraParams: {
+ status: '',
+ creationTime: [] as unknown as ModelValueType,
+ orderInput: [{ property: 'id', order: EnumPagedListOrder.Asc }],
+ },
+ columnsRenderProps: {},
+ }
+);
+</script>
+
+<style lang="scss" scoped>
+@use '@/style/common.scss' as *;
+</style>
diff --git a/src/views/FinanceManage/components/FinanceDetailDialog.vue b/src/views/FinanceManage/components/FinanceDetailDialog.vue
index 899ce02..ffa1459 100644
--- a/src/views/FinanceManage/components/FinanceDetailDialog.vue
+++ b/src/views/FinanceManage/components/FinanceDetailDialog.vue
@@ -18,7 +18,7 @@
});
type Form = {
- name?: string;
+ id?: string;
};
const visible = defineModel({ type: Boolean });
@@ -34,62 +34,62 @@
columns: [
{
label: '浠樻浜鸿处鎴�',
- key: 'name',
+ key: 'id',
type: 'text',
},
{
label: '鏀舵浜鸿处鎴�',
- key: 'name',
+ key: 'id',
type: 'text',
},
{
label: '浠樻浜哄悕绉�',
- key: 'name',
+ key: 'id',
type: 'text',
},
{
label: '鏀舵浜哄悕绉�',
- key: 'name',
+ key: 'id',
type: 'text',
},
{
label: '浠樻浜哄紑鎴疯',
- key: 'name',
+ key: 'id',
type: 'text',
},
{
label: '鏀舵浜哄紑鎴疯',
- key: 'name',
+ key: 'id',
type: 'text',
},
{
label: '甯佺',
- key: 'name',
+ key: 'id',
type: 'text',
},
{
label: '浜ゆ槗閲戦',
- key: 'name',
+ key: 'id',
type: 'money',
},
{
label: '鐢ㄩ��',
- key: 'name',
+ key: 'id',
type: 'text',
},
{
label: '鎽樿',
- key: 'name',
+ key: 'id',
type: 'text',
},
{
label: '浜ゆ槗鏃堕棿',
- key: 'name',
+ key: 'id',
type: 'text',
},
{
label: '浜ゆ槗鐘舵��',
- key: 'name',
+ key: 'id',
type: 'text',
},
],
--
Gitblit v1.9.1