From 809355178cdd17d4bf66a4eb443c56b563b68dd9 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 14 八月 2026 13:39:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/mes/pro/feedback/index.vue | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/src/views/mes/pro/feedback/index.vue b/src/views/mes/pro/feedback/index.vue
index b4457b7..adb6ae1 100644
--- a/src/views/mes/pro/feedback/index.vue
+++ b/src/views/mes/pro/feedback/index.vue
@@ -15,10 +15,14 @@
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 ArchiveDetail from '#/views/mes/pd/archive/modules/detail.vue';
const userStore = useUserStore();
const currentUserId = userStore.userInfo?.id; // 褰撳墠鐧诲綍鐢ㄦ埛 ID锛岀敤浜庡鎵逛汉鏉冮檺鍒ゆ柇
@@ -27,6 +31,8 @@
connectedComponent: Form,
destroyOnClose: true,
});
+
+const archiveDetailRef = ref<InstanceType<typeof ArchiveDetail>>();
/** 鍒锋柊琛ㄦ牸 */
function handleRefresh() {
@@ -79,6 +85,17 @@
downloadFileFromBlobPart({ fileName: '鐢熶骇鎶ュ伐.xls', source: data });
}
+/** 鏌ョ湅褰掓。 */
+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({
formOptions: { schema: useGridFormSchema() },
gridOptions: {
@@ -103,7 +120,8 @@
</script>
<template>
- <Page auto-content-height><FormModal @success="handleRefresh" />
+ <Page auto-content-height>
+ <FormModal @success="handleRefresh" />
<Grid table-title="鐢熶骇鎶ュ伐鍒楄〃">
<template #toolbar-tools>
<TableAction
@@ -167,9 +185,15 @@
confirm: handleDelete.bind(null, row),
},
},
+ {
+ label: '褰掓。',
+ type: 'link',
+ onClick: handleArchive.bind(null, row),
+ },
]"
/>
</template>
</Grid>
+ <ArchiveDetail ref="archiveDetailRef" />
</Page>
</template>
--
Gitblit v1.9.3