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:
wangshiming
2022-03-04 15:08:34 +08:00
parent 2c46fd77bd 5db0abb42e
commit 3341787481
3 changed files with 36 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html
View File

@ -75,7 +75,7 @@
<input
nz-input
[(ngModel)]="data1.detailedAddress"
(click)="openMap('start', idx)"
(click)="openMap('start', idx,data1.detailedAddress)"
formControlName="loadAddress{{ idx }}"
placeholder="请输入装货地"
readonly="true"
@ -126,7 +126,7 @@
<input
nz-input
[(ngModel)]="data2.detailedAddress"
(click)="openMap('end', idx)"
(click)="openMap('end', idx,data2.detailedAddress)"
formControlName="unloadAddress{{ idx }}"
placeholder="请输入卸货地"
readonly="true"

23
src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts
View File

@ -443,13 +443,13 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
this.loadTime = res.loadTime;
this.unloadTime = res.unloadTime;
this.dirvingMessage = res.billExpenseDetails;
// 计算里程，时间
if (this.startInfo?.[0]?.area && this.endInfo?.[0]?.area) {
this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => {
this.totalDistance = res.distance;
this.totalTime = res.time;
});
}
// 计算里程，时间
if (this.startInfo?.[0]?.area && this.endInfo?.[0]?.area) {
this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => {
this.totalDistance = res.distance;
this.totalTime = res.time;
});
}
}
});
}
@ -560,12 +560,13 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
}
// -------------------装卸货信息处理
// 打开地图
openMap(type: string, index: number) {
openMap(type: string, index: number, address: string) {
console.log(type);
console.log(index);
const modalRef = this.modalService.create({
nzTitle: '',
nzComponentParams: { selectedAddress: address },
nzContent: AmapPoiPickerComponent,
nzWidth: 900,
nzOnOk: item => {
@ -883,8 +884,8 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
}
console.log(elf);
}
// 装卸货地址互换
swapAddress() {
// 装卸货地址互换
swapAddress() {
this.startInfo.forEach((element: any, index: any) => {
this.validateForm1.removeControl(`loadAddress${index}`);
this.validateForm1.removeControl(`loadName${index}`);