From c72be856765583aa60e621fbc35da8e3e276aabc Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期五, 26 九月 2025 10:56:44 +0800 Subject: [PATCH] fix: 修改灵工安排 --- packages/services/apiV2/ocrUtils.ts | 12 ++++++ packages/services/apiV2/index.ts | 4 +- apps/bMiniApp/src/subpackages/task/batchTaskList/InnerPage.vue | 3 + packages/services/apiV2/electronSign.ts | 2 - packages/services/apiV2/typings.d.ts | 79 ++++++++++++++++++++++++++++++++++++--- packages/constants/apiEnum.ts | 10 +++++ 6 files changed, 99 insertions(+), 11 deletions(-) diff --git a/apps/bMiniApp/src/subpackages/task/batchTaskList/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/batchTaskList/InnerPage.vue index abf7f20..2c69071 100644 --- a/apps/bMiniApp/src/subpackages/task/batchTaskList/InnerPage.vue +++ b/apps/bMiniApp/src/subpackages/task/batchTaskList/InnerPage.vue @@ -87,7 +87,8 @@ async function handleArrange(item: API.GetArrangeTaskUsersQueryResultItem) { try { let params: API.SetTaskUserArrangeCommand = { - id: item.id, + enterpriseEmployeeId: item.id, + taskInfoId: id, arrangeStatus: EnumTaskUserArrangeStatus.Complete, }; let res = await taskUserServices.setTaskUserArrange(params); diff --git a/packages/constants/apiEnum.ts b/packages/constants/apiEnum.ts index 7910571..5e7d264 100644 --- a/packages/constants/apiEnum.ts +++ b/packages/constants/apiEnum.ts @@ -81,6 +81,14 @@ AlipaySign = 20, } +/** 鐢靛瓙绛炬牎楠岀被鍨� */ +export enum EnumElectronSignVerifyType { + /**鐭俊 */ + SMS = 10, + /**浜鸿劯 */ + Face = 20, +} + /** 浼佷笟鐢ㄩ噺鎵h垂鐘舵�� */ export enum EnumEnterpriseCostStatus { /**鎵h垂鎴愬姛 */ @@ -219,6 +227,8 @@ export enum EnumOcrAccess { /**鐧惧害 */ Baidu = 10, + /**涓婁笂绛� */ + BestSign = 20, } /** 鍒嗛〉鍒楄〃鎺掑簭 */ diff --git a/packages/services/apiV2/electronSign.ts b/packages/services/apiV2/electronSign.ts index 10ce0d9..8b63a80 100644 --- a/packages/services/apiV2/electronSign.ts +++ b/packages/services/apiV2/electronSign.ts @@ -166,8 +166,6 @@ method: 'GET', params: { ...params, - request: undefined, - ...params['request'], }, ...(options || {}), } diff --git a/packages/services/apiV2/index.ts b/packages/services/apiV2/index.ts index 2d2b182..99078ea 100644 --- a/packages/services/apiV2/index.ts +++ b/packages/services/apiV2/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/packages/services/apiV2/ocrUtils.ts b/packages/services/apiV2/ocrUtils.ts index 75d1669..c342ddd 100644 --- a/packages/services/apiV2/ocrUtils.ts +++ b/packages/services/apiV2/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/packages/services/apiV2/typings.d.ts b/packages/services/apiV2/typings.d.ts index 3b3cf96..5623a46 100644 --- a/packages/services/apiV2/typings.d.ts +++ b/packages/services/apiV2/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 { @@ -605,6 +607,13 @@ AlipaySign = 20, } + enum EnumElectronSignVerifyType { + /**鐭俊 */ + SMS = 10, + /**浜鸿劯 */ + Face = 20, + } + enum EnumEnterpriseCostStatus { /**鎵h垂鎴愬姛 */ Success = 10, @@ -730,6 +739,8 @@ enum EnumOcrAccess { /**鐧惧害 */ Baidu = 10, + /**涓婁笂绛� */ + BestSign = 20, } enum EnumPagedListOrder { @@ -1104,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; /** 閿欒淇℃伅 */ @@ -2726,7 +2755,7 @@ } interface GetArrangeTaskUsersQueryResultItem { - /** 浠诲姟浜哄憳Id */ + /** 鐏靛伐Id */ id?: string; /** 澶村儚 */ avatar?: string; @@ -2757,6 +2786,21 @@ /** 宸ヤ綔缁忛獙 */ workExperience?: string; arrangeStatus?: EnumTaskUserArrangeStatus; + } + + interface GetBankOcrCommand { + access?: EnumOcrAccess; + /** 鍦烘櫙 */ + scene?: string; + /** 閾炬帴鍦板潃 */ + url?: string; + /** 鏄惁涓轰簯瀛樺偍鐩稿鍦板潃 */ + isOssUrl?: boolean; + } + + interface GetBankOcrCommandResult { + /** 鍗″彿 */ + number?: string; } interface GetCheckReceiveTaskQuery { @@ -3222,6 +3266,8 @@ enterpriseId?: string; /** 鍏抽敭瀛� */ keywords?: string; + /** 閫氶亾 */ + accesses?: EnumElectronSignAccess[]; status?: EnumContractTemplateStatus; /** 瀹㈡埛涓婁紶鏃堕棿-璧峰 */ createdTimeBegin?: string; @@ -3985,6 +4031,8 @@ interface GetPersonalUserBankCardQueryResult { access?: EnumUserBankCardAccess; + /** 閾惰鍗$収鐗囧湴鍧� */ + bankImageUrl?: string; /** 閾惰鍗″彿 */ code?: string; /** 鎵�灞為摱琛� */ @@ -4131,9 +4179,9 @@ signContractTime?: string; } - type GetPersonalUserRealResultQuery = Record<string, any>; - interface GetPersonalUserRealResultQueryResult { + /** 鐢ㄦ埛Id */ + id?: string; /** 鏄惁瀹炲悕 */ isReal?: boolean; /** 瀹炲悕鏃堕棿 */ @@ -5410,7 +5458,11 @@ /** 閭�绾︾煭淇$紪鍙凤紙浜岄�変竴锛� */ smsCode?: string; /** 鍚堝悓妯℃澘Id锛堢绾﹀伐鍏锋椂浣跨敤锛� */ - templateId?: string; + contractTemplateId?: string; + /** 绛剧害鏍¢獙绫诲瀷 */ + verifyTypes?: EnumElectronSignVerifyType[]; + /** 绛剧害瀹屾垚鍚庤皟鏁村湴鍧� */ + returnUrl?: string; } interface PersonalUserElectronSignCommandResult { @@ -5429,6 +5481,8 @@ identityImg: string; /** 韬唤璇佸浗寰介潰 */ identityBackImg: string; + /** 浜鸿劯璇嗗埆鎴愬姛璋冩暣椤甸潰 */ + faceRealCallbackUrl?: string; } interface PersonalUserFaceRealCommandResult { @@ -5436,6 +5490,11 @@ userId?: string; /** 鐏靛伐Id */ enterpriseEmployeeId?: string; + userSignContractStatus?: EnumTaskUserSignContractStatus; + /** 鏄惁瀹炲悕 */ + isReal?: boolean; + realMethod?: EnumUserRealMethod; + realStatus?: EnumPersonalUserRealStatus; /** 浜鸿劯璇嗗埆鍦板潃 */ faceUrl?: string; } @@ -5756,7 +5815,11 @@ } interface SavePersonalUserBankCardCommand { + /** 鐏靛伐Id */ + enterpriseEmployeeId?: string; access?: EnumUserBankCardAccess; + /** 閾惰鍗$収鐗囧湴鍧� */ + bankImageUrl?: string; /** 閾惰鍗″彿 */ code?: string; /** 鎵�灞為摱琛� */ @@ -6017,6 +6080,10 @@ interface SetTaskUserArrangeCommand { /** 浠诲姟浜哄憳Id */ id?: string; + /** 浠诲姟Id */ + taskInfoId?: string; + /** 鐏靛伐Id */ + enterpriseEmployeeId?: string; arrangeStatus?: EnumTaskUserArrangeStatus; } -- Gitblit v1.9.1