Selaa lähdekoodia

默认检查科室和检查类型不必填

seimin 2 kuukautta sitten
vanhempi
commit
9728223da8

+ 3 - 3
src/app/components/configurationCenter/configuration-inspect/configuration-inspect-inspects/configuration-inspect-inspects.component.html

@@ -112,7 +112,7 @@
112
           </nz-form-control>
112
           </nz-form-control>
113
         </nz-form-item>
113
         </nz-form-item>
114
         <nz-form-item>
114
         <nz-form-item>
115
-          <nz-form-label [nzSpan]="6" nzRequired nzFor="extra4">默认检查科室</nz-form-label>
115
+          <nz-form-label [nzSpan]="6" nzFor="extra4">默认检查科室</nz-form-label>
116
           <nz-form-control [nzSpan]="18" nzErrorTip="请选择默认检查科室!">
116
           <nz-form-control [nzSpan]="18" nzErrorTip="请选择默认检查科室!">
117
             <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="extra4" nzPlaceHolder="请选择默认检查科室" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeDeptInp($event)" (nzOpenChange)="openChangeDept($event)" (ngModelChange)="setIsSelecting(true)">
117
             <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="extra4" nzPlaceHolder="请选择默认检查科室" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeDeptInp($event)" (nzOpenChange)="openChangeDept($event)" (ngModelChange)="setIsSelecting(true)">
118
               <ng-container *ngFor="let option of deptList">
118
               <ng-container *ngFor="let option of deptList">
@@ -125,9 +125,9 @@
125
           </nz-form-control>
125
           </nz-form-control>
126
         </nz-form-item>
126
         </nz-form-item>
127
         <nz-form-item>
127
         <nz-form-item>
128
-          <nz-form-label [nzSpan]="6" nzRequired nzFor="extra5">检查类型</nz-form-label>
128
+          <nz-form-label [nzSpan]="6" nzFor="extra5">检查类型</nz-form-label>
129
           <nz-form-control [nzSpan]="18" nzErrorTip="请选择检查类型!">
129
           <nz-form-control [nzSpan]="18" nzErrorTip="请选择检查类型!">
130
-            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="extra5" nzPlaceHolder="请选择检查类型" nzServerSearch>
130
+            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="extra5" nzPlaceHolder="请选择检查类型" nzAllowClear nzServerSearch>
131
               <ng-container *ngFor="let data of typeList">
131
               <ng-container *ngFor="let data of typeList">
132
                 <nz-option *ngIf="!isLoading" [nzLabel]="data.name" [nzValue]="data.id"></nz-option>
132
                 <nz-option *ngIf="!isLoading" [nzLabel]="data.name" [nzValue]="data.id"></nz-option>
133
               </ng-container>
133
               </ng-container>

+ 2 - 2
src/app/components/configurationCenter/configuration-inspect/configuration-inspect-inspects/configuration-inspect-inspects.component.ts

@@ -164,8 +164,8 @@ export class ConfigurationInspectInspectsComponent implements OnInit {
164
       orders: [null, [Validators.required]],
164
       orders: [null, [Validators.required]],
165
       name: [null, [Validators.required]],
165
       name: [null, [Validators.required]],
166
       extra6: [null, [Validators.required]],
166
       extra6: [null, [Validators.required]],
167
-      extra4: [null, [Validators.required]],
168
-      extra5: [null, [Validators.required]],
167
+      extra4: [null],
168
+      extra5: [null],
169
       extra7: [[]],
169
       extra7: [[]],
170
     });
170
     });
171
   }
171
   }