解决冲突
This commit is contained in:
@ -199,7 +199,7 @@ export class VehicleComponentsListComponent implements OnInit {
|
||||
// { title: '', type: 'checkbox', className: 'text-center' },
|
||||
{ title: '车牌号', width: '150px', className: 'text-center', index: 'carNo' },
|
||||
{ title: '车牌颜色', width: '150px', className: 'text-center', index: 'carNoColorLabel' },
|
||||
{ title: '车型-车长-载重', width: '150px', className: 'text-center', render: 'carLength' },
|
||||
{ title: '车型-车长-载重', width: '180px', className: 'text-center', render: 'carLength' },
|
||||
{
|
||||
title: '运营状态',
|
||||
width: '150px',
|
||||
@ -238,7 +238,7 @@ export class VehicleComponentsListComponent implements OnInit {
|
||||
3: { text: '已到期', color: 'error' }
|
||||
}
|
||||
},
|
||||
{ title: '所有人', width: '150px', className: 'text-center', index: 'carOwner' },
|
||||
{ title: '所有人', width: '200px', className: 'text-center', index: 'carOwner' },
|
||||
{ title: '是否挂靠', width: '150px', className: 'text-center', render: 'isSelf' },
|
||||
{ title: '挂靠协议', width: '150px', className: 'text-center', render: 'approvalAuditStatus' },
|
||||
// { title: '是否已备案', className: 'text-center', render: 'putOnRecord', },
|
||||
|
||||
Reference in New Issue
Block a user