From d820b4d0fc01559e36484649c56bbc13b9cc551c Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期二, 12 八月 2025 16:30:42 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/cMiniApp/src/subpackages/wallet/unboundBankCard/InnerPage.vue | 4 +
packages/constants/index.ts | 1
apps/bMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue | 48 +++++++++++++++---------
packages/components/src/Tabs/ProTabs.vue | 3 -
packages/constants/enterpriseEmployee.ts | 13 ++++++
apps/bMiniApp/project.private.config.json | 7 +++
6 files changed, 55 insertions(+), 21 deletions(-)
diff --git a/apps/bMiniApp/project.private.config.json b/apps/bMiniApp/project.private.config.json
index 08d5725..57b2186 100644
--- a/apps/bMiniApp/project.private.config.json
+++ b/apps/bMiniApp/project.private.config.json
@@ -9,6 +9,13 @@
"miniprogram": {
"list": [
{
+ "name": "鐏靛伐绠＄悊",
+ "pathName": "subpackages/flexJobManage/flexJobManage/flexJobManage",
+ "query": "",
+ "launchMode": "default",
+ "scene": null
+ },
+ {
"name": "搴旇仒绠＄悊璇︽儏",
"pathName": "subpackages/jobApplicationManage/jobApplicationDetail/jobApplicationDetail",
"query": "taskId=04c75425-e783-4dbf-0f16-08ddd626b756",
diff --git a/apps/bMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue b/apps/bMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue
index 29401b3..7460bc6 100644
--- a/apps/bMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue
@@ -1,6 +1,6 @@
<template>
<ProTabs
- v-model="queryState.mineHireType"
+ v-model="queryState.userSignContractStatus"
name="home-tab"
:showPaneContent="false"
class="home-tabs"
@@ -8,19 +8,22 @@
title-gutter="12"
title-scroll
>
- <ProTabPane :title="`宸茬绾" :pane-key="FlexWorkerEleSignEnum.HasSign"></ProTabPane>
- <ProTabPane :title="`寰呯绾" :pane-key="FlexWorkerEleSignEnum.WaitSign"></ProTabPane>
- <ProTabPane :title="`宸茶В绾" :pane-key="FlexWorkerEleSignEnum.CancelSign"></ProTabPane>
+ <ProTabPane :title="`宸茬绾" :pane-key="EnumTaskUserSignContractStatus.Pass"></ProTabPane>
+ <ProTabPane :title="`寰呯绾" :pane-key="EnumTaskUserSignContractStatus.Wait"></ProTabPane>
+ <ProTabPane :title="`宸茶В绾" :pane-key="EnumTaskUserSignContractStatus.Refuse"></ProTabPane>
</ProTabs>
<InfiniteLoading
scrollViewClassName="common-infinite-scroll-list home-list"
v-bind="infiniteLoadingProps"
- :key="queryState.mineHireType"
+ :key="queryState.userSignContractStatus"
>
<template #renderItem="{ item }">
<FlexJobCard :show-done-detail="false" :show-footer-left="false" @click="goDetail(item)">
<template #footerRight>
- <template v-if="queryState.mineHireType === FlexWorkerEleSignEnum.HasSign">
+ <span></span>
+ <!-- <template
+ v-if="queryState.userSignContractStatus === EnumTaskUserSignContractStatus.Pass"
+ >
<nut-button
class="flexJobManage-card-plain-button"
type="default"
@@ -30,7 +33,12 @@
>
<nut-button type="primary" @click.stop="checkContract">鏌ョ湅鍚堢害</nut-button>
</template>
- <nut-button v-else type="primary" @click.stop="goSignContract(item)">绛剧害</nut-button>
+ <nut-button
+ v-else-if="queryState.userSignContractStatus === EnumTaskUserSignContractStatus.Wait"
+ type="primary"
+ @click.stop="goSignContract(item)"
+ >绛剧害</nut-button
+ > -->
</template>
</FlexJobCard>
</template>
@@ -41,9 +49,12 @@
import { FlexJobCard, ProTabs, ProTabPane } from '@12333/components';
import { RouterPath } from '@/constants';
import { useInfiniteLoading } from '@12333/hooks';
-import { OrderInputType } from '@12333/constants';
-import * as flexWorkerServices from '@12333/services/api/FlexWorker';
-import { FlexWorkerEleSignEnum } from '@12333/constants/task';
+import {
+ EnumTaskUserHireStatus,
+ EnumTaskUserSignContractStatus,
+ EnumPagedListOrder,
+} from '@12333/constants';
+import * as enterpriseEmployeeServices from '@12333/services/apiV2/enterpriseEmployee';
import Taro from '@tarojs/taro';
defineOptions({
@@ -51,32 +62,33 @@
});
const queryState = reactive({
- mineHireType: FlexWorkerEleSignEnum.HasSign,
+ userSignContractStatus: EnumTaskUserSignContractStatus.Pass,
});
const { infiniteLoadingProps } = useInfiniteLoading(
({ pageParam }) => {
- let params: API.GetFlexSignWorkerListInput = {
- signStatus: queryState.mineHireType,
+ let params: API.GetEnterpriseEmployeesQuery = {
pageModel: {
rows: 20,
page: pageParam,
- orderInput: [{ property: 'creationTime', order: OrderInputType.Desc }],
+ orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
},
+ hireStatus: EnumTaskUserHireStatus.Pass,
+ userSignContractStatus: queryState.userSignContractStatus,
};
- return flexWorkerServices.getFlexSignWorkerList(params, {
+ return enterpriseEmployeeServices.getEnterpriseEmployees(params, {
showLoading: false,
});
},
{
- queryKey: ['flexWorkerServices/getFlexSignWorkerList', queryState],
+ queryKey: ['enterpriseEmployeeServices/getEnterpriseEmployees', queryState],
}
);
-function goDetail(item: API.GetNewestWorkerListOutput) {
+function goDetail(item: API.GetEnterpriseEmployeesQueryResultItem) {
Taro.navigateTo({
- url: `${RouterPath.flexJobDetailFromManage}?userId=${item.userId}`,
+ url: `${RouterPath.flexJobDetailFromManage}?userId=${item.id}`,
});
}
diff --git a/apps/cMiniApp/src/subpackages/wallet/unboundBankCard/InnerPage.vue b/apps/cMiniApp/src/subpackages/wallet/unboundBankCard/InnerPage.vue
index 46e5264..05389a4 100644
--- a/apps/cMiniApp/src/subpackages/wallet/unboundBankCard/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/wallet/unboundBankCard/InnerPage.vue
@@ -50,10 +50,12 @@
import { Message } from '@12333/utils';
import { VerificationCodeBusinessType } from '@12333/constants';
import * as commonServices from '@12333/services/api/Common';
-import * as userResumeServices from '@12333/services/api/userResume';
+// import * as userResumeServices from '@12333/services/api/userResume';
import Taro from '@tarojs/taro';
import { useQuery } from '@tanstack/vue-query';
+const userResumeServices = {};
+
defineOptions({
name: 'InnerPage',
});
diff --git a/packages/components/src/Tabs/ProTabs.vue b/packages/components/src/Tabs/ProTabs.vue
index f3d1b77..f15207d 100644
--- a/packages/components/src/Tabs/ProTabs.vue
+++ b/packages/components/src/Tabs/ProTabs.vue
@@ -406,10 +406,9 @@
const refRandomId = Math.random().toString(36).slice(-8);
const systemInfo = Taro.getSystemInfoSync();
-console.log('systemInfo: ', systemInfo);
const tabsStyle = computed(() => {
- if (systemInfo.platform === 'ios') {
+ if (systemInfo.platform.toLowerCase() === 'ios') {
return { overflow: 'visible' };
} else {
return {};
diff --git a/packages/constants/enterpriseEmployee.ts b/packages/constants/enterpriseEmployee.ts
new file mode 100644
index 0000000..5db63ff
--- /dev/null
+++ b/packages/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/packages/constants/index.ts b/packages/constants/index.ts
index d1151ce..29e7321 100644
--- a/packages/constants/index.ts
+++ b/packages/constants/index.ts
@@ -13,3 +13,4 @@
export * from './parkOrHR';
export * from './task';
export * from './apiEnum';
+export * from './enterpriseEmployee';
--
Gitblit v1.9.1