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

车辆对接

Browse Source
This commit is contained in:
wangshiming
2021-12-17 16:03:22 +08:00
parent 6d65ead997
commit 4bb0520a73
16 changed files with 524 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
src/app/routes/waybill-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-07 15:08:56
* @LastEditTime: 2021-12-17 14:56:09
* @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
@ -14,17 +14,14 @@
</ng-template>
</page-header-wrapper>
<nz-card>
<nz-spin *ngIf="!i" class="modal-spin"></nz-spin>
<div nz-row>
<div nz-col nzSpan="4">
<sv-container class="bdr">
<sv label="订单号" col="1">{{ i?.no }}</sv>
<sv-title class="text-center text-lg">待接单</sv-title>
<sv-title class="text-center text-lg" style="font-weight: 700;">{{i?.wayBillStatusLabel}}</sv-title>
<sv-title>
<div class="">
<div style="display: flex; justify-content: center;">
<a class="btn-size" (click)="hand()">指派车队长</a>
<!-- <a class="btn-size m-lg mr-lg">取消货源</a>
<a class="btn-size">再下一单</a> -->
</div>
</sv-title>
</sv-container>
@ -38,45 +35,51 @@
</div>
<nz-divider></nz-divider>
<div sv-container *ngIf="i">
<sv label="项目名称">{{ i?.owner }}</sv>
<sv label="调度员">32943898021309809423</sv>
<sv label="承诺付款时间">3321944288191034921</sv>
<sv label="服务类型">18112345678</sv>
<sv label="项目名称">{{ i?.enterpriseProject }}</sv>
<sv label="调度员">{{ i?.dispatch?.name }}/{{i?.dispatch?.phone}}</sv>
<sv label="承诺付款时间">到货后{{ i?.paymentDays }}天内支付运费</sv>
<sv label="服务类型">{{ i?.serviceTypeLabel }}</sv>
</div>
<nz-divider></nz-divider>
<div nz-row>
<div nz-col nzSpan="6">
<div class="source-info">
<h3>装卸货信息</h3>
<p>装货地：广东省深圳市龙岗区怡亚通大厦</p>
<p>联系人：奥利给/13680058545</p>
<p>卸货地：广东省深圳市福田区岗厦村9巷8号405（新村）</p>
<p>联系人：花花世界/13680058545</p>
<p>发货日期：广东省深圳市福田区岗厦村9巷8号405（新村）</p>
<p>卸货日期：花花世界/13680058545</p>
<div *ngFor="let item of unLoadingPlaceVOList; let ii = index">
<h3 *ngIf="ii === 0" style="font-weight: 700;">装卸货信息</h3>
<div *ngIf="item?.type === 1 || item?.type === '1'">
<p>装货地：{{item?.detailedAddress}}</p>
<p>联系人：{{item?.appUserName}}/{{item?.contractTelephone}}</p>
<p>发货日期：{{item?.createTime}}</p>
</div>
<div *ngIf="item.type === 2 || item.type === '2'">
<p>卸货地：{{item?.detailedAddress}}</p>
<p>联系人：{{item?.appUserName}}/{{item?.contractTelephone}}</p>
<p>卸货日期：{{item?.modifyTime}}</p>
</div>
</div>
</div>
<div nz-col nzSpan="5">
<div class="source-info bdr bdl pl-md">
<h3>货物信息</h3>
<p>货物名称：广东省深圳市龙岗区怡亚通大厦</p>
<p>重量/体积：广东省深圳市福田区岗厦村9巷8号405（新村）</p>
<p>车型/车长：花花世界/13680058545</p>
<div *ngFor="let item of i?.goodsInfos; let i = index">
<p>货物名称：{{item?.goodsName}}</p>
<p>重量/体积：{{item?.weight}}吨/{{item?.volume}}立方</p>
<p>用车需求：{{item?.vehicleDemand}}</p>
</div>
</div>
</div>
<div nz-col nzSpan="5">
<div class="source-info bdr bdl pl-md">
<h3>托运信息</h3>
<p>公司名称：广东省深圳市龙岗区怡亚通大厦</p>
<p>联系人：广东省深圳市福田区岗厦村9巷8号405（新村）</p>
<p>公司名称：{{i?.enterpriseInfoName}}</p>
<p>联系人：{{ i?.dispatch?.name }}/{{i?.dispatch?.phone}}</p>
</div>
</div>
<div nz-col nzSpan="5">
<div class="source-info bdr pl-md">
<h3>承运信息</h3>
<p>司机：广东省深圳市龙岗区怡亚通大厦</p>
<p>车牌号：广东省深圳市福田区岗厦村9巷8号405（新村）</p>
<p>车型/车长/承重：{{'拖车'}} | {{'4.5米'}} | {{'15吨'}}</p>
<p>司机：{{i?.driverVo?.name}}/{{i?.driverVo?.phone}}</p>
<p>车牌号：{{i?.carVO?.carNo}}</p>
<p>车型/车长/承重：{{i?.carVO?.carModel}} | {{i?.carVO?.carLength}} | {{i?.carVO?.carLoad}}</p>
</div>
</div>
<div class="source-info pl-md">
@ -92,12 +95,12 @@
<div class="freight-info-box">
<h3>运费信息</h3>
<div class="text-right">
<p><label class="freigth-label">收款人:</label><span>{{400 | currency }}</span></p>
<p><label class="freigth-label">预付:</label><span>{{400 | currency }}</span></p>
<p><label class="freigth-label">油卡:</label><span>{{400 | currency }}</span></p>
<p><label class="freigth-label">到付:</label><span>{{400 | currency }}</span></p>
<p><label class="freigth-label">回单付:</label><span>{{400 | currency}}</span></p>
<p><label class="freigth-label">附加费:</label><span>{{400 | currency }}</span></p>
<p><label class="freigth-label">收款人:</label><span>{{i?.payee?.name}} /{{i?.payee?.phone}} / {{i?.payee?.phone}}</span></p>
<p><label class="freigth-label">预付:</label><span>{{400 | currency: '￥' }}</span></p>
<p><label class="freigth-label">油卡:</label><span>{{400 | currency: '￥' }}</span></p>
<p><label class="freigth-label">到付:</label><span>{{400 | currency: '￥' }}</span></p>
<p><label class="freigth-label">回单付:</label><span>{{400 | currency: '￥'}}</span></p>
<p><label class="freigth-label">附加费:</label><span>{{400 | currency: '￥' }}</span></p>
</div>
</div>
<nz-divider></nz-divider>
@ -110,17 +113,19 @@
</div>
</div>
<nz-divider></nz-divider>
<div style="display: flex; justify-content: space-evenly;">
<div>
<div>
<span class="leftPadding">司机运输费</span>
<div nz-row >
<div nz-col [nzSpan]='12'>
<div style="position: relative;">
<div style="height: 24px; width: 90px; background-color: #68758e;position: absolute; top: -109%; left: 0%;color: #fff;text-align: center;">平台支付</div>
<span class="leftPadding">司机运输费666</span>
<span class="leftPadding">1000.00</span>
<span class="leftPadding">未支付</span>
</div>
</div>
<div>
<div>
<span class="leftPadding">司机运输费</span>
<div nz-col [nzSpan]='12'>
<div style="position: relative;">
<div style="height: 24px; width: 90px; background-color: #68758e;position: absolute; top: -109%; left: 0%;color: #fff;text-align: center;">货主支付</div>
<span class="leftPadding">司机运输费22</span>
<span class="leftPadding">1000.00</span>
<span class="leftPadding">未支付</span>
</div>

21
src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts
View File

@ -1,7 +1,7 @@
/*
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2021-12-07 14:55:57
* @LastEditTime: 2021-12-17 14:38:14
* @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
@ -26,6 +26,7 @@ export class WaybillManagementVehicleDetailComponent implements OnInit {
{ title: '时间', index: 'operationUserPhone' },
{ title: '地点', index: ' createTime' },
];
unLoadingPlaceVOList: any = [];
constructor(
private route: ActivatedRoute,
@ -37,12 +38,20 @@ export class WaybillManagementVehicleDetailComponent implements OnInit {
}
ngOnInit(): void {
this.service.http.get(`/user/${this.id}?_allow_anonymous=true&_allow_badcode=true`).subscribe(res => {
console.log(res);
this.i = res
});
this.initData()
}
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.i = res;
})
}
hand() {