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

2021-12-01 10:58:31 +08:00
parent b88e313785 741912c630
commit 1ea3377be7
29 changed files with 1449 additions and 2230 deletions
--- a/src/app/routes/routes-routing.module.ts
+++ b/src/app/routes/routes-routing.module.ts
@ -1,7 +1,7 @@
 /*
 * @Author: your name
 * @Date: 2021-11-29 10:20:33
- * @LastEditTime: 2021-11-29 15:38:35
+ * @LastEditTime: 2021-12-01 09:53:56
 * @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\routes-routing.module.ts
@ -31,7 +31,8 @@ const routes: Routes = [
        path: 'usercenter',
        loadChildren: () => import('./usercenter/usercenter.module').then(m => m.UsercenterModule)
      },
-      { path: 'system', loadChildren: () => import('./sys-setting/sys-setting.module').then(m => m.SysSettingModule) }
+      { path: 'system', loadChildren: () => import('./sys-setting/sys-setting.module').then(m => m.SysSettingModule) },
+      { path: 'supplygoods', loadChildren: () => import('./supply-goods/supply-goods.module').then(m => m.SupplyGoodsModule) }
    ]
  },
  // passport
--- a/src/app/routes/supply-goods/components/carload/carload.component.html
+++ b/src/app/routes/supply-goods/components/carload/carload.component.html
@ -0,0 +1,183 @@
+
+<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" [disabled]="!sf.valid"  (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>
+  <div class="actionAreaWrap">
+    <button nz-button (click)="orderExport()" nzType="primary">订单导入</button>
+    <!-- <button nz-button (click)="deliverBelivery()" nzType="primary">批量发货</button> -->
+  </div>
+  <nz-tabset [nzTabPosition]="'top'" [nzType]="'card'" class="table" [nzSelectedIndex]="nzSelectedIndex">
+    <nz-tab *ngFor="let tab of tabs; let i = index" [nzTitle]="i === 3 ? tab + '（' + toSendCount + '）' : tab" (nzClick)="tabChange(i)">
+      <nz-table
+        #nzTable
+        [nzData]="listData"
+        nzTableLayout="fixed"
+        [nzLoading]="loading"
+        [nzTotal]="total"
+        [nzBordered]="true"
+        [nzFrontPagination]="false"
+        [nzPageSize]="pageSize"
+        [nzPageIndex]="pageIndex"
+        (nzPageIndexChange)="changePageIndex($event)"
+        [nzShowTotal]="totalTemplate"
+        [nzShowSizeChanger]="true"
+        (nzPageSizeChange)="changePageSize($event)"
+        [nzPageSizeOptions]="[10, 20, 30, 50, 100, 200, 300, 500, 1000]"
+      >
+        <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+        <thead>
+          <tr>
+            <th nzAlign="center">商品</th>
+            <th nzWidth="100px" nzAlign="center">订单金额</th>
+            <th nzWidth="160px" nzAlign="center">收件人</th>
+            <th nzWidth="160px" nzAlign="center">下单商家</th>
+            <th nzWidth="120px" nzAlign="center">状态</th>
+            <th nzWidth="120px" nzAlign="center">操作</th>
+          </tr>
+        </thead>
+        <tbody>
+          <ng-container *ngFor="let data of nzTable.data; index as key">
+            <tr [nzExpand]="true">
+              <div class="order-line">
+                <div class="order-line-number">
+                  订单号：{{ data.orderSn }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;下单时间：{{
+                    data.createTime
+                  }}&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;订单类型：{{
+                    data.supplierType == 1 ? '普通订单' : 'GD订单'
+                  }}
+                  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;支付方式：{{ data.payType === 1 ? '一次性付款，先货后款' : '-'
+                  }}{{ data.payType === 2 ? '分批付款，先货后款' : '' }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 配送方式：{{
+                    data.deliveryTypeDesc
+                  }}
+                </div>
+              </div>
+            </tr>
+            <tr *ngFor="let item of data.goodsList; index as i">
+              <td>
+                <div class="order-goods">
+                  <div class="order-goods-img">
+                    <img [src]="item.goodsPhotoUrl" alt="" />
+                  </div>
+                  <div class="order-goods-info">
+                    <h2>
+                      <span nz-tooltip [nzTooltipTitle]="item.goodsName"
+                        >{{ item.goodsName }}<br />
+                        <span *ngFor="let items of item.goodsSpecJson; index as i">
+                          <span *ngIf="i !== 0">，</span>{{ items.specName }}：{{ items.specValueName }}
+                        </span>
+                      </span>
+                      <p>数量：{{ item.goodsQuantity }}</p>
+                    </h2>
+                  </div>
+                  <div class="order-goods-state">
+                    {{ item.sendType === 1 ? '已发货' : item.sendType === 2 ? '部分发货' : '' }}<br />
+                    {{ item.returnStatusName }}
+                  </div>
+                </div>
+              </td>
+
+              <ng-container [ngSwitch]="i">
+                <ng-container *ngSwitchCase="0">
+                  <td [rowSpan]="data.goodsList.length">¥{{ data.payAmount.toFixed(2) }}</td>
+                  <td [rowSpan]="data.goodsList.length" nzAlign="center">
+                    {{ data.receiveName }}<br />
+                    {{ data.receiveMobile }}
+                  </td>
+                  <td [rowSpan]="data.goodsList.length" nzAlign="center">
+                    {{ data.tenantName }}
+                  </td>
+                  <td [rowSpan]="data.goodsList.length" nzAlign="center">
+                    <ng-container *ngIf="data.orderStatusStr; else elseorderStatusTemplate">{{ data.orderStatusStr }}</ng-container
+                    ><ng-template #elseorderStatusTemplate
+                      ><span *ngIf="!(data.payType === 2 && data.orderExtend.isDeliverGoods === 1 && data.orderStatus === 20)">{{
+                        data.orderStatusDesc
+                      }}</span
+                      ><br /><span *ngIf="data.payType === 2 && data.orderStatus !== 5 && data.orderExtend.isPay === 0">{{
+                        data.payStatusDesc
+                      }}</span></ng-template
+                    >
+                  </td>
+                  <td [rowSpan]="data.goodsList.length" nzAlign="center">
+                    <div class="order-line-price">
+                      <!-- <span *ngIf="data.updateDeliverFlag === 1"
+                        ><a nz-button nzType="link" (click)="updateLogistics(data)">修改运单</a><br
+                      /></span> -->
+                      <!-- *ngIf="data.orderPaymentVoucherVO.chechStatus === 0" -->
+                      <span *ngIf="data.orderPaymentVoucherVO.checkStatus === 0 && data.supplierType === 2">
+                        <a nz-button nzType="link" (click)="paymentReview(data)">付款审核</a>
+                      </span>
+                      <span *ngIf="data.orderStatus === 5 && data.supplierType === 2">
+                        <a nz-button nzType="link" (click)="orderReview(data)">审核</a><br />
+                      </span>
+                      <span *ngIf="data.orderStatus === 5">
+                        <a nz-button nzType="link" (click)="modifyPrice(data)">修改价格</a>
+                      </span>
+                      <span
+                        *ngIf="
+                          data.orderExtend?.isDeliverGoods === 0 && data.orderStatus !== 5 && data.orderStatus !== 50 && data.payType === 2
+                        "
+                      >
+                        <a nz-button nzType="link" (click)="deliverGoods(data)">立即发货</a>
+                        <br
+                      /></span>
+                      <span *ngIf="data.orderExtend?.isDeliverGoods === 0 && data.orderStatus === 20 && data.payType === 1">
+                        <a nz-button nzType="link" (click)="deliverGoods(data)">立即发货</a>
+                        <br
+                      /></span>
+                      <a nz-button nzType="link" (click)="goDetail(data)">查看详情</a>
+                    </div>
+                  </td>
+                </ng-container>
+              </ng-container>
+            </tr>
+          </ng-container>
+        </tbody>
+      </nz-table>
+    </nz-tab>
+  </nz-tabset>
+</nz-card>
+
+<ng-template #exportTemplate>
+  <nz-alert nzType="info" nzMessage="为保证报表导出性能，最多只能导出最近1W个订单" nzShowIcon></nz-alert>
+  <sv-container col="1" style="margin-top: 20px">
+    <sv label="报表字段">
+      <nz-tag *ngFor="let item of exportFieldList" nzColor="#2db7f5">
+        {{ item }}
+      </nz-tag>
+    </sv>
+  </sv-container>
+</ng-template>
--- a/src/app/routes/supply-goods/components/carload/carload.component.less
+++ b/src/app/routes/supply-goods/components/carload/carload.component.less
@ -0,0 +1,128 @@
+.order-goods {
+  display: flex;
+  text-align: left;
+  .order-goods-img {
+    width: 80px;
+    height: 80px;
+    margin-right: 10px;
+    overflow: hidden;
+    img {
+      width: 100%;
+    }
+  }
+  .order-goods-info {
+    flex: 1;
+  }
+  .order-goods-state {
+    width: 70px;
+    margin-left: 10px;
+    line-height: 28px;
+    text-align: right;
+  }
+}
+h2 {
+  font-size: 16px;
+}
+p {
+  font-size: 14px;
+}
+.form,
+.table {
+  background-color: #fff;
+}
+.form {
+  padding: 20px;
+}
+.select-item {
+  width: 180px;
+}
+.ant-form-item {
+  margin-bottom: 16px;
+}
+.order-line {
+  display: flex;
+  justify-content: space-between;
+}
+
+.order-receiving {
+  .order-receiving-remark {
+    line-height: 26px;
+    span {
+      color: #1890ff;
+    }
+    input {
+      width: 130px;
+      margin-right: 6px;
+      padding: 0;
+      overflow: hidden;
+      color: #1890ff;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      background: none;
+      border: none;
+      &.have-edit {
+        color: #000000a6;
+        border: 1px solid #d9d9d9;
+      }
+    }
+  }
+}
+.order-operation {
+  div {
+    color: #1890ff;
+    cursor: pointer;
+  }
+  p {
+    margin-bottom: 10px;
+  }
+}
+.timeline {
+  span {
+    display: inline-block;
+    margin: 0 4px;
+    padding: 5px 6px;
+    color: #999;
+    background-color: #f2f2f2;
+    border-radius: 2px;
+    cursor: pointer;
+  }
+}
+.ant-table-tbody > tr.ant-table-row:hover > td {
+  background: #fff;
+}
+
+.btnBox {
+  margin: 0 0 10px 0;
+}
+.searchAreaWrap {
+  display: flex;
+}
+.sfExpand {
+  display: block;
+}
+.actionBox {
+  margin: 0 0 0 10px;
+}
+.sfBox {
+  width: 60%;
+}
+.expandsfBox {
+  width: 100%;
+}
+.expandAcitonBox {
+  margin: 10px 0 20px 0;
+  text-align: right;
+}
+.actionAreaWrap {
+  margin: 0 0 20px 0;
+}
+.overflowText {
+  display: -webkit-box;
+  overflow: hidden;
+  text-align: left;
+  text-overflow: -o-ellipsis-lastline;
+  text-overflow: ellipsis;
+  -webkit-line-clamp: 2;
+  line-clamp: 2;
+  -webkit-box-orient: vertical;
+}
--- a/src/app/routes/supply-goods/components/carload/carload.component.spec.ts
+++ b/src/app/routes/supply-goods/components/carload/carload.component.spec.ts
@ -0,0 +1,31 @@
+/*
+ * @Description:
+ * @Author: wsm
+ * @Date: 2021-07-08 15:46:29
+ * @LastEditTime: 2021-12-01 10:02:07
+ * @LastEditors: Please set LastEditors
+ * @Reference:
+ */
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { SupplyGoodsComponentListCarloadComponent } from './carload.component';
+
+describe('SupplyGoodsComponentListCarloadComponent', () => {
+  let component: SupplyGoodsComponentListCarloadComponent;
+  let fixture: ComponentFixture<SupplyGoodsComponentListCarloadComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [SupplyGoodsComponentListCarloadComponent],
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(SupplyGoodsComponentListCarloadComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
--- a/src/app/routes/supply-goods/components/carload/carload.component.ts
+++ b/src/app/routes/supply-goods/components/carload/carload.component.ts
@ -0,0 +1,398 @@
+/*
+ * @Description:
+ * @Author: wsm
+ * @Date: 2021-07-15 09:42:57
+ * @LastEditTime: 2021-12-01 10:36:54
+ * @LastEditors: Please set LastEditors
+ * @Reference:
+ */
+import { AfterViewInit, Component, OnInit, TemplateRef, ViewChild } from '@angular/core';
+import { FormBuilder, FormGroup } from '@angular/forms';
+import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
+import { STComponent } from '@delon/abc/st';
+import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
+import { ModalHelper } from '@delon/theme';
+import { NzModalService } from 'ng-zorro-antd/modal';
+import { filter } from 'rxjs/operators';
+
+
+@Component({
+  selector: 'app-supply-goods-components-list-carload',
+  templateUrl: './carload.component.html',
+  styleUrls: ['./carload.component.less'],
+})
+export class SupplyGoodsComponentListCarloadComponent implements OnInit, AfterViewInit {
+  @ViewChild('st', { static: true }) st!: STComponent;
+  @ViewChild('sf', { static: false }) sf!: SFComponent;
+  validateForm!: FormGroup;
+  @ViewChild('exportTemplate')
+  exportTemplate!: TemplateRef<any>;
+  ui: SFUISchema = {};
+  mode: any = 'search';
+  tabs = ['全部', '待审核', '待支付', '待发货', '待收货', '已完成'];
+  exportFieldList = [
+    '订单号',
+    '下单时间',
+    '支付方式',
+    '订单金额',
+    '订单状态',
+    '下单商家',
+    'SKU信息（SKUID,商品名称+规格名称,数量）',
+    '配送方式',
+    '收件人',
+    '收件人电话',
+    '收件人地址',
+  ];
+  listData: any;
+  orderStatus: any = '0'; // 订单状态, 10为已提交待付款, 20为已付款待发,30为已发货待收货,50取消订单,40 已完成
+  nzSelectedIndex = 0;
+  total = 1;
+  loading = false;
+  pageSize = 20;
+  pageIndex = 1;
+  toSendCount = 0;
+  addTimeStart = '';
+  addTimeEnd = '';
+  sfExpand = false;
+  _$expand = false;
+
+  schema!: SFSchema;
+  payStatus: any;
+  constructor(
+    private fb: FormBuilder,
+    private modal: NzModalService,
+    private router: Router,
+    private ar: ActivatedRoute,
+    private modalHelper: ModalHelper,
+  ) {}
+
+  ngOnInit(): void {
+    this.getList();
+    this.initSF();
+    this.initUI();
+  }
+
+  ngAfterViewInit() {
+    // this.router.events.pipe(filter((evt) => evt instanceof NavigationEnd)).subscribe(() => {
+    //
+    // });
+  }
+
+  initSF() {
+    this.schema = {
+      properties: {
+        expand: {
+          type: 'boolean',
+          ui: {
+            hidden: true,
+          },
+        },
+        storeName: { title: '企业名称', type: 'string', ui: { showRequired: false } },
+        contactsName: {
+          title: '联系人',
+          type: 'string',
+          ui: {
+            showRequired: false,
+          },
+        },
+        unifiedSocialCreditCode: {
+          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',
+            visibleIf: {
+              expand: (value: boolean) => value,
+            },
+          },
+        },
+        enStatus2: {
+          type: 'string',
+          title: 'CRM审核状态',
+          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() } };
+  }
+  initUI() {
+    this.ui = {
+      '*': {
+        spanLabelFixed: 90,
+        grid: { span: 8 },
+      },
+    };
+  }
+  tabChange(i: number) {
+    this.changeIndex(i);
+    this.getList();
+  }
+  changeIndex(i: number) {
+    if (i === 0) {
+      this.orderStatus = '0';
+      this.payStatus = null;
+    } else if (i === 1) {
+      this.orderStatus = '5';
+      this.payStatus = null;
+    } else if (i === 2) {
+      this.orderStatus = null;
+      this.payStatus = '10';
+    } else if (i === 3) {
+      this.orderStatus = '20';
+      this.payStatus = null;
+    } else if (i === 4) {
+      this.orderStatus = '30';
+      this.payStatus = null;
+    } else if (i === 5) {
+      this.orderStatus = '40';
+      this.payStatus = null;
+    }
+    this.pageIndex = 1;
+  }
+  getList(type?: string) {
+    // this.loading = true;
+    const params: any = {
+      pageSize: this.pageSize,
+      pageIndex: this.pageIndex,
+      ...this.sf?.value,
+      orderStatus: this.orderStatus,
+      payStatus: this.payStatus,
+      createTime: this.sf?.value.createTime || [],
+      time: {},
+    };
+    if (this.sf?.value?.createTime) {
+      delete params.createTime;
+      params.time.start = this.sf?.value?.createTime[0];
+      params.time.end = this.sf?.value?.createTime[1];
+    }
+    delete params.expand;
+    if (type === 'search') {
+      params.pageIndex = 1;
+    }
+    // this.service.request(this.service.$api_get_page, params).subscribe((res) => {
+    //   this.loading = false;
+    //   this.listData = res.orderPage.records;
+    //   this.toSendCount = res.toSendCount;
+    //   this.listData.forEach((element: { goodsList: { goodsSpecJson: string }[] }) => {
+    //     element.goodsList.forEach((item: { goodsSpecJson: string }) => {
+    //       if (item.goodsSpecJson) {
+    //         item.goodsSpecJson = JSON.parse(item.goodsSpecJson);
+    //       }
+    //     });
+    //   });
+    //   this.total = res.orderPage.total;
+    // });
+  }
+
+  orderExport() {
+    // this.service.exportStart(params, this.service.$api_export);
+    this.modal.create({
+      nzTitle: '订单导出',
+      nzContent: this.exportTemplate,
+      // nzContent: `待导出订单总数：${this.pageInfo.total}条，确定要导出吗？`,
+      nzOnOk: () => {
+        const params: any = {
+          pageSize: this.pageSize,
+          pageIndex: this.pageIndex,
+          ...this.sf?.value,
+          orderStatus: this.orderStatus,
+          // createTime: this.sf?.value.createTime || [],
+        };
+        delete params.expand;
+      },
+    });
+  }
+
+  goDetail(data: any) {
+    this.router.navigate(['../order-detail', data.orderSn], { relativeTo: this.ar });
+  }
+
+  // 批量发货
+  deliverBelivery() {
+    this.router.navigate(['../order-batch-delivery'], { relativeTo: this.ar });
+  }
+  changePageIndex(pageIndex: number) {
+    this.pageIndex = pageIndex;
+    this.getList();
+  }
+  changePageSize(value: number) {
+    this.pageSize = value;
+    this.getList();
+  }
+  expandToggle() {
+    this.sfExpand = !this.sfExpand;
+    this.sf?.setValue('/expand', this.sfExpand);
+  }
+
+  // 修改运单
+  updateLogistics(data: any) {
+    // 如果是多个运单
+    if (data.deliveryList.length > 1) {
+      this.updateLogisticsList(data);
+    } else {
+      data.deliveryAddrId = data.deliveryList[0].deliveryAddrId;
+      data.deliveryCorpSn = data.deliveryList[0].deliveryCorpSn;
+      data.deliverySn = data.deliveryList[0].deliverySn; // 原物流单号
+      data.expressName = data.deliveryList[0].expressName; // 原物流公司
+      data.sendName = data.deliveryList[0].sendName;
+      data.sendMobile = data.deliveryList[0].sendMobile;
+      data.sendAddr = data.deliveryList[0].sendAddr;
+      data.orderExpressItemVOList = data.deliveryList[0].orderExpressItemVOList; // 运单对应的发货商品信息
+      this.updateLogisticsPop(data);
+    }
+  }
+
+  // 修改运单中间页List
+  updateLogisticsList(data: any) {
+    const modalRef = this.modal.create({
+      nzTitle: '运单信息',
+      nzWidth: 1200,
+      // nzContent: OrderComponentsOrderLogisticsmessageComponent,
+      nzComponentParams: {
+        listData: data,
+      },
+      nzFooter: null,
+    });
+    modalRef.afterClose.subscribe((result) => {
+      if (result === true) {
+        this.getList();
+      }
+    });
+  }
+
+  // 修改运单弹窗
+  updateLogisticsPop(data: any) {
+    const modalRef = this.modal.create({
+      nzTitle: '已发货商品',
+      nzWidth: 1200,
+      // nzContent: OrderComponentsOrderDeliverGoodsUpdateComponent,
+      nzComponentParams: {
+        listData: data,
+      },
+      nzFooter: null,
+    });
+    modalRef.afterClose.subscribe((result) => {
+      if (result === true) {
+        this.getList();
+      }
+    });
+  }
+
+  // 立即发货
+  deliverGoods(data: any) {
+    // const modalRef = this.modal.create({
+    //   nzTitle: '订单发货',
+    //   nzWidth: 1200,
+    //   nzContent: OrderComponentsOrderDelivergoodsComponent,
+    //   nzComponentParams: {
+    //     listData: data,
+    //   },
+    //   nzFooter: null,
+    // });
+    // modalRef.afterOpen.subscribe(() => {});
+    // modalRef.afterClose.subscribe((result) => {
+    //   if (result === true) {
+    //     this.getList();
+    //   }
+    // });
+    this.router.navigate(['../order-deliver-goods'], { relativeTo: this.ar });
+  }
+
+  /**
+   * 重置表单
+   */
+  resetSF() {
+    this.sf.reset();
+    this.sfExpand = false;
+  }
+  /**
+   * 立即确认
+   */
+  deliversure(val: any) {
+    const modalRef = this.modal.create({
+      nzTitle: '订单确认',
+      nzWidth: 700,
+      // nzContent: OrderComponentsOrderOrderlistOrderSureComponent,
+      nzComponentParams: {
+        record: val,
+      },
+      nzFooter: null,
+    });
+    modalRef.afterOpen.subscribe(() => {});
+    modalRef.afterClose.subscribe((result) => {
+      if (result === true) {
+        this.getList();
+      }
+    });
+  }
+  /**
+   * 付款审核
+   */
+  paymentReview(data: any) {
+    const dialogData = {
+      ...data,
+    };
+    // this.modalHelper.create(OrderComponentsOrderOrderlistPaymentReviewComponent, { dialogData }, { size: 900 }).subscribe((res) => {
+    //   if (res === '2') {
+    //     this.getList();
+    //   }
+    // });
+  }
+  /**
+   * 修改价格
+   */
+  modifyPrice(data: any) {
+    const dialogData = {
+      ...data,
+    };
+    // this.modalHelper.create(OrderComponentsOrderOrderlistModifyPriceComponent, { dialogData }, { size: 900 }).subscribe((res) => {
+    //   if (res === '2') {
+    //     this.getList();
+    //   }
+    // });
+  }
+  /**
+   * 审核
+   */
+  orderReview(data: any) {
+    const dialogData = {
+      ...data,
+    };
+    // this.modalHelper.create(OrderReviewComponent, { dialogData }, { size: 900 }).subscribe((res) => {
+    //   if (res === '2') {
+    //     this.getList();
+    //   }
+    // });
+  }
+   /**
+   * 查询字段个数navigate
+   */
+    get queryFieldCount(): number {
+      return Object.keys(this.schema?.properties || {}).length;
+    }
+}
--- a/src/app/routes/supply-goods/components/list/list.component.html
+++ b/src/app/routes/supply-goods/components/list/list.component.html
@ -0,0 +1,19 @@
+<!--
+ * @Author: your name
+ * @Date: 2021-12-01 09:25:32
+ * @LastEditTime: 2021-12-01 10:03:18
+ * @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\supply-goods\components\list\list.component.html
+-->
+<page-header-wrapper [title]="''"></page-header-wrapper>
+<nz-card>
+  <nz-tabset [nzSelectedIndex]="nzSelectedIndex">
+    <nz-tab nzTitle="整车货源">
+   <app-supply-goods-components-list-carload></app-supply-goods-components-list-carload>
+    </nz-tab>
+    <nz-tab nzTitle="大宗货源">
+   
+    </nz-tab>
+  </nz-tabset>
+</nz-card>
--- a/src/app/routes/supply-goods/components/list/list.component.spec.ts
+++ b/src/app/routes/supply-goods/components/list/list.component.spec.ts
@ -0,0 +1,31 @@
+/*
+ * @Author: your name
+ * @Date: 2021-12-01 09:25:32
+ * @LastEditTime: 2021-12-01 09:55:39
+ * @LastEditors: your name
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: \tms-obc-web\src\app\routes\supply-goods\components\list\list.component.spec.ts
+ */
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { SupplyGoodsComponentListComponent } from './list.component';
+
+describe('SupplyGoodsComponentListComponent', () => {
+  let component: SupplyGoodsComponentListComponent;
+  let fixture: ComponentFixture<SupplyGoodsComponentListComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [SupplyGoodsComponentListComponent],
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(SupplyGoodsComponentListComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
--- a/src/app/routes/supply-goods/components/list/list.component.ts
+++ b/src/app/routes/supply-goods/components/list/list.component.ts
@ -0,0 +1,22 @@
+/*
+ * @Author: your name
+ * @Date: 2021-12-01 09:25:32
+ * @LastEditTime: 2021-12-01 09:49:32
+ * @LastEditors: your name
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: \tms-obc-web\src\app\routes\supply-goods\components\list\list.component.ts
+ */
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+
+@Component({
+  selector: 'app-supply-goods-components-list',
+  templateUrl: './list.component.html',
+})
+export class SupplyGoodsComponentListComponent implements OnInit {
+  constructor(private ar: ActivatedRoute) {}
+  nzSelectedIndex = 0;
+  ngOnInit(): void {
+    this.nzSelectedIndex = this.ar.snapshot.queryParams.nzSelectedIndex;
+  }
+}
--- a/src/app/routes/supply-goods/services/supply-goods.service.ts
+++ b/src/app/routes/supply-goods/services/supply-goods.service.ts
@ -0,0 +1,23 @@
+/*
+ * @Author: your name
+ * @Date: 2021-11-29 15:22:34
+ * @LastEditTime: 2021-12-01 10:33:33
+ * @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\services\usercenter.service.ts
+ */
+import { Injectable, Injector } from '@angular/core';
+import { _HttpClient } from '@delon/theme';
+import { NzMessageService } from 'ng-zorro-antd/message';
+import { BaseService } from 'src/app/shared/services/core/base.service';
+import { EAFileUtil } from 'src/app/shared/utils/file.util';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class SupplyGoodsService extends BaseService {
+
+  constructor(public injector: Injector) {
+    super(injector);
+  }
+}
--- a/src/app/routes/supply-goods/supply-goods-routing.module.ts
+++ b/src/app/routes/supply-goods/supply-goods-routing.module.ts
@ -0,0 +1,22 @@
+/*
+ * @Author: your name
+ * @Date: 2021-11-29 15:22:34
+ * @LastEditTime: 2021-12-01 09:52:45
+ * @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 { SupplyGoodsComponentListComponent } from './components/list/list.component';
+
+
+const routes: Routes = [
+  { path: 'list', component: SupplyGoodsComponentListComponent}
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class SupplyGoodsRoutingModule {}
--- a/src/app/routes/supply-goods/supply-goods.module.ts
+++ b/src/app/routes/supply-goods/supply-goods.module.ts
@ -0,0 +1,24 @@
+/*
+ * @Author: your name
+ * @Date: 2021-11-29 15:22:34
+ * @LastEditTime: 2021-12-01 10:03:01
+ * @LastEditors: Please set LastEditors
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+import { NgModule } from '@angular/core';
+import { SharedModule } from '@shared';
+import { SupplyGoodsComponentListCarloadComponent } from './components/carload/carload.component';
+import { SupplyGoodsComponentListComponent } from './components/list/list.component';
+
+import { SupplyGoodsRoutingModule } from './supply-goods-routing.module';
+
+const COMPONENTS = [
+  SupplyGoodsComponentListComponent,
+  SupplyGoodsComponentListCarloadComponent
+];
+
+@NgModule({
+  imports: [SharedModule, SupplyGoodsRoutingModule],
+  declarations: [...COMPONENTS],
+})
+export class SupplyGoodsModule {}
--- a/src/app/routes/usercenter/components/driver/captain/captain.component.html
+++ b/src/app/routes/usercenter/components/driver/captain/captain.component.html
@ -0,0 +1,83 @@
+<!--
+ * @Author: your name
+ * @Date: 2021-11-29 15:22:34
+ * @LastEditTime: 2021-11-30 20:39: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\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>
--- a/src/app/routes/usercenter/components/driver/captain/captain.component.spec.ts
+++ b/src/app/routes/usercenter/components/driver/captain/captain.component.spec.ts
@ -0,0 +1,31 @@
+/*
+ * @Author: your name
+ * @Date: 2021-11-30 16:56:15
+ * @LastEditTime: 2021-11-30 20:36:30
+ * @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\driver\driver.component.spec.ts
+ */
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { UserCenterComponentsDriverCaptainComponent } from './captain.component';
+
+describe('UserCenterComponentsDriverCaptainComponent', () => {
+  let component: UserCenterComponentsDriverCaptainComponent;
+  let fixture: ComponentFixture<UserCenterComponentsDriverCaptainComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [UserCenterComponentsDriverCaptainComponent],
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(UserCenterComponentsDriverCaptainComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
--- a/src/app/routes/usercenter/components/driver/captain/captain.component.ts
+++ b/src/app/routes/usercenter/components/driver/captain/captain.component.ts
@ -0,0 +1,178 @@
+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 '../../../services/usercenter.service';
+@Component({
+  selector: 'app-usercenter-components-driver-captain',
+  templateUrl: './captain.component.html',
+})
+export class UserCenterComponentsDriverCaptainComponent 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 } },
+        phone: {
+          title: '手机号',
+          type: 'string',
+          format: 'mobile',
+          maxLength: 11,
+          ui: {
+            placeholder: '请输入手机号',
+          },
+        },
+        phon747e: {
+          title: '银行卡号',
+          type: 'string',
+          ui: {
+            placeholder: '请输入银行卡号',
+          },
+        },
+
+        phone2: {
+          title: '业务员手机号',
+          type: 'string',
+          format: 'mobile',
+          maxLength: 11,
+          ui: {
+            placeholder: '请输入手机号',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          },
+        },
+  
+      },
+    };
+    this.ui = { '*': { spanLabelFixed: 110, 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: 'unifiedSocialCreditCode' },
+      { title: '推广业务员', className: 'text-center', index: 'unifiedSocialCreditCode2' },
+      { title: '注册时间', className: 'text-center', index: 'unifiedSocialCreditCode3' },
+      {
+        title: '操作',
+        width: '170px',
+        className: 'text-center',
+        buttons: [
+          {
+            text: '查看',
+            click: (item) => {
+              this.router.navigate(['/usercenter/driver/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;
+  }
+}
--- a/src/app/routes/usercenter/components/driver/detail/detail.component.html
+++ b/src/app/routes/usercenter/components/driver/detail/detail.component.html
@ -1,6 +1,6 @@
 <ng-container >
  <!-- 页头 -->
-  <page-header-wrapper [logo]="logo" [action]="action" [content]="content">
+  <page-header-wrapper [logo]="logo"  [title]="'司机详情'"   [action]="action" [content]="content">
    <ng-template #logo>
      <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
        <i nz-icon nzType="left" nzTheme="outline"></i>
@ -11,13 +11,13 @@
        <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>
-          <nz-badge nzStatus="success" nzText="正常" *ngIf="detailData?.status === 0"></nz-badge>
+          <p style="padding-right: 80px; width: 400px;">张司机{{ detailData?.shoppFeignVO?.publicity }}</p>
+          <nz-badge nzStatus="success" nzText="正常" ></nz-badge>
          <nz-badge nzStatus="error" nzText="冻结" *ngIf="detailData?.status === 1"></nz-badge>
          <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;">手机号：1452454545{{ detailData?.shoppFeignVO?.introduction }}</p>
          <p >认证时间：2021-09-02 12.53.32</p>
         </div>
         <div>
@ -47,28 +47,6 @@
          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>
@ -124,166 +102,173 @@
        </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 label="联系人">
+    <sv-container col="2">
+      <sv-title>实名认证信息</sv-title>
+      <sv label="姓名">
        {{ detailData?.contactsName }}
      </sv>
-      <sv label="联系人手机号">
+      <sv label="身份证号">
        {{ detailData?.contactsPhone }}
      </sv>
-      <sv label="联系人身份证号">
-        {{ detailData?.contactsPhone }}
-      </sv>
-      <sv label="企业授权函">
-        <!-- <app-imagelist [imgList]="detailData?.enterpriseQualificationCertificate"></app-imagelist> -->
-      </sv>
    </sv-container>
+    <sv-container col="1">
+      <sv label="企业授权函">
+        <!-- <app-imagelist [imgList]="detailData?.enterpriseQualificationCertificate"></app-imagelist> -->
+        <div style="display: flex;">
+          <div style="    position: relative;
+          top: -65%;
+          left: 75%;">
+            <button nz-button nzType="default" nzDanger  (click)="auditPass()">审核通过</button>
+            <button nz-button nzType="default" nzDanger  (click)="auditNo()">驳回审核</button>
+           </div>
+         </div>
+      </sv>
+    </sv-container>
+
    <nz-divider></nz-divider>
    <sv-container col="3" class="mt16">
-      <sv-title>公司基本信息</sv-title>
-      <sv label="公司名称">
+      <sv-title>驾驶证信息</sv-title>
+      <sv label="驾驶证号">
        {{ detailData?.enterpriseName }}
      </sv>
-      <sv label="统一社会信用代码">
+      <sv label="准驾车型">
        {{ detailData?.unifiedSocialCreditCode }}
      </sv>
-      <sv label="公司类型">
+      <sv label="有效期起">
        {{ detailData?.enterpriseType }}
      </sv>
-      <sv label="注册资本">
+    </sv-container>
+
+    <sv-container col="2" class="mt16">
+    <sv label="有效期至">
      {{ detailData?.registrationCapital }}
      <span *ngIf="detailData?.registrationCapital">万元</span>
    </sv>
-      <sv label="成立日期">
+    <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="营业执照">
+    <sv label="驾驶证照片">
      <!-- <app-imagelist [imgList]="detailData?.enterpriseQualificationCertificate"></app-imagelist> -->
    </sv>
  </sv-container>
+
+    <sv-container col="3" class="mt16">
+      <sv-title>从业资格证信息</sv-title>
+      <sv label="从业资格证号">
+        {{ detailData?.businessScope }}
+      </sv>
+      <sv label="发证日期">
+        {{ detailData?.businessScope }}
+      </sv>
+      <sv label="有效期至">
+        {{ detailData?.businessScope }}
+      </sv>
+    </sv-container>
+
+      <sv-container col="1">
+        <sv label="从业资格证照片">
+          <!-- <app-imagelist [imgList]="detailData?.enterpriseQualificationCertificate"></app-imagelist> -->
+          <div style="display: flex;">
+            <div style="position: relative;
+            top: -65%;
+            left: 75%;">
+              <button nz-button nzType="default" nzDanger  (click)="auditPass()">审核通过</button>
+              <button nz-button nzType="default" nzDanger  (click)="auditNo()">驳回审核</button>
+              <button nz-button nzType="default" nzDanger  (click)="auditNo()">修改</button>
+             </div>
+           </div>
+        </sv>
+    </sv-container>
+
    <nz-divider></nz-divider>
    <sv-container col="3" class="mt16">
-      <sv-title>法人信息</sv-title>
-      <sv label="法定代表人">
+      <sv-title>载具信息</sv-title>
+      <sv label="车牌号">
        {{ detailData?.name }}
      </sv>
-      <sv label="身份证号">
+      <sv label="车牌颜色">
        {{ detailData?.certificateNumber }}
      </sv>
-      <sv label="身份证有效期">
-        {{ detailData?.validStartTime }} -
-        {{ detailData?.validEndTime ? detailData?.validEndTime : '长期' }}
+      <sv label="车型">
+        {{ detailData?.validStartTime }}
      </sv>
-      <sv label="身份证照" col="1">
+      <sv label="车长">
+        {{ detailData?.validStartTime }}
+      </sv>
+      <sv label="是否为当前车辆">
+        {{ detailData?.validStartTime }}
+      </sv>
+      <sv label="自有载具">
+        {{ detailData?.validStartTime }}
+      </sv>
+      <sv label="行驶证照片" col="1">
+        <!-- <app-imagelist [imgList]="detailData?.certificatePhoto"></app-imagelist> -->
+      </sv>
+      <sv label="道路运输证照片" col="1">
+        <!-- <app-imagelist [imgList]="detailData?.certificatePhoto"></app-imagelist> -->
+      </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">
      <sv-title>银行结算信息</sv-title>
-      <sv label="开户名称">
+      <sv label="开户银行">
        {{ detailData?.name }}
      </sv>
-      <sv label="开户账户">
+      <sv label="银行卡号">
        {{ detailData?.certificateNumber }}
      </sv>
-      <sv label="开户支行">
-        {{ detailData?.validStartTime }}
-      </sv>
    </sv-container>
+    <nz-divider></nz-divider>
+    <sv-container col="3" class="mt16">
+      <sv-title>服务评级</sv-title>
+      <sv label="服务评级">
+        <nz-rate [ngModel]="2" nzDisabled></nz-rate>
+      </sv>
+      <sv label="运输效率">
+        <nz-rate [ngModel]="2" nzDisabled></nz-rate>
+      </sv>
+      <sv label="运输安全">
+        <nz-rate [ngModel]="2" nzDisabled></nz-rate>
+      </sv>
+      <sv label="服务质量">
+        <nz-rate [ngModel]="2" nzDisabled></nz-rate>
+      </sv>
+      <sv label="客户满意度">
+        <nz-rate [ngModel]="2" nzDisabled></nz-rate>
+      </sv>
+      <sv label="车辆整洁程度">
+        <nz-rate [ngModel]="2" nzDisabled></nz-rate>
+      </sv>
+   
+    </sv-container>
+        <div style="float: right;">
+      <button nz-button nzType="default" nzDanger  (click)="auditNo()">修改</button>
+        </div>
+
  </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>
+<nz-modal [(nzVisible)]="isVisible"   [nzFooter]="nzModalFooter" nzTitle="审核通过" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel('suppliersType')">
+  <ng-container *nzModalContent>
+    <sf #sf [schema]="schema" [ui]="ui" [compact]="false" [button]="'none'" [formData]="suppliersData"></sf>
+  </ng-container>
+  
+  <ng-template #nzModalFooter>
    <button nz-button nzType="default" (click)="handleCancel('suppliersType')">取消</button>
-    <button nz-button nzType="primary" (click)="handleOK('suppliersType')" [disabled]="!sf1.valid">确认</button>
-  </div>
+    <button nz-button nzType="primary" (click)="handleOK()" [disabled]="">确认</button>
+  </ng-template>
+</nz-modal>
+<nz-modal [(nzVisible)]="isVisibleNo"   [nzFooter]="nzModalFooter2" nzTitle="审核驳回" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel('suppliersTypeNo')">
+  <ng-container *nzModalContent>
+    <sf #sf2 [schema]="schema2" [ui]="ui2" [compact]="false" [button]="'none'" [formData]="suppliersData"></sf>
+  </ng-container>
+  
+  <ng-template #nzModalFooter2>
+    <button nz-button nzType="default" (click)="handleCancel('suppliersTypeNo')">取消</button>
+    <button nz-button nzType="primary" (click)="handleOK()" [disabled]="">确认</button>
+  </ng-template>
 </nz-modal>
--- a/src/app/routes/usercenter/components/driver/detail/detail.component.spec.ts
+++ b/src/app/routes/usercenter/components/driver/detail/detail.component.spec.ts
@ -7,20 +7,20 @@
 * @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';
+import { UserCenterComponentsDriverDetailComponent } from './detail.component';

-describe('FreightComponentsListDetailComponent', () => {
-  let component: FreightComponentsListDetailComponent;
-  let fixture: ComponentFixture<FreightComponentsListDetailComponent>;
+describe('UserCenterComponentsDriverDetailComponent', () => {
+  let component: UserCenterComponentsDriverDetailComponent;
+  let fixture: ComponentFixture<UserCenterComponentsDriverDetailComponent>;

  beforeEach(async(() => {
    TestBed.configureTestingModule({
-      declarations: [FreightComponentsListDetailComponent],
+      declarations: [UserCenterComponentsDriverDetailComponent],
    }).compileComponents();
  }));

  beforeEach(() => {
-    fixture = TestBed.createComponent(FreightComponentsListDetailComponent);
+    fixture = TestBed.createComponent(UserCenterComponentsDriverDetailComponent);
    component = fixture.componentInstance;
    fixture.detectChanges();
  });
--- a/src/app/routes/usercenter/components/driver/detail/detail.component.ts
+++ b/src/app/routes/usercenter/components/driver/detail/detail.component.ts
@ -1,30 +1,33 @@
 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 { SFComponent, SFDateWidgetSchema, SFSchema, SFTagWidgetSchema, SFTextWidgetSchema, 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/usercenter.service';

@Component({
-  selector: 'app-supplier-components-list-view',
+  selector: 'app-usercenter-components-driver-detail',
  templateUrl: './detail.component.html',
  styleUrls: ['./detail.component.less'],
 })
-export class FreightComponentsListDetailComponent implements OnInit {
+export class UserCenterComponentsDriverDetailComponent implements OnInit {
  i: any;
  url = `/rule?_allow_anonymous=true`;
  @ViewChild('st', { static: false }) st!: STComponent;
  detailData: any;
  isShow = false;
  isVisible = false;
+  isVisibleNo = false;
  modalTitle = '有效期';
  modalName = '';
  ui!: SFUISchema;
  schema!: SFSchema;
+  ui2!: SFUISchema;
+  schema2!: SFSchema;
  @ViewChild('sf', { static: false }) sf!: SFComponent;
  schema1!: SFSchema;
-  @ViewChild('sf1', { static: false }) sf1!: SFComponent;
+  @ViewChild('sf2', { static: false }) sf2!: SFComponent;
  validData: any = ['suppliersType'];
  suppliersData: any = {};

@ -41,7 +44,7 @@ export class FreightComponentsListDetailComponent implements OnInit {
    console.log(this.route.snapshot);
    // this.initData();
    this.initSF();
-    this.initSF1();
+    this.initSFNo();
    // this.launchSign();
  }
  /**
@ -65,44 +68,36 @@ export class FreightComponentsListDetailComponent implements OnInit {
    };
    this.ui = { '*': { spanLabelFixed: 120, grid: { span: 24 } } };
  }
-  initSF1() {
-    this.schema1 = {
+  initSFNo() {
+    this.schema2 = {
      properties: {
-        _$expand: { type: 'boolean', ui: { hidden: true } },
-        suppliersType: {
+        '姓名': { type: 'number', ui: { widget: 'text', defaultText: '深圳市星链供应链云科技有限公' } as SFTextWidgetSchema },
+        roleDescription: {
+          title: '备注',
          type: 'string',
-          title: '类型',
+          maxLength: 30,
+          ui: {
+            placeholder: '请输入地址',
+            widget: 'textarea',
+          },
+        },
+        like: {
+          type: 'number',
+          title: '可选理由',
          enum: [
-            { label: '非外部供应商', value: 0 },
-            { label: '外部供应商', value: 1 },
+            { value: 1, label: '电影' },
+            { value: 2, label: '书' },
+            { value: 3, label: '旅行' },
          ],
-          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();
+            widget: 'tag',
+          } as SFTagWidgetSchema,
+          default: [1, 2],
        },
      },
-        },
-        externalSuppliersId: {
-          title: '外部供应商id',
-          type: 'string',
-          default: '',
-          ui: {
-            visibleIf: { suppliersType: (value: any) => value === 1 },
-          },
-        },
-      },
-      required: this.validData,
+      required: ['roleDescription'],
    };
+    this.ui2 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } };
  }
  showModal(name: any) {
    this.modalName = name;
@ -221,35 +216,45 @@ export class FreightComponentsListDetailComponent implements OnInit {
  }

  handleCancel(name: any) {
-    if (name === 'effectiveDate') {
-      this.isShow = false;
+    if (name === 'suppliersTypeNo') {
+      this.isVisibleNo = false;
    } else {
      this.isVisible = false;
    }
  }
-  handleOK(name: any) {
+  handleOK() {
    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);
+    // 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;
+    //   }
+    // });
  }
-    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 || '编辑失败！');
+  auditPass() {
+    this.isVisible = true
  }
-      if (name === 'effectiveDate') {
-        this.isShow = false;
-      } else {
-        this.isVisible = false;
+  auditNo() {
+    this.isVisibleNo = true
  }
-    });
+  ratify() {
+
  }
+ 
 }
--- a/src/app/routes/usercenter/components/driver/driver.component.html
+++ b/src/app/routes/usercenter/components/driver/driver.component.html
@ -1,7 +1,7 @@
 <!--
 * @Author: your name
 * @Date: 2021-11-29 15:22:34
- * @LastEditTime: 2021-11-30 17:18:22
+ * @LastEditTime: 2021-11-30 17:38:59
 * @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
@ -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>
--- a/src/app/routes/usercenter/components/driver/driver.component.ts
+++ b/src/app/routes/usercenter/components/driver/driver.component.ts
@ -96,24 +96,19 @@ export class UserCenterComponentsDriverComponent implements OnInit {
            hidden: true,
          },
        },
-        storeName: { title: '企业名称', type: 'string', ui: { showRequired: false } },
-        contactsName: {
-          title: '联系人',
+        storeName: { title: '司机姓名', type: 'string', ui: { showRequired: false } },
+        phone: {
+          title: '手机号',
          type: 'string',
+          format: 'mobile',
+          maxLength: 11,
          ui: {
-            showRequired: false,
-          },
-        },
-        unifiedSocialCreditCode: {
-          title: '税源地',
-          type: 'string',
-          ui: {
-            showRequired: false,
+            placeholder: '请输入手机号',
          },
        },
        enStatus: {
          type: 'string',
-          title: '货主状态',
+          title: '实名状态',
          enum: [
            { label: '全部', value: '' },
            { label: '正常', value: 0 },
@ -130,7 +125,7 @@ export class UserCenterComponentsDriverComponent implements OnInit {
        },
        enStatus2: {
          type: 'string',
-          title: 'CRM审核状态',
+          title: '驾驶证状态',
          enum: [
            { label: '全部', value: '' },
            { label: '正常', value: 0 },
@ -145,22 +140,46 @@ export class UserCenterComponentsDriverComponent implements OnInit {
            },
          },
        },
+        enStatus23: {
+          type: 'string',
+          title: '从业资格证状态',
+          enum: [
+            { label: '全部', value: '' },
+            { label: '正常', value: 0 },
+            { label: '冻结', value: 1 },
+            { label: '废弃', value: 2 },
+          ],
+          default: '',
+          ui: {
+            widget: 'select',
+            visibleIf: {
+              expand: (value: boolean) => value,
+            },
+          },
+        },
+        phone2: {
+          title: '业务员手机号',
+          type: 'string',
+          format: 'mobile',
+          maxLength: 11,
+          ui: {
+            placeholder: '请输入手机号',
+          },
+        },
+  
      },
    };
-    this.ui = { '*': { spanLabelFixed: 90, grid: { span: 8, gutter: 4 }, enter: () => this.st.load() } };
+    this.ui = { '*': { spanLabelFixed: 180, 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: 'contactsPhone',
-        render: 'contactsPhone'
-      },
-      { title: '企业状态', className: 'text-center', index: 'effectiveDateStr',
+      { 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' },
@ -169,7 +188,7 @@ export class UserCenterComponentsDriverComponent implements OnInit {
      },
     },
      {
-        title: 'CRM审核状态',
+        title: '驾驶证状态',
        className: 'text-center',
        index: 'enStatusStr2',
        type: 'badge',
@ -180,7 +199,7 @@ export class UserCenterComponentsDriverComponent implements OnInit {
        },
      },
      {
-        title: '代收权限',
+        title: '从业资格证状态',
        className: 'text-center',
        index: 'enStatusStr3',
        type: 'badge',
@ -190,8 +209,8 @@ export class UserCenterComponentsDriverComponent implements OnInit {
          废弃: { text: '废弃', color: 'default' },
        },
      },
-      { title: '常用服务', className: 'text-center', index: 'unifiedSocialCreditCode3' },
      { title: '推广业务员', className: 'text-center', index: 'unifiedSocialCreditCode2' },
+      { title: '注册时间', className: 'text-center', index: 'unifiedSocialCreditCode3' },
      {
        title: '操作',
        width: '170px',
--- a/src/app/routes/usercenter/components/driver/new/new.component.html
+++ b/src/app/routes/usercenter/components/driver/new/new.component.html
@ -1,109 +0,0 @@
-<page-header-wrapper [title]="'企业认证'"></page-header-wrapper>
-<nz-card>
-        <ng-container>
-          <sf #sf1 [compact]="true" [ui]="ui" [schema]="schema1" [button]="'none'" [formData]="infoData1">
-            <ng-template sf-template="title1" let-me let-ui="ui" let-schema="schema">
-              <div class="form-title">营业执照基本信息</div>
-            </ng-template>
-            <ng-template sf-template="title2" let-me let-ui="ui" let-schema="schema">
-              <div class="form-title" style="margin-top: 40px">营业执照法人信息</div>
-            </ng-template>
-            <ng-template sf-template="tips" let-me let-ui="ui" let-schema="schema">
-              <div class="pr">
-                请上传营业执照原件的高清照片，若上传复印件，则需加盖公司印章；
-                <div>上传后系统会自动识别并填写</div>
-              </div>
-            </ng-template>
-            <ng-template sf-template="unit" let-me let-ui="ui" let-schema="schema">
-              <div class="pr">万元</div>
-            </ng-template>
-
-            <ng-template sf-template="tipsC" let-me let-ui="ui" let-schema="schema">
-              <div class="pr">
-                <div>请上传身份证原件的高清照片，若上传复印件，则需申请人签字；</div>
-                <div>上传后系统会自动识别并填写</div>
-              </div>
-            </ng-template>
-            <ng-template sf-template="tipsA" let-me let-ui="ui" let-schema="schema">
-              <div class="pr">
-                <dl class="tips">
-                  <dt>正面照（人像面）</dt>
-                  <dd>示例</dd>
-                </dl>
-                <div class="pa"><img width="190" src="/assets/images/eg01.png" /></div>
-              </div>
-            </ng-template>
-            <ng-template sf-template="tipsB" let-me let-ui="ui" let-schema="schema">
-              <div class="pr">
-                <dl class="tips">
-                  <dt>背面照（国徽面）</dt>
-                  <dd>示例</dd>
-                </dl>
-                <div class="pa"><img width="190" src="/assets/images/eg02.png" /></div>
-              </div>
-            </ng-template>
-    
-          </sf>
-          <sf #sf [compact]="true" [ui]="ui" [schema]="schema" [button]="'none'" [formData]="infoData">
-            <ng-template sf-template="title1" let-me let-ui="ui" let-schema="schema">
-              <div class="form-title">公司其他补充信息</div>
-            </ng-template>
-            <ng-template sf-template="title99" let-me let-ui="ui" let-schema="schema">
-              <div class="form-title">企业管理员信息</div>
-            </ng-template>
-   
-            <ng-template sf-template="tipsD" let-me let-ui="ui" let-schema="schema">
-              <div class="pr">
-                <div>请上传该企业授权您成为本系统企业管理员的文件的高清照片，需加盖公司印章</div>
-                <div>上传后系统会自动识别并填写</div>
-                <div></div>
-              </div>
-            </ng-template>
-            <ng-template sf-template="tipsE" let-me let-ui="ui" let-schema="schema">
-              <div class="pr">
-                <dl class="tips">
-                  <dt></dt>
-                  <dd>示例</dd>
-                </dl>
-                <div class="pa"><img width="190" src="/assets/images/eg02.png" /></div>
-              </div>
-            </ng-template>
-            <ng-template sf-template="telephone" let-me let-ui="ui" let-schema="schema">
-              <div class="pr">
-                <div>{{ telephone }} <span>默认当前登录账号绑定的手机号</span></div>
-              </div>
-            </ng-template>
-            <ng-template sf-template="tips" let-me let-ui="ui" let-schema="schema">
-              <div class="pr">
-                <div>请上传身份证原件的高清照片，若上传复印件，则需申请人签字；</div>
-                <div>上传后系统会自动识别并填写</div>
-              </div>
-            </ng-template>
-            <ng-template sf-template="tipsA" let-me let-ui="ui" let-schema="schema">
-              <div class="pr">
-                <dl class="tips">
-                  <dt>正面照（人像面）</dt>
-                  <dd>示例</dd>
-                </dl>
-                <div class="pa"><img width="190" src="/assets/images/eg01.png" /></div>
-              </div>
-            </ng-template>
-            <ng-template sf-template="tipsB" let-me let-ui="ui" let-schema="schema">
-              <div class="pr">
-                <dl class="tips">
-                  <dt>背面照（国徽面）</dt>
-                  <dd>示例</dd>
-                </dl>
-                <div class="pa"><img width="190" src="/assets/images/eg02.png" /></div>
-              </div>
-            </ng-template>
-           
-          </sf>
-    
-
-          <div style="padding-left: 379px">
-            <button nz-button type="button" nzType="primary" (click)="submitForm()" >确认新增</button>
-            <button nz-button (click)="goBack()">返回</button>
-          </div>
-        </ng-container>
-</nz-card>
--- a/src/app/routes/usercenter/components/driver/new/new.component.less
+++ b/src/app/routes/usercenter/components/driver/new/new.component.less
@ -1,109 +0,0 @@
-:host {
-  ::ng-deep {
-    nz-card {
-      .page-title {
-        margin-bottom: 39px;
-        color        : #333;
-        font-weight  : 500;
-        font-size    : 20px;
-        line-height  : 28px;
-        text-align   : center;
-      }
-
-      .step-title {
-        display: block;
-        width  : 800px !important;
-        margin : 0 auto;
-      }
-
-      .myForm {
-        width : 680px;
-        margin: 5rem auto;
-      }
-
-      .steps-content {
-        min-height: 250px;
-      }
-
-      .btn-submit {
-        margin-top: 16px;
-      }
-
-      .pr {
-        position: relative;
-      }
-
-      .pa {
-        position: absolute;
-        top     : 35px;
-        left    : 150px;
-      }
-
-      .tips {
-        display      : flex;
-        margin-bottom: 0;
-        color        : #333;
-
-        dt {
-          width: 150px;
-        }
-
-        dd {
-          width        : 190px;
-          margin-bottom: 0;
-          text-align   : center;
-        }
-      }
-
-      .form-title {
-        margin-bottom: 10px;
-        padding-left : 8px;
-        color        : #333;
-        font-weight  : 700;
-        font-size    : 18px;
-        line-height  : 20px;
-        border-left  : solid 3px #1890ff;
-      }
-
-      .form-content {
-        padding: 48px 32px;
-      }
-
-      .apply-sv {
-        margin       : 16px 0;
-        padding      : 20px;
-        background   : #f8f8f8;
-        border-radius: 2px;
-      }
-
-      .result-date {
-        font-size: 12px;
-      }
-
-      .result-tips {
-        color    : #ff4d4f;
-        font-size: 14px;
-      }
-
-      .sv-img {
-        display      : inline-block;
-        width        : 104px;
-        height       : 104px;
-        margin-right : 20px;
-        padding      : 8px;
-        background   : #fff;
-        border       : 1px solid rgba(0, 0, 0, 0.15);
-        border-radius: 2px;
-
-        img {
-          width : 100%;
-          height: 100%;
-        }
-      }
-    }
-
-    .ant-row {
-      margin-left: 100px;
-    }
-  }
-}
--- a/src/app/routes/usercenter/components/driver/new/new.component.ts
+++ b/src/app/routes/usercenter/components/driver/new/new.component.ts
--- a/src/app/routes/usercenter/components/driver/view/view.component.html
+++ b/src/app/routes/usercenter/components/driver/view/view.component.html
@ -1,49 +0,0 @@
-<!--
- * @Author: your name
- * @Date: 2021-11-29 15:22:34
- * @LastEditTime: 2021-11-29 17:07:37
- * @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\view\view.component.html
-->
-<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">
-        <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>
-          <nz-badge nzStatus="success" nzText="正常" *ngIf="detailData?.status === 0"></nz-badge>
-          <nz-badge nzStatus="error" nzText="冻结" *ngIf="detailData?.status === 1"></nz-badge>
-          <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 >认证时间：2021-09-02 12.53.32</p>
-         </div>
-         <div>
-          服务评级：<nz-rate [ngModel]="2" nzDisabled></nz-rate>
-         </div>
-        
-        </div>
-      </div>
-    </ng-template>
-  </page-header-wrapper>
-  <nz-card>
-    <h1 style="font-weight: 700; font-size: 16px; margin-left: '15%';">道路运输经营许可证</h1>
-    <sf #sf [compact]="false" [ui]="ui" [schema]="schema" [button]="'none'" [formData]="detailData?.effectiveDate"></sf>
-    <div style="display: flex; justify-content: center; align-items: center;">
-      <button nz-button nzType="default" (click)="handleCancel('suppliersType')">取消</button>
-      <button nz-button nzType="primary" (click)="handleOK('suppliersType')" [disabled]="!sf.valid">确认</button>
-    </div>
-  </nz-card>
-</ng-container>
-
-
--- a/src/app/routes/usercenter/components/driver/view/view.component.less
+++ b/src/app/routes/usercenter/components/driver/view/view.component.less
@ -1,46 +0,0 @@
-@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;
-    }
-    img {
-      width: 64px;
-      height: 64px;
-      margin-right: 15px;
-      border-radius: 50%;
-    }
-    .user-info-des {
-      margin-bottom: 5px;
-    }
-  }
-}
--- a/src/app/routes/usercenter/components/driver/view/view.component.spec.ts
+++ b/src/app/routes/usercenter/components/driver/view/view.component.spec.ts
@ -1,23 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { FreightComponentsListViewComponent } from './view.component';
-
-describe('FreightComponentsListViewComponent', () => {
-  let component: FreightComponentsListViewComponent;
-  let fixture: ComponentFixture<FreightComponentsListViewComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [FreightComponentsListViewComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(FreightComponentsListViewComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
--- a/src/app/routes/usercenter/components/driver/view/view.component.ts
+++ b/src/app/routes/usercenter/components/driver/view/view.component.ts
@ -1,257 +0,0 @@
-import { Component, OnInit, ViewChild } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
-import { STColumn, STComponent } from '@delon/abc/st';
-import { ModalHelper, _HttpClient } from '@delon/theme';
-import { NzMessageService } from 'ng-zorro-antd/message';
-import { UsermanageService } from '../../../../services/usercenter.service';
-import { SFComponent, SFSchema, SFDateWidgetSchema, SFUISchema, SFUploadWidgetSchema } from '@delon/form';
-import { Observable, Observer } from 'rxjs';
-@Component({
-  selector: 'app-Freight-components-list-view',
-  templateUrl: './view.component.html',
-  styleUrls: ['./view.component.less'],
-})
-export class FreightComponentsListViewComponent implements OnInit {
-  i: any;
-  url = `/rule?_allow_anonymous=true`;
-
-  @ViewChild('st', { static: false }) st!: STComponent;
-  detailData: any = {
-    status: 0
-  };
-  isShow = false;
-  isVisible = false;
-  modalTitle = '有效期';
-  modalName = '';
-  ui!: SFUISchema;
-  schema!: SFSchema;
-  @ViewChild('sf', { static: false }) sf!: SFComponent;
-  @ViewChild('sf1', { static: false }) sf1!: SFComponent;
-  validData: any = ['FreightsType'];
-  FreightsData: 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.launchSign();
-  }
-  /**
-   * 初始化查询表单
-   */
-  initSF() {
-    this.schema = {
-      properties: {
-      name: {
-        title: '许可证号',
-        type: 'string',
-        maxLength: 20,
-        ui: {
-          placeholder: '请输入角色名称',
-        },
-      },
-      phone: {
-        title: '业户名称',
-        type: 'string',
-        maxLength: 20,
-        ui: {
-          placeholder: '请输入业户名称',
-        },
-      },
-      roleDescription: {
-        title: '地址',
-        type: 'string',
-        maxLength: 30,
-        ui: {
-          placeholder: '请输入地址',
-          widget: 'textarea',
-        },
-      },
-      effectiveDate: {
-          title: '发证日期',
-          type: 'string',
-          ui: {
-            widget: 'date',
-            format: 'yyyy-MM-dd 00:00:00',
-            // hidden: this.modalName === 'effectiveDate' ? false : true,
-          } as SFDateWidgetSchema,
-      },
-      phone3: {
-        title: '有效期',
-        type: 'string',
-        ui: {
-          placeholder: '请输入业户名称',
-        },
-      }, 
-      phone4: {
-        title: '有效期截止',
-        type: 'string',
-        ui: {
-          placeholder: '请输入业户名称',
-        },
-      }, 
-      phone5: {
-        title: '经营范围',
-        type: 'string',
-        ui: {
-          placeholder: '请输入业户名称',
-        },
-      }, 
-      avatar: {
-        type: 'string',
-        title: '证照',
-        ui: {
-          // action: environment.UPLOAD_URL,
-          fileType: 'image/png,image/jpeg,image/jpg,image/png,image/gif,image/bmp',
-          limit: 1,
-          limitFileCount: 1,
-          resReName: 'url',
-          urlReName: 'url',
-          widget: 'upload',
-          descriptionI18n: '图片支持jpg、jpeg、png、gif格式，大小不超过5M',
-          data: {
-            // appId: environment.appId,
-          },
-          name: 'multipartFile',
-          multiple: false,
-          listType: 'picture-card',
-          change: (args) => {
-            if (args.type === 'success') {
-              const avatar = [
-                {
-                  uid: -1,
-                  name: 'LOGO',
-                  status: 'done',
-                  url: args.fileList[0].response.url,
-                  response: {
-                    url: args.fileList[0].response.url,
-                  },
-                },
-              ];
-              this.sf?.setValue('/avatar', avatar);
-            }
-          },
-          beforeUpload: (file: any, _fileList) => {
-            return new Observable((observer: Observer<boolean>) => {
-              const isLt2M = file.size / 1024 / 1024 < 5;
-              if (!isLt2M) {
-                this.service.msgSrv.warning('图片大小超过5M!');
-                observer.complete();
-                return;
-              }
-              observer.next(isLt2M);
-              observer.complete();
-            });
-          },
-        } as SFUploadWidgetSchema,
-      },
-      },
-      required: ['name', 'phone'],
-    };
-    this.ui = { '*': { spanLabelFixed: 200, grid: {offset:4, span: 12 } } };
-  }
-  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,
-    };
-  }
-
-  /**
-   * 根据地区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) {
-    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;
-      }
-    });
-  }
-}
--- a/src/app/routes/usercenter/usercenter-routing.module.ts
+++ b/src/app/routes/usercenter/usercenter-routing.module.ts
@ -1,13 +1,15 @@
 /*
 * @Author: your name
 * @Date: 2021-11-29 15:22:34
- * @LastEditTime: 2021-11-30 17:00:50
+ * @LastEditTime: 2021-11-30 20:36:06
 * @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 { UserCenterComponentsDriverCaptainComponent } from './components/driver/captain/captain.component';
+import { UserCenterComponentsDriverDetailComponent } from './components/driver/detail/detail.component';
 import { UserCenterComponentsDriverComponent } from './components/driver/driver.component';
 import { FreightComponentsEnterpriseAuditComponent } from './components/freight/enterprise-audit/enterprise-audit.component';
 import { FreightComponentsEnterpriseAuditViewComponent } from './components/freight/enterprise-audit/view/view.component';
@ -31,6 +33,8 @@ const routes: Routes = [
  { path: 'freight/user', component: FreightComponentsUserComponent },
  { path: 'freight/user/view/:id', component: FreightComponentsUserDetailComponent },
  { path: 'driver', component: UserCenterComponentsDriverComponent },
+  { path: 'driver/detail/:id', component: UserCenterComponentsDriverDetailComponent },
+  { path: 'driver/captain', component: UserCenterComponentsDriverCaptainComponent },
 ];

@NgModule({
--- a/src/app/routes/usercenter/usercenter.module.ts
+++ b/src/app/routes/usercenter/usercenter.module.ts
@ -1,13 +1,15 @@
 /*
 * @Author: your name
 * @Date: 2021-11-29 15:22:34
- * @LastEditTime: 2021-11-30 17:00:19
+ * @LastEditTime: 2021-11-30 20:35:42
 * @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.module.ts
 */
 import { NgModule } from '@angular/core';
 import { SharedModule } from '@shared';
+import { UserCenterComponentsDriverCaptainComponent } from './components/driver/captain/captain.component';
+import { UserCenterComponentsDriverDetailComponent } from './components/driver/detail/detail.component';
 import { UserCenterComponentsDriverComponent } from './components/driver/driver.component';
 import { FreightComponentsEnterpriseAuditComponent } from './components/freight/enterprise-audit/enterprise-audit.component';
 import { FreightComponentsEnterpriseAuditViewComponent } from './components/freight/enterprise-audit/view/view.component';
@ -28,7 +30,9 @@ const COMPONENTS = [
  FreightComponentsEnterpriseAuditViewComponent,
  FreightComponentsUserComponent,
  FreightComponentsUserDetailComponent,
-  UserCenterComponentsDriverComponent
+  UserCenterComponentsDriverComponent,
+  UserCenterComponentsDriverDetailComponent,
+  UserCenterComponentsDriverCaptainComponent
 ];

@NgModule({
--- a/src/assets/mocks/menu-data.json
+++ b/src/assets/mocks/menu-data.json
@ -86,10 +86,32 @@
                  "text": "司机列表",
                  "icon": "anticon anticon-dashboard",
                  "link": "/usercenter/driver"
+                },
+                {
+                  "text": "司机详情",
+                  "hide": true,
+                  "icon": "anticon anticon-dashboard",
+                  "link": "/usercenter/driver/detail/:id"
+                },
+                {
+                  "text": "车队长列表",
+                  "icon": "anticon anticon-dashboard",
+                  "link": "/usercenter/driver/captain"
                }
          ]
        }]
        },
+        {
+          "text": "货源管理",
+          "icon": "anticon anticon-dashboard",
+          "group": true,
+          "children": [
+            {
+              "text": "货源管理",
+              "link": "/supplygoods/list"
+            }
+          ]
+        },
        {
          "text": "系统设置",
          "icon": "anticon anticon-dashboard",