车辆对接

This commit is contained in:
wangshiming
2022-01-13 16:22:30 +08:00
parent dc7d0d5e1d
commit 6ae6403750
11 changed files with 102 additions and 67 deletions

View File

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-12-03 11:10:14
* @LastEditTime: 2022-01-12 14:53:26
* @LastEditTime: 2022-01-13 16:14:43
* @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\supply-management\components\vehicle\vehicle.component.html
@ -24,7 +24,7 @@
</div>
<div nz-col [nzSpan]="_$expand ? 24 : 6" class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading"
(click)="st?.load(1)">查询</button>
(click)="search()">查询</button>
<button nz-button nzType="primary" [disabled]="service.http.loading">导出</button>
<button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()">
@ -38,11 +38,11 @@
<nz-card>
<nz-tabset (nzSelectedIndexChange)="selectChange($event)" >
<nz-tab [nzTitle]="'全部'"></nz-tab>
<nz-tab [nzTitle]="'全部('+tabs?.totalQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'待发车('+tabs?.receivedQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'运输中('+tabs?.cancelQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'待签收('+tabs?.signQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'已完成'"></nz-tab>
<nz-tab [nzTitle]="'已完成('+tabs?.compolatelQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'已取消'"></nz-tab>
</nz-tabset>
<div style="margin-top: 15px;">

View File

@ -3,6 +3,9 @@
::ng-deep nz-range-picker{
width: 100%;
}
p{
margin-bottom: 0
}
.left_btn {
width: 50px;
height: 32px;

View File

@ -55,7 +55,8 @@ tabs = {
signQuantity: 0,
cancelQuantity: 0,
receivedQuantity: 0,
stayQuantity: 0
totalQuantity: 0,
compolatelQuantity: 0
};
constructor(public service: WaybillManagementServe, private modal: NzModalService, public service2: ShipperBaseService) { }
@ -351,73 +352,73 @@ tabs = {
{
title: '运单号',
width: '180px',
className: 'text-center',
className: 'text-left',
render: 'wayBillCode'
},
{
title: '运费明细',
width: '150px',
className: 'text-center',
className: 'text-left',
render: 'billExpenseDetailVOList'
},
{ title: '网络货运人', index: 'enterpriseInfoName', width: '180px', className: 'text-center' },
{ title: '货主', index: 'shipperAppUserName', width: '180px', className: 'text-center' },
{ title: '关联订单号', render: 'wayBill', width: '180px', className: 'text-center' },
{ title: '货源编号', index: 'resourceCode', width: '180px', className: 'text-center' },
{ title: '装货地', index: 'loadingPlace', width: '180px', className: 'text-center' },
{ title: '网络货运人', index: 'enterpriseInfoName', width: '180px', className: 'text-left' },
{ title: '货主', index: 'shipperAppUserName', width: '180px', className: 'text-left' },
{ title: '关联订单号', render: 'wayBill', width: '180px', className: 'text-left' },
{ title: '货源编号', index: 'resourceCode', width: '180px', className: 'text-left' },
{ title: '装货地', index: 'loadingPlace', width: '180px', className: 'text-left' },
{
title: '卸货地',
className: 'text-center',
className: 'text-left',
width: '180px',
index: 'dischargePlace'
},
{
title: '货物信息',
className: 'text-center',
className: 'text-left',
width: '180px',
render: 'goodsInfos'
},
{
title: '运费单价',
className: 'text-center',
className: 'text-left',
width: '120px',
index: 'freightPrice'
},
{
title: '接单数量',
className: 'text-center',
className: 'text-left',
width: '120px',
index: 'orderReceivingQuantity'
},
{
title: '结算重量',
className: 'text-center',
className: 'text-left',
width: '200px',
index: 'settlementWeight'
},
{
title: '承运司机',
className: 'text-center',
className: 'text-left',
width: '200px',
index: 'driverName'
},
{
title: '收款人',
className: 'text-center',
className: 'text-left',
width: '120px',
index: 'payeeName'
},
{
title: '装卸货时间',
className: 'text-center',
className: 'text-left',
width: '200px',
render: 'loadingTime'
},
{
title: '创建时间',
width: '180px',
className: 'text-center',
className: 'text-left',
index: 'createTime',
},
{
@ -496,6 +497,10 @@ tabs = {
{ title: '变更后', index: 'externalSn', width: '120px', className: 'text-center' }
];
}
search() {
this.st?.load(1);
this.getGoodsSourceStatistical()
}
/**
* 查询字段个数
*/
@ -599,11 +604,9 @@ tabs = {
getGoodsSourceStatistical() {
this.service.request(this.service.$api_get_getBulkStatistics).subscribe(res => {
if (res) {
let totalCount = 0;
res.forEach((ele: any) => {
switch(ele.wayBillStatus) {
case '1':
this.tabs.stayQuantity = ele?.count;
break;
case '2':
this.tabs.receivedQuantity = ele?.count;
break;
@ -613,10 +616,13 @@ tabs = {
case '4':
this.tabs.signQuantity = ele?.count;
break;
case '5':
this.tabs.compolatelQuantity = ele?.count;
break;
}
totalCount += ele.count
});
this.tabs.totalQuantity = totalCount
}
})
}
@ -633,6 +639,10 @@ tabs = {
},
nzFooter: null
});
modalRef.afterClose.subscribe((result: any) => {
this.st.load(1);
this.getGoodsSourceStatistical()
});
}
// 确认到车
sureArrive(item: any) {
@ -646,5 +656,9 @@ tabs = {
},
nzFooter: null
});
modalRef.afterClose.subscribe((result: any) => {
this.st.load(1);
this.getGoodsSourceStatistical()
});
}
}