Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

This commit is contained in:
Taric Xin
2022-03-02 16:42:27 +08:00
15 changed files with 209 additions and 188 deletions

View File

@ -148,12 +148,12 @@ export class NetworkFreightNewComponent implements OnInit {
});
}
submitForm() {
// if (!this.sf1.valid || !this.sf.valid) {
// this.sf.validator({ emitError: true });
// this.sf1.validator({ emitError: true });
// this.service.msgSrv.warning('请修改填写错误信息');
// return;
// }
if (!this.sf1.valid || !this.sf.valid) {
this.sf.validator({ emitError: true });
this.sf1.validator({ emitError: true });
this.service.msgSrv.warning('请修改填写错误信息');
return;
}
const enterpriseRegistrationTime = new Date(this.sf1.value.enterpriseRegistrationTime);
const operatingStartTime = new Date(this.sf1.value.operatingStartTime);
if (enterpriseRegistrationTime.getTime() > operatingStartTime.getTime()) {