Merge branch 'master' into lmm

src/app/views/office-management/office-management.component.ts

@@ -512,17 +512,21 @@ export class OfficeManagementComponent implements OnInit {
       .subscribe((data) => {
         that.btnLoading = false;
         that.delModal = false;
-        if (data.status == 200 && !data.data[0].msg) {
-          if (
-            that.listOfData.length == 1 &&
-            that.pageIndex == Math.ceil(that.listLength / that.pageSize)
-          ) {
-            that.listLength--;
-            that.pageIndex = Math.ceil(that.listLength / that.pageSize);
+        if (data.data && data.data[0]) {
+          if (!data.data[0].msg) {
+            if (
+              that.listOfData.length == 1 &&
+              that.pageIndex == Math.ceil(that.listLength / that.pageSize)
+            ) {
+              that.listLength--;
+              that.pageIndex = Math.ceil(that.listLength / that.pageSize);
+            }
+            that.showPromptModal("删除", true, "");
+          } else {
+            that.showPromptModal("删除", false, data.data[0].msg);
           }
-          that.showPromptModal("删除", true, "");
         } else {
-          that.showPromptModal("删除", false, data.data[0].msg);
+          that.showPromptModal("删除", false, "");
         }
       });
   }

src/app/views/task-type-management/task-type-management.component.ts

@@ -1096,12 +1096,16 @@ export class TaskTypeManagementComponent implements OnInit {
         .subscribe((data) => {
           this.btnLoading = false;
           this.delModal = false;
-          if (data.status == 200 && !data.data[0].msg) {
-            this.showPromptModal("删除", true, "");
-            this.getAllTaskType();
-            this.itemChoice(this.allTaskType[0], this.index);
+          if (data.data && data.data[0]) {
+            if (!data.data[0].msg) {
+              this.showPromptModal("删除", true, "");
+              this.getAllTaskType();
+              this.itemChoice(this.allTaskType[0], this.index);
+            } else {
+              this.showPromptModal("删除", false, data.data[0].msg);
+            }
           } else {
-            this.showPromptModal("删除", false, data.data[0].msg);
+            this.showPromptModal("删除", false, "");
           }
         });
     } else {