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

fix bug

Browse Source
This commit is contained in:
wangshiming
2021-12-15 20:24:24 +08:00
parent 7f65ee67ec
commit 3ba6d074cb
11 changed files with 294 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/app/routes/vehicle/components/list/list.component.ts
View File

@ -78,12 +78,15 @@ export class VehicleComponentsListComponent implements OnInit {
params: { dictKey: 'CarColor' },
},
},
carLength2: {
carStatus: {
title: '运营状态',
type: 'string',
enum: [
{ label: '空闲', value: 0 },
{ label: '运输中', value: 1 },
],
ui: {
widget: 'dict-select',
params: { dictKey: 'CarColor' },
widget: 'select',
visibleIf: {
expand: (value: boolean) => value,
},
@ -94,7 +97,7 @@ export class VehicleComponentsListComponent implements OnInit {
type: 'string',
ui: {
widget: 'dict-select',
params: { dictKey: 'CarColor' },
params: { dictKey: 'CarModel' },
visibleIf: {
expand: (value: boolean) => value,
},
@ -105,7 +108,7 @@ export class VehicleComponentsListComponent implements OnInit {
type: 'string',
ui: {
widget: 'dict-select',
params: { dictKey: 'CarColor' },
params: { dictKey: 'CarLength' },
visibleIf: {
expand: (value: boolean) => value,
},
@ -118,24 +121,27 @@ export class VehicleComponentsListComponent implements OnInit {
expand: (value: boolean) => value,
},
},
isTrailer: {
isSelf: {
type: 'string',
title: '是否挂靠',
enum: [
{ label: '是', value: true },
{ label: '否', value: false },
],
ui: {
widget: 'dict-select',
params: { dictKey: 'Whether' },
widget: 'select',
visibleIf: {
expand: (value: boolean) => value,
},
},
},
isDriverLicenseExpire: {
driverLicenseStatus: {
type: 'string',
title: '行驶证到期状态',
enum: [
{ label: '正常', value: 0 },
{ label: '冻结', value: 1 },
{ label: '废弃', value: 2 },
{ label: '正常', value: 1 },
{ label: '即将到期', value: 2 },
{ label: '已到期', value: 3},
],
default: '',
ui: {
@ -145,12 +151,16 @@ export class VehicleComponentsListComponent implements OnInit {
},
},
},
isRoadTransportExpire: {
roadTransportStatus: {
type: 'string',
title: '驾驶证到期状态',
enum: [
{ label: '正常', value: 1 },
{ label: '即将到期', value: 2 },
{ label: '已到期', value: 3},
],
ui: {
widget: 'dict-select',
params: { dictKey: 'CarColor' },
widget: 'select',
visibleIf: {
expand: (value: boolean) => value,
},
@ -165,38 +175,39 @@ export class VehicleComponentsListComponent implements OnInit {
this.columns = [
// { title: '', type: 'checkbox', className: 'text-center' },
{ title: '车牌号', className: 'text-center', index: 'carNo' },
{ title: '车牌颜色', className: 'text-center', index: 'carNoColor' },
{ title: '车牌颜色', className: 'text-center', index: 'carNoColorLabel' },
{ title: '车型-车长-载重', className: 'text-center', render: 'carLength' },
{ title: '运营状态', className: 'text-center', index: 'effectiveDateStr',
{ title: '运营状态', className: 'text-center', index: 'carStatus',
type: 'badge',
badge: {
正常: { text: '空闲', color: 'success' },
冻结: { text: '运输中', color: 'warning' },
废弃: { text: '废弃', color: 'default' },
true: { text: '运输中', color: 'success' },
false: { text: '空闲', color: 'default' },
},
},
{
title: '行驶证到期状态',
className: 'text-center',
index: 'isDriverLicenseExpire',
index: 'driverLicenseStatus',
type: 'badge',
badge: {
false: { text: '否', color: 'success' },
true: { text: '是', color: 'warning' },
1: { text: '正常', color: 'success' },
2: { text: '即将到期', color: 'warning' },
3: { text: '已到期', color: 'error' },
},
},
{
title: '道运证到期状态',
className: 'text-center',
index: 'isRoadTransportExpire',
index: 'roadTransportStatus',
type: 'badge',
badge: {
false: { text: '否', color: 'success' },
true: { text: '是', color: 'warning' },
1: { text: '正常', color: 'success' },
2: { text: '即将到期', color: 'warning' },
3: { text: '已到期', color: 'error' },
},
},
{ title: '所有人', className: 'text-center', index: 'carOwner' },
{ title: '是否挂靠', className: 'text-center', index: 'isTrailer', },
{ title: '是否挂靠', className: 'text-center', render: 'isSelf', },
{ title: '挂靠协议', className: 'text-center', index: 'carNo' },
{