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/iqc/index.vue | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/src/views/mes/qc/iqc/index.vue b/src/views/mes/qc/iqc/index.vue
index 761305f..5759607 100644
--- a/src/views/mes/qc/iqc/index.vue
+++ b/src/views/mes/qc/iqc/index.vue
@@ -14,11 +14,15 @@
import { deleteIqc, exportIqc, getIqcPage } from '#/api/mes/qc/iqc';
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';
defineOptions({ name: 'MesQcIqc' });
+
+/** 鏈〉瀵瑰簲 mes_qc_type 鐨勫�硷細1 鏉ユ枡妫�楠� */
+const QC_TYPE = 1;
const route = useRoute();
@@ -29,6 +33,11 @@
const [ExportRangeModal, exportRangeModalApi] = useVbenModal({
connectedComponent: QcExportRangeModal,
+ destroyOnClose: true,
+});
+
+const [ReportModal, reportModalApi] = useVbenModal({
+ connectedComponent: QcReportGenerateModal,
destroyOnClose: true,
});
@@ -78,6 +87,13 @@
.open();
}
+/** 鍑烘姤鍛婏細鏁版嵁鐢卞悗绔粠璇ヨ川妫�鍗曞彇锛屽墠绔彧閫夋ā鏉� */
+function handleReport(row: MesQcIqcApi.Iqc) {
+ reportModalApi
+ .setData({ qcType: QC_TYPE, qcId: row.id, qcNo: row.code })
+ .open();
+}
+
const [Grid, gridApi] = useVbenVxeGrid({
formOptions: {
schema: useGridFormSchema(),
@@ -120,6 +136,7 @@
<Page auto-content-height>
<FormModal @success="handleRefresh" />
<ExportRangeModal />
+ <ReportModal />
<Grid table-title="鏉ユ枡妫�楠屽崟鍒楄〃">
<template #toolbar-tools>
<TableAction
@@ -150,6 +167,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