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

车辆对接

Browse Source
This commit is contained in:
wangshiming
2021-12-28 16:33:45 +08:00
parent 8d381ef42a
commit 1c5ca651ea
12 changed files with 223 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,11 +1,12 @@
<!--
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2021-12-28 09:56:51
* @LastEditTime: 2021-12-28 16:32:53
* @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
-->
<nz-affix [nzOffsetTop]="10">
<page-header-wrapper [title]="''" [logo]="logo" [content]="headerContent">
<ng-template #logo>
<button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
@ -52,6 +53,7 @@
</div>
</ng-template>
</page-header-wrapper>
</nz-affix>
<nz-card nzTitle="运单进度" #distannce1>
<div class="approval-status">
<div style="width: 60%; margin: 0 auto">
@ -64,7 +66,7 @@
</div>
</nz-card>
<nz-card nzTitle="基本信息" #distannce2>
<nz-card nzTitle="基本信息" #distannce2 >
<sv-container col="1">
<sv-title>货物信息</sv-title>
<sv label="网络货运人">
@ -82,14 +84,14 @@
{{i?.goodsInfoList?.[0]?.maxWeightLabel}}/{{i?.goodsInfoList?.[0]?.maxCube}}
</sv>
<sv label="承运司机">
<!-- {{i?.driverId}} -->
{{i?.driverName}}/{{i?.driverPhone}}/{{i?.carNo}}
</sv>
<sv label="车型车长载重">
{{i?.goodsInfoList?.[0]?.weight}}顿,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件
{{i?.carModel}},{{i?.carLength}},{{i?.carLoad ? i?.carLoad +'吨': ''}}
</sv>
</sv-container>
<div class="mt-md">
<h4 class="text-md">装货卸货信息
<div class="mt-md" >
<h4 class="text-md" >装货卸货信息
<span class="ml-sm text-sm">(
<label>{{i?.loadingCount}}装</label>
<label>{{i?.unloadingCount}}卸</label>
@ -135,8 +137,12 @@
<st #st [data]="i?.billExpenseDetails" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
</st>
<div>总计：{{i?.total | currency: '￥'}}（运费￥3500.00，附加运费￥191.98，附加费率3.5%）</div>
<div>收款人：</div>
<div>
总计：<span style="color: #da001b; font-size: 18px">{{ totalObj?.price | currency: '￥' }}</span> （运费￥{{
totalObj?.price - attObj?.price
}}，附加运费￥{{ attObj?.price }}，附加费率{{ (attObj?.price / totalObj?.price) * 100 | number: '0.2-2' }}%）
</div>
<div>收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
</nz-card>
<nz-card nzTitle="附件信息" id="distannce4" #distannce4>
@ -206,7 +212,7 @@
<nz-modal [(nzVisible)]="isVisible" [nzFooter]="nzModalFooter" nzTitle="附件信息" (nzOnOk)="handleOK()"
(nzOnCancel)="handleCancel()">
<ng-container *nzModalContent>
<app-imagelist [imgList]="[imges]"></app-imagelist>
<app-imagelist [imgList]="imges"></app-imagelist>
</ng-container>
<ng-template #nzModalFooter>
<button nz-button nzType="primary" (click)="handleOK()" [disabled]="">取消</button>

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

@ -2,7 +2,7 @@ import { ViewChild } from '@angular/core';
/*
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2021-12-27 21:05:48
* @LastEditTime: 2021-12-28 16:22:50
* @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
@ -29,6 +29,8 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
goodsResource: []
};
imges: any;
attObj: any;
totalObj: any;
approvalLsit: any;
isVisible = false;
logColumns: STColumn[] = [
@ -72,6 +74,8 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
if (res) {
this.i = res;
this.approvalLsit = res.scheduleVOList;
this.attObj = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'ATT')[0];
this.totalObj = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'TOTAL')[0];
this.approvalLsit.map((item: any, key: any) => {
console.log(item);
if (item.displayStatus === 'HIDE') {
@ -108,7 +112,7 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
goDistance(elf: NzCardComponent) {
if (elf) {
elf['elementRef'].nativeElement.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'start' });
elf['elementRef'].nativeElement.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'start' , yOffset : 400 });
}
}
}