Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into fix/updatesyspic

src/api/task/task.ts

@@ -132,10 +132,10 @@ export async function getSimilarityList(params: any) {
  * @returns
  */
 
-export async function getTaskDetailInfo(taskId: string, packageid: string) {
+export async function getTaskDetailInfo(taskId: string, packageid: string, taskNode: string) {
   const pid = packageid || 0
   const res = await http.request({
-    url: `/backstage/jifen/ocrtaskchildpicture/getdata/${taskId}/${pid}`,
+    url: `/backstage/jifen/ocrtaskchildpicture/getdata/${taskId}/${pid}/${taskNode}`,
     method: 'get',
   })
 

src/views/final/comp/RepeatTaskTableModal.vue

@@ -363,7 +363,7 @@ function reload() {
 }
 
 function goDetail(row) {
-  router.push({ name: 'final-detail', query: { id: row.id, packageid: row.packageid } })
+  router.push({ name: 'final-detail', query: { id: row.id, packageid: row.packageid, taskindex: row.taskIndex } })
 }
 
 const showActions = computed(() => {

src/views/final/content/Content.vue

@@ -720,7 +720,7 @@ function validate(items: any[]) {
 function goDetail(row) {
   router.push({
     name: 'final-detail',
-    query: { id: row.id, packageid: row.packageid },
+    query: { id: row.id, packageid: row.packageid, taskindex: row.taskIndex },
   })
 }
 

src/views/final/content/ListContent.vue

@@ -199,7 +199,7 @@ function isValidTimestamp(value) {
 function goDetail(row) {
   router.push({
     name: 'final-detail',
-    query: { id: row.id, packageid: row.packageid },
+    query: { id: row.id, packageid: row.packageid, taskindex: row.taskIndex },
   })
 }
 // 小结批量不通过

src/views/task/content/Content.vue

@@ -49,6 +49,7 @@ const batchModalRef: any = ref(null)
 const totalCount = ref(0)
 const taskId: any = ref('') // 任务id
 const packageId: any = ref('') // 包id
+const taskIndex = ref<string>('') // 包标识
 const CustomSettingModalRef = ref(null)
 const taskTableData = ref<any[]>([])
 const route = useRoute()
@@ -115,6 +116,7 @@ onMounted(() => {
   if (route.query.id) {
     taskId.value = route.query.id
     packageId.value = route.query.packageid
+    taskIndex.value = route.query.taskindex as string
     isDetail.value = true
     getDetail()
   }
@@ -513,6 +515,9 @@ watch(
     if (!isEmpty(taskStore.getActiveId)) {
       packageId.value = taskStore.getPackageid
       taskId.value = taskStore.getActiveId
+      // 找到当前选中的数据
+      const task = taskStore.getApprovalList.find(i => i.id === taskStore.activeId)
+      taskIndex.value = task.taskIndex
       getDetail()
     }
   },
@@ -520,7 +525,7 @@ watch(
 
 // 获取数据
 async function getDetail() {
-  taskDetailInfo.value = await getTaskDetailInfo(taskId.value, packageId.value)
+  taskDetailInfo.value = await getTaskDetailInfo(taskId.value, packageId.value, taskIndex.value)
   setBatch(false)
   getTableData()
   getImgList()