From 6be85220858395453d5fc0c500ecc8aa6b219eb6 Mon Sep 17 00:00:00 2001
From: Dragon <>
Date: Fri, 22 Mar 2024 00:26:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/modules/final.ts         |  8 ++++++
 src/views/final/content/Content.vue |  5 +++-
 src/views/task/content/Content.vue  | 41 ++++++++++++++++++++++-------
 3 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/src/router/modules/final.ts b/src/router/modules/final.ts
index 83db1ed..9ede89c 100644
--- a/src/router/modules/final.ts
+++ b/src/router/modules/final.ts
@@ -34,6 +34,14 @@ const routes: Array<RouteRecordRaw> = [
         },
         component: () => import('@/views/final/index.vue'),
       },
+      {
+        path: 'final-detail',
+        name: 'final-detail',
+        meta: {
+          title: '任务终审详情',
+        },
+        component: () => import('@/views/task/content/Content.vue'),
+      },
     ],
   },
 ]
diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index 11a361f..c97749e 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -14,6 +14,7 @@ import {
   watch,
 } from 'vue'
 import { rowPropKeys } from 'naive-ui/es/legacy-grid/src/Row'
+import { useRoute, useRouter } from 'vue-router'
 import {
   Action,
   CustomTabelModal,
@@ -42,6 +43,8 @@ import { getAllfieldList, getfieldList, savefield } from '@/api/home/filter'
 
 const dicStore = useDictionary()
 const izstatusList = ref([])
+const router = useRouter()
+const route = useRoute()
 const reviewType = 0
 const actionsColumns = {
   title: '操作',
@@ -567,7 +570,7 @@ function validate(items: any[]) {
 }
 
 function goDetail(row) {
-  console.log(row)
+  router.push({ name: 'final-detail', query: { id: row.id, packageid: row.packageid } })
 }
 
 function resetHandler() {
diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index 172647b..a51a341 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -1,5 +1,11 @@
 <script lang="ts" setup>
+import { computed, onMounted, onUnmounted, reactive, ref, unref, watch } from 'vue'
+import { chunk, clone } from 'lodash-es'
+import { useDialog, useMessage } from 'naive-ui'
+import { useRoute } from 'vue-router'
+import BatchModal from '../modal/BatchModal.vue'
 import { getAllfieldList, getfieldList } from '@/api/home/filter'
+
 import { audit } from '@/api/task/task'
 import { getTaskDetailInfo, getTaskDetailPictureList } from '@/api/work/work'
 import { useTask } from '@/store/modules/task'
@@ -8,10 +14,6 @@ import { isEmpty } from '@/utils'
 import { formatToDateHMS } from '@/utils/dateUtil'
 import { hideDownload } from '@/utils/image'
 import emitter from '@/utils/mitt'
-import { chunk, clone } from 'lodash-es'
-import { useDialog, useMessage } from 'naive-ui'
-import { computed, onUnmounted, reactive, ref, unref, watch } from 'vue'
-import BatchModal from '../modal/BatchModal.vue'
 import ConfrimModal from '../modal/ConfrimModal.vue'
 import CustomSettingModal from '../modal/CustomSettingModal.vue'
 import PictureTable from './PictureTable.vue'
@@ -28,6 +30,7 @@ const batchModalRef = ref(null)
 const totalCount = ref(0)
 const CustomSettingModalRef = ref(null)
 const taskTableData = ref<any[]>([])
+const route = useRoute()
 
 const sortBy: PictureSortParam = {
   orderbyname: 'asc',
@@ -74,6 +77,29 @@ const userStore = useUser()
 const imageRef = ref<ComponentElRef | null>()
 let processItems: any[] = []
 
+onMounted(() => {
+  if (route.query.id)
+    getDetail(route.query.id, route.query.packageid)
+})
+
+// 从任务终审列表跳转过来的
+async function getDetail(taskId, packageid) {
+  taskDetailInfo.value = await getTaskDetailInfo(taskId, packageid)
+  getTableData()
+  if (!isEmpty(packageid)) {
+    const { data, total } = await getTaskDetailPictureList(
+      packageid,
+      taskId,
+      { ...taskpagination, ...sortBy },
+    )
+    taskDetailPictureList.value = data
+    totalCount.value = total
+  }
+  else {
+    taskDetailPictureList.value.length = 0
+    totalCount.value = 0
+  }
+}
 // states:1未提交，2待审批，3通过，4不通过
 function validate(items: any[]) {
   if (items.length === 0)
@@ -234,11 +260,12 @@ watch(
   async (newValue, oldValue) => {
     const packageid = taskStore.getPackageid
     const taskId = taskStore.getActiveId
+    console.log(packageid)
+    console.log(taskId)
 
     if (isEmpty(taskId))
       return
     taskDetailInfo.value = await getTaskDetailInfo(taskId, packageid)
-    console.log(taskDetailInfo.value,'taskDetailInfo')
     getTableData()
     // TODO mock备份 确认逻辑无误后删除
     // let showFieldData = taskDetailInfo.value.ocrPicture;
@@ -283,10 +310,6 @@ const currentTaskId = computed(() => {
 
 function overTaskHandle() {
   const item = taskDetailInfo.value
-  if(item?.userapprove?.statshis == 2 || item?.userapprove?.statshis == 3){
-    overTask.value = null;
-    return
-  }
 
   if (validate([item]) == null && batch.value === false)
     overTask.value = item