From 7619c19a67c2ac824f803090bab753fc5ea14408 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期四, 16 七月 2026 12:01:49 +0800
Subject: [PATCH] 工作台完善
---
src/views/mes/workbench/index.vue | 6 +++---
src/views/mes/workbench/components/tabs/RecordParamTab.vue | 16 +++++++++++++++-
src/api/mes/pro/workorderparamrecord/index.ts | 2 +-
src/views/mes/workbench/components/tabs/FeedbackHistoryTab.vue | 2 +-
4 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/src/api/mes/pro/workorderparamrecord/index.ts b/src/api/mes/pro/workorderparamrecord/index.ts
index fcb0692..babaafd 100644
--- a/src/api/mes/pro/workorderparamrecord/index.ts
+++ b/src/api/mes/pro/workorderparamrecord/index.ts
@@ -44,7 +44,7 @@
/** 鎸夊伐鍗�/宸ヤ綔绔欏垎椤垫煡璇㈠弬鏁拌褰� */
export function getWorkOrderParamRecordPage(
- params: PageParam & { workOrderId?: number; workstationId?: number; recordNo?: string; templateName?: string; createTime?: string[] },
+ params: PageParam & { taskId?: number; workstationId?: number; recordNo?: string; templateName?: string; createTime?: string[] },
) {
return requestClient.get<PageResult<MesProWorkOrderParamRecordApi.WorkOrderParamRecord>>(
'/mes/pro/work-order-param-record/page-by-work-order',
diff --git a/src/views/mes/workbench/components/tabs/FeedbackHistoryTab.vue b/src/views/mes/workbench/components/tabs/FeedbackHistoryTab.vue
index 9c9cad4..4048770 100644
--- a/src/views/mes/workbench/components/tabs/FeedbackHistoryTab.vue
+++ b/src/views/mes/workbench/components/tabs/FeedbackHistoryTab.vue
@@ -100,7 +100,7 @@
width: 160,
slots: { default: 'code' },
},
- { field: 'workOrderCode', title: '宸ュ崟缂栫爜', width: 140 },
+ { field: 'taskCode', title: '浠诲姟缂栫爜', width: 140 },
{ field: 'processName', title: '宸ュ簭', width: 100 },
{ field: 'itemName', title: '浜у搧', minWidth: 120 },
{ field: 'feedbackQuantity', title: '鎶ュ伐鏁伴噺', width: 100 },
diff --git a/src/views/mes/workbench/components/tabs/RecordParamTab.vue b/src/views/mes/workbench/components/tabs/RecordParamTab.vue
index 81b114c..d6f9a64 100644
--- a/src/views/mes/workbench/components/tabs/RecordParamTab.vue
+++ b/src/views/mes/workbench/components/tabs/RecordParamTab.vue
@@ -160,6 +160,20 @@
await paramFormApi.resetForm();
await nextTick();
await paramFormApi.setState({ schema: [...baseSchemas, ...paramSchemas] });
+
+ // 鏄惧紡璁剧疆宸叉湁鍊硷紝纭繚琛ㄥ崟妯″瀷缁戝畾姝ｇ‘
+ if (existingValues && existingValues.size > 0) {
+ for (const [detailId, value] of existingValues) {
+ // 鏍规嵁鍙傛暟绫诲瀷杞崲鍊硷紝鏁板�肩被鍨嬮渶瑕佽浆涓� number
+ const detail = details.find((d) => d.id === detailId);
+ const paramType = detail?.paramType ?? 1;
+ let convertedValue: any = value;
+ if ((paramType === 1 || paramType === 2) && value != null && value !== '') {
+ convertedValue = Number(value);
+ }
+ await paramFormApi.setFieldValue(`param_${detailId}`, convertedValue);
+ }
+ }
}
/** 鏂板鍙傛暟璁板綍 */
@@ -286,7 +300,7 @@
recordLoading.value = true;
try {
const result = await getWorkOrderParamRecordPage({
- workOrderId: props.workOrderId,
+ taskId: props.workOrderId,
workstationId: props.workstationId,
pageNo: 1,
pageSize: 100,
diff --git a/src/views/mes/workbench/index.vue b/src/views/mes/workbench/index.vue
index 9cb719d..2307911 100644
--- a/src/views/mes/workbench/index.vue
+++ b/src/views/mes/workbench/index.vue
@@ -180,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,7 +204,7 @@
<RecordParamTab
v-else-if="activeTab === 'record-param'"
:task-id="selectedTask?.id"
- :work-order-id="selectedTask?.workOrderId"
+ :work-order-id="selectedTask?.id"
:workstation-id="workstationId"
/>
<ProductIssueTab
--
Gitblit v1.9.3