From f8e2cf155c7385c4c412e4b3c0eee2ea8070c693 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期四, 14 八月 2025 13:25:28 +0800
Subject: [PATCH] feat: 接口对接

---
 apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue |   82 ++++++++++++++++++++++++++---------------
 1 files changed, 52 insertions(+), 30 deletions(-)

diff --git a/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue
index 9944fd9..a06d11c 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,21 +28,24 @@
         :createdTime="item.createdTime"
         :serviceFee="item.serviceFee"
         :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>
@@ -49,35 +55,51 @@
 <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 notCount = computed(() => {
-  return infiniteLoadingProps.value?.listData?.pages?.[0]?.objectData?.notCount ?? 0;
+const { queryMenuState, infiniteLoadingProps } = useTaskList({
+  defaultQueryMenuState: {
+    status: EnumTaskStatus.Wait,
+  },
 });
 
-function goSubmitTaskDetail(item: API.GetTaskInfosQueryResultItem) {
-  Taro.navigateTo({
-    url: `${RouterPath.flexJobDetail}?taskId=${item.id}`,
-  });
-}
+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 goBatchTaskList(item: API.GetTaskInfosQueryResultItem, status: string) {
+//鏈夐棶棰�
+// function goSubmitTaskDetail(item: API.GetTaskInfosQueryResultItem) {
+//   Taro.navigateTo({
+//     url: `${RouterPath.taskManage}?taskId=${item.id}`,
+//   });
+// }
+
+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