Merge branch 'master' of http://git.dashitech.com/seimin/zy-pc

src/app/components/incidentManagement/incident-handle-info/incident-handle-info.component.ts

@@ -148,6 +148,7 @@ export class IncidentHandleInfoComponent implements OnInit, OnChanges {
     if(type === 'hospital' || type === 'department'){
       this.incidentCategoryList = [];
       this.incidentDataCopy.category = null;
+      this.isLoading = false;
       return;
     };
     let postData = {
@@ -164,17 +165,17 @@ export class IncidentHandleInfoComponent implements OnInit, OnChanges {
       this.isLoading = true;
     }
     this.mainService.incidentPost("listIncidentCategory", postData).subscribe(res => {
+      this.incidentCategoryList = res.data || [];
       if(isInit){
         this.handleInfoLoading = false;
+        if(this.incidentDataCopy.category){
+          let obj = this.incidentCategoryList.find(v => v.id == this.incidentDataCopy.category);
+          this.incidentDataCopy.category = obj ? obj.id : undefined;
+          this.changeCategoryHs.emit(this.incidentDataCopy.category);
+        }
       }else{
         this.isLoading = false;
       }
-      this.incidentCategoryList = res.data || [];
-      if(this.incidentDataCopy.category){
-        let obj = this.incidentCategoryList.find(v => v.id == this.incidentDataCopy.category);
-        this.incidentDataCopy.category = obj ? obj.id : undefined;
-        this.changeCategoryHs.emit(this.incidentDataCopy.category);
-      }
     })
   }