diff --git a/src/app/routes/vehicle/components/list/list.component.ts b/src/app/routes/vehicle/components/list/list.component.ts index 90554701..71e06b6f 100644 --- a/src/app/routes/vehicle/components/list/list.component.ts +++ b/src/app/routes/vehicle/components/list/list.component.ts @@ -3,6 +3,7 @@ import { ActivatedRoute, Router } from '@angular/router'; import { STColumn, STColumnBadge, STComponent, STData } from '@delon/abc/st'; import { SFComponent, SFSchema, SFUISchema } from '@delon/form'; import { NzModalService } from 'ng-zorro-antd/modal'; +import { format } from 'path'; import { VehicleService } from '../../../vehicle/services/vehicle.service'; @Component({ selector: 'app-Vehicle-components-list', @@ -69,31 +70,57 @@ export class VehicleComponentsListComponent implements OnInit { }, }, carNo: { title: '车牌号', type: 'string', ui: { showRequired: false } }, - carLength: { - title: '车型车长载重', - type: 'string', - ui: { - showRequired: false, - }, - }, - - enStatus: { - type: 'string', - title: '运营状态', - enum: [ - { label: '全部', value: '' }, - { label: '正常', value: 0 }, - { label: '冻结', value: 1 }, - { label: '废弃', value: 2 }, - ], - default: '', - ui: { - widget: 'select', - }, - }, carNoColor: { type: 'string', title: '车牌颜色', + ui: { + widget: 'dict-select', + params: { dictKey: 'CarColor' }, + }, + }, + carLength2: { + title: '运营状态', + type: 'string', + ui: { + widget: 'dict-select', + params: { dictKey: 'CarColor' }, + visibleIf: { + expand: (value: boolean) => value, + }, + }, + }, + carModel: { + title: '车型', + type: 'string', + ui: { + widget: 'dict-select', + params: { dictKey: 'CarColor' }, + visibleIf: { + expand: (value: boolean) => value, + }, + }, + }, + carLength: { + title: '车长', + type: 'string', + ui: { + widget: 'dict-select', + params: { dictKey: 'CarColor' }, + visibleIf: { + expand: (value: boolean) => value, + }, + }, + }, + carLoad: { + title: '载重', + type: 'string', + visibleIf: { + expand: (value: boolean) => value, + }, + }, + isTrailer: { + type: 'string', + title: '是否挂靠', ui: { widget: 'dict-select', params: { dictKey: 'CarColor' }, @@ -104,7 +131,7 @@ export class VehicleComponentsListComponent implements OnInit { }, isDriverLicenseExpire: { type: 'string', - title: '到期状态', + title: '行驶证到期状态', enum: [ { label: '正常', value: 0 }, { label: '冻结', value: 1 }, @@ -118,6 +145,17 @@ export class VehicleComponentsListComponent implements OnInit { }, }, }, + isRoadTransportExpire: { + type: 'string', + title: '驾驶证到期状态', + ui: { + widget: 'dict-select', + params: { dictKey: 'CarColor' }, + visibleIf: { + expand: (value: boolean) => value, + }, + }, + }, }, }; this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 }, enter: () => this.st.load() } }; @@ -157,6 +195,10 @@ export class VehicleComponentsListComponent implements OnInit { true: { text: '是', color: 'warning' }, }, }, + { title: '所有人', className: 'text-center', index: 'carOwner' }, + { title: '是否挂靠', className: 'text-center', index: 'isTrailer', }, + { title: '挂靠协议', className: 'text-center', index: 'carNo' }, + { title: '操作', width: '170px', diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json index ec12cc51..15f3aad9 100644 --- a/src/assets/mocks/menu-data.json +++ b/src/assets/mocks/menu-data.json @@ -278,12 +278,12 @@ "group": true, "children": [ { - "text": "车辆管理", + "text": "车辆列表", "link": "/vehicle/list" }, { "hide": true, - "text": "车辆详情", + "text": "车辆列表详情", "link": "/vehicle/list/detail/:id" }, {