From dea5820ad3ba037b674a750753755588bc25b56c Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 13 八月 2025 14:46:03 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/bMiniApp/src/subpackages/task/batchTaskList/InnerPage.vue | 53 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 30 insertions(+), 23 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/task/batchTaskList/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/batchTaskList/InnerPage.vue
index ae81c7c..9793c3d 100644
--- a/apps/bMiniApp/src/subpackages/task/batchTaskList/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/task/batchTaskList/InnerPage.vue
@@ -1,5 +1,5 @@
<template>
- <div class="searchbar-container">
+ <div class="searchbar-container" v-if="showQueryState">
<BlSearchbar
v-model.trim="searchValue"
placeholder="鎼滅储濮撳悕/韬唤璇佸彿"
@@ -11,15 +11,17 @@
<template #renderItem="{ item }">
<FlexJobCard
:name="item.name"
- :genderType="item.genderType"
+ :gender="item.gender"
:age="item.age"
- :educationalLevel="item.educationalLevel"
- :arrangeCount="item.arrangeCount"
+ :educationalBackgroundContent="item.educationalBackgroundContent"
+ :taskCount="item.taskCount"
:showFooterLeft="false"
>
<template #footerRight>
- <nut-button type="primary" @click="handleArrange(item)">瀹夋帓</nut-button>
- <!-- <div class="batch-task-card-status">宸插畨鎺�</div> -->
+ <nut-button v-if="showQueryState" type="primary" @click="handleArrange(item)"
+ >瀹夋帓</nut-button
+ >
+ <div v-else class="batch-task-card-status">宸插畨鎺�</div>
</template>
</FlexJobCard>
</template>
@@ -29,8 +31,8 @@
<script setup lang="ts">
import Taro from '@tarojs/taro';
import { useInfiniteLoading } from '@12333/hooks';
-import { OrderInputType } from '@12333/constants';
-import * as flexWorkerServices from '@12333/services/api/FlexWorker';
+import { EnumTaskUserArrangeStatus, EnumPagedListOrder } from '@12333/constants';
+import * as taskUserServices from '@12333/services/apiV2/taskUser';
import _ from 'lodash';
import { Message, trim } from '@12333/utils';
import { FlexJobCard } from '@12333/components';
@@ -41,44 +43,49 @@
const searchValue = ref('');
const router = Taro.useRouter();
-const taskId = router.params?.taskId ?? '';
+const id = router.params?.id ?? '';
+const status = Number(router.params?.status);
const queryState = reactive({
- searchValueTrim: '',
+ keywords: '',
+});
+
+const showQueryState = computed(() => {
+ return status === EnumTaskUserArrangeStatus.Wait;
});
const handleSearch = _.debounce(function () {
- queryState.searchValueTrim = trim(searchValue.value);
+ queryState.keywords = trim(searchValue.value);
}, 300);
const { infiniteLoadingProps, invalidateQueries } = useInfiniteLoading(
({ pageParam }) => {
- let params: API.GetFlexTaskWorkerArrangeListInput = {
- searchKeys: queryState.searchValueTrim,
- flexTaskId: taskId,
+ let params: API.GetArrangeTaskUsersQuery = {
+ keywords: queryState.keywords,
+ arrangeStatus: status,
+ id: id,
pageModel: {
rows: 20,
page: pageParam,
- orderInput: [{ property: 'lastShelfTime', order: OrderInputType.Desc }],
+ orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
},
};
- return flexWorkerServices.getFlexTaskWorkerArrangeList(params, {
+ return taskUserServices.getArrangeTaskUsers(params, {
showLoading: false,
});
},
{
- queryKey: ['flexWorkerServices/getFlexTaskWorkerArrangeList', queryState],
+ queryKey: ['taskUserServices/getArrangeTaskUsers', queryState],
}
);
-async function handleArrange(item: API.GetNewestWorkerListOutput) {
+async function handleArrange(item: API.GetArrangeTaskUsersQueryResultItem) {
try {
- let params: API.TaskWorkerArrangeInput = {
- flexTaskId: taskId,
- flexWorkerId: item.userId,
- arrange: true,
+ let params: API.SetTaskUserArrangeCommand = {
+ id: item.id,
+ arrangeStatus: EnumTaskUserArrangeStatus.Complete,
};
- let res = await flexWorkerServices.taskWorkerArrange(params);
+ let res = await taskUserServices.setTaskUserArrange(params);
if (res) {
Message.success('宸插畨鎺�');
invalidateQueries();
--
Gitblit v1.9.1