From 0780645266681fbfe4fd02f32ebc307eb88c6554 Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期四, 31 三月 2022 15:07:13 +0800
Subject: [PATCH] Merge branch 'shf' of https://sinanoaq.cn:8888/r/ztqt into shf

---
 src/views/safetyproduction/feature.vue |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/src/views/safetyproduction/feature.vue b/src/views/safetyproduction/feature.vue
index 8db69d8..312c285 100644
--- a/src/views/safetyproduction/feature.vue
+++ b/src/views/safetyproduction/feature.vue
@@ -74,6 +74,7 @@
     <el-dialog
       :title="title"
       :visible.sync="dialogVisible"
+      :close-on-click-modal="false"
       width="40%"
     >
       <el-form ref="form" :rules="rules" :model="form" label-width="80px">
@@ -139,7 +140,7 @@
         <el-button type="primary" class="btns" @click="AddelementManagement()"
           >确 定</el-button
         >
-        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button @click="cancel()">取 消</el-button>
       </span>
     </el-dialog>
   </div>
@@ -303,6 +304,7 @@
       });
     },
     deleteById(val) {
+        console.log(123,val)
         this.$confirm('确认删除吗','提示', {
             confirmButtonText: '确认',
             cancelButtonText: '取消',
@@ -318,12 +320,22 @@
                      type: "success",
                      duration: 2000,
                    });
+                 }else {
+                     this.$message({
+                         type: "warning",
+                         // message: res.data.message,
+                         message: "当前A级要素仍然有已绑定的B级要素,无法删除"
+                     });
                  }
                });
             })
             .catch(error =>{
             });
     },
+      cancel(){
+          this.elementManagementL();
+          this.dialogVisible = false;
+      },
   find(){
      this.elementManagementL();
   },

--
Gitblit v1.9.2