巡检

src/app/views/inspection-configuration/inspection-configuration.component.html

@@ -131,7 +131,7 @@
               </nz-radio-group>
             </nz-form-control>
           </nz-form-item>
-          <nz-form-item>
+          <nz-form-item *ngIf="validateForm.value.userGroup == 1 || validateForm.value.userGroup == 2 || validateForm.value.userGroup == 3">
             <nz-form-label [nzSpan]="5" nzRequired nzFor="groupId">维&nbsp;&nbsp;修&nbsp;&nbsp;组</nz-form-label>
             <nz-form-control [nzSpan]="19" nzErrorTip="请选择维修组!">
               <nz-select (nzOnSearch)="changeInp('group', $event)" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear formControlName="groupId" nzPlaceHolder="请选择维修组" (nzOpenChange)="changeInp('group', '')">

src/app/views/inspection-configuration/inspection-configuration.component.ts

@@ -148,8 +148,8 @@ export class InspectionConfigurationComponent implements OnInit {
       // 是责任部门
       dutyIds = hospital.id.toString();
     }else{
-      this.isLoading = false;
       this.categoryList = [];
+      this.isLoading = false;
       return;
     }
     let postData:any = {
@@ -233,7 +233,7 @@ export class InspectionConfigurationComponent implements OnInit {
       repairDeptId: [null],
       categoryId: [null],
       priorityId: [null],
-      userGroup: [1],
+      userGroup: [null],
       groupId: [null],
       userId: [null],
     });
@@ -335,7 +335,7 @@ export class InspectionConfigurationComponent implements OnInit {
 
         data.groupDTO && (this.groupList = [data.groupDTO]);
         this.validateForm.controls.groupId.setValue(data.groupId);
-        this.requiredChange('groupId', true);
+        this.requiredChange('groupId', (data.userGroup == 1 || data.userGroup == 2 || data.userGroup == 3));
 
         data.userDTO && (this.userList = [data.userDTO]);
         this.validateForm.controls.userId.setValue(data.userId);
@@ -408,17 +408,17 @@ export class InspectionConfigurationComponent implements OnInit {
     this.requiredChange('userGroup', value == 1);
     this.validateForm.controls.userGroup.setValue(value == 1 ? 1 : null);
 
-    this.requiredChange('groupId', false);
+    this.requiredChange('groupId', (this.validateForm.value.userGroup == 1 || this.validateForm.value.userGroup == 2 || this.validateForm.value.userGroup == 3));
     this.validateForm.controls.groupId.setValue(null);
     this.groupList = [];
 
-    this.requiredChange('userId', false);
+    this.requiredChange('userId', this.validateForm.value.userGroup == 3);
     this.validateForm.controls.userId.setValue(null);
     this.userList = [];
   }
 
   changeUserGroup(value){
-    this.requiredChange('groupId', true);
+    this.requiredChange('groupId', (value == 1 || value == 2 || value == 3));
     this.validateForm.controls.groupId.setValue(null);
     this.groupList = [];