From 9752b78da2f4afba58955b7c46a2700f72c8ab34 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期日, 19 十月 2025 14:39:29 +0800
Subject: [PATCH] Merge branch 'dev-1.2.0.1' of http://120.26.58.240:8888/r/flexJobMiniApp into dev-1.2.0.1
---
apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue | 62 ++++++++++++++++++++----------
1 files changed, 41 insertions(+), 21 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue
index c4d5852..befd943 100644
--- a/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue
@@ -27,22 +27,26 @@
:addressName="item.addressName"
:createdTime="item.createdTime"
:serviceFee="item.serviceFee"
+ :status="item.status"
:unit="BillingMethodEnumUnit[item.billingMethod]"
- @click="goSubmitTaskDetail(item)"
mode="taskManage"
>
<template #footer-actions>
- <nut-button
- v-if="item.status === EnumTaskStatus.Complete"
- type="primary"
- :color="Colors.Info"
- class="dark-btn"
- @click.stop="goBatchTaskList(item, 'detail')"
- >璇︽儏</nut-button
- >
- <nut-button type="primary" v-else @click.stop="goBatchTaskList(item, 'arrange')"
- >浜哄憳瀹夋帓</nut-button
- >
+ <div>
+ <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, EnumTaskUserArrangeStatus.Complete)"
+ >璇︽儏</nut-button
+ >
+ </div>
</template>
</JobApplicationCard>
</template>
@@ -52,14 +56,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,19 +81,26 @@
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>
<style lang="scss">
@import '@/styles/common.scss';
+
+.taskManage-page-wrapper {
+ .dark-btn {
+ margin-left: 12px;
+ }
+}
</style>
--
Gitblit v1.9.1