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

批量审核

Browse Source
This commit is contained in:
wangshiming
2022-01-18 09:51:11 +08:00
parent 47a0cecb9a
commit 545d674d44
9 changed files with 54 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
View File

@ -64,14 +64,20 @@ export class WaybillManagementVehicleComponent implements OnInit {
* 查询参数
*/
get reqParams() {
const a: any = {};
const a:any = {};
if (this.resourceStatus) {
a.wayBillStatus = this.resourceStatus;
}
return {
const params: any = Object.assign({}, this.sf?.value || {});
delete params._$expand;
return {
...a,
...this.sf?.value
};
...params,
createTime: {
start: this.sf?.value?.createTime?.[0] || '',
end: this.sf?.value?.createTime?.[1] || '',
},
};
}
get selectedRows() {
return this.st?.list.filter(item => item.checked) || [];
@ -150,7 +156,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
if (!!q) {
return this.service
.request(this.service.$api_get_getDriverInfo, { keyword: q, model: 1, type: 1 })
.pipe(map(res => (res as any[]).map(i => ({ label: i.name, value: i.id } as SFSchemaEnum))))
.pipe(map(res => (res as any[]).map(i => ({ label: i.name, value: i.appUserId } as SFSchemaEnum))))
.toPromise();
} else {
return of([]);
@ -175,7 +181,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
.request(this.service.$api_get_getCarLicenseListByCarNo, {
carNo: q
})
.pipe(map((res: any) => (res?.records as any[]).map(i => ({ label: i.carNo, value: i.carNo } as SFSchemaEnum))))
.pipe(map((res: any) => (res?.records as any[]).map(i => ({ label: i.carNo, value: i.id } as SFSchemaEnum))))
.toPromise();
} else {
return of([]);
@ -198,7 +204,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
if (!!q) {
return this.service
.request(this.service.$api_get_getDriverInfo, { keyword: q, model: 1, type: 2 })
.pipe(map(res => (res as any[]).map(i => ({ label: i.name, value: i.id } as SFSchemaEnum))))
.pipe(map(res => (res as any[]).map(i => ({ label: i.name, value: i.userId } as SFSchemaEnum))))
.toPromise();
} else {
return of([]);
@ -214,7 +220,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
type: 'string',
ui: {
widget: 'dict-select',
params: { dictKey: 'payment:status' },
params: { dictKey: 'overall:payment:status' },
containAllLable: true,
visibleIf: {
_$expand: (value: boolean) => value
@ -249,7 +255,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
}
}
},
enterpriseInfoName: {
enterpriseInfoId: {
type: 'string',
title: '网络货运人',
ui: {
@ -320,17 +326,17 @@ export class WaybillManagementVehicleComponent implements OnInit {
{
title: '货主出价',
width: '250px',
className: 'text-left',
className: 'text-right',
render: 'billExpenseDetailVOList2'
},
{
title: '费用明细',
width: '250px',
className: 'text-left',
className: 'text-right',
render: 'billExpenseDetailVOList'
},
{ title: '网络货运人', index: 'enterpriseInfoName', width: '180px', className: 'text-left' },
{ title: '货主', index: 'shipperAppUserName', width: '150px', className: 'text-left' },
{ title: '网络货运人', index: 'enterpriseInfoName', width: '220px', className: 'text-left' },
{ title: '货主', index: 'shipperAppUserName', width: '200px', className: 'text-left' },
{ title: '关联订单号', render: 'wayBill', width: '180px', className: 'text-left' },
{ title: '装货地', index: 'loadingPlace', width: '180px', className: 'text-left' },
{
@ -541,7 +547,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
this.isVisibleEvaluate = true;
}
getGoodsSourceStatistical() {
this.service.request(this.service.$api_get_getWholeStatistics).subscribe(res => {
this.service.request(this.service.$api_get_getWholeStatistics, this.reqParams).subscribe(res => {
if (res) {
let totalCount = 0;
res.forEach((ele: any) => {