From 0cd05cf1adc6574a25810ffab748c8defe283e1e Mon Sep 17 00:00:00 2001 From: wupengfei <834520024@qq.com> Date: 星期二, 12 八月 2025 17:43:23 +0800 Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp --- apps/bMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue | 58 ++++++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 40 insertions(+), 18 deletions(-) diff --git a/apps/bMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue b/apps/bMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue index 6bc6b6b..3f72bab 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,18 +8,30 @@ title-gutter="12" title-scroll > - <ProTabPane :title="`宸茬绾" :pane-key="TaskStatus.All"></ProTabPane> - <ProTabPane :title="`寰呯绾" :pane-key="TaskStatus.WaitSign"></ProTabPane> - <ProTabPane :title="`宸茶В绾" :pane-key="TaskStatus.Effect"></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.userSignContractStatus" > <template #renderItem="{ item }"> - <FlexJobCard :show-done-detail="false" :show-footer-left="false" @click="goDetail(item)"> + <FlexJobCard + :show-done-detail="false" + :show-footer-left="false" + :name="item.name" + :gender="item.gender" + :age="item.age" + :isReal="item.userIsReal" + @click="goDetail(item)" + > <template #footerRight> - <template v-if="Number(queryState.mineHireType) === TaskStatus.All"> + <span></span> + <!-- <template + v-if="queryState.userSignContractStatus === EnumTaskUserSignContractStatus.Pass" + > <nut-button class="flexJobManage-card-plain-button" type="default" @@ -29,7 +41,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> @@ -40,9 +57,12 @@ import { FlexJobCard, ProTabs, ProTabPane } from '@12333/components'; import { RouterPath } from '@/constants'; import { useInfiniteLoading } from '@12333/hooks'; -import { OrderInputType } from '@12333/constants'; -import * as orderServices from '@12333/services/api/Order'; -import { TaskStatus } from '@/constants/task'; +import { + EnumTaskUserHireStatus, + EnumTaskUserSignContractStatus, + EnumPagedListOrder, +} from '@12333/constants'; +import * as enterpriseEmployeeServices from '@12333/services/apiV2/enterpriseEmployee'; import Taro from '@tarojs/taro'; defineOptions({ @@ -50,37 +70,39 @@ }); const queryState = reactive({ - mineHireType: TaskStatus.All, + userSignContractStatus: EnumTaskUserSignContractStatus.Pass, }); const { infiniteLoadingProps } = useInfiniteLoading( ({ pageParam }) => { - let params: API.FrontOrderListInput = { + let params: API.GetEnterpriseEmployeesQuery = { pageModel: { rows: 20, page: pageParam, - orderInput: [{ property: 'isRecommend', order: OrderInputType.Desc }], + orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }], }, + hireStatus: EnumTaskUserHireStatus.Pass, + userSignContractStatus: queryState.userSignContractStatus, }; - return orderServices.getFrontOrderList(params, { + return enterpriseEmployeeServices.getEnterpriseEmployees(params, { showLoading: false, }); }, { - queryKey: ['orderServices/getFrontOrderList'], + queryKey: ['enterpriseEmployeeServices/getEnterpriseEmployees', queryState], } ); -function goDetail(item: API.FrontOrderList) { +function goDetail(item: API.GetEnterpriseEmployeesQueryResultItem) { Taro.navigateTo({ - url: `${RouterPath.flexJobDetailFromManage}?id=${item.id}`, + url: `${RouterPath.flexJobDetailFromManage}?userId=${item.id}`, }); } function checkContract() {} function handleUnContract() {} -function goSignContract(item: API.FrontOrderList) { +function goSignContract(item: API.GetNewestWorkerListOutput) { Taro.navigateTo({ url: `${RouterPath.flexJobSign}`, }); -- Gitblit v1.9.1