diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts index d1300d15..0a3c4816 100644 --- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts +++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts @@ -928,12 +928,14 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { this.service.msgSrv.warning('起终点相同,请重新选择装卸货地址!'); return; } - if (this.validateForm1.value.loadingTime < new Date()) { + let date1 = this.validateForm1.value.loadingTime + let date2 = new Date() + let min = date1.getMinutes() + date1.setMinutes(min+10) + if (date1 < date2 ) { this.service.msgSrv.warning('装货时间必须大于当前时间!'); return; } - console.log(this.validateForm1.value.loadingTime); - console.log(new Date()); if (this.validateForm1.value.loadingTime > this.validateForm1.value.unloadingTime) { this.service.msgSrv.warning('装货时间不能大于卸货时间!'); @@ -959,25 +961,25 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { return; } - // const getFreightParms = { carLengthKeys: this.sf4.value.carLength, km: this.totalDistance }; - // this.service.request(this.service.$api_getFreight, getFreightParms).subscribe(res => { - // if (this.sf7.value.subtotal > res.maxPrice) { - // this.service.msgSrv.error(`运费过高,请调整录入`); - // return; - // } else if (this.sf7.value.subtotal > res.ewPrice) { - // this.modalService.confirm({ - // nzTitle: '', - // nzContent: `您的录入的运费过高,可能会影响支付,请仔细确认`, - // nzOkText: '继续', - // nzCancelText: '取消', - // nzOnOk: () => { - // this.agreementConfirm(submitType); - // } - // }); - // } else { - // this.agreementConfirm(submitType); - // } - // }); + const getFreightParms = { carLengthKeys: this.sf4.value.carLength, km: this.totalDistance }; + this.service.request(this.service.$api_getFreight, getFreightParms).subscribe(res => { + if (this.sf7.value.subtotal > res.maxPrice) { + this.service.msgSrv.error(`运费过高,请调整录入`); + return; + } else if (this.sf7.value.subtotal > res.ewPrice) { + this.modalService.confirm({ + nzTitle: '', + nzContent: `您的录入的运费过高,可能会影响支付,请仔细确认`, + nzOkText: '继续', + nzCancelText: '取消', + nzOnOk: () => { + this.agreementConfirm(submitType); + } + }); + } else { + this.agreementConfirm(submitType); + } + }); } // 提交前协议弹窗 agreementConfirm(submitType?: string) { diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts index d82b9567..c625fdde 100644 --- a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts +++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts @@ -892,7 +892,11 @@ export class SupplyManagementReleasePublishComponent implements OnInit { this.service.msgSrv.warning('起终点相同,请重新选择装卸货地址!'); return; } - if (this.validateForm1.value.loadingTime < new Date()) { + let date1 = this.validateForm1.value.loadingTime + let date2 = new Date() + let min = date1.getMinutes() + date1.setMinutes(min+10) + if (date1 < date2 ) { this.service.msgSrv.warning('装货时间必须大于当前时间!'); return; }