From 4e63208cc64da14ea36ed606b5fe7992b2748f4e Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期二, 12 八月 2025 17:58:37 +0800 Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp --- apps/bMiniApp/src/subpackages/flexJob/flexJobDetailFromTask/InnerPage.vue | 31 +++++++++++-------------------- 1 files changed, 11 insertions(+), 20 deletions(-) diff --git a/apps/bMiniApp/src/subpackages/flexJob/flexJobDetailFromTask/InnerPage.vue b/apps/bMiniApp/src/subpackages/flexJob/flexJobDetailFromTask/InnerPage.vue index d42c8da..b239454 100644 --- a/apps/bMiniApp/src/subpackages/flexJob/flexJobDetailFromTask/InnerPage.vue +++ b/apps/bMiniApp/src/subpackages/flexJob/flexJobDetailFromTask/InnerPage.vue @@ -2,15 +2,8 @@ <LoadingLayout :loading="isLoading" :error="isError" :loadError="refetch"> <JobDetailContent :isCollapse="true"> <template #footer> - <PageFooterBtn - type="primary" - plain - @click="taskWorkerHireRefuse(FlexTaskWorkerHireEnum.Refused)" - >璋㈢粷</PageFooterBtn - > - <PageFooterBtn type="primary" @click="taskWorkerHireRefuse(FlexTaskWorkerHireEnum.Hired)" - >褰曠敤</PageFooterBtn - > + <PageFooterBtn type="primary" plain @click="taskWorkerHireRefuse(10)">璋㈢粷</PageFooterBtn> + <PageFooterBtn type="primary" @click="taskWorkerHireRefuse(20)">褰曠敤</PageFooterBtn> </template> </JobDetailContent> </LoadingLayout> @@ -19,16 +12,15 @@ <script setup lang="ts"> import Taro from '@tarojs/taro'; import { useQuery } from '@tanstack/vue-query'; -import * as flexWorkerServices from '@12333/services/api/FlexWorker'; +import * as taskUserServices from '@12333/services/apiV2/taskUser'; import { Message } from '@12333/utils'; -import { FlexTaskWorkerHireEnum } from '@12333/constants/task'; defineOptions({ name: 'InnerPage', }); const router = Taro.useRouter(); -const taskId = router.params?.id ?? ''; +const id = router.params?.id ?? ''; const { isLoading, @@ -36,26 +28,25 @@ data: detail, refetch, } = useQuery({ - queryKey: ['flexWorkerServices/getFlexTaskDto', taskId], + queryKey: ['taskServices/getTaskInfo', id], queryFn: async () => { - return await flexWorkerServices.getFlexTaskDto( - { id: taskId }, + return await taskServices.getTaskInfo( + { id: id }, { showLoading: false, } ); }, - placeholderData: () => ({} as API.GetFlexTaskDtoOutput), + placeholderData: () => ({} as API.GetTaskInfoQueryResult), }); async function taskWorkerHireRefuse(hireStatus: FlexTaskWorkerHireEnum) { try { - let params: API.TaskWorkerHireRefuseInput = { - flexTaskId: taskId, - flexWorkerId: detail.value?.taskId, + let params: API.SetTaskUserHireCommand = { + id: id, hireStatus: hireStatus, }; - let res = await flexWorkerServices.taskWorkerHireRefuse(params); + let res = await taskUserServices.setTaskUserHire(params); if (res) { Message.success('鎿嶄綔鎴愬姛'); refetch({ -- Gitblit v1.9.1