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

edit

Browse Source
This commit is contained in:
Taric Xin
2021-12-28 11:10:46 +08:00
parent 9ffc4c6f89
commit 1a4a0bbf15
3 changed files with 92 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,63 +35,34 @@
<sv label="录单员">{{i?.goodsResource?.dispatchName}} 18100000000 </sv> <sv label="录单员">{{i?.goodsResource?.dispatchName}} 18100000000 </sv>
<sv label="调度员">{{i?.goodsResource?.dispatchName}} </sv> <sv label="调度员">{{i?.goodsResource?.dispatchName}} </sv>
</div> </div>
<nz-tabset nzType="card" style="margin-top: 15px;"> <nz-tabset style="margin-top: 15px;">
<nz-tab [nzTitle]="tempt" > <nz-tab nzTitle="装卸货信息" (nzClick)="goDistance(distannce1)">
<ng-template #tempt>
<nz-anchor>
<nz-link nzHref="#distannce1" nzTitle="装卸货信息"></nz-link>
</nz-anchor>
</ng-template>
</nz-tab> </nz-tab>
<nz-tab [nzTitle]="tempt2" > <nz-tab nzTitle="基本信息" (nzClick)="goDistance(distannce2)">
<ng-template #tempt2>
<nz-anchor>
<nz-link nzHref="#distannce2" nzTitle="基本信息"></nz-link>
</nz-anchor>
</ng-template>
</nz-tab> </nz-tab>
<nz-tab [nzTitle]="tempt3" > <nz-tab nzTitle="运费信息" (nzClick)="goDistance(distannce3)">
<ng-template #tempt3>
<nz-anchor>
<nz-link nzHref="#distannce3" nzTitle="运费信息"></nz-link>
</nz-anchor>
</ng-template>
</nz-tab> </nz-tab>
<nz-tab [nzTitle]="tempt4" > <nz-tab nzTitle="附件信息" (nzClick)="goDistance(distannce4)">
<ng-template #tempt4>
<nz-anchor>
<nz-link nzHref="#distannce4" nzTitle="附件信息"></nz-link>
</nz-anchor>
</ng-template>
</nz-tab> </nz-tab>
<nz-tab [nzTitle]="tempt5" > <nz-tab nzTitle="轨迹信息" (nzClick)="goDistance(distannce5)">
<ng-template #tempt5>
<nz-anchor>
<nz-link nzHref="#distannce5" nzTitle="轨迹信息"></nz-link>
</nz-anchor>
</ng-template>
</nz-tab> </nz-tab>
</nz-tabset> </nz-tabset>
</div> </div>
</ng-template> </ng-template>
</page-header-wrapper> </page-header-wrapper>
<nz-card nzTitle="运单进度"> <nz-card nzTitle="运单进度" #distannce1>
<div class="approval-status"> <div class="approval-status">
<div style="width: 60%; margin: 0 auto"> <div style="width: 60%; margin: 0 auto">
  <nz-steps [nzCurrent]="approvalLsit?.length + 1" nzLabelPlacement="vertical">   <nz-steps [nzCurrent]="approvalLsit?.length + 1" nzLabelPlacement="vertical">
  <nz-step   <nz-step     *ngFor="let item of approvalLsit"     [nzTitle]="item?.state"     [nzSubtitle]="item?.stateTime"
    *ngFor="let item of approvalLsit"     [nzStatus]="item?.displayStatus === 'SHOW' ? 'finish' : 'wait'"  >
    [nzTitle]="item?.state"
    [nzSubtitle]="item?.stateTime"
    [nzStatus]="item?.displayStatus === 'SHOW' ? 'finish' : 'wait'"
  >
  </nz-step>   </nz-step>
 </nz-steps>  </nz-steps>
</div> </div>
</div> </div>
</nz-card> </nz-card>
<nz-card nzTitle="基本信息"> <nz-card nzTitle="基本信息" #distannce2>
<sv-container col="1"> <sv-container col="1">
<sv-title>货物信息</sv-title> <sv-title>货物信息</sv-title>
<sv label="网络货运人"> <sv label="网络货运人">
@ -158,7 +129,7 @@
<nz-card nzTitle="保险待定"> <nz-card nzTitle="保险待定">
</nz-card> </nz-card>
<nz-card nzTitle="运费信息" id="distannce3"> <nz-card nzTitle="运费信息" id="distannce3" #distannce3>
<st #st [data]="i?.billExpenseDetails" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }"> <st #st [data]="i?.billExpenseDetails" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
</st> </st>
@ -166,7 +137,7 @@
<div>收款人：</div> <div>收款人：</div>
</nz-card> </nz-card>
<nz-card nzTitle="附件信息" id="distannce4"> <nz-card nzTitle="附件信息" id="distannce4" #distannce4>
<sv-container> <sv-container>
<sv label="协议附件"> <sv label="协议附件">
<!-- {{i?.supplementaryInformationVO?.stateReceipt?'是':'否'}} --> <!-- {{i?.supplementaryInformationVO?.stateReceipt?'是':'否'}} -->
@ -206,7 +177,7 @@
</sv-container> </sv-container>
<sv-container col="1" class="mt-md"> <sv-container col="1" class="mt-md">
<sv label="回单凭证"> <sv label="回单凭证">
<app-imagelist [imgList]="[i?.receiptFilePath]"></app-imagelist> <app-imagelist [imgList]="i?.receiptFilePath"></app-imagelist>
</sv> </sv>
<sv label="备注"> <sv label="备注">
{{i?.goodsResource?.remarks}} {{i?.goodsResource?.remarks}}
@ -216,7 +187,7 @@
<nz-card> <nz-card>
<div nz-row> <div nz-row>
<nz-card nzTitle="轨迹信息" style="width: 100%;" id="distannce5"> <nz-card nzTitle="轨迹信息" style="width: 100%;" id="distannce5" #distannce5>
<div nz-row> <div nz-row>
<div nz-col [nzSpan]='12'> <div nz-col [nzSpan]='12'>
<!-- <st #st [data]="i?.auditRecordList" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }"> <!-- <st #st [data]="i?.auditRecordList" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
@ -230,7 +201,8 @@
</div> </div>
</nz-card> </nz-card>
<nz-modal [(nzVisible)]="isVisible" [nzFooter]="nzModalFooter" nzTitle="附件信息" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel()"> <nz-modal [(nzVisible)]="isVisible" [nzFooter]="nzModalFooter" nzTitle="附件信息" (nzOnOk)="handleOK()"
(nzOnCancel)="handleCancel()">
<ng-container *nzModalContent> <ng-container *nzModalContent>
<app-imagelist [imgList]="[imges]"></app-imagelist> <app-imagelist [imgList]="[imges]"></app-imagelist>
</ng-container> </ng-container>

