Bläddra i källkod

检查类型必填

seimin 2 månader sedan
förälder
incheckning
ea2881f5fc

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

@@ -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" nzFor="extra5">检查类型</nz-form-label>
128
+          <nz-form-label [nzSpan]="6" nzRequired 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="请选择检查类型" nzAllowClear nzServerSearch>
130
+            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="extra5" nzPlaceHolder="请选择检查类型" 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>

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

@@ -101,17 +101,10 @@ export class ConfigurationInspectInspectsComponent implements OnInit {
101
 
101
 
102
     if (this.add) {
102
     if (this.add) {
103
       //增加
103
       //增加
104
-      let n = 0;
105
-      if (this.dataList.length > 0) {
106
-        let sortArr = this.dataList.map((item) => Number(item.value));
107
-        n = Math.max.apply(null, sortArr);
108
-      } else {
109
-        n = 0;
110
-      }
111
       postData = {
104
       postData = {
112
         // dictionary: {
105
         // dictionary: {
113
           key: "inspect_check_type",
106
           key: "inspect_check_type",
114
-          value: n + 1,
107
+          value: this.validateForm.value.extra6,
115
           desc: "检查项目",
108
           desc: "检查项目",
116
           orders: this.validateForm.value.orders,
109
           orders: this.validateForm.value.orders,
117
           name: this.validateForm.value.name,
110
           name: this.validateForm.value.name,
@@ -131,6 +124,7 @@ export class ConfigurationInspectInspectsComponent implements OnInit {
131
             orders: this.validateForm.value.orders,
124
             orders: this.validateForm.value.orders,
132
             name: this.validateForm.value.name,
125
             name: this.validateForm.value.name,
133
             extra6: this.validateForm.value.extra6,
126
             extra6: this.validateForm.value.extra6,
127
+            value: this.validateForm.value.value,
134
             extra4: this.validateForm.value.extra4,
128
             extra4: this.validateForm.value.extra4,
135
             extra5: this.validateForm.value.extra5,
129
             extra5: this.validateForm.value.extra5,
136
             extra7: this.validateForm.value.extra7.toString(),
130
             extra7: this.validateForm.value.extra7.toString(),
@@ -165,7 +159,7 @@ export class ConfigurationInspectInspectsComponent implements OnInit {
165
       name: [null, [Validators.required]],
159
       name: [null, [Validators.required]],
166
       extra6: [null, [Validators.required]],
160
       extra6: [null, [Validators.required]],
167
       extra4: [null],
161
       extra4: [null],
168
-      extra5: [null],
162
+      extra5: [null, [Validators.required]],
169
       extra7: [[]],
163
       extra7: [[]],
170
     });
164
     });
171
   }
165
   }