Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/Sinopec-Anxin

src/app/pages/audit/audit-inform-time/edit-inform-time/edit-inform-time.component.ts

@@ -24,10 +24,11 @@ export class EditInformTimeComponent implements OnInit {
     this.validateForm = this.fb.group({
       time1: [this.dataCopy.handleRemindDays, [Validators.required]],
       time2: [this.dataCopy.closingRemindDays, [Validators.required]],
-      time: [this.dataCopy.yearlyCheckDate, [Validators.required]],//年检时间
+      time: [this.dataCopy.yearlyCheckDate, this.dataCopy.isYearlyCheckDefault ? [Validators.required] : null],//年检时间
       explain: [null]
     });
 
+
   }
 
 
@@ -46,7 +47,7 @@ export class EditInformTimeComponent implements OnInit {
         organizationId: this.dataCopy.organizationId,
         handleRemindDays: this.validateForm.value.time1,
         closingRemindDays: this.validateForm.value.time2,
-        yearlyCheckDate: moment(this.validateForm.value.time).format('YYYY-MM-DD'),
+        yearlyCheckDate: this.dataCopy.isYearlyCheckDefault ? moment(this.validateForm.value.time).format('YYYY-MM-DD') : null,
         remark: this.validateForm.value.explain
       }
       console.log(body)