From 4a6b6d253451a14063df0659877f3d8c4ca921a5 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期四, 31 三月 2022 15:20:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/shf' into master

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

diff --git a/src/views/safetyproduction/feature.vue b/src/views/safetyproduction/feature.vue
index 8ab28c8..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,18 +304,38 @@
       });
     },
     deleteById(val) {
-      elementManagementDel({id:val}).then((res) => {
-        if (res.data.code == 200) {
-          this.elementManagementL();
-          this.$notify({
-            title: "成功",
-            message: "删除成功",
-            type: "success",
-            duration: 2000,
-          });
-        }
-      });
+        console.log(123,val)
+        this.$confirm('确认删除吗','提示', {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning'
+        })
+            .then(()=>{
+               elementManagementDel({id:val}).then((res) => {
+                 if (res.data.code == 200) {
+                   this.elementManagementL();
+                   this.$notify({
+                     title: "成功",
+                     message: "删除成功",
+                     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();
   },
@@ -334,4 +355,4 @@
   background-color: #034ea2;
   border: 1px solid #034ea2;
 }
-</style>
\ No newline at end of file
+</style>

--
Gitblit v1.9.2