From ccf503d917f80dd8a1b25eed713282fb2494a919 Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期四, 04 九月 2025 16:06:40 +0800 Subject: [PATCH] fix: 签约 --- src/services/api/enterpriseEmployee.ts | 115 +++- src/views/EnterpriseManage/components/ConfigureDialog.vue | 62 ++ .eslintrc-auto-import.json | 4 src/services/api/typings.d.ts | 498 +++++++++++++++++++---- src/constants/enterprise.ts | 9 src/services/api/enterpriseWallet.ts | 294 ++++++++++++++ src/services/api/enterprise.ts | 15 src/views/EnterpriseManage/components/QrcodeDialog.vue | 87 ++++ .env.staging | 4 src/services/api/index.ts | 2 src/services/api/electronSign.ts | 15 auto-imports.d.ts | 10 src/constants/apiEnum.ts | 40 + src/views/EnterpriseManage/EnterpriseManageList.vue | 55 +- 14 files changed, 1,054 insertions(+), 156 deletions(-) diff --git a/.env.staging b/.env.staging index 6270734..7ae58f3 100644 --- a/.env.staging +++ b/.env.staging @@ -7,8 +7,8 @@ VITE_ROUTER_HISTORY = "h5" # 绾夸笂鐜鍚庣鍦板潃 -# VITE_PROXY_DOMAIN_REAL = "https://testrlywx.boleyuma.com/" -VITE_PROXY_DOMAIN_REAL = "http://118.178.252.28:8770/" +VITE_PROXY_DOMAIN_REAL = "https://testfj.81812333.com/" +# VITE_PROXY_DOMAIN_REAL = "http://118.178.252.28:8770/" # 鏄惁涓烘墦鍖呭悗鐨勬枃浠舵彁渚涗紶缁熸祻瑙堝櫒鍏煎鎬ф敮鎸� 鏀寔 true 涓嶆敮鎸� false VITE_LEGACY = true diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json index 4646e5b..ab24bde 100644 --- a/.eslintrc-auto-import.json +++ b/.eslintrc-auto-import.json @@ -37,7 +37,11 @@ "EnumDbAuditOperateText": true, "EnumElectronSignAccess": true, "EnumElectronSignAccessText": true, + "EnumEnterpriseCostStatus": true, + "EnumEnterpriseCostType": true, "EnumEnterpriseRealMethod": true, + "EnumEnterpriseWalletAccess": true, + "EnumEnterpriseWalletSignStatus": true, "EnumMenuType": true, "EnumMenuVisitLevel": true, "EnumOcrAccess": true, diff --git a/auto-imports.d.ts b/auto-imports.d.ts index b902105..2e3b160 100644 --- a/auto-imports.d.ts +++ b/auto-imports.d.ts @@ -45,7 +45,11 @@ const EnumDbAuditOperateText: typeof import('./src/constants/apiEnumText')['EnumDbAuditOperateText'] const EnumElectronSignAccess: typeof import('./src/constants/apiEnum')['EnumElectronSignAccess'] const EnumElectronSignAccessText: typeof import('./src/constants/electronSign')['EnumElectronSignAccessText'] + 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 EnumEnterpriseWalletSignStatus: typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletSignStatus'] const EnumMenuType: typeof import('./src/constants/apiEnum')['EnumMenuType'] const EnumMenuVisitLevel: typeof import('./src/constants/apiEnum')['EnumMenuVisitLevel'] const EnumOcrAccess: typeof import('./src/constants/apiEnum')['EnumOcrAccess'] @@ -273,7 +277,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, 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, 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, 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' import('./src/constants/apiEnum') // @ts-ignore export type { FlexWorkerEleSignEnum, FlexTaskWorkerHireEnum, FlexWorkerEleSignEnum, FlexTaskWorkerHireEnum } from './src/constants/cPerson' @@ -351,7 +355,11 @@ readonly EnumDbAuditOperateText: UnwrapRef<typeof import('./src/constants/apiEnumText')['EnumDbAuditOperateText']> readonly EnumElectronSignAccess: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumElectronSignAccess']> readonly EnumElectronSignAccessText: UnwrapRef<typeof import('./src/constants/electronSign')['EnumElectronSignAccessText']> + 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 EnumEnterpriseWalletSignStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletSignStatus']> 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']> diff --git a/src/constants/apiEnum.ts b/src/constants/apiEnum.ts index bd799b6..3303086 100644 --- a/src/constants/apiEnum.ts +++ b/src/constants/apiEnum.ts @@ -71,12 +71,44 @@ AlipaySign = 20, } +/** 浼佷笟鐢ㄩ噺鎵h垂鐘舵�� */ +export enum EnumEnterpriseCostStatus { + /**鎵h垂鎴愬姛 */ + Success = 10, + /**鎵h垂澶辫触 */ + Fail = 20, +} + +/** 浼佷笟鐢ㄩ噺绫诲瀷 */ +export enum EnumEnterpriseCostType { + /**鐭俊 */ + SMS = 10, + /**鐢靛瓙绛� */ + ElectronSign = 20, +} + /** 浼佷笟瀹炲悕鏂瑰紡 */ export enum EnumEnterpriseRealMethod { /**浼佷笟涓夎绱� */ Identity3 = 10, /**浼佷笟鍥涜绱� */ Identity4 = 20, +} + +/** 浼佷笟閽卞寘閫氶亾 */ +export enum EnumEnterpriseWalletAccess { + /**鏀粯瀹� */ + Alipay = 10, +} + +/** 浼佷笟閽卞寘绛剧害鐘舵�� */ +export enum EnumEnterpriseWalletSignStatus { + /**鐢宠涓� */ + Apply = 10, + /**宸茬绾� */ + Normal = 100, + /**缁堟 */ + Stop = 999, } /** 鑿滃崟绫诲瀷 */ @@ -211,10 +243,12 @@ UserServerUserResume = 13, /**浼佷笟淇℃伅 */ UserServerEnterprise = 14, + /**浼佷笟閽卞寘 */ + UserServerEnterpriseWallet = 15, /**鐏靛伐淇℃伅 */ - UserServerEnterpriseEmployee = 15, + UserServerEnterpriseEmployee = 16, /**鐢靛瓙绛� */ - ElectronSignServerElectronSign = 16, + ElectronSignServerElectronSign = 17, } /** 璧勬簮璇锋眰鏂瑰紡 */ @@ -331,8 +365,6 @@ Pass = 20, /**宸叉嫆绛� */ Refuse = 30, - /**鐢熸晥涓� */ - Effect = 40, /**宸茬粓姝� */ Stop = 50, } diff --git a/src/constants/enterprise.ts b/src/constants/enterprise.ts index 79357ec..4e8a7fc 100644 --- a/src/constants/enterprise.ts +++ b/src/constants/enterprise.ts @@ -4,17 +4,22 @@ */ Bank = 1, /** + * 鏀粯淇℃伅閰嶇疆 + */ + AliPay = 2, + /** * 鐢靛瓙绛鹃厤缃� */ - Electronic = 2, + Electronic = 3, /** * 鐭俊閫氶亾閰嶇疆 */ - ShortMessage = 3, + ShortMessage = 4, } export const EnterpriseConfigureTypeText = { // [EnterpriseConfigureType.Bank]: '閾惰淇℃伅閰嶇疆', + [EnterpriseConfigureType.AliPay]: '鏀粯淇℃伅閰嶇疆', [EnterpriseConfigureType.Electronic]: '鐢靛瓙绛鹃厤缃�', [EnterpriseConfigureType.ShortMessage]: '鐭俊閫氶亾閰嶇疆', }; diff --git a/src/services/api/electronSign.ts b/src/services/api/electronSign.ts index cc9ed3b..abd2700 100644 --- a/src/services/api/electronSign.ts +++ b/src/services/api/electronSign.ts @@ -2,6 +2,21 @@ // @ts-ignore import { request } from '@/utils/request'; +/** 鏍¢獙鍚堝悓妯℃槸鍚﹀彲鐢� POST /api/user/electronSign/checkContractTemplate */ +export async function checkContractTemplate( + body: API.CheckContractTemplateCommand, + options?: API.RequestConfig +) { + return request<boolean>('/api/user/electronSign/checkContractTemplate', { + method: 'POST', + headers: { + 'Content-Type': 'application/json-patch+json', + }, + data: body, + ...(options || {}), + }); +} + /** 鏍¢獙鐢靛瓙绛鹃�氶亾鏄惁鍚敤 POST /api/user/electronSign/checkElectronSignAccessEnableds */ export async function checkElectronSignAccessEnableds( body: API.CheckElectronSignAccessEnabledsCommand, diff --git a/src/services/api/enterprise.ts b/src/services/api/enterprise.ts index 084e76e..868563d 100644 --- a/src/services/api/enterprise.ts +++ b/src/services/api/enterprise.ts @@ -80,6 +80,21 @@ }); } +/** 淇濆瓨浼佷笟璐圭敤 POST /api/user/enterprise/saveEnterpriseCost */ +export async function saveEnterpriseCost( + body: API.SaveEnterpriseCostCommand, + options?: API.RequestConfig +) { + return request<string>('/api/user/enterprise/saveEnterpriseCost', { + method: 'POST', + headers: { + 'Content-Type': 'application/json-patch+json', + }, + data: body, + ...(options || {}), + }); +} + /** 璁剧疆浼佷笟鐢靛瓙绛鹃厤缃� PUT /api/user/enterprise/setEnterpriseElectronSignSetting */ export async function setEnterpriseElectronSignSetting( body: API.SetEnterpriseElectronSignSettingCommand, diff --git a/src/services/api/enterpriseEmployee.ts b/src/services/api/enterpriseEmployee.ts index 4f7e0c8..874d511 100644 --- a/src/services/api/enterpriseEmployee.ts +++ b/src/services/api/enterpriseEmployee.ts @@ -17,6 +17,24 @@ }); } +/** 浼佷笟鐢ㄦ埛绛剧害 POST /api/user/enterpriseEmployee/enterpriseUserElectronSign */ +export async function enterpriseUserElectronSign( + body: API.EnterpriseUserElectronSignCommand, + options?: API.RequestConfig +) { + return request<API.EnterpriseUserElectronSignCommandResult>( + '/api/user/enterpriseEmployee/enterpriseUserElectronSign', + { + method: 'POST', + headers: { + 'Content-Type': 'application/json-patch+json', + }, + data: body, + ...(options || {}), + } + ); +} + /** 鏌ヨ鐏靛伐璇︽儏 GET /api/user/enterpriseEmployee/getEnterpriseEmployee */ export async function getEnterpriseEmployee( // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄) @@ -35,31 +53,13 @@ ); } -/** 鏌ヨ涓汉鐢ㄦ埛绛剧害璇︽儏 GET /api/user/enterpriseEmployee/getEnterpriseEmployeeElectronSign */ -export async function getEnterpriseEmployeeElectronSign( - // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄) - params: API.APIgetEnterpriseEmployeeElectronSignParams, +/** 鏌ヨ鐏靛伐鍒嗛〉鍒楄〃鏁版嵁 POST /api/user/enterpriseEmployee/getEnterpriseEmployees */ +export async function getEnterpriseEmployees( + body: API.GetEnterpriseEmployeesQuery, options?: API.RequestConfig ) { - return request<API.GetEnterpriseEmployeeElectronSignQueryResult>( - '/api/user/enterpriseEmployee/getEnterpriseEmployeeElectronSign', - { - method: 'GET', - params: { - ...params, - }, - ...(options || {}), - } - ); -} - -/** 鏌ヨ涓汉鐢ㄦ埛绛剧害鍒楄〃 POST /api/user/enterpriseEmployee/getEnterpriseEmployeeElectronSigns */ -export async function getEnterpriseEmployeeElectronSigns( - body: API.GetEnterpriseEmployeeElectronSignsQuery, - options?: API.RequestConfig -) { - return request<API.GetEnterpriseEmployeeElectronSignsQueryResult>( - '/api/user/enterpriseEmployee/getEnterpriseEmployeeElectronSigns', + return request<API.GetEnterpriseEmployeesQueryResult>( + '/api/user/enterpriseEmployee/getEnterpriseEmployees', { method: 'POST', headers: { @@ -71,13 +71,31 @@ ); } -/** 鏌ヨ鐏靛伐鍒嗛〉鍒楄〃鏁版嵁 POST /api/user/enterpriseEmployee/getEnterpriseEmployees */ -export async function getEnterpriseEmployees( - body: API.GetEnterpriseEmployeesQuery, +/** 鏌ヨ涓汉鐢ㄦ埛绛剧害璇︽儏 GET /api/user/enterpriseEmployee/getPersonalUserElectronSign */ +export async function getPersonalUserElectronSign( + // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄) + params: API.APIgetPersonalUserElectronSignParams, options?: API.RequestConfig ) { - return request<API.GetEnterpriseEmployeesQueryResult>( - '/api/user/enterpriseEmployee/getEnterpriseEmployees', + return request<API.GetPersonalUserElectronSignQueryResult>( + '/api/user/enterpriseEmployee/getPersonalUserElectronSign', + { + method: 'GET', + params: { + ...params, + }, + ...(options || {}), + } + ); +} + +/** 鏌ヨ涓汉鐢ㄦ埛绛剧害鍒楄〃 POST /api/user/enterpriseEmployee/getPersonalUserElectronSigns */ +export async function getPersonalUserElectronSigns( + body: API.GetPersonalUserElectronSignsQuery, + options?: API.RequestConfig +) { + return request<API.GetPersonalUserElectronSignsQueryResult>( + '/api/user/enterpriseEmployee/getPersonalUserElectronSigns', { method: 'POST', headers: { @@ -107,12 +125,45 @@ ); } -/** 閭�璇风伒宸ョ绾� POST /api/user/enterpriseEmployee/inviteEnterpriseEmployeeElectronSign */ -export async function inviteEnterpriseEmployeeElectronSign( - body: API.InviteEnterpriseEmployeeElectronSignCommand, +/** 閭�璇风伒宸ョ绾� POST /api/user/enterpriseEmployee/inviteElectronSign */ +export async function inviteElectronSign( + body: API.InviteElectronSignCommand, options?: API.RequestConfig ) { - return request<string>('/api/user/enterpriseEmployee/inviteEnterpriseEmployeeElectronSign', { + return request<number>('/api/user/enterpriseEmployee/inviteElectronSign', { + method: 'POST', + headers: { + 'Content-Type': 'application/json-patch+json', + }, + data: body, + ...(options || {}), + }); +} + +/** 涓汉鐢ㄦ埛绛剧害 POST /api/user/enterpriseEmployee/personalUserElectronSign */ +export async function personalUserElectronSign( + body: API.PersonalUserElectronSignCommand, + options?: API.RequestConfig +) { + return request<API.PersonalUserElectronSignCommandResult>( + '/api/user/enterpriseEmployee/personalUserElectronSign', + { + method: 'POST', + headers: { + 'Content-Type': 'application/json-patch+json', + }, + data: body, + ...(options || {}), + } + ); +} + +/** 鐏靛伐瑙g害 POST /api/user/enterpriseEmployee/stopElectronSign */ +export async function stopElectronSign( + body: API.StopElectronSignCommand, + options?: API.RequestConfig +) { + return request<number>('/api/user/enterpriseEmployee/stopElectronSign', { method: 'POST', headers: { 'Content-Type': 'application/json-patch+json', diff --git a/src/services/api/enterpriseWallet.ts b/src/services/api/enterpriseWallet.ts new file mode 100644 index 0000000..663ce51 --- /dev/null +++ b/src/services/api/enterpriseWallet.ts @@ -0,0 +1,294 @@ +/* eslint-disable */ +// @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: { + /** 閫氱煡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 || {}), + }); +} + +/** 鏀粯瀹濊祫閲戜簩绾у晢鎴稫YB浠h繘浠舵枃浠朵笂浼犳帴鍙� POST /api/user/enterpriseWallet/alipayFundExpandindirectImageUpload */ +export async function alipayFundExpandindirectImageUpload( + body: { + /** 浜у搧鐮� */ + ProductCode?: string; + /** 鍦烘櫙鐮� */ + BizScene?: 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]; + + if (item !== undefined && item !== null) { + formData.append( + ele, + typeof item === 'object' && !(item instanceof File) ? JSON.stringify(item) : item + ); + } + }); + + return request<string>('/api/user/enterpriseWallet/alipayFundExpandindirectImageUpload', { + 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 || {}), + }); +} + +/** 鏀粯瀹濈敤鎴锋巿鏉冨崗璁绾﹂�氱煡 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繘浠跺崟璇︽儏 GET /api/user/enterpriseWallet/getAlipayFundExpandindirectOrder */ +export async function getAlipayFundExpandindirectOrder( + // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄) + params: API.APIgetAlipayFundExpandindirectOrderParams, + options?: API.RequestConfig +) { + return request<API.GetAlipayFundExpandindirectOrderQueryResult>( + '/api/user/enterpriseWallet/getAlipayFundExpandindirectOrder', + { + method: 'GET', + params: { + ...params, + }, + ...(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 || {}), + } + ); +} + +/** 寮�閫氫紒涓氶挶鍖� 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<string>('/api/user/enterpriseWallet/rechargeEnterpriseWallet', { + method: 'POST', + headers: { + 'Content-Type': 'application/json-patch+json', + }, + data: body, + ...(options || {}), + }); +} diff --git a/src/services/api/index.ts b/src/services/api/index.ts index 7c7dd5e..96f40fc 100644 --- a/src/services/api/index.ts +++ b/src/services/api/index.ts @@ -10,6 +10,7 @@ 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'; @@ -27,6 +28,7 @@ resource, task, dictionary, + enterpriseWallet, electronSign, userResume, auth, diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts index 3ae288f..91549f7 100644 --- a/src/services/api/typings.d.ts +++ b/src/services/api/typings.d.ts @@ -3,9 +3,59 @@ [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 { @@ -81,13 +131,6 @@ id?: string; } - interface APIgetEnterpriseEmployeeElectronSignParams { - /** 鐏靛伐Id */ - id?: string; - /** 鍚堝悓妯℃澘涓氬姟缂栫爜 */ - code?: string; - } - interface APIgetEnterpriseEmployeeParams { /** 鐏靛伐Id */ id?: string; @@ -108,6 +151,13 @@ interface APIgetEnterpriseSmsSettingParams { /** Id */ id?: string; + } + + interface APIgetEnterpriseWalletParams { + /** 浼佷笟Id */ + enterpriseId?: string; + /** 閫氶亾 */ + access?: EnumEnterpriseWalletAccess; } interface APIgetFileUrlParams { @@ -134,6 +184,13 @@ interface APIgetPersonalLoginInfoParams { /** 鏌ヨ涓汉鐢ㄦ埛鐧诲綍淇℃伅 */ request?: GetPersonalLoginInfoQuery; + } + + interface APIgetPersonalUserElectronSignParams { + /** 鐏靛伐Id */ + id?: string; + /** 鍚堝悓妯℃澘涓氬姟缂栫爜 */ + code?: string; } interface APIgetPersonalUserRealResultParams { @@ -295,6 +352,11 @@ verifyCode: string; } + interface CheckContractTemplateCommand { + /** 鍚堝悓妯℃澘Id */ + id?: string; + } + interface CheckElectronSignAccessEnabledsCommand { /** 閫氶亾 */ accesses?: EnumElectronSignAccess[]; @@ -309,6 +371,10 @@ } type ClearTaskCollectCommand = Record<string, any>; + + interface CloseEnterpriseWalletCommand { + access?: EnumEnterpriseWalletAccess; + } interface CollectTaskCommand { /** 浠诲姟Id */ @@ -384,6 +450,18 @@ data?: any; } + interface EnterpriseUserElectronSignCommand { + /** 鐏靛伐Id */ + id?: string; + } + + interface EnterpriseUserElectronSignCommandResult { + /** 绛剧讲鍚堝悓鐭摼鎺� */ + signContractShortUrl?: string; + /** 绛剧讲鍚堝悓闀块摼鎺� */ + signContractLongUrl?: string; + } + enum EnumBillingMethod { /**鎸夋湀 */ Month = 10, @@ -446,11 +524,39 @@ AlipaySign = 20, } + enum EnumEnterpriseCostStatus { + /**鎵h垂鎴愬姛 */ + Success = 10, + /**鎵h垂澶辫触 */ + Fail = 20, + } + + enum EnumEnterpriseCostType { + /**鐭俊 */ + SMS = 10, + /**鐢靛瓙绛� */ + ElectronSign = 20, + } + enum EnumEnterpriseRealMethod { /**浼佷笟涓夎绱� */ Identity3 = 10, /**浼佷笟鍥涜绱� */ Identity4 = 20, + } + + enum EnumEnterpriseWalletAccess { + /**鏀粯瀹� */ + Alipay = 10, + } + + enum EnumEnterpriseWalletSignStatus { + /**鐢宠涓� */ + Apply = 10, + /**宸茬绾� */ + Normal = 100, + /**缁堟 */ + Stop = 999, } enum EnumMenuType { @@ -574,10 +680,12 @@ UserServerUserResume = 13, /**浼佷笟淇℃伅 */ UserServerEnterprise = 14, + /**浼佷笟閽卞寘 */ + UserServerEnterpriseWallet = 15, /**鐏靛伐淇℃伅 */ - UserServerEnterpriseEmployee = 15, + UserServerEnterpriseEmployee = 16, /**鐢靛瓙绛� */ - ElectronSignServerElectronSign = 16, + ElectronSignServerElectronSign = 17, } enum EnumResourceMethod { @@ -682,8 +790,6 @@ Pass = 20, /**宸叉嫆绛� */ Refuse = 30, - /**鐢熸晥涓� */ - Effect = 40, /**宸茬粓姝� */ Stop = 50, } @@ -745,6 +851,42 @@ errorCode?: string; /** 鏁版嵁 */ data?: boolean; + /** 鎵ц鎴愬姛 */ + success?: boolean; + /** 閿欒淇℃伅 */ + msg?: any; + /** 闄勫姞鏁版嵁 */ + extras?: any; + /** 鏃堕棿鎴� */ + timestamp?: number; + } + + interface FriendlyResultEnterpriseUserElectronSignCommandResult { + /** 璺熻釜Id */ + traceId?: string; + /** 鐘舵�佺爜 */ + code?: number; + /** 閿欒鐮� */ + 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; /** 閿欒淇℃伅 */ @@ -971,42 +1113,6 @@ timestamp?: number; } - interface FriendlyResultGetEnterpriseEmployeeElectronSignQueryResult { - /** 璺熻釜Id */ - traceId?: string; - /** 鐘舵�佺爜 */ - code?: number; - /** 閿欒鐮� */ - errorCode?: string; - data?: GetEnterpriseEmployeeElectronSignQueryResult; - /** 鎵ц鎴愬姛 */ - success?: boolean; - /** 閿欒淇℃伅 */ - msg?: any; - /** 闄勫姞鏁版嵁 */ - extras?: any; - /** 鏃堕棿鎴� */ - timestamp?: number; - } - - interface FriendlyResultGetEnterpriseEmployeeElectronSignsQueryResult { - /** 璺熻釜Id */ - traceId?: string; - /** 鐘舵�佺爜 */ - code?: number; - /** 閿欒鐮� */ - errorCode?: string; - data?: GetEnterpriseEmployeeElectronSignsQueryResult; - /** 鎵ц鎴愬姛 */ - success?: boolean; - /** 閿欒淇℃伅 */ - msg?: any; - /** 闄勫姞鏁版嵁 */ - extras?: any; - /** 鏃堕棿鎴� */ - timestamp?: number; - } - interface FriendlyResultGetEnterpriseEmployeeQueryResult { /** 璺熻釜Id */ traceId?: string; @@ -1087,6 +1193,24 @@ /** 閿欒鐮� */ errorCode?: string; data?: GetEnterpriseSmsSettingQueryResult; + /** 鎵ц鎴愬姛 */ + success?: boolean; + /** 閿欒淇℃伅 */ + msg?: any; + /** 闄勫姞鏁版嵁 */ + extras?: any; + /** 鏃堕棿鎴� */ + timestamp?: number; + } + + interface FriendlyResultGetEnterpriseWalletQueryResult { + /** 璺熻釜Id */ + traceId?: string; + /** 鐘舵�佺爜 */ + code?: number; + /** 閿欒鐮� */ + errorCode?: string; + data?: GetEnterpriseWalletQueryResult; /** 鎵ц鎴愬姛 */ success?: boolean; /** 閿欒淇℃伅 */ @@ -1249,6 +1373,42 @@ /** 閿欒鐮� */ errorCode?: string; data?: GetPersonalLoginInfoQueryResult; + /** 鎵ц鎴愬姛 */ + success?: boolean; + /** 閿欒淇℃伅 */ + msg?: any; + /** 闄勫姞鏁版嵁 */ + extras?: any; + /** 鏃堕棿鎴� */ + timestamp?: number; + } + + interface FriendlyResultGetPersonalUserElectronSignQueryResult { + /** 璺熻釜Id */ + traceId?: string; + /** 鐘舵�佺爜 */ + code?: number; + /** 閿欒鐮� */ + errorCode?: string; + data?: GetPersonalUserElectronSignQueryResult; + /** 鎵ц鎴愬姛 */ + success?: boolean; + /** 閿欒淇℃伅 */ + msg?: any; + /** 闄勫姞鏁版嵁 */ + extras?: any; + /** 鏃堕棿鎴� */ + timestamp?: number; + } + + interface FriendlyResultGetPersonalUserElectronSignsQueryResult { + /** 璺熻釜Id */ + traceId?: string; + /** 鐘舵�佺爜 */ + code?: number; + /** 閿欒鐮� */ + errorCode?: string; + data?: GetPersonalUserElectronSignsQueryResult; /** 鎵ц鎴愬姛 */ success?: boolean; /** 閿欒淇℃伅 */ @@ -1866,6 +2026,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; @@ -1956,6 +2134,24 @@ timestamp?: number; } + interface FriendlyResultPersonalUserElectronSignCommandResult { + /** 璺熻釜Id */ + traceId?: string; + /** 鐘舵�佺爜 */ + code?: number; + /** 閿欒鐮� */ + errorCode?: string; + data?: PersonalUserElectronSignCommandResult; + /** 鎵ц鎴愬姛 */ + success?: boolean; + /** 閿欒淇℃伅 */ + msg?: any; + /** 闄勫姞鏁版嵁 */ + extras?: any; + /** 鏃堕棿鎴� */ + timestamp?: number; + } + interface FriendlyResultString { /** 璺熻釜Id */ traceId?: string; @@ -1992,6 +2188,52 @@ /** 鏃堕棿鎴� */ 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>; type GetAliyunOSSAcsQuery = Record<string, any>; @@ -2177,6 +2419,8 @@ /** 鎻愪氦Id */ id?: string; enterpriseEmployeeUser?: GetCheckReceiveTaskUserSubmitsQueryResultObjectDataEnterpriseEmployeeUser; + /** 楠屾敹鏃堕棿 */ + date?: string; /** 鎻愪氦鏃堕棿 */ createdTime?: string; /** 楠屾敹鐓х墖 */ @@ -2201,6 +2445,8 @@ interface GetCheckReceiveTaskUserSubmitsQueryResultItem { /** 鎻愪氦Id */ id?: string; + /** 楠屾敹鏃堕棿 */ + date?: string; /** 鎻愪氦鏃堕棿 */ createdTime?: string; /** 楠屾敹鐓х墖 */ @@ -2562,47 +2808,6 @@ electronSignAccesses?: EnumElectronSignAccess[]; } - interface GetEnterpriseEmployeeElectronSignQueryResult { - /** 鍚堝悓缂栧彿 */ - contractCode?: string; - userSignContractStatus?: EnumTaskUserSignContractStatus; - /** 绛剧害鏂逛俊鎭�-鍛樺伐-濮撳悕 */ - name?: string; - /** 绛剧害鏂逛俊鎭�-鍛樺伐-璇佷欢绫诲瀷 */ - identityType?: string; - /** 绛剧害鏂逛俊鎭�-鍛樺伐-璇佷欢鍙风爜 */ - identity?: string; - /** 绛剧害鏂逛俊鎭�-鍛樺伐-绛剧害鏃堕棿 */ - userSignContractTime?: string; - /** 绛剧害鏂逛俊鎭�-鍏徃涓讳綋-涓讳綋绫诲瀷 */ - enterpriseType?: string; - /** 绛剧害鏂逛俊鎭�-鍏徃涓讳綋-绛剧害涓讳綋 */ - enterpriseName?: string; - /** 绛剧害鏂逛俊鎭�-鍏徃涓讳綋-绛剧害鏃堕棿 */ - enterpriseSignContractTime?: string; - /** 鍗忚鍐呭 */ - contractUrl?: string; - } - - interface GetEnterpriseEmployeeElectronSignsQuery { - userSignContractStatus?: EnumTaskUserSignContractStatus; - pageModel?: PagedListQueryPageModel; - } - - interface GetEnterpriseEmployeeElectronSignsQueryResult { - pageModel?: PagedListQueryResultPageModel; - /** 鏁版嵁 */ - data?: GetEnterpriseEmployeeElectronSignsQueryResultItem[]; - } - - interface GetEnterpriseEmployeeElectronSignsQueryResultItem { - /** 鐏靛伐Id */ - id?: string; - /** 浼佷笟鍏ㄧО */ - enterpriseName?: string; - userSignContractStatus?: EnumTaskUserSignContractStatus; - } - interface GetEnterpriseEmployeeQueryResult { /** 鐏靛伐Id */ id?: string; @@ -2629,6 +2834,7 @@ enterpriseSignContractTime?: string; /** 鐢靛瓙鍚堝悓 */ contractUrl?: string; + userSignContractStatus?: EnumTaskUserSignContractStatus; } interface GetEnterpriseEmployeesQuery { @@ -2698,6 +2904,8 @@ enterpriseSignContractStatus?: EnumTaskUserSignContractStatus; /** 浼佷笟绛剧害鏃堕棿 */ enterpriseSignContractTime?: string; + /** 鐢靛瓙鍚堝悓 */ + contractUrl?: string; } type GetEnterpriseLoginInfoQuery = Record<string, any>; @@ -2798,6 +3006,23 @@ industryTypeContent?: string; /** 鏄惁宸查厤缃� */ isConfigured?: boolean; + } + + interface GetEnterpriseWalletQueryResult { + /** 閽卞寘Id */ + id?: string; + access?: EnumEnterpriseWalletAccess; + /** 鍗忚鍙� */ + code?: string; + /** 閫氶亾鍗忚鍙� */ + agreementNo?: string; + /** 鍗忚绛剧害鏃堕棿 */ + signTime?: string; + /** 鍗忚鐢熸晥鏃堕棿 */ + validTime?: string; + /** 鍗忚澶辨晥鏃堕棿 */ + invalidTime?: string; + signStatus?: EnumEnterpriseWalletSignStatus; } interface GetExceptionLogsQuery { @@ -3186,6 +3411,8 @@ avatar?: string; /** 濮撳悕 */ name?: string; + /** 鎵嬫満鍙� */ + contactPhoneNumber?: string; /** 鏄惁瀹炲悕 */ isReal?: boolean; realMethod?: EnumUserRealMethod; @@ -3195,6 +3422,52 @@ hirePassTaskCount?: number; /** 宸插彇娑� */ hireRefuseTaskCount?: number; + } + + interface GetPersonalUserElectronSignQueryResult { + /** 鐏靛伐Id */ + id?: string; + /** 鍚堝悓缂栧彿 */ + contractCode?: string; + contractTemplateAccess?: EnumElectronSignAccess; + userSignContractStatus?: EnumTaskUserSignContractStatus; + /** 绛剧害鏂逛俊鎭�-鍛樺伐-濮撳悕 */ + name?: string; + /** 绛剧害鏂逛俊鎭�-鍛樺伐-璇佷欢绫诲瀷 */ + identityType?: string; + /** 绛剧害鏂逛俊鎭�-鍛樺伐-璇佷欢鍙风爜 */ + identity?: string; + /** 绛剧害鏂逛俊鎭�-鍛樺伐-鎵嬫満鍙� */ + contactPhoneNumber?: string; + /** 绛剧害鏂逛俊鎭�-鍛樺伐-绛剧害鏃堕棿 */ + userSignContractTime?: string; + /** 绛剧害鏂逛俊鎭�-鍏徃涓讳綋-涓讳綋绫诲瀷 */ + enterpriseType?: string; + /** 绛剧害鏂逛俊鎭�-鍏徃涓讳綋-绛剧害涓讳綋 */ + enterpriseName?: string; + /** 绛剧害鏂逛俊鎭�-鍏徃涓讳綋-绛剧害鏃堕棿 */ + enterpriseSignContractTime?: string; + /** 鍗忚鍐呭 */ + contractUrl?: string; + } + + interface GetPersonalUserElectronSignsQuery { + userSignContractStatus?: EnumTaskUserSignContractStatus; + pageModel?: PagedListQueryPageModel; + } + + interface GetPersonalUserElectronSignsQueryResult { + pageModel?: PagedListQueryResultPageModel; + /** 鏁版嵁 */ + data?: GetPersonalUserElectronSignsQueryResultItem[]; + } + + interface GetPersonalUserElectronSignsQueryResultItem { + /** 鐏靛伐Id */ + id?: string; + /** 浼佷笟鍏ㄧО */ + enterpriseName?: string; + userSignContractStatus?: EnumTaskUserSignContractStatus; } interface GetPersonalUserInfoSignContractsQuery { @@ -3558,6 +3831,8 @@ status?: EnumTaskStatus; releaseStatus?: EnumTaskReleaseStatus; hireStatus?: EnumTaskUserHireStatus; + /** 鐏靛伐Id */ + enterpriseEmployeeId?: string; applyButton?: GetTaskInfoQueryResultApplyButton; hireButton?: GetTaskInfoQueryResultHireButton; } @@ -4054,9 +4329,9 @@ identity?: string; } - interface InviteEnterpriseEmployeeElectronSignCommand { + interface InviteElectronSignCommand { /** 鐏靛伐Id */ - id?: string; + ids?: string[]; /** 鍚堝悓妯℃澘Id */ contractTemplateId?: string; } @@ -4072,6 +4347,15 @@ sessionKey?: string; /** 鏄惁宸茬粦瀹氭墜鏈哄彿锛堜粎鐢ㄤ簬寰俊灏忕▼搴忔巿鏉冪櫥褰曪級 */ isBindPhoneNumber?: boolean; + } + + interface OpenEnterpriseWalletCommand { + access?: EnumEnterpriseWalletAccess; + } + + interface OpenEnterpriseWalletCommandResult { + /** 绛剧害鍦板潃 */ + signUrl?: string; } interface PagedListQueryPageModel { @@ -4141,6 +4425,18 @@ clientType?: EnumClientType; } + interface PersonalUserElectronSignCommand { + /** 鐏靛伐Id */ + id?: string; + } + + interface PersonalUserElectronSignCommandResult { + /** 绛剧讲鍚堝悓鐭摼鎺� */ + signContractShortUrl?: string; + /** 绛剧讲鍚堝悓闀块摼鎺� */ + signContractLongUrl?: string; + } + interface PersonalUserFaceRealCommand { /** 濮撳悕 */ name: string; @@ -4165,6 +4461,12 @@ identityBackImg: string; /** 楠岃瘉鐮� */ verifyCode: string; + } + + interface RechargeEnterpriseWalletCommand { + access?: EnumEnterpriseWalletAccess; + /** 閲戦 */ + amount?: number; } interface RegisterPersonalUserCommand { @@ -4293,6 +4595,17 @@ password?: string; /** Id */ id?: string; + } + + interface SaveEnterpriseCostCommand { + /** 浼佷笟Id */ + enterpriseId?: string; + type?: EnumEnterpriseCostType; + /** 鍚堝悓妯℃澘Id */ + contractTemplateId?: string; + /** 鐏靛伐鍚堝悓Id */ + enterpriseEmployeeContractId?: string; + status?: EnumEnterpriseCostStatus; } interface SaveMenuButtonCommand { @@ -4667,6 +4980,11 @@ clientType?: EnumClientType; } + interface StopElectronSignCommand { + /** 鐏靛伐Id */ + ids?: string[]; + } + interface SubmitCheckReceiveTaskCommand { /** 浠诲姟Id */ taskInfoId?: string; diff --git a/src/views/EnterpriseManage/EnterpriseManageList.vue b/src/views/EnterpriseManage/EnterpriseManageList.vue index 4bbf424..365b471 100644 --- a/src/views/EnterpriseManage/EnterpriseManageList.vue +++ b/src/views/EnterpriseManage/EnterpriseManageList.vue @@ -58,6 +58,7 @@ import ConfigureDialog from './components/ConfigureDialog.vue'; import { Message } from '@bole-core/core'; import * as enterpriseServices from '@/services/api/enterprise'; +import * as enterpriseWalletServices from '@/services/api/enterpriseWallet'; defineOptions({ name: 'EnterpriseManageList', @@ -140,15 +141,11 @@ ); async function getEnterpriseElectronSignSetting(id: string) { - try { - return await enterpriseServices.getEnterpriseElectronSignSetting({ id: id }); - } catch (error) {} + return await enterpriseServices.getEnterpriseElectronSignSetting({ id: id }); } async function getEnterpriseSmsSetting(id: string) { - try { - return await enterpriseServices.getEnterpriseSmsSetting({ id: id }); - } catch (error) {} + return await enterpriseServices.getEnterpriseSmsSetting({ id: id }); } const EnumElectronSignAccessList = computed(() => @@ -158,33 +155,43 @@ ); async function openDialog(row?: API.GetEnterprisesQueryResultItem) { - if (row) { - let electronSignSetting = await getEnterpriseElectronSignSetting(row.id); - let smsSetting = await getEnterpriseSmsSetting(row.id); - handleEdit({ - id: row.id, - enterpriseConfigureType: EnterpriseConfigureType.Electronic, - electronSignAccesses: EnumElectronSignAccessList.value.map((value) => - electronSignSetting.electronSignAccesses.includes(value) ? value : null - ), - smsAccess: smsSetting.smsAccess, - smsCost: smsSetting.smsCost, - }); - } else { - handleAdd({ - enterpriseConfigureType: EnterpriseConfigureType.Electronic, - }); - } + try { + if (row) { + let electronSignSetting = await getEnterpriseElectronSignSetting(row.id); + let smsSetting = await getEnterpriseSmsSetting(row.id); + // let alipayWallet = await enterpriseWalletServices.getEnterpriseWallet({ + // enterpriseId: row.id, + // access: EnumEnterpriseWalletAccess.Alipay, + // }); + handleEdit({ + id: row.id, + enterpriseConfigureType: EnterpriseConfigureType.AliPay, + electronSignAccesses: EnumElectronSignAccessList.value.map((value) => + electronSignSetting.electronSignAccesses.includes(value) ? value : null + ), + smsAccess: smsSetting.smsAccess, + smsCost: smsSetting.smsCost, + alipayAccount: '', + alipayMerchantId: '', + }); + } else { + handleAdd({ + enterpriseConfigureType: EnterpriseConfigureType.AliPay, + }); + } + } catch (error) {} } const { dialogProps, handleAdd, handleEdit, editForm, dialogState } = useFormDialog({ onConfirm: handleAddOrEdit, defaultFormParams: { id: '', - enterpriseConfigureType: EnterpriseConfigureType.Electronic, + enterpriseConfigureType: EnterpriseConfigureType.AliPay, electronSignAccesses: [] as EnumElectronSignAccess[], smsAccess: '' as any as EnumSmsAccess, smsCost: 0, + alipayAccount: '', + alipayMerchantId: '', }, }); diff --git a/src/views/EnterpriseManage/components/ConfigureDialog.vue b/src/views/EnterpriseManage/components/ConfigureDialog.vue index e1d475e..46b8b87 100644 --- a/src/views/EnterpriseManage/components/ConfigureDialog.vue +++ b/src/views/EnterpriseManage/components/ConfigureDialog.vue @@ -35,11 +35,45 @@ </ProFormItemV2> <ProFormItemV2 label="閾惰璐︽埛:" prop="verifyStatus"> {{ VerifyStatusText[form.verifyStatus] }} - <el-button style="margin-left: 40px" type="primary" link @click="handleCheckBankAccount" + <el-button style="margin-left: 10px" type="primary" link @click="handleCheckBankAccount" >鏍¢獙</el-button > </ProFormItemV2> </template> --> + <template v-if="form.enterpriseConfigureType === EnterpriseConfigureType.AliPay"> + <ProFormItemV2 + label="鏀粯瀹濊处鍙�:" + prop="alipayAccount" + :checkRules="[{ message: '璇疯緭鍏ユ敮浠樺疂璐﹀彿' }]" + > + <div style="display: flex; width: 100%"> + <ProFormText v-model.trim="form.alipayAccount" placeholder="璇疯緭鍏ユ敮浠樺疂璐﹀彿"> + </ProFormText> + <el-button style="margin-left: 10px" type="primary" link @click="openEnterpriseWallet" + >鑾峰彇绛剧害閾炬帴</el-button + > + </div> + </ProFormItemV2> + <ProFormItemV2 + label="鍟嗘埛ID:" + prop="alipayMerchantId" + :checkRules="[{ message: '璇疯緭鍏ュ晢鎴稩D' }]" + > + <ProFormText v-model.trim="form.alipayMerchantId" placeholder="璇疯緭鍏ュ晢鎴稩D" /> + </ProFormItemV2> + <ProFormItemV2 label="绛剧害鐘舵��:" prop="alipayAccount" required> + <span>宸茬绾�</span> + <el-button style="margin-left: 10px" type="primary" link @click="handleCheckBankAccount" + >鏍¢獙</el-button + > + </ProFormItemV2> + <ProFormItemV2 label="杩涗欢鐘舵��:" prop="alipayAccount" required> + <span>宸茶繘浠�</span> + <el-button style="margin-left: 10px" type="primary" link @click="handleCheckBankAccount" + >鏍¢獙</el-button + > + </ProFormItemV2> + </template> <template v-if="form.enterpriseConfigureType === EnterpriseConfigureType.Electronic"> <div class="configure-dialog-form-title">閫氶亾閰嶇疆</div> <ProFormItemV2 @@ -84,6 +118,7 @@ </span> </template> </ProDialog> + <QrcodeDialog v-bind="dialogQrcodeProps"></QrcodeDialog> </template> <script setup lang="ts"> @@ -97,6 +132,7 @@ ProFormInputNumber, ProFormSelect, ProFormSwitch, + useFormDialog, } from '@bole-core/components'; import { BoleRegExp } from '@bole-core/core'; import { @@ -107,6 +143,8 @@ EnumSmsAccessText, EnumElectronSignAccess, } from '@/constants'; +import * as enterpriseWalletServices from '@/services/api/enterpriseWallet'; +import QrcodeDialog from './QrcodeDialog.vue'; defineOptions({ name: 'ConfigureDialog', @@ -121,6 +159,8 @@ electronSignAccesses: EnumElectronSignAccess[]; smsAccess: EnumSmsAccess; smsCost: number; + alipayAccount: string; + alipayMerchantId: string; }; const form = defineModel<Form>('form'); @@ -152,6 +192,26 @@ } }); } + +const { dialogProps: dialogQrcodeProps, handleAdd } = useFormDialog({ + defaultFormParams: { + qrcodeUrl: '', + }, +}); + +async function openEnterpriseWallet() { + try { + let params: API.OpenEnterpriseWalletCommand = { + access: EnumEnterpriseWalletAccess.Alipay, + }; + let res = await enterpriseWalletServices.openEnterpriseWallet(params); + if (res) { + handleAdd({ + qrcodeUrl: res.signUrl, + }); + } + } catch (error) {} +} </script> <style lang="scss" scoped> @use '@/style/common.scss' as *; diff --git a/src/views/EnterpriseManage/components/QrcodeDialog.vue b/src/views/EnterpriseManage/components/QrcodeDialog.vue new file mode 100644 index 0000000..9d44956 --- /dev/null +++ b/src/views/EnterpriseManage/components/QrcodeDialog.vue @@ -0,0 +1,87 @@ +<template> + <ProDialog + title="浜岀淮鐮�" + v-model="innerVisible" + width="400px" + destroy-on-close + draggable + class="qrcode-dialog" + > + <div class="qrcode-wrapper"> + <vue-qrcode + v-if="useQrcode" + :value="form.qrcodeUrl" + tag="img" + :options="{ width: 180 }" + ref="qrcode" + > + </vue-qrcode> + <img v-else :src="form.qrcodeUrl" style="width: 180px; height: 180px" /> + </div> + </ProDialog> +</template> + +<script setup lang="ts"> +import VueQrcode from '@chenfengyuan/vue-qrcode'; +import { ProDialog } from '@bole-core/components'; + +defineOptions({ + name: 'QrcodeDialog', +}); + +type Props = { + modelValue: boolean; + form: { + qrcodeUrl: string; + }; + useQrcode?: boolean; +}; + +const props = withDefaults(defineProps<Props>(), { + modelValue: false, + useQrcode: true, +}); + +const emit = defineEmits<{ + (e: 'update:modelValue', value: boolean): void; + (e: 'onCancel'): void; +}>(); + +const innerVisible = computed({ + get() { + return props.modelValue; + }, + set(val) { + emit('update:modelValue', val); + }, +}); +</script> + +<style lang="scss" scoped> +@use '@/style/common.scss' as *; + +.qrcode-wrapper { + position: relative; + + .alipay-icon { + position: absolute; + top: calc(50% - 22px); + left: calc(50% - 22px); + display: block; + padding: 6px; + width: 44px; + height: 44px; + border: none; + border-radius: 7px; + background: #ffffff; + } +} +</style> +<style lang="scss"> +.qrcode-dialog { + .el-dialog__body { + display: flex; + justify-content: center; + } +} +</style> -- Gitblit v1.9.1