解决冲突
This commit is contained in:
@ -248,9 +248,10 @@ export class UserCenterComponentsDriverComponent implements OnInit {
|
||||
|
||||
private initST(): STColumn[] {
|
||||
return [
|
||||
{ title: '司机姓名', className: 'text-center', index: 'name' },
|
||||
{ title: '手机号', className: 'text-center', index: 'mobile' },
|
||||
{ title: '当前车辆', className: 'text-center', index: 'carNo' },
|
||||
{ title: '司机姓名', className: 'text-center', index: 'name' , width: 150},
|
||||
{ title: '手机号', className: 'text-center', index: 'mobile',width: 150 },
|
||||
{ title: '身份证号码', className: 'text-center', index: 'identityNo', width: 200 },
|
||||
{ title: '当前车辆', className: 'text-center', index: 'carNo' , width: 200},
|
||||
{
|
||||
title: '实名认证状态',
|
||||
className: 'text-center',
|
||||
@ -262,6 +263,8 @@ export class UserCenterComponentsDriverComponent implements OnInit {
|
||||
1: { text: '通过', color: 'success' },
|
||||
2: { text: '驳回', color: 'warning' }
|
||||
}
|
||||
, width: 180
|
||||
|
||||
},
|
||||
{
|
||||
title: '驾驶证状态',
|
||||
@ -275,6 +278,7 @@ export class UserCenterComponentsDriverComponent implements OnInit {
|
||||
30: { text: '驳回', color: 'warning' },
|
||||
40: { text: '证件过期', color: 'error' }
|
||||
}
|
||||
, width: 180
|
||||
},
|
||||
{
|
||||
title: '从业资格证状态',
|
||||
@ -288,10 +292,11 @@ export class UserCenterComponentsDriverComponent implements OnInit {
|
||||
30: { text: '驳回', color: 'warning' },
|
||||
40: { text: '证件过期', color: 'error' }
|
||||
}
|
||||
, width: 180
|
||||
},
|
||||
{ title: '推广业务员', className: 'text-center', render: 'promotersTelephone' },
|
||||
{ title: '注册渠道', className: 'text-center', index: 'source', type: 'enum', enum: { 1: '用户注册', 2: '货主添加' } },
|
||||
{ title: '注册时间', className: 'text-center', index: 'createTime' },
|
||||
{ title: '推广业务员', className: 'text-center', render: 'promotersTelephone' , width: 180},
|
||||
{ title: '注册渠道', className: 'text-center', index: 'source', type: 'enum', enum: { 1: '用户注册', 2: '货主添加' }, width: 150 },
|
||||
{ title: '注册时间', className: 'text-center', index: 'createTime', width: 200 },
|
||||
{
|
||||
title: '操作',
|
||||
width: '110px',
|
||||
|
||||
Reference in New Issue
Block a user