From b641b502f4d45a289f46b923a35c4f3bd3307b66 Mon Sep 17 00:00:00 2001
From: zhouxiaoan <13598091228@139.com>
Date: Mon, 22 Apr 2024 20:56:11 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E7=BB=88=E5=AE=A1=E5=8D=A1=E7=89=87?=
 =?UTF-8?q?=E6=9C=80=E5=A4=A7=E5=8C=96=E6=8A=A5=E9=94=99=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/final/content/ListContent.vue | 2 +-
 src/views/task/modal/BatchModal.vue     | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/views/final/content/ListContent.vue b/src/views/final/content/ListContent.vue
index 90457e0..7279e19 100644
--- a/src/views/final/content/ListContent.vue
+++ b/src/views/final/content/ListContent.vue
@@ -239,7 +239,7 @@ function isValidTimestamp(value) {
 function goDetail(row) {
   router.push({
     name: 'final-detail',
-    query: { id: row.id, packageid: row.packageid, taskindex: row.taskIndexm,type:'card' },
+    query: { id: row.id, packageid: row.packageid, taskindex: row.taskNode, type:'card' },
   })
 }
 // 小结批量不通过
diff --git a/src/views/task/modal/BatchModal.vue b/src/views/task/modal/BatchModal.vue
index 0e8471d..c8c44d7 100644
--- a/src/views/task/modal/BatchModal.vue
+++ b/src/views/task/modal/BatchModal.vue
@@ -15,12 +15,13 @@ import { formatToDateHMS } from '@/utils/dateUtil'
 import { getSimilarityList, getTaskDetailInfo } from '@/api/task/task'
 import emitter from '@/utils/mitt'
 import bgLoading from '@/assets/images/bg-loading.png'
+import { useRoute } from 'vue-router'
 
 const emit = defineEmits<{
   (e: 'reject', params: any)
   (e: 'approval', params: any)
 }>()
-
+const {query} = useRoute()
 const cardStyle = {
   '--n-padding-bottom': '40px',
   '--n-padding-left': '120px',
@@ -271,6 +272,7 @@ function handleKeydown(event) {
 }
 function showModal(value) {
   taskId.value = value
+  console.log('showModal')
   refreshHandler()
   show.value = true
 }
@@ -351,7 +353,7 @@ async function refreshHandler() {
   if (!taskId.value)
     return
   const taskPackage = taskStore.getApprovalList[taskStore.getCurrentIndex] || {}
-  taskDetailInfo.value = await getTaskDetailInfo(taskId.value, taskPackage.packageid, taskPackage?.taskIndex || '')
+  taskDetailInfo.value = await getTaskDetailInfo(taskId.value, taskPackage.packageid||query.packageid, taskPackage?.taskIndex || query.taskindex)
   nextTick(() => {
     setTimeout(() => {
       useInfiniteScroll(