From 628c4a44f13a3f3670b1a23b8e6d55bf153e5b31 Mon Sep 17 00:00:00 2001
From: zhouxiaoan <13598091228@139.com>
Date: Thu, 18 Apr 2024 17:40:48 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E5=AE=A1=E6=89=B9=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=A2=9E=E5=8A=A0taskindex=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/task/aside/TaskList.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/task/aside/TaskList.vue b/src/views/task/aside/TaskList.vue
index 9575e57..ed8bcda 100644
--- a/src/views/task/aside/TaskList.vue
+++ b/src/views/task/aside/TaskList.vue
@@ -14,6 +14,7 @@ defineProps({
 const taskStore = useTaskStore();
 const data = ref<any[]>([]);
 const activeId = ref("");
+const taskIndex = ref("")
 const el = ref<HTMLDivElement | null>(null);
 const keyword = ref("");
 const canloadMore = ref(true);
@@ -27,6 +28,7 @@ const pagination = reactive({
 
 function selectHandler(item, index: number) {
   activeId.value = item.id;
+  taskIndex.value = item.taskIndex
   console.log(activeId.value, item.id);
   console.log(index);
   taskStore.setActive(index, item.id);
@@ -136,6 +138,7 @@ onMounted(() => {
     searchId.value = id;
     data.value = await fetchList();
     activeId.value = data.value[0]?.id;
+    taskIndex.value = data.value[0]?.taskIndex
     console.log(data.value);
   });
 });
@@ -166,7 +169,7 @@ defineExpose({
         v-for="(item, index) in data"
         :key="item.id"
         :show-field-list="showFieldList"
-        :selected="activeId === item.id"
+        :selected="`${activeId}_${taskIndex}` === `${item.id}_${item.taskIndex}`"
         :list-item="item"
         @click="selectHandler(item, index)"
       />

From b675eb3611bf26acece31e5cbcedada961f73a34 Mon Sep 17 00:00:00 2001
From: zhouxiaoan <13598091228@139.com>
Date: Thu, 18 Apr 2024 17:45:32 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E5=AE=A1=E6=89=B9=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=A2=9E=E5=8A=A0taskindex=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/task/aside/TaskList.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/task/aside/TaskList.vue b/src/views/task/aside/TaskList.vue
index ed8bcda..72ca637 100644
--- a/src/views/task/aside/TaskList.vue
+++ b/src/views/task/aside/TaskList.vue
@@ -78,6 +78,7 @@ watch(
   () => taskStore.activeId,
   (newVal) => {
     activeId.value = newVal;
+    taskIndex.value = taskStore.getApprovalList.find(i => i.id === newVal)?.taskIndex
   },
 );
 
@@ -96,6 +97,7 @@ watch(
     });
     data.value = newlist;
     activeId.value = newlist[index].id;
+    taskIndex.value = newlist[index]?.taskIndex
 
     taskStore.setActive(index, newlist[index].id);
     // taskStore.setActive(index)