From b64a0deae5b5d33f9e20671a68936b27f0b9b00b Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 21 七月 2026 18:03:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/mes/workbench/index.vue | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/views/mes/workbench/index.vue b/src/views/mes/workbench/index.vue
index 2d9072b..3640291 100644
--- a/src/views/mes/workbench/index.vue
+++ b/src/views/mes/workbench/index.vue
@@ -167,7 +167,6 @@
:list="taskList"
:selected-id="selectedTask?.id"
:loading="taskLoading"
- :process-name="workstation?.processName"
@select="handleSelectTask"
/>
</aside>
@@ -181,8 +180,8 @@
<main class="workbench-main">
<div class="workbench-main__head">
<span class="workbench-main__tab-title">{{ activeTabLabel }}</span>
- <span v-if="selectedTask?.workOrderCode" class="workbench-main__context">
- 宸ュ崟 {{ selectedTask.workOrderCode }}
+ <span v-if="selectedTask?.code" class="workbench-main__context">
+ 宸ュ崟 {{ selectedTask.code }}
</span>
</div>
<div class="workbench-main__body">
@@ -204,16 +203,25 @@
/>
<RecordParamTab
v-else-if="activeTab === 'record-param'"
- :work-order-id="selectedTask?.workOrderId"
+ :task-id="selectedTask?.id"
+ :work-order-id="selectedTask?.id"
:workstation-id="workstationId"
/>
<ProductIssueTab
v-else-if="activeTab === 'product-issue'"
+ :task-id="selectedTask?.id"
+ :task-code="selectedTask?.code"
+ :task-name="selectedTask?.name"
+ :work-order-id="selectedTask?.workOrderId"
:workstation-id="workstationId"
:workstation-name="workstationName"
/>
<ReturnIssueTab
v-else-if="activeTab === 'return-issue'"
+ :task-id="selectedTask?.id"
+ :task-code="selectedTask?.code"
+ :task-name="selectedTask?.name"
+ :work-order-id="selectedTask?.workOrderId"
:workstation-id="workstationId"
:workstation-name="workstationName"
/>
--
Gitblit v1.9.3