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

车辆对接

Browse Source
This commit is contained in:
wangshiming
2021-12-23 14:44:17 +08:00
parent c914ee023e
commit 4b4e54933e
14 changed files with 1050 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2021-12-21 17:13:11
* @LastEditTime: 2021-12-23 13:39:32
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\order-management\components\vehicle-detail\vehicle-detail.component.html
@ -18,28 +18,63 @@
</div>
<div nz-row style="display: flex; justify-content: end;">
<div nz-col nzSpan="10">
<button nz-button >取消货源</button>
<button nz-button
>重新指派</button>
<button nz-button >修改货源</button>
<button nz-button >确认发车</button>
<button nz-button >取消订单</button>
<button nz-button (click)="changeOrder()">修改订单</button>
<button nz-button nzType="primary" nzGhost >再下一单</button>
</div>
</div>
<div>
<div style="display: flex; justify-content: space-between;">
<div sv-container>
<sv label="货主">{{ i?.goodsResource[0]?.shipperAppUserName }} </sv>
<sv label="所属项目">{{i?.goodsResource[0]?.enterpriseProjectName}}</sv>
<sv label="服务类型">{{i?.goodsResource[0]?.serviceTypeLabel}}</sv>
<sv label="录单员">{{i?.goodsResource[0]?.dispatchName}} 18100000000 </sv>
<sv label="调度员">{{i?.goodsResource[0]?.dispatchName}} </sv>
<sv label="货主">{{ i?.goodsResource?.[0]?.shipperAppUserName }} </sv>
<sv label="所属项目">{{i?.goodsResource?.[0]?.enterpriseProjectName}}</sv>
<sv label="服务类型">{{i?.goodsResource?.[0]?.serviceTypeLabel}}</sv>
<sv label="录单员">{{i?.goodsResource?.[0]?.dispatchName}} 18100000000 </sv>
<sv label="调度员">{{i?.goodsResource?.[0]?.dispatchName}} </sv>
</div>
<div>
<div>状态</div>
<div style="font-size: 22px;font-weight: 700;">{{i?.billStatusLabel}}</div>
</div>
</div>
<nz-tabset nzType="card" style="margin-top: 15px;">
<nz-tab [nzTitle]="tempt" >
<ng-template #tempt>
<nz-anchor>
<nz-link nzHref="#distannce1" nzTitle="装卸货信息"></nz-link>
</nz-anchor>
</ng-template>
</nz-tab>
<nz-tab [nzTitle]="tempt2" >
<ng-template #tempt2>
<nz-anchor>
<nz-link nzHref="#distannce2" nzTitle="基本信息"></nz-link>
</nz-anchor>
</ng-template>
</nz-tab>
<nz-tab [nzTitle]="tempt3" >
<ng-template #tempt3>
<nz-anchor>
<nz-link nzHref="#distannce3" nzTitle="运费信息"></nz-link>
</nz-anchor>
</ng-template>
</nz-tab>
<nz-tab [nzTitle]="tempt4" >
<ng-template #tempt4>
<nz-anchor>
<nz-link nzHref="#distannce4" nzTitle="附件信息"></nz-link>
</nz-anchor>
</ng-template>
</nz-tab>
<nz-tab [nzTitle]="tempt5" >
<ng-template #tempt5>
<nz-anchor>
<nz-link nzHref="#distannce5" nzTitle="轨迹信息"></nz-link>
</nz-anchor>
</ng-template>
</nz-tab>
</nz-tabset>
</div>
</ng-template>
</page-header-wrapper>
@ -57,59 +92,59 @@
</div>
</nz-card>
<nz-card nzTitle="装卸货信息(一装一卸)">
<nz-card nzTitle="装卸货信息(一装一卸)" id="distannce1" >
<div class="mt-md">
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="12">
<div class="handling-info p-md">
<div class="flex" *ngFor="let item of i?.unLoadingPlaceList;let idx = index">
<!-- <div class="flex" *ngFor="let item of i?.unLoadingPlaceList;let idx = index">
<div *ngIf="item?.type === '1'" class="loading-row">
<div class="info">
<h4>装货地：{{item?.province}}{{item?.city}}{{item?.area}}{{item?.detailedAddress}}</h4>
<p>联系人：{{item?.appUserName}}/{{item?.contractTelephone}}</p>
</div>
</div>
</div>
<p class="time-info">计划装货时间：{{i?.goodsResource[0]?.loadingTime}}</p>
</div> -->
<p class="time-info">计划装货时间：{{i?.goodsResource?.[0]?.loadingTime}}</p>
</div>
</div>
<div nz-col [nzSpan]="12">
<div class="handling-info p-md">
<div class="flex" *ngFor="let item of i?.unLoadingPlaceList;let idx = index">
<!-- <div class="flex" *ngFor="let item of i?.unLoadingPlaceList;let idx = index">
<div *ngIf="item?.type === '2'" class="loading-row">
<div class="info">
<h4>卸货地：{{item?.province}}{{item?.city}}{{item?.area}}{{item?.detailedAddress}}</h4>
<p>联系人：{{item?.appUserName}}/{{item?.contractTelephone}}</p>
</div>
</div>
</div>
<p class="time-info">计划卸货时间：{{i?.goodsResource[0]?.unloadingTime}}</p>
</div> -->
<p class="time-info">计划卸货时间：{{i?.goodsResource?.[0]?.unloadingTime}}</p>
</div>
</div>
</div>
</div>
</nz-card>
<nz-card nzTitle="基本信息">
<nz-card nzTitle="基本信息" id="distannce2">
<sv-container col="1">
<sv label="网络货运人">
{{i?.goodsResource[0]?.enterpriseInfoName}}
{{i?.goodsResource?.[0]?.enterpriseInfoName}}
</sv>
<sv label="货物名称">
{{i?.goodsInfoList[0]?.goodsName}}
{{i?.goodsInfoList?.[0]?.goodsName}}
</sv>
</sv-container>
<sv-container col="2">
<sv label="货物数量">
{{i?.goodsInfoList[0]?.weight}}顿,{{i?.goodsInfoList[0]?.volume}}方,{{i?.goodsInfoList[0]?.number}}件
{{i?.goodsInfoList?.[0]?.weight}}顿,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件
</sv>
<sv label="用车需求">
{{i?.goodsInfoList[0]?.maxWeightLabel}}/{{i?.goodsInfoList[0]?.maxCube}}
{{i?.goodsInfoList?.[0]?.maxWeightLabel}}/{{i?.goodsInfoList?.[0]?.maxCube}}
</sv>
<sv label="承运司机">
{{i?.driverId}}
</sv>
<sv label="车型车长载重">
{{i?.goodsInfoList[0]?.weight}}顿,{{i?.goodsInfoList[0]?.volume}}方,{{i?.goodsInfoList[0]?.number}}件
{{i?.goodsInfoList?.[0]?.weight}}顿,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件
</sv>
</sv-container>
@ -118,7 +153,7 @@
<nz-card nzTitle="保险待定">
</nz-card>
<nz-card nzTitle="运费信息">
<nz-card nzTitle="运费信息" id="distannce3">
<st #st [data]="i?.billExpenseDetails" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
</st>
@ -126,7 +161,7 @@
<div>收款人：</div>
</nz-card>
<nz-card nzTitle="附件信息">
<nz-card nzTitle="附件信息" id="distannce4">
<sv-container>
<sv label="协议附件">
{{i?.supplementaryInformationVO?.stateReceipt?'是':'否'}}
@ -134,11 +169,11 @@
</sv-container>
<sv-container col="2" class="mt-md">
<sv label="装货凭证">
<app-imagelist [imgList]="i?.goodsResource">
<app-imagelist [imgList]="[i?.goodsResource]">
</app-imagelist>
</sv>
<sv label="卸货凭证">
<app-imagelist [imgList]="i?.goodsResource">
<app-imagelist [imgList]="[i?.goodsResource]">
</app-imagelist>
</sv>
</sv-container>
@ -173,11 +208,11 @@
<nz-card>
<div nz-row>
<nz-card nzTitle="轨迹信息" style="width: 100%;" >
<nz-card nzTitle="轨迹信息" style="width: 100%;" id="distannce5">
<div nz-row >
<div nz-col [nzSpan]='12'>
<st #st [data]="i?.auditRecordList" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
</st>
<!-- <st #st [data]="i?.auditRecordList" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
</st> -->
</div>
<div nz-col [nzSpan]='12'>
<amap-path-simplifier></amap-path-simplifier>

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

