From 354fa08d53f4cd97014bfb0008c8c5f0326bbdd3 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 11 八月 2025 09:38:35 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/bMiniApp/src/subpackages/jobApplicationManage/jobApplicationManage/InnerPage.vue | 99 +++++++++++++++++--------------------------------
1 files changed, 35 insertions(+), 64 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/jobApplicationManage/jobApplicationManage/InnerPage.vue b/apps/bMiniApp/src/subpackages/jobApplicationManage/jobApplicationManage/InnerPage.vue
index a29d411..11a4540 100644
--- a/apps/bMiniApp/src/subpackages/jobApplicationManage/jobApplicationManage/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/jobApplicationManage/jobApplicationManage/InnerPage.vue
@@ -1,6 +1,6 @@
<template>
<ProTabs
- v-model="queryState.flexTaskReleaseStatus"
+ v-model="queryMenuState.releaseStatus"
name="home-tab"
:showPaneContent="false"
class="home-tabs"
@@ -9,37 +9,35 @@
title-scroll
>
<ProTabPane
- :title="`${
- FlexTaskReleaseStatusEnumText[FlexTaskReleaseStatusEnum.Releasing]
- }(${releaseing})`"
- :pane-key="FlexTaskReleaseStatusEnum.Releasing"
+ :title="`鍙戝竷涓�(${releaseing})`"
+ :pane-key="EnumTaskReleaseStatus.InProcess"
></ProTabPane>
<ProTabPane
- :title="`${FlexTaskReleaseStatusEnumText[FlexTaskReleaseStatusEnum.Stoping]}(${stoping})`"
- :pane-key="FlexTaskReleaseStatusEnum.Stoping"
+ :title="`宸插仠姝�(${stoping})`"
+ :pane-key="EnumTaskReleaseStatus.Stopped"
></ProTabPane>
</ProTabs>
<InfiniteLoading
scrollViewClassName="common-infinite-scroll-list home-list"
v-bind="infiniteLoadingProps"
- :key="queryState.flexTaskReleaseStatus"
+ :key="queryMenuState.releaseStatus"
>
<template #renderItem="{ item }">
<JobApplicationCard
- :taskName="item.taskName"
- :startDate="item.startDate"
- :endDate="item.endDate"
- :creationTime="item.creationTime"
- :address="item.address"
- :fee="item.fee"
- :applyWorkerCount="item.applyWorkerCount"
- :unit="SalaryTimeTypeEnumUnit[item.feeType]"
+ :name="item.name"
+ :beginTime="item.beginTime"
+ :endTime="item.endTime"
+ :createdTime="item.createdTime"
+ :addressName="item.addressName"
+ :serviceFee="item.serviceFee"
+ :userCount="item.userCount"
+ :unit="BillingMethodEnumUnit[item.billingMethod]"
:releaseStatus="item.releaseStatus"
@edit="goEdit(item)"
@copy="goEdit(item, true)"
@detail="goDetail(item)"
- @publish="handleChangeStatus(item, FlexTaskReleaseStatusEnum.Releasing)"
- @stop="handleChangeStatus(item, FlexTaskReleaseStatusEnum.Stoping)"
+ @publish="handleChangeStatus(item, EnumTaskReleaseStatus.InProcess)"
+ @stop="handleChangeStatus(item, EnumTaskReleaseStatus.Stopped)"
@delete="handleDelete(item)"
>
</JobApplicationCard>
@@ -50,62 +48,35 @@
<script setup lang="ts">
import { JobApplicationCard, ProTabs, ProTabPane } from '@12333/components';
import { RouterPath } from '@/constants';
-import { useInfiniteLoading } from '@12333/hooks';
-import { OrderInputType } from '@12333/constants';
-import {
- FlexTaskReleaseStatusEnum,
- FlexTaskReleaseStatusEnumText,
- SalaryTimeTypeEnumUnit,
-} from '@12333/constants/task';
-import * as flexWorkerServices from '@12333/services/api/FlexWorker';
+import { EnumTaskReleaseStatus, BillingMethodEnumUnit } from '@12333/constants';
import Taro from '@tarojs/taro';
import { Message } from '@12333/utils';
+import * as taskServices from '@12333/services/apiV2/task';
+import { useTaskList } from '@12333/hooks';
defineOptions({
name: 'InnerPage',
});
-const queryState = reactive({
- flexTaskReleaseStatus: FlexTaskReleaseStatusEnum.Releasing,
-});
-
-const { infiniteLoadingProps, invalidateQueries } = useInfiniteLoading(
- ({ pageParam }) => {
- let params: API.GetFlexTaskListByStatusInput = {
- releaseStatus: queryState.flexTaskReleaseStatus,
- pageModel: {
- rows: 20,
- page: pageParam,
- orderInput: [{ property: 'creationTime', order: OrderInputType.Desc }],
- },
- };
-
- return flexWorkerServices.getFlexTaskList(params, {
- showLoading: false,
- });
- },
- {
- queryKey: ['flexWorkerServices/getFlexTaskList', queryState],
- }
-);
+const { queryMenuState, infiniteLoadingProps, invalidateQueries } = useTaskList();
const releaseing = computed(() => {
- return infiniteLoadingProps.value?.listData?.pages?.[0]?.objectData?.releaseing ?? 0;
+ return infiniteLoadingProps.value?.listData?.pages?.[0]?.objectData?.inProcessReleaseCount ?? 0;
});
const stoping = computed(() => {
- return infiniteLoadingProps.value?.listData?.pages?.[0]?.objectData?.stoping ?? 0;
+ return infiniteLoadingProps.value?.listData?.pages?.[0]?.objectData?.stoppedReleaseCount ?? 0;
});
async function handleChangeStatus(
- item: API.GetFlexTaskListOutput,
- releaseStatus: FlexTaskReleaseStatusEnum
+ item: API.GetTaskInfosQueryResultItem,
+ releaseStatus: EnumTaskReleaseStatus
) {
try {
- let params: API.UpdateTaskReleaseStatusInput = {
- taskId: item.taskId,
+ let params: API.SetTaskInfoReleaseStatusCommand = {
+ ids: [item.id],
releaseStatus: releaseStatus,
};
- let res = await flexWorkerServices.updateFlexTaskReleaseStatus(params);
+ let res = await taskServices.setTaskInfoReleaseStatus(params);
if (res) {
Message.success('鎿嶄綔鎴愬姛');
invalidateQueries();
@@ -113,15 +84,15 @@
} catch (error) {}
}
-async function handleDelete(item: API.GetFlexTaskListOutput) {
+async function handleDelete(item: API.GetTaskInfosQueryResultItem) {
try {
await Message.confirm({
message: '纭畾瑕佸垹闄ゅ悧锛�',
});
- let params: API.APIdeleteFlexTaskParams = {
- id: item.taskId,
+ let params: API.DeleteTaskInfoCommand = {
+ ids: [item.id],
};
- let res = await flexWorkerServices.deleteFlexTask(params);
+ let res = await taskServices.deleteTaskInfo(params);
if (res) {
Message.success('鍒犻櫎鎴愬姛');
invalidateQueries();
@@ -129,14 +100,14 @@
} catch (error) {}
}
-function goEdit(item: API.GetFlexTaskListOutput, isCopy = false) {
+function goEdit(item: API.GetTaskInfosQueryResultItem, isCopy = false) {
Taro.navigateTo({
- url: `${RouterPath.publishTask}?taskId=${item.taskId}&isCopy=${isCopy}`,
+ url: `${RouterPath.publishTask}?taskId=${item.id}&isCopy=${isCopy}`,
});
}
-function goDetail(item: API.GetFlexTaskListOutput) {
+function goDetail(item: API.GetTaskInfosQueryResultItem) {
Taro.navigateTo({
- url: `${RouterPath.jobApplicationDetail}?taskId=${item.taskId}`,
+ url: `${RouterPath.jobApplicationDetail}?taskId=${item.id}`,
});
}
</script>
--
Gitblit v1.9.1