From 7a5c5250b66cc6faffbcac9e192073473c50f79f Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 28 八月 2026 17:02:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/mes/pro/feedback/index.vue | 84 ++++++++++++++++++++++--------------------
1 files changed, 44 insertions(+), 40 deletions(-)
diff --git a/src/views/mes/pro/feedback/index.vue b/src/views/mes/pro/feedback/index.vue
index 239da4a..c56983a 100644
--- a/src/views/mes/pro/feedback/index.vue
+++ b/src/views/mes/pro/feedback/index.vue
@@ -15,30 +15,26 @@
exportFeedback,
getFeedbackPage,
} from '#/api/mes/pro/feedback';
+import { getWorkOrder } from '#/api/mes/pro/workorder';
import { $t } from '#/locales';
+
+import { ref } from 'vue';
+import { useRouter } from 'vue-router';
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();
const currentUserId = userStore.userInfo?.id; // 褰撳墠鐧诲綍鐢ㄦ埛 ID锛岀敤浜庡鎵逛汉鏉冮檺鍒ゆ柇
+const router = useRouter();
const [FormModal, formModalApi] = useVbenModal({
connectedComponent: Form,
destroyOnClose: true,
});
-const [QuickFeedbackModal, quickFeedbackModalApi] = useVbenModal({
- connectedComponent: QuickFeedbackForm,
- destroyOnClose: true,
-});
-
-const [BatchFeedbackModal, batchFeedbackModalApi] = useVbenModal({
- connectedComponent: BatchFeedbackForm,
- destroyOnClose: true,
-});
+const archiveDetailRef = ref<InstanceType<typeof ArchiveDetail>>();
/** 鍒锋柊琛ㄦ牸 */
function handleRefresh() {
@@ -63,6 +59,15 @@
/** 瀹℃壒鐢熶骇鎶ュ伐 */
function handleApprove(row: MesProFeedbackApi.Feedback) {
formModalApi.setData({ formType: 'approve', id: row.id }).open();
+}
+
+/** 鏌ョ湅瀹℃壒璇︽儏 */
+function handleViewProcess(row: MesProFeedbackApi.Feedback) {
+ if (!row.processInstanceId) {
+ message.warning('璇ユ姤宸ュ皻鏈彁浜ゅ鎵�');
+ return;
+ }
+ router.push({ path: '/bpm/process-instance/detail', query: { id: row.processInstanceId } });
}
/** 璇︽儏鐢熶骇鎶ュ伐 */
@@ -91,14 +96,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({
@@ -127,8 +133,6 @@
<template>
<Page auto-content-height>
<FormModal @success="handleRefresh" />
- <QuickFeedbackModal @success="handleRefresh" />
- <BatchFeedbackModal @success="handleRefresh" />
<Grid table-title="鐢熶骇鎶ュ伐鍒楄〃">
<template #toolbar-tools>
<TableAction
@@ -139,19 +143,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'),
@@ -185,14 +176,21 @@
ifShow: () => row.status === MesProFeedbackStatusEnum.PREPARE,
onClick: handleSubmit.bind(null, row),
},
+ // {
+ // label: $t('common.approve'),
+ // type: 'link',
+ // auth: ['mes:pro-feedback:approve'],
+ // ifShow: () =>
+ // row.status === MesProFeedbackStatusEnum.APPROVING &&
+ // row.approveUserId === currentUserId,
+ // onClick: handleApprove.bind(null, row),
+ // },
{
- label: $t('common.approve'),
+ label: '鏌ョ湅瀹℃壒',
type: 'link',
- auth: ['mes:pro-feedback:approve'],
- ifShow: () =>
- row.status === MesProFeedbackStatusEnum.APPROVING &&
- row.approveUserId === currentUserId,
- onClick: handleApprove.bind(null, row),
+ icon: ACTION_ICON.VIEW,
+ ifShow: () => row.status === MesProFeedbackStatusEnum.APPROVING,
+ onClick: handleViewProcess.bind(null, row),
},
{
label: $t('common.delete'),
@@ -205,9 +203,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