BUG修改

src/app/components/configurationCenter/configuration-category/configuration-category.component.html

@@ -194,7 +194,7 @@
           <nz-form-label nzFor="category1" nzRequired [nzSpan]="6">一级故障现象</nz-form-label>
           <nz-form-control [nzSpan]="24" nzErrorTip="请选择一级故障现象!">
 						<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzPlaceHolder="请选择一级故障现象" formControlName="category1" (ngModelChange)="changeOneCategory($event)">
-						  <ng-container *ngFor="let option of categoryList1">
+						  <ng-container *ngFor="let option of categoryListP1">
 						    <nz-option *ngIf="!isLoading" [nzLabel]="option.category" [nzValue]="option.id"></nz-option>
 						  </ng-container>
 						  <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
@@ -204,10 +204,10 @@
           </nz-form-control>
         </nz-form-item>
         <nz-form-item *ngIf="!add && coopType === 3">
-          <nz-form-label nzFor="category2" nzRequired [nzSpan]="6">二级故障现象</nz-form-label>
+          <nz-form-label nzFor="category2" nzRequired [nzSpan]="6">{{activeCategory2.id}}二级故障现象</nz-form-label>
           <nz-form-control [nzSpan]="24" nzErrorTip="请选择二级故障现象!">
 						<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzPlaceHolder="请选择二级故障现象" formControlName="category2">
-						  <ng-container *ngFor="let option of categoryList2">
+						  <ng-container *ngFor="let option of categoryListP2">
 						    <nz-option *ngIf="!isLoading" [nzLabel]="option.category" [nzValue]="option.id"></nz-option>
 						  </ng-container>
 						  <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>

src/app/components/configurationCenter/configuration-category/configuration-category.component.ts

@@ -6,6 +6,7 @@ import { MainService } from "../../../services/main.service";
 import { Validators, FormGroup, FormBuilder } from '@angular/forms';
 import { ToolService } from 'src/app/services/tool.service';
 import { OverlayScrollbarsComponent } from 'overlayscrollbars-ngx';
+import cloneDeep from 'lodash-es/cloneDeep'
 
 @Component({
   selector: "app-configuration-category",
@@ -363,6 +364,7 @@ export class ConfigurationCategoryComponent implements OnInit {
     this.mainService.incidentPost("listIncidentCategory", postData).subscribe(res => {
       this['categoryLoading' + type] = false;
       this['categoryList' + type] = res.data || [];
+      this['categoryListP' + type] = cloneDeep(this['categoryList' + type]);
       if(isEdit){
         this['activeCategory' + type] = this['categoryList' + type].find(v => v.id == this['activeCategory' + type].id);
       }
@@ -373,6 +375,25 @@ export class ConfigurationCategoryComponent implements OnInit {
     })
   }
 
+  // 弹窗-故障现象查询
+  categoryListP1: any[] = [];
+  categoryListP2: any[] = [];
+  categoryListP3: any[] = [];
+  getCategoryListP(type:number, parentId = 0) {
+    this.isLoading = true;
+    let postData = {
+      category: {
+        hierarchy: type === 1 ? 1 : undefined,
+        dutyIds: this.hospitalConfig === 1 ? this.currentHospital.id.toString()  : undefined,
+        parent: type === 1 ? undefined : { id: parentId },
+      },
+    };
+    this.mainService.incidentPost("listIncidentCategory", postData).subscribe(res => {
+      this.isLoading = false;
+      this['categoryListP' + type] = res.data || [];
+    })
+  }
+
   // 新增故障现象弹框
   modelName = ""; //模态框名称
   add: boolean; //true:新增；false:编辑
@@ -431,8 +452,11 @@ export class ConfigurationCategoryComponent implements OnInit {
 
     this.validateCategoryForm.controls.name.setValue(data.category);
     if(type === 2){
+      this.categoryListP1 = cloneDeep(this.categoryList1);
       this.validateCategoryForm.controls.category1.setValue(this.activeCategory1.id);
     }else if(type === 3){
+      this.categoryListP1 = cloneDeep(this.categoryList1);
+      this.categoryListP2 = cloneDeep(this.categoryList2);
       this.validateCategoryForm.controls.category1.setValue(this.activeCategory1.id);
       this.validateCategoryForm.controls.category2.setValue(this.activeCategory2.id);
     }
@@ -480,13 +504,15 @@ export class ConfigurationCategoryComponent implements OnInit {
       console.log(this['activeCategory' + this.coopType])
       //编辑
       let postData = {
-        ...this.coopData,
-        parent: this.coopType === 1 ? undefined : (this.coopType === 2 ? { id: this.validateCategoryForm.value.category1 } : { id: this.validateCategoryForm.value.category2 }),
-        category: this.validateCategoryForm.value.name,
+        incidentCategory: {
+          ...this.coopData,
+          parent: this.coopType === 1 ? undefined : (this.coopType === 2 ? { id: this.validateCategoryForm.value.category1 } : { id: this.validateCategoryForm.value.category2 }),
+          category: this.validateCategoryForm.value.name,
+        }
       };
       console.log(postData);
       this.mainService
-        .simplePost("addData", "incidentCategory", postData)
+        .coopData("updData", "incidentCategory", postData)
         .subscribe((result) => {
           this.btnLoading = false;
           this.hideCategoryModal();
@@ -760,7 +786,7 @@ export class ConfigurationCategoryComponent implements OnInit {
   // 修改故障现象
   changeOneCategory(id){
     this.validateCategoryForm.controls.category2.setValue(null);
-    this.getCategoryList(2, id);
+    this.getCategoryListP(2, id);
   }
 
   // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）