From 5694090781fb8badc7ab31d9a4a38de1856d5eda Mon Sep 17 00:00:00 2001 From: wupengfei <834520024@qq.com> Date: 星期五, 08 八月 2025 16:30:54 +0800 Subject: [PATCH] feat: 接口对接 --- apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue | 62 +++++++++--------------------- 1 files changed, 19 insertions(+), 43 deletions(-) diff --git a/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue index dd4535c..9944fd9 100644 --- a/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue +++ b/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue @@ -1,6 +1,6 @@ <template> <ProTabs - v-model="queryState.status" + v-model="queryMenuState.status" name="task-tab" :showPaneContent="false" class="task-tabs" @@ -8,29 +8,29 @@ title-gutter="8" title-scroll > - <ProTabPane :title="`寰呭畨鎺�(${notCount})`" pane-key="10"></ProTabPane> - <ProTabPane :title="`宸插畨鎺�(${hasCount})`" pane-key="20"></ProTabPane> + <ProTabPane :title="`寰呭畨鎺�(${notCount})`" :pane-key="EnumTaskStatus.Wait"></ProTabPane> + <ProTabPane :title="`宸插畨鎺�(${hasCount})`" :pane-key="EnumTaskStatus.Complete"></ProTabPane> </ProTabs> <InfiniteLoading scrollViewClassName="common-infinite-scroll-list" v-bind="infiniteLoadingProps" - :key="queryState.status" + :key="queryMenuState.status" > <template #renderItem="{ item }"> <JobApplicationCard - :taskName="item.taskName" - :startDate="item.startDate" - :endDate="item.endDate" - :address="item.address" - :creationTime="item.creationTime" - :fee="item.fee" - :unit="SalaryTimeTypeEnumUnit[item.feeType]" + :name="item.name" + :beginTime="item.beginTime" + :endTime="item.endTime" + :addressName="item.addressName" + :createdTime="item.createdTime" + :serviceFee="item.serviceFee" + :unit="BillingMethodEnumUnit[item.billingMethod]" @click="goSubmitTaskDetail(item)" mode="taskManage" > <template #footer-actions> <nut-button - v-if="item.isArrange" + v-if="item.status === EnumTaskStatus.Complete" type="primary" :color="Colors.Info" class="dark-btn" @@ -49,38 +49,14 @@ <script setup lang="ts"> import { JobApplicationCard, ProTabs, ProTabPane } from '@12333/components'; import Taro from '@tarojs/taro'; -import { useInfiniteLoading } from '@12333/hooks'; -import { OrderInputType, Colors } from '@12333/constants'; -import * as flexWorkerServices from '@12333/services/api/FlexWorker'; -import { SalaryTimeTypeEnumUnit } from '@12333/constants/task'; +import { EnumTaskStatus, BillingMethodEnumUnit, Colors } from '@12333/constants'; +import { useTaskList } from '@/hooks/task'; defineOptions({ name: 'InnerPage', }); -const queryState = reactive({ - status: '10', -}); - -const { infiniteLoadingProps } = useInfiniteLoading( - ({ pageParam }) => { - let params: API.GetFlexTaskListInput = { - isArrange: queryState.status === '20', - pageModel: { - rows: 20, - page: pageParam, - orderInput: [{ property: 'creationTime', order: OrderInputType.Desc }], - }, - }; - - return flexWorkerServices.getFlexTaskByArrange(params, { - showLoading: false, - }); - }, - { - queryKey: ['flexWorkerServices/getFlexTaskByArrange', queryState], - } -); +const { queryMenuState, infiniteLoadingProps } = useTaskList(); const hasCount = computed(() => { return infiniteLoadingProps.value?.listData?.pages?.[0]?.objectData?.hasCount ?? 0; @@ -89,15 +65,15 @@ return infiniteLoadingProps.value?.listData?.pages?.[0]?.objectData?.notCount ?? 0; }); -function goSubmitTaskDetail(item: API.GetFlexTaskListOutput) { +function goSubmitTaskDetail(item: API.GetTaskInfosQueryResultItem) { Taro.navigateTo({ - url: `${RouterPath.flexJobDetail}?taskId=${item.taskId}`, + url: `${RouterPath.flexJobDetail}?taskId=${item.id}`, }); } -function goBatchTaskList(item: API.GetFlexTaskListOutput, status: string) { +function goBatchTaskList(item: API.GetTaskInfosQueryResultItem, status: string) { Taro.navigateTo({ - url: `${RouterPath.batchTaskList}?taskId=${item.taskId}&detail=${status}`, + url: `${RouterPath.batchTaskList}?taskId=${item.id}&detail=${status}`, }); } </script> -- Gitblit v1.9.1