From 44dd9c4eb8a2489c63a5eb53fd4254bbb3510e95 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Thu, 18 Jun 2026 09:14:57 +0800
Subject: [PATCH] Merge branch 'feature/v9.0/9.0.4'

---
 src/subPackages/taskDetail/execution/index.vue |   23 ++++++-----------------
 1 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/src/subPackages/taskDetail/execution/index.vue b/src/subPackages/taskDetail/execution/index.vue
index 41d5b69..201e281 100644
--- a/src/subPackages/taskDetail/execution/index.vue
+++ b/src/subPackages/taskDetail/execution/index.vue
@@ -8,19 +8,9 @@
 import WebViewPlus from "@/components/WebViewPlus.vue";
 import {getWebViewUrl} from "@/utils/index.js";
 
-const wayLineJodInfoId = ref(null)
+const wayLineJobInfoId = ref(null)
 const viewUrl = ref('')
-// const viewUrl = ref(getWebViewUrl('/execution'))
 
-// function onPostMessage(data) {
-//   console.log(data, '9999')
-//   if (data.type === 'taskDetails'){
-//     console.log('4444')
-//     uni.switchTab({
-//       url: '/subPackages/taskDetail/execution/index'
-//     });
-//   }
-// }
 function onPostMessage(data) {
   if (data.type === 'back') {
     uni.switchTab({
@@ -28,18 +18,18 @@
     });
   } else if (data.type === 'control') {
     uni.redirectTo({
-      url: `/pages/inspectionTask/execution/index?wayLineJodInfoId=${wayLineJodInfoId.value}`
+      url: `/pages/inspectionTask/execution/index?wayLineJobInfoId=${wayLineJobInfoId.value}`
     });
   } 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) => {
-  wayLineJodInfoId.value = options.wayLineJodInfoId
-  viewUrl.value = getWebViewUrl('/execution', {wayLineJodInfoId: wayLineJodInfoId.value, waylineJobId: options.waylineJobId, batch_no: options.batch_no})
+  wayLineJobInfoId.value = options.wayLineJobInfoId
+  viewUrl.value = getWebViewUrl('/execution', {wayLineJobInfoId: wayLineJobInfoId.value, waylineJobId: options.waylineJobId, batch_no: options.batch_no})
 })
 const isApp = ref(false)
 onShow(() => {
@@ -47,8 +37,7 @@
 });
 
 onHide(() => {
-  // 如果工单详情返回任务详情，那么tab栏对应的是关联事件一项
-  // isApp.value = false
+
 });
 </script>
 

--
Gitblit v1.9.3