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

'fixbug'

Browse Source
This commit is contained in:
1107302052
2022-03-18 00:43:17 +08:00
parent d9d9ea2733
commit 759c829c4d
3 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts
View File

@ -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 = [