From c369d4241463e7efcf6b5dc9c7499b08bdbba040 Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Wed, 8 Dec 2021 15:56:22 +0800
Subject: [PATCH] edit

---
 .../invoice-requested-detail.component.ts     |   1 +
 .../driver/detail/detail.component.ts         |   4 +-
 .../enterprise-audit/view/view.component.ts   |   4 +-
 .../freight/list/detail/detail.component.html | 467 +++++++-----------
 .../freight/list/detail/detail.component.less |   1 -
 .../freight/list/detail/detail.component.ts   | 169 ++-----
 .../freight/list/list.component.html          |  68 +--
 .../freight/list/list.component.less          |   0
 .../freight/list/list.component.spec.ts       |  23 -
 .../components/freight/list/list.component.ts | 178 +++----
 .../freight/list/view/view.component.ts       |   6 +-
 .../freight/user/detail/detail.component.ts   |   6 +-
 .../usercenter/services/usercenter.service.ts |  73 +--
 13 files changed, 337 insertions(+), 663 deletions(-)
 create mode 100644 src/app/routes/usercenter/components/freight/list/list.component.less
 delete mode 100644 src/app/routes/usercenter/components/freight/list/list.component.spec.ts

diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts
index b04d7e0c..103f5015 100644
--- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts
+++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts
@@ -62,6 +62,7 @@ export class InvoiceRequestedDetailComponent implements OnInit {
         type: 'string',
         title: '发票号码',
         ui: {
+          placeholder: '请输入',
           autocomplete: 'off'
         }
       }
diff --git a/src/app/routes/usercenter/components/driver/detail/detail.component.ts b/src/app/routes/usercenter/components/driver/detail/detail.component.ts
index 400db1e1..b70efcb7 100644
--- a/src/app/routes/usercenter/components/driver/detail/detail.component.ts
+++ b/src/app/routes/usercenter/components/driver/detail/detail.component.ts
@@ -114,7 +114,7 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
       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);
+    const res = await this.service.asyncRequest(this.service.$api_get_one, params);
     // // 商品资质
     // if (res.enterpriseBusinessJson) {
     //   res.enterpriseBusinessJson.aptitudes = res.enterpriseBusinessJson?.aptitudes ? res.enterpriseBusinessJson.aptitudes.split(',') : [];
@@ -154,7 +154,7 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
     const params = {
       regionCode: code,
     };
-    const res = await this.service.asyncRequest(this.service.$api_get_region_detailByCode, params, 'POST', true);
+    const res = await this.service.asyncRequest(this.service.$api_get_one, params, 'POST', true);
     // if (res && res.regionFullName) {
     //   const arr = res.regionFullName.split(',');
     //   res.regionFullName = arr.reverse().join('-');
diff --git a/src/app/routes/usercenter/components/freight/enterprise-audit/view/view.component.ts b/src/app/routes/usercenter/components/freight/enterprise-audit/view/view.component.ts
index 46db87ab..dd77b304 100644
--- a/src/app/routes/usercenter/components/freight/enterprise-audit/view/view.component.ts
+++ b/src/app/routes/usercenter/components/freight/enterprise-audit/view/view.component.ts
@@ -110,7 +110,7 @@ export class FreightComponentsEnterpriseAuditViewComponent implements OnInit {
       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);
+    const res = await this.service.asyncRequest(this.service.$api_get_one, params);
     // // 商品资质
     // if (res.enterpriseBusinessJson) {
     //   res.enterpriseBusinessJson.aptitudes = res.enterpriseBusinessJson?.aptitudes ? res.enterpriseBusinessJson.aptitudes.split(',') : [];