@ -33,4 +33,13 @@
.leftPadding {
padding-right: 100px;
}
/deep/ .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;
}
/deep/ .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
}
}

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

@ -1,13 +1,14 @@
import { ViewChild } from '@angular/core';
/*
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2021-12-21 16:50:27
* @LastEditTime: 2021-12-23 13:47:57
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\order-management\components\vehicle-detail\vehicle-detail.component.ts
*/
import { Component, OnInit } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { ActivatedRoute, Router } from '@angular/router';
import { STColumn } from '@delon/abc/st';
import { _HttpClient } from '@delon/theme';
import { NzMessageService } from 'ng-zorro-antd/message';
@ -21,7 +22,8 @@ import { OrderManagementService } from '../../services/order-management.service'
export class OrderManagementVehicleDetailComponent implements OnInit {
id = this.route.snapshot.params.id;
i: any;
@ViewChild('distannce3', { static: false })
i: any= {unLoadingPlaceList:[]};
logColumns: STColumn[] = [
{ title: '款项', index: 'costName' },
{ title: '总费用（元）', index: 'price' },
@ -48,7 +50,8 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
private route: ActivatedRoute,
private msgSrv: NzMessageService,
private service: OrderManagementService,
private modalService: NzModalService
private modalService: NzModalService,
private router: Router
) {
}
@ -78,5 +81,9 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
goBack() {
window.history.go(-1);
}
// 修改订单
changeOrder() {
console.log(this.id)
this.router.navigate(['order-management/vehicle-detailChange', this.id])
}
}