From 7981c8b76ea5708bfb75b59fcd65252e72ed72f3 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期二, 20 十月 2026 14:09:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_江苏商贸供销社' into dev_江苏商贸供销社
---
src/views/mes/qc/ipqc/index.vue | 54 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 45 insertions(+), 9 deletions(-)
diff --git a/src/views/mes/qc/ipqc/index.vue b/src/views/mes/qc/ipqc/index.vue
index 022beb4..2d47360 100644
--- a/src/views/mes/qc/ipqc/index.vue
+++ b/src/views/mes/qc/ipqc/index.vue
@@ -2,21 +2,35 @@
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
import type { MesQcIpqcApi } from '#/api/mes/qc/ipqc';
-import { Page, useVbenModal } from '../../../../packages/effects/common-ui/src';
-import { MesQcStatusEnum } from '../../../../packages/constants/src';
-import { downloadFileFromBlobPart } from '../../../../packages/utils/src';
+import { Page, useVbenModal } from '@vben/common-ui';
+import { MesQcStatusEnum } from '@vben/constants';
import { Button, message } from 'ant-design-vue';
import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
import { deleteIpqc, exportIpqc, getIpqcPage } from '#/api/mes/qc/ipqc';
import { $t } from '#/locales';
+import QcExportRangeModal from '#/views/mes/qc/components/export-range-modal.vue';
+import QcReportGenerateModal from '#/views/mes/qc/components/report-generate-modal.vue';
import { useGridColumns, useGridFormSchema } from './data';
import Form from './modules/form.vue';
+/** 鏈〉瀵瑰簲 mes_qc_type 鐨勫�硷細2 杩囩▼妫�楠� */
+const QC_TYPE = 2;
+
const [FormModal, formModalApi] = useVbenModal({
connectedComponent: Form,
+ destroyOnClose: true,
+});
+
+const [ExportRangeModal, exportRangeModalApi] = useVbenModal({
+ connectedComponent: QcExportRangeModal,
+ destroyOnClose: true,
+});
+
+const [ReportModal, reportModalApi] = useVbenModal({
+ connectedComponent: QcReportGenerateModal,
destroyOnClose: true,
});
@@ -55,10 +69,22 @@
}
}
-/** 瀵煎嚭琛ㄦ牸 */
-async function handleExport() {
- const data = await exportIpqc(await gridApi.formApi.getValues());
- downloadFileFromBlobPart({ fileName: '杩囩▼妫�楠屽崟.xls', source: data });
+/** 瀵煎嚭琛ㄦ牸锛堝脊绐楅�夋楠屾椂闂磋寖鍥达級 */
+function handleExport() {
+ exportRangeModalApi
+ .setData({
+ title: '鎸夋楠屾椂闂村鍑鸿繃绋嬫楠屽崟',
+ exportApi: exportIpqc,
+ fileName: '杩囩▼妫�楠屽崟.xls',
+ })
+ .open();
+}
+
+/** 鍑烘姤鍛婏細鏁版嵁鐢卞悗绔粠璇ヨ川妫�鍗曞彇锛屽墠绔彧閫夋ā鏉� */
+function handleReport(row: MesQcIpqcApi.Ipqc) {
+ reportModalApi
+ .setData({ qcType: QC_TYPE, qcId: row.id, qcNo: row.code })
+ .open();
}
const [Grid, gridApi] = useVbenVxeGrid({
@@ -93,8 +119,10 @@
</script>
<template>
- <Page auto-content-height><FormModal @success="handleRefresh" />
-
+ <Page auto-content-height>
+ <FormModal @success="handleRefresh" />
+ <ExportRangeModal />
+ <ReportModal />
<Grid table-title="杩囩▼妫�楠屽崟鍒楄〃">
<template #toolbar-tools>
<TableAction
@@ -125,6 +153,14 @@
<TableAction
:actions="[
{
+ label: '鍑烘姤鍛�',
+ type: 'link',
+ icon: ACTION_ICON.AUDIT,
+ auth: ['qc-report:instance:generate'],
+ ifShow: row.status === MesQcStatusEnum.FINISHED,
+ onClick: handleReport.bind(null, row),
+ },
+ {
label: $t('common.edit'),
type: 'link',
icon: ACTION_ICON.EDIT,
--
Gitblit v1.9.3