From f5f64038c266cb9013cf8c9c79ee570b8c23933e Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Wed, 23 Mar 2022 14:31:43 +0800
Subject: [PATCH] merge partner

---
 .../components/freight/list/list.component.ts   | 17 +----------------
 .../usercenter/usercenter-routing.module.ts     |  3 +--
 .../services/business/shipper-base.service.ts   |  2 +-
 3 files changed, 3 insertions(+), 19 deletions(-)

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 b5370777..afb394a1 100644
--- a/src/app/routes/usercenter/components/freight/list/list.component.ts
+++ b/src/app/routes/usercenter/components/freight/list/list.component.ts
@@ -166,21 +166,6 @@ export class FreightComponentsListComponent implements OnInit {
             showRequired: false
           }
         },
-        enterpriseType: {
-          type: 'string',
-          title: '企业类型',
-          enum: [
-            { label: '全部', value: '' },
-            { label: '物流企业', value: 0 }
-          ],
-          default: '',
-          ui: {
-            widget: 'select',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
-          }
-        },
         lockedStatus8: {
           type: 'string',
           title: '公司所在地',
@@ -312,7 +297,7 @@ export class FreightComponentsListComponent implements OnInit {
             }
           }
         },
-        networkTransporter: {
+        enterpriseType: {
           type: 'string',
           title: '企业类型',
           enum: [
diff --git a/src/app/routes/usercenter/usercenter-routing.module.ts b/src/app/routes/usercenter/usercenter-routing.module.ts
index 4ed24bdd..3034830b 100644
--- a/src/app/routes/usercenter/usercenter-routing.module.ts
+++ b/src/app/routes/usercenter/usercenter-routing.module.ts
@@ -19,14 +19,13 @@ import { FreightComponentsListDetailComponent } from './components/freight/list/
 
 import { FreightComponentsListComponent } from './components/freight/list/list.component';
 import { FreightComponentsListNewComponent } from './components/freight/list/new/new.component';
-import { FreightComponentsListViewComponent } from './components/freight/list/view/view.component';
 import { FreightComponentsUserDetailComponent } from './components/freight/user/detail/detail.component';
 import { FreightComponentsUserComponent } from './components/freight/user/user.component';
 
 const routes: Routes = [
   { path: 'freight/list', component: FreightComponentsListComponent, data: { guard: { ability: ['USERCENTER-FREIGHT-LIST-list'] } } },
   //  data: { guard: { ability: ['USERCENTER-FREIGHT-LIST-list'] } }
-  { path: 'freight/list/view/:id', component: FreightComponentsListViewComponent },
+  // { path: 'freight/list/view/:id', component: FreightComponentsListViewComponent },
   { path: 'freight/list/new', component: FreightComponentsListNewComponent, data: { guard: { ability: ['USERCENTER-FREIGHT-NEW-save'] } } },
   {
     path: 'freight/list/detail/:id',
diff --git a/src/app/shared/services/business/shipper-base.service.ts b/src/app/shared/services/business/shipper-base.service.ts
index 9b303616..fe96b8a0 100644
--- a/src/app/shared/services/business/shipper-base.service.ts
+++ b/src/app/shared/services/business/shipper-base.service.ts
@@ -62,7 +62,7 @@ export class ShipperBaseService extends BaseService {
           };
         });
         const obj = [{ value: '', label: '全部' }];
-        this.list = [...obj, ...list];
+        // this.list = [...obj, ...list];
         return [...obj, ...list];
       })
     );