From 5dbc69b4e792dcce998038822b92402366bec47f Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 18 八月 2026 10:45:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/fix/hsy/20260812' into dev_pro2.0
---
src/views/mes/pro/feedback/index.vue | 47 +++++++++++------------------------------------
1 files changed, 11 insertions(+), 36 deletions(-)
diff --git a/src/views/mes/pro/feedback/index.vue b/src/views/mes/pro/feedback/index.vue
index 1793ebb..adb6ae1 100644
--- a/src/views/mes/pro/feedback/index.vue
+++ b/src/views/mes/pro/feedback/index.vue
@@ -15,14 +15,13 @@
exportFeedback,
getFeedbackPage,
} from '#/api/mes/pro/feedback';
+import { getWorkOrder } from '#/api/mes/pro/workorder';
import { $t } from '#/locales';
import { ref } from 'vue';
import { useGridColumns, useGridFormSchema } from './data';
import Form from './modules/form.vue';
-import QuickFeedbackForm from '../workorder-center/modules/quick-feedback.vue';
-import BatchFeedbackForm from './modules/batch-feedback.vue';
import ArchiveDetail from '#/views/mes/pd/archive/modules/detail.vue';
const userStore = useUserStore();
@@ -30,16 +29,6 @@
const [FormModal, formModalApi] = useVbenModal({
connectedComponent: Form,
- destroyOnClose: true,
-});
-
-const [QuickFeedbackModal, quickFeedbackModalApi] = useVbenModal({
- connectedComponent: QuickFeedbackForm,
- destroyOnClose: true,
-});
-
-const [BatchFeedbackModal, batchFeedbackModalApi] = useVbenModal({
- connectedComponent: BatchFeedbackForm,
destroyOnClose: true,
});
@@ -96,14 +85,15 @@
downloadFileFromBlobPart({ fileName: '鐢熶骇鎶ュ伐.xls', source: data });
}
-/** 蹇�熸姤宸� */
-function handleQuickCreate() {
- quickFeedbackModalApi.setData({}).open();
-}
-
-/** 鎵归噺鎶ュ伐 */
-function handleBatchCreate() {
- batchFeedbackModalApi.setData({}).open();
+/** 鏌ョ湅褰掓。 */
+async function handleArchive(row: MesProFeedbackApi.Feedback) {
+ if (!row.workOrderId) return;
+ try {
+ const workOrder = await getWorkOrder(row.workOrderId);
+ archiveDetailRef.value?.open(workOrder.productCode);
+ } catch {
+ message.error('鑾峰彇宸ュ崟淇℃伅澶辫触');
+ }
}
const [Grid, gridApi] = useVbenVxeGrid({
@@ -132,8 +122,6 @@
<template>
<Page auto-content-height>
<FormModal @success="handleRefresh" />
- <QuickFeedbackModal @success="handleRefresh" />
- <BatchFeedbackModal @success="handleRefresh" />
<Grid table-title="鐢熶骇鎶ュ伐鍒楄〃">
<template #toolbar-tools>
<TableAction
@@ -144,19 +132,6 @@
icon: ACTION_ICON.ADD,
auth: ['mes:pro-feedback:create'],
onClick: handleCreate,
- },
- {
- label: '蹇�熸姤宸�',
- type: 'primary',
- icon: ACTION_ICON.ADD,
- auth: ['mes:pro-feedback:create'],
- onClick: handleQuickCreate,
- },
- {
- label: '鎵归噺鎶ュ伐',
- type: 'primary',
- auth: ['mes:pro-feedback:create'],
- onClick: handleBatchCreate,
},
{
label: $t('ui.actionTitle.export'),
@@ -213,7 +188,7 @@
{
label: '褰掓。',
type: 'link',
- onClick: () => archiveDetailRef.value?.open(row.itemCode),
+ onClick: handleArchive.bind(null, row),
},
]"
/>
--
Gitblit v1.9.3