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/components/tabs/FeedbackHistoryTab.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/mes/workbench/components/tabs/FeedbackHistoryTab.vue b/src/views/mes/workbench/components/tabs/FeedbackHistoryTab.vue
index 7ec016e..4048770 100644
--- a/src/views/mes/workbench/components/tabs/FeedbackHistoryTab.vue
+++ b/src/views/mes/workbench/components/tabs/FeedbackHistoryTab.vue
@@ -46,7 +46,7 @@
/** 缂栬緫锛堜粎鑽夌锛� */
function handleEdit(row: MesProFeedbackApi.Feedback) {
- formModalApi.setData({ formType: 'update', id: row.id }).open();
+ formModalApi.setData({ formType: 'update', id: row.id, showSubmitButton: false }).open();
}
/** 鍒犻櫎锛堜粎鑽夌锛� */
@@ -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 },
--
Gitblit v1.9.3