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-04-21 16:40:59 +08:00
parent 69c846b93a e46d73b601
commit fdab52cd5a
2 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
View File

@ -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) {

6
src/app/routes/supply-management/components/release-publish/release-publish.component.ts
View File

@ -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;
}