17
src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.less
View File

@ -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 { .leftPadding {

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

@ -11,6 +11,7 @@ import { Component, OnInit } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router'; import { ActivatedRoute, Router } from '@angular/router';
import { STColumn } from '@delon/abc/st'; import { STColumn } from '@delon/abc/st';
import { _HttpClient } from '@delon/theme'; import { _HttpClient } from '@delon/theme';
import { NzCardComponent } from 'ng-zorro-antd/card';
import { NzMessageService } from 'ng-zorro-antd/message'; import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalService } from 'ng-zorro-antd/modal'; import { NzModalService } from 'ng-zorro-antd/modal';
import { OrderManagementService } from '../../services/order-management.service'; import { OrderManagementService } from '../../services/order-management.service';
@ -20,7 +21,6 @@ import { OrderManagementService } from '../../services/order-management.service'
styleUrls: ['./vehicle-detail.component.less'] styleUrls: ['./vehicle-detail.component.less']
}) })
export class OrderManagementVehicleDetailComponent implements OnInit { export class OrderManagementVehicleDetailComponent implements OnInit {
id = this.route.snapshot.params.id; id = this.route.snapshot.params.id;
i: any = { i: any = {
unLoadingPlaceList: [], unLoadingPlaceList: [],
@ -48,9 +48,9 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
'1': { text: '待申请', color: 'warning' }, '1': { text: '待申请', color: 'warning' },
'2': { text: '已支付', color: 'success' }, '2': { text: '已支付', color: 'success' },
'3': { text: '已拒绝', color: 'warning' }, '3': { text: '已拒绝', color: 'warning' },
'4': { text: '申请中', color: 'warning' }, '4': { text: '申请中', color: 'warning' }
}, }
}, }
]; ];
constructor( constructor(
@ -59,30 +59,28 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
private service: OrderManagementService, private service: OrderManagementService,
private modalService: NzModalService, private modalService: NzModalService,
private router: Router private router: Router
) { ) {}
}
ngOnInit(): void { ngOnInit(): void {
console.log(this.id) console.log(this.id);
this.initData() this.initData();
} }
initData() { initData() {
this.service.request(this.service.$api_get_getWholeBillDetail, { id: this.id }).subscribe(res => { this.service.request(this.service.$api_get_getWholeBillDetail, { id: this.id }).subscribe(res => {
console.log(res) console.log(res);
if (res) { if (res) {
this.i = res; this.i = res;
this.approvalLsit = res.scheduleVOList this.approvalLsit = res.scheduleVOList;
this.approvalLsit.map((item: any, key: any) => { this.approvalLsit.map((item: any, key: any) => {
console.log(item) console.log(item);
if (item.displayStatus === 'HIDE') { if (item.displayStatus === 'HIDE') {
delete(this.approvalLsit[key]) delete this.approvalLsit[key];
} }
}) });
console.log(this.approvalLsit) console.log(this.approvalLsit);
} }
}) });
} }
goBack() { goBack() {
@ -90,21 +88,27 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
} }
// 修改订单 // 修改订单
changeOrder() { changeOrder() {
console.log(this.id) console.log(this.id);
this.router.navigate(['order-management/vehicle-detailChange', this.id]) this.router.navigate(['order-management/vehicle-detailChange', this.id]);
} }
agreement(value: any) { agreement(value: any) {
if (value === '1') { if (value === '1') {
this.imges = this.i?.agreementFilePath this.imges = this.i?.agreementFilePath;
} else if (value === '2') { } else if (value === '2') {
this.imges = this.i?.agreementFilePath this.imges = this.i?.agreementFilePath;
} }
this.isVisible = true; this.isVisible = true;
} }
handleCancel() { handleCancel() {
this.isVisible = false this.isVisible = false;
} }
handleOK() { handleOK() {
this.isVisible = false this.isVisible = false;
}
goDistance(elf: NzCardComponent) {
if (elf) {
elf['elementRef'].nativeElement.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'start' });
}
} }
} }