From b3dc565fe8a341bdb069b8f0feb912cd751a589f Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期四, 14 八月 2025 09:12:27 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue | 39 +++++++++++++++++++++++++--------------
1 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue
index c4d5852..0dcd380 100644
--- a/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue
@@ -28,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>
@@ -52,14 +53,23 @@
<script setup lang="ts">
import { JobApplicationCard, ProTabs, ProTabPane } from '@12333/components';
import Taro from '@tarojs/taro';
-import { EnumTaskStatus, BillingMethodEnumUnit, Colors } from '@12333/constants';
+import {
+ EnumTaskStatus,
+ BillingMethodEnumUnit,
+ Colors,
+ EnumTaskUserArrangeStatus,
+} from '@12333/constants';
import { useTaskList } from '@12333/hooks';
defineOptions({
name: 'InnerPage',
});
-const { queryMenuState, infiniteLoadingProps } = useTaskList();
+const { queryMenuState, infiniteLoadingProps } = useTaskList({
+ defaultQueryMenuState: {
+ status: EnumTaskStatus.Wait,
+ },
+});
const completedAssignCount = computed(() => {
return infiniteLoadingProps.value?.listData?.pages?.[0]?.objectData?.completedAssignCount ?? 0;
@@ -68,15 +78,16 @@
return infiniteLoadingProps.value?.listData?.pages?.[0]?.objectData?.waitAssignCount ?? 0;
});
-function goSubmitTaskDetail(item: API.GetTaskInfosQueryResultItem) {
- Taro.navigateTo({
- url: `${RouterPath.flexJobDetail}?taskId=${item.id}`,
- });
-}
+//鏈夐棶棰�
+// function goSubmitTaskDetail(item: API.GetTaskInfosQueryResultItem) {
+// Taro.navigateTo({
+// url: `${RouterPath.taskManage}?taskId=${item.id}`,
+// });
+// }
-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