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

车辆对接

Browse Source
This commit is contained in:
wangshiming
2021-12-29 17:20:00 +08:00
parent a3f3b2e9a8
commit 2ded33f4d6
23 changed files with 443 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
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: 2021-12-27 13:25:08
* @LastEditTime: 2021-12-29 15:00:48
* @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
@ -212,6 +212,15 @@
</nz-modal>
<ng-template #extraTemplate>
<div>
<button nz-button nzType="primary"(click)="modifyRate()">
修改附加费率
</button>
<button nz-button nzType="primary"(click)="modifyFreightPeople()">
修改网络货运人
</button>
<button nz-button nzType="primary"(click)="modifyRate()">
修改车队长
</button>
<button nz-button nzType="primary" nzGhost nz-popconfirm
[nzPopconfirmTitle]="enable" (nzOnConfirm)="userAction()" nzPopconfirmPlacement="bottomRight">
批量签收

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

@ -14,6 +14,8 @@ import { VehicleSureArriveComponent } from '../../modal/vehicle/sure-arrive/sure
import { VehicleSureDepartComponent } from '../../modal/vehicle/sure-depart/sure-depart.component';
import { VehicleUpdateFreightComponent } from '../../modal/vehicle/update-freight/update-freight.component';
import { OrderManagementService } from '../../services/order-management.service';
import { VehicleModifyRateComponent } from '../../modal/vehicle/modify-rate/modify-rate.component';
import { VehicleFreightPeopleComponent } from '../../modal/vehicle/freight-people/freight-people.component';
@Component({
@ -590,21 +592,82 @@ resourceStatus: any;
nzWidth: 580,
nzContent: VehicleUpdateFreightComponent,
nzComponentParams: { data: { ...data, id: item.id } },
nzOnOk: sin => {
this.service.request(this.service.$api_change_bulk, { billId: item.id, ...sin.sf.value }).subscribe(res => {
if (res) {
this.service.msgSrv.success('变更运费成功');
modal.destroy();
this.st.reload();
}
});
return false;
}
nzFooter: null,
// nzOnOk: sin => {
// this.service.request(this.service.$api_change_bulk, { billId: item.id, ...sin.sf.value }).subscribe(res => {
// if (res) {
// this.service.msgSrv.success('变更运费成功');
// modal.destroy();
// this.st.reload();
// }
// });
// return false;
// }
});
modal.afterClose.subscribe(_ => this.st.reload());
}
});
}
/**
*修改附加费率
*/
modifyRate() {
let params: any[] = [];
this.selectedRows.forEach(item => {
params.push(item.id);
});
if(params.length === 0) {
this.service.msgSrv.error('请先选择订单！')
return
}
const modal = this.modal.create({
nzTitle: '修改附加费率',
nzWidth: 600,
nzContent: VehicleModifyRateComponent,
nzComponentParams: { data: { ids: params } },
nzFooter: null,
// nzOnOk: sin => {
// this.service.request(this.service.$api_change_bulk, { billId: item.id, ...sin.sf.value }).subscribe(res => {
// if (res) {
// this.service.msgSrv.success('变更运费成功');
// modal.destroy();
// this.st.reload();
// }
// });
// return false;
// }
});
}
/**
*修改网络货运人
*/
modifyFreightPeople() {
let params: any[] = [];
this.selectedRows.forEach(item => {
params.push(item.id);
});
if(params.length === 0) {
this.service.msgSrv.error('请先选择订单！')
return
}
const modal = this.modal.create({
nzTitle: '修改网络货运人',
nzWidth: 600,
nzContent: VehicleFreightPeopleComponent,
nzComponentParams: { data: { ids: params } },
nzFooter: null,
// nzOnOk: sin => {
// this.service.request(this.service.$api_change_bulk, { billId: item.id, ...sin.sf.value }).subscribe(res => {
// if (res) {
// this.service.msgSrv.success('变更运费成功');
// modal.destroy();
// this.st.reload();
// }
// });
// return false;
// }
});
}
// *确认签收
@ -656,8 +719,10 @@ resourceStatus: any;
this.selectedRows.forEach(item => {
params.push(item.id);
});
console.log(this.selectedRows)
console.log(params)
if(params.length === 0) {
this.service.msgSrv.error('请先选择订单！')
return
}
this.service.request(this.service.$api_get_batchSignWholeOrder, params).subscribe(res => {
if (res) {
console.log(res);