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

车辆对接

Browse Source
This commit is contained in:
wangshiming
2022-01-13 13:53:47 +08:00
parent b8a8526d54
commit 948165710b
16 changed files with 207 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/routes/order-management/components/bulk/bulk.component.html
View File

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-12-03 11:10:14
* @LastEditTime: 2022-01-13 10:01:50
* @LastEditTime: 2022-01-13 13:30:01
* @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]="_$expand">
<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>
@ -40,7 +40,7 @@
<nz-card>
<nz-tabset (nzSelectedIndexChange)="selectChange($event)"
[nzTabBarExtraContent]="extraTemplate">
<nz-tab [nzTitle]="'全部'"></nz-tab>
<nz-tab [nzTitle]="'全部('+tabs?.totalCount+')'"></nz-tab>
<nz-tab [nzTitle]="'待接单('+tabs?.receivedQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'待发车('+tabs?.stayQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'运输中('+tabs?.GoingQuantity+')'"></nz-tab>

20
src/app/routes/order-management/components/bulk/bulk.component.less
View File

@ -1,7 +1,13 @@
.left_btn {
width: 50px;
height: 32px;
padding-left: 8px;
line-height:32px;
background-color: #d7d7d7;
}
:host {
p{
margin-bottom: 0
}
.left_btn {
width: 50px;
height: 32px;
padding-left: 8px;
line-height:32px;
background-color: #d7d7d7;
}
}

29
src/app/routes/order-management/components/bulk/bulk.component.ts
View File

