Update dataPickers.vue

src/views/magl/dataPickers.vue

@@ -486,8 +486,7 @@
                                 <span class="addContent">
                                   <i
                                     :class="'zdyicon ' + item2.iconClass"
-                                    @click="deleteObj(reakData)"
-                                    v-if="realIndex != 0"
+                                    @click="deleteObj(reakData, item2)"
                                   ></i>
                                   <el-form-item
                                     v-for="item4 in item3.name"
@@ -2321,7 +2320,7 @@ export default {
                       ],
                     },
                   ],
-                  iconClass: "",
+                  iconClass: "el-icon-close",
                 },
               ],
             },
@@ -2799,7 +2798,7 @@ export default {
                       ],
                     },
                   ],
-                  iconClass: "",
+                  iconClass: "el-icon-close",
                 },
               ],
             },
@@ -3187,12 +3186,12 @@ export default {
             ]
           );
         } else {
-            res.data.data.result.forEach((item) => {
-           let failMessage = item.data.failList.length > 0 ? item.data.failList.toString() + ',' : ''
-            message +=
-              item.xm +
-              ":" + failMessage +
-              item.message + "<br/>"
+          res.data.data.result.forEach((item) => {
+            let failMessage =
+              item.data.failList.length > 0
+                ? item.data.failList.toString() + ","
+                : "";
+            message += item.xm + ":" + failMessage + item.message + "<br/>";
           });
           self
             .$confirm(message, "温馨提示", {
@@ -6057,7 +6056,7 @@ export default {
       this.$emit("changeTag", id);
     },
     //点击垃圾桶 删除表单
-    deleteObj(obj) {
+    deleteObj(obj, item2) {
       let self = this;
       this.$confirm("删除后将无法恢复，确认删除?", "删除", {
         confirmButtonText: "确定",
@@ -6065,6 +6064,12 @@ export default {
         type: "warning",
       })
         .then(() => {
+            const loading = this.$loading({
+            lock: true,
+            text: "正在删除...",
+            spinner: "el-icon-loading",
+            background: "rgba(255, 255, 255, 0.7)",
+          });
           self.propFormField.forEach((groupItem) => {
             groupItem.data.forEach((fieldItem) => {
               if (fieldItem.childrenAsAdd) {
@@ -6074,7 +6079,55 @@ export default {
                       if (childrenObjectItem == obj) {
                         var delectMethod = childrenFieldItem.delectMethod;
                         if (self.formLabelAlign.hasOwnProperty("editing")) {
-                          if (
+                          if (item2.id == "fzxyr") {
+                            if (
+                              self.formLabelAlign[childrenFieldItem.id]
+                                .length == 1
+                            ) {
+                              self.formLabelAlign[childrenFieldItem.id] = [];
+                              self.xyrXXAll.splice(childrenObjectIndex, 1);
+                            } else {
+                              self.formLabelAlign[childrenFieldItem.id].splice(
+                                childrenObjectIndex,
+                                1
+                              );
+                              self.xyrXXAll.splice(childrenObjectIndex, 1);
+                            }
+                            loading.close();
+                            self.$forceUpdate();
+                            self.$message({
+                              type: "success",
+                              message: "删除成功",
+                              offset: 200,
+                            });
+                          } else if (item2.id == "bhrxx") {
+                           if (
+                                    self.formLabelAlign[childrenFieldItem.id]
+                                      .length == 1
+                                  ) {
+                                    self.formLabelAlign[childrenFieldItem.id] =
+                                      [];
+                                    self.bhrXXAll.splice(
+                                      childrenObjectIndex,
+                                      1
+                                    );
+                                  } else {
+                                    self.formLabelAlign[
+                                      childrenFieldItem.id
+                                    ].splice(childrenObjectIndex, 1);
+                                    self.bhrXXAll.splice(
+                                      childrenObjectIndex,
+                                      1
+                                    );
+                                  }
+                                  loading.close();
+                                  self.$forceUpdate();
+                                  self.$message({
+                                    type: "success",
+                                    message: "删除成功",
+                                    offset: 200,
+                                  });
+                          } else if (
                             delectMethod &&
                             self.fileLists[childrenFieldItem.id][
                               childrenObjectIndex
@@ -6125,12 +6178,14 @@ export default {
                                   });
                                 });
                             });
+                            loading.close();
                             var params = {};
                             params.method = delectMethod;
                             params.params = obj;
                             self.$emit("selfDefineEvent", params);
                           } else {
                             this.$message.error("路径错误,删除失败");
+                            loading.close();
                           }
                         } else {
                           self.formLabelAlign[childrenFieldItem.id].splice(
@@ -6138,6 +6193,7 @@ export default {
                             1
                           );
                           this.$message.success("删除成功");
+                          loading.close();
                         }
                       }
                     }
@@ -6205,6 +6261,7 @@ export default {
     //防抖
     submit(bllx) {
       var self = this;
+      
       if (
         self.formLabelAlign.ajlbdm == "02000100" ||
         self.formLabelAlign.ajlbdm == "02000300" ||