From 1be2467793a332d94fec87d0853995136e6679af Mon Sep 17 00:00:00 2001
From: zhoulingpo <zhoulingpo>
Date: Tue, 16 May 2023 17:42:51 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=88=A0=E9=99=A4=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Report/ReportManager.vue | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/views/Report/ReportManager.vue b/src/views/Report/ReportManager.vue
index 566bdbd..56383be 100644
--- a/src/views/Report/ReportManager.vue
+++ b/src/views/Report/ReportManager.vue
@@ -91,7 +91,7 @@
                 <vxe-column show-overflow show-header-overflow title="操作" width="200" fixed="right">
                     <template #default="{ row }">
                         <el-button type="text" @click="openReportModify('modify', row)">编辑</el-button>
-                        <el-button type="text" class="del-btn" @click="reportDelete(row.id)">删除</el-button>
+                        <el-button type="text" class="del-btn" @click="reportDelete(row)">删除</el-button>
                         <el-button type="text" @click="previewRow(row)">预览</el-button>
                         <el-button type="text" @click="downloadRow(row)">下载</el-button>
                     </template>
@@ -913,13 +913,17 @@ export default {
             this.reportDateList();
         },
         // 报告删除
-        reportDelete(ids) {
+        reportDelete(row) {
+          if(+row.isAct == 0){
+            this.$message.warning("当前选择的"+row.name+"已经在流程中")
+            return
+          }
             this.$confirm('此操作将删除所选数据, 是否继续?', '提示', {
                 confirmButtonText: '确定',
                 cancelButtonText: '取消',
                 type: 'warning'
             }).then(() => {
-                this.$api.report.reportDelete({ ids }).then(_ => {
+                this.$api.report.reportDelete({ ids:row.id }).then(_ => {
                     this.$message.success('操作成功');
                     this.reportList();
                     this.reportDateList();