From 6ce748cc886d5240283b1456e208db1871b3837f Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期日, 28 九月 2025 09:35:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-1.1.2'
---
src/services/api/index.ts | 4
.eslintrc-auto-import.json | 1
src/services/api/electronSign.ts | 21 ++--
src/services/api/typings.d.ts | 196 ++++++++++++++++++++++++++++++++++++---
auto-imports.d.ts | 4
src/constants/apiEnum.ts | 12 ++
src/views/EmploymentManage/EmploymentManageArrange.vue | 3
src/services/api/enterpriseWallet.ts | 12 --
src/services/api/logRecords.ts | 18 +++
src/services/api/ocrUtils.ts | 12 ++
10 files changed, 241 insertions(+), 42 deletions(-)
diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json
index c015401..e564345 100644
--- a/.eslintrc-auto-import.json
+++ b/.eslintrc-auto-import.json
@@ -28,6 +28,7 @@
"EnumDataSource": true,
"EnumDbAuditOperate": true,
"EnumElectronSignAccess": true,
+ "EnumElectronSignVerifyType": true,
"EnumEnterpriseCostStatus": true,
"EnumEnterpriseCostType": true,
"EnumEnterpriseRealMethod": true,
diff --git a/auto-imports.d.ts b/auto-imports.d.ts
index aa83e70..6731aa6 100644
--- a/auto-imports.d.ts
+++ b/auto-imports.d.ts
@@ -31,6 +31,7 @@
const EnumDataSource: typeof import('./src/constants/apiEnum')['EnumDataSource']
const EnumDbAuditOperate: typeof import('./src/constants/apiEnum')['EnumDbAuditOperate']
const EnumElectronSignAccess: typeof import('./src/constants/apiEnum')['EnumElectronSignAccess']
+ const EnumElectronSignVerifyType: typeof import('./src/constants/apiEnum')['EnumElectronSignVerifyType']
const EnumEnterpriseCostStatus: typeof import('./src/constants/apiEnum')['EnumEnterpriseCostStatus']
const EnumEnterpriseCostType: typeof import('./src/constants/apiEnum')['EnumEnterpriseCostType']
const EnumEnterpriseRealMethod: typeof import('./src/constants/apiEnum')['EnumEnterpriseRealMethod']
@@ -258,7 +259,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, EnumCodeUrlScene, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumEnterpriseCostStatus, EnumEnterpriseCostType, EnumEnterpriseRealMethod, EnumEnterpriseWalletAccess, EnumEnterpriseWalletExpandindirectOrderFileType, EnumEnterpriseWalletExpandindirectOrderScene, EnumEnterpriseWalletExpandindirectOrderStatus, EnumEnterpriseWalletSignStatus, EnumEnterpriseWalletTransactionType, EnumGetEnterpriseEmployeesQuerySignContractStatus, 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, EnumUserBankCardAccess, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, EnumUserWalletTransactionType, EnumWalletTransactionStatus, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton, SettlementReceiveStatus, EnumBillingMethod, EnumClientType, EnumCodeUrlScene, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumEnterpriseCostStatus, EnumEnterpriseCostType, EnumEnterpriseRealMethod, EnumEnterpriseWalletAccess, EnumEnterpriseWalletExpandindirectOrderFileType, EnumEnterpriseWalletExpandindirectOrderScene, EnumEnterpriseWalletExpandindirectOrderStatus, EnumEnterpriseWalletSignStatus, EnumEnterpriseWalletTransactionType, EnumGetEnterpriseEmployeesQuerySignContractStatus, 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, EnumUserBankCardAccess, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, EnumUserWalletTransactionType, EnumWalletTransactionStatus, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton, SettlementReceiveStatus } from './src/constants/apiEnum'
+ export type { EnumBillingMethod, EnumClientType, EnumCodeUrlScene, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumElectronSignVerifyType, EnumEnterpriseCostStatus, EnumEnterpriseCostType, EnumEnterpriseRealMethod, EnumEnterpriseWalletAccess, EnumEnterpriseWalletExpandindirectOrderFileType, EnumEnterpriseWalletExpandindirectOrderScene, EnumEnterpriseWalletExpandindirectOrderStatus, EnumEnterpriseWalletSignStatus, EnumEnterpriseWalletTransactionType, EnumGetEnterpriseEmployeesQuerySignContractStatus, 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, EnumUserBankCardAccess, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, EnumUserWalletTransactionType, EnumWalletTransactionStatus, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton, SettlementReceiveStatus, EnumBillingMethod, EnumClientType, EnumCodeUrlScene, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumElectronSignVerifyType, EnumEnterpriseCostStatus, EnumEnterpriseCostType, EnumEnterpriseRealMethod, EnumEnterpriseWalletAccess, EnumEnterpriseWalletExpandindirectOrderFileType, EnumEnterpriseWalletExpandindirectOrderScene, EnumEnterpriseWalletExpandindirectOrderStatus, EnumEnterpriseWalletSignStatus, EnumEnterpriseWalletTransactionType, EnumGetEnterpriseEmployeesQuerySignContractStatus, 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, EnumUserBankCardAccess, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, EnumUserWalletTransactionType, EnumWalletTransactionStatus, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton, SettlementReceiveStatus } from './src/constants/apiEnum'
import('./src/constants/apiEnum')
// @ts-ignore
export type { CategoryCode, IdentityCodeEnum, EducationCodeEnum, CertificateTypeCodeEnum, WelfareCodeEnum } from './src/constants/dic'
@@ -318,6 +319,7 @@
readonly EnumDataSource: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumDataSource']>
readonly EnumDbAuditOperate: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumDbAuditOperate']>
readonly EnumElectronSignAccess: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumElectronSignAccess']>
+ readonly EnumElectronSignVerifyType: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumElectronSignVerifyType']>
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']>
diff --git a/src/constants/apiEnum.ts b/src/constants/apiEnum.ts
index 3407d01..5e7d264 100644
--- a/src/constants/apiEnum.ts
+++ b/src/constants/apiEnum.ts
@@ -19,6 +19,8 @@
PcWeb = 10,
/**寰俊灏忕▼搴� */
Wxmp = 20,
+ /**H5鐧诲綍 */
+ H5 = 30,
}
/** 缂栧彿鍦板潃鍦烘櫙 */
@@ -77,6 +79,14 @@
BestSign = 10,
/**鏀粯瀹濅俊浠荤 */
AlipaySign = 20,
+}
+
+/** 鐢靛瓙绛炬牎楠岀被鍨� */
+export enum EnumElectronSignVerifyType {
+ /**鐭俊 */
+ SMS = 10,
+ /**浜鸿劯 */
+ Face = 20,
}
/** 浼佷笟鐢ㄩ噺鎵h垂鐘舵�� */
@@ -217,6 +227,8 @@
export enum EnumOcrAccess {
/**鐧惧害 */
Baidu = 10,
+ /**涓婁笂绛� */
+ BestSign = 20,
}
/** 鍒嗛〉鍒楄〃鎺掑簭 */
diff --git a/src/services/api/electronSign.ts b/src/services/api/electronSign.ts
index abd2700..8b63a80 100644
--- a/src/services/api/electronSign.ts
+++ b/src/services/api/electronSign.ts
@@ -166,8 +166,6 @@
method: 'GET',
params: {
...params,
- request: undefined,
- ...params['request'],
},
...(options || {}),
}
@@ -179,14 +177,17 @@
body: API.PersonalUserFaceRealCommand,
options?: API.RequestConfig
) {
- return request<string>('/api/user/electronSign/personalUserFaceReal', {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json-patch+json',
- },
- data: body,
- ...(options || {}),
- });
+ return request<API.PersonalUserFaceRealCommandResult>(
+ '/api/user/electronSign/personalUserFaceReal',
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ }
+ );
}
/** 涓汉涓夎绱犲疄鍚嶈璇� POST /api/user/electronSign/personalUserIdentity3Real */
diff --git a/src/services/api/enterpriseWallet.ts b/src/services/api/enterpriseWallet.ts
index dc65418..3ccb9f2 100644
--- a/src/services/api/enterpriseWallet.ts
+++ b/src/services/api/enterpriseWallet.ts
@@ -330,15 +330,3 @@
}
);
}
-
-/** 娴嬭瘯闃块噷鏀粯 POST /api/user/enterpriseWallet/testAliPay */
-export async function testAliPay(body: API.TestAliPayCommand, options?: API.RequestConfig) {
- return request<string>('/api/user/enterpriseWallet/testAliPay', {
- 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 2d2b182..99078ea 100644
--- a/src/services/api/index.ts
+++ b/src/services/api/index.ts
@@ -9,6 +9,7 @@
import * as task from './task';
import * as enterprise from './enterprise';
import * as resource from './resource';
+import * as logRecords from './logRecords';
import * as dictionary from './dictionary';
import * as enterpriseWallet from './enterpriseWallet';
import * as codeUrl from './codeUrl';
@@ -18,7 +19,6 @@
import * as taskCheckReceive from './taskCheckReceive';
import * as taskUser from './taskUser';
import * as menu from './menu';
-import * as logRecords from './logRecords';
import * as fileUtils from './fileUtils';
import * as syncDatabase from './syncDatabase';
export default {
@@ -29,6 +29,7 @@
task,
enterprise,
resource,
+ logRecords,
dictionary,
enterpriseWallet,
codeUrl,
@@ -38,7 +39,6 @@
taskCheckReceive,
taskUser,
menu,
- logRecords,
fileUtils,
syncDatabase,
};
diff --git a/src/services/api/logRecords.ts b/src/services/api/logRecords.ts
index ed70d74..0cb3919 100644
--- a/src/services/api/logRecords.ts
+++ b/src/services/api/logRecords.ts
@@ -41,6 +41,24 @@
});
}
+/** 绗笁鏂硅祫婧愭棩蹇楀垎椤靛垪琛ㄦ煡璇� POST /api/common/logRecords/getThreeResourceLogs */
+export async function getThreeResourceLogs(
+ body: API.GetThreeResourceLogsQuery,
+ options?: API.RequestConfig
+) {
+ return request<API.GetThreeResourceLogsQueryResult>(
+ '/api/common/logRecords/getThreeResourceLogs',
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ }
+ );
+}
+
/** 璺熻釜Id鏃ュ織鏌ヨ GET /api/common/logRecords/getTraceIdLog */
export async function getTraceIdLog(
// 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
diff --git a/src/services/api/ocrUtils.ts b/src/services/api/ocrUtils.ts
index 75d1669..c342ddd 100644
--- a/src/services/api/ocrUtils.ts
+++ b/src/services/api/ocrUtils.ts
@@ -2,6 +2,18 @@
// @ts-ignore
import { request } from '@/utils/request';
+/** 鏌ヨ閾惰鍗¤瘑鍒� POST /api/common/ocrUtils/getBankOcr */
+export async function getBankOcr(body: API.GetBankOcrCommand, options?: API.RequestConfig) {
+ return request<API.GetBankOcrCommandResult>('/api/common/ocrUtils/getBankOcr', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
/** 鏂囧瓧璇嗗埆韬唤璇佽儗闈� POST /api/common/ocrUtils/getIdentityBackOcr */
export async function getIdentityBackOcr(
body: API.GetIdentityBackOcrCommand,
diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index bf4b442..5623a46 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -161,6 +161,8 @@
}
interface APIgetPersonalUserBankCardParams {
+ /** 鐏靛伐Id */
+ enterpriseEmployeeId?: string;
/** 閫氶亾 */
access?: EnumUserBankCardAccess;
}
@@ -173,8 +175,8 @@
}
interface APIgetPersonalUserRealResultParams {
- /** 鏌ヨ涓汉瀹炲悕缁撴灉 */
- request?: GetPersonalUserRealResultQuery;
+ /** 鐏靛伐Id */
+ enterpriseEmployeeId?: string;
}
interface APIgetPersonalUserTransactionParams {
@@ -550,6 +552,8 @@
PcWeb = 10,
/**寰俊灏忕▼搴� */
Wxmp = 20,
+ /**H5鐧诲綍 */
+ H5 = 30,
}
enum EnumCodeUrlScene {
@@ -601,6 +605,13 @@
BestSign = 10,
/**鏀粯瀹濅俊浠荤 */
AlipaySign = 20,
+ }
+
+ enum EnumElectronSignVerifyType {
+ /**鐭俊 */
+ SMS = 10,
+ /**浜鸿劯 */
+ Face = 20,
}
enum EnumEnterpriseCostStatus {
@@ -728,6 +739,8 @@
enum EnumOcrAccess {
/**鐧惧害 */
Baidu = 10,
+ /**涓婁笂绛� */
+ BestSign = 20,
}
enum EnumPagedListOrder {
@@ -1102,6 +1115,24 @@
/** 閿欒鐮� */
errorCode?: string;
data?: GetArrangeTaskUsersQueryResult;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
+ interface FriendlyResultGetBankOcrCommandResult {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: GetBankOcrCommandResult;
/** 鎵ц鎴愬姛 */
success?: boolean;
/** 閿欒淇℃伅 */
@@ -1958,6 +1989,24 @@
timestamp?: number;
}
+ interface FriendlyResultGetThreeResourceLogsQueryResult {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: GetThreeResourceLogsQueryResult;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
interface FriendlyResultGetTraceIdLogQueryResult {
/** 璺熻釜Id */
traceId?: string;
@@ -2586,6 +2635,24 @@
timestamp?: number;
}
+ interface FriendlyResultPersonalUserFaceRealCommandResult {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: PersonalUserFaceRealCommandResult;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
interface FriendlyResultRechargeEnterpriseWalletCommandResult {
/** 璺熻釜Id */
traceId?: string;
@@ -2688,7 +2755,7 @@
}
interface GetArrangeTaskUsersQueryResultItem {
- /** 浠诲姟浜哄憳Id */
+ /** 鐏靛伐Id */
id?: string;
/** 澶村儚 */
avatar?: string;
@@ -2719,6 +2786,21 @@
/** 宸ヤ綔缁忛獙 */
workExperience?: string;
arrangeStatus?: EnumTaskUserArrangeStatus;
+ }
+
+ interface GetBankOcrCommand {
+ access?: EnumOcrAccess;
+ /** 鍦烘櫙 */
+ scene?: string;
+ /** 閾炬帴鍦板潃 */
+ url?: string;
+ /** 鏄惁涓轰簯瀛樺偍鐩稿鍦板潃 */
+ isOssUrl?: boolean;
+ }
+
+ interface GetBankOcrCommandResult {
+ /** 鍗″彿 */
+ number?: string;
}
interface GetCheckReceiveTaskQuery {
@@ -3019,8 +3101,6 @@
oldValues?: string;
/** 鏂板�� */
newValues?: string;
- /** 鎿嶄綔浜篒d */
- createdUserId?: string;
createdUser?: GetResourceLogsQueryResultItemCreatedUser;
/** 鍒涘缓鏃堕棿 */
createdTime?: string;
@@ -3186,6 +3266,8 @@
enterpriseId?: string;
/** 鍏抽敭瀛� */
keywords?: string;
+ /** 閫氶亾 */
+ accesses?: EnumElectronSignAccess[];
status?: EnumContractTemplateStatus;
/** 瀹㈡埛涓婁紶鏃堕棿-璧峰 */
createdTimeBegin?: string;
@@ -3568,8 +3650,6 @@
message?: string;
/** 鍫嗘爤璺熻釜 */
stackTrace?: string;
- /** 鎿嶄綔浜篒d */
- createdUserId?: string;
createdUser?: GetResourceLogsQueryResultItemCreatedUser;
/** 鍒涘缓鏃堕棿 */
createdTime?: string;
@@ -3951,6 +4031,8 @@
interface GetPersonalUserBankCardQueryResult {
access?: EnumUserBankCardAccess;
+ /** 閾惰鍗$収鐗囧湴鍧� */
+ bankImageUrl?: string;
/** 閾惰鍗″彿 */
code?: string;
/** 鎵�灞為摱琛� */
@@ -4097,9 +4179,9 @@
signContractTime?: string;
}
- type GetPersonalUserRealResultQuery = Record<string, any>;
-
interface GetPersonalUserRealResultQueryResult {
+ /** 鐢ㄦ埛Id */
+ id?: string;
/** 鏄惁瀹炲悕 */
isReal?: boolean;
/** 瀹炲悕鏃堕棿 */
@@ -4327,8 +4409,6 @@
consoleLogs?: string;
/** 鑰楁椂姣鏁� */
elapsedMilliseconds?: number;
- /** 鎿嶄綔浜篒d */
- createdUserId?: string;
createdUser?: GetResourceLogsQueryResultItemCreatedUser;
/** 鍒涘缓鏃堕棿 */
createdTime?: string;
@@ -4848,9 +4928,68 @@
hireStatus?: EnumTaskUserHireStatus;
}
+ interface GetThreeResourceLogsQuery {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鍏抽敭瀛� */
+ keywords?: string;
+ /** 鍒涘缓鏃堕棿-璧峰 */
+ createdTimeBegin?: string;
+ /** 鍒涘缓鏃堕棿-鎴 */
+ createdTimeEnd?: string;
+ pageModel?: PagedListQueryPageModel;
+ }
+
+ interface GetThreeResourceLogsQueryResult {
+ pageModel?: PagedListQueryResultPageModel;
+ /** 鏁版嵁 */
+ data?: GetThreeResourceLogsQueryResultItem[];
+ }
+
+ interface GetThreeResourceLogsQueryResultItem {
+ /** Id */
+ id?: string;
+ method?: EnumResourceMethod;
+ /** 鍩熷悕 */
+ domain?: string;
+ /** 鍦板潃 */
+ path?: string;
+ /** 璇锋眰澶� */
+ requestHeaders?: string;
+ /** 璇锋眰鍙傛暟 */
+ request?: string;
+ /** 璇锋眰澶� */
+ responseHeaders?: string;
+ /** 鍝嶅簲缁撴灉 */
+ response?: string;
+ /** 鏄惁鎴愬姛 */
+ isSuccess?: boolean;
+ /** 鑰楁椂姣鏁� */
+ elapsedMilliseconds?: number;
+ createdUser?: GetThreeResourceLogsQueryResultItemCreatedUser;
+ /** 鍒涘缓鏃堕棿 */
+ createdTime?: string;
+ }
+
+ interface GetThreeResourceLogsQueryResultItemCreatedUser {
+ /** Id */
+ id?: string;
+ type?: EnumUserType;
+ /** 濮撳悕 */
+ name?: string;
+ /** 鐢ㄦ埛鍚� */
+ userName?: string;
+ /** 浼佷笟Id */
+ enterpriseId?: string;
+ /** 浼佷笟鍏ㄧО */
+ enterpriseName?: string;
+ }
+
interface GetTraceIdLogQueryResult {
/** 璧勬簮鏃ュ織 */
resourceLogs?: GetResourceLogsQueryResultItem[];
+ /** 绗笁鏂硅祫婧愭棩蹇� */
+ threeResourceLogs?: GetThreeResourceLogsQueryResultItem[];
/** 寮傚父鏃ュ織 */
exceptionLogs?: GetExceptionLogsQueryResultItem[];
/** 鏁版嵁搴撳璁℃棩蹇� */
@@ -5318,6 +5457,12 @@
id?: string;
/** 閭�绾︾煭淇$紪鍙凤紙浜岄�変竴锛� */
smsCode?: string;
+ /** 鍚堝悓妯℃澘Id锛堢绾﹀伐鍏锋椂浣跨敤锛� */
+ contractTemplateId?: string;
+ /** 绛剧害鏍¢獙绫诲瀷 */
+ verifyTypes?: EnumElectronSignVerifyType[];
+ /** 绛剧害瀹屾垚鍚庤皟鏁村湴鍧� */
+ returnUrl?: string;
}
interface PersonalUserElectronSignCommandResult {
@@ -5336,6 +5481,22 @@
identityImg: string;
/** 韬唤璇佸浗寰介潰 */
identityBackImg: string;
+ /** 浜鸿劯璇嗗埆鎴愬姛璋冩暣椤甸潰 */
+ faceRealCallbackUrl?: string;
+ }
+
+ interface PersonalUserFaceRealCommandResult {
+ /** 鐢ㄦ埛Id */
+ userId?: string;
+ /** 鐏靛伐Id */
+ enterpriseEmployeeId?: string;
+ userSignContractStatus?: EnumTaskUserSignContractStatus;
+ /** 鏄惁瀹炲悕 */
+ isReal?: boolean;
+ realMethod?: EnumUserRealMethod;
+ realStatus?: EnumPersonalUserRealStatus;
+ /** 浜鸿劯璇嗗埆鍦板潃 */
+ faceUrl?: string;
}
interface PersonalUserIdentity3RealCommand {
@@ -5654,7 +5815,11 @@
}
interface SavePersonalUserBankCardCommand {
+ /** 鐏靛伐Id */
+ enterpriseEmployeeId?: string;
access?: EnumUserBankCardAccess;
+ /** 閾惰鍗$収鐗囧湴鍧� */
+ bankImageUrl?: string;
/** 閾惰鍗″彿 */
code?: string;
/** 鎵�灞為摱琛� */
@@ -5915,6 +6080,10 @@
interface SetTaskUserArrangeCommand {
/** 浠诲姟浜哄憳Id */
id?: string;
+ /** 浠诲姟Id */
+ taskInfoId?: string;
+ /** 鐏靛伐Id */
+ enterpriseEmployeeId?: string;
arrangeStatus?: EnumTaskUserArrangeStatus;
}
@@ -6096,11 +6265,6 @@
status?: EnumUserStatus;
/** 澶囨敞 */
remark?: string;
- }
-
- interface TestAliPayCommand {
- code?: string;
- freezeNo?: string;
}
interface UpdatePhoneNumberVerifyCodeCommand {
diff --git a/src/views/EmploymentManage/EmploymentManageArrange.vue b/src/views/EmploymentManage/EmploymentManageArrange.vue
index c88f40b..d33ed67 100644
--- a/src/views/EmploymentManage/EmploymentManageArrange.vue
+++ b/src/views/EmploymentManage/EmploymentManageArrange.vue
@@ -132,7 +132,8 @@
async function handleArrange(row: API.GetArrangeTaskUsersQueryResultItem) {
try {
let res = await taskUserServices.setTaskUserArrange({
- id: row.id,
+ enterpriseEmployeeId: row.id,
+ taskInfoId: id,
arrangeStatus: EnumTaskUserArrangeStatus.Complete,
});
if (res) {
--
Gitblit v1.9.1