Merge remote-tracking branch 'remotes/origin/shf' into master

lyfO_o

2022-04-06 1cc4eb09ce38f1f0db114b7d3570f92ceaf1d470

 src/views/safetyproduction/feature.vue

@@ -110,6 +110,7 @@
                v-model="form.parentId"
                placeholder="请选择"
                style="width: 100%"
                :disabled="title=='编辑'?true:false"
              >
                <el-option
                  v-for="item in parent"
@@ -234,7 +235,7 @@
        };
      } else {
        this.title = "编辑";
        this.form = value;
        this.form=JSON.parse(JSON.stringify(value));
      }
    },
    AddelementManagement() {
@@ -320,8 +321,7 @@
                 }else {
                     this.$message({
                         type: "warning",
                         // message: res.data.message,
                         message: "当前A级要素仍然有已绑定的B级要素,无法删除"
                         message: res.data.message,
                     });
                 }
               });