diff --git a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts index 438f255a..57f100ae 100644 --- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts +++ b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts @@ -193,10 +193,10 @@ export class SupplyManagementBulkPublishComponent implements OnInit { type: 'string', title: '调度员手机号', maxLength: 30, - ui: { + ui: { placeholder: '请输入' } - }, + } }, required: ['shipperAppUserId', 'enterpriseProjectId', 'enterpriseInfoName', 'deadlineTime'] }; @@ -204,7 +204,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit { '*': { spanLabelFixed: 115, grid: { span: 12 } - }, + } }; } initSF3() { @@ -275,7 +275,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit { } } }, - required: ['goodsTypeId', 'goodsName', 'goodsNameId','goodsName1'] + required: ['goodsTypeId', 'goodsName', 'goodsNameId', 'goodsName1'] }; this.ui3 = { '*': { @@ -534,7 +534,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit { Number(this.sf7?.value?.receiptPay) + Number(this.sf7?.value?.toPay); } - initDict() { + initDict() { this.service.getDictByKey('freight:type').subscribe(res => { this.freightTypeOptions = res; }); @@ -716,7 +716,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit { unLoadingPlaceDTOList: LoadingList, goodsInfoDTOList: goodsInfoDTOList, estimatedKilometers: this.totalDistance, - estimatedTravelTime: this.totalTime, + estimatedTravelTime: this.totalTime }; params.freightPrice = this.totalFees; const modalRef = this.modalService.create({ @@ -724,7 +724,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit { nzContent: TranAgreementComponent, nzWidth: 900, nzFooter: null, - nzComponentParams: { object: params, shipperName: this.shipperName , type:'bulk'} + nzComponentParams: { object: params, shipperName: this.shipperName, type: 'bulk' } }); modalRef.afterClose.subscribe(result => { if (result) { @@ -1011,13 +1011,13 @@ export class SupplyManagementBulkPublishComponent implements OnInit { if (this.PageStatus === '大宗修改') { this.sf4data.id = res?.goodsInfoVOList[0]?.id; } - // 计算里程,时间 - if (this.startInfo[0]?.detailedAddress && this.endInfo[0]?.detailedAddress) { - this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { - this.totalDistance = res.distance; - this.totalTime = res.time; - }); - } + // 计算里程,时间 + if (this.startInfo[0]?.detailedAddress && this.endInfo[0]?.detailedAddress) { + this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { + this.totalDistance = res.distance; + this.totalTime = res.time; + }); + } this.totalFees = res?.freightPrice || '0'; this.sf7data = { stateReceipt: res?.stateReceipt, @@ -1090,13 +1090,13 @@ export class SupplyManagementBulkPublishComponent implements OnInit { element.type = '2'; }); - // 计算里程,时间 - if (this.startInfo[0]?.detailedAddress && this.endInfo[0]?.detailedAddress) { - this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { - this.totalDistance = res.distance; - this.totalTime = res.time; - }); - } + // 计算里程,时间 + if (this.startInfo[0]?.detailedAddress && this.endInfo[0]?.detailedAddress) { + this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { + this.totalDistance = res.distance; + this.totalTime = res.time; + }); + } } getLimitvalue() { const getlimitvaluesParms = [ diff --git a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html index c77af698..db754dcf 100644 --- a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html +++ b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html @@ -134,20 +134,12 @@ - + - + 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 b4fbcb67..78ce97a5 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 @@ -39,6 +39,7 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { creatTime: any; // 货源单设置回显 modifyTime: any; // 货源单设置回显 totalFees: any; // 总数信息 + ruleOptions: any; id = ''; type = 'add'; limitValues = { @@ -89,6 +90,7 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { this.initSF4(); this.initSF6(); this.getLimitvalue(); + this.initDict(); this.startInfo = [ { detailedAddress: '', @@ -538,6 +540,14 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { } }; } + initDict() { + this.service.getDictByKey('freight:type').subscribe(res => { + this.freightTypeOptions = res; + }); + this.service.getDictByKey('goodresource:rounding:rules').subscribe(res => { + this.ruleOptions = res; + }); + } //指派熟车 chooseFamifiar(item: any) { const modalRef = this.modalService.create({