diff --git a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts index a19255ab..53858ad0 100644 --- a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts +++ b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts @@ -596,7 +596,16 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { this.service.msgSrv.warning('请完善必填项!'); return; } - + // 校验各个输入限定值 + if (this.sf4.value.weight > this.limitValues.maxWeight || this.sf4.value.volume > this.limitValues.maxVolume || this.sf4.value.number > this.limitValues.maxTrainNumber) { + this.service.msgSrv.error(`当前货物核载信息已超出限定值【${this.limitValues.maxWeight}吨、${this.limitValues.maxVolume}方、${this.limitValues.maxTrainNumber}车】`); + return; + } + + if (this.sf4.value.freightPrice > this.limitValues.maxFreight) { + this.service.msgSrv.error(`当前运费单价已超出限定值【${this.limitValues.maxFreight}元】`); + return; + } const modalRef = this.modalService.create({ nzTitle: '运输协议', nzContent: TranAgreementComponent, @@ -613,12 +622,20 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { submit(submitType: string): void { // //装卸货信息 const LoadingList = this.startInfo.concat(this.endInfo); + // 货物信息 const sf3Values = { ...this.sf3.value }; if (sf3Values.goodsTypeName === '其它') { sf3Values.goodsName = sf3Values.goodsName1; delete sf3Values.goodsName1; } + if (this.sf4.value.carModel.includes('999')) { + this.sf4.value.carModel = ['999'] + } + if (this.sf4.value.carLength.includes('999')) { + this.sf4.value.carLength = ['999'] + } + const goodsInfoList = [ { ...sf3Values,