From 186234cb3833e620aa0ae46212fe337eb2d6e77d Mon Sep 17 00:00:00 2001 From: wupengfei <834520024@qq.com> Date: 星期四, 13 三月 2025 13:07:02 +0800 Subject: [PATCH] feat: 接口对接 --- apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue | 60 +++++++++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 47 insertions(+), 13 deletions(-) diff --git a/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue index 078d933..9c049a0 100644 --- a/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue +++ b/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue @@ -8,8 +8,8 @@ title-gutter="8" title-scroll > - <ProTabPane :title="`寰呭畨鎺�(10)`" :pane-key="10"></ProTabPane> - <ProTabPane :title="`宸插畨鎺�(11)`" :pane-key="20"></ProTabPane> + <ProTabPane :title="`寰呭畨鎺�(${notCount})`" pane-key="10"></ProTabPane> + <ProTabPane :title="`宸插畨鎺�(${hasCount})`" pane-key="20"></ProTabPane> </ProTabs> <InfiniteLoading scrollViewClassName="common-infinite-scroll-list" @@ -17,10 +17,29 @@ :key="queryState.status" > <template #renderItem="{ item }"> - <JobApplicationCard @click="goSubmitTaskDetail(item)" mode="taskManage"> + <JobApplicationCard + :taskName="item.taskName" + :startDate="item.startDate" + :endDate="item.endDate" + :address="item.address" + :creationTime="item.creationTime" + :fee="item.fee" + :unit="SalaryTimeTypeEnumUnit[item.feeType]" + @click="goSubmitTaskDetail(item)" + mode="taskManage" + > <template #footer-actions> - <!-- <nut-button type="primary">浜哄憳瀹夋帓</nut-button> --> - <nut-button type="primary" :color="Colors.Info" class="dark-btn">璇︽儏</nut-button> + <nut-button + v-if="item.isArrange" + type="primary" + :color="Colors.Info" + class="dark-btn" + @click.stop="goBatchTaskList(item, 'detail')" + >璇︽儏</nut-button + > + <nut-button type="primary" v-else @click.stop="goBatchTaskList(item, 'arrange')" + >浜哄憳瀹夋帓</nut-button + > </template> </JobApplicationCard> </template> @@ -32,38 +51,53 @@ import Taro from '@tarojs/taro'; import { useInfiniteLoading } from '@12333/hooks'; import { OrderInputType, Colors } from '@12333/constants'; -import * as orderServices from '@12333/services/api/Order'; +import * as flexWorkerServices from '@12333/services/api/FlexWorker'; +import { SalaryTimeTypeEnumUnit } from '@/constants/task'; defineOptions({ name: 'InnerPage', }); const queryState = reactive({ - status: 10, + status: '10', }); const { infiniteLoadingProps } = useInfiniteLoading( ({ pageParam }) => { - let params: API.FrontOrderListInput = { + let params: API.GetFlexTaskListInput = { + isArrange: queryState.status === '20', pageModel: { rows: 20, page: pageParam, - orderInput: [{ property: 'lastShelfTime', order: OrderInputType.Desc }], + orderInput: [{ property: 'creationTime', order: OrderInputType.Desc }], }, }; - return orderServices.getFrontOrderList(params, { + return flexWorkerServices.getFlexTaskByArrange(params, { showLoading: false, }); }, { - queryKey: ['orderServices/getFrontOrderList', queryState], + queryKey: ['flexWorkerServices/getFlexTaskByArrange', queryState], } ); -function goSubmitTaskDetail(item: API.FrontOrderList) { +const hasCount = computed(() => { + return infiniteLoadingProps.value?.listData?.pages?.[0]?.objectData?.hasCount ?? 0; +}); +const notCount = computed(() => { + return infiniteLoadingProps.value?.listData?.pages?.[0]?.objectData?.notCount ?? 0; +}); + +function goSubmitTaskDetail(item: API.GetFlexTaskListOutput) { Taro.navigateTo({ - url: `${RouterPath.batchTaskList}?id=${item.id}`, + url: `${RouterPath.flexJobDetail}?taskId=${item.taskId}`, + }); +} + +function goBatchTaskList(item: API.GetFlexTaskListOutput, status: string) { + Taro.navigateTo({ + url: `${RouterPath.batchTaskList}?taskId=${item.taskId}&detail=${status}`, }); } </script> -- Gitblit v1.9.1