From 809c0426970ffbb300086a5f1b7e470b9cc8f000 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期二, 12 八月 2025 17:44:20 +0800
Subject: [PATCH] fix: s
---
src/services/api/enterpriseEmployee.ts | 21 ++
src/views/CPersonManage/CPersonManageList.vue | 76 +++----
src/constants/task.ts | 5
.eslintrc-auto-import.json | 4
src/services/api/typings.d.ts | 343 +++++++++++++++++++++++++++++++++
src/services/api/dictionary.ts | 15 +
src/services/api/taskUser.ts | 27 ++
src/services/api/index.ts | 6
src/services/api/userResume.ts | 12 +
auto-imports.d.ts | 10
src/constants/enterpriseEmployee.ts | 13 +
src/constants/apiEnum.ts | 12 +
src/constants/index.ts | 1
13 files changed, 493 insertions(+), 52 deletions(-)
diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json
index 4cb06d5..e98ad4a 100644
--- a/.eslintrc-auto-import.json
+++ b/.eslintrc-auto-import.json
@@ -52,8 +52,12 @@
"EnumTaskStatus": true,
"EnumTaskStatusText": true,
"EnumTaskUserHireStatus": true,
+ "EnumTaskUserHireStatusText": true,
+ "EnumTaskUserSignContractStatus": true,
+ "EnumTaskUserSignContractStatusText": true,
"EnumUserGender": true,
"EnumUserGenderText": true,
+ "EnumUserGenderTextForPerson": true,
"EnumUserInfoStatusText": true,
"EnumUserRealMethod": true,
"EnumUserStatus": true,
diff --git a/auto-imports.d.ts b/auto-imports.d.ts
index 9df72a9..a6f72f9 100644
--- a/auto-imports.d.ts
+++ b/auto-imports.d.ts
@@ -61,8 +61,12 @@
const EnumTaskStatus: typeof import('./src/constants/apiEnum')['EnumTaskStatus']
const EnumTaskStatusText: typeof import('./src/constants/task')['EnumTaskStatusText']
const EnumTaskUserHireStatus: typeof import('./src/constants/apiEnum')['EnumTaskUserHireStatus']
+ const EnumTaskUserHireStatusText: typeof import('./src/constants/enterpriseEmployee')['EnumTaskUserHireStatusText']
+ const EnumTaskUserSignContractStatus: typeof import('./src/constants/apiEnum')['EnumTaskUserSignContractStatus']
+ const EnumTaskUserSignContractStatusText: typeof import('./src/constants/enterpriseEmployee')['EnumTaskUserSignContractStatusText']
const EnumUserGender: typeof import('./src/constants/apiEnum')['EnumUserGender']
const EnumUserGenderText: typeof import('./src/constants/task')['EnumUserGenderText']
+ const EnumUserGenderTextForPerson: typeof import('./src/constants/task')['EnumUserGenderTextForPerson']
const EnumUserInfoStatus: typeof import('./src/constants/apiEnum')['EnumUserInfoStatus']
const EnumUserInfoStatusText: typeof import('./src/constants/user')['EnumUserInfoStatusText']
const EnumUserRealMethod: typeof import('./src/constants/apiEnum')['EnumUserRealMethod']
@@ -243,7 +247,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, EnumMenuType, EnumMenuVisitLevel, EnumPagedListOrder, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumTaskCheckReceiveStatus, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumTaskUserHireStatus, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, EnumBillingMethod, EnumClientType, EnumMenuType, EnumMenuVisitLevel, EnumPagedListOrder, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumTaskCheckReceiveStatus, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumTaskUserHireStatus, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType } from './src/constants/apiEnum'
+ export type { EnumBillingMethod, EnumClientType, EnumMenuType, EnumMenuVisitLevel, EnumPagedListOrder, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumTaskCheckReceiveStatus, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumTaskUserHireStatus, EnumTaskUserSignContractStatus, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, EnumBillingMethod, EnumClientType, EnumMenuType, EnumMenuVisitLevel, EnumPagedListOrder, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumTaskCheckReceiveStatus, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumTaskUserHireStatus, EnumTaskUserSignContractStatus, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType } from './src/constants/apiEnum'
import('./src/constants/apiEnum')
// @ts-ignore
export type { FlexWorkerEleSignEnum, FlexTaskWorkerHireEnum, FlexWorkerEleSignEnum, FlexTaskWorkerHireEnum } from './src/constants/cPerson'
@@ -333,8 +337,12 @@
readonly EnumTaskStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskStatus']>
readonly EnumTaskStatusText: UnwrapRef<typeof import('./src/constants/task')['EnumTaskStatusText']>
readonly EnumTaskUserHireStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskUserHireStatus']>
+ readonly EnumTaskUserHireStatusText: UnwrapRef<typeof import('./src/constants/enterpriseEmployee')['EnumTaskUserHireStatusText']>
+ readonly EnumTaskUserSignContractStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskUserSignContractStatus']>
+ readonly EnumTaskUserSignContractStatusText: UnwrapRef<typeof import('./src/constants/enterpriseEmployee')['EnumTaskUserSignContractStatusText']>
readonly EnumUserGender: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumUserGender']>
readonly EnumUserGenderText: UnwrapRef<typeof import('./src/constants/task')['EnumUserGenderText']>
+ readonly EnumUserGenderTextForPerson: UnwrapRef<typeof import('./src/constants/task')['EnumUserGenderTextForPerson']>
readonly EnumUserInfoStatusText: UnwrapRef<typeof import('./src/constants/user')['EnumUserInfoStatusText']>
readonly EnumUserRealMethod: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumUserRealMethod']>
readonly EnumUserStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumUserStatus']>
diff --git a/src/constants/apiEnum.ts b/src/constants/apiEnum.ts
index 393a3ce..aec9be0 100644
--- a/src/constants/apiEnum.ts
+++ b/src/constants/apiEnum.ts
@@ -107,6 +107,8 @@
UserResume = 8,
/**浼佷笟淇℃伅 */
Enterprise = 9,
+ /**鐏靛伐淇℃伅 */
+ EnterpriseEmployee = 10,
}
/** 璧勬簮璇锋眰鏂瑰紡 */
@@ -203,6 +205,16 @@
Refuse = 30,
}
+/** 浠诲姟鐢ㄦ埛绛剧害鐘舵�� */
+export enum EnumTaskUserSignContractStatus {
+ /**寰呯绾� */
+ Wait = 10,
+ /**宸茬绾� */
+ Pass = 20,
+ /**宸叉嫆绛� */
+ Refuse = 30,
+}
+
/** 鐢ㄦ埛鎬у埆 */
export enum EnumUserGender {
/**鐢� */
diff --git a/src/constants/enterpriseEmployee.ts b/src/constants/enterpriseEmployee.ts
new file mode 100644
index 0000000..5db63ff
--- /dev/null
+++ b/src/constants/enterpriseEmployee.ts
@@ -0,0 +1,13 @@
+import { EnumTaskUserHireStatus, EnumTaskUserSignContractStatus } from './apiEnum';
+
+export const EnumTaskUserHireStatusText = {
+ [EnumTaskUserHireStatus.Wait]: '寰呭綍鐢�',
+ [EnumTaskUserHireStatus.Pass]: '宸插綍鐢�',
+ [EnumTaskUserHireStatus.Refuse]: '宸茶阿缁�',
+};
+
+export const EnumTaskUserSignContractStatusText = {
+ [EnumTaskUserSignContractStatus.Wait]: '寰呯绾�',
+ [EnumTaskUserSignContractStatus.Pass]: '宸茬绾�',
+ [EnumTaskUserSignContractStatus.Refuse]: '宸茶阿缁�',
+};
diff --git a/src/constants/index.ts b/src/constants/index.ts
index 02c6032..8a2ccbf 100644
--- a/src/constants/index.ts
+++ b/src/constants/index.ts
@@ -17,3 +17,4 @@
export * from './user';
export * from './dic';
export * from './task';
+export * from './enterpriseEmployee';
diff --git a/src/constants/task.ts b/src/constants/task.ts
index caa07a4..d719abd 100644
--- a/src/constants/task.ts
+++ b/src/constants/task.ts
@@ -25,6 +25,11 @@
[EnumUserGender.Female]: '濂虫��',
};
+export const EnumUserGenderTextForPerson = {
+ [EnumUserGender.Male]: '鐢�',
+ [EnumUserGender.Female]: '濂�',
+};
+
export const EnumBillingMethodText = {
[EnumBillingMethod.Month]: '鎸夋湀',
[EnumBillingMethod.Day]: '鎸夋棩',
diff --git a/src/services/api/dictionary.ts b/src/services/api/dictionary.ts
index 4c74b85..eacd853 100644
--- a/src/services/api/dictionary.ts
+++ b/src/services/api/dictionary.ts
@@ -17,6 +17,21 @@
});
}
+/** 鏌ヨ鍦板尯閫夋嫨鍣� GET /api/flexjob/dictionary/getAreaSelect */
+export async function getAreaSelect(
+ // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
+ params: API.APIgetAreaSelectParams,
+ options?: API.RequestConfig
+) {
+ return request<API.GetAreaSelectQueryResultOption[]>('/api/flexjob/dictionary/getAreaSelect', {
+ method: 'GET',
+ params: {
+ ...params,
+ },
+ ...(options || {}),
+ });
+}
+
/** 鑾峰彇鏁版嵁瀛楀吀绫诲埆鍒嗛〉鍒楄〃鏁版嵁 POST /api/flexjob/dictionary/getDictionaryCategories */
export async function getDictionaryCategories(
body: API.GetDictionaryCategoriesQuery,
diff --git a/src/services/api/enterpriseEmployee.ts b/src/services/api/enterpriseEmployee.ts
new file mode 100644
index 0000000..8da2480
--- /dev/null
+++ b/src/services/api/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/src/services/api/index.ts b/src/services/api/index.ts
index a1555c0..042f909 100644
--- a/src/services/api/index.ts
+++ b/src/services/api/index.ts
@@ -4,23 +4,25 @@
// 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 taskUser from './taskUser';
import * as menu from './menu';
export default {
userResume,
resource,
+ enterpriseEmployee,
user,
dictionary,
auth,
+ taskUser,
task,
enterprise,
role,
- taskUser,
menu,
};
diff --git a/src/services/api/taskUser.ts b/src/services/api/taskUser.ts
index 694be3e..0b1d1b5 100644
--- a/src/services/api/taskUser.ts
+++ b/src/services/api/taskUser.ts
@@ -25,3 +25,30 @@
...(options || {}),
});
}
+
+/** 鏌ヨ搴旇仒鎶ュ悕鍒嗛〉鍒楄〃淇℃伅 POST /api/flexjob/taskUser/getTaskUsers */
+export async function getTaskUsers(body: API.GetTaskUsersQuery, options?: API.RequestConfig) {
+ return request<API.GetTaskUsersQueryResult>('/api/flexjob/taskUser/getTaskUsers', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
+/** 浠诲姟褰曠敤 PUT /api/flexjob/taskUser/setTaskUserHire */
+export async function setTaskUserHire(
+ body: API.SetTaskUserHireCommand,
+ options?: API.RequestConfig
+) {
+ return request<string>('/api/flexjob/taskUser/setTaskUserHire', {
+ method: 'PUT',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index 8638b22..fe6ab58 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -8,6 +8,11 @@
request?: GetAliyunOSSAcsQuery;
}
+ interface APIgetAreaSelectParams {
+ /** 鏈�澶ф繁搴� */
+ maxDeep?: number;
+ }
+
interface APIgetCurrentLogierMenuParams {
/** Id */
id?: string;
@@ -36,6 +41,8 @@
all?: boolean;
/** 鏈�澶ф繁搴� */
maxDeep?: number;
+ /** 鎼哄甫涓嬬骇 */
+ withChildren?: boolean;
}
interface APIgetEnterpriseElectronSignSettingParams {
@@ -151,6 +158,8 @@
}
interface BindWxmpUserInfoCommand {
+ /** 璁块棶浠ょ墝 */
+ accessToken: string;
/** 鍖呮嫭鏁忔劅鏁版嵁鍦ㄥ唴鐨勫畬鏁寸敤鎴蜂俊鎭殑鍔犲瘑鏁版嵁 */
encryptedData: string;
/** 鍔犲瘑绠楁硶鐨勫垵濮嬪悜閲� */
@@ -290,6 +299,8 @@
UserResume = 8,
/**浼佷笟淇℃伅 */
Enterprise = 9,
+ /**鐏靛伐淇℃伅 */
+ EnterpriseEmployee = 10,
}
enum EnumResourceMethod {
@@ -376,6 +387,15 @@
Refuse = 30,
}
+ enum EnumTaskUserSignContractStatus {
+ /**寰呯绾� */
+ Wait = 10,
+ /**宸茬绾� */
+ Pass = 20,
+ /**宸叉嫆绛� */
+ Refuse = 30,
+ }
+
enum EnumUserGender {
/**鐢� */
Male = 10,
@@ -453,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;
/** 閿欒淇℃伅 */
@@ -589,6 +627,24 @@
timestamp?: number;
}
+ interface FriendlyResultGetTaskUsersQueryResult {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: GetTaskUsersQueryResult;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
interface FriendlyResultGetUserResumeCredentialQueryResult {
/** 璺熻釜Id */
traceId?: string;
@@ -679,6 +735,24 @@
timestamp?: number;
}
+ interface FriendlyResultGetUserResumesQueryResult {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: GetUserResumesQueryResult;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
interface FriendlyResultGetUserResumeWorkExperienceQueryResult {
/** 璺熻釜Id */
traceId?: string;
@@ -725,6 +799,25 @@
errorCode?: string;
/** 鏁版嵁 */
data?: number;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
+ interface FriendlyResultListGetAreaSelectQueryResultOption {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ /** 鏁版嵁 */
+ data?: GetAreaSelectQueryResultOption[];
/** 鎵ц鎴愬姛 */
success?: boolean;
/** 閿欒淇℃伅 */
@@ -1005,6 +1098,25 @@
requestId?: string;
}
+ interface GetAreaSelectQueryResultOption {
+ /** Id */
+ areaCode?: string;
+ /** 鍦板尯鍚嶇О */
+ areaName?: string;
+ /** 瀛愮骇 */
+ children?: GetAreaSelectQueryResultOption[];
+ /** Id */
+ id?: string;
+ /** 涓婄骇缂栧彿 */
+ parentCode?: string;
+ /** 灞傜骇 */
+ leyer?: number;
+ /** 鎺掑簭 */
+ sort?: number;
+ /** 蹇�熸煡璇� */
+ quickQuery?: string;
+ }
+
type GetCurrentLogierMenusQuery = Record<string, any>;
interface GetDictionaryCategoriesQuery {
@@ -1027,6 +1139,50 @@
}
type GetDictionaryCategorySelectQuery = Record<string, any>;
+
+ interface GetDictionaryCategorySelectQueryOption {
+ /** Id */
+ id?: string;
+ /** 缂栧彿 */
+ code?: string;
+ /** 鍚嶇О */
+ name?: string;
+ /** 瀛楁鍚嶏紙閫楀彿闅斿紑锛� */
+ fieldNames?: string;
+ /** 澶囨敞 */
+ remark?: string;
+ }
+
+ interface GetDictionaryDataSelectQueryResultOption {
+ /** Id */
+ id?: string;
+ /** 涓婄骇Id */
+ parentId?: string;
+ /** 涓婄骇缂栧彿 */
+ parentCode?: string;
+ /** 瀛愮骇 */
+ children?: SelectOptionStringGetDictionaryDataSelectQueryResultOption[];
+ /** 瀛楀吀璺緞 */
+ path?: string;
+ /** 娣卞害 */
+ deep?: number;
+ /** 鎺掑簭 */
+ sort?: number;
+ /** 缂栧彿 */
+ code?: string;
+ /** 鏄剧ず鍐呭 */
+ content: string;
+ /** 瀛楁1 */
+ field1?: string;
+ /** 瀛楁2 */
+ field2?: string;
+ /** 瀛楁3 */
+ field3?: string;
+ /** 瀛楁4 */
+ field4?: string;
+ /** 瀛楁5 */
+ field5?: string;
+ }
interface GetDictionaryDatasQuery {
/** 绫诲埆Id锛圛d/缂栧彿浜岄�変竴锛� */
@@ -1081,6 +1237,58 @@
signCost?: number;
/** 涓�鍙ｄ环 */
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;
+ /** 鎵嬫満鍙� */
+ contactPhoneNumber?: string;
+ hireStatus?: EnumTaskUserHireStatus;
+ /** 瀹炲悕鐘舵�� */
+ userIsReal?: boolean;
+ userSignContractStatus?: EnumTaskUserSignContractStatus;
+ /** 褰曠敤鏃堕棿 */
+ hireTime?: string;
+ /** 瀹炲悕鏃堕棿 */
+ userRealTime?: string;
+ /** 绛剧害鏃堕棿 */
+ userSignContractTime?: string;
+ enterpriseSignContractStatus?: EnumTaskUserSignContractStatus;
+ /** 浼佷笟绛剧害鏃堕棿 */
+ enterpriseSignContractTime?: string;
}
interface GetEnterpriseQueryResult {
@@ -1424,8 +1632,12 @@
enterpriseId?: string;
/** 浼佷笟鍏ㄧО */
enterpriseName?: string;
+ /** 鑱旂郴鐢佃瘽 */
+ contactPhoneNumber?: string;
/** 鍦ㄦ嫑宀椾綅鏁伴噺 */
taskCount?: number;
+ /** 鎶ュ悕浜烘暟 */
+ applyCount?: number;
/** 浠诲姟鍚嶇О */
name?: string;
billingMethod?: EnumBillingMethod;
@@ -1467,6 +1679,7 @@
isCollected?: boolean;
status?: EnumTaskStatus;
releaseStatus?: EnumTaskReleaseStatus;
+ hireStatus?: EnumTaskUserHireStatus;
}
interface GetTaskInfoQueryResultBenefit {
@@ -1575,6 +1788,52 @@
stoppedReleaseCount?: number;
}
+ interface GetTaskUsersQuery {
+ /** 浠诲姟Id */
+ id?: string;
+ pageModel?: PagedListQueryPageModel;
+ }
+
+ interface GetTaskUsersQueryResult {
+ pageModel?: PagedListQueryResultPageModel;
+ /** 鏁版嵁 */
+ data?: GetTaskUsersQueryResultItem[];
+ }
+
+ interface GetTaskUsersQueryResultItem {
+ /** 浠诲姟闆囦剑Id */
+ id?: string;
+ /** 澶村儚 */
+ avatar?: string;
+ /** 濮撳悕 */
+ name?: string;
+ /** 韬唤璇佸彿 */
+ identity?: string;
+ /** 鎵嬫満鍙� */
+ contactPhoneNumber?: string;
+ gender?: EnumUserGender;
+ /** 骞撮緞 */
+ age?: number;
+ /** 鏄惁瀹炲悕 */
+ isReal?: boolean;
+ realMethod?: EnumUserRealMethod;
+ /** 韬唤缂栧彿 */
+ personalIdentityCode?: string;
+ /** 韬唤 */
+ personalIdentityContent?: string;
+ /** 瀛﹀巻缂栧彿 */
+ educationalBackgroundCode?: string;
+ /** 瀛﹀巻 */
+ educationalBackgroundContent?: string;
+ /** 涓婂矖娆℃暟 */
+ taskCount?: number;
+ /** 宸ヤ綔璧勫巻 */
+ workSeniority?: string;
+ /** 宸ヤ綔缁忛獙 */
+ workExperience?: string;
+ hireStatus?: EnumTaskUserHireStatus;
+ }
+
interface GetUserInfoRolesQueryResultItem {
/** 瑙掕壊Id */
id?: string;
@@ -1658,8 +1917,6 @@
name?: string;
/** 鎵嬫満鍙� */
contactPhoneNumber?: string;
- /** 韬唤璇佸彿 */
- identity?: string;
/** 韬唤缂栧彿 */
personalIdentityCode?: string;
/** 韬唤 */
@@ -1730,6 +1987,8 @@
weight?: number;
/** 鐢熸椿鐓� */
photos?: string[];
+ /** 缁忓巻 */
+ taskInfoUsers?: GetUserResumeQueryResultExperience[];
}
interface GetUserResumeQueryResultCredential {
@@ -1760,6 +2019,72 @@
expectJobCode?: string;
/** 鏈熸湜宀椾綅 */
expectJobContent?: string;
+ }
+
+ interface GetUserResumeQueryResultExperience {
+ /** 绛剧害鏃堕棿 */
+ signContractTime?: string;
+ /** 浼佷笟鍏ㄧО */
+ enterpriseName?: string;
+ /** 浠诲姟鍚嶇О */
+ name?: string;
+ }
+
+ interface GetUserResumesQuery {
+ /** 浠诲姟Id */
+ taskInfoId?: string;
+ /** 鏈熸湜宀椾綅缂栧彿 */
+ userExpectJobs?: string[];
+ gender?: EnumUserGender;
+ /** 韬唤缂栧彿 */
+ personalIdentityCode?: string;
+ /** 骞撮緞鑼冨洿鏈�灏� */
+ ageMin?: number;
+ /** 骞撮緞鑼冨洿澶� */
+ ageMax?: number;
+ /** 璧勬牸璇佷功缂栧彿 */
+ userCredentials?: string[];
+ pageModel?: PagedListQueryPageModel;
+ }
+
+ interface GetUserResumesQueryResult {
+ pageModel?: PagedListQueryResultPageModel;
+ /** 鏁版嵁 */
+ data?: GetUserResumesQueryResultItem[];
+ }
+
+ interface GetUserResumesQueryResultItem {
+ /** 鐢ㄦ埛Id */
+ id?: string;
+ /** 澶村儚 */
+ avatar?: string;
+ /** 濮撳悕 */
+ name?: string;
+ /** 鎵嬫満鍙� */
+ contactPhoneNumber?: string;
+ /** 韬唤璇佸彿 */
+ identity?: string;
+ /** 骞撮緞 */
+ age?: number;
+ gender?: EnumUserGender;
+ /** 鏄惁瀹炲悕 */
+ isReal?: boolean;
+ /** 瀹炲悕鏃堕棿 */
+ realTime?: string;
+ /** 韬唤缂栧彿 */
+ personalIdentityCode?: string;
+ /** 韬唤 */
+ personalIdentityContent?: string;
+ /** 瀛﹀巻缂栧彿 */
+ educationalBackgroundCode?: string;
+ /** 瀛﹀巻 */
+ educationalBackgroundContent?: string;
+ /** 涓婂矖娆℃暟 */
+ taskCount?: number;
+ /** 宸ヤ綔璧勫巻 */
+ workSeniority?: string;
+ /** 宸ヤ綔缁忛獙 */
+ workExperience?: string;
}
type GetUserResumeWorkExperienceQuery = Record<string, any>;
@@ -2161,8 +2486,6 @@
name?: string;
/** 鎵嬫満鍙� */
contactPhoneNumber?: string;
- /** 韬唤璇佸彿 */
- identity: string;
/** 韬唤缂栧彿 */
personalIdentityCode: string;
/** 瀛﹀巻缂栧彿 */
@@ -2185,8 +2508,7 @@
value?: string;
/** 鏍囩 */
label?: string;
- /** 鏁版嵁 */
- data?: any;
+ data?: GetDictionaryCategorySelectQueryOption;
}
interface SelectOptionStringGetDictionaryDataSelectQueryResultOption {
@@ -2194,8 +2516,7 @@
value?: string;
/** 鏍囩 */
label?: string;
- /** 鏁版嵁 */
- data?: any;
+ data?: GetDictionaryDataSelectQueryResultOption;
}
interface SendLoginOrRegisterVerifyCodeCommand {
@@ -2264,6 +2585,12 @@
releaseStatus?: EnumTaskReleaseStatus;
}
+ interface SetTaskUserHireCommand {
+ /** 浠诲姟闆囦剑Id */
+ id?: string;
+ hireStatus?: EnumTaskUserHireStatus;
+ }
+
interface SetUserInfoRolesCommand {
/** 鐢ㄦ埛Id */
userInfoId?: string;
diff --git a/src/services/api/userResume.ts b/src/services/api/userResume.ts
index 6ab9057..e708586 100644
--- a/src/services/api/userResume.ts
+++ b/src/services/api/userResume.ts
@@ -127,6 +127,18 @@
);
}
+/** 鏌ヨ鐏靛伐鍒嗛〉鍒楄〃鏁版嵁 POST /api/user/userResume/getUserResumes */
+export async function getUserResumes(body: API.GetUserResumesQuery, options?: API.RequestConfig) {
+ return request<API.GetUserResumesQueryResult>('/api/user/userResume/getUserResumes', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
/** 鏌ヨ鐢ㄦ埛绠�鍘�-宸ヤ綔缁忛獙 GET /api/user/userResume/getUserResumeWorkExperience */
export async function getUserResumeWorkExperience(
// 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
diff --git a/src/views/CPersonManage/CPersonManageList.vue b/src/views/CPersonManage/CPersonManageList.vue
index ac1cda8..db6d47e 100644
--- a/src/views/CPersonManage/CPersonManageList.vue
+++ b/src/views/CPersonManage/CPersonManageList.vue
@@ -5,25 +5,20 @@
<template #query>
<QueryFilterItem tip-content="瀹炲悕鐘舵��">
<FieldRadio
- v-model="extraParamState.realVerifyStatus"
+ v-model="extraParamState.isReal"
:value-enum="[
- {
- value: false,
- label: '鏈疄鍚�',
- },
- {
- value: true,
- label: '宸插疄鍚�',
- },
+ { label: '宸插疄鍚�', value: true },
+ { label: '鏈疄鍚�', value: false },
]"
buttonStyle
showAllBtn
+ :all-btn-value="null"
@change="getList()"
/>
</QueryFilterItem>
<QueryFilterItem tip-content="鏈�杩戝綍鐢ㄦ椂闂�">
<FieldDatePicker
- v-model="extraParamState.nearlyHireDateTime"
+ v-model="extraParamState.createdTime"
type="daterange"
range-separator="~"
start-placeholder="寮�濮嬫椂闂�"
@@ -34,7 +29,7 @@
</QueryFilterItem>
<QueryFilterItem tip-content="鏈�杩戠绾︽椂闂�">
<FieldDatePicker
- v-model="extraParamState.nearlySignDateTime"
+ v-model="extraParamState.signContractTime"
type="daterange"
range-separator="~"
start-placeholder="寮�濮嬫椂闂�"
@@ -82,6 +77,7 @@
import CPersonDetailDialog from './components/CPersonDetailDialog.vue';
import { convertApi2FormUrlOnlyOne, format } from '@/utils';
import { ModelValueType } from 'element-plus';
+import * as enterpriseEmployeeServices from '@/services/api/enterpriseEmployee';
defineOptions({
name: 'CPersonManageList',
@@ -127,33 +123,28 @@
} = useTable(
async ({ pageIndex, pageSize }, extraParamState) => {
try {
- let params: API.GetUserClientForBackInput = {
+ let params: API.GetEnterpriseEmployeesQuery = {
pageModel: {
rows: pageSize,
page: pageIndex,
orderInput: extraParamState.orderInput,
},
- searchKeys: extraParamState.searchKeys,
- nearlyHireDateTimeBegin: format(
- extraParamState.nearlyHireDateTime?.[0] ?? '',
+ keywords: extraParamState.searchKeys,
+ //TODO 搴旇鏄綍鐢ㄦ椂闂� 杩樻病鏈�
+ createdTimeStart: format(extraParamState.createdTime?.[0] ?? '', 'YYYY-MM-DD 00:00:00'),
+ createdTimeEnd: format(extraParamState.createdTime?.[1] ?? '', 'YYYY-MM-DD 23:59:59'),
+ signContractTimeStart: format(
+ extraParamState.signContractTime?.[0] ?? '',
'YYYY-MM-DD 00:00:00'
),
- nearlyHireDateTimeEnd: format(
- extraParamState.nearlyHireDateTime?.[1] ?? '',
+ signContractTimeEnd: format(
+ extraParamState.signContractTime?.[1] ?? '',
'YYYY-MM-DD 23:59:59'
),
- nearlySignDateTimeBegin: format(
- extraParamState.nearlySignDateTime?.[0] ?? '',
- 'YYYY-MM-DD 00:00:00'
- ),
- nearlySignDateTimeEnd: format(
- extraParamState.nearlySignDateTime?.[1] ?? '',
- 'YYYY-MM-DD 23:59:59'
- ),
- realVerifyStatus: extraParamState.realVerifyStatus,
+ isReal: extraParamState.isReal,
};
- let res = await flexEnterpriseWokerServices.getUserClientList(params, {
+ let res = await enterpriseEmployeeServices.getEnterpriseEmployees(params, {
showLoading: !state.loading,
});
return res;
@@ -164,26 +155,29 @@
{
defaultExtraParams: {
searchKeys: '',
- realVerifyStatus: '' as any as boolean,
- nearlyHireDateTime: [] as unknown as ModelValueType,
- nearlySignDateTime: [] as unknown as ModelValueType,
- orderInput: [{ property: 'userId', order: EnumPagedListOrder.Desc }],
+ orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
+ createdTime: [] as unknown as ModelValueType,
+ signContractTime: [] as unknown as ModelValueType,
+ isReal: null as any as boolean,
},
- queryKey: ['flexEnterpriseWokerServices/getUserClientList'],
+ queryKey: ['enterpriseEmployeeServices/getEnterpriseEmployees'],
columnsRenderProps: {
- realVerifyStatus: {
- type: 'enum',
- valueEnum: [
- { label: '宸插疄鍚�', value: true },
- { label: '鏈疄鍚�', value: false },
- ],
+ gender: { type: 'enum', valueEnum: EnumUserGenderTextForPerson },
+ hireStatus: { type: 'enum', valueEnum: EnumTaskUserHireStatusText },
+ userIsReal: {
+ formatter: (row: API.GetEnterpriseEmployeesQueryResultItem) => {
+ return row.userIsReal ? '宸插疄鍚�' : '鏈疄鍚�';
+ },
},
- realVerifyTime: { type: 'date' },
+ userSignContractStatus: { type: 'enum', valueEnum: EnumTaskUserSignContractStatusText },
+ hireTime: { type: 'date' },
+ userRealTime: { type: 'date' },
+ userSignContractTime: { type: 'date' },
},
}
);
-async function openDialog(row?: API.GetUserClientForBackOutput) {
+async function openDialog(row?: API.GetEnterpriseEmployeesQueryResultItem) {
const res = await getUserDetailForBack('98ac4c01-3598-ebf3-fa7d-3a189bb6b587');
handleEdit({
userId: row.userId ?? '98ac4c01-3598-ebf3-fa7d-3a189bb6b587',
@@ -220,7 +214,7 @@
async function getUserDetailForBack(userId: string) {
try {
- return await flexEnterpriseWokerServices.getUserDetailForBack({ userId: userId });
+ // return await flexEnterpriseWokerServices.getUserDetailForBack({ userId: userId });
} catch (error) {}
}
</script>
--
Gitblit v1.9.1