From 5fbd1b13686fb3aaad863a0454625190aec92d2c Mon Sep 17 00:00:00 2001 From: wupengfei <834520024@qq.com> Date: 星期二, 12 八月 2025 14:04:03 +0800 Subject: [PATCH] feat: 接口对接 --- packages/services/apiV2/index.ts | 2 packages/services/apiV2/enterpriseEmployee.ts | 21 +++++++ packages/services/apiV2/typings.d.ts | 107 ++++++++++++++++++++++++----------- apps/cMiniApp/src/subpackages/mine/mineCollectTask/InnerPage.vue | 27 ++++++++ apps/cMiniApp/project.private.config.json | 9 -- packages/constants/apiEnum.ts | 10 -- 6 files changed, 123 insertions(+), 53 deletions(-) diff --git a/apps/cMiniApp/project.private.config.json b/apps/cMiniApp/project.private.config.json index 5bf897c..63f3b52 100644 --- a/apps/cMiniApp/project.private.config.json +++ b/apps/cMiniApp/project.private.config.json @@ -80,14 +80,7 @@ }, { "name": "", - "pathName": "subpackages/task/taskDetail/taskDetail", - "query": "id=04c75425-e783-4dbf-0f16-08ddd626b756", - "launchMode": "default", - "scene": null - }, - { - "name": "", - "pathName": "subpackages/curriculum/mineCurriculumVitae/mineCurriculumVitae", + "pathName": "subpackages/mine/mineCollectTask/mineCollectTask", "query": "", "launchMode": "default", "scene": null diff --git a/apps/cMiniApp/src/subpackages/mine/mineCollectTask/InnerPage.vue b/apps/cMiniApp/src/subpackages/mine/mineCollectTask/InnerPage.vue index 1861411..c912d41 100644 --- a/apps/cMiniApp/src/subpackages/mine/mineCollectTask/InnerPage.vue +++ b/apps/cMiniApp/src/subpackages/mine/mineCollectTask/InnerPage.vue @@ -1,14 +1,28 @@ <template> <div class="my-collect-task"> <div class="my-collect-task-title">鏀惰棌浠诲姟鍒楄〃</div> - <div class="my-collect-task-btn">娓呯┖宸插け鏁堜换鍔�</div> + <div class="my-collect-task-btn" @click="clearExpiredTask">娓呯┖宸插け鏁堜换鍔�</div> </div> <InfiniteLoading scrollViewClassName="common-infinite-scroll-list home-list" v-bind="infiniteLoadingProps" > <template #renderItem="{ item }"> - <TaskCard> </TaskCard> + <TaskCard + :name="item.name" + :address-name="item.addressName" + :begin-time="item.beginTime" + :end-time="item.endTime" + :gender-limit="item.genderLimit" + :service-fee="item.serviceFee" + :billing-method="item.billingMethod" + :settlement-cycle="item.settlementCycle" + :benefits="item.benefits" + > + <template #actions> + <nut-button @click="goTaskDetail(item)" type="primary">鎶ュ悕</nut-button> + </template> + </TaskCard> </template> </InfiniteLoading> </template> @@ -17,6 +31,7 @@ import { TaskCard } from '@12333/components'; import { useUserStore } from '@/stores/modules/user'; import { useTaskList } from '@12333/hooks'; +import Taro from '@tarojs/taro'; defineOptions({ name: 'InnerPage', @@ -25,6 +40,14 @@ const { infiniteLoadingProps } = useTaskList({ defaultQueryMenuState: {}, }); + +function goTaskDetail(item: API.GetTaskInfosQueryResultItem) { + Taro.navigateTo({ + url: `${RouterPath.taskCheckDetail}?id=${item.id}`, + }); +} + +function clearExpiredTask() {} </script> <style lang="scss"> diff --git a/packages/constants/apiEnum.ts b/packages/constants/apiEnum.ts index 946c6dc..aec9be0 100644 --- a/packages/constants/apiEnum.ts +++ b/packages/constants/apiEnum.ts @@ -107,6 +107,8 @@ UserResume = 8, /**浼佷笟淇℃伅 */ Enterprise = 9, + /**鐏靛伐淇℃伅 */ + EnterpriseEmployee = 10, } /** 璧勬簮璇锋眰鏂瑰紡 */ @@ -188,14 +190,6 @@ /** 浠诲姟瀹夋帓鐘舵�� */ export enum EnumTaskStatus { /**寰呭畨鎺� */ - Wait = 10, - /**宸插畨鎺� */ - Complete = 20, -} - -/** 浠诲姟鐢ㄦ埛瀹夋帓鐘舵�� */ -export enum EnumTaskUserArrangeStatus { - /**鏈畨鎺� */ Wait = 10, /**宸插畨鎺� */ Complete = 20, diff --git a/packages/services/apiV2/enterpriseEmployee.ts b/packages/services/apiV2/enterpriseEmployee.ts new file mode 100644 index 0000000..8da2480 --- /dev/null +++ b/packages/services/apiV2/enterpriseEmployee.ts @@ -0,0 +1,21 @@ +/* eslint-disable */ +// @ts-ignore +import { request } from '@/utils/request'; + +/** 鏌ヨ鐏靛伐鍒嗛〉鍒楄〃鏁版嵁 POST /api/user/enterpriseEmployee/getEnterpriseEmployees */ +export async function getEnterpriseEmployees( + body: API.GetEnterpriseEmployeesQuery, + options?: API.RequestConfig +) { + return request<API.GetEnterpriseEmployeesQueryResult>( + '/api/user/enterpriseEmployee/getEnterpriseEmployees', + { + method: 'POST', + headers: { + 'Content-Type': 'application/json-patch+json', + }, + data: body, + ...(options || {}), + } + ); +} diff --git a/packages/services/apiV2/index.ts b/packages/services/apiV2/index.ts index 110baef..042f909 100644 --- a/packages/services/apiV2/index.ts +++ b/packages/services/apiV2/index.ts @@ -4,6 +4,7 @@ // 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'; @@ -15,6 +16,7 @@ export default { userResume, resource, + enterpriseEmployee, user, dictionary, auth, diff --git a/packages/services/apiV2/typings.d.ts b/packages/services/apiV2/typings.d.ts index aa36f3b..fbaf463 100644 --- a/packages/services/apiV2/typings.d.ts +++ b/packages/services/apiV2/typings.d.ts @@ -299,6 +299,8 @@ UserResume = 8, /**浼佷笟淇℃伅 */ Enterprise = 9, + /**鐏靛伐淇℃伅 */ + EnterpriseEmployee = 10, } enum EnumResourceMethod { @@ -371,13 +373,6 @@ enum EnumTaskStatus { /**寰呭畨鎺� */ - Wait = 10, - /**宸插畨鎺� */ - Complete = 20, - } - - enum EnumTaskUserArrangeStatus { - /**鏈畨鎺� */ Wait = 10, /**宸插畨鎺� */ Complete = 20, @@ -478,6 +473,24 @@ /** 閿欒鐮� */ errorCode?: string; data?: GetEnterpriseElectronSignSettingQueryResult; + /** 鎵ц鎴愬姛 */ + success?: boolean; + /** 閿欒淇℃伅 */ + msg?: any; + /** 闄勫姞鏁版嵁 */ + extras?: any; + /** 鏃堕棿鎴� */ + timestamp?: number; + } + + interface FriendlyResultGetEnterpriseEmployeesQueryResult { + /** 璺熻釜Id */ + traceId?: string; + /** 鐘舵�佺爜 */ + code?: number; + /** 閿欒鐮� */ + errorCode?: string; + data?: GetEnterpriseEmployeesQueryResult; /** 鎵ц鎴愬姛 */ success?: boolean; /** 閿欒淇℃伅 */ @@ -1208,6 +1221,58 @@ mergeSignCost?: number; } + interface GetEnterpriseEmployeesQuery { + /** 鍏抽敭瀛楋紙濮撳悕/鎵嬫満/韬唤璇佸彿锛� */ + keywords?: string; + /** 鐧昏鏃堕棿-鏈�鏃╂椂闂� */ + createdTimeStart?: string; + /** 鐧昏鏃堕棿-鏈�鏅氭椂闂� */ + createdTimeEnd?: string; + /** 绛剧害鏃堕棿-鏈�鏃╂椂闂� */ + signContractTimeStart?: string; + /** 绛剧害鏃堕棿-鏈�鏅氭椂闂� */ + signContractTimeEnd?: string; + hireStatus?: EnumTaskUserHireStatus; + /** 鏄惁瀹炲悕 */ + isReal?: boolean; + userSignContractStatus?: EnumTaskUserSignContractStatus; + enterpriseSignContractStatus?: EnumTaskUserSignContractStatus; + pageModel?: PagedListQueryPageModel; + } + + interface GetEnterpriseEmployeesQueryResult { + pageModel?: PagedListQueryResultPageModel; + /** 鏁版嵁 */ + data?: GetEnterpriseEmployeesQueryResultItem[]; + } + + interface GetEnterpriseEmployeesQueryResultItem { + /** 鐏靛伐Id */ + id?: string; + /** 濮撳悕 */ + name?: string; + /** 韬唤璇佸彿 */ + identity?: string; + gender?: EnumUserGender; + /** 骞撮緞 */ + age?: number; + /** 鎵嬫満鍙� */ + phoneNumber?: string; + hireStatus?: EnumTaskUserHireStatus; + /** 瀹炲悕鐘舵�� */ + userIsReal?: boolean; + userSignContractStatus?: EnumTaskUserSignContractStatus; + /** 褰曠敤鏃堕棿 */ + hireTime?: string; + /** 瀹炲悕鏃堕棿 */ + userRealTime?: string; + /** 绛剧害鏃堕棿 */ + userSignContractTime?: string; + enterpriseSignContractStatus?: EnumTaskUserSignContractStatus; + /** 浼佷笟绛剧害鏃堕棿 */ + enterpriseSignContractTime?: string; + } + interface GetEnterpriseQueryResult { /** Id */ id?: string; @@ -1860,22 +1925,6 @@ photos?: string[]; /** 缁忓巻 */ taskInfoUsers?: GetUserResumeQueryResultExperience[]; - /** 鎶ュ悕鏃堕棿 */ - createdTime?: string; - hireStatus?: EnumTaskUserHireStatus; - /** 褰曠敤鏃堕棿 */ - hireTime?: string; - arrangeStatus?: EnumTaskUserArrangeStatus; - /** 瀹夋帓鐘舵�� */ - arrangeTime?: string; - userSignContractStatus?: EnumTaskUserSignContractStatus; - /** 鐏靛伐绛剧害鏃堕棿 */ - userSignContractTime?: string; - enterpriseSignContractStatus?: EnumTaskUserSignContractStatus; - /** 浼佷笟绛剧害鏃堕棿 */ - enterpriseSignContractTime?: string; - /** 鐢靛瓙鍚堝悓 */ - contractUrl?: string; } interface GetUserResumeQueryResultCredential { @@ -1972,18 +2021,6 @@ workSeniority?: string; /** 宸ヤ綔缁忛獙 */ workExperience?: string; - hireStatus?: EnumTaskUserHireStatus; - /** 褰曠敤鏃堕棿 */ - hireTime?: string; - arrangeStatus?: EnumTaskUserArrangeStatus; - /** 瀹夋帓鐘舵�� */ - arrangeTime?: string; - userSignContractStatus?: EnumTaskUserSignContractStatus; - /** 鐏靛伐绛剧害鏃堕棿 */ - userSignContractTime?: string; - enterpriseSignContractStatus?: EnumTaskUserSignContractStatus; - /** 浼佷笟绛剧害鏃堕棿 */ - enterpriseSignContractTime?: string; } type GetUserResumeWorkExperienceQuery = Record<string, any>; -- Gitblit v1.9.1