From 15b1d4f07e5a0cc5b77fca5adf1c043bee3c4585 Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期二, 09 九月 2025 13:54:56 +0800 Subject: [PATCH] fix: bug --- src/services/api/enterpriseEmployee.ts | 15 + src/views/EnterpriseManage/components/ConfigureDialog.vue | 44 ++++ .eslintrc-auto-import.json | 3 src/services/api/codeUrl.ts | 30 +++ src/services/api/typings.d.ts | 236 +++++++++++++++++++++++--- src/constants/enterprise.ts | 21 ++ src/services/api/taskUser.ts | 12 src/services/api/task.ts | 18 ++ .env.development | 4 src/services/api/index.ts | 4 auto-imports.d.ts | 8 src/constants/apiEnum.ts | 46 +++- src/views/EnterpriseManage/EnterpriseManageList.vue | 16 + src/services/api/syncDatabase.ts | 15 + src/services/api/user.ts | 32 +++ 15 files changed, 439 insertions(+), 65 deletions(-) diff --git a/.env.development b/.env.development index 9d6ad13..adc7ce7 100644 --- a/.env.development +++ b/.env.development @@ -11,8 +11,8 @@ VITE_ROUTER_HISTORY = "h5" # 寮�鍙戠幆澧冨悗绔湴鍧� -VITE_PROXY_DOMAIN_REAL = "http://localhost:53780/" -# VITE_PROXY_DOMAIN_REAL = "http://118.178.252.28:8752/" +# VITE_PROXY_DOMAIN_REAL = "http://localhost:53780/" +VITE_PROXY_DOMAIN_REAL = "https://lgdapi.81812333.com" VITE_COMPRESSION = "none" diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json index acd104e..8db6b7f 100644 --- a/.eslintrc-auto-import.json +++ b/.eslintrc-auto-import.json @@ -25,6 +25,7 @@ "EnumBillingMethodUnitText": true, "EnumClientType": true, "EnumClientTypeText": true, + "EnumCodeUrlScene": true, "EnumContractTemplateStatus": true, "EnumContractTemplateStatusText": true, "EnumContractTemplateStatusTextForEnterpriseFilter": true, @@ -44,7 +45,9 @@ "EnumEnterpriseWalletExpandindirectOrderFileType": true, "EnumEnterpriseWalletExpandindirectOrderScene": true, "EnumEnterpriseWalletExpandindirectOrderStatus": true, + "EnumEnterpriseWalletExpandindirectOrderStatusText": true, "EnumEnterpriseWalletSignStatus": true, + "EnumEnterpriseWalletSignStatusText": true, "EnumEnterpriseWalletTransactionStatus": true, "EnumEnterpriseWalletTransactionType": true, "EnumMenuType": true, diff --git a/auto-imports.d.ts b/auto-imports.d.ts index f6e2b6b..7318f0d 100644 --- a/auto-imports.d.ts +++ b/auto-imports.d.ts @@ -27,6 +27,7 @@ const EnumBillingMethodUnitText: typeof import('./src/constants/task')['EnumBillingMethodUnitText'] const EnumClientType: typeof import('./src/constants/apiEnum')['EnumClientType'] const EnumClientTypeText: typeof import('./src/constants/apiEnumText')['EnumClientTypeText'] + const EnumCodeUrlScene: typeof import('./src/constants/apiEnum')['EnumCodeUrlScene'] const EnumContractTemplateStatus: typeof import('./src/constants/apiEnum')['EnumContractTemplateStatus'] const EnumContractTemplateStatusText: typeof import('./src/constants/electronSign')['EnumContractTemplateStatusText'] const EnumContractTemplateStatusTextForEnterpriseFilter: typeof import('./src/constants/electronSign')['EnumContractTemplateStatusTextForEnterpriseFilter'] @@ -46,7 +47,9 @@ 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 EnumEnterpriseWalletExpandindirectOrderStatusText: typeof import('./src/constants/enterprise')['EnumEnterpriseWalletExpandindirectOrderStatusText'] const EnumEnterpriseWalletSignStatus: typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletSignStatus'] + const EnumEnterpriseWalletSignStatusText: typeof import('./src/constants/enterprise')['EnumEnterpriseWalletSignStatusText'] const EnumEnterpriseWalletTransactionStatus: typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletTransactionStatus'] const EnumEnterpriseWalletTransactionType: typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletTransactionType'] const EnumMenuType: typeof import('./src/constants/apiEnum')['EnumMenuType'] @@ -251,7 +254,7 @@ export type { Component, Slot, Slots, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue' import('vue') // @ts-ignore - export type { EnumBillingMethod, EnumClientType, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumEnterpriseCostStatus, EnumEnterpriseCostType, EnumEnterpriseRealMethod, EnumEnterpriseWalletAccess, 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' + export type { EnumBillingMethod, EnumClientType, EnumCodeUrlScene, 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, EnumCodeUrlScene, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumEnterpriseCostStatus, EnumEnterpriseCostType, EnumEnterpriseRealMethod, EnumEnterpriseWalletAccess, EnumEnterpriseWalletExpandindirectOrderFileType, EnumEnterpriseWalletExpandindirectOrderScene, EnumEnterpriseWalletExpandindirectOrderStatus, EnumEnterpriseWalletSignStatus, EnumEnterpriseWalletTransactionStatus, EnumEnterpriseWalletTransactionType, EnumMenuType, EnumMenuVisitLevel, EnumOcrAccess, EnumPagedListOrder, EnumPayAccess, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumPersonalRealMethod, EnumPersonalUserRealStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumTaskCheckReceiveStatus, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementOrderStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumTaskUserArrangeStatus, EnumTaskUserHireStatus, EnumTaskUserSignContractStatus, EnumTaskUserSubmitCheckReceiveStatus, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton } from './src/constants/apiEnum' import('./src/constants/apiEnum') // @ts-ignore export type { FlexWorkerEleSignEnum, FlexTaskWorkerHireEnum, FlexWorkerEleSignEnum, FlexTaskWorkerHireEnum } from './src/constants/cPerson' @@ -317,6 +320,7 @@ readonly EnumBillingMethodUnitText: UnwrapRef<typeof import('./src/constants/task')['EnumBillingMethodUnitText']> readonly EnumClientType: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumClientType']> readonly EnumClientTypeText: UnwrapRef<typeof import('./src/constants/apiEnumText')['EnumClientTypeText']> + readonly EnumCodeUrlScene: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumCodeUrlScene']> readonly EnumContractTemplateStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumContractTemplateStatus']> readonly EnumContractTemplateStatusText: UnwrapRef<typeof import('./src/constants/electronSign')['EnumContractTemplateStatusText']> readonly EnumContractTemplateStatusTextForEnterpriseFilter: UnwrapRef<typeof import('./src/constants/electronSign')['EnumContractTemplateStatusTextForEnterpriseFilter']> @@ -336,7 +340,9 @@ 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 EnumEnterpriseWalletExpandindirectOrderStatusText: UnwrapRef<typeof import('./src/constants/enterprise')['EnumEnterpriseWalletExpandindirectOrderStatusText']> readonly EnumEnterpriseWalletSignStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletSignStatus']> + readonly EnumEnterpriseWalletSignStatusText: UnwrapRef<typeof import('./src/constants/enterprise')['EnumEnterpriseWalletSignStatusText']> 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']> diff --git a/src/constants/apiEnum.ts b/src/constants/apiEnum.ts index 1045c37..efed8bd 100644 --- a/src/constants/apiEnum.ts +++ b/src/constants/apiEnum.ts @@ -21,6 +21,14 @@ Wxmp = 20, } +/** 缂栧彿鍦板潃鍦烘櫙 */ +export enum EnumCodeUrlScene { + /**閭�璇风绾� */ + InviteElectronSign = 1, + /**绛剧害鍦板潃 */ + ElectronSignUrl = 10, +} + /** 鍚堝悓鍒剁増鐘舵�� */ export enum EnumContractTemplateStatus { /**寰呭埗鐗� */ @@ -133,9 +141,11 @@ /** 浼佷笟閽卞寘浠h繘浠跺崟鐘舵�� */ export enum EnumEnterpriseWalletExpandindirectOrderStatus { + /**鏈繘浠� */ + Wait = 1, /**瀹℃壒涓� */ PROCESSING = 10, - /**宸茬敓鏁� */ + /**宸茶繘浠� */ VALID = 20, /**瀹℃壒涓嶉�氳繃 */ INVALID = 30, @@ -147,6 +157,8 @@ /** 浼佷笟閽卞寘绛剧害鐘舵�� */ export enum EnumEnterpriseWalletSignStatus { + /**鏈绾� */ + Wait = 1, /**鐢宠涓� */ Apply = 10, /**宸茬绾� */ @@ -289,34 +301,38 @@ FlexJobServerTaskUser = 2, /**浠诲姟楠屾敹 */ FlexJobServerTaskCheckReceive = 3, + /**缂栧彿鍦板潃 */ + CommonServerCodeUrls = 4, /**鏂囦欢 */ - CommonServerFileUtils = 4, + CommonServerFileUtils = 5, /**鏂囧瓧璇嗗埆 */ - CommonServerOcrUtils = 5, + CommonServerOcrUtils = 6, /**鏃ュ織璁板綍 */ - CommonServerLogRecords = 6, + CommonServerLogRecords = 7, + /**鍚屾鏁版嵁搴� */ + CommonServerSyncDatabase = 8, /**鐢ㄦ埛璁よ瘉 */ - UserServerAuth = 7, + UserServerAuth = 9, /**鐢ㄦ埛鑿滃崟 */ - UserServerMenu = 8, + UserServerMenu = 10, /**鐢ㄦ埛璧勬簮 */ - UserServerResource = 9, + UserServerResource = 11, /**鐢ㄦ埛瑙掕壊 */ - UserServerRole = 10, + UserServerRole = 12, /**鐢ㄦ埛淇℃伅 */ - UserServerUser = 11, + UserServerUser = 13, /**鐢靛瓙绛� */ - UserServerElectronSign = 12, + UserServerElectronSign = 14, /**鐢ㄦ埛绠�鍘� */ - UserServerUserResume = 13, + UserServerUserResume = 15, /**浼佷笟淇℃伅 */ - UserServerEnterprise = 14, + UserServerEnterprise = 16, /**浼佷笟閽卞寘 */ - UserServerEnterpriseWallet = 15, + UserServerEnterpriseWallet = 17, /**鐏靛伐淇℃伅 */ - UserServerEnterpriseEmployee = 16, + UserServerEnterpriseEmployee = 18, /**鐢靛瓙绛� */ - ElectronSignServerElectronSign = 17, + ElectronSignServerElectronSign = 19, } /** 璧勬簮璇锋眰鏂瑰紡 */ diff --git a/src/constants/enterprise.ts b/src/constants/enterprise.ts index 4e8a7fc..636974c 100644 --- a/src/constants/enterprise.ts +++ b/src/constants/enterprise.ts @@ -1,3 +1,8 @@ +import { + EnumEnterpriseWalletSignStatus, + EnumEnterpriseWalletExpandindirectOrderStatus, +} from './apiEnum'; + export enum EnterpriseConfigureType { /** * 閾惰淇℃伅閰嶇疆 @@ -93,3 +98,19 @@ false: '鏈厤缃�', true: '宸查厤缃�', }; + +export const EnumEnterpriseWalletSignStatusText = { + [EnumEnterpriseWalletSignStatus.Wait]: '鏈绾�', + [EnumEnterpriseWalletSignStatus.Apply]: '鐢宠涓�', + [EnumEnterpriseWalletSignStatus.Normal]: '宸茬绾�', + [EnumEnterpriseWalletSignStatus.Stop]: '缁堟', +}; + +export const EnumEnterpriseWalletExpandindirectOrderStatusText = { + [EnumEnterpriseWalletExpandindirectOrderStatus.Wait]: '鏈繘浠�', + [EnumEnterpriseWalletExpandindirectOrderStatus.PROCESSING]: '瀹℃壒涓�', + [EnumEnterpriseWalletExpandindirectOrderStatus.VALID]: '宸茶繘浠�', + [EnumEnterpriseWalletExpandindirectOrderStatus.INVALID]: '瀹℃壒涓嶉�氳繃', + [EnumEnterpriseWalletExpandindirectOrderStatus.DISUSE]: '宸插簾寮�', + [EnumEnterpriseWalletExpandindirectOrderStatus.REVOKED]: '宸叉挙閿�', +}; diff --git a/src/services/api/codeUrl.ts b/src/services/api/codeUrl.ts new file mode 100644 index 0000000..2cb6939 --- /dev/null +++ b/src/services/api/codeUrl.ts @@ -0,0 +1,30 @@ +/* eslint-disable */ +// @ts-ignore +import { request } from '@/utils/request'; + +/** 鏌ヨ缂栧彿鍦板潃 GET /api/common/codeUrl/getCodeUrl */ +export async function getCodeUrl( + // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄) + params: API.APIgetCodeUrlParams, + options?: API.RequestConfig +) { + return request<API.GetCodeUrlQueryResult>('/api/common/codeUrl/getCodeUrl', { + method: 'GET', + params: { + ...params, + }, + ...(options || {}), + }); +} + +/** 淇濆瓨缂栧彿鍦板潃 POST /api/common/codeUrl/saveCodeUrl */ +export async function saveCodeUrl(body: API.SaveCodeUrlCommand, options?: API.RequestConfig) { + return request<string>('/api/common/codeUrl/saveCodeUrl', { + method: 'POST', + headers: { + 'Content-Type': 'application/json-patch+json', + }, + data: body, + ...(options || {}), + }); +} diff --git a/src/services/api/enterpriseEmployee.ts b/src/services/api/enterpriseEmployee.ts index 874d511..286ed8a 100644 --- a/src/services/api/enterpriseEmployee.ts +++ b/src/services/api/enterpriseEmployee.ts @@ -158,6 +158,21 @@ ); } +/** 鍙戦�侀個璇风绾︾煭淇� POST /api/user/enterpriseEmployee/sendInviteElectronSignSms */ +export async function sendInviteElectronSignSms( + body: API.SendInviteElectronSignSmsCommand, + options?: API.RequestConfig +) { + return request<number>('/api/user/enterpriseEmployee/sendInviteElectronSignSms', { + 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, diff --git a/src/services/api/index.ts b/src/services/api/index.ts index 76b273c..2d2b182 100644 --- a/src/services/api/index.ts +++ b/src/services/api/index.ts @@ -11,6 +11,7 @@ import * as resource from './resource'; import * as dictionary from './dictionary'; import * as enterpriseWallet from './enterpriseWallet'; +import * as codeUrl from './codeUrl'; import * as electronSign from './electronSign'; import * as userResume from './userResume'; import * as auth from './auth'; @@ -19,6 +20,7 @@ import * as menu from './menu'; import * as logRecords from './logRecords'; import * as fileUtils from './fileUtils'; +import * as syncDatabase from './syncDatabase'; export default { enterpriseEmployee, user, @@ -29,6 +31,7 @@ resource, dictionary, enterpriseWallet, + codeUrl, electronSign, userResume, auth, @@ -37,4 +40,5 @@ menu, logRecords, fileUtils, + syncDatabase, }; diff --git a/src/services/api/syncDatabase.ts b/src/services/api/syncDatabase.ts new file mode 100644 index 0000000..b40e50d --- /dev/null +++ b/src/services/api/syncDatabase.ts @@ -0,0 +1,15 @@ +/* eslint-disable */ +// @ts-ignore +import { request } from '@/utils/request'; + +/** 鍚屾鏁版嵁搴� POST /api/common/syncDatabase/syncDatabase */ +export async function syncDatabase(body: API.SyncDatabaseCommand, options?: API.RequestConfig) { + return request<number>('/api/common/syncDatabase/syncDatabase', { + method: 'POST', + headers: { + 'Content-Type': 'application/json-patch+json', + }, + data: body, + ...(options || {}), + }); +} diff --git a/src/services/api/task.ts b/src/services/api/task.ts index 573a56e..06e974f 100644 --- a/src/services/api/task.ts +++ b/src/services/api/task.ts @@ -155,6 +155,24 @@ }); } +/** 鏌ヨ浠诲姟閫夋嫨鍣ㄦ暟鎹� GET /api/flexjob/task/getTaskSelect */ +export async function getTaskSelect( + // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄) + params: API.APIgetTaskSelectParams, + options?: API.RequestConfig +) { + return request<API.SelectOptionGuidGetTaskSelectQueryOption[]>( + '/api/flexjob/task/getTaskSelect', + { + method: 'GET', + params: { + ...params, + }, + ...(options || {}), + } + ); +} + /** 鎾ゅ洖缁撶畻 POST /api/flexjob/task/revokeTaskSettlementOrder */ export async function revokeTaskSettlementOrder( body: API.RevokeTaskSettlementOrderCommand, diff --git a/src/services/api/taskUser.ts b/src/services/api/taskUser.ts index 85e1c78..a66d30a 100644 --- a/src/services/api/taskUser.ts +++ b/src/services/api/taskUser.ts @@ -56,19 +56,19 @@ }); } -/** 鏌ヨ缁撶畻鍚嶅崟鍒嗛〉鍒楄〃鏁版嵁 POST /api/flexjob/taskUser/getSettlementTaskUsers */ +/** 鏌ヨ缁撶畻鍚嶅崟鍒嗛〉鍒楄〃鏁版嵁 GET /api/flexjob/taskUser/getSettlementTaskUsers */ export async function getSettlementTaskUsers( - body: API.GetSettlementTaskUsersQuery, + // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄) + params: API.APIgetSettlementTaskUsersParams, options?: API.RequestConfig ) { return request<API.GetSettlementTaskUsersQueryResult>( '/api/flexjob/taskUser/getSettlementTaskUsers', { - method: 'POST', - headers: { - 'Content-Type': 'application/json-patch+json', + method: 'GET', + params: { + ...params, }, - data: body, ...(options || {}), } ); diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts index 5aa46b1..eab48c6 100644 --- a/src/services/api/typings.d.ts +++ b/src/services/api/typings.d.ts @@ -29,6 +29,13 @@ date?: string; } + interface APIgetCodeUrlParams { + /** 鍦烘櫙 */ + scene?: EnumCodeUrlScene; + /** 缂栧彿 */ + code?: string; + } + interface APIgetContractTemplateParams { /** 妯℃澘Id */ id?: string; @@ -146,6 +153,11 @@ request?: GetPersonalLoginInfoQuery; } + interface APIgetPersonalUserBankCardParams { + /** 鏌ヨ涓汉鐢ㄦ埛閾惰鍗′俊鎭� */ + request?: GetPersonalUserBankCardQuery; + } + interface APIgetPersonalUserElectronSignParams { /** 鐏靛伐Id */ id?: string; @@ -187,6 +199,13 @@ id?: string; } + interface APIgetSettlementTaskUsersParams { + /** 浠诲姟Id */ + taskInfoId?: string; + /** 缁撶畻鍗曞湴鍧� */ + settlementOrderUrl?: string; + } + interface APIgetTaskEnterpriseParams { /** 浼佷笟Id */ id?: string; @@ -195,6 +214,11 @@ interface APIgetTaskInfoParams { /** Id */ id?: string; + } + + interface APIgetTaskSelectParams { + /** 鍏抽敭瀛� */ + keywords?: string; } interface APIgetTaskUserHireStatusParams { @@ -486,6 +510,13 @@ Wxmp = 20, } + enum EnumCodeUrlScene { + /**閭�璇风绾� */ + InviteElectronSign = 1, + /**绛剧害鍦板潃 */ + ElectronSignUrl = 10, + } + enum EnumContractTemplateStatus { /**寰呭埗鐗� */ Wait = 10, @@ -585,9 +616,11 @@ } enum EnumEnterpriseWalletExpandindirectOrderStatus { + /**鏈繘浠� */ + Wait = 1, /**瀹℃壒涓� */ PROCESSING = 10, - /**宸茬敓鏁� */ + /**宸茶繘浠� */ VALID = 20, /**瀹℃壒涓嶉�氳繃 */ INVALID = 30, @@ -598,6 +631,8 @@ } enum EnumEnterpriseWalletSignStatus { + /**鏈绾� */ + Wait = 1, /**鐢宠涓� */ Apply = 10, /**宸茬绾� */ @@ -727,34 +762,38 @@ FlexJobServerTaskUser = 2, /**浠诲姟楠屾敹 */ FlexJobServerTaskCheckReceive = 3, + /**缂栧彿鍦板潃 */ + CommonServerCodeUrls = 4, /**鏂囦欢 */ - CommonServerFileUtils = 4, + CommonServerFileUtils = 5, /**鏂囧瓧璇嗗埆 */ - CommonServerOcrUtils = 5, + CommonServerOcrUtils = 6, /**鏃ュ織璁板綍 */ - CommonServerLogRecords = 6, + CommonServerLogRecords = 7, + /**鍚屾鏁版嵁搴� */ + CommonServerSyncDatabase = 8, /**鐢ㄦ埛璁よ瘉 */ - UserServerAuth = 7, + UserServerAuth = 9, /**鐢ㄦ埛鑿滃崟 */ - UserServerMenu = 8, + UserServerMenu = 10, /**鐢ㄦ埛璧勬簮 */ - UserServerResource = 9, + UserServerResource = 11, /**鐢ㄦ埛瑙掕壊 */ - UserServerRole = 10, + UserServerRole = 12, /**鐢ㄦ埛淇℃伅 */ - UserServerUser = 11, + UserServerUser = 13, /**鐢靛瓙绛� */ - UserServerElectronSign = 12, + UserServerElectronSign = 14, /**鐢ㄦ埛绠�鍘� */ - UserServerUserResume = 13, + UserServerUserResume = 15, /**浼佷笟淇℃伅 */ - UserServerEnterprise = 14, + UserServerEnterprise = 16, /**浼佷笟閽卞寘 */ - UserServerEnterpriseWallet = 15, + UserServerEnterpriseWallet = 17, /**鐏靛伐淇℃伅 */ - UserServerEnterpriseEmployee = 16, + UserServerEnterpriseEmployee = 18, /**鐢靛瓙绛� */ - ElectronSignServerElectronSign = 17, + ElectronSignServerElectronSign = 19, } enum EnumResourceMethod { @@ -1055,6 +1094,24 @@ /** 閿欒鐮� */ errorCode?: string; data?: GetCheckReceiveTaskUserSubmitsQueryResult; + /** 鎵ц鎴愬姛 */ + success?: boolean; + /** 閿欒淇℃伅 */ + msg?: any; + /** 闄勫姞鏁版嵁 */ + extras?: any; + /** 鏃堕棿鎴� */ + timestamp?: number; + } + + interface FriendlyResultGetCodeUrlQueryResult { + /** 璺熻釜Id */ + traceId?: string; + /** 鐘舵�佺爜 */ + code?: number; + /** 閿欒鐮� */ + errorCode?: string; + data?: GetCodeUrlQueryResult; /** 鎵ц鎴愬姛 */ success?: boolean; /** 閿欒淇℃伅 */ @@ -1469,6 +1526,24 @@ /** 閿欒鐮� */ errorCode?: string; data?: GetPersonalLoginInfoQueryResult; + /** 鎵ц鎴愬姛 */ + success?: boolean; + /** 閿欒淇℃伅 */ + msg?: any; + /** 闄勫姞鏁版嵁 */ + extras?: any; + /** 鏃堕棿鎴� */ + timestamp?: number; + } + + interface FriendlyResultGetPersonalUserBankCardQueryResult { + /** 璺熻釜Id */ + traceId?: string; + /** 鐘舵�佺爜 */ + code?: number; + /** 閿欒鐮� */ + errorCode?: string; + data?: GetPersonalUserBankCardQueryResult; /** 鎵ц鎴愬姛 */ success?: boolean; /** 閿欒淇℃伅 */ @@ -2139,6 +2214,25 @@ timestamp?: number; } + interface FriendlyResultListSelectOptionGuidGetTaskSelectQueryOption { + /** 璺熻釜Id */ + traceId?: string; + /** 鐘舵�佺爜 */ + code?: number; + /** 閿欒鐮� */ + errorCode?: string; + /** 鏁版嵁 */ + data?: SelectOptionGuidGetTaskSelectQueryOption[]; + /** 鎵ц鎴愬姛 */ + success?: boolean; + /** 閿欒淇℃伅 */ + msg?: any; + /** 闄勫姞鏁版嵁 */ + extras?: any; + /** 鏃堕棿鎴� */ + timestamp?: number; + } + interface FriendlyResultListSelectOptionStringGetDictionaryDataSelectQueryResultOption { /** 璺熻釜Id */ traceId?: string; @@ -2615,6 +2709,21 @@ endTime?: string; /** 浠诲姟鍦扮偣鍚嶇О */ addressName?: string; + } + + interface GetCodeUrlQueryResult { + /** 鍦板潃 */ + url?: string; + /** 鍙傛暟1 */ + paramValue1?: string; + /** 鍙傛暟2 */ + paramValue2?: string; + /** 鍙傛暟3 */ + paramValue3?: string; + /** 鍙傛暟4 */ + paramValue4?: string; + /** 鍙傛暟5 */ + paramValue5?: string; } interface GetContractTemplateEnterprisesQuery { @@ -3179,6 +3288,10 @@ /** 閽卞寘Id */ id?: string; access?: EnumEnterpriseWalletAccess; + /** 璐﹀彿 */ + account?: string; + /** 鍟嗘埛Id */ + merchantId?: string; /** 鍗忚鍙� */ code?: string; /** 閫氶亾鍗忚鍙� */ @@ -3190,6 +3303,7 @@ /** 鍗忚澶辨晥鏃堕棿 */ invalidTime?: string; signStatus?: EnumEnterpriseWalletSignStatus; + expandindirectOrderStatus?: EnumEnterpriseWalletExpandindirectOrderStatus; } interface GetEnterpriseWalletTransactionQueryResult { @@ -3606,6 +3720,20 @@ hireRefuseTaskCount?: number; } + type GetPersonalUserBankCardQuery = Record<string, any>; + + interface GetPersonalUserBankCardQueryResult { + access?: EnumEnterpriseWalletAccess; + /** 閾惰鍗″彿 */ + code?: string; + /** 鎵�灞為摱琛� */ + bank?: string; + /** 鎵�灞炴敮琛� */ + bankBranch?: string; + /** 閾惰棰勭暀鎵嬫満鍙� */ + phoneNumber?: string; + } + interface GetPersonalUserElectronSignQueryResult { /** 鐏靛伐Id */ id?: string; @@ -3995,22 +4123,11 @@ settlementUserCount?: number; } - interface GetSettlementTaskUsersQuery { - /** 浠诲姟Id */ - taskInfoId?: string; - /** 鍏抽敭瀛� */ - keywords?: string; - /** 缁撶畻鍗曞湴鍧� */ - settlementOrderUrl?: string; - pageModel?: PagedListQueryPageModel; - } - interface GetSettlementTaskUsersQueryResult { + /** 缁撶畻鍚嶅崟 */ + data?: GetSettlementTaskUsersQueryResultItem[]; /** 閿欒淇℃伅 */ errors?: GetSettlementTaskUsersQueryResultError[]; - pageModel?: PagedListQueryResultPageModel; - /** 鏁版嵁 */ - data?: GetSettlementTaskUsersQueryResultItem[]; } interface GetSettlementTaskUsersQueryResultError { @@ -4044,6 +4161,7 @@ /** 鎵嬫満鍙� */ contactPhoneNumber?: string; checkReceiveStatus?: EnumTaskCheckReceiveStatus; + settlementStatus?: EnumTaskSettlementStatus; /** 鎵�灞為摱琛� */ bank?: string; /** 寮�鎴锋敮琛屽悕绉� */ @@ -4272,6 +4390,15 @@ inProcessReleaseCount?: number; /** 宸插仠姝㈡暟閲� */ stoppedReleaseCount?: number; + } + + interface GetTaskSelectQueryOption { + /** 浠诲姟Id */ + id?: string; + /** 浠诲姟鍗曞彿 */ + code?: string; + /** 浠诲姟鍚嶇О */ + name?: string; } interface GetTaskUserHireStatusQueryResult { @@ -4660,6 +4787,10 @@ /** 浼佷笟Id */ enterpriseId?: string; access?: EnumEnterpriseWalletAccess; + /** 璐﹀彿 */ + account?: string; + /** 鍟嗘埛Id */ + merchantId?: string; } interface OpenEnterpriseWalletCommandResult { @@ -4735,8 +4866,10 @@ } interface PersonalUserElectronSignCommand { - /** 鐏靛伐Id */ + /** 鐏靛伐Id锛堜簩閫変竴锛� */ id?: string; + /** 閭�绾︾煭淇$紪鍙凤紙浜岄�変竴锛� */ + smsCode?: string; } interface PersonalUserElectronSignCommandResult { @@ -4802,6 +4935,24 @@ interface RevokeTaskSettlementOrderCommand { /** 浠诲姟Id */ taskInfoId?: string; + } + + interface SaveCodeUrlCommand { + scene?: EnumCodeUrlScene; + /** 鍦板潃 */ + url?: string; + /** 鍙傛暟1 */ + paramValue1?: string; + /** 鍙傛暟2 */ + paramValue2?: string; + /** 鍙傛暟3 */ + paramValue3?: string; + /** 鍙傛暟4 */ + paramValue4?: string; + /** 鍙傛暟5 */ + paramValue5?: string; + /** 杩囨湡鏃堕棿 */ + expiredTime?: string; } interface SaveContractTemplateCommand { @@ -5054,6 +5205,18 @@ id?: string; } + interface SavePersonalUserBankCardCommand { + access?: EnumEnterpriseWalletAccess; + /** 閾惰鍗″彿 */ + code?: string; + /** 鎵�灞為摱琛� */ + bank?: string; + /** 鎵�灞炴敮琛� */ + bankBranch?: string; + /** 閾惰棰勭暀鎵嬫満鍙� */ + phoneNumber?: string; + } + interface SaveRoleCommand { /** Id */ id?: string; @@ -5185,12 +5348,25 @@ data?: GetEnterpriseContractTemplateSelectQueryOption; } + interface SelectOptionGuidGetTaskSelectQueryOption { + /** 鍊� */ + value?: string; + /** 鏍囩 */ + label?: string; + data?: GetTaskSelectQueryOption; + } + interface SelectOptionStringGetDictionaryDataSelectQueryResultOption { /** 鍊� */ value?: string; /** 鏍囩 */ label?: string; data?: GetDictionaryDataSelectQueryResultOption; + } + + interface SendInviteElectronSignSmsCommand { + /** Id */ + ids?: string[]; } interface SendLoginOrRegisterVerifyCodeCommand { @@ -5348,6 +5524,8 @@ actualSettlementAmount: number; } + type SyncDatabaseCommand = Record<string, any>; + interface SyncElectronSignSettingsCommand { /** 椤� */ items?: SyncElectronSignSettingsCommandItem[]; diff --git a/src/services/api/user.ts b/src/services/api/user.ts index 43f20b8..99c7719 100644 --- a/src/services/api/user.ts +++ b/src/services/api/user.ts @@ -20,6 +20,23 @@ ); } +/** 鏌ヨ涓汉鐢ㄦ埛閾惰鍗′俊鎭� GET /api/user/user/getPersonalUserBankCard */ +export async function getPersonalUserBankCard( + // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄) + params: API.APIgetPersonalUserBankCardParams, + options?: API.RequestConfig +) { + return request<API.GetPersonalUserBankCardQueryResult>('/api/user/user/getPersonalUserBankCard', { + method: 'GET', + params: { + ...params, + request: undefined, + ...params['request'], + }, + ...(options || {}), + }); +} + /** 鏌ヨC绔汉鍛樺垎椤靛垪琛ㄦ暟鎹� POST /api/user/user/getPersonalUserInfos */ export async function getPersonalUserInfos( body: API.GetPersonalUserInfosQuery, @@ -68,6 +85,21 @@ }); } +/** 淇濆瓨鐢ㄦ埛閾惰鍗′俊鎭� POST /api/user/user/savePersonalUserBankCard */ +export async function savePersonalUserBankCard( + body: API.SavePersonalUserBankCardCommand, + options?: API.RequestConfig +) { + return request<string>('/api/user/user/savePersonalUserBankCard', { + method: 'POST', + headers: { + 'Content-Type': 'application/json-patch+json', + }, + data: body, + ...(options || {}), + }); +} + /** 璁剧疆鐢ㄦ埛淇℃伅瑙掕壊 PUT /api/user/user/setUserInfoRoles */ export async function setUserInfoRoles( body: API.SetUserInfoRolesCommand, diff --git a/src/views/EnterpriseManage/EnterpriseManageList.vue b/src/views/EnterpriseManage/EnterpriseManageList.vue index 365b471..95f5447 100644 --- a/src/views/EnterpriseManage/EnterpriseManageList.vue +++ b/src/views/EnterpriseManage/EnterpriseManageList.vue @@ -159,10 +159,10 @@ 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, - // }); + let alipayWallet = await enterpriseWalletServices.getEnterpriseWallet({ + enterpriseId: row.id, + access: EnumEnterpriseWalletAccess.Alipay, + }); handleEdit({ id: row.id, enterpriseConfigureType: EnterpriseConfigureType.AliPay, @@ -171,8 +171,10 @@ ), smsAccess: smsSetting.smsAccess, smsCost: smsSetting.smsCost, - alipayAccount: '', - alipayMerchantId: '', + alipayAccount: alipayWallet.account, + alipayMerchantId: alipayWallet.merchantId, + signStatus: alipayWallet.signStatus, + expandindirectOrderStatus: alipayWallet.expandindirectOrderStatus, }); } else { handleAdd({ @@ -192,6 +194,8 @@ smsCost: 0, alipayAccount: '', alipayMerchantId: '', + signStatus: '' as any as EnumEnterpriseWalletSignStatus, + expandindirectOrderStatus: '' as any as EnumEnterpriseWalletExpandindirectOrderStatus, }, }); diff --git a/src/views/EnterpriseManage/components/ConfigureDialog.vue b/src/views/EnterpriseManage/components/ConfigureDialog.vue index e094b3c..4129230 100644 --- a/src/views/EnterpriseManage/components/ConfigureDialog.vue +++ b/src/views/EnterpriseManage/components/ConfigureDialog.vue @@ -49,7 +49,11 @@ <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 + style="margin-left: 10px" + type="primary" + link + @click="handleOpenEnterpriseWallet" >鑾峰彇绛剧害閾炬帴</el-button > </div> @@ -61,14 +65,16 @@ > <ProFormText v-model.trim="form.alipayMerchantId" placeholder="璇疯緭鍏ュ晢鎴稩D" /> </ProFormItemV2> - <ProFormItemV2 label="绛剧害鐘舵��:" prop="alipayAccount" required> - <span>宸茬绾�</span> + <ProFormItemV2 label="绛剧害鐘舵��:" prop="signStatus" required> + <span>{{ EnumEnterpriseWalletSignStatusText[form.signStatus] }}</span> <el-button style="margin-left: 10px" type="primary" link @click="handleCheckBankAccount" >鏍¢獙</el-button > </ProFormItemV2> - <ProFormItemV2 label="杩涗欢鐘舵��:" prop="alipayAccount" required> - <span>宸茶繘浠�</span> + <ProFormItemV2 label="杩涗欢鐘舵��:" prop="expandindirectOrderStatus" required> + <span>{{ + EnumEnterpriseWalletExpandindirectOrderStatusText[form.expandindirectOrderStatus] + }}</span> <el-button style="margin-left: 10px" type="primary" link @click="handleCheckBankAccount" >鏍¢獙</el-button > @@ -142,6 +148,8 @@ EnumElectronSignAccessText, EnumSmsAccessText, EnumElectronSignAccess, + EnumEnterpriseWalletSignStatusText, + EnumEnterpriseWalletExpandindirectOrderStatusText, } from '@/constants'; import * as enterpriseWalletServices from '@/services/api/enterpriseWallet'; import AlipayWalletOpen from './AlipayWalletOpen.vue'; @@ -162,6 +170,9 @@ alipayAccount: string; alipayMerchantId: string; id: string; + + signStatus: EnumEnterpriseWalletSignStatus; + expandindirectOrderStatus: EnumEnterpriseWalletExpandindirectOrderStatus; }; const form = defineModel<Form>('form'); @@ -176,7 +187,18 @@ const { enabledElectronSignSettings } = useEnabledElectronSignSettings(); -function handleCheckBankAccount() {} +async function handleCheckBankAccount() { + try { + let alipayWallet = await enterpriseWalletServices.getEnterpriseWallet({ + enterpriseId: form.value.id, + access: EnumEnterpriseWalletAccess.Alipay, + }); + if (alipayWallet) { + form.value.signStatus = alipayWallet.signStatus; + form.value.expandindirectOrderStatus = alipayWallet.expandindirectOrderStatus; + } + } catch (error) {} +} function onDialogClose() { if (!dialogForm.value) return; @@ -200,6 +222,16 @@ }, }); +async function handleOpenEnterpriseWallet() { + try { + if (!dialogForm.value) return; + const valid = await dialogForm.value.validateField(['alipayAccount', 'alipayMerchantId']); + if (valid) { + openEnterpriseWallet(); + } + } catch (error) {} +} + async function openEnterpriseWallet() { try { let params: API.OpenEnterpriseWalletCommand = { -- Gitblit v1.9.1