@@ -150,7 +150,7 @@ export class FreightComponentsEnterpriseAuditViewComponent implements OnInit {
     const params = {
       regionCode: code,
     };
-    const res = await this.service.asyncRequest(this.service.$api_get_region_detailByCode, params, 'POST', true);
+    const res = await this.service.asyncRequest(this.service.$api_get_one, params, 'POST', true);
     // if (res && res.regionFullName) {
     //   const arr = res.regionFullName.split(',');
     //   res.regionFullName = arr.reverse().join('-');
diff --git a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html
index 4aafe892..8d08b3f9 100644
--- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html
+++ b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html
@@ -1,289 +1,202 @@
-<ng-container >
-  <!-- 页头 -->
-  <page-header-wrapper [logo]="logo" [action]="action" [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 style="position: relative;top: -65%;
-         left: 75%;">
-          <button
-          [nzLoading]="service.http.loading"
-          nz-button
-          nzDanger
-          nz-popconfirm
-          [nzPopconfirmTitle]="enable"
-          (nzOnConfirm)="freezeOrResume(0)"
-          nzPopconfirmPlacement="bottomRight"
-        >
+<!-- 页头 -->
+<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" nz-row>
+      <div nz-col [nzXl]="18" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="d-flex">
+        <img [src]="detailData?.enterpriseLogo" />
+        <div style="flex: 1;">
+          <div nz-row>
+            <div nz-col [nzLg]="12" [nzSm]="24" [nzXs]="24">
+              <p style="margin-bottom: 0;">{{ detailData?.enterpriseName }}</p>
+            </div>
+            <div nz-col [nzLg]="12" [nzSm]="24" [nzXs]="24">
+              <nz-badge nzStatus="success" nzText="正常" *ngIf="detailData?.stateLocked === 0"></nz-badge>
+              <nz-badge nzStatus="error" nzText="冻结" *ngIf="detailData?.stateLocked === 1"></nz-badge>
+            </div>
+          </div>
+          <div nz-row>
+            <div nz-col [nzLg]="12" [nzSm]="24" [nzXs]="24">
+              <p>{{ detailData?.unifiedSocialCreditCode }}</p>
+            </div>
+            <div nz-col [nzLg]="12" [nzSm]="24" [nzXs]="24">
+              认证时间：{{detailData?.createTime}}
+            </div>
+          </div>
+          <div>
+            服务评级：<nz-rate [ngModel]="detailData?.serviceLevel" nzDisabled></nz-rate>
+          </div>
+        </div>
+      </div>
+      <div nz-col [nzXl]="6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right mt-sm">
+        <button [nzLoading]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="enable"
+          (nzOnConfirm)="freezeOrResume(0)" nzPopconfirmPlacement="bottomRight" *ngIf="detailData?.stateLocked === 1">
           启用
         </button>
-        <button
-          [nzLoading]="service.http.loading"
-          nz-button
-          nzDanger
-          nz-popconfirm
-          [nzPopconfirmTitle]="frozen"
-          (nzOnConfirm)="freezeOrResume(1)"
-          nzPopconfirmPlacement="bottomRight"
-        >
+        <button [nzLoading]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="frozen"
+          (nzOnConfirm)="freezeOrResume(1)" nzPopconfirmPlacement="bottomRight" *ngIf="detailData?.stateLocked === 0">
           冻结
         </button>
-        <button
-          [nzLoading]="service.http.loading"
-          nz-button
-          nzDanger
-          nz-popconfirm
-          [nzPopconfirmTitle]="Payfrozen"
-          (nzOnConfirm)="PayOrResume(0)"
-          nzPopconfirmPlacement="bottomRight"
-        >
+        <button [nzLoading]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="Payfrozen"
+          (nzOnConfirm)="PayOrResume(0)" nzPopconfirmPlacement="bottomRight" *ngIf="detailData?.createPay === 0">
           开通支付权限
         </button>
-        <button
-          [nzLoading]="service.http.loading"
-          nz-button
-          nzDanger
-          nz-popconfirm
-          [nzPopconfirmTitle]="Payenable"
-          (nzOnConfirm)="PayOrResume(1)"
-          nzPopconfirmPlacement="bottomRight"
-        >
+        <button [nzLoading]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="Payenable"
+          (nzOnConfirm)="PayOrResume(1)" nzPopconfirmPlacement="bottomRight" *ngIf="detailData?.createPay === 1">
           关闭支付权限
         </button>
-         </div>
-        </div>
       </div>
-    </ng-template>
-    <ng-template #action> </ng-template>
+    </div>
+  </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>
+  <ng-template #frozen>
+    <ng-container
+      *ngTemplateOutlet="PopconfirmTempalte;context:{title:'确定冻结该企业吗？',content:'停用后，该企业将被限制使用，不限于访问受限、无法发布货源等，请谨慎操作'}">
+    </ng-container>
+  </ng-template>
+  <ng-template #enable>
+    <ng-container *ngTemplateOutlet="PopconfirmTempalte;context:{title:'确定启用该企业吗？',content:'启用后，该企业将恢复正常使用功能，请再次确认'}">
+    </ng-container>
+  </ng-template>
+  <ng-template #Payenable>
+    <ng-container
+      *ngTemplateOutlet="PopconfirmTempalte;context:{title:'确定关闭该企业支付权限吗？',content:'停用后，该企业将被限制使用支付功能，请谨慎操作'}">
+    </ng-container>
+  </ng-template>
+  <ng-template #Payfrozen>
+    <ng-container
+      *ngTemplateOutlet="PopconfirmTempalte;context:{title:'确定开通该企业支付权限吗？',content:'启用后，该企业将恢复正常支付功能，请再次确认'}">
+    </ng-container>
+  </ng-template>
+</page-header-wrapper>
+
+<nz-card>
+  <sv-container col="3">
+    <sv-title>企业管理员信息</sv-title>
+    <sv label="姓名">
+      {{ detailData?.adminUserInfo?.name }}
+    </sv>
+    <sv label="手机号">
+      {{ detailData?.adminUserInfo?.mobile }}
+    </sv>
+    <sv label="身份证号">
+      {{ detailData?.contactadminUserInfo?.certificateNumber }}
+    </sv>
+    <sv label="身份证照">
+      <img [src]="detailData?.adminUserInfo?.certificatePhotoFrontWatermark" alt="">
+      <img [src]="detailData?.adminUserInfo?.certificatePhotoBackWatermark" alt="">
+    </sv>
+    <sv label="企业授权函">
+      <img [src]="detailData?.adminUserInfo?.certificatePhotoBackWatermark" alt="">
+      <!-- <app-imagelist [imgList]="detailData?.enterpriseQualificationCertificate"></app-imagelist> -->
+    </sv>
+  </sv-container>
+  <nz-divider></nz-divider>
+  <sv-container col="3" class="mt16">
+    <sv-title>
+      <label class="mr-md">企业基本信息</label>
+      <label *ngIf="detailData?.approvalStatus===10" style="color: #1890ff;"><i nz-icon nzType="info-circle"
+          nzTheme="fill" class="mr-xs"></i>待审核
+      </label>
+      <label *ngIf="detailData?.approvalStatus===20" style="color: #52c41a;"><i nz-icon nzType="check-circle"
+          nzTheme="fill" class="mr-xs"></i>审核通过
+      </label>
+      <label *ngIf="detailData?.approvalStatus===30" style="color: #ff4d4f;"><i nz-icon nzType="close-circle"
+          nzTheme="fill" class="mr-xs"></i>驳回
+      </label>
+    </sv-title>
+    <sv label="公司名称">
+      {{ detailData?.enterpriseName }}
+    </sv>
+    <sv label="统一社会信用代码">
+      {{ detailData?.unifiedSocialCreditCode }}
+    </sv>
+    <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>
-    </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 label="联系人">
-        {{ detailData?.contactsName }}
-      </sv>
-      <sv label="联系人手机号">
-        {{ detailData?.contactsPhone }}
-      </sv>
-      <sv label="联系人身份证号">
-        {{ detailData?.contactsPhone }}
-      </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="注册资本">
-        {{ 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-title>法人信息</sv-title>
-      <sv label="法定代表人">
-        {{ detailData?.name }}
-      </sv>
-      <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">
-      <sv-title>银行结算信息</sv-title>
-      <sv label="开户名称">
-        {{ detailData?.name }}
-      </sv>
-      <sv label="开户账户">
-        {{ detailData?.certificateNumber }}
-      </sv>
-      <sv label="开户支行">
-        {{ detailData?.validStartTime }}
-      </sv>
-    </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 *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="1" class="mt16">
+    <sv label="经营范围">
+      {{ detailData?.businessScope }}
+    </sv>
+  </sv-container>
+  <sv-container col="2" class="mt16">
+    <sv label="税务机关">
+      {{ detailData?.taxAuthority }}
+    </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?.legalPersonIdentityVO?.name }}
+    </sv>
+    <sv label="身份证号码">
+      {{ detailData?.legalPersonIdentityVO?.certificateNumber }}
+    </sv>
+    <sv label="身份证有效期">
+      {{ detailData?.legalPersonIdentityVO?.validStartTime }} -
+      {{ detailData?.legalPersonIdentityVO?.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">
+    <sv-title>企业开票信息</sv-title>
+    <sv label="开户银行">
+      {{ detailData?.name }}
+    </sv>
+    <sv label="银行账户">
+      {{ detailData?.bankAccount }}
+    </sv>
+    <sv label="注册电话">
+      {{ detailData?.validStartTime }}
+    </sv>
+    <sv label="注册地址">
+      {{ detailData?.validStartTime }}
+    </sv>
+  </sv-container>
+</nz-card>
+
+<ng-template #PopconfirmTempalte let-title="title" let-content="content">
+  <div class="ant-popover-message">
+    <i nz-icon nzType="info-circle" nzTheme="fill"></i>
+    <div class="ant-popover-message-title ng-star-inserted self-ant-popover-title" style="font-size: 16px">{{title}}
+    </div>
+    <div class="ant-popover-message-title ng-star-inserted">
+      {{content}}
+    </div>
   </div>
-</nz-modal>
+</ng-template>
\ No newline at end of file
diff --git a/src/app/routes/usercenter/components/freight/list/detail/detail.component.less b/src/app/routes/usercenter/components/freight/list/detail/detail.component.less
index 48f605d9..ecad9a04 100644
--- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.less
+++ b/src/app/routes/usercenter/components/freight/list/detail/detail.component.less
@@ -28,7 +28,6 @@
     margin-top: 16px;
   }
   .user-info {
-    display: flex;
     font-size: 16px;
     .enterprise-name {
       margin-right: 15px;
diff --git a/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts b/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts
index 809f567f..a19d28de 100644
--- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts
+++ b/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts
@@ -9,7 +9,7 @@ import { UsermanageService } from '../../../../services/usercenter.service';
 @Component({
   selector: 'app-supplier-components-list-view',
   templateUrl: './detail.component.html',
-  styleUrls: ['./detail.component.less'],
+  styleUrls: ['./detail.component.less']
 })
 export class FreightComponentsListDetailComponent implements OnInit {
   i: any;
@@ -17,7 +17,6 @@ export class FreightComponentsListDetailComponent implements OnInit {
   @ViewChild('st', { static: false }) st!: STComponent;
   detailData: any;
   isShow = false;
-  isVisible = false;
   modalTitle = '有效期';
   modalName = '';
   ui!: SFUISchema;
@@ -34,92 +33,23 @@ export class FreightComponentsListDetailComponent implements OnInit {
     public service: UsermanageService,
     private route: ActivatedRoute,
     private modalHelper: ModalHelper,
-    private msgSrv: NzMessageService,
+    private msgSrv: NzMessageService
   ) {}
 
   ngOnInit() {
-    console.log(this.route.snapshot);
-    // this.initData();
-    this.initSF();
-    this.initSF1();
-    // this.launchSign();
+    this.initData();
   }
-  /**
-   * 初始化查询表单
-   */
-  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);
+  initData() {
+    this.service
+      .request(this.service.$api_get_freight_detail, {
+        id: this.route.snapshot.params.id
+      })
+      .subscribe(res => {
+        if (res) {
+          this.detailData = res;
+        }
+        console.log(res);
+      });
     // // 商品资质
     // if (res.enterpriseBusinessJson) {
     //   res.enterpriseBusinessJson.aptitudes = res.enterpriseBusinessJson?.aptitudes ? res.enterpriseBusinessJson.aptitudes.split(',') : [];
@@ -131,24 +61,24 @@ export class FreightComponentsListDetailComponent implements OnInit {
     // // res.applyUserJson.imagelist.push(res.applyUserJson.handCertificate);
 
     // 法人身份证证件
-    const imagelist = [];
-    imagelist.push(res?.certificatePhotoFront);
-    imagelist.push(res?.certificatePhotoBack);
-    res.certificatePhoto = imagelist;
+    // const imagelist = [];
+    // imagelist.push(res?.certificatePhotoFront);
+    // imagelist.push(res?.certificatePhotoBack);
+    // res.certificatePhoto = imagelist;
 
-    // 营业执照
-    res.enterpriseQualificationCertificate = res.enterpriseQualificationCertificate
-      ? res.enterpriseQualificationCertificate.split(',')
-      : [];
+    // // 营业执照
+    // res.enterpriseQualificationCertificate = res.enterpriseQualificationCertificate
+    //   ? res.enterpriseQualificationCertificate.split(',')
+    //   : [];
 
-    // 返回所在地
-    res.enterpriseAddressCodeStr = await this.getRegionFullName(res.enterpriseAddressCode);
+    // // 返回所在地
+    // res.enterpriseAddressCodeStr = await this.getRegionFullName(res.enterpriseAddressCode);
 
-    this.detailData = res;
-    this.suppliersData = {
-      suppliersType: res?.suppliersType,
-      externalSuppliersId: res?.externalSuppliersId,
-    };
+    // this.detailData = res;
+    // this.suppliersData = {
+    //   suppliersType: res?.suppliersType,
+    //   externalSuppliersId: res?.externalSuppliersId
+    // };
   }
 
   /**
@@ -157,9 +87,9 @@ export class FreightComponentsListDetailComponent implements OnInit {
    */
   async getRegionFullName(code: any) {
     const params = {
-      regionCode: code,
+      regionCode: code
     };
-    const res = await this.service.asyncRequest(this.service.$api_get_region_detailByCode, params, 'POST', true);
+    const res = await this.service.asyncRequest(this.service.$api_get_one, params, 'POST', true);
     // if (res && res.regionFullName) {
     //   const arr = res.regionFullName.split(',');
     //   res.regionFullName = arr.reverse().join('-');
@@ -178,7 +108,7 @@ export class FreightComponentsListDetailComponent implements OnInit {
    * 冻结
    */
   freezeOrResume(type: number) {
-    console.log(type)
+    console.log(type);
     // this.service.http
     //   .post(this.service.$api_set_freezeOrResume, {
     //     tenantId: this.route.snapshot.params.id,
@@ -199,7 +129,7 @@ export class FreightComponentsListDetailComponent implements OnInit {
     //   });
   }
   PayOrResume(type: number) {
-    console.log(type)
+    console.log(type);
     // this.service.http
     //   .post(this.service.$api_set_freezeOrResume, {
     //     tenantId: this.route.snapshot.params.id,
@@ -219,37 +149,4 @@ export class FreightComponentsListDetailComponent implements OnInit {
     //     }
     //   });
   }
-
-  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;
-      }
-    });
-  }
 }
diff --git a/src/app/routes/usercenter/components/freight/list/list.component.html b/src/app/routes/usercenter/components/freight/list/list.component.html
index b0d2de52..be46b4c6 100644
--- a/src/app/routes/usercenter/components/freight/list/list.component.html
+++ b/src/app/routes/usercenter/components/freight/list/list.component.html
@@ -12,73 +12,45 @@
   <!-- 搜索区 -->
   <!-- 搜索表单 -->
   <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 nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
+      <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
+    </div>
+    <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
+      <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>
+      <button nz-button nzType="link" (click)="expandToggle()">
+        {{ !_$expand ? '展开' : '收起' }}
+        <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
+      </button>
     </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)="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>
-        <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'
+  <st #st [bordered]="true" [columns]="columns" [data]='service.$api_get_freight_list'
     [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"
-  >
+    [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"
-        >
+          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 st-row="promotersTelephone" let-item let-index="index">
+      <a (click)="daoyun(item)">{{ item.promotersTelephone }}</a>
     </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>
+</nz-card>
\ No newline at end of file
diff --git a/src/app/routes/usercenter/components/freight/list/list.component.less b/src/app/routes/usercenter/components/freight/list/list.component.less
new file mode 100644
index 00000000..e69de29b
diff --git a/src/app/routes/usercenter/components/freight/list/list.component.spec.ts b/src/app/routes/usercenter/components/freight/list/list.component.spec.ts
deleted file mode 100644
index e695c14a..00000000
--- a/src/app/routes/usercenter/components/freight/list/list.component.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { FreightComponentsListComponent } from './list.component';
-
-describe('FreightComponentsListComponent', () => {
-  let component: FreightComponentsListComponent;
-  let fixture: ComponentFixture<FreightComponentsListComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [FreightComponentsListComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(FreightComponentsListComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/routes/usercenter/components/freight/list/list.component.ts b/src/app/routes/usercenter/components/freight/list/list.component.ts
index bbb18f3c..1eb7e0a2 100644
--- a/src/app/routes/usercenter/components/freight/list/list.component.ts
+++ b/src/app/routes/usercenter/components/freight/list/list.component.ts
@@ -7,52 +7,17 @@ import { UsermanageService } from '../../../services/usercenter.service';
 @Component({
   selector: 'app-Freight-components-list',
   templateUrl: './list.component.html',
+  styleUrls: ['./list.component.less']
 })
 export class FreightComponentsListComponent 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;
-  }
 
   /**
    * 查询参数
@@ -60,6 +25,7 @@ export class FreightComponentsListComponent implements OnInit {
   get reqParams() {
     const params: any = {
       ...(this.sf && this.sf.value),
+      listSource: 1
     };
     if (this.sf?.value.effectiveDate) {
       params.effectiveDateStart = this.sf?.value.effectiveDate[0];
@@ -71,13 +37,13 @@ export class FreightComponentsListComponent implements OnInit {
   }
 
   get selectedRows() {
-    return this.st?.list.filter((item) => item.checked) || [];
+    return this.st?.list.filter(item => item.checked) || [];
   }
 
   ngOnInit() {
     this.initSF();
     this.initST();
-    this.ar.url.subscribe((params) => {
+    this.ar.url.subscribe(params => {
       this.st?.load(1);
     });
   }
@@ -93,105 +59,117 @@ export class FreightComponentsListComponent implements OnInit {
         expand: {
           type: 'boolean',
           ui: {
-            hidden: true,
-          },
+            hidden: true
+          }
         },
-        storeName: { title: '企业名称', type: 'string', ui: { showRequired: false } },
-        contactsName: {
+        enterpriseName: {
+          title: '企业名称',
+          type: 'string',
+          ui: {
+            placeholder: '请输入',
+            showRequired: false
+          }
+        },
+        mobile: {
           title: '联系人',
           type: 'string',
           ui: {
-            showRequired: false,
-          },
+            placeholder: '请输入',
+            showRequired: false
+          }
         },
-        unifiedSocialCreditCode: {
-          title: '税源地',
+        networkTransporter: {
+          title: '网络货运人',
           type: 'string',
           ui: {
-            showRequired: false,
-          },
+            placeholder: '请输入',
+            showRequired: false
+          }
         },
-        enStatus: {
+        source: {
           type: 'string',
-          title: '货主状态',
+          title: '注册渠道',
           enum: [
             { label: '全部', value: '' },
-            { label: '正常', value: 0 },
-            { label: '冻结', value: 1 },
-            { label: '废弃', value: 2 },
+            { label: '自己录入', value: 1 },
+            { label: '运营录入', value: 2 }
           ],
           default: '',
           ui: {
             widget: 'select',
             visibleIf: {
-              expand: (value: boolean) => value,
-            },
-          },
+              expand: (value: boolean) => value
+            }
+          }
         },
-        enStatus2: {
+        crmStatus: {
           type: 'string',
           title: 'CRM审核状态',
           enum: [
             { label: '全部', value: '' },
-            { label: '正常', value: 0 },
-            { label: '冻结', value: 1 },
-            { label: '废弃', value: 2 },
+            { label: '待审核', value: '10' },
+            { label: '审核通过', value: '20' },
+            { label: '驳回', value: '30' }
           ],
           default: '',
           ui: {
             widget: 'select',
             visibleIf: {
-              expand: (value: boolean) => value,
-            },
-          },
+              expand: (value: boolean) => value
+            }
+          }
         },
-      },
+        lockedStatus: {
+          type: 'string',
+          title: '企业状态',
+          enum: [
+            { label: '全部', value: '' },
+            { label: '正常', value: 0 },
+            { label: '冻结', value: 1 }
+          ],
+          default: '',
+          ui: {
+            widget: 'select',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        }
+      }
     };
-    this.ui = { '*': { spanLabelFixed: 90, grid: { span: 8, gutter: 4 }, enter: () => this.st.load() } };
+    this.ui = { '*': { spanLabelFixed: 110, grid: { lg: 8, md: 12, sm: 12, xs: 24 }, 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',
-      type: 'badge',
-      badge: {
-        正常: { text: '正常', color: 'success' },
-        冻结: { text: '冻结', color: 'warning' },
-        废弃: { text: '废弃', color: 'default' },
-      },
-     },
+      { title: '企业名称', className: 'text-center', index: 'enterpriseName' },
+      { title: '联系人', className: 'text-center', index: 'contacter' },
+      { title: '网络货运人', className: 'text-center', index: 'networkTransporter' },
+      { title: '常用服务', className: 'text-center', index: 'oftenUsedServices', type: 'enum', enum: { 10: '整车发货', 20: '大宗发货' } },
+      { title: '推广业务员', className: 'text-center', render: 'promotersTelephone' },
+      { title: '注册渠道', className: 'text-center', index: 'source', type: 'enum', enum: { 1: '自己录入', 2: '运营录入' } },
       {
         title: 'CRM审核状态',
         className: 'text-center',
-        index: 'enStatusStr2',
+        index: 'crmStatus',
         type: 'badge',
         badge: {
-          正常: { text: '正常', color: 'success' },
-          冻结: { text: '冻结', color: 'warning' },
-          废弃: { text: '废弃', color: 'default' },
-        },
+          10: { text: '待审核', color: 'default' },
+          20: { text: '已成功', color: 'success' },
+          30: { text: '审核失败', color: 'warning' }
+        }
       },
       {
-        title: '代收权限',
+        title: '企业状态',
         className: 'text-center',
-        index: 'enStatusStr3',
+        index: 'lockedStatus',
         type: 'badge',
         badge: {
-          正常: { text: '正常', color: 'success' },
-          冻结: { text: '冻结', color: 'warning' },
-          废弃: { text: '废弃', color: 'default' },
-        },
+          0: { text: '正常', color: 'success' },
+          1: { text: '冻结', color: 'error' }
+        }
       },
-      { title: '常用服务', className: 'text-center', index: 'unifiedSocialCreditCode3' },
-      { title: '推广业务员', className: 'text-center', index: 'unifiedSocialCreditCode2' },
       {
         title: '操作',
         width: '170px',
@@ -199,13 +177,13 @@ export class FreightComponentsListComponent implements OnInit {
         buttons: [
           {
             text: '查看',
-            click: (item) => {
-              this.router.navigate(['./detail', item.tenantId], { relativeTo: this.ar });
+            click: item => {
+              this.router.navigate(['./detail', item.id], { relativeTo: this.ar });
               // this.router.navigate(['./view', item.id], { relativeTo: this.ar, queryParams: { tenantId: item.tenantId } });
-            },
-          },
-        ],
-      },
+            }
+          }
+        ]
+      }
     ];
   }
   daoyun(item: any) {
@@ -216,7 +194,7 @@ export class FreightComponentsListComponent implements OnInit {
     this.sf?.setValue('/expand', this._$expand);
   }
   creat() {
-    this.router.navigate(['./new',], { relativeTo: this.ar });
+    this.router.navigate(['./new'], { relativeTo: this.ar });
   }
   /**
    * 重置表单
diff --git a/src/app/routes/usercenter/components/freight/list/view/view.component.ts b/src/app/routes/usercenter/components/freight/list/view/view.component.ts
index f72bb40a..0874ddda 100644
--- a/src/app/routes/usercenter/components/freight/list/view/view.component.ts
+++ b/src/app/routes/usercenter/components/freight/list/view/view.component.ts
@@ -183,7 +183,7 @@ export class FreightComponentsListViewComponent implements OnInit {
     const params = {
       regionCode: code,
     };
-    const res = await this.service.asyncRequest(this.service.$api_get_region_detailByCode, params, 'POST', true);
+    const res = await this.service.asyncRequest(this.service.$api_get_one, params, 'POST', true);
     // if (res && res.regionFullName) {
     //   const arr = res.regionFullName.split(',');
     //   res.regionFullName = arr.reverse().join('-');
@@ -203,7 +203,7 @@ export class FreightComponentsListViewComponent implements OnInit {
    */
   freezeOrResume(type: number) {
     this.service.http
-      .post(this.service.$api_set_freezeOrResume, {
+      .post(this.service.$api_get_one, {
         tenantId: this.route.snapshot.params.id,
         // tenantId: this.route.snapshot.queryParams.tenantId,
         status: type,
@@ -240,7 +240,7 @@ export class FreightComponentsListViewComponent implements OnInit {
     } else {
       Object.assign(params, this.sf1?.value);
     }
-    this.service.http.post(this.service.$api_set_freezeOrResume, params).subscribe((res) => {
+    this.service.http.post(this.service.$api_get_one, params).subscribe((res) => {
       if (res.data === true) {
         this.service.msgSrv.success(`编辑成功！`);
         this.ngOnInit();
diff --git a/src/app/routes/usercenter/components/freight/user/detail/detail.component.ts b/src/app/routes/usercenter/components/freight/user/detail/detail.component.ts
index 5353245f..9c95166a 100644
--- a/src/app/routes/usercenter/components/freight/user/detail/detail.component.ts
+++ b/src/app/routes/usercenter/components/freight/user/detail/detail.component.ts
@@ -137,7 +137,7 @@ export class FreightComponentsUserDetailComponent implements OnInit {
       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);
+    const res = await this.service.asyncRequest(this.service.$api_get_one, params);
     // // 商品资质
     // if (res.enterpriseBusinessJson) {
     //   res.enterpriseBusinessJson.aptitudes = res.enterpriseBusinessJson?.aptitudes ? res.enterpriseBusinessJson.aptitudes.split(',') : [];
@@ -177,7 +177,7 @@ export class FreightComponentsUserDetailComponent implements OnInit {
     const params = {
       regionCode: code,
     };
-    const res = await this.service.asyncRequest(this.service.$api_get_region_detailByCode, params, 'POST', true);
+    const res = await this.service.asyncRequest(this.service.$api_get_one, params, 'POST', true);
     // if (res && res.regionFullName) {
     //   const arr = res.regionFullName.split(',');
     //   res.regionFullName = arr.reverse().join('-');
@@ -256,7 +256,7 @@ export class FreightComponentsUserDetailComponent implements OnInit {
     } else {
       Object.assign(params, this.sf1?.value);
     }
-    this.service.http.post(this.service.$api_set_freezeOrResume, params).subscribe((res) => {
+    this.service.http.post(this.service.$api_get_one, params).subscribe((res) => {
       if (res.data === true) {
         this.service.msgSrv.success(`编辑成功！`);
         this.ngOnInit();
diff --git a/src/app/routes/usercenter/services/usercenter.service.ts b/src/app/routes/usercenter/services/usercenter.service.ts
index f73600a1..69185380 100644
--- a/src/app/routes/usercenter/services/usercenter.service.ts
+++ b/src/app/routes/usercenter/services/usercenter.service.ts
@@ -13,77 +13,14 @@ import { BaseService } from 'src/app/shared/services/core/base.service';
 import { EAFileUtil } from 'src/app/shared/utils/file.util';
 
 @Injectable({
-  providedIn: 'root',
+  providedIn: 'root'
 })
 export class UsermanageService extends BaseService {
-  public $api_add_one!: string;
-  public $api_add_many!: string;
-  public $api_edit_one!: string;
-  public $api_edit_many!: string;
-  public $api_del_one!: string;
-  public $api_del_many!: string;
-  public $api_get_many!: string;
-  public $api_get_one!: string;
-  public $api_get_page!: string;
-  public $api_export!: string;
-  public $api_import!: string;
-  public $api_import_download_tpl!: string;
-  // 平台用户列表
-  $api_get_page_user = '/cuc/userApp/getOperatorUserList?_allow_anonymous=true';
-  // 获取供应商采购商应用
-  $api_get_supplier_purchaserApp = '/cuc/appInfo/getSupplierPurchaserApp?_allow_anonymous=true';
+  // 查询企业列表
+  $api_get_freight_list = '/api/mdc/cuc/enterpriseInfo/operate/list/page';
 
-  // 供应商列表
-  $api_get_supplier_page = '/cuc/operator/list/listSupplierPage?_allow_anonymous=true';
-  // 供应商详情
-  $api_get_supplier_info = '/cuc/operator/selectSupplierDetailInfo?_allow_anonymous=true';
-  // 用户冻结或恢复应用用户
-  $api_set_freezeOrResume = '/cuc/operator/updateSupplierInfo?_allow_anonymous=true';
-  // 获取一、二、三级地区详情
-  $api_getRegionToThree = '/cms/region/getRegionToThree?_allow_anonymous=true';
-  // 根据地区code查询列表
-  $api_getRegionByCode = '/cms/region/getRegionByCode?_allow_anonymous=true';
-
-  // 根据地区code查询地区详情
-  $api_get_region_detailByCode = '/cms/region/getRegionDetailByCode?_allow_anonymous=true';
-  // 查询供应商申请列表分页
-  $api_get_supplier_audit_page = `/cuc/operator/audit/listSupplierPage?_allow_anonymous=true`;
-  // 查询供应商入驻详情
-  $api_get_supplier_entryInfo = `/cuc/operator/selectSupplierEntryDetailInfo?_allow_anonymous=true`;
-  // 审核供应商
-  $api_auditSupplier = `/cuc/operator/auditSupplier?_allow_anonymous=true`;
-  // 查询采购商列表分页
-  $api_get_purchaserList = `/cuc/operator/list/queryPurchaserPage`;
-  // 查询采购商申请列表分页
-  $api_get_purchaserAudit = `/cuc/operator/audit/queryPurchaserPage`;
-  // 查询采购商认证详情
-  $api_get_purchaser_detailInfo = `/cuc/operator/selectPurchaserDetailInfo`;
-
-  // 查询采购商审核总数
-  $api_query_purchaser_count = `/cuc/operator/queryPurchaserCount`;
-  // 获取供应商审核总数
-  $api_query_supplier_count = `/cuc/operator/querySupplierCount`;
-
-  // 审核企业详情
-  $api_get_cache_enterprise_info = '';
-  // 获取审核进度
-  $api_get_progress = '/cuc/reviewRecordInfo/getReviewProgress';
-  // 查询流程信息列表
-  $api_get_progressInfoList = '/cuc/processInfo/getProcessInfoList';
-  // 审核通过
-  $api_set_audit_pass = '/cuc/reviewRecordInfo/reviewPassed';
-  // 审核拒绝
-  $api_set_audit_reject = '/cuc/reviewRecordInfo/reviewRejected';
-
-  // 发起签约 //撤回签约
-  $api_get_startSigning = `/cuc/operator/startSigning?_allow_badcode=true`;
-
-  // 发起续约 //撤回续约
-  $api_get_startRenewalContract = `/cuc/operator/startRenewalContract?_allow_badcode=true`;
-  // 获取审核记录
-  $api_get_reviewRecordInfoList = '/cuc/reviewRecordInfo/getReviewRecordInfoList';
-  // 查看合同详情
-  $api_get_contract_detail = `/scce/etc/etc/contractDetail/getContractByContractNo`;
+  // 查询企业详情
+  $api_get_freight_detail = '/api/mdc/cuc/enterpriseInfo/operate/detail';
 
   constructor(public injector: Injector) {
     super(injector);