From f51b20beaeaaade5e3336b5eff749066c6a34b03 Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期三, 13 八月 2025 13:36:20 +0800 Subject: [PATCH] fix: 灵工管理 --- src/views/EmploymentManage/EmploymentSignList.vue | 45 +++-- src/views/FlexJobManage/FlexJobManage.vue | 39 ++-- src/services/api/enterpriseEmployee.ts | 18 ++ src/services/api/index.ts | 34 ++-- src/services/api/taskCheckReceive.ts | 57 +++++++ src/services/api/typings.d.ts | 198 ++++++++++++++++++++++-- auto-imports.d.ts | 2 src/constants/apiEnum.ts | 18 +- src/services/api/taskUser.ts | 18 -- 9 files changed, 327 insertions(+), 102 deletions(-) diff --git a/auto-imports.d.ts b/auto-imports.d.ts index 77904a8..22edb57 100644 --- a/auto-imports.d.ts +++ b/auto-imports.d.ts @@ -418,4 +418,4 @@ readonly watchPostEffect: UnwrapRef<typeof import('vue')['watchPostEffect']> readonly watchSyncEffect: UnwrapRef<typeof import('vue')['watchSyncEffect']> } -} +} \ No newline at end of file diff --git a/src/constants/apiEnum.ts b/src/constants/apiEnum.ts index 9bd5d57..8d03ef1 100644 --- a/src/constants/apiEnum.ts +++ b/src/constants/apiEnum.ts @@ -93,22 +93,24 @@ Task = 1, /**浠诲姟浜哄憳 */ TaskUser = 2, + /**浠诲姟楠屾敹 */ + TaskCheckReceive = 3, /**鐢ㄦ埛璁よ瘉 */ - Auth = 3, + Auth = 4, /**鐢ㄦ埛鑿滃崟 */ - Menu = 4, + Menu = 5, /**鐢ㄦ埛璧勬簮 */ - Resource = 5, + Resource = 6, /**鐢ㄦ埛瑙掕壊 */ - Role = 6, + Role = 7, /**鐢ㄦ埛淇℃伅 */ - User = 7, + User = 8, /**鐢ㄦ埛绠�鍘� */ - UserResume = 8, + UserResume = 9, /**浼佷笟淇℃伅 */ - Enterprise = 9, + Enterprise = 10, /**鐏靛伐淇℃伅 */ - EnterpriseEmployee = 10, + EnterpriseEmployee = 11, } /** 璧勬簮璇锋眰鏂瑰紡 */ diff --git a/src/services/api/enterpriseEmployee.ts b/src/services/api/enterpriseEmployee.ts index 8da2480..1c915b2 100644 --- a/src/services/api/enterpriseEmployee.ts +++ b/src/services/api/enterpriseEmployee.ts @@ -2,6 +2,24 @@ // @ts-ignore import { request } from '@/utils/request'; +/** 鏌ヨ鐏靛伐璇︽儏 GET /api/user/enterpriseEmployee/getEnterpriseEmployee */ +export async function getEnterpriseEmployee( + // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄) + params: API.APIgetEnterpriseEmployeeParams, + options?: API.RequestConfig +) { + return request<API.GetEnterpriseEmployeeQueryResult>( + '/api/user/enterpriseEmployee/getEnterpriseEmployee', + { + method: 'GET', + params: { + ...params, + }, + ...(options || {}), + } + ); +} + /** 鏌ヨ鐏靛伐鍒嗛〉鍒楄〃鏁版嵁 POST /api/user/enterpriseEmployee/getEnterpriseEmployees */ export async function getEnterpriseEmployees( body: API.GetEnterpriseEmployeesQuery, diff --git a/src/services/api/index.ts b/src/services/api/index.ts index 042f909..e5221f9 100644 --- a/src/services/api/index.ts +++ b/src/services/api/index.ts @@ -2,27 +2,29 @@ /* eslint-disable */ // API 鏇存柊鏃堕棿锛� // API 鍞竴鏍囪瘑锛� -import * as userResume from './userResume'; -import * as resource from './resource'; import * as enterpriseEmployee from './enterpriseEmployee'; -import * as user from './user'; -import * as dictionary from './dictionary'; -import * as auth from './auth'; -import * as taskUser from './taskUser'; -import * as task from './task'; -import * as enterprise from './enterprise'; import * as role from './role'; +import * as taskCheckReceive from './taskCheckReceive'; +import * as enterprise from './enterprise'; +import * as task from './task'; +import * as dictionary from './dictionary'; +import * as user from './user'; +import * as userResume from './userResume'; +import * as auth from './auth'; +import * as resource from './resource'; +import * as taskUser from './taskUser'; import * as menu from './menu'; export default { - userResume, - resource, enterpriseEmployee, - user, - dictionary, - auth, - taskUser, - task, - enterprise, role, + taskCheckReceive, + enterprise, + task, + dictionary, + user, + userResume, + auth, + resource, + taskUser, menu, }; diff --git a/src/services/api/taskCheckReceive.ts b/src/services/api/taskCheckReceive.ts new file mode 100644 index 0000000..f290dbd --- /dev/null +++ b/src/services/api/taskCheckReceive.ts @@ -0,0 +1,57 @@ +/* eslint-disable */ +// @ts-ignore +import { request } from '@/utils/request'; + +/** 鏌ヨ楠屾敹浠诲姟鍒嗛〉鍒楄〃 POST /api/flexjob/taskCheckReceive/getCheckReceiveTask */ +export async function getCheckReceiveTask( + body: API.GetCheckReceiveTaskQuery, + options?: API.RequestConfig +) { + return request<API.GetCheckReceiveTaskQueryResult>( + '/api/flexjob/taskCheckReceive/getCheckReceiveTask', + { + method: 'POST', + headers: { + 'Content-Type': 'application/json-patch+json', + }, + data: body, + ...(options || {}), + } + ); +} + +/** 鏌ヨ楠屾敹鍒嗛〉鍒楄〃 POST /api/flexjob/taskCheckReceive/getCheckReceiveTaskUser */ +export async function getCheckReceiveTaskUser( + body: API.GetCheckReceiveTaskUserQuery, + options?: API.RequestConfig +) { + return request<API.GetCheckReceiveTaskUserQueryResult>( + '/api/flexjob/taskCheckReceive/getCheckReceiveTaskUser', + { + method: 'POST', + headers: { + 'Content-Type': 'application/json-patch+json', + }, + data: body, + ...(options || {}), + } + ); +} + +/** 鏌ヨ楠屾敹璇︽儏 POST /api/flexjob/taskCheckReceive/getCheckReceiveTaskUserSubmits */ +export async function getCheckReceiveTaskUserSubmits( + body: API.GetCheckReceiveTaskUserSubmitsQuery, + options?: API.RequestConfig +) { + return request<API.GetCheckReceiveTaskUserSubmitsQueryResult>( + '/api/flexjob/taskCheckReceive/getCheckReceiveTaskUserSubmits', + { + method: 'POST', + headers: { + 'Content-Type': 'application/json-patch+json', + }, + data: body, + ...(options || {}), + } + ); +} diff --git a/src/services/api/taskUser.ts b/src/services/api/taskUser.ts index 2b056fb..af03cc7 100644 --- a/src/services/api/taskUser.ts +++ b/src/services/api/taskUser.ts @@ -41,24 +41,6 @@ }); } -/** 鏌ヨ楠屾敹鍒嗛〉鍒楄〃 POST /api/flexjob/taskUser/getCheckReceiveTaskUserInfos */ -export async function getCheckReceiveTaskUserInfos( - body: API.GetCheckReceiveTaskUserInfosQuery, - options?: API.RequestConfig -) { - return request<API.GetCheckReceiveTaskUserInfosQueryResult>( - '/api/flexjob/taskUser/getCheckReceiveTaskUserInfos', - { - method: 'POST', - headers: { - 'Content-Type': 'application/json-patch+json', - }, - data: body, - ...(options || {}), - } - ); -} - /** B绔煡璇㈠簲鑱樻姤鍚嶅垎椤靛垪琛ㄤ俊鎭� POST /api/flexjob/taskUser/getTaskUsers */ export async function getTaskUsers(body: API.GetTaskUsersQuery, options?: API.RequestConfig) { return request<API.GetTaskUsersQueryResult>('/api/flexjob/taskUser/getTaskUsers', { diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts index 36268d2..5eb070c 100644 --- a/src/services/api/typings.d.ts +++ b/src/services/api/typings.d.ts @@ -50,6 +50,13 @@ id?: string; } + interface APIgetEnterpriseEmployeeParams { + /** 鐏靛伐Id */ + id?: string; + /** 浠诲姟Id */ + taskInfoId?: string; + } + interface APIgetEnterpriseParams { /** Id */ id?: string; @@ -285,22 +292,24 @@ Task = 1, /**浠诲姟浜哄憳 */ TaskUser = 2, + /**浠诲姟楠屾敹 */ + TaskCheckReceive = 3, /**鐢ㄦ埛璁よ瘉 */ - Auth = 3, + Auth = 4, /**鐢ㄦ埛鑿滃崟 */ - Menu = 4, + Menu = 5, /**鐢ㄦ埛璧勬簮 */ - Resource = 5, + Resource = 6, /**鐢ㄦ埛瑙掕壊 */ - Role = 6, + Role = 7, /**鐢ㄦ埛淇℃伅 */ - User = 7, + User = 8, /**鐢ㄦ埛绠�鍘� */ - UserResume = 8, + UserResume = 9, /**浼佷笟淇℃伅 */ - Enterprise = 9, + Enterprise = 10, /**鐏靛伐淇℃伅 */ - EnterpriseEmployee = 10, + EnterpriseEmployee = 11, } enum EnumResourceMethod { @@ -490,14 +499,50 @@ timestamp?: number; } - interface FriendlyResultGetCheckReceiveTaskUserInfosQueryResult { + interface FriendlyResultGetCheckReceiveTaskQueryResult { /** 璺熻釜Id */ traceId?: string; /** 鐘舵�佺爜 */ code?: number; /** 閿欒鐮� */ errorCode?: string; - data?: GetCheckReceiveTaskUserInfosQueryResult; + data?: GetCheckReceiveTaskQueryResult; + /** 鎵ц鎴愬姛 */ + success?: boolean; + /** 閿欒淇℃伅 */ + msg?: any; + /** 闄勫姞鏁版嵁 */ + extras?: any; + /** 鏃堕棿鎴� */ + timestamp?: number; + } + + interface FriendlyResultGetCheckReceiveTaskUserQueryResult { + /** 璺熻釜Id */ + traceId?: string; + /** 鐘舵�佺爜 */ + code?: number; + /** 閿欒鐮� */ + errorCode?: string; + data?: GetCheckReceiveTaskUserQueryResult; + /** 鎵ц鎴愬姛 */ + success?: boolean; + /** 閿欒淇℃伅 */ + msg?: any; + /** 闄勫姞鏁版嵁 */ + extras?: any; + /** 鏃堕棿鎴� */ + timestamp?: number; + } + + interface FriendlyResultGetCheckReceiveTaskUserSubmitsQueryResult { + /** 璺熻釜Id */ + traceId?: string; + /** 鐘舵�佺爜 */ + code?: number; + /** 閿欒鐮� */ + errorCode?: string; + data?: GetCheckReceiveTaskUserSubmitsQueryResult; /** 鎵ц鎴愬姛 */ success?: boolean; /** 閿欒淇℃伅 */ @@ -516,6 +561,24 @@ /** 閿欒鐮� */ errorCode?: string; data?: GetEnterpriseElectronSignSettingQueryResult; + /** 鎵ц鎴愬姛 */ + success?: boolean; + /** 閿欒淇℃伅 */ + msg?: any; + /** 闄勫姞鏁版嵁 */ + extras?: any; + /** 鏃堕棿鎴� */ + timestamp?: number; + } + + interface FriendlyResultGetEnterpriseEmployeeQueryResult { + /** 璺熻釜Id */ + traceId?: string; + /** 鐘舵�佺爜 */ + code?: number; + /** 閿欒鐮� */ + errorCode?: string; + data?: GetEnterpriseEmployeeQueryResult; /** 鎵ц鎴愬姛 */ success?: boolean; /** 閿欒淇℃伅 */ @@ -1263,26 +1326,54 @@ arrangeStatus?: EnumTaskUserArrangeStatus; } - interface GetCheckReceiveTaskUserInfosQuery { + interface GetCheckReceiveTaskQuery { + /** 楠屾敹鏃ユ湡-鏈�鏃╂椂闂� */ + dateBegin?: string; + /** 楠屾敹鏃ユ湡-鏈�鏅氭椂闂� */ + dateEnd?: string; + checkReceiveStatus?: EnumTaskCheckReceiveStatus; + pageModel?: PagedListQueryPageModel; + } + + interface GetCheckReceiveTaskQueryResult { + pageModel?: PagedListQueryResultPageModel; + /** 鏁版嵁 */ + data?: GetCheckReceiveTaskQueryResultItem[]; + } + + interface GetCheckReceiveTaskQueryResultItem { + /** 浠诲姟Id */ + id?: string; + /** 浠诲姟鍚嶇О */ + name?: string; + /** 浠诲姟寮�濮嬫椂闂� */ + beginTime?: string; + /** 浠诲姟缁撴潫鏃堕棿 */ + endTime?: string; + /** 浠诲姟鍦扮偣鍚嶇О */ + addressName?: string; + } + + interface GetCheckReceiveTaskUserQuery { /** 浠诲姟Id */ taskInfoId?: string; /** 鍏抽敭瀛� */ keywords?: string; /** 楠屾敹鏃ユ湡-鏈�鏃╂椂闂� */ - submitTimeBegin?: string; + dateBegin?: string; /** 楠屾敹鏃ユ湡-鏈�鏅氭椂闂� */ - submitTimeEnd?: string; + dateEnd?: string; checkReceiveStatus?: EnumTaskCheckReceiveStatus; pageModel?: PagedListQueryPageModel; } - interface GetCheckReceiveTaskUserInfosQueryResult { + interface GetCheckReceiveTaskUserQueryResult { pageModel?: PagedListQueryResultPageModel; /** 鏁版嵁 */ - data?: GetCheckReceiveTaskUserInfosQueryResultItem[]; + data?: GetCheckReceiveTaskUserQueryResultItem[]; } - interface GetCheckReceiveTaskUserInfosQueryResultItem { + interface GetCheckReceiveTaskUserQueryResultItem { /** 浠诲姟Id */ id?: string; /** 浠诲姟鍚嶇О */ @@ -1297,8 +1388,7 @@ name?: string; /** 韬唤璇佸彿 */ identity?: string; - /** 鐢熸棩 */ - birthday?: string; + gender?: EnumUserGender; /** 骞撮緞 */ age?: number; /** 鎵嬫満鍙� */ @@ -1307,6 +1397,20 @@ lastSubmitTime?: string; checkReceiveStatus?: EnumTaskCheckReceiveStatus; } + + interface GetCheckReceiveTaskUserSubmitsQuery { + /** 浠诲姟Id */ + id?: string; + pageModel?: PagedListQueryPageModel; + } + + interface GetCheckReceiveTaskUserSubmitsQueryResult { + pageModel?: PagedListQueryResultPageModel; + /** 鏁版嵁 */ + data?: GetCheckReceiveTaskUserSubmitsQueryResultItem[]; + } + + type GetCheckReceiveTaskUserSubmitsQueryResultItem = Record<string, any>; type GetCurrentLogierMenusQuery = Record<string, any>; @@ -1430,6 +1534,34 @@ mergeSignCost?: number; } + interface GetEnterpriseEmployeeQueryResult { + /** 鐏靛伐Id */ + id?: string; + /** 濮撳悕 */ + name?: string; + /** 韬唤璇佸彿 */ + identity?: string; + /** 鎵嬫満鍙� */ + contactPhoneNumber?: string; + gender?: EnumUserGender; + /** 骞撮緞 */ + age?: number; + /** 韬唤璇佷汉鍍忛潰 */ + identityImg?: string; + /** 韬唤璇佸浗寰介潰 */ + identityBackImg?: string; + /** 鎶ュ悕鏃堕棿 */ + applyTime?: string; + /** 瀹炲悕鏃堕棿 */ + userRealTime?: string; + /** 绛剧害鏃堕棿 */ + userSignContractTime?: string; + /** 浼佷笟绛剧害鏃堕棿 */ + enterpriseSignContractTime?: string; + /** 鐢靛瓙鍚堝悓 */ + contractUrl?: string; + } + interface GetEnterpriseEmployeesQuery { /** 鍏抽敭瀛楋紙濮撳悕/鎵嬫満/韬唤璇佸彿锛� */ keywords?: string; @@ -1458,6 +1590,8 @@ interface GetEnterpriseEmployeesQueryResultItem { /** 鐏靛伐Id */ id?: string; + /** 澶村儚 */ + avatar?: string; /** 濮撳悕 */ name?: string; /** 韬唤璇佸彿 */ @@ -1467,9 +1601,24 @@ age?: number; /** 鎵嬫満鍙� */ contactPhoneNumber?: string; - hireStatus?: EnumTaskUserHireStatus; - /** 瀹炲悕鐘舵�� */ + /** 鏄惁瀹炲悕 */ userIsReal?: boolean; + realMethod?: EnumUserRealMethod; + /** 韬唤缂栧彿 */ + personalIdentityCode?: string; + /** 韬唤 */ + personalIdentityContent?: string; + /** 瀛﹀巻缂栧彿 */ + educationalBackgroundCode?: string; + /** 瀛﹀巻 */ + educationalBackgroundContent?: string; + /** 涓婂矖娆℃暟 */ + taskCount?: number; + /** 宸ヤ綔璧勫巻 */ + workSeniority?: string; + /** 宸ヤ綔缁忛獙 */ + workExperience?: string; + hireStatus?: EnumTaskUserHireStatus; userSignContractStatus?: EnumTaskUserSignContractStatus; /** 褰曠敤鏃堕棿 */ hireTime?: string; @@ -2102,6 +2251,9 @@ interface GetTaskUsersQuery { /** 浠诲姟Id */ id?: string; + /** 鍏抽敭瀛� */ + keywords?: string; + hireStatus?: EnumTaskUserHireStatus; pageModel?: PagedListQueryPageModel; } @@ -2114,6 +2266,8 @@ interface GetTaskUsersQueryResultItem { /** 浠诲姟浜哄憳Id */ id?: string; + /** 鐏靛伐Id */ + enterpriseEmployeeId?: string; /** 澶村儚 */ avatar?: string; /** 濮撳悕 */ @@ -2761,9 +2915,9 @@ /** 姘镐箙璇佷功 */ isForever?: boolean; /** 寮�濮嬫棩鏈� */ - startDate: string; + startDate?: string; /** 缁撴潫鏃ユ湡 */ - endDate: string; + endDate?: string; /** 鍙戣瘉鍗曚綅 */ issueUnit?: string; /** 璇佷功姝i潰鐓х墖 */ diff --git a/src/views/EmploymentManage/EmploymentSignList.vue b/src/views/EmploymentManage/EmploymentSignList.vue index 399ea9f..ef19b11 100644 --- a/src/views/EmploymentManage/EmploymentSignList.vue +++ b/src/views/EmploymentManage/EmploymentSignList.vue @@ -55,6 +55,7 @@ import StaffInfoDialog from '@/views/FlexJobManage/components/StaffInfoDialog.vue'; import { convertApi2FormUrlOnlyOne } from '@/utils'; import * as taskUserServices from '@/services/api/taskUser'; +import * as enterpriseEmployeeServices from '@/services/api/enterpriseEmployee'; defineOptions({ name: 'EmploymentSignList', @@ -127,8 +128,9 @@ page: pageIndex, orderInput: extraParamState.orderInput, }, - // searchWord: extraParamState.searchWord, id: id, + keywords: extraParamState.searchWord, + hireStatus: extraParamState.hireStatus, }; let res = await taskUserServices.getTaskUsers(params, { @@ -175,24 +177,29 @@ }, }); -function openDialog(row: API.GetTaskUsersQueryResultItem) { - handleStaffInfoEdit({ - id: row.id, - name: row.name, - identity: row.identity, - contactPhoneNumber: row.contactPhoneNumber, - gender: row.gender, - age: row.age ?? null, - idFrontUrl: convertApi2FormUrlOnlyOne(row.idFrontUrl), - idBackUrl: convertApi2FormUrlOnlyOne(row.idBackUrl), - contractUrl: convertApi2FormUrlOnlyOne(row.contractUrl, { - fileName: row.contractUrl ? row.contractUrl.split('/').pop() : '鍚堝悓', - }), - regiterTime: row.regiterTime ?? '', - userRealTime: row.userRealTime, - userSignContractTime: row.userSignContractTime, - isDetail: true, - }); +async function openDialog(row: API.GetTaskUsersQueryResultItem) { + try { + let detail = await enterpriseEmployeeServices.getEnterpriseEmployee({ + id: row.enterpriseEmployeeId, + }); + handleStaffInfoEdit({ + id: row.id, + name: row.name, + identity: row.identity, + contactPhoneNumber: row.contactPhoneNumber, + gender: detail.gender, + age: detail.age ?? null, + idFrontUrl: convertApi2FormUrlOnlyOne(detail.identityImg), + idBackUrl: convertApi2FormUrlOnlyOne(detail.identityBackImg), + contractUrl: convertApi2FormUrlOnlyOne(detail.contractUrl, { + fileName: detail.contractUrl ? detail.contractUrl.split('/').pop() : '鍚堝悓', + }), + regiterTime: detail.applyTime ?? '', + userRealTime: detail.userRealTime ?? '', + userSignContractTime: detail.userSignContractTime ?? '', + isDetail: true, + }); + } catch (error) {} } async function setTaskUserHire( diff --git a/src/views/FlexJobManage/FlexJobManage.vue b/src/views/FlexJobManage/FlexJobManage.vue index d6e64e2..c012902 100644 --- a/src/views/FlexJobManage/FlexJobManage.vue +++ b/src/views/FlexJobManage/FlexJobManage.vue @@ -322,24 +322,27 @@ }, }); -function openDialog(row: API.GetEnterpriseEmployeesQueryResultItem, isDetail = false) { - handleStaffInfoEdit({ - id: row.id, - name: row.name, - identity: row.identity, - contactPhoneNumber: row.contactPhoneNumber, - gender: row.gender, - age: row.age ?? null, - idFrontUrl: convertApi2FormUrlOnlyOne(row.idFrontUrl), - idBackUrl: convertApi2FormUrlOnlyOne(row.idBackUrl), - contractUrl: convertApi2FormUrlOnlyOne(row.contractUrl, { - fileName: row.contractUrl ? row.contractUrl.split('/').pop() : '鍚堝悓', - }), - regiterTime: row.regiterTime ?? '', - userRealTime: row.userRealTime, - userSignContractTime: row.userSignContractTime, - isDetail: isDetail, - }); +async function openDialog(row: API.GetEnterpriseEmployeesQueryResultItem, isDetail = false) { + try { + let detail = await enterpriseEmployeeServices.getEnterpriseEmployee({ id: row.id }); + handleStaffInfoEdit({ + id: row.id, + name: row.name, + identity: row.identity, + contactPhoneNumber: row.contactPhoneNumber, + gender: detail.gender, + age: detail.age ?? null, + idFrontUrl: convertApi2FormUrlOnlyOne(detail.identityImg), + idBackUrl: convertApi2FormUrlOnlyOne(detail.identityBackImg), + contractUrl: convertApi2FormUrlOnlyOne(detail.contractUrl, { + fileName: detail.contractUrl ? detail.contractUrl.split('/').pop() : '鍚堝悓', + }), + regiterTime: detail.applyTime ?? '', + userRealTime: row.userRealTime ?? '', + userSignContractTime: row.userSignContractTime ?? '', + isDetail: isDetail, + }); + } catch (error) {} } async function handleAddOrEdit() {} -- Gitblit v1.9.1