@ -62,7 +62,8 @@ tabs = {
stayQuantity: 0,
signQuantity: 0,
compolatelQuantity: 0,
GoingQuantity: 0
GoingQuantity: 0,
totalCount: 0
};
constructor(
public service: OrderManagementService,
@ -93,9 +94,14 @@ tabs = {
id: this.changeId
};
}
search() {
this.st?.load(1);
this.getGoodsSourceStatistical()
}
getGoodsSourceStatistical() {
this.service.request(this.service.$api_getBulkStatistical).subscribe(res => {
if (res) {
let totalCount = 0;
res.forEach((element: any) => {
if(element.billStatusLabel === '待发车') {
this.tabs.stayQuantity = element.quantity
@ -110,7 +116,9 @@ tabs = {
} else if (element.billStatusLabel === '运输中') {
this.tabs.GoingQuantity = element.quantity
}
totalCount += element.quantity
});
this.tabs.totalCount = totalCount
}
})
}
@ -120,6 +128,8 @@ tabs = {
this.initST();
setTimeout(() => {
this.st.load();
this.getGoodsSourceStatistical()
}, 500);
}
ngOnInit(): void {
@ -398,7 +408,7 @@ tabs = {
},
{
title: '运费明细',
width: '200px',
width: '250px',
className: 'text-center',
render: 'mybidDetailInfo',
},
@ -517,7 +527,7 @@ tabs = {
className: 'text-center',
index: 'applyUserName'
},
{ title: '状态', index: 'handleStatus', className: 'text-center' },
{ title: '状态', index: 'handleStatusLabel', className: 'text-center' },
{
title: '操作',
fixed: 'right',
@ -670,7 +680,12 @@ tabs = {
nzComponentParams: { data: { ...data, billId: item.id } },
});
modal.afterClose.subscribe(_ => this.st.reload(1));
modal.afterClose.subscribe(_ =>
{
this.st.reload(1);
this.getGoodsSourceStatistical();
}
);
}
});
}
@ -690,6 +705,7 @@ tabs = {
});
modalRef.afterClose.subscribe((result: any) => {
this.st.load(1);
this.getGoodsSourceStatistical()
});
}
userAction() {
@ -702,7 +718,7 @@ tabs = {
this.service.request(this.service.$api_get_batchSignBulkOrder, params).subscribe(res => {
if (res) {
this.st.load(1);
console.log(res);
this.getGoodsSourceStatistical()
} else {
this.service.msgSrv.error(res.msg);
}
@ -719,9 +735,11 @@ tabs = {
if (res === true) {
this.service.msgSrv.success('操作成功！');
this.st?.reload(1);
this.getGoodsSourceStatistical()
this.initST();
}
this.st?.reload(1);
this.getGoodsSourceStatistical()
}),
})
}
@ -735,6 +753,7 @@ tabs = {
this.service.msgSrv.success('撤销成功！')
this.stFloat.reload()
this.st?.reload(1);
this.getGoodsSourceStatistical()
} else {
this.service.msgSrv.error(res.msg)
}

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

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-12-03 11:10:14
* @LastEditTime: 2022-01-13 10:03:16
* @LastEditTime: 2022-01-13 13:45:24
* @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>
@ -40,7 +40,7 @@
<nz-card>
<nz-tabset (nzSelectedIndexChange)="selectChange($event)"
[nzTabBarExtraContent]="extraTemplate">
<nz-tab [nzTitle]="'全部'"></nz-tab>
<nz-tab [nzTitle]="'全部('+tabs?.totalCount+')'"></nz-tab>
<nz-tab [nzTitle]="'待接单('+tabs?.receivedQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'待发车('+tabs?.stayQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'运输中('+tabs?.GoingQuantity+')'"></nz-tab>
@ -52,7 +52,8 @@
<st
#st
[bordered]="true"
[scroll]="{ x: '2000px' }"
multiSort
[scroll]="{ x: '1200px' }"
[data]="service.$api_get_listWholePage"
[columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
@ -74,20 +75,23 @@
<span>{{item?.goodsNumber ? item?.goodsNumber + '吨' : '' }}</span>
</div>
</ng-template>
<!-- 我的出价 -->
<ng-template st-row="mybidInfo" let-item let-index="index" class="temp_p">
<div *ngIf="item.mybidInfo?.length > 0">
<p *ngFor="let data of item?.mybidInfo"> {{ data?.expenseName }}：￥{{ data?.price | number:'0.2-2' }} </p>
<!-- 我的出价 -->
<ng-template st-row="mybidInfo" let-item let-index="index" class="temp_p">
<div *ngIf="item.mybidInfo.length > 0">
<p *ngFor="let data of item.mybidInfo"> {{ data.expenseName }}：￥{{ data.price | number:'0.2-2' }} </p>
</div>
</ng-template>
<ng-template st-row="mybidDetailInfo" let-item let-index="index">
<div *ngIf="item.mybidDetailInfo.length > 0">
<p *ngFor="let data of item.mybidDetailInfo">
{{ data.expenseName }}：￥{{ data.price | number:'0.2-2' }}
<span *ngIf="data.paymentStatus && data.paymentStatus === '1'" style="color: #f59a63">待申请</span>
<span *ngIf="data.paymentStatus && data.paymentStatus === '2'" style="color: #f59a63">已拒绝</span>
<span *ngIf="data.paymentStatus && data.paymentStatus === '3'" style="color: #f59a63">已支付</span>
<span *ngIf="data.paymentStatus && data.paymentStatus === '4'" style="color: #f59a63">申请中</span>
</p>
</div>
</ng-template>
<ng-template st-row="mybidDetailInfo" let-item let-index="index">
<div *ngIf="item.mybidDetailInfo?.length > 0">
<p *ngFor="let data of item.mybidDetailInfo">
{{ data.expenseName }}：{{ data.price }}
<span style="color: #f59a63">{{ data.paymentStatusLabel }}</span>
</p>
</div>
</ng-template>
<ng-template st-row="billExpenseDetailVOList" let-item let-index="index">
<div *ngFor="let i of item?.billExpenseDetailVOList; let ii = index">
<span >{{i?.costName}}：{{i?.price}}</span>

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

@ -1,2 +1,5 @@
:host {
p{
margin-bottom: 0
}
}

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

@ -63,7 +63,8 @@ tabs = {
stayQuantity: 0,
signQuantity: 0,
compolatelQuantity: 0,
GoingQuantity: 0
GoingQuantity: 0,
totalCount: 0
};
resourceStatus: any;
constructor(
@ -106,10 +107,14 @@ resourceStatus: any;
this.initSTFloat();
this.initSTFloatView();
}
search() {
this.st?.load(1);
this.getGoodsSourceStatistical()
}
getGoodsSourceStatistical() {
this.service.request(this.service.$api_statisticalStatus).subscribe(res => {
if (res) {
let totalCount = 0;
res.forEach((element: any) => {
if(element.billStatusLabel === '待发车') {
this.tabs.stayQuantity = element.quantity
@ -124,7 +129,9 @@ resourceStatus: any;
} else if (element.billStatusLabel === '已取消') {
this.tabs.cancelQuantity = element.quantity
}
totalCount += element.quantity
});
this.tabs.totalCount = totalCount
}
})
}
@ -347,36 +354,37 @@ resourceStatus: any;
{ title: '', type: 'checkbox', width: '50px', className: 'text-center' },
{
title: '订单号',
width: '100px',
width: '200px',
className: 'text-center',
render: 'billCode'
},
{
title: '我的出价',
width: '150px',
width: '200px',
className: 'text-center',
render: 'mybidInfo'
},
{
title: '运费明细',
width: '200px',
width: '250px',
className: 'text-center',
render: 'mybidDetailInfo',
},
{ title: '网络货运人', index: 'enterpriseInfoName', width: '120px', className: 'text-center' },
{ title: '货主', index: 'shipperAppUserName', width: '120px', className: 'text-center' },
{ title: '关联运单号', index: 'wayBillCode', width: '120px', className: 'text-center' },
{ title: '货源编号', index: 'resourceCode', width: '120px', className: 'text-center' },
{ title: '装货地', index: 'loadingAddressArr', width: '120px', className: 'text-center' },
{ title: '网络货运人', index: 'enterpriseInfoName', width: '170px', className: 'text-center' },
{ title: '货主', index: 'shipperAppUserName', width: '170px', className: 'text-center' },
{ title: '关联运单号', index: 'wayBillCode', width: '170px', className: 'text-center' },
{ title: '货源编号', index: 'resourceCode', width: '170px', className: 'text-center' },
{ title: '装货地', index: 'loadingAddressArr', width: '170px', className: 'text-center' },
{
title: '卸货地',
className: 'text-center',
width: '120px',
width: '170px',
index: 'unloadingAddressArr'
},
{
title: '货物信息',
className: 'text-center',
width: '120px',
width: '170px',
render: 'goodsName'
}, {
title: '承运司机',
@ -400,6 +408,7 @@ resourceStatus: any;
title: '创建时间',
className: 'text-center',
index: 'creationTime',
width: '170px',
},
{
title: '操作',
@ -464,7 +473,7 @@ resourceStatus: any;
className: 'text-center',
index: 'applyUserName'
},
{ title: '状态', index: 'handleStatus', className: 'text-center' },
{ title: '状态', index: 'handleStatusLabel', className: 'text-center' },
{
title: '操作',
fixed: 'right',