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 10:14:43 +08:00
parent df8c32b0eb
commit f216c25f7c
8 changed files with 38 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2022-01-12 17:46:09
* @LastEditTime: 2022-01-13 10:07:03
* @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
@ -19,10 +19,8 @@
</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 (click)="changeOrder()">修改订单</button>
<button nz-button nzType="primary" nzGhost >再下一单</button>
<button (click)="cancellation()" nz-button *ngIf="i?.billStatus == '4' || i?.billStatus == '5' || i?.billStatus == '2' || i?.billStatus == '3' || i?.billStatus == '1'" >取消订单</button>
<button nz-button *ngIf="i?.billStatus == '4' || i?.billStatus == '5' || i?.billStatus == '2' || i?.billStatus == '3'" (click)="changeOrder()">修改订单</button>
</div>
</div>
<nz-divider></nz-divider>

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

@ -2,7 +2,7 @@ import { Router } from '@angular/router';
/*
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2021-12-28 16:23:04
* @LastEditTime: 2022-01-13 10:10:21
* @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
@ -54,13 +54,13 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
private msgSrv: NzMessageService,
private service: OrderManagementService,
private router: Router,
private modal: NzModalService,
) {
}
ngOnInit(): void {
console.log(this.id)
console.log('123')
this.initData()
}
@ -102,5 +102,20 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
if (elf) {
elf['elementRef'].nativeElement.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'start' });
}
}
// 取消订单
cancellation() {
// api_get_cancelAnOrder
this.modal.confirm({
nzTitle: '<b>确定取消该订单吗?</b>',
nzContent: `<b>取消后无法恢复，请确认</b>`,
nzOnOk: () =>
this.service.request(this.service.$api_get_cancelAnOrder, {id: this.id}).subscribe((res) => {
if (res === true) {
this.service.msgSrv.success('操作成功！');
this.initData();
}
}),
})
}
}

5
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: 2021-12-27 13:25:20
* @LastEditTime: 2022-01-13 10:01: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\supply-management\components\vehicle\vehicle.component.html
@ -41,8 +41,9 @@
<nz-tabset (nzSelectedIndexChange)="selectChange($event)"
[nzTabBarExtraContent]="extraTemplate">
<nz-tab [nzTitle]="'全部'"></nz-tab>
<nz-tab [nzTitle]="'待接单('+tabs?.receivedQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'待发车('+tabs?.stayQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'运输中('+tabs?.receivedQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'运输中('+tabs?.GoingQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'待签收('+tabs?.signQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'已完成('+tabs?.compolatelQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'已取消('+tabs?.cancelQuantity+')'"></nz-tab>

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

@ -62,6 +62,7 @@ tabs = {
stayQuantity: 0,
signQuantity: 0,
compolatelQuantity: 0,
GoingQuantity: 0
};
constructor(
public service: OrderManagementService,
@ -77,7 +78,7 @@ tabs = {
get reqParams() {
const a:any = {};
if(this.resourceStatus) {
a.billStatus = this.resourceStatus + 1;
a.billStatus = this.resourceStatus;
}
return {
...a,
@ -106,6 +107,8 @@ tabs = {
this.tabs.compolatelQuantity = element.quantity
} else if (element.billStatusLabel === '已取消') {
this.tabs.cancelQuantity = element.quantity
} else if (element.billStatusLabel === '运输中') {
this.tabs.GoingQuantity = element.quantity
}
});
}

5
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-12 18:29:04
* @LastEditTime: 2022-01-13 10:03:16
* @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
@ -41,8 +41,9 @@
<nz-tabset (nzSelectedIndexChange)="selectChange($event)"
[nzTabBarExtraContent]="extraTemplate">
<nz-tab [nzTitle]="'全部'"></nz-tab>
<nz-tab [nzTitle]="'待接单('+tabs?.receivedQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'待发车('+tabs?.stayQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'运输中('+tabs?.receivedQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'运输中('+tabs?.GoingQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'待签收('+tabs?.signQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'已完成('+tabs?.compolatelQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'已取消('+tabs?.cancelQuantity+')'"></nz-tab>

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

@ -63,6 +63,7 @@ tabs = {
stayQuantity: 0,
signQuantity: 0,
compolatelQuantity: 0,
GoingQuantity: 0
};
resourceStatus: any;
constructor(
@ -88,7 +89,7 @@ resourceStatus: any;
get reqParams() {
const a:any = {};
if(this.resourceStatus) {
a.billStatus = this.resourceStatus + 1;
a.billStatus = this.resourceStatus;
}
return {
...a,
@ -114,6 +115,8 @@ resourceStatus: any;
this.tabs.stayQuantity = element.quantity
} else if (element.billStatusLabel === '待接单') {
this.tabs.receivedQuantity = element.quantity
} else if (element.billStatusLabel === '运输中') {
this.tabs.GoingQuantity = element.quantity
} else if (element.billStatusLabel === '待签收') {
this.tabs.signQuantity = element.quantity
} else if (element.billStatusLabel === '已完成') {

2
src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html
View File

@ -22,7 +22,7 @@
</div>
<div class="mt-sm mb-sm" nz-row>
<div>
<b>总费用：<span class="text-red-light text-md">{{i?.freightPrice | currency: '¥'}}</span></b>
<b>总费用：<span class="text-red-light text-md">{{i?.totalAmount | currency: '¥'}}</span></b>
</div>
</div>
<nz-divider></nz-divider>