From 648904d076ae6e17892b40675598b1c8dc474277 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 24 Apr 2026 16:21:12 +0800
Subject: [PATCH] Merge branch 'feature/v9.0/9.0.3' into feature/v9.0/9.0.4

---
 src/subPackages/taskDetail/execution/index.vue |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/subPackages/taskDetail/execution/index.vue b/src/subPackages/taskDetail/execution/index.vue
index dcf2d93..8a11578 100644
--- a/src/subPackages/taskDetail/execution/index.vue
+++ b/src/subPackages/taskDetail/execution/index.vue
@@ -32,14 +32,14 @@
     });
   } else if(data.type === 'workid') {
     uni.navigateTo({
-      url: `/subPackages/workDetail/index?eventNum=${data.eventNum}&wLJobInfoId=${data.wLJobInfoId}`
+      url: `/subPackages/workDetail/index?eventNum=${data.eventNum}&wLJobInfoId=${data.wLJobInfoId}&current=${data.current}`
     });
   }
 }
 
 onLoad((options) => {
   wayLineJobInfoId.value = options.wayLineJobInfoId
-  viewUrl.value = getWebViewUrl('/execution', {wayLineJobInfoId: wayLineJobInfoId.value})
+  viewUrl.value = getWebViewUrl('/execution', {wayLineJobInfoId: wayLineJobInfoId.value, waylineJobId: options.waylineJobId, batch_no: options.batch_no})
 })
 const isApp = ref(false)
 onShow(() => {
@@ -47,7 +47,8 @@
 });
 
 onHide(() => {
-  isApp.value = false
+  // 如果工单详情返回任务详情，那么tab栏对应的是关联事件一项
+  // isApp.value = false
 });
 </script>
 

--
Gitblit v1.9.3