From 258b6ce3a359bceb354ca3ea55c73bfb0cad0dc1 Mon Sep 17 00:00:00 2001 From: wupengfei <834520024@qq.com> Date: 星期四, 04 九月 2025 17:47:14 +0800 Subject: [PATCH] feat: 页面 --- src/views/ServiceChargeManage/constants/columns.ts | 49 - src/hooks/useEvent.ts | 1 src/views/ServiceChargeManage/ServiceChargeDetail.vue | 86 ++ src/constants/task.ts | 11 .eslintrc-auto-import.json | 10 src/services/api/typings.d.ts | 602 ++++++++++++++++++++++- src/views/ServiceChargeManage/ServiceChargeManage.vue | 167 ++++-- src/views/ServiceChargeManage/components/SettleDetailDialog.vue | 16 src/services/api/enterpriseWallet.ts | 315 ++++++++++++ src/services/api/taskUser.ts | 18 src/services/api/task.ts | 75 +++ src/services/api/index.ts | 8 auto-imports.d.ts | 22 src/constants/apiEnum.ts | 94 +++ 14 files changed, 1,323 insertions(+), 151 deletions(-) diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json index 649d418..7afcca3 100644 --- a/.eslintrc-auto-import.json +++ b/.eslintrc-auto-import.json @@ -29,6 +29,13 @@ "EnumEnterpriseCostStatus": true, "EnumEnterpriseCostType": true, "EnumEnterpriseRealMethod": true, + "EnumEnterpriseWalletAccess": true, + "EnumEnterpriseWalletExpandindirectOrderFileType": true, + "EnumEnterpriseWalletExpandindirectOrderScene": true, + "EnumEnterpriseWalletExpandindirectOrderStatus": true, + "EnumEnterpriseWalletSignStatus": true, + "EnumEnterpriseWalletTransactionStatus": true, + "EnumEnterpriseWalletTransactionType": true, "EnumMenuType": true, "EnumMenuVisitLevel": true, "EnumOcrAccess": true, @@ -54,7 +61,10 @@ "EnumTaskReleaseStatus": true, "EnumTaskReleaseStatusText": true, "EnumTaskReleaseStatusTextForTip": true, + "EnumTaskSettlementOrderStatus": true, + "EnumTaskSettlementOrderStatusText": true, "EnumTaskSettlementStatus": true, + "EnumTaskSettlementStatusText": true, "EnumTaskStatus": true, "EnumTaskStatusText": true, "EnumTaskUserArrangeStatus": true, diff --git a/auto-imports.d.ts b/auto-imports.d.ts index 50dfe20..c4782fe 100644 --- a/auto-imports.d.ts +++ b/auto-imports.d.ts @@ -33,6 +33,13 @@ const EnumEnterpriseCostStatus: typeof import('./src/constants/apiEnum')['EnumEnterpriseCostStatus'] 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'] @@ -59,7 +66,10 @@ const EnumTaskReleaseStatus: typeof import('./src/constants/apiEnum')['EnumTaskReleaseStatus'] const EnumTaskReleaseStatusText: typeof import('./src/constants/task')['EnumTaskReleaseStatusText'] const EnumTaskReleaseStatusTextForTip: typeof import('./src/constants/task')['EnumTaskReleaseStatusTextForTip'] + const EnumTaskSettlementOrderStatus: typeof import('./src/constants/apiEnum')['EnumTaskSettlementOrderStatus'] + const EnumTaskSettlementOrderStatusText: typeof import('./src/constants/task')['EnumTaskSettlementOrderStatusText'] const EnumTaskSettlementStatus: typeof import('./src/constants/apiEnum')['EnumTaskSettlementStatus'] + const EnumTaskSettlementStatusText: typeof import('./src/constants/task')['EnumTaskSettlementStatusText'] const EnumTaskStatus: typeof import('./src/constants/apiEnum')['EnumTaskStatus'] const EnumTaskStatusText: typeof import('./src/constants/task')['EnumTaskStatusText'] const EnumTaskUserArrangeStatus: typeof import('./src/constants/apiEnum')['EnumTaskUserArrangeStatus'] @@ -226,7 +236,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, 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, 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 { CategoryCode, IdentityCodeEnum, EducationCodeEnum, CertificateTypeCodeEnum, WelfareCodeEnum } from './src/constants/dic' @@ -284,6 +294,13 @@ readonly EnumEnterpriseCostStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseCostStatus']> 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']> @@ -309,7 +326,10 @@ readonly EnumTaskReleaseStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskReleaseStatus']> readonly EnumTaskReleaseStatusText: UnwrapRef<typeof import('./src/constants/task')['EnumTaskReleaseStatusText']> readonly EnumTaskReleaseStatusTextForTip: UnwrapRef<typeof import('./src/constants/task')['EnumTaskReleaseStatusTextForTip']> + readonly EnumTaskSettlementOrderStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskSettlementOrderStatus']> + readonly EnumTaskSettlementOrderStatusText: UnwrapRef<typeof import('./src/constants/task')['EnumTaskSettlementOrderStatusText']> 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']> readonly EnumTaskStatusText: UnwrapRef<typeof import('./src/constants/task')['EnumTaskStatusText']> readonly EnumTaskUserArrangeStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskUserArrangeStatus']> diff --git a/src/constants/apiEnum.ts b/src/constants/apiEnum.ts index 0181980..1045c37 100644 --- a/src/constants/apiEnum.ts +++ b/src/constants/apiEnum.ts @@ -95,6 +95,90 @@ Identity4 = 20, } +/** 浼佷笟閽卞寘閫氶亾 */ +export enum EnumEnterpriseWalletAccess { + /**鏀粯瀹� */ + 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 { + /**鐢宠涓� */ + Apply = 10, + /**宸茬绾� */ + 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, +} + /** 鑿滃崟绫诲瀷 */ export enum EnumMenuType { /**鑿滃崟 */ @@ -307,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/task.ts b/src/constants/task.ts index 79bf326..6cf4a5e 100644 --- a/src/constants/task.ts +++ b/src/constants/task.ts @@ -73,3 +73,14 @@ [EnumTaskUserSubmitCheckReceiveStatus.Success]: '楠屾敹閫氳繃', [EnumTaskUserSubmitCheckReceiveStatus.Fail]: '楠屾敹鏈�氳繃', }; + +export const EnumTaskSettlementOrderStatusText = { + [EnumTaskSettlementOrderStatus.Wait]: '寰呬笂浼�', + [EnumTaskSettlementOrderStatus.Completed]: '宸蹭笂浼�', +}; + +export const EnumTaskSettlementStatusText = { + [EnumTaskSettlementStatus.Wait]: '寰呯粨绠�', + [EnumTaskSettlementStatus.InProcess]: '缁撶畻涓�', + [EnumTaskSettlementStatus.Completed]: '宸茬粨绠�', +}; diff --git a/src/hooks/useEvent.ts b/src/hooks/useEvent.ts index f897656..3d01572 100644 --- a/src/hooks/useEvent.ts +++ b/src/hooks/useEvent.ts @@ -5,6 +5,7 @@ 'home:add': any; 'taskManage:add': any; 'taskManage:edit': any; + sureTaskSettlementOrder: any; checkReceiveTask: any; }; diff --git a/src/services/api/enterpriseWallet.ts b/src/services/api/enterpriseWallet.ts index 343ba99..b03ba6d 100644 --- a/src/services/api/enterpriseWallet.ts +++ b/src/services/api/enterpriseWallet.ts @@ -2,13 +2,322 @@ // @ts-ignore import { request } from '@/utils/request'; -/** 鏀粯瀹濈敤鎴锋巿鏉冨崗璁绾﹂�氱煡 POST /api/user/enterpriseWallet/alipayUserAgreementPageSignNotify */ -export async function alipayUserAgreementPageSignNotify( - body: API.AlipayUserAgreementPageSignNotifyQuery, +/** 鏀粯瀹濊祫閲戜簩绾у晢鎴稫YB浠h繘浠剁姸鎬侀�氱煡 POST /api/user/enterpriseWallet/alipayFundExpandindirectCreateNotify */ +export async function alipayFundExpandindirectCreateNotify( + body: { + /** 閫氱煡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; + }, options?: API.RequestConfig ) { + const formData = new FormData(); + + Object.keys(body).forEach((ele) => { + const item = (body as any)[ele]; + + if (item !== undefined && item !== null) { + formData.append( + ele, + typeof item === 'object' && !(item instanceof File) ? JSON.stringify(item) : item + ); + } + }); + + return request<string>('/api/user/enterpriseWallet/alipayFundExpandindirectCreateNotify', { + method: 'POST', + data: formData, + requestType: 'form', + ...(options || {}), + }); +} + +/** 璧勯噾鍗曟嵁鐘舵�佸彉鏇撮�氱煡 POST /api/user/enterpriseWallet/alipayFundTransOrderChangedNotify */ +export async function alipayFundTransOrderChangedNotify( + body: { + /** 閫氱煡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; + }, + options?: API.RequestConfig +) { + const formData = new FormData(); + + Object.keys(body).forEach((ele) => { + const item = (body as any)[ele]; + + if (item !== undefined && item !== null) { + formData.append( + ele, + typeof item === 'object' && !(item instanceof File) ? JSON.stringify(item) : item + ); + } + }); + + return request<boolean>('/api/user/enterpriseWallet/alipayFundTransOrderChangedNotify', { + method: 'POST', + data: formData, + requestType: 'form', + ...(options || {}), + }); +} + +/** 鏀粯瀹濈敤鎴锋巿鏉冨崗璁绾﹂�氱煡 POST /api/user/enterpriseWallet/alipayUserAgreementPageSignNotify */ +export async function alipayUserAgreementPageSignNotify( + body: { + notify_id?: string; + notify_time?: string; + sign_type?: string; + sign?: string; + invalid_time?: string; + sign_scene?: string; + sign_time?: string; + alipay_user_id?: string; + status?: string; + forex_eligible?: string; + external_logon_id?: string; + app_id?: string; + auth_app_id?: string; + external_agreement_no?: string; + personal_product_code?: string; + valid_time?: string; + agreement_no?: string; + zm_open_id?: string; + alipay_open_id?: string; + merchant_app_id?: string; + alipay_logon_id?: string; + notify_type?: string; + zm_score?: string; + single_quota?: string; + login_token?: string; + device_id?: string; + credit_auth_mode?: string; + specified_sort_assets?: string; + partner_id?: string; + modify_type?: string; + next_deduct_time?: string; + }, + options?: API.RequestConfig +) { + const formData = new FormData(); + + Object.keys(body).forEach((ele) => { + const item = (body as any)[ele]; + + if (item !== undefined && item !== null) { + formData.append( + ele, + typeof item === 'object' && !(item instanceof File) ? JSON.stringify(item) : item + ); + } + }); + return request<boolean>('/api/user/enterpriseWallet/alipayUserAgreementPageSignNotify', { method: 'POST', + data: formData, + requestType: 'form', + ...(options || {}), + }); +} + +/** 鍏抽棴浼佷笟閽卞寘 POST /api/user/enterpriseWallet/closeEnterpriseWallet */ +export async function closeEnterpriseWallet( + body: API.CloseEnterpriseWalletCommand, + options?: API.RequestConfig +) { + return request<string>('/api/user/enterpriseWallet/closeEnterpriseWallet', { + method: 'POST', + headers: { + 'Content-Type': 'application/json-patch+json', + }, + data: body, + ...(options || {}), + }); +} + +/** 鏀粯瀹濊祫閲戜簩绾у晢鎴稫YB浠h繘浠� POST /api/user/enterpriseWallet/enterpriseWalletExpandindirectCreate */ +export async function enterpriseWalletExpandindirectCreate( + body: API.EnterpriseWalletExpandindirectCreateCommand, + options?: API.RequestConfig +) { + 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 */ +export async function getAlipayNotify( + body: API.GetAlipayNotifyCommand, + options?: API.RequestConfig +) { + const formData = new FormData(); + + Object.keys(body).forEach((ele) => { + const item = (body as any)[ele]; + + if (item !== undefined && item !== null) { + formData.append( + ele, + typeof item === 'object' && !(item instanceof File) ? JSON.stringify(item) : item + ); + } + }); + + return request<boolean>('/api/user/enterpriseWallet/getAlipayNotify', { + method: 'GET', + data: formData, + requestType: 'form', + ...(options || {}), + }); +} + +/** 鏌ヨ浼佷笟閽卞寘璇︽儏 GET /api/user/enterpriseWallet/getEnterpriseWallet */ +export async function getEnterpriseWallet( + // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄) + params: API.APIgetEnterpriseWalletParams, + options?: API.RequestConfig +) { + return request<API.GetEnterpriseWalletQueryResult>( + '/api/user/enterpriseWallet/getEnterpriseWallet', + { + method: 'GET', + params: { + ...params, + }, + ...(options || {}), + } + ); +} + +/** 鏌ヨ鏀粯瀹濊祫閲戜簩绾у晢鎴稫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, + options?: API.RequestConfig +) { + return request<API.OpenEnterpriseWalletCommandResult>( + '/api/user/enterpriseWallet/openEnterpriseWallet', + { + method: 'POST', + headers: { + 'Content-Type': 'application/json-patch+json', + }, + data: body, + ...(options || {}), + } + ); +} + +/** 浼佷笟閽卞寘鍏呭�� POST /api/user/enterpriseWallet/rechargeEnterpriseWallet */ +export async function rechargeEnterpriseWallet( + body: API.RechargeEnterpriseWalletCommand, + options?: API.RequestConfig +) { + 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 e230365..76b273c 100644 --- a/src/services/api/index.ts +++ b/src/services/api/index.ts @@ -6,10 +6,11 @@ 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'; import * as userResume from './userResume'; import * as auth from './auth'; @@ -17,17 +18,17 @@ import * as taskUser from './taskUser'; import * as menu from './menu'; import * as logRecords from './logRecords'; -import * as enterpriseWallet from './enterpriseWallet'; import * as fileUtils from './fileUtils'; export default { enterpriseEmployee, user, role, ocrUtils, + task, enterprise, resource, - task, dictionary, + enterpriseWallet, electronSign, userResume, auth, @@ -35,6 +36,5 @@ taskUser, menu, logRecords, - enterpriseWallet, fileUtils, }; 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 6f6f2fa..5aa46b1 100644 --- a/src/services/api/typings.d.ts +++ b/src/services/api/typings.d.ts @@ -3,35 +3,6 @@ [key: string]: any; } - interface AlipayUserAgreementPageSignNotifyQuery { - /** 鍗忚浜у搧鐮侊紝鍟嗘埛鍜屾敮浠樺疂绛剧害鏃剁‘瀹氾紝涓嶅悓涓氬姟鍦烘櫙瀵瑰簲涓嶅悓鐨勭绾︿骇鍝佺爜銆� */ - personal_product_code?: string; - /** 褰撳墠绛剧害鐨勫崗璁満鏅�� */ - sign_scene?: string; - /** NORMAL 鍗忚褰撳墠鐘舵�� 1. TEMP锛氭殏瀛橈紝鍗忚鏈敓鏁堣繃锛� 2. NORMAL锛氭甯革紱 3. STOP锛氭殏鍋� */ - status?: string; - /** 鐢ㄦ埛绛剧害鐨勬敮浠樺疂璐﹀彿瀵瑰簲鐨勬敮浠樺疂鍞竴鐢ㄦ埛鍙枫�� 浠�2088寮�澶寸殑16浣嶇函鏁板瓧缁勬垚銆� */ - alipay_user_id?: string; - /** 鏀粯瀹濈郴缁熶腑鐢ㄤ互鍞竴鏍囪瘑鐢ㄦ埛绛剧害璁板綍鐨勭紪鍙枫�� */ - agreement_no?: string; - /** 鏀粯瀹濅唬鎵e崗璁殑瀹為檯绛剧害鏃堕棿锛屾牸寮忎负yyyy-MM-dd HH:mm:ss銆� */ - sign_time?: string; - /** 鐢ㄦ埛鍦ㄥ晢鎴风綉绔欑殑鐧诲綍璐﹀彿锛屽鏋滃晢鎴锋帴鍙d腑鏈紶锛屽垯涓嶄細杩斿洖 */ - external_logon_id?: string; - /** 鏀粯瀹濆垎閰嶇粰寮�鍙戣�呯殑搴旂敤Id */ - app_id?: string; - /** 鏀粯瀹濆垎閰嶇粰鍟嗘埛鐨勫簲鐢↖d */ - auth_app_id?: string; - /** 浠f墸鍗忚涓爣绀虹敤鎴风殑鍞竴绛剧害鍙凤紙纭繚鍦ㄥ晢鎴风郴缁熶腑鍞竴锛夈�� */ - external_agreement_no?: string; - /** 鐢ㄦ埛浠f墸鍗忚鐨勫疄闄呯敓鏁堟椂闂达紝鏍煎紡涓簓yyy-MM-dd HH:mm:ss銆� */ - valid_time?: string; - /** 杩斿洖鑴辨晱鐨勬敮浠樺疂璐﹀彿銆� */ - alipay_logon_id?: string; - /** 鐢ㄦ埛绛剧害鎴愬姛閫氱煡绫诲瀷 */ - notify_type?: string; - } - interface APIcheckHealthParams { /** 鍋ュ悍鏍¢獙 */ request?: CheckHealthQuery; @@ -132,6 +103,23 @@ id?: string; } + interface APIgetEnterpriseWalletExpandindirectOrderParams { + /** 浼佷笟Id */ + enterpriseId?: string; + } + + interface APIgetEnterpriseWalletParams { + /** 浼佷笟Id */ + enterpriseId?: string; + /** 閫氶亾 */ + access?: EnumEnterpriseWalletAccess; + } + + interface APIgetEnterpriseWalletTransactionParams { + /** 浜ゆ槗Id */ + id?: string; + } + interface APIgetFileUrlParams { /** 鍦板潃 */ url?: string; @@ -192,6 +180,11 @@ interface APIgetRoleUserInfosParams { /** 瑙掕壊Id */ roleId?: string; + } + + interface APIgetSettlementTaskParams { + /** Id */ + id?: string; } interface APIgetTaskEnterpriseParams { @@ -344,6 +337,12 @@ type ClearTaskCollectCommand = Record<string, any>; + interface CloseEnterpriseWalletCommand { + /** 浼佷笟Id */ + enterpriseId?: string; + access?: EnumEnterpriseWalletAccess; + } + interface CollectTaskCommand { /** 浠诲姟Id */ ids?: string[]; @@ -430,6 +429,45 @@ 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 { /**鎸夋湀 */ Month = 10, @@ -511,6 +549,83 @@ Identity3 = 10, /**浼佷笟鍥涜绱� */ Identity4 = 20, + } + + enum EnumEnterpriseWalletAccess { + /**鏀粯瀹� */ + 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, + /**宸茬绾� */ + 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 { @@ -707,9 +822,18 @@ Stopped = 100, } + enum EnumTaskSettlementOrderStatus { + /**寰呬笂浼� */ + Wait = 10, + /**宸蹭笂浼� */ + Completed = 20, + } + enum EnumTaskSettlementStatus { /**寰呯粨绠� */ Wait = 10, + /**缁撶畻涓� */ + InProcess = 20, /**宸茬粨绠� */ Completed = 30, } @@ -1139,6 +1263,60 @@ 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; + /** 鐘舵�佺爜 */ + code?: number; + /** 閿欒鐮� */ + 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; + /** 閿欒淇℃伅 */ + msg?: any; + /** 闄勫姞鏁版嵁 */ + extras?: any; + /** 鏃堕棿鎴� */ + timestamp?: number; + } + interface FriendlyResultGetExceptionLogsQueryResult { /** 璺熻釜Id */ traceId?: string; @@ -1417,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; /** 閿欒淇℃伅 */ @@ -1944,6 +2176,24 @@ timestamp?: number; } + interface FriendlyResultOpenEnterpriseWalletCommandResult { + /** 璺熻釜Id */ + traceId?: string; + /** 鐘舵�佺爜 */ + code?: number; + /** 閿欒鐮� */ + errorCode?: string; + data?: OpenEnterpriseWalletCommandResult; + /** 鎵ц鎴愬姛 */ + success?: boolean; + /** 閿欒淇℃伅 */ + msg?: any; + /** 闄勫姞鏁版嵁 */ + extras?: any; + /** 鏃堕棿鎴� */ + timestamp?: number; + } + interface FriendlyResultPagedListQueryResultGetDictionaryCategoriesQueryResultItem { /** 璺熻釜Id */ traceId?: string; @@ -2052,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; @@ -2088,6 +2356,8 @@ /** 鏃堕棿鎴� */ timestamp?: number; } + + type GetAlipayNotifyCommand = Record<string, any>; type GetAliyunOSSAcsQuery = Record<string, any>; @@ -2862,6 +3132,81 @@ 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; + access?: EnumEnterpriseWalletAccess; + /** 鍗忚鍙� */ + code?: string; + /** 閫氶亾鍗忚鍙� */ + agreementNo?: string; + /** 鍗忚绛剧害鏃堕棿 */ + signTime?: string; + /** 鍗忚鐢熸晥鏃堕棿 */ + validTime?: string; + /** 鍗忚澶辨晥鏃堕棿 */ + invalidTime?: string; + signStatus?: EnumEnterpriseWalletSignStatus; + } + + interface GetEnterpriseWalletTransactionQueryResult { + type?: EnumEnterpriseWalletTransactionType; + /** 璁㈠崟鍙� */ + code?: string; + /** 閲戦 */ + amount?: number; + /** 浣欓 */ + balance?: number; + /** 澶囨敞 */ + remark?: string; + /** 璁㈠崟鏀粯鏃堕棿 */ + transDate?: string; + transactionStatus?: EnumEnterpriseWalletTransactionStatus; + } + interface GetExceptionLogsQuery { /** 璺熻釜Id */ traceId?: string; @@ -3248,6 +3593,8 @@ avatar?: string; /** 濮撳悕 */ name?: string; + /** 鎵嬫満鍙� */ + contactPhoneNumber?: string; /** 鏄惁瀹炲悕 */ isReal?: boolean; realMethod?: EnumUserRealMethod; @@ -3260,6 +3607,8 @@ } interface GetPersonalUserElectronSignQueryResult { + /** 鐏靛伐Id */ + id?: string; /** 鍚堝悓缂栧彿 */ contractCode?: string; contractTemplateAccess?: EnumElectronSignAccess; @@ -3582,6 +3931,131 @@ userName?: string; /** 鏄惁閫変腑 */ 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 { @@ -4182,6 +4656,17 @@ isBindPhoneNumber?: boolean; } + interface OpenEnterpriseWalletCommand { + /** 浼佷笟Id */ + enterpriseId?: string; + access?: EnumEnterpriseWalletAccess; + } + + interface OpenEnterpriseWalletCommandResult { + /** 绛剧害鍦板潃 */ + signUrl?: string; + } + interface PagedListQueryPageModel { /** 琛屾暟 */ rows?: number; @@ -4287,6 +4772,21 @@ verifyCode: string; } + interface RechargeEnterpriseWalletCommand { + /** 浼佷笟Id */ + enterpriseId?: string; + access?: EnumEnterpriseWalletAccess; + /** 閲戦 */ + amount?: number; + /** 鍏呭�煎娉� */ + remark?: string; + } + + interface RechargeEnterpriseWalletCommandResult { + /** 鏀粯鍦板潃 */ + payUrl?: string; + } + interface RegisterPersonalUserCommand { /** 鎵嬫満鍙风爜 */ phoneNumber: string; @@ -4297,6 +4797,11 @@ interface ResendResourceCommand { /** 璧勬簮鏃ュ織Id */ id?: string; + } + + interface RevokeTaskSettlementOrderCommand { + /** 浠诲姟Id */ + taskInfoId?: string; } interface SaveContractTemplateCommand { @@ -4812,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[]; @@ -4935,6 +5471,14 @@ remark?: string; } + interface TransferEnterpriseWalletCommand { + access?: EnumEnterpriseWalletAccess; + /** 閲戦 */ + amount?: number; + /** 鍏呭�煎娉� */ + remark?: string; + } + interface UpdatePhoneNumberVerifyCodeCommand { /** 鎵嬫満鍙风爜 */ phoneNumber: string; diff --git a/src/views/ServiceChargeManage/ServiceChargeDetail.vue b/src/views/ServiceChargeManage/ServiceChargeDetail.vue index 0f4c891..756a31a 100644 --- a/src/views/ServiceChargeManage/ServiceChargeDetail.vue +++ b/src/views/ServiceChargeManage/ServiceChargeDetail.vue @@ -10,22 +10,21 @@ </ProFormItemV2> </ProFormColItem> <ProFormColItem :span="8"> - <ProFormItemV2 label="浠诲姟缂栧彿:" prop="name"> - <ProFormText v-model="form.name"> </ProFormText> + <ProFormItemV2 label="浠诲姟缂栧彿:" prop="code"> + <ProFormText v-model="form.code"> </ProFormText> </ProFormItemV2> </ProFormColItem> - <ProFormColItem :span="8"></ProFormColItem> </ProFormCol> <ProFormCol> <ProFormColItem :span="8"> - <ProFormItemV2 label="缁撶畻鍗曞悕绉�:" prop="name"> - <ProFormText v-model="form.name"> </ProFormText> + <ProFormItemV2 label="缁撶畻鍗曞悕绉�:" prop="settlementOrderName"> + <ProFormText v-model="form.settlementOrderName"> </ProFormText> </ProFormItemV2> </ProFormColItem> <ProFormColItem :span="8"> - <ProFormItemV2 label="涓婁紶鏃堕棿:" prop="name"> + <ProFormItemV2 label="涓婁紶鏃堕棿:" prop="settlementOrderTime"> <ProFormDatePicker - v-model="form.name" + v-model="form.settlementOrderTime" type="date" format="YYYY-MM-DD HH:mm" ></ProFormDatePicker> @@ -34,13 +33,13 @@ </ProFormCol> <ProFormCol> <ProFormColItem :span="8"> - <ProFormItemV2 label="缁撶畻閲戦:" prop="money"> - <ProFormInputNumber v-model="form.money"> </ProFormInputNumber> + <ProFormItemV2 label="缁撶畻閲戦:" prop="settlementAmount"> + <ProFormInputNumber v-model="form.settlementAmount"> </ProFormInputNumber> </ProFormItemV2> </ProFormColItem> <ProFormColItem :span="8"> - <ProFormItemV2 label="瀹炲彂閲戦:" prop="money"> - <ProFormInputNumber v-model="form.money"> </ProFormInputNumber> + <ProFormItemV2 label="瀹炲彂閲戦:" prop="actualSettlementAmount"> + <ProFormInputNumber v-model="form.actualSettlementAmount"> </ProFormInputNumber> </ProFormItemV2> </ProFormColItem> </ProFormCol> @@ -93,6 +92,12 @@ }" > </ProTableV2> + <div class="chuck-add-or-edit-actions"> + <el-button @click="handleBack">鍙栨秷</el-button> + <el-button class="chuck-add-or-edit-actions" type="primary" @click="handleSubmit" + >纭</el-button + > + </div> </ChunkCell> </AppScrollContainer> <EditAccountInfoDialog v-bind="dialogProps"></EditAccountInfoDialog> @@ -110,27 +115,27 @@ ProFormColItem, ProFormDatePicker, ProFormInputNumber, - ProFormRadio, useTable, ProTableV2, defineOperationBtns, SearchInput, QueryFilterItem, ProTableQueryFilterBar, - TextOverTooltip, useFormDialog, } from '@bole-core/components'; -import { Edit, Upload } from '@element-plus/icons-vue'; import { SettlementListColumns } from './constants'; import { useQuery } from '@tanstack/vue-query'; -import { downloadFileByUrl } from '@bole-core/core'; import * as taskServices from '@/services/api/task'; +import * as taskUserServices from '@/services/api/taskUser'; import EditAccountInfoDialog from './components/EditAccountInfoDialog.vue'; +import { Message } from '@bole-core/core'; defineOptions({ name: 'ServiceChargeDetail', }); +const { closeViewPush } = useRouteView(); +const eventContext = useGlobalEventContext(); const operationBtns = defineOperationBtns([ { data: { @@ -144,27 +149,36 @@ ]); const route = useRoute(); -const id = (route.params.id as string) ?? ''; +const id = (route.query.id as string) ?? ''; +const url = (route.query.url as string) ?? ''; const form = reactive({ name: '', - money: 0, - status: 1, + settlementAmount: 0, + actualSettlementAmount: 0, + code: '', + settlementOrderName: '', + settlementOrderTime: '', }); const { isLoading } = useQuery({ - queryKey: ['taskServices/getTaskInfo', id], + queryKey: ['taskServices/getSettlementTask', id], queryFn: async () => { - return await taskServices.getTaskInfo( + return await taskServices.getSettlementTask( { id: id }, { showLoading: false, } ); }, - placeholderData: () => ({} as API.GetTaskInfoQueryResult), + placeholderData: () => ({} as API.GetSettlementTaskQueryResult), onSuccess(data) { form.name = data.name; + form.settlementAmount = data.settlementAmount; + form.actualSettlementAmount = data.actualSettlementAmount; + form.code = data.code; + form.settlementOrderName = data.settlementOrderName; + form.settlementOrderTime = data.settlementOrderTime; }, enabled: !!id, }); @@ -178,16 +192,18 @@ } = useTable( async ({ pageIndex, pageSize }, extraParamState) => { try { - let params: API.GetOpenTaskInfosQuery = { + let params: API.GetSettlementTaskUsersQuery = { pageModel: { rows: pageSize, page: pageIndex, orderInput: extraParamState.orderInput, }, + taskInfoId: id, + // settlementOrderUrl:form. keywords: extraParamState.keywords, }; - let res = await taskServices.getOpenTaskInfos(params); + let res = await taskUserServices.getSettlementTaskUsers(params); return res; } catch (error) { console.log('error: ', error); @@ -198,7 +214,7 @@ keywords: '', orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }], }, - queryKey: ['taskServices/getOpenTaskInfos'], + queryKey: ['taskUserServices/getOpenTaskInfos'], columnsRenderProps: {}, } ); @@ -222,6 +238,28 @@ async function handleAddOrEdit() {} +async function handleSubmit() { + try { + let params: API.SureTaskSettlementOrderCommand = { + taskInfoId: id, + settlementOrderUrl: url, + taskInfoUsers: [], + }; + let res = await taskServices.sureTaskSettlementOrder(params); + if (res) { + Message.successMessage('鎿嶄綔鎴愬姛'); + eventContext.emit('sureTaskSettlementOrder'); + handleBack(); + } + } catch (error) {} +} + +function handleBack() { + closeViewPush(route, { + name: 'ServiceChargeManageList', + }); +} + onMounted(() => { getList(); }); diff --git a/src/views/ServiceChargeManage/ServiceChargeManage.vue b/src/views/ServiceChargeManage/ServiceChargeManage.vue index 47361e8..868fbbf 100644 --- a/src/views/ServiceChargeManage/ServiceChargeManage.vue +++ b/src/views/ServiceChargeManage/ServiceChargeManage.vue @@ -5,11 +5,8 @@ <template #query> <QueryFilterItem tip-content="缁撶畻鍗曠姸鎬�"> <FieldRadio - v-model="extraParamState.status" - :value-enum="[ - { label: '宸插畨鎺�', value: 1 }, - { label: '寰呭畨鎺�', value: 0 }, - ]" + v-model="extraParamState.settlementOrderStatus" + :value-enum="EnumTaskSettlementOrderStatusText" buttonStyle showAllBtn @change="getList()" @@ -17,11 +14,8 @@ </QueryFilterItem> <QueryFilterItem tip-content="缁撶畻鐘舵��"> <FieldRadio - v-model="extraParamState.status" - :value-enum="[ - { label: '宸插畨鎺�', value: 1 }, - { label: '寰呭畨鎺�', value: 0 }, - ]" + v-model="extraParamState.settlementStatus" + :value-enum="EnumTaskSettlementStatusText" buttonStyle showAllBtn @change="getList()" @@ -41,7 +35,7 @@ </QueryFilterItem> <QueryFilterItem> <SearchInput - v-model="extraParamState.searchWord" + v-model="extraParamState.keywords" style="width: 250px" placeholder="浠诲姟鍚嶇О" @on-click-search="getList" @@ -52,7 +46,6 @@ </template> <template #btn> <el-button type="primary" link @click="handleDownloadTemplate()">缁撶畻鍗曟ā鏉�</el-button> - <el-button type="primary" @click="openDialog()">涓婁紶缁撶畻鍗�</el-button> <el-button type="primary" @click="handleDownloadTemplate()">瀵煎嚭</el-button> </template> @@ -62,6 +55,20 @@ :columns="ServiceChargeManageColumns" :operationBtns="operationBtns" > + <template #operationBtn-uploadBtn="{ data, row }"> + <BlFileUpload + v-model:file-url="row.listFiles" + multiple + ref="uploadRef" + :showTip="false" + :show-file-list="false" + class="pro-table-operation-btn upload-style-btn" + :on-success="(event) => handleUploadSuccess(event, row)" + :limitFileSize="null" + > + <el-button text type="primary" class="pro-table-operation-btn">涓婁紶</el-button> + </BlFileUpload> + </template> </ProTableV2> </AppContainer> <UploadStatementDialog v-bind="dialogProps" /> @@ -83,43 +90,46 @@ defineOperationBtns, useFormDialog, UploadUserFile, + BlFileUpload, } from '@bole-core/components'; import { ServiceChargeManageColumns } from './constants'; +import { EnumTaskSettlementStatusText, EnumTaskSettlementOrderStatusText } from '@/constants'; import { downloadFileByUrl } from '@/utils'; import * as taskServices from '@/services/api/task'; import { ModelValueType } from 'element-plus'; import UploadStatementDialog from './components/UploadStatementDialog.vue'; import SettleDetailDialog from './components/SettleDetailDialog.vue'; +import { Message } from '@bole-core/core'; defineOptions({ name: 'ServiceChargeManageList', }); const operationBtns = defineOperationBtns([ - { - data: { - enCode: 'uploadBtn', - name: '涓婁紶', - }, - emits: { - onClick: (role) => openDialog(role), - }, - extraProps: { - hide: () => false, - }, - }, - { - data: { - enCode: 'reUploadBtn', - name: '閲嶆柊涓婁紶', - }, - emits: { - onClick: (role) => openDialog(role), - }, - extraProps: { - hide: () => false, - }, - }, + // { + // data: { + // enCode: 'uploadBtn', + // name: '涓婁紶', + // }, + // emits: { + // onClick: (role) => openDialog(role), + // }, + // extraProps: { + // hide: () => false, + // }, + // }, + // { + // data: { + // enCode: 'reUploadBtn', + // name: '閲嶆柊涓婁紶', + // }, + // emits: { + // onClick: (role) => openDialog(role), + // }, + // extraProps: { + // hide: () => false, + // }, + // }, { data: { enCode: 'settleBtn', @@ -141,7 +151,8 @@ onClick: (role) => handleRecall(role), }, extraProps: { - hide: () => false, + hide: (role: API.GetSettlementTasksQueryResultItem) => + role.settlementStatus !== EnumTaskSettlementStatus.InProcess, }, }, { @@ -169,6 +180,12 @@ const router = useRouter(); +const eventContext = useGlobalEventContext(); + +eventContext.addEvent('sureTaskSettlementOrder', () => { + getList(paginationState.pageIndex); +}); + const BaseState = { loading: true, }; @@ -189,15 +206,18 @@ } = useTable( async ({ pageIndex, pageSize }, extraParamState) => { try { - let params: API.GetTaskInfosQuery = { + let params: API.GetSettlementTasksQuery = { pageModel: { rows: pageSize, page: pageIndex, orderInput: extraParamState.orderInput, }, + keywords: extraParamState.keywords, + settlementOrderStatus: extraParamState.settlementOrderStatus, + settlementStatus: extraParamState.settlementStatus, }; - let res = await taskServices.getTaskInfos(params, { + let res = await taskServices.getSettlementTasks(params, { showLoading: !state.loading, }); return res; @@ -207,13 +227,21 @@ }, { defaultExtraParams: { - searchWord: '', - status: 0, + keywords: '', + settlementOrderStatus: '' as any as EnumTaskSettlementOrderStatus, + settlementStatus: '' as any as EnumTaskSettlementStatus, time: [] as unknown as ModelValueType, orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }], }, - queryKey: ['taskServices/getTaskInfos'], - columnsRenderProps: {}, + queryKey: ['taskServices/getSettlementTasks'], + columnsRenderProps: { + settlementOrderStatus: { type: 'enum', valueEnum: EnumTaskSettlementOrderStatusText }, + settlementStatus: { type: 'enum', valueEnum: EnumTaskSettlementStatusText }, + actualSettlementAmount: { type: 'money' }, + settlementAmount: { type: 'money' }, + settlementTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' }, + settlementOrderTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' }, + }, } ); @@ -226,7 +254,7 @@ }, }); -function openDialog(row?) { +function openDialog(row?: API.GetSettlementTasksQueryResultItem) { if (row) { handleEdit({ id: row?.id, @@ -249,27 +277,64 @@ defaultFormParams: { id: '', name: '', - count: 0, + code: '', + settlementUserCount: 0, + settlementAmount: 0, }, }); -async function handleSettle() {} +async function handleSettle() { + try { + let params: API.SureTaskSettlementCommand = { + taskInfoId: settleEditForm.id, + }; + let res = await taskServices.sureTaskSettlement(params); + if (res) { + Message.successMessage('鎿嶄綔鎴愬姛'); + getList(paginationState.pageIndex); + } + } catch (error) {} +} -function openSettleDialog(row?) { +function openSettleDialog(row: API.GetSettlementTasksQueryResultItem) { handleSettleEdit({ id: row.id, name: row.name, - count: row.count, + code: row.code, + settlementUserCount: row.settlementUserCount, + settlementAmount: row.settlementAmount, }); } -function handleRecall(row) {} +async function handleRecall(row: API.GetSettlementTasksQueryResultItem) { + try { + Message.tipMessage('纭瑕佹挙鍥炲悧锛�'); + let params: API.RevokeTaskSettlementOrderCommand = { + taskInfoId: row.id, + }; + let res = await taskServices.revokeTaskSettlementOrder(params); + if (res) { + Message.successMessage('鎿嶄綔鎴愬姛'); + getList(paginationState.pageIndex); + } + } catch (error) {} +} -function goDetail(row) { +function handleUploadSuccess( + response: UploadUserFile & { file: File & { uid: number } }, + row: API.GetSettlementTasksQueryResultItem +) { + if (response.url) { + goDetail(row, response.url); + } +} + +function goDetail(row: API.GetSettlementTasksQueryResultItem, url?: string) { router.push({ name: 'ServiceChargeDetail', - params: { + query: { id: row.id, + url: url ? url : '', }, }); } diff --git a/src/views/ServiceChargeManage/components/SettleDetailDialog.vue b/src/views/ServiceChargeManage/components/SettleDetailDialog.vue index 189905a..181b6bf 100644 --- a/src/views/ServiceChargeManage/components/SettleDetailDialog.vue +++ b/src/views/ServiceChargeManage/components/SettleDetailDialog.vue @@ -8,17 +8,17 @@ :width="700" > <ProForm :model="form" ref="dialogForm" label-width="120px" is-read> - <ProFormItemV2 label="浠诲姟鍗曞彿锛�" prop="name"> - <ProFormSelect v-model="form.name" :valueEnum="[]"> </ProFormSelect> + <ProFormItemV2 label="浠诲姟鍗曞彿锛�" prop="code"> + <ProFormSelect v-model="form.code" :valueEnum="[]"> </ProFormSelect> </ProFormItemV2> <ProFormItemV2 label="浠诲姟鍚嶇О锛�" prop="name"> <ProFormText v-model.trim="form.name"></ProFormText> </ProFormItemV2> - <ProFormItemV2 label="缁撶畻浜烘暟锛�" prop="count"> - <ProFormInputNumber v-model="form.count" unit="浜�"> </ProFormInputNumber> + <ProFormItemV2 label="缁撶畻浜烘暟锛�" prop="settlementUserCount"> + <ProFormInputNumber v-model="form.settlementUserCount" unit="浜�"> </ProFormInputNumber> </ProFormItemV2> - <ProFormItemV2 label="缁撶畻閲戦锛�" prop="count"> - <ProFormInputNumber v-model="form.count" unit="鍏�"> </ProFormInputNumber> + <ProFormItemV2 label="缁撶畻閲戦锛�" prop="settlementAmount"> + <ProFormInputNumber v-model="form.settlementAmount" unit="鍏�"> </ProFormInputNumber> </ProFormItemV2> </ProForm> <template #footer> @@ -49,7 +49,9 @@ title?: string; id: string; name: string; - count: number; + code: string; + settlementUserCount: number; + settlementAmount: number; }; const visible = defineModel({ type: Boolean }); diff --git a/src/views/ServiceChargeManage/constants/columns.ts b/src/views/ServiceChargeManage/constants/columns.ts index f9bb4a0..867fec1 100644 --- a/src/views/ServiceChargeManage/constants/columns.ts +++ b/src/views/ServiceChargeManage/constants/columns.ts @@ -8,62 +8,47 @@ }, { id: '2', - enCode: 'name', + enCode: 'code', name: '浠诲姟鍗曞彿', }, { id: '3', - enCode: 'name', - name: '鍙戞斁鏂瑰紡', - }, - { - id: '4', - enCode: 'name', + enCode: 'settlementOrderStatus', name: '缁撶畻鍗曠姸鎬�', }, { - id: '5', - enCode: 'name', + id: '4', + enCode: 'settlementOrderName', name: '缁撶畻鍗曞悕绉�', }, { - id: '6', - enCode: 'name', + id: '5', + enCode: 'settlementOrderTime', name: '涓婁紶鏃堕棿', }, { - id: '7', - enCode: 'name', - name: '缁撶畻鐘舵��', - }, - { - id: '8', - enCode: 'name', + id: '6', + enCode: 'actualSettlementAmount', name: '瀹炲彂閲戦', }, { - id: '9', - enCode: 'name', + id: '7', + enCode: 'settlementAmount', name: '缁撶畻閲戦', }, { - id: '10', - enCode: 'name', - name: '澶辫触閲戦', + id: '8', + enCode: 'settlementStatus', + name: '缁撶畻鐘舵��', }, { - id: '11', - enCode: 'name', - name: '閫�娆鹃噾棰�', - }, - { - id: '12', - enCode: 'name', + id: '9', + enCode: 'settlementTime', name: '缁撶畻鏃堕棿', }, { - id: '13', - enCode: 'name', + id: '10', + enCode: 'settlementRemark', name: '澶囨敞', }, ]); -- Gitblit v1.9.1