From 47516b5ab04270ea17e1ef85b9cbc8675318fe43 Mon Sep 17 00:00:00 2001
From: liujiangyong <liu.jiangyong@free-sun.com.cn>
Date: Mon, 30 Jan 2023 15:56:00 +0800
Subject: [PATCH] =?UTF-8?q?=EF=BC=88*=EF=BC=89=E4=B8=8D=E8=83=BD=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=9C=89=E5=B7=A1=E6=A3=80=E8=AE=B0=E5=BD=95=E7=9A=84?=
 =?UTF-8?q?=E5=B7=A1=E6=A3=80=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/app/lib/controllers/patrolPlan/patrolPlan.js  | 15 ++++++++++++---
 .../patrolManage/containers/patrolPlan.js         |  1 +
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/api/app/lib/controllers/patrolPlan/patrolPlan.js b/api/app/lib/controllers/patrolPlan/patrolPlan.js
index cb72752..f0e7584 100644
--- a/api/app/lib/controllers/patrolPlan/patrolPlan.js
+++ b/api/app/lib/controllers/patrolPlan/patrolPlan.js
@@ -88,9 +88,20 @@ async function updatePatrolPlan(ctx, next) {
 
 async function delPatrolPlan(ctx, next) {
     try {
+        let errMsg = '删除巡检计划失败';
+
         const models = ctx.fs.dc.models;
         const { id } = ctx.params;
 
+        const record = await models.PatrolRecord.findOne({
+            where: { patrolPlanId: id }
+        });
+
+        if (record) {
+            errMsg = '不能删除有巡检记录的计划';
+            throw errMsg;
+        }
+
         await models.PatrolPlan.destroy({
             where: { id }
         })
@@ -99,9 +110,7 @@ async function delPatrolPlan(ctx, next) {
     } catch (error) {
         ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`);
         ctx.status = 400;
-        ctx.body = {
-            "message": '删除巡检计划失败'
-        }
+        ctx.body = { message: error }
     }
 }
 
diff --git a/web/client/src/sections/patrolManage/containers/patrolPlan.js b/web/client/src/sections/patrolManage/containers/patrolPlan.js
index fc8ef24..36a3f82 100644
--- a/web/client/src/sections/patrolManage/containers/patrolPlan.js
+++ b/web/client/src/sections/patrolManage/containers/patrolPlan.js
@@ -84,6 +84,7 @@ function PatrolPlan(props) {
         dataIndex: 'action',
         key: 'action',
         search: false,
+        width: 200,
         render: (_, record) => {
             return <>
                 <Button type="link" onClick={() => {