Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Taric Xin
2022-02-21 20:50:47 +08:00
parent a75f0872fe a735f6947b
commit 602be660ce
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/app/routes/sys-setting/components/network-freight/new/new.component.ts
View File

@ -100,7 +100,7 @@ export class NetworkFreightNewComponent implements OnInit {
console.log(res);
this.sf2FormData = res
this.sf1FormData = res.enterpriseInfoVO
this.sf1FormData.legalPersonIdentityVO.isLoingDate = this.sf1FormData.legalPersonIdentityVO.validEndTime !== null ? false : true;
this.sf1FormData.isLoingDate = this.sf1FormData.operatingEndTime !== null ? false : true;
this.sf1FormData.licensePhotoWatermark = [
{
uid: -1,
@ -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()) {
@ -167,6 +167,13 @@ export class NetworkFreightNewComponent implements OnInit {
return;
}
}
if (this.sf1.value.isLoingDate) {
this.sf1.value.operatingEndTime = '';
}
console.log(this.sf1.value)
console.log(this.sf1.valid)
console.log(this.sf.value)
console.log(this.sf.valid)
const sfVlaue = this.sf1.value;
const params: any = {};
Object.assign(