Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

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,17 @@ 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' },
@@ -102,9 +89,49 @@ export class VehicleComponentsListComponent implements OnInit {
             },
           },
         },
+        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: 'Whether' },
+            visibleIf: {
+              expand: (value: boolean) => value,
+            },
+          },
+        },
         isDriverLicenseExpire: {
           type: 'string',
-          title: '到期状态',
+          title: '行驶证到期状态',
           enum: [
             { label: '正常', value: 0 },
             { label: '冻结', value: 1 },
@@ -118,9 +145,20 @@ 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() } };
+    this.ui = { '*': { spanLabelFixed: 130, grid: { span: 8, gutter: 4 }, enter: () => this.st.load() } };
   }
 
   initST() {
@@ -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',