From f961c2725562b736f34d2d70844a7f52e0c4310b Mon Sep 17 00:00:00 2001
From: zhouxiaoan <13598091228@139.com>
Date: Fri, 19 Apr 2024 10:48:05 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=8C=E5=96=84taskindex=E5=8F=96?=
 =?UTF-8?q?=E5=80=BC=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/task/aside/TaskList.vue   | 10 +++++++---
 src/views/task/content/Content.vue  |  3 +--
 src/views/task/modal/BatchModal.vue |  3 ++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/views/task/aside/TaskList.vue b/src/views/task/aside/TaskList.vue
index 72ca637..e4bf28a 100644
--- a/src/views/task/aside/TaskList.vue
+++ b/src/views/task/aside/TaskList.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { useInfiniteScroll } from "@vueuse/core";
-import { defineProps, onMounted, onUnmounted, reactive, ref, watch } from "vue";
+import { defineProps, nextTick, onMounted, onUnmounted, reactive, ref, watch } from "vue";
 import ListItem from "./ListItem.vue";
 import emitter from "@/utils/mitt";
 import { useTaskStore } from "@/store/modules/task";
@@ -77,8 +77,12 @@ async function fetchList() {
 watch(
   () => taskStore.activeId,
   (newVal) => {
-    activeId.value = newVal;
-    taskIndex.value = taskStore.getApprovalList.find(i => i.id === newVal)?.taskIndex
+    activeId.value = newVal
+    nextTick(() => {
+      const taskPackage = taskStore.getApprovalList[taskStore.getCurrentIndex]||{}
+      taskIndex.value = taskPackage.taskIndex
+
+    })
   },
 );
 
diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index 35ae621..d334675 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -517,8 +517,7 @@ watch(
       packageId.value = taskStore.getPackageid
       taskId.value = taskStore.getActiveId
       // 找到当前选中的数据
-      const task = taskStore.getApprovalList.find(i => i.id === taskStore.activeId)
-      taskIndex.value = task.taskIndex
+      taskIndex.value = taskStore.getApprovalList[taskStore.currentIndex].taskIndex
       getDetail()
     }
   },
diff --git a/src/views/task/modal/BatchModal.vue b/src/views/task/modal/BatchModal.vue
index 27ab9ad..a433950 100644
--- a/src/views/task/modal/BatchModal.vue
+++ b/src/views/task/modal/BatchModal.vue
@@ -346,7 +346,8 @@ async function refreshHandler() {
   reset()
   if (!taskId.value)
     return
-  taskDetailInfo.value = await getTaskDetailInfo(taskId.value, '')
+  const taskPackage = taskStore.getApprovalList[taskStore.getCurrentIndex] || {}
+  taskDetailInfo.value = await getTaskDetailInfo(taskId.value, taskPackage.packageid,taskPackage?.taskIndex || '')
 
   nextTick(() => {
     setTimeout(() => {