From ac7fde69c457b3488bbfe2671dbfeb3eeba26414 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 13 八月 2025 10:15:20 +0800
Subject: [PATCH] fix: 灵工管理
---
apps/bMiniApp/src/subpackages/jobApplicationManage/components/SignList.vue | 7 +
packages/services/apiV2/index.ts | 36 ++++++------
packages/components/src/Card/FlexJobTopView.vue | 7 ++
packages/constants/task.ts | 9 ++
apps/bMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue | 6 ++
apps/cMiniApp/src/subpackages/mine/mineHire/mineHire.vue | 2
packages/services/apiV2/enterpriseEmployee.ts | 18 ++++++
packages/services/apiV2/typings.d.ts | 84 +++++++++++++++++++++++++--
apps/bMiniApp/src/pages/home/index.vue | 2
apps/cMiniApp/src/pages/mine/index.vue | 2
10 files changed, 140 insertions(+), 33 deletions(-)
diff --git a/apps/bMiniApp/src/pages/home/index.vue b/apps/bMiniApp/src/pages/home/index.vue
index 98be786..e4b1113 100644
--- a/apps/bMiniApp/src/pages/home/index.vue
+++ b/apps/bMiniApp/src/pages/home/index.vue
@@ -91,7 +91,7 @@
onMounted(async () => {
try {
- await setLocationCity();
+ await resetLocation();
} catch (error) {}
});
diff --git a/apps/bMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue b/apps/bMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue
index 3f72bab..15b3dfa 100644
--- a/apps/bMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue
@@ -25,6 +25,12 @@
:gender="item.gender"
:age="item.age"
:isReal="item.userIsReal"
+ :personalIdentityContent="item.personalIdentityContent"
+ :educationalBackgroundContent="item.educationalBackgroundContent"
+ :taskCount="item.taskCount"
+ :avatar="item.avatar"
+ :workExperience="item.workExperience"
+ :workSeniority="item.workSeniority"
@click="goDetail(item)"
>
<template #footerRight>
diff --git a/apps/bMiniApp/src/subpackages/jobApplicationManage/components/SignList.vue b/apps/bMiniApp/src/subpackages/jobApplicationManage/components/SignList.vue
index adc2bdc..83dc2d5 100644
--- a/apps/bMiniApp/src/subpackages/jobApplicationManage/components/SignList.vue
+++ b/apps/bMiniApp/src/subpackages/jobApplicationManage/components/SignList.vue
@@ -14,7 +14,10 @@
:workExperience="item.workExperience"
>
<template #footerLeft>
- <div class="flexJob-card-footer-text">
+ <div
+ class="flexJob-card-footer-text"
+ :style="{ color: EnumTaskUserHireStatusColor[item.hireStatus] }"
+ >
{{ EnumTaskUserHireStatusText[item.hireStatus] }}
</div>
</template>
@@ -27,7 +30,7 @@
</template>
<script setup lang="ts">
-import { EnumTaskUserHireStatusText } from '@12333/constants';
+import { EnumTaskUserHireStatusText, EnumTaskUserHireStatusColor } from '@12333/constants';
import { RouterPath } from '@/constants';
import { useTaskUserList } from '@12333/hooks';
import { FlexJobCard } from '@12333/components';
diff --git a/apps/cMiniApp/src/pages/mine/index.vue b/apps/cMiniApp/src/pages/mine/index.vue
index 4c9ab7a..d27651b 100644
--- a/apps/cMiniApp/src/pages/mine/index.vue
+++ b/apps/cMiniApp/src/pages/mine/index.vue
@@ -80,7 +80,7 @@
@click="goMineHire"
>
<img :src="IconOrderHire" class="mine-order-list-icon" />
- <div class="mine-order-list-text">宸插綍鐢�</div>
+ <div class="mine-order-list-text">宸插畨鎺�</div>
</nut-badge>
<nut-badge
class="mine-order-list-item"
diff --git a/apps/cMiniApp/src/subpackages/mine/mineHire/mineHire.vue b/apps/cMiniApp/src/subpackages/mine/mineHire/mineHire.vue
index 6ae63c0..8e27308 100644
--- a/apps/cMiniApp/src/subpackages/mine/mineHire/mineHire.vue
+++ b/apps/cMiniApp/src/subpackages/mine/mineHire/mineHire.vue
@@ -1,5 +1,5 @@
<template>
- <PageLayoutWithBg class="mineHire-page-wrapper" :title="'宸插綍鐢�'">
+ <PageLayoutWithBg class="mineHire-page-wrapper" :title="'宸插畨鎺�'">
<InnerPage></InnerPage>
</PageLayoutWithBg>
</template>
diff --git a/packages/components/src/Card/FlexJobTopView.vue b/packages/components/src/Card/FlexJobTopView.vue
index af58bf0..f874817 100644
--- a/packages/components/src/Card/FlexJobTopView.vue
+++ b/packages/components/src/Card/FlexJobTopView.vue
@@ -1,6 +1,10 @@
<template>
<div :class="['flexJob-card-top-wrapper', size]">
- <Avatar :src="avatar" :size="size === 'small' ? 50 : 60" class="flexJob-card-top-avatar" />
+ <Avatar
+ :src="setOSSLink(avatar)"
+ :size="size === 'small' ? 50 : 60"
+ class="flexJob-card-top-avatar"
+ />
<div class="flexJob-card-top-info">
<div class="flexJob-card-top-info-item">
<div class="flexJob-card-top-info-name">{{ name }}</div>
@@ -31,6 +35,7 @@
import { AvatarImage, EnumUserGender } from '@12333/constants';
import { Avatar } from '@12333/components';
import { computed } from 'vue';
+import { setOSSLink } from '@12333/utils';
defineOptions({
name: 'FlexJobTopView',
diff --git a/packages/constants/task.ts b/packages/constants/task.ts
index 245bba6..41352e4 100644
--- a/packages/constants/task.ts
+++ b/packages/constants/task.ts
@@ -1,3 +1,4 @@
+import { Colors } from './enum';
import {
EnumBillingMethod,
EnumUserGender,
@@ -48,7 +49,7 @@
};
export const EnumTaskCheckReceiveStatusText = {
- [EnumTaskCheckReceiveStatus.Wait]: '寰呴獙鏀�',
+ [EnumTaskCheckReceiveStatus.WaitSubmit]: '寰呴獙鏀�',
[EnumTaskCheckReceiveStatus.Completed]: '宸查獙鏀�',
};
@@ -72,6 +73,12 @@
[EnumTaskUserHireStatus.Refuse]: '宸茶阿缁�',
};
+export const EnumTaskUserHireStatusColor = {
+ [EnumTaskUserHireStatus.Wait]: Colors.Warning,
+ [EnumTaskUserHireStatus.Pass]: Colors.Primary,
+ [EnumTaskUserHireStatus.Refuse]: Colors.Danger,
+};
+
export const GetPersonalApplyTaskInfosQueryStatusText = {
[GetPersonalApplyTaskInfosQueryStatus.WaitHire]: '寰呯‘璁�',
[GetPersonalApplyTaskInfosQueryStatus.WaitSignContract]: '寰呯绾�',
diff --git a/packages/services/apiV2/enterpriseEmployee.ts b/packages/services/apiV2/enterpriseEmployee.ts
index 8da2480..1c915b2 100644
--- a/packages/services/apiV2/enterpriseEmployee.ts
+++ b/packages/services/apiV2/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/packages/services/apiV2/index.ts b/packages/services/apiV2/index.ts
index 042f909..d5c3133 100644
--- a/packages/services/apiV2/index.ts
+++ b/packages/services/apiV2/index.ts
@@ -2,27 +2,27 @@
/* 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 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 enterpriseEmployee from './enterpriseEmployee';
import * as menu from './menu';
export default {
- userResume,
- resource,
- enterpriseEmployee,
- user,
- dictionary,
- auth,
- taskUser,
- task,
- enterprise,
role,
+ enterprise,
+ task,
+ dictionary,
+ user,
+ userResume,
+ auth,
+ resource,
+ taskUser,
+ enterpriseEmployee,
menu,
};
diff --git a/packages/services/apiV2/typings.d.ts b/packages/services/apiV2/typings.d.ts
index 36268d2..860e74f 100644
--- a/packages/services/apiV2/typings.d.ts
+++ b/packages/services/apiV2/typings.d.ts
@@ -50,6 +50,13 @@
id?: string;
}
+ interface APIgetEnterpriseEmployeeParams {
+ /** 鐏靛伐Id */
+ id?: string;
+ /** 浠诲姟Id */
+ taskInfoId?: string;
+ }
+
interface APIgetEnterpriseParams {
/** Id */
id?: string;
@@ -516,6 +523,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;
/** 閿欒淇℃伅 */
@@ -1269,9 +1294,9 @@
/** 鍏抽敭瀛� */
keywords?: string;
/** 楠屾敹鏃ユ湡-鏈�鏃╂椂闂� */
- submitTimeBegin?: string;
+ dateBegin?: string;
/** 楠屾敹鏃ユ湡-鏈�鏅氭椂闂� */
- submitTimeEnd?: string;
+ dateEnd?: string;
checkReceiveStatus?: EnumTaskCheckReceiveStatus;
pageModel?: PagedListQueryPageModel;
}
@@ -1297,8 +1322,7 @@
name?: string;
/** 韬唤璇佸彿 */
identity?: string;
- /** 鐢熸棩 */
- birthday?: string;
+ gender?: EnumUserGender;
/** 骞撮緞 */
age?: number;
/** 鎵嬫満鍙� */
@@ -1430,6 +1454,32 @@
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;
+ /** 浼佷笟绛剧害鏃堕棿 */
+ enterpriseSignContractTime?: string;
+ /** 鐢靛瓙鍚堝悓 */
+ contractUrl?: string;
+ }
+
interface GetEnterpriseEmployeesQuery {
/** 鍏抽敭瀛楋紙濮撳悕/鎵嬫満/韬唤璇佸彿锛� */
keywords?: string;
@@ -1467,9 +1517,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 +2167,9 @@
interface GetTaskUsersQuery {
/** 浠诲姟Id */
id?: string;
+ /** 鍏抽敭瀛� */
+ keywords?: string;
+ hireStatus?: EnumTaskUserHireStatus;
pageModel?: PagedListQueryPageModel;
}
@@ -2761,9 +2829,9 @@
/** 姘镐箙璇佷功 */
isForever?: boolean;
/** 寮�濮嬫棩鏈� */
- startDate: string;
+ startDate?: string;
/** 缁撴潫鏃ユ湡 */
- endDate: string;
+ endDate?: string;
/** 鍙戣瘉鍗曚綅 */
issueUnit?: string;
/** 璇佷功姝ｉ潰鐓х墖 */
--
Gitblit v1.9.1