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/taskManage/InnerPage.vue | 47 ++++++++++++++++++++++++++++++-----------------
1 files changed, 30 insertions(+), 17 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue
index 9944fd9..3a2e09d 100644
--- a/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue
@@ -8,8 +8,11 @@
title-gutter="8"
title-scroll
>
- <ProTabPane :title="`寰呭畨鎺�(${notCount})`" :pane-key="EnumTaskStatus.Wait"></ProTabPane>
- <ProTabPane :title="`宸插畨鎺�(${hasCount})`" :pane-key="EnumTaskStatus.Complete"></ProTabPane>
+ <ProTabPane :title="`寰呭畨鎺�(${waitAssignCount})`" :pane-key="EnumTaskStatus.Wait"></ProTabPane>
+ <ProTabPane
+ :title="`宸插畨鎺�(${completedAssignCount})`"
+ :pane-key="EnumTaskStatus.Complete"
+ ></ProTabPane>
</ProTabs>
<InfiniteLoading
scrollViewClassName="common-infinite-scroll-list"
@@ -25,20 +28,21 @@
:createdTime="item.createdTime"
:serviceFee="item.serviceFee"
:unit="BillingMethodEnumUnit[item.billingMethod]"
- @click="goSubmitTaskDetail(item)"
mode="taskManage"
>
<template #footer-actions>
+ <nut-button
+ type="primary"
+ @click.stop="goBatchTaskList(item, EnumTaskUserArrangeStatus.Wait)"
+ >浜哄憳瀹夋帓</nut-button
+ >
<nut-button
v-if="item.status === EnumTaskStatus.Complete"
type="primary"
:color="Colors.Info"
class="dark-btn"
- @click.stop="goBatchTaskList(item, 'detail')"
+ @click.stop="goBatchTaskList(item, EnumTaskUserArrangeStatus.Complete)"
>璇︽儏</nut-button
- >
- <nut-button type="primary" v-else @click.stop="goBatchTaskList(item, 'arrange')"
- >浜哄憳瀹夋帓</nut-button
>
</template>
</JobApplicationCard>
@@ -49,20 +53,29 @@
<script setup lang="ts">
import { JobApplicationCard, ProTabs, ProTabPane } from '@12333/components';
import Taro from '@tarojs/taro';
-import { EnumTaskStatus, BillingMethodEnumUnit, Colors } from '@12333/constants';
-import { useTaskList } from '@/hooks/task';
+import {
+ EnumTaskStatus,
+ BillingMethodEnumUnit,
+ Colors,
+ EnumTaskUserArrangeStatus,
+} from '@12333/constants';
+import { useTaskList } from '@12333/hooks';
defineOptions({
name: 'InnerPage',
});
-const { queryMenuState, infiniteLoadingProps } = useTaskList();
-
-const hasCount = computed(() => {
- return infiniteLoadingProps.value?.listData?.pages?.[0]?.objectData?.hasCount ?? 0;
+const { queryMenuState, infiniteLoadingProps } = useTaskList({
+ defaultQueryMenuState: {
+ status: EnumTaskStatus.Wait,
+ },
});
-const notCount = computed(() => {
- return infiniteLoadingProps.value?.listData?.pages?.[0]?.objectData?.notCount ?? 0;
+
+const completedAssignCount = computed(() => {
+ return infiniteLoadingProps.value?.listData?.pages?.[0]?.objectData?.completedAssignCount ?? 0;
+});
+const waitAssignCount = computed(() => {
+ return infiniteLoadingProps.value?.listData?.pages?.[0]?.objectData?.waitAssignCount ?? 0;
});
function goSubmitTaskDetail(item: API.GetTaskInfosQueryResultItem) {
@@ -71,9 +84,9 @@
});
}
-function goBatchTaskList(item: API.GetTaskInfosQueryResultItem, status: string) {
+function goBatchTaskList(item: API.GetTaskInfosQueryResultItem, status: EnumTaskUserArrangeStatus) {
Taro.navigateTo({
- url: `${RouterPath.batchTaskList}?taskId=${item.id}&detail=${status}`,
+ url: `${RouterPath.batchTaskList}?id=${item.id}&status=${status}`,
});
}
</script>
--
Gitblit v1.9.1