From 12f08c16ee7c7176368b5961fe104ed698227a8d Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期四, 11 九月 2025 17:41:50 +0800
Subject: [PATCH] Merge branch 'master' into dev-v1.1
---
apps/bMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue | 44 +++++++++++++++++++++++++++++++-------------
1 files changed, 31 insertions(+), 13 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue b/apps/bMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue
index 9b371ce..601974b 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.userSignContractStatus"
+ v-model="queryState.status"
name="home-tab"
:showPaneContent="false"
class="home-tabs"
@@ -8,14 +8,15 @@
title-gutter="12"
title-scroll
>
- <ProTabPane :title="`宸茬绾" :pane-key="EnumTaskUserSignContractStatus.Pass"></ProTabPane>
- <ProTabPane :title="`寰呯绾" :pane-key="EnumTaskUserSignContractStatus.Wait"></ProTabPane>
- <ProTabPane :title="`宸茶В绾" :pane-key="EnumTaskUserSignContractStatus.Stop"></ProTabPane>
+ <ProTabPane :title="`鐏靛伐寰呯绾" :pane-key="Status.FlexJobWait"></ProTabPane>
+ <ProTabPane :title="`浼佷笟寰呯绾" :pane-key="Status.EnterpriseWait"></ProTabPane>
+ <ProTabPane :title="`宸茬绾" :pane-key="Status.Pass"></ProTabPane>
+ <!-- <ProTabPane :title="`宸茶В绾" :pane-key="EnumTaskUserSignContractStatus.Stop"></ProTabPane> -->
</ProTabs>
<InfiniteLoading
scrollViewClassName="common-infinite-scroll-list home-list"
v-bind="infiniteLoadingProps"
- :key="queryState.userSignContractStatus"
+ :key="queryState.status"
>
<template #renderItem="{ item }">
<FlexJobCard
@@ -35,7 +36,7 @@
>
<template #footerRight>
<template
- v-if="Number(queryState.userSignContractStatus) === EnumTaskUserSignContractStatus.Pass"
+ v-if="item.enterpriseSignContractStatus === EnumTaskUserSignContractStatus.Pass"
>
<nut-button
class="flexJobManage-card-plain-button"
@@ -47,13 +48,16 @@
<nut-button type="primary" @click.stop="checkContract(item)">鏌ョ湅鍚堢害</nut-button>
</template>
<nut-button
- v-else-if="
- Number(queryState.userSignContractStatus) === EnumTaskUserSignContractStatus.Wait ||
- Number(queryState.userSignContractStatus) === EnumTaskUserSignContractStatus.Stop
- "
+ v-if="item.userSignContractStatus === EnumTaskUserSignContractStatus.Wait"
type="primary"
@click.stop="goFlexJobSign(item)"
- >绛剧害</nut-button
+ >閭�璇风绾�</nut-button
+ >
+ <nut-button
+ v-if="item.enterpriseSignContractStatus === EnumTaskUserSignContractStatus.Wait"
+ type="primary"
+ @click.stop="goFlexJobSign(item)"
+ >浼佷笟绛剧害</nut-button
>
</template>
</FlexJobCard>
@@ -78,8 +82,14 @@
name: 'InnerPage',
});
+const enum Status {
+ FlexJobWait = 1,
+ EnterpriseWait = 2,
+ Pass = 3,
+}
+
const queryState = reactive({
- userSignContractStatus: EnumTaskUserSignContractStatus.Pass,
+ status: Status.FlexJobWait,
});
const { infiniteLoadingProps, invalidateQueries } = useInfiniteLoading(
@@ -91,8 +101,16 @@
orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
},
hireStatus: EnumTaskUserHireStatus.Pass,
- userSignContractStatus: queryState.userSignContractStatus,
};
+ if (Number(queryState.status) === Status.FlexJobWait) {
+ params.userSignContractStatus = EnumTaskUserSignContractStatus.Wait;
+ }
+ if (Number(queryState.status) === Status.EnterpriseWait) {
+ params.enterpriseSignContractStatus = EnumTaskUserSignContractStatus.Wait;
+ }
+ if (Number(queryState.status) === Status.Pass) {
+ params.userSignContractStatus = EnumTaskUserSignContractStatus.Pass;
+ }
return enterpriseEmployeeServices.getEnterpriseEmployees(params, {
showLoading: false,
--
Gitblit v1.9.1