bug修复

src/app/components/incidentManagement/incident-create/incident-create.component.ts

@@ -614,7 +614,11 @@ export class IncidentCreateComponent implements OnInit {
           this.applicationBuildingList = data.list;
           if(buildingId){
             let hasBuildingId = this.applicationBuildingList.some(v => v.id == buildingId);
-            hasBuildingId && (this.incidentModel.area = buildingId);
+            if(hasBuildingId){
+              this.incidentModel.area = buildingId;
+            }else{
+              this.incidentModel.area = undefined;
+            }
           }
         }
       });
@@ -627,12 +631,12 @@ export class IncidentCreateComponent implements OnInit {
   }
   // 楼层列表
   applicationFloorList:any[] = [];
-  searchApplicationFloor(keyWord?, floorId?) {
+  searchApplicationFloor(keyWord?, floorId?, buildingId?) {
     let postData = {
       idx: 0,
       sum: 9999,
       floor: {
-        buildId: this.incidentModel.area || undefined,
+        buildId: buildingId || this.incidentModel.area || undefined,
         hosId: this.incidentModel.hosId,
       },
     };
@@ -645,7 +649,11 @@ export class IncidentCreateComponent implements OnInit {
           this.applicationFloorList = data.list;
           if(floorId){
             let hasFloorId = this.applicationFloorList.some(v => v.id == floorId);
-            hasFloorId && (this.incidentModel.place = floorId);
+            if(hasFloorId){
+              this.incidentModel.place = floorId;
+            }else{
+              this.incidentModel.place = undefined;
+            }
           }
         }
       });
@@ -751,7 +759,7 @@ export class IncidentCreateComponent implements OnInit {
       let buildingId = deptObj.building ? deptObj.building.id : undefined;
       buildingId && this.searchApplicationBuilding('', buildingId);
       let floorId = deptObj.floor ? deptObj.floor.id : undefined;
-      floorId && this.searchApplicationFloor('', floorId);
+      buildingId && floorId && this.searchApplicationFloor('', floorId, buildingId);
       this.incidentModel.houseNumber = deptObj.address;
     }
 

src/app/components/incidentManagement/incident-substitutio-assign/incident-substitution-assign.component.ts

@@ -94,7 +94,7 @@ export class IncidentSubstitutionAssignComponent implements OnInit {
     if(id === 1){
       // 人
       this.requiredConfigChange('userId', true);
-    }else if(id === 2){
+    }else{
       // 组
       this.requiredConfigChange('userId', false);
     }

src/app/views/fuwutai/fuwutai.component.ts

@@ -3052,7 +3052,11 @@ export class FuwutaiComponent implements OnInit {
           this.applicationBuildingList = data.list;
           if(buildingId){
             let hasBuildingId = this.applicationBuildingList.some(v => v.id == buildingId);
-            hasBuildingId && (this.incidentModel.area = buildingId);
+            if(hasBuildingId){
+              this.incidentModel.area = buildingId;
+            }else{
+              this.incidentModel.area = undefined;
+            }
           }
         }
       });
@@ -3065,12 +3069,12 @@ export class FuwutaiComponent implements OnInit {
   }
   // 楼层列表
   applicationFloorList:any[] = [];
-  searchApplicationFloor(keyWord?, floorId?) {
+  searchApplicationFloor(keyWord?, floorId?, buildingId?) {
     let postData = {
       idx: 0,
       sum: 9999,
       floor: {
-        buildId: this.incidentModel.area || undefined,
+        buildId: buildingId || this.incidentModel.area || undefined,
         hosId: this.incidentModel.hosId,
       },
     };
@@ -3083,7 +3087,11 @@ export class FuwutaiComponent implements OnInit {
           this.applicationFloorList = data.list;
           if(floorId){
             let hasFloorId = this.applicationFloorList.some(v => v.id == floorId);
-            hasFloorId && (this.incidentModel.place = floorId);
+            if(hasFloorId){
+              this.incidentModel.place = floorId;
+            }else{
+              this.incidentModel.place = undefined;
+            }
           }
         }
       });
@@ -3253,7 +3261,7 @@ export class FuwutaiComponent implements OnInit {
       let buildingId = deptObj.building ? deptObj.building.id : undefined;
       buildingId && this.searchApplicationBuilding('', buildingId);
       let floorId = deptObj.floor ? deptObj.floor.id : undefined;
-      floorId && this.searchApplicationFloor('', floorId);
+      buildingId && floorId && this.searchApplicationFloor('', floorId, buildingId);
       this.incidentModel.houseNumber = deptObj.address;
     }