From cb9cd49627b65a4c0e137e08063271a8cefe1826 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 23 七月 2026 17:48:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/mes/pro/feedback/index.vue | 50 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 44 insertions(+), 6 deletions(-)
diff --git a/src/views/mes/pro/feedback/index.vue b/src/views/mes/pro/feedback/index.vue
index 1a376a3..239da4a 100644
--- a/src/views/mes/pro/feedback/index.vue
+++ b/src/views/mes/pro/feedback/index.vue
@@ -2,10 +2,10 @@
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
import type { MesProFeedbackApi } from '#/api/mes/pro/feedback';
-import { Page, useVbenModal } from '../../../../packages/effects/common-ui/src';
-import { MesProFeedbackStatusEnum } from '../../../../packages/constants/src';
-import { useUserStore } from '../../../../packages/stores/src';
-import { downloadFileFromBlobPart } from '../../../../packages/utils/src';
+import { Page, useVbenModal } from '@vben/common-ui';
+import { MesProFeedbackStatusEnum } from '@vben/constants';
+import { useUserStore } from '@vben/stores';
+import { downloadFileFromBlobPart } from '@vben/utils';
import { Button, message } from 'ant-design-vue';
@@ -19,12 +19,24 @@
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';
const userStore = useUserStore();
const currentUserId = userStore.userInfo?.id; // 褰撳墠鐧诲綍鐢ㄦ埛 ID锛岀敤浜庡鎵逛汉鏉冮檺鍒ゆ柇
const [FormModal, formModalApi] = useVbenModal({
connectedComponent: Form,
+ destroyOnClose: true,
+});
+
+const [QuickFeedbackModal, quickFeedbackModalApi] = useVbenModal({
+ connectedComponent: QuickFeedbackForm,
+ destroyOnClose: true,
+});
+
+const [BatchFeedbackModal, batchFeedbackModalApi] = useVbenModal({
+ connectedComponent: BatchFeedbackForm,
destroyOnClose: true,
});
@@ -40,7 +52,7 @@
/** 缂栬緫鐢熶骇鎶ュ伐 */
function handleEdit(row: MesProFeedbackApi.Feedback) {
- formModalApi.setData({ formType: 'update', id: row.id }).open();
+ formModalApi.setData({ formType: 'update', id: row.id, showSubmitButton: false }).open();
}
/** 鎻愪氦鐢熶骇鎶ュ伐 */
@@ -79,6 +91,16 @@
downloadFileFromBlobPart({ fileName: '鐢熶骇鎶ュ伐.xls', source: data });
}
+/** 蹇�熸姤宸� */
+function handleQuickCreate() {
+ quickFeedbackModalApi.setData({}).open();
+}
+
+/** 鎵归噺鎶ュ伐 */
+function handleBatchCreate() {
+ batchFeedbackModalApi.setData({}).open();
+}
+
const [Grid, gridApi] = useVbenVxeGrid({
formOptions: { schema: useGridFormSchema() },
gridOptions: {
@@ -103,7 +125,10 @@
</script>
<template>
- <Page auto-content-height><FormModal @success="handleRefresh" />
+ <Page auto-content-height>
+ <FormModal @success="handleRefresh" />
+ <QuickFeedbackModal @success="handleRefresh" />
+ <BatchFeedbackModal @success="handleRefresh" />
<Grid table-title="鐢熶骇鎶ュ伐鍒楄〃">
<template #toolbar-tools>
<TableAction
@@ -116,6 +141,19 @@
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'),
type: 'primary',
icon: ACTION_ICON.DOWNLOAD,
--
Gitblit v1.9.3