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 14:30:03 +08:00
parent 73b7bd66a9
commit 4dc7b9490b
4 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/routes/order-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: 2022-01-12 17:45:57
* @LastEditTime: 2022-01-13 14:20:49
* @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 (click)="changeOrder()" *ngIf="i.billStatus == '4' || i.billStatus == '5' || i.billStatus == '2' || i.billStatus == '3'" >修改订单</button>
</div>
</div>
<nz-divider></nz-divider>

22
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-29 14:42:04
* @LastEditTime: 2022-01-13 14:19:10
* @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
@ -59,8 +59,8 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
private route: ActivatedRoute,
private msgSrv: NzMessageService,
private service: OrderManagementService,
private modalService: NzModalService,
private router: Router
private router: Router,
private modal: NzModalService,
) {}
ngOnInit(): void {
@ -86,7 +86,21 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
}
});
}
// 取消订单
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();
}
}),
})
}
goBack() {
window.history.go(-1);
}

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

@ -483,10 +483,6 @@ resourceStatus: any;
text: '查看',
click: (_record) => this.FloatView(_record),
},
// {
// text: '查看协议',
// click: (_record, _modal, _instance) => this.view(_record)
// },
{
text: '撤销',
click: (_record) => this.revoke(_record),
@ -590,7 +586,6 @@ resourceStatus: any;
}
}
OpenPrice(value: any) {
console.log(value)
this.changeId = value.id;
this.isVisible = true
}
@ -761,7 +756,7 @@ resourceStatus: any;
console.log(res)
if(res) {
this.service.msgSrv.success('撤销成功！')
this.stFloat.reload(1)
this.stFloat.reload()
} else {
this.service.msgSrv.error(res.msg)
}

8
src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts
View File

@ -2,7 +2,7 @@ import { preloaderFinished } from '@delon/theme';
/*
* @Author: your name
* @Date: 2021-12-14 14:03:07
* @LastEditTime: 2022-01-13 14:08:56
* @LastEditTime: 2022-01-13 14:25:56
* @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\modal\bulk\update-freight\update-freight.component.ts
@ -127,9 +127,13 @@ export class VehicleUpdateFreightComponent implements OnInit {
}
save(value: any): void {
if(!this.sf.valid) {
this.service.msgSrv.error('请填写必填项！');
return;
}
this.service.request(this.service.$api_get_insertFreightChangeWhole, this.getParams()).subscribe(res => {
if (res) {
this.modal.destroy();
this.modal.destroy(true);
this.service.msgSrv.success('变更运费成功');
}
});