From f298ead5bbd3d88bad7fd9956967ab858003a226 Mon Sep 17 00:00:00 2001 From: 1107302052 <1107302052@qq.com> Date: Fri, 18 Mar 2022 15:42:50 +0800 Subject: [PATCH] 'fixbug' --- .../bulk-detail-change.component.html | 3 +- .../bulk-detail-change.component.ts | 6 +- .../bulk-detail/bulk-detail.component.html | 3 +- .../bulk-detail/bulk-detail.component.ts | 6 +- .../vehicle-detail-change.component.html | 3 +- .../vehicle-detail-change.component.ts | 6 +- .../vehicle-detail.component.html | 3 +- .../vehicle-detail.component.ts | 6 +- .../bulk-detail/bulk-detail.component.html | 3 +- .../bulk-detail/bulk-detail.component.ts | 12 +-- .../vehicle-detail.component.html | 3 +- .../vehicle-detail.component.ts | 100 ++++++++---------- 12 files changed, 59 insertions(+), 95 deletions(-) diff --git a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html index b345a0b4..fc988391 100644 --- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html +++ b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html @@ -281,7 +281,7 @@ 查看附件     - 补充协议 + 补充协议 @@ -360,6 +360,7 @@ +
暂无附件信息
 diff --git a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts index 9d9756a2..540b5f26 100644 --- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts +++ b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts @@ -908,11 +908,7 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit { }); }; agreement(value: any) { - if (value === '1') { - this.imges = this.i?.supplementAgreement; - } else if (value === '2') { - this.imges = this.i?.supplementAgreement; - } + this.imges = this.i?.agreementFilePath; this.isVisible = true; } handleCancel() { diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html index 1e8b09a2..277877f9 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html @@ -162,7 +162,7 @@ 查看附件      - 补充协议 + 补充协议 @@ -248,6 +248,7 @@ +
暂无附件信息
 diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts index 32ad9e11..330ddbb0 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts @@ -112,11 +112,7 @@ export class OrderManagementBulkeDetailComponent implements OnInit { this.router.navigate(['order-management/bulk-detailChange', this.id]); } agreement(value: any) { - if (value === '1') { - this.imges = this.i?.supplementAgreement; - } else if (value === '2') { - this.imges = this.i?.supplementAgreement; - } + this.imges = this.i?.agreementFilePath; this.isVisible = true; } handleCancel() { diff --git a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html index 91ee9a8e..b5c99884 100644 --- a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html +++ b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html @@ -256,7 +256,7 @@ 查看附件     - 补充协议 + 补充协议 @@ -333,6 +333,7 @@ +
暂无附件信息
 diff --git a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts index ad8c312e..98579deb 100644 --- a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts +++ b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts @@ -855,11 +855,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit { }); }; agreement(value: any) { - if (value === '1') { - this.imges = this.i?.supplementAgreement; - } else if (value === '2') { - this.imges = this.i?.supplementAgreement; - } + this.imges = this.i?.agreementFilePath; this.isVisible = true; } handleCancel() { diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html index 0132ecbd..5505d9f2 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html @@ -168,7 +168,7 @@ 查看附件      - 补充协议 + 补充协议 @@ -230,6 +230,7 @@ +
暂无附件信息
 diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts index d05ad48a..02f7ca45 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts @@ -124,11 +124,7 @@ export class OrderManagementVehicleDetailComponent implements OnInit { this.router.navigate(['order-management/vehicle-detailChange', this.id]); } agreement(value: any) { - if (value === '1') { - this.imges = this.i?.agreementFilePath; - } else if (value === '2') { - this.imges = this.i?.agreementFilePath; - } + this.imges = this.i?.agreementFilePath; this.isVisible = true; } handleCancel() { diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html index 5be7f348..5b80e49d 100644 --- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html @@ -182,7 +182,7 @@ 查看附件      - 补充协议 + 补充协议 @@ -248,6 +248,7 @@ +
暂无附件信息
 diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts index 65f66053..6b296b13 100644 --- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts +++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts @@ -102,17 +102,7 @@ export class WaybillManagementBulkeDetailComponent implements OnInit { window.history.go(-1); } agreement(value: any) { - console.log('123') - console.log(value) - if(value === '1') { - this.imges = this.i?.supplementAgreement - } else if (value === '2') { - this.imges = this.i?.loadingCertificate - } else if (value === '3') { - this.imges = this.i?.unLoadingCertificate - } else if (value === '4') { - this.imges = this.i?.receiptCertificate - } + this.imges = this.i?.agreementFilePath this.isVisible = true; } handleCancel() { diff --git a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html index 6a5d17b4..90e6e556 100644 --- a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html @@ -164,7 +164,7 @@ 查看附件      - 补充协议 + 补充协议 @@ -228,6 +228,7 @@ +
暂无附件信息
 diff --git a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts index 19af415f..bd34a6f3 100644 --- a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts +++ b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts @@ -24,12 +24,11 @@ import { WaybillManagementServe } from '../../services/waybill-management.servic styleUrls: ['./vehicle-detail.component.less'] }) export class WaybillManagementVehicleDetailComponent implements OnInit, OnDestroy { - id = this.route.snapshot.params.id; - MapList: any[]=[]; + MapList: any[] = []; trajectory = 'car'; - mapList:any[] = []; //地图点位数据组 - addressItems:any[] = []; //打点地址数据组 + mapList: any[] = []; //地图点位数据组 + addressItems: any[] = []; //打点地址数据组 i: any; totalObj: any; attObj: any; @@ -50,7 +49,7 @@ export class WaybillManagementVehicleDetailComponent implements OnInit, OnDestro { title: '支付状态', className: 'text-center', - index: 'paymentStatusLabel', + index: 'paymentStatusLabel' } ]; @@ -60,19 +59,16 @@ export class WaybillManagementVehicleDetailComponent implements OnInit, OnDestro private route: ActivatedRoute, private msgSrv: NzMessageService, private service: WaybillManagementServe, - private modal: NzModalService, - ) { - - } + private modal: NzModalService + ) {} ngOnDestroy(): void { this.subscribeScoll.unsubscribe(); } - ngOnInit(): void { - this.initData() - this.getTrajectory() + this.initData(); + this.getTrajectory(); this.subscribeScoll = fromEvent(window, 'scroll').subscribe(event => { this.scrollTop = document.documentElement.scrollTop; }); @@ -80,48 +76,38 @@ export class WaybillManagementVehicleDetailComponent implements OnInit, OnDestro initData() { const params = { id: this.id - } - this.service.request(this.service.$api_get_getWholeDetail, params).subscribe((res) => { - console.log(res) - this.unLoadingPlaceVOList.push(...res.loadingPlace) - this.unLoadingPlaceVOList.push(...res.dischargePlace) - console.log(this.unLoadingPlaceVOList) + }; + this.service.request(this.service.$api_get_getWholeDetail, params).subscribe(res => { + console.log(res); + this.unLoadingPlaceVOList.push(...res.loadingPlace); + this.unLoadingPlaceVOList.push(...res.dischargePlace); + console.log(this.unLoadingPlaceVOList); this.i = res; this.billExpenses = this.i?.billExpenseDetailVOList?.filter( (data: any) => data.costCode === 'PRE' || data.costCode === 'RECE' || data.costCode === 'BACK' ); this.i.scheduleVOList = this.i?.scheduleVOList?.filter((data: any) => data.displayStatus !== 'HIDE'); - }) + }); } goBack() { window.history.go(-1); } agreement(value: any) { - console.log('123') - console.log(value) - if(value === '1') { - this.imges = this.i?.supplementAgreement - } else if (value === '2') { - this.imges = this.i?.loadingCertificate - } else if (value === '3') { - this.imges = this.i?.unLoadingCertificate - } else if (value === '4') { - this.imges = this.i?.receiptCertificate - } + this.imges = this.i?.agreementFilePath; this.isVisible = true; } handleCancel() { - this.isVisible = false -} -handleOK() { - this.isVisible = false -} -goDistance(elf: NzCardComponent) { - if (elf) { - elf['elementRef'].nativeElement.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'start' }); + this.isVisible = false; + } + handleOK() { + this.isVisible = false; + } + goDistance(elf: NzCardComponent) { + if (elf) { + elf['elementRef'].nativeElement.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'start' }); + } } -} // *确认发车 sureDepart(item: any) { @@ -136,9 +122,8 @@ goDistance(elf: NzCardComponent) { nzFooter: null }); modalRef.afterClose.subscribe((result: any) => { - this.initData() - - }); + this.initData(); + }); } // 确认到车 sureArrive(item: any) { @@ -153,17 +138,16 @@ goDistance(elf: NzCardComponent) { nzFooter: null }); modalRef.afterClose.subscribe((result: any) => { - this.initData() - - }); + this.initData(); + }); } // 获取车辆轨迹 - getTrajectory(){ + getTrajectory() { this.service.request(this.service.$api_get_getTrajectory, { id: this.id }).subscribe(res => { if (res) { const points = res.trackArray; - let list :any[] = []; + let list: any[] = []; points?.forEach((item: any) => { list.push({ name: item.hgt, @@ -172,7 +156,7 @@ goDistance(elf: NzCardComponent) { }); this.mapList = list; this.addressItems = res.cityArray; - if(this.addressItems && this.addressItems.length > 0){ + if (this.addressItems && this.addressItems.length > 0) { this.addressItems.forEach(item => { item.vinOutTime = this.getLocalTime(item.vinOutTime); }); @@ -181,12 +165,12 @@ goDistance(elf: NzCardComponent) { }); } - // 获取司机轨迹 - getDriverTrajectory(){ + // 获取司机轨迹 + getDriverTrajectory() { this.service.request(this.service.$api_get_getAppDriverPosition, { id: this.id }).subscribe(res => { if (res) { const points = res.tracks; - let list :any[] = []; + let list: any[] = []; points?.forEach((item: any) => { list.push({ name: item.hgt, @@ -195,7 +179,7 @@ goDistance(elf: NzCardComponent) { }); this.mapList = list; this.addressItems = [...res.enclosureDataAppTrack]; - if(this.addressItems && this.addressItems.length > 0){ + if (this.addressItems && this.addressItems.length > 0) { this.addressItems.forEach(item => { item.vinOutTime = this.getLocalTime(item.gtm); item.cityName = item.appAdress; @@ -203,14 +187,14 @@ goDistance(elf: NzCardComponent) { } } }); - } - trajectoryChange(event:any){ - if(event ==='car'){ - this.getTrajectory() - }else if(event ==='driver'){ + } + trajectoryChange(event: any) { + if (event === 'car') { + this.getTrajectory(); + } else if (event === 'driver') { this.getDriverTrajectory(); } - } + } getLocalTime(time: any) { return format(new Date(parseInt(time)), 'yyyy-MM-dd HH:mm:ss'); }