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

车辆对接

Browse Source
This commit is contained in:
wangshiming
2022-01-12 14:56:09 +08:00
parent 0352cd2f08
commit c7eeba9ba9
15 changed files with 126 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/app/routes/waybill-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-22 11:31:50
* @LastEditTime: 2022-01-12 14:51:05
* @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
@ -52,10 +52,25 @@
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
[loading]="service.http.loading">
<ng-template st-row="billExpenseDetailVOList" let-item let-index="index">
<!-- <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>
</div>
</ng-template> -->
<ng-template st-row="billExpenseDetailVOList2" let-item let-index="index">
<div *ngIf="item.billExpenseDetailVOList.length > 0">
<p *ngFor="let data of item.billExpenseDetailVOList">
{{ data.costCodeLabel }}：{{ data.price }}
</p>
</div>
</ng-template>
<ng-template st-row="billExpenseDetailVOList" let-item let-index="index">
<div *ngIf="item.billExpenseDetailVOList.length > 0">
<p *ngFor="let data of item.billExpenseDetailVOList">
{{ data.costCodeLabel }}：{{ data.price }}
<span style="color: #f59a63">{{ data.paymentStatusLabel }}</span>
</p>
</div>
</ng-template>
<ng-template st-row="wayBillCode" let-item let-index="index">
<a [routerLink]="'/waybill-management/vehicle-detail/'+item.id">{{item.wayBillCode}}</a>

5
src/app/routes/waybill-management/components/vehicle/vehicle.component.less
View File

@ -1,2 +1,5 @@
:host {
:host ::ng-deep{
::ng-deep nz-range-picker{
width: 100%;
}
}

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

@ -170,7 +170,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
.request(this.service.$api_get_getCarLicenseListByCarNo, {
carNo: q
})
.pipe(map((res: any[]) => (res 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.carNo } as SFSchemaEnum))))
.toPromise();
} else {
return of([]);
@ -307,31 +307,31 @@ export class WaybillManagementVehicleComponent implements OnInit {
},
{
title: '货主出价',
width: '100px',
width: '250px',
className: 'text-center',
index: 'resourceCode'
render: 'billExpenseDetailVOList2'
},
{
title: '货源编号',
width: '100px',
width: '150px',
className: 'text-center',
index: 'resourceCode'
},
{
title: '运费明细',
width: '100px',
title: '费用明细',
width: '250px',
className: 'text-center',
render: 'billExpenseDetailVOList'
},
{ title: '网络货运人', index: 'enterpriseInfoName', width: '120px', className: 'text-center' },
{ title: '货主', index: 'shipperAppUserName', width: '120px', className: 'text-center' },
{ title: '关联订单号', render: 'wayBill', width: '120px', className: 'text-center' },
{ title: '装货地', index: 'loadingAddressArr', width: '120px', className: 'text-center' },
{ title: '网络货运人', index: 'enterpriseInfoName', width: '180px', className: 'text-center' },
{ title: '货主', index: 'shipperAppUserName', width: '150px', className: 'text-center' },
{ title: '关联订单号', render: 'wayBill', width: '180px', className: 'text-center' },
{ title: '装货地', index: 'loadingPlace', width: '180px', className: 'text-center' },
{
title: '卸货地',
className: 'text-center',
width: '120px',
index: 'unloadingAddressArr'
width: '180px',
index: 'dischargePlace'
},
{
title: '货物信息',
@ -359,7 +359,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
},
{
title: '创建时间',
width: '130px',
width: '180px',
className: 'text-center',
index: 'createTime'
},