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

src/app/routes/usercenter/components/freight/user/detail/detail.component.ts

@@ -15,6 +15,7 @@ export class FreightComponentsUserDetailComponent implements OnInit {
   i: any;
   url = `/rule?_allow_anonymous=true`;
   @ViewChild('st', { static: false }) st!: STComponent;
+
   detailData: any = {
     goodsList: [
       {

src/app/routes/vehicle/components/audit/audit.component.html

@@ -0,0 +1,83 @@
+<!--
+ * @Author: your name
+ * @Date: 2021-11-29 15:22:34
+ * @LastEditTime: 2021-12-01 20:58:57
+ * @LastEditors: Please set LastEditors
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: \tms-obc-web\src\app\routes\usercenter\components\freight\list\list.component.html
+-->
+<!-- 页头 -->
+<page-header-wrapper ></page-header-wrapper>
+<nz-card>
+  <!-- 搜索区 -->
+  <!-- 搜索表单 -->
+  <div nz-row nzGutter="8">
+    <!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
+    <div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
+      <sf
+        #sf
+        [schema]="schema"
+        [ui]="ui"
+        [mode]="'search'"
+        [disabled]="!sf?.valid"
+        (formSubmit)="st?.load(1)"
+        (formReset)="resetSF()"
+      ></sf>
+    
+    </div>
+    <!-- [loading]="service.http.loading" -->
+
+    <!-- 查询字段大于3个时，根据展开状态调整布局 -->
+    <ng-container *ngIf="queryFieldCount > 4">
+      <div nz-col [nzSpan]="_$expand ? 24 : 18">
+        <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
+      </div>
+      <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
+        <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">导出</button>
+        <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
+        <button nz-button (click)="resetSF()">重置</button>
+        <button nz-button nzType="link" (click)="expandToggle()">
+          {{ !_$expand ? '展开' : '收起' }}
+          <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
+        </button>
+      </div>
+    </ng-container>
+  </div>
+</nz-card>
+<nz-card>
+  <!-- 数据列表 -->
+  <!-- [data]="service.$api_get_supplier_page" -->
+
+  <st
+    #st
+    [bordered]="true"
+    [columns]="columns"
+    [data]='datalist'
+    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+    [res]="{ reName: { list: 'data.records', total: 'data.total' }, process: dataProcess }"
+    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+    [loadingDelay]="500"
+    [loading]="service.http.loading"
+  >
+    <ng-template st-row="enterpriseName" let-item let-index="index">
+      <div nz-tooltip [nzTooltipTitle]="item.enterpriseName">
+        <div
+          style="display: inline-block; max-width: 280px; margin: 0 auto; overflow: hidden; white-space: nowrap; text-overflow: ellipsis"
+        >
+          {{ item.enterpriseName }}
+        </div>
+      </div>
+    </ng-template>
+    <ng-template st-row="contactsPhone" let-item let-index="index">
+        <div
+          style="color: #52c41a;" (click)="daoyun(item)"
+        >
+          {{ item.contactsPhone }}
+      </div>
+    </ng-template>
+    <ng-template st-row="stateCol" let-item let-index="index">
+      <nz-tag *ngIf="item.stateLocked" nzColor="error">冻结</nz-tag>
+      <nz-tag *elseBlock nzColor="success">正常</nz-tag>
+    </ng-template>
+  </st>
+</nz-card>

src/app/routes/vehicle/components/audit/audit.component.spec.ts

@@ -0,0 +1,31 @@
+/*
+ * @Author: your name
+ * @Date: 2021-12-01 20:05:59
+ * @LastEditTime: 2021-12-01 20:35:33
+ * @LastEditors: your name
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: \tms-obc-web\src\app\routes\vehicle\components\list\list.component.spec.ts
+ */
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { VehicleComponentsListComponent } from './list.component';
+
+describe('VehicleComponentsListComponent', () => {
+  let component: VehicleComponentsListComponent;
+  let fixture: ComponentFixture<VehicleComponentsListComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [VehicleComponentsListComponent],
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(VehicleComponentsListComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/routes/vehicle/components/audit/audit.component.ts

@@ -0,0 +1,231 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+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 { UsermanageService } from '../../../vehicle/services/vehicle.service';
+@Component({
+  selector: 'app-Freight-components-list',
+  templateUrl: './list.component.html',
+})
+export class VehicleComponentsListComponent implements OnInit {
+  _$expand = false;
+  url = `/rule?_allow_anonymous=true`;
+
+  ui!: SFUISchema;
+  schema!: SFSchema;
+  columns!: STColumn[];
+  datalist = [
+    {
+      storeName: '企业名称',
+      contactsName: '152746565',
+      enterpriseName: '湖南',
+      unifiedSocialCreditCode: '45454',
+      contactsPhone: '*97889461561',
+      effectiveDateStr: '废弃eww',
+      enStatusStr2: '正常',
+      enStatusStr3: '正常',
+      unifiedSocialCreditCode3: '常用服务',
+      unifiedSocialCreditCode2: '正常',
+      tenantId: 1
+    },
+    {
+      storeName: '企业名称',
+      contactsName: '152746565',
+      enterpriseName: '湖南',
+      unifiedSocialCreditCode: '45454',
+      contactsPhone: '*97889461561',
+      effectiveDateStr: '废弃eww',
+      enStatusStr2: '正常',
+      enStatusStr3: '正常',
+      unifiedSocialCreditCode3: '常用服务',
+      unifiedSocialCreditCode2: '正常',
+      tenantId: 2
+    },
+  ]
+  @ViewChild('st', { static: false }) st!: STComponent;
+  @ViewChild('sf', { static: false }) sf!: SFComponent;
+
+  constructor(public service: UsermanageService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute) {}
+  /**
+   * 查询字段个数navigate
+   */
+  get queryFieldCount(): number {
+    return Object.keys(this.schema?.properties || {}).length;
+  }
+
+  /**
+   * 查询参数
+   */
+  get reqParams() {
+    const params: any = {
+      ...(this.sf && this.sf.value),
+    };
+    if (this.sf?.value.effectiveDate) {
+      params.effectiveDateStart = this.sf?.value.effectiveDate[0];
+      params.effectiveDateEnd = this.sf?.value.effectiveDate[1];
+    }
+    delete params.effectiveDate;
+    delete params.expand;
+    return params;
+  }
+
+  get selectedRows() {
+    return this.st?.list.filter((item) => item.checked) || [];
+  }
+
+  ngOnInit() {
+    this.initSF();
+    this.initST();
+    this.ar.url.subscribe((params) => {
+      this.st?.load(1);
+    });
+  }
+  dataProcess(data: STData[]): STData[] {
+    return data.map((i, index) => {
+      i.showSortFlag = false;
+      return i;
+    });
+  }
+  initSF() {
+    this.schema = {
+      properties: {
+        expand: {
+          type: 'boolean',
+          ui: {
+            hidden: true,
+          },
+        },
+        storeName: { title: '车牌号', type: 'string', ui: { showRequired: false } },
+        contactsName: {
+          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',
+          },
+        },
+        enStatus12: {
+          type: 'string',
+          title: '车牌颜色',
+          enum: [
+            { label: '全部', value: '' },
+            { label: '正常', value: 0 },
+            { label: '冻结', value: 1 },
+            { label: '废弃', value: 2 },
+          ],
+          default: '',
+          ui: {
+            widget: 'select',
+            visibleIf: {
+              expand: (value: boolean) => value,
+            },
+          },
+        },
+        enStatus2: {
+          type: 'string',
+          title: '到期状态',
+          enum: [
+            { label: '全部', value: '' },
+            { label: '正常', value: 0 },
+            { label: '冻结', value: 1 },
+            { label: '废弃', value: 2 },
+          ],
+          default: '',
+          ui: {
+            widget: 'select',
+            visibleIf: {
+              expand: (value: boolean) => value,
+            },
+          },
+        },
+      },
+    };
+    this.ui = { '*': { spanLabelFixed: 90, grid: { span: 8, gutter: 4 }, enter: () => this.st.load() } };
+  }
+
+  initST() {
+    this.columns = [
+      // { title: '', type: 'checkbox', className: 'text-center' },
+      { title: '车牌号', className: 'text-center', index: 'storeName' },
+      { title: '车牌颜色', className: 'text-center', index: 'contactsName' },
+      { title: '车型-车长-载重', className: 'text-center', render: 'enterpriseName' },
+      { title: '承运总单量', className: 'text-center', index: 'unifiedSocialCreditCode' },
+      { title: '运营状态', className: 'text-center', index: 'effectiveDateStr',
+      type: 'badge',
+      badge: {
+        正常: { text: '空闲', color: 'success' },
+        冻结: { text: '运输中', color: 'warning' },
+        废弃: { text: '废弃', color: 'default' },
+      },
+     },
+      {
+        title: '行驶证到期状态',
+        className: 'text-center',
+        index: 'enStatusStr2',
+        type: 'badge',
+        badge: {
+          正常: { text: '正常', color: 'success' },
+          冻结: { text: '冻结', color: 'warning' },
+          废弃: { text: '废弃', color: 'default' },
+        },
+      },
+      {
+        title: '道运证到期状态',
+        className: 'text-center',
+        index: 'enStatusStr3',
+        type: 'badge',
+        badge: {
+          正常: { text: '正常', color: 'success' },
+          冻结: { text: '冻结', color: 'warning' },
+          废弃: { text: '废弃', color: 'default' },
+        },
+      },
+      {
+        title: '操作',
+        width: '170px',
+        className: 'text-center',
+        buttons: [
+          {
+            text: '查看',
+            click: (item) => {
+              this.router.navigate(['./detail', item.tenantId], { relativeTo: this.ar });
+              // this.router.navigate(['./view', item.id], { relativeTo: this.ar, queryParams: { tenantId: item.tenantId } });
+            },
+          },
+        ],
+      },
+    ];
+  }
+  daoyun(item: any) {
+    this.router.navigate(['./view', item.tenantId], { relativeTo: this.ar });
+  }
+  expandToggle() {
+    this._$expand = !this._$expand;
+    this.sf?.setValue('/expand', this._$expand);
+  }
+  creat() {
+    this.router.navigate(['./new',], { relativeTo: this.ar });
+  }
+  /**
+   * 重置表单
+   */
+  resetSF() {
+    this.sf.reset();
+    this._$expand = false;
+  }
+}

src/app/routes/vehicle/components/audit/detail/detail.component.html

@@ -0,0 +1,121 @@
+<ng-container >
+  <!-- 页头 -->
+  <page-header-wrapper [logo]="logo" [content]="content">
+    <ng-template #logo>
+      <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
+        <i nz-icon nzType="left" nzTheme="outline"></i>
+      </button>
+    </ng-template>
+    <ng-template #content>
+      <div class="user-info">
+        <div style="flex: 1">
+         <div style="display: flex;">
+          <p style="padding-right: 80px; width: 400px;">车牌号{{ detailData?.shoppFeignVO?.publicity }}</p>
+          <p style="padding-right: 80px; width: 400px;">车牌颜色{{ detailData?.shoppFeignVO?.introduction }}</p>
+          <p >注册日期：2021-09-02 12.53.32</p>
+         </div>
+         <div style="display: flex;">
+          <p style="padding-right: 80px; width: 400px;">车型{{ detailData?.shoppFeignVO?.introduction }}</p>
+          <p >车长：2021-09-02 12.53.32</p>
+         </div>
+        
+   
+        </div>
+      </div>
+    </ng-template>
+  </page-header-wrapper>
+  <nz-card>
+    <sv-container col="3">
+      <sv-title>行驶证信息</sv-title>
+      <sv label="档案编号">
+        {{ detailData?.contactsName }}
+      </sv>
+      <sv label="准驾车型">
+        {{ detailData?.contactsPhone }}
+      </sv>
+      <sv label="行驶证注册日期">
+        {{ detailData?.contactsPhone }}
+      </sv>
+    </sv-container>
+
+      <sv-container col="2">
+        <sv label="行驶证到期日">
+          {{ detailData?.contactsPhone }}
+        </sv>
+      <sv label="行驶证签发机关">
+        {{ detailData?.contactsPhone }}
+      </sv>
+    </sv-container>
+
+    <sv-container col="3">
+      <sv label="行驶证发证日期">
+        {{ detailData?.contactsName }}
+      </sv>
+      <sv label="车辆识别代码">
+        {{ detailData?.contactsPhone }}
+      </sv>
+      <sv label="使用性质">
+        {{ detailData?.contactsPhone }}
+      </sv>
+    </sv-container>
+
+    <sv-container col="3">
+      <sv label="载重（吨）">
+        {{ detailData?.contactsName }}
+      </sv>
+      <sv label="整备质量">
+        {{ detailData?.contactsPhone }}
+      </sv>
+      <sv label="所有人">
+        {{ detailData?.contactsPhone }}
+      </sv>
+    </sv-container>
+    <sv-container col="1">
+      <sv label="自有载具">
+        {{ detailData?.contactsName }}
+      </sv>
+      <sv label="行驶证照片">
+        <!-- <app-imagelist [imgList]="detailData?.enterpriseQualificationCertificate"></app-imagelist> -->
+      </sv>
+    </sv-container>
+    <nz-divider></nz-divider>
+    <sv-container col="3" class="mt16">
+      <sv-title>道路运输证信息</sv-title>
+      <sv label="道路运输证号">
+        {{ detailData?.enterpriseName }}
+      </sv>
+      <sv label="许可证起始有效期">
+        {{ detailData?.unifiedSocialCreditCode }}
+      </sv>
+      <sv label="许可证截至有效期">
+        {{ detailData?.enterpriseType }}
+      </sv>
+      <sv label="营业执照">
+        <!-- <app-imagelist [imgList]="detailData?.enterpriseQualificationCertificate"></app-imagelist> -->
+      </sv>
+    </sv-container>
+    <nz-divider></nz-divider>
+    <sv-container col="2" class="mt16">
+      <sv-title>其他信息</sv-title>
+      <sv label="车头照">
+        {{ detailData?.name }}
+      </sv>
+      <sv label="车主申明或挂靠协议" >
+        <!-- <app-imagelist [imgList]="detailData?.certificatePhoto"></app-imagelist> -->
+      </sv>
+    </sv-container>
+    <nz-divider></nz-divider>
+    <st
+    #st
+    [bordered]="true"
+    [columns]="columns"
+    [data]="detailData.goodsList"
+    [ngStyle]="{ margin: '1rem 0' }"
+    multiSort
+    size="small"
+    [page]="{ show: false }"
+  >
+  </st>
+  </nz-card>
+</ng-container>
+

src/app/routes/vehicle/components/audit/detail/detail.component.less

@@ -0,0 +1,40 @@
+@import '~@delon/theme/index';
+:host {
+  ::ng-deep {
+    .ant-steps-dot {
+      .ant-steps-item-content {
+        width: 200px;
+      }
+      .ant-steps-item-icon {
+        margin-left: 96px;
+      }
+      .ant-steps-item-tail::after {
+        margin-left: 40px;
+      }
+    }
+    .success {
+      color: @success-color;
+    }
+
+    .warning {
+      color: @warning-color;
+    }
+
+    .error {
+      color: @error-color;
+    }
+  }
+  .mt16 {
+    margin-top: 16px;
+  }
+  .user-info {
+    display: flex;
+    font-size: 16px;
+    .enterprise-name {
+      margin-right: 15px;
+    }
+    .user-info-des {
+      margin-bottom: 5px;
+    }
+  }
+}

src/app/routes/vehicle/components/audit/detail/detail.component.spec.ts

@@ -0,0 +1,31 @@
+/*
+ * @Author: your name
+ * @Date: 2021-11-29 20:19:08
+ * @LastEditTime: 2021-11-29 20:31:00
+ * @LastEditors: your name
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: \tms-obc-web\src\app\routes\usercenter\components\freight\list\detail\detail.component.spec.ts
+ */
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { FreightComponentsListDetailComponent } from './detail.component';
+
+describe('FreightComponentsListDetailComponent', () => {
+  let component: FreightComponentsListDetailComponent;
+  let fixture: ComponentFixture<FreightComponentsListDetailComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [FreightComponentsListDetailComponent],
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(FreightComponentsListDetailComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/routes/vehicle/components/audit/detail/detail.component.ts

@@ -0,0 +1,273 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { STColumn, STComponent } from '@delon/abc/st';
+import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
+import { ModalHelper, _HttpClient } from '@delon/theme';
+import { NzMessageService } from 'ng-zorro-antd/message';
+import { UsermanageService } from '../../../services/vehicle.service';
+
+@Component({
+  selector: 'app-supplier-components-list-view',
+  templateUrl: './detail.component.html',
+  styleUrls: ['./detail.component.less'],
+})
+export class VehicleComponentsListDetailComponent implements OnInit {
+  i: any;
+  url = `/rule?_allow_anonymous=true`;
+  @ViewChild('st', { static: false }) st!: STComponent;
+  isShow = false;
+  isVisible = false;
+  modalTitle = '有效期';
+  modalName = '';
+  ui!: SFUISchema;
+  columns: STColumn[] = [
+    { title: '认证司机', index: 'perPrice', width: 300, className: 'text-center' },
+    { title: '司机手机号', index: 'goodsQuantity', width: 300, className: 'text-center' },
+    { title: '录入人员', index: 'totalPrice', width: 300, className: 'text-center' },
+  ];
+  detailData: any = {
+    goodsList: [
+      {
+        perPrice: '22323',
+        goodsQuantity: '项目名称',
+        totalPrice: '角色',
+      },
+      {
+        perPrice: '2259595',
+        goodsQuantity: '项目名称2',
+        totalPrice: '角色',
+      },
+    ]
+  };
+  schema!: SFSchema;
+  @ViewChild('sf', { static: false }) sf!: SFComponent;
+  schema1!: SFSchema;
+  @ViewChild('sf1', { static: false }) sf1!: SFComponent;
+  validData: any = ['suppliersType'];
+  suppliersData: any = {};
+
+  constructor(
+    private http: _HttpClient,
+    private modal: ModalHelper,
+    public service: UsermanageService,
+    private route: ActivatedRoute,
+    private modalHelper: ModalHelper,
+    private msgSrv: NzMessageService,
+  ) {}
+
+  ngOnInit() {
+    console.log(this.route.snapshot);
+    // this.initData();
+    this.initSF();
+    this.initSF1();
+    // this.launchSign();
+  }
+  /**
+   * 初始化查询表单
+   */
+  initSF() {
+    this.schema = {
+      properties: {
+        _$expand: { type: 'boolean', ui: { hidden: true } },
+        effectiveDate: {
+          title: '有效期',
+          type: 'string',
+          ui: {
+            widget: 'date',
+            format: 'yyyy-MM-dd 00:00:00',
+            // hidden: this.modalName === 'effectiveDate' ? false : true,
+          } as SFDateWidgetSchema,
+        },
+      },
+      required: ['effectiveDate'],
+    };
+    this.ui = { '*': { spanLabelFixed: 120, grid: { span: 24 } } };
+  }
+  initSF1() {
+    this.schema1 = {
+      properties: {
+        _$expand: { type: 'boolean', ui: { hidden: true } },
+        suppliersType: {
+          type: 'string',
+          title: '类型',
+          enum: [
+            { label: '非外部供应商', value: 0 },
+            { label: '外部供应商', value: 1 },
+          ],
+          default: '',
+          ui: {
+            widget: 'select',
+            change: (args: any) => {
+              console.log(args, 'args');
+              this.suppliersData.suppliersType = args;
+              if (args === 1) {
+                this.validData = ['suppliersType', 'externalSuppliersId'];
+              } else {
+                this.validData = ['suppliersType'];
+                this.suppliersData.externalSuppliersId = '';
+              }
+              this.initSF1();
+            },
+          },
+        },
+        externalSuppliersId: {
+          title: '外部供应商id',
+          type: 'string',
+          default: '',
+          ui: {
+            visibleIf: { suppliersType: (value: any) => value === 1 },
+          },
+        },
+      },
+      required: this.validData,
+    };
+  }
+  showModal(name: any) {
+    this.modalName = name;
+    if (name === 'effectiveDate') {
+      this.isShow = true;
+    } else {
+      this.isVisible = true;
+    }
+  }
+  async initData() {
+    console.log(this.route.snapshot, 'this.route.snapshot');
+
+    const params = {
+      tenantId: this.route.snapshot.params.id,
+      // tenantId: this.route.snapshot.queryParams.tenantId,
+    };
+    const res = await this.service.asyncRequest(this.service.$api_get_supplier_info, params);
+    // // 商品资质
+    // if (res.enterpriseBusinessJson) {
+    //   res.enterpriseBusinessJson.aptitudes = res.enterpriseBusinessJson?.aptitudes ? res.enterpriseBusinessJson.aptitudes.split(',') : [];
+    // }
+    // // // 申请人身份证证件
+    // // res.applyUserJson.imagelist = [];
+    // // res.applyUserJson.imagelist.push(res.applyUserJson.certificatePhotoFront);
+    // // res.applyUserJson.imagelist.push(res.applyUserJson.certificatePhotoBack);
+    // // res.applyUserJson.imagelist.push(res.applyUserJson.handCertificate);
+
+    // 法人身份证证件
+    const imagelist = [];
+    imagelist.push(res?.certificatePhotoFront);
+    imagelist.push(res?.certificatePhotoBack);
+    res.certificatePhoto = imagelist;
+
+    // 营业执照
+    res.enterpriseQualificationCertificate = res.enterpriseQualificationCertificate
+      ? res.enterpriseQualificationCertificate.split(',')
+      : [];
+
+    // 返回所在地
+    res.enterpriseAddressCodeStr = await this.getRegionFullName(res.enterpriseAddressCode);
+
+    this.detailData = res;
+    this.suppliersData = {
+      suppliersType: res?.suppliersType,
+      externalSuppliersId: res?.externalSuppliersId,
+    };
+  }
+
+  /**
+   * 根据地区code查询地区详情
+   * @param code 地区代码
+   */
+  async getRegionFullName(code: any) {
+    const params = {
+      regionCode: code,
+    };
+    const res = await this.service.asyncRequest(this.service.$api_get_region_detailByCode, params, 'POST', true);
+    // if (res && res.regionFullName) {
+    //   const arr = res.regionFullName.split(',');
+    //   res.regionFullName = arr.reverse().join('-');
+    // }
+    return res && res.regionFullName;
+  }
+  add() {
+    // this.modal
+    //   .createStatic(FormEditComponent, { i: { id: 0 } })
+    //   .subscribe(() => this.st.reload());
+  }
+  goBack() {
+    window.history.go(-1);
+  }
+  /**
+   * 冻结
+   */
+  freezeOrResume(type: number) {
+    console.log(type)
+    // this.service.http
+    //   .post(this.service.$api_set_freezeOrResume, {
+    //     tenantId: this.route.snapshot.params.id,
+    //     // tenantId: this.route.snapshot.queryParams.tenantId,
+    //     status: type,
+    //   })
+    //   .subscribe((res) => {
+    //     if (res.data === true) {
+    //       if (type === 0) {
+    //         this.service.msgSrv.success(`启用成功！`);
+    //       } else if (type === 1) {
+    //         this.service.msgSrv.success(`冻结成功！`);
+    //       }
+    //       this.ngOnInit();
+    //     } else {
+    //       this.service.msgSrv.error(res.msg || '操作失败！');
+    //     }
+    //   });
+  }
+  PayOrResume(type: number) {
+    console.log(type)
+    // this.service.http
+    //   .post(this.service.$api_set_freezeOrResume, {
+    //     tenantId: this.route.snapshot.params.id,
+    //     // tenantId: this.route.snapshot.queryParams.tenantId,
+    //     status: type,
+    //   })
+    //   .subscribe((res) => {
+    //     if (res.data === true) {
+    //       if (type === 0) {
+    //         this.service.msgSrv.success(`启用成功！`);
+    //       } else if (type === 1) {
+    //         this.service.msgSrv.success(`冻结成功！`);
+    //       }
+    //       this.ngOnInit();
+    //     } else {
+    //       this.service.msgSrv.error(res.msg || '操作失败！');
+    //     }
+    //   });
+  }
+
+  handleCancel(name: any) {
+    if (name === 'effectiveDate') {
+      this.isShow = false;
+    } else {
+      this.isVisible = false;
+    }
+  }
+  handleOK(name: any) {
+    const params: any = {
+      tenantId: this.route.snapshot.params.id,
+      // tenantId: this.route.snapshot.queryParams.tenantId,
+    };
+
+    if (name === 'effectiveDate') {
+      params.effectiveDate = this.sf?.value?.effectiveDate;
+    } else {
+      Object.assign(params, this.sf1?.value);
+    }
+    this.service.http.post(this.service.$api_set_freezeOrResume, params).subscribe((res) => {
+      if (res.data === true) {
+        this.service.msgSrv.success(`编辑成功！`);
+        this.ngOnInit();
+      } else {
+        this.service.msgSrv.error(res.msg || '编辑失败！');
+      }
+      if (name === 'effectiveDate') {
+        this.isShow = false;
+      } else {
+        this.isVisible = false;
+      }
+    });
+  }
+}

src/app/routes/vehicle/components/list/detail/detail.component.html

@@ -1,6 +1,6 @@
 <ng-container >
   <!-- 页头 -->
-  <page-header-wrapper [logo]="logo" [action]="action" [content]="content">
+  <page-header-wrapper [logo]="logo" [content]="content">
     <ng-template #logo>
       <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
         <i nz-icon nzType="left" nzTheme="outline"></i>
@@ -8,282 +8,114 @@
     </ng-template>
     <ng-template #content>
       <div class="user-info">
-        <img [src]="detailData?.shoppFeignVO?.logoUrl" />
         <div style="flex: 1">
          <div style="display: flex;">
-          <p style="padding-right: 80px; width: 400px;">深圳市xxxx科技有限公司{{ detailData?.shoppFeignVO?.publicity }}</p>
+          <p style="padding-right: 80px; width: 400px;">车牌号{{ detailData?.shoppFeignVO?.publicity }}</p>
-          <nz-badge nzStatus="success" nzText="正常" *ngIf="detailData?.status === 0"></nz-badge>
+          <p style="padding-right: 80px; width: 400px;">车牌颜色{{ detailData?.shoppFeignVO?.introduction }}</p>
-          <nz-badge nzStatus="error" nzText="冻结" *ngIf="detailData?.status === 1"></nz-badge>
+          <p >注册日期：2021-09-02 12.53.32</p>
-          <nz-badge nzStatus="warning" nzText="废弃" *ngIf="detailData?.status === 2"></nz-badge>
          </div>
          <div style="display: flex;">
-          <p style="padding-right: 80px; width: 400px;">4545456655645{{ detailData?.shoppFeignVO?.introduction }}</p>
+          <p style="padding-right: 80px; width: 400px;">车型{{ detailData?.shoppFeignVO?.introduction }}</p>
-          <p >认证时间：2021-09-02 12.53.32</p>
+          <p >车长：2021-09-02 12.53.32</p>
-         </div>
-         <div>
-          服务评级：<nz-rate [ngModel]="2" nzDisabled></nz-rate>
          </div>
         
-         <div style="position: relative;top: -65%;
-         left: 75%;">
-          <button
-          [nzLoading]="service.http.loading"
-          nz-button
-          nzDanger
-          nz-popconfirm
-          [nzPopconfirmTitle]="enable"
-          (nzOnConfirm)="freezeOrResume(0)"
-          nzPopconfirmPlacement="bottomRight"
-        >
-          启用
-        </button>
-        <button
-          [nzLoading]="service.http.loading"
-          nz-button
-          nzDanger
-          nz-popconfirm
-          [nzPopconfirmTitle]="frozen"
-          (nzOnConfirm)="freezeOrResume(1)"
-          nzPopconfirmPlacement="bottomRight"
-        >
-          冻结
-        </button>
-        <button
-          [nzLoading]="service.http.loading"
-          nz-button
-          nzDanger
-          nz-popconfirm
-          [nzPopconfirmTitle]="Payfrozen"
-          (nzOnConfirm)="PayOrResume(0)"
-          nzPopconfirmPlacement="bottomRight"
-        >
-          开通支付权限
-        </button>
-        <button
-          [nzLoading]="service.http.loading"
-          nz-button
-          nzDanger
-          nz-popconfirm
-          [nzPopconfirmTitle]="Payenable"
-          (nzOnConfirm)="PayOrResume(1)"
-          nzPopconfirmPlacement="bottomRight"
-        >
-          关闭支付权限
-        </button>
-         </div>
-        </div>
-      </div>
-    </ng-template>
-    <ng-template #action> </ng-template>
    
-    <ng-template #frozen>
-      <div class="ant-popover-message">
-        <i nz-icon="" nztheme="fill" class="anticon anticon-exclamation-circle ng-star-inserted">
-          <svg
-            viewBox="64 64 896 896"
-            focusable="false"
-            fill="currentColor"
-            width="1em"
-            height="1em"
-            class="ng-tns-c358-1487"
-            data-icon="exclamation-circle"
-            aria-hidden="true"
-          >
-            <path
-              d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm-32 232c0-4.4 3.6-8 8-8h48c4.4 0 8 3.6 8 8v272c0 4.4-3.6 8-8 8h-48c-4.4 0-8-3.6-8-8V296zm32 440a48.01 48.01 0 010-96 48.01 48.01 0 010 96z"
-            ></path>
-          </svg>
-        </i>
-        <div class="ant-popover-message-title ng-star-inserted self-ant-popover-title" style="font-size: 16px">确定冻结该企业吗？</div>
-        <div class="ant-popover-message-title ng-star-inserted">
-          停用后，该企业将被限制使用，不限于访问受限、无法发布货源等，请谨慎操作
-        </div>
-      </div>
-    </ng-template>
-    <ng-template #enable>
-      <div class="ant-popover-message">
-        <i nz-icon="" nztheme="fill" class="anticon anticon-exclamation-circle ng-star-inserted">
-          <svg
-            viewBox="64 64 896 896"
-            focusable="false"
-            fill="currentColor"
-            width="1em"
-            height="1em"
-            class="ng-tns-c358-1487"
-            data-icon="exclamation-circle"
-            aria-hidden="true"
-          >
-            <path
-              d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm-32 232c0-4.4 3.6-8 8-8h48c4.4 0 8 3.6 8 8v272c0 4.4-3.6 8-8 8h-48c-4.4 0-8-3.6-8-8V296zm32 440a48.01 48.01 0 010-96 48.01 48.01 0 010 96z"
-            ></path>
-          </svg>
-        </i>
-        <div class="ant-popover-message-title ng-star-inserted self-ant-popover-title" style="font-size: 16px">确定启用该企业吗？</div>
-        <div class="ant-popover-message-title ng-star-inserted">
-          启用后，该企业将恢复正常使用功能，请再次确认
-        </div>
-      </div>
-    </ng-template>
-    <ng-template #Payenable>
-      <div class="ant-popover-message">
-        <i nz-icon="" nztheme="fill" class="anticon anticon-exclamation-circle ng-star-inserted">
-          <svg
-            viewBox="64 64 896 896"
-            focusable="false"
-            fill="currentColor"
-            width="1em"
-            height="1em"
-            class="ng-tns-c358-1487"
-            data-icon="exclamation-circle"
-            aria-hidden="true"
-          >
-            <path
-              d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm-32 232c0-4.4 3.6-8 8-8h48c4.4 0 8 3.6 8 8v272c0 4.4-3.6 8-8 8h-48c-4.4 0-8-3.6-8-8V296zm32 440a48.01 48.01 0 010-96 48.01 48.01 0 010 96z"
-            ></path>
-          </svg>
-        </i>
-        <div class="ant-popover-message-title ng-star-inserted self-ant-popover-title" style="font-size: 16px">确定关闭该企业支付权限吗？</div>
-        <div class="ant-popover-message-title ng-star-inserted">
-          停用后，该企业将被限制使用支付功能，请谨慎操作
-        </div>
-      </div>
-    </ng-template>
-    <ng-template #Payfrozen>
-      <div class="ant-popover-message">
-        <i nz-icon="" nztheme="fill" class="anticon anticon-exclamation-circle ng-star-inserted">
-          <svg
-            viewBox="64 64 896 896"
-            focusable="false"
-            fill="currentColor"
-            width="1em"
-            height="1em"
-            class="ng-tns-c358-1487"
-            data-icon="exclamation-circle"
-            aria-hidden="true"
-          >
-            <path
-              d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm-32 232c0-4.4 3.6-8 8-8h48c4.4 0 8 3.6 8 8v272c0 4.4-3.6 8-8 8h-48c-4.4 0-8-3.6-8-8V296zm32 440a48.01 48.01 0 010-96 48.01 48.01 0 010 96z"
-            ></path>
-          </svg>
-        </i>
-        <div class="ant-popover-message-title ng-star-inserted self-ant-popover-title" style="font-size: 16px">确定开通该企业支付权限吗？</div>
-        <div class="ant-popover-message-title ng-star-inserted">
-          启用后，该企业将恢复正常支付功能，请再次确认
         </div>
       </div>
     </ng-template>
   </page-header-wrapper>
   <nz-card>
     <sv-container col="3">
-      <sv-title>联系信息人</sv-title>
+      <sv-title>行驶证信息</sv-title>
-      <sv label="联系人">
+      <sv label="档案编号">
         {{ detailData?.contactsName }}
       </sv>
-      <sv label="联系人手机号">
+      <sv label="准驾车型">
         {{ detailData?.contactsPhone }}
       </sv>
-      <sv label="联系人身份证号">
+      <sv label="行驶证注册日期">
         {{ detailData?.contactsPhone }}
       </sv>
-      <sv label="企业授权函">
+    </sv-container>
+
+      <sv-container col="2">
+        <sv label="行驶证到期日">
+          {{ detailData?.contactsPhone }}
+        </sv>
+      <sv label="行驶证签发机关">
+        {{ detailData?.contactsPhone }}
+      </sv>
+    </sv-container>
+
+    <sv-container col="3">
+      <sv label="行驶证发证日期">
+        {{ detailData?.contactsName }}
+      </sv>
+      <sv label="车辆识别代码">
+        {{ detailData?.contactsPhone }}
+      </sv>
+      <sv label="使用性质">
+        {{ detailData?.contactsPhone }}
+      </sv>
+    </sv-container>
+
+    <sv-container col="3">
+      <sv label="载重（吨）">
+        {{ detailData?.contactsName }}
+      </sv>
+      <sv label="整备质量">
+        {{ detailData?.contactsPhone }}
+      </sv>
+      <sv label="所有人">
+        {{ detailData?.contactsPhone }}
+      </sv>
+    </sv-container>
+    <sv-container col="1">
+      <sv label="自有载具">
+        {{ detailData?.contactsName }}
+      </sv>
+      <sv label="行驶证照片">
         <!-- <app-imagelist [imgList]="detailData?.enterpriseQualificationCertificate"></app-imagelist> -->
       </sv>
     </sv-container>
     <nz-divider></nz-divider>
     <sv-container col="3" class="mt16">
-      <sv-title>公司基本信息</sv-title>
+      <sv-title>道路运输证信息</sv-title>
-      <sv label="公司名称">
+      <sv label="道路运输证号">
         {{ detailData?.enterpriseName }}
       </sv>
-      <sv label="统一社会信用代码">
+      <sv label="许可证起始有效期">
         {{ detailData?.unifiedSocialCreditCode }}
       </sv>
-      <sv label="公司类型">
+      <sv label="许可证截至有效期">
         {{ detailData?.enterpriseType }}
       </sv>
-      <sv label="注册资本">
-        {{ detailData?.registrationCapital }}
-        <span *ngIf="detailData?.registrationCapital">万元</span>
-      </sv>
-      <sv label="成立日期">
-        {{ detailData?.enterpriseRegistrationTime }}
-      </sv>
-      <sv label="营业期限">
-        <div *ngIf="!!detailData?.operatingStartTime && !!detailData?.operatingEndTime">
-          {{ detailData?.operatingStartTime }} 至 {{ detailData?.operatingEndTime }}
-        </div>
-        <div *ngIf="!detailData?.operatingStartTime && !detailData?.operatingEndTime">长期</div>
-        <div *ngIf="!!detailData?.operatingStartTime && !detailData?.operatingEndTime">{{ detailData?.operatingStartTime }} 至 长期</div>
-      </sv>
-    </sv-container>
-    <sv-container col="2" class="mt16">
-      <sv label="公司所在地" col="3">
-        {{ detailData?.enterpriseAddressCodeStr }}
-      </sv>
-      <sv label="公司详细地址">
-        {{ detailData?.enterpriseAddress }}
-      </sv>
-    </sv-container>
-    <sv-container col="2" class="mt16">
-      <sv label="公司实际经营所在地" col="3">
-        {{ detailData?.enterpriseAddressCodeStr }}
-      </sv>
-      <sv label="公司实际经营详细地址">
-        {{ detailData?.enterpriseAddress }}
-      </sv>
-    </sv-container>
-    <sv-container col="2" class="mt16">
-      <sv label="公司电话" col="3">
-        {{ detailData?.enterpriseAddressCodeStr }}
-      </sv>
-      <sv label="公司邮箱">
-        {{ detailData?.enterpriseAddress }}
-      </sv>
-    </sv-container>
-    <sv-container col="1" class="mt16">
-      <sv label="经营范围">
-        {{ detailData?.businessScope }}
-      </sv>
       <sv label="营业执照">
         <!-- <app-imagelist [imgList]="detailData?.enterpriseQualificationCertificate"></app-imagelist> -->
       </sv>
     </sv-container>
     <nz-divider></nz-divider>
-    <sv-container col="3" class="mt16">
+    <sv-container col="2" class="mt16">
-      <sv-title>法人信息</sv-title>
+      <sv-title>其他信息</sv-title>
-      <sv label="法定代表人">
+      <sv label="车头照">
         {{ detailData?.name }}
       </sv>
-      <sv label="身份证号">
+      <sv label="车主申明或挂靠协议" >
-        {{ detailData?.certificateNumber }}
-      </sv>
-      <sv label="身份证有效期">
-        {{ detailData?.validStartTime }} -
-        {{ detailData?.validEndTime ? detailData?.validEndTime : '长期' }}
-      </sv>
-      <sv label="身份证照" col="1">
         <!-- <app-imagelist [imgList]="detailData?.certificatePhoto"></app-imagelist> -->
       </sv>
     </sv-container>
     <nz-divider></nz-divider>
-    <sv-container col="3" class="mt16">
+    <st
-      <sv-title>银行结算信息</sv-title>
+    #st
-      <sv label="开户名称">
+    [bordered]="true"
-        {{ detailData?.name }}
+    [columns]="columns"
-      </sv>
+    [data]="detailData.goodsList"
-      <sv label="开户账户">
+    [ngStyle]="{ margin: '1rem 0' }"
-        {{ detailData?.certificateNumber }}
+    multiSort
-      </sv>
+    size="small"
-      <sv label="开户支行">
+    [page]="{ show: false }"
-        {{ detailData?.validStartTime }}
+  >
-      </sv>
+  </st>
-    </sv-container>
   </nz-card>
 </ng-container>
-<nz-modal [(nzVisible)]="isVisible" nzTitle="类型" (nzOnOk)="handleOK('suppliersType')">
+
-  <sf #sf1 [schema]="schema1" [ui]="ui" [compact]="false" [button]="'none'" [formData]="suppliersData"></sf>
-  <div *nzModalFooter>
-    <button nz-button nzType="default" (click)="handleCancel('suppliersType')">取消</button>
-    <button nz-button nzType="primary" (click)="handleOK('suppliersType')" [disabled]="!sf1.valid">确认</button>
-  </div>
-</nz-modal>

src/app/routes/vehicle/components/list/detail/detail.component.less

@@ -33,12 +33,6 @@
     .enterprise-name {
       margin-right: 15px;
     }
-    img {
-      width: 64px;
-      height: 64px;
-      margin-right: 15px;
-      border-radius: 50%;
-    }
     .user-info-des {
       margin-bottom: 5px;
     }

src/app/routes/vehicle/components/list/detail/detail.component.ts

@@ -4,23 +4,41 @@ import { STColumn, STComponent } from '@delon/abc/st';
 import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
 import { ModalHelper, _HttpClient } from '@delon/theme';
 import { NzMessageService } from 'ng-zorro-antd/message';
-import { UsermanageService } from '../../../../services/usercenter.service';
+import { UsermanageService } from '../../../services/vehicle.service';
 
 @Component({
   selector: 'app-supplier-components-list-view',
   templateUrl: './detail.component.html',
   styleUrls: ['./detail.component.less'],
 })
-export class FreightComponentsListDetailComponent implements OnInit {
+export class VehicleComponentsListDetailComponent implements OnInit {
   i: any;
   url = `/rule?_allow_anonymous=true`;
   @ViewChild('st', { static: false }) st!: STComponent;
-  detailData: any;
   isShow = false;
   isVisible = false;
   modalTitle = '有效期';
   modalName = '';
   ui!: SFUISchema;
+  columns: STColumn[] = [
+    { title: '认证司机', index: 'perPrice', width: 300, className: 'text-center' },
+    { title: '司机手机号', index: 'goodsQuantity', width: 300, className: 'text-center' },
+    { title: '录入人员', index: 'totalPrice', width: 300, className: 'text-center' },
+  ];
+  detailData: any = {
+    goodsList: [
+      {
+        perPrice: '22323',
+        goodsQuantity: '项目名称',
+        totalPrice: '角色',
+      },
+      {
+        perPrice: '2259595',
+        goodsQuantity: '项目名称2',
+        totalPrice: '角色',
+      },
+    ]
+  };
   schema!: SFSchema;
   @ViewChild('sf', { static: false }) sf!: SFComponent;
   schema1!: SFSchema;

src/app/routes/vehicle/components/list/list.component.html

@@ -1,13 +1,13 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-29 15:22:34
- * @LastEditTime: 2021-11-29 20:14:00
+ * @LastEditTime: 2021-12-01 20:58:57
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\usercenter\components\freight\list\list.component.html
 -->
 <!-- 页头 -->
-<page-header-wrapper [title]="'企业列表'"></page-header-wrapper>
+<page-header-wrapper ></page-header-wrapper>
 <nz-card>
   <!-- 搜索区 -->
   <!-- 搜索表单 -->
@@ -33,7 +33,6 @@
         <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
       </div>
       <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
-        <button nz-button nzType="primary"  [nzLoading]="service.http.loading" (click)="creat()">新建</button>
         <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">导出</button>
         <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
         <button nz-button (click)="resetSF()">重置</button>

src/app/routes/vehicle/components/list/list.component.ts

@@ -96,24 +96,32 @@ export class VehicleComponentsListComponent implements OnInit {
             hidden: true,
           },
         },
-        storeName: { title: '企业名称', type: 'string', ui: { showRequired: false } },
+        storeName: { title: '车牌号', type: 'string', ui: { showRequired: false } },
         contactsName: {
-          title: '联系人',
+          title: '车型车长载重',
-          type: 'string',
-          ui: {
-            showRequired: false,
-          },
-        },
-        unifiedSocialCreditCode: {
-          title: '税源地',
           type: 'string',
           ui: {
             showRequired: false,
           },
         },
+ 
         enStatus: {
           type: 'string',
-          title: '货主状态',
+          title: '运营状态',
+          enum: [
+            { label: '全部', value: '' },
+            { label: '正常', value: 0 },
+            { label: '冻结', value: 1 },
+            { label: '废弃', value: 2 },
+          ],
+          default: '',
+          ui: {
+            widget: 'select',
+          },
+        },
+        enStatus12: {
+          type: 'string',
+          title: '车牌颜色',
           enum: [
             { label: '全部', value: '' },
             { label: '正常', value: 0 },
@@ -130,7 +138,7 @@ export class VehicleComponentsListComponent implements OnInit {
         },
         enStatus2: {
           type: 'string',
-          title: 'CRM审核状态',
+          title: '到期状态',
           enum: [
             { label: '全部', value: '' },
             { label: '正常', value: 0 },
@@ -153,23 +161,20 @@ export class VehicleComponentsListComponent implements OnInit {
   initST() {
     this.columns = [
       // { title: '', type: 'checkbox', className: 'text-center' },
-      { title: '企业名称', className: 'text-center', index: 'storeName' },
+      { title: '车牌号', className: 'text-center', index: 'storeName' },
-      { title: '联系人', className: 'text-center', index: 'contactsName' },
+      { title: '车牌颜色', className: 'text-center', index: 'contactsName' },
-      { title: '税源地', className: 'text-center', render: 'enterpriseName' },
+      { title: '车型-车长-载重', className: 'text-center', render: 'enterpriseName' },
-      { title: '累计运单金额', className: 'text-center', index: 'unifiedSocialCreditCode' },
+      { title: '承运总单量', className: 'text-center', index: 'unifiedSocialCreditCode' },
-      { title: '道运证', className: 'text-center', index: 'contactsPhone',
+      { title: '运营状态', className: 'text-center', index: 'effectiveDateStr',
-        render: 'contactsPhone'
-      },
-      { title: '企业状态', className: 'text-center', index: 'effectiveDateStr',
       type: 'badge',
       badge: {
-        正常: { text: '正常', color: 'success' },
+        正常: { text: '空闲', color: 'success' },
-        冻结: { text: '冻结', color: 'warning' },
+        冻结: { text: '运输中', color: 'warning' },
         废弃: { text: '废弃', color: 'default' },
       },
      },
       {
-        title: 'CRM审核状态',
+        title: '行驶证到期状态',
         className: 'text-center',
         index: 'enStatusStr2',
         type: 'badge',
@@ -180,7 +185,7 @@ export class VehicleComponentsListComponent implements OnInit {
         },
       },
       {
-        title: '代收权限',
+        title: '道运证到期状态',
         className: 'text-center',
         index: 'enStatusStr3',
         type: 'badge',
@@ -190,8 +195,6 @@ export class VehicleComponentsListComponent implements OnInit {
           废弃: { text: '废弃', color: 'default' },
         },
       },
-      { title: '常用服务', className: 'text-center', index: 'unifiedSocialCreditCode3' },
-      { title: '推广业务员', className: 'text-center', index: 'unifiedSocialCreditCode2' },
       {
         title: '操作',
         width: '170px',

src/app/routes/vehicle/vehicle-routing.module.ts

@@ -1,13 +1,14 @@
 /*
  * @Author: your name
  * @Date: 2021-11-29 15:22:34
- * @LastEditTime: 2021-12-01 20:38:01
+ * @LastEditTime: 2021-12-02 11:11:39
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\usercenter\usercenter-routing.module.ts
  */
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
+import { VehicleComponentsListDetailComponent } from './components/list/detail/detail.component';
 import { VehicleComponentsListComponent } from './components/list/list.component';
 
 
@@ -15,6 +16,7 @@ import { VehicleComponentsListComponent } from './components/list/list.component
 const routes: Routes = [
 
   { path: 'list', component: VehicleComponentsListComponent },
+  { path: 'list/detail/:id', component: VehicleComponentsListDetailComponent },
 ];
 
 @NgModule({

src/app/routes/vehicle/vehicle.module.ts

@@ -8,12 +8,14 @@
  */
 import { NgModule } from '@angular/core';
 import { SharedModule } from '@shared';
+import { VehicleComponentsListDetailComponent } from './components/list/detail/detail.component';
 import { VehicleComponentsListComponent } from './components/list/list.component';
 import { VehicleRoutingModule } from './vehicle-routing.module';
 
 
 const COMPONENTS = [
-  VehicleComponentsListComponent
+  VehicleComponentsListComponent,
+  VehicleComponentsListDetailComponent
 ];
 
 @NgModule({

src/assets/mocks/menu-data.json

@@ -120,6 +120,11 @@
             {
               "text": "车辆列表",
               "link": "/vehicle/list"
+            },
+            {
+              "hide": true,
+              "text": "车辆详情",
+              "link": "/vehicle/list/detail/:id"
             }
           ]
         },