Merge branch 'master' into develop

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

@@ -107,6 +107,15 @@
             </nz-input-group>
           </nz-form-control>
         </nz-form-item>
+        <nz-form-item>
+          <nz-form-label style="line-height:40px;" [nzSpan]="6" nzRequired nzFor="extra8">是否初始化</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择是否初始化!">
+            <nz-radio-group formControlName="extra8">
+              <label nz-radio nzValue="1">是</label>
+              <label nz-radio nzValue="0">否</label>
+            </nz-radio-group>
+          </nz-form-control>
+        </nz-form-item>
         <nz-form-item>
           <nz-form-label [nzSpan]="6" nzRequired nzFor="extra6">项目标识</nz-form-label>
           <nz-form-control [nzSpan]="18" nzErrorTip="请输入项目标识!">

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

@@ -65,6 +65,7 @@ export class ConfigurationInspectInspectsComponent implements OnInit {
     this.validateForm.controls.extra4.setValue(data.extra4DTO ? data.extra4DTO.id : null);
     this.validateForm.controls.extra5.setValue(data.extra5DTO ? data.extra5DTO.id : null);
     this.validateForm.controls.extra7.setValue(data.deptList ? data.deptList.map(v => v.id) : []);
+    this.validateForm.controls.extra8.setValue(data.extra8 || '0');
 
     data.extra4DTO && (this.deptList = [data.extra4DTO]);
     data.deptList && (this.deptsList = data.deptList);
@@ -112,7 +113,7 @@ export class ConfigurationInspectInspectsComponent implements OnInit {
           extra4: this.validateForm.value.extra4,
           extra5: this.validateForm.value.extra5,
           extra7: this.validateForm.value.extra7.toString(),
-          extra8: '1',
+          extra8: this.validateForm.value.extra8,
         // }
       };
     } else {
@@ -120,15 +121,14 @@ export class ConfigurationInspectInspectsComponent implements OnInit {
       postData = {
         // dictionary: {
           ...this.coopData,
-          ...{
-            orders: this.validateForm.value.orders,
-            name: this.validateForm.value.name,
-            extra6: this.validateForm.value.extra6,
-            value: this.validateForm.value.value,
-            extra4: this.validateForm.value.extra4,
-            extra5: this.validateForm.value.extra5,
-            extra7: this.validateForm.value.extra7.toString(),
-          }
+          orders: this.validateForm.value.orders,
+          name: this.validateForm.value.name,
+          extra6: this.validateForm.value.extra6,
+          value: this.validateForm.value.extra6,
+          extra4: this.validateForm.value.extra4,
+          extra5: this.validateForm.value.extra5,
+          extra7: this.validateForm.value.extra7.toString(),
+          extra8: this.validateForm.value.extra8,
         // }
       };
     }
@@ -161,6 +161,7 @@ export class ConfigurationInspectInspectsComponent implements OnInit {
       extra4: [null],
       extra5: [null, [Validators.required]],
       extra7: [[]],
+      extra8: [null, [Validators.required]],
     });
   }