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 593cc5a0..9afc524e 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 @@ -19,14 +19,14 @@
- - - - + + + +
-
+
{{ i?.goodsResource?.enterpriseInfoName }} {{ i?.goodsResource?.shipperAppUserName }} @@ -34,86 +34,57 @@ {{i?.goodsResource?.serviceTypeLabel}} {{i?.goodsResource?.dispatchName}} 18100000000 {{i?.goodsResource?.dispatchName}} -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+ + + + + + + + + + + + + - +
  -   -   +   +    
- - + + 货物信息 - - {{i?.goodsResource?.enterpriseInfoName}} - - - {{i?.goodsInfoList?.[0]?.goodsName}} - + + {{i?.goodsResource?.enterpriseInfoName}} + + + {{i?.goodsInfoList?.[0]?.goodsName}} + - - {{i?.goodsInfoList?.[0]?.weight}}顿,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件 - - - {{i?.goodsInfoList?.[0]?.maxWeightLabel}}/{{i?.goodsInfoList?.[0]?.maxCube}} - - - - - - {{i?.goodsInfoList?.[0]?.weight}}顿,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件 - + + {{i?.goodsInfoList?.[0]?.weight}}顿,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件 + + + {{i?.goodsInfoList?.[0]?.maxWeightLabel}}/{{i?.goodsInfoList?.[0]?.maxCube}} + + + + + + {{i?.goodsInfoList?.[0]?.weight}}顿,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件 +

装货卸货信息 @@ -158,7 +129,7 @@ - + @@ -166,7 +137,7 @@
收款人：
 - + @@ -202,11 +173,11 @@ {{i?.goodsResource?.receiptAddress}} - + - + {{i?.goodsResource?.remarks}} @@ -216,26 +187,27 @@
- -
+ +
- -
-
- -
-
+
+
+ +
+

- + - + \ No newline at end of file diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.less b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.less index 8ae5eed8..b0f0fde2 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.less +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.less @@ -35,23 +35,6 @@ } } - .ant-tabs-top>.ant-tabs-nav, - .ant-tabs-bottom>.ant-tabs-nav, - .ant-tabs-top>div>.ant-tabs-nav, - .ant-tabs-bottom>div>.ant-tabs-nav { - margin: 0; - } - - .ant-anchor-ink::before { - width: 0; - } - - .ant-tabs-card.ant-tabs-top>.ant-tabs-nav .ant-tabs-tab+.ant-tabs-tab, - .ant-tabs-card.ant-tabs-bottom>.ant-tabs-nav .ant-tabs-tab+.ant-tabs-tab, - .ant-tabs-card.ant-tabs-top>div>.ant-tabs-nav .ant-tabs-tab+.ant-tabs-tab, - .ant-tabs-card.ant-tabs-bottom>div>.ant-tabs-nav .ant-tabs-tab+.ant-tabs-tab { - margin-left: 40px - } } .leftPadding { 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 9f228631..e5f050ae 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 @@ -11,6 +11,7 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { STColumn } from '@delon/abc/st'; import { _HttpClient } from '@delon/theme'; +import { NzCardComponent } from 'ng-zorro-antd/card'; import { NzMessageService } from 'ng-zorro-antd/message'; import { NzModalService } from 'ng-zorro-antd/modal'; import { OrderManagementService } from '../../services/order-management.service'; @@ -20,12 +21,11 @@ import { OrderManagementService } from '../../services/order-management.service' styleUrls: ['./vehicle-detail.component.less'] }) export class OrderManagementVehicleDetailComponent implements OnInit { - id = this.route.snapshot.params.id; - i: any= { - unLoadingPlaceList:[], + i: any = { + unLoadingPlaceList: [], billExpenseDetails: [], - goodsInfoList:[], + goodsInfoList: [], goodsResource: [] }; imges: any; @@ -48,9 +48,9 @@ export class OrderManagementVehicleDetailComponent implements OnInit { '1': { text: '待申请', color: 'warning' }, '2': { text: '已支付', color: 'success' }, '3': { text: '已拒绝', color: 'warning' }, - '4': { text: '申请中', color: 'warning' }, - }, - }, + '4': { text: '申请中', color: 'warning' } + } + } ]; constructor( @@ -59,30 +59,28 @@ export class OrderManagementVehicleDetailComponent implements OnInit { private service: OrderManagementService, private modalService: NzModalService, private router: Router - ) { - - } + ) {} ngOnInit(): void { - console.log(this.id) - this.initData() + console.log(this.id); + this.initData(); } initData() { - this.service.request(this.service.$api_get_getWholeBillDetail, {id: this.id}).subscribe(res => { - console.log(res) + this.service.request(this.service.$api_get_getWholeBillDetail, { id: this.id }).subscribe(res => { + console.log(res); if (res) { - this.i =res; - this.approvalLsit = res.scheduleVOList + this.i = res; + this.approvalLsit = res.scheduleVOList; this.approvalLsit.map((item: any, key: any) => { - console.log(item) - if(item.displayStatus === 'HIDE') { - delete(this.approvalLsit[key]) + console.log(item); + if (item.displayStatus === 'HIDE') { + delete this.approvalLsit[key]; } - }) - console.log(this.approvalLsit) + }); + console.log(this.approvalLsit); } - }) + }); } goBack() { @@ -90,21 +88,27 @@ export class OrderManagementVehicleDetailComponent implements OnInit { } // 修改订单 changeOrder() { - console.log(this.id) - this.router.navigate(['order-management/vehicle-detailChange', this.id]) + console.log(this.id); + this.router.navigate(['order-management/vehicle-detailChange', this.id]); } agreement(value: any) { - if(value === '1') { - this.imges = this.i?.agreementFilePath + 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() { - this.isVisible = false + this.isVisible = false; } handleOK() { - this.isVisible = false + this.isVisible = false; + } + + goDistance(elf: NzCardComponent) { + if (elf) { + elf['elementRef'].nativeElement.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'start' }); + } } }