From 12ef96df3104a07ec80d1d78899eca7159426b6e Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Tue, 14 Dec 2021 20:58:53 +0800
Subject: [PATCH] edit

---
 .../enterprise-audit/enterprise-audit.component.ts |  2 +-
 .../enterprise-audit/view/view.component.html      | 14 +++++++-------
 .../enterprise-audit/view/view.component.ts        | 13 ++++++-------
 src/assets/mocks/menu-data.json                    |  2 +-
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts b/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts
index 55cb415f..60f6c865 100644
--- a/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts
+++ b/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts
@@ -42,7 +42,7 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
       flag: this.tabType
     });
     delete params._$expand;
-    return { ...params, listSource: 1 };
+    return { ...params, listSource: 2 };
   }
 
   /**
diff --git a/src/app/routes/usercenter/components/freight/enterprise-audit/view/view.component.html b/src/app/routes/usercenter/components/freight/enterprise-audit/view/view.component.html
index 9acbaa05..c357b619 100644
--- a/src/app/routes/usercenter/components/freight/enterprise-audit/view/view.component.html
+++ b/src/app/routes/usercenter/components/freight/enterprise-audit/view/view.component.html
@@ -6,7 +6,7 @@
     </button>
   </ng-template>
   <ng-template #content>
-    <nz-skeleton [nzLoading]="service.http.loading">
+    <nz-skeleton >
       <div class="user-info" nz-row>
         <div nz-col nzSpan="24" class="d-flex">
           <img [src]="detailData?.enterpriseLogo" />
@@ -56,7 +56,7 @@
   </ng-template>
 </page-header-wrapper>
 
-<nz-card [nzLoading]="service.http.loading" [class]="isEdit?'edit-box':'readOnly-box'">
+<nz-card  [class]="isEdit?'edit-box':'readOnly-box'">
   <sv-container col="3">
     <sv-title>企业管理员信息</sv-title>
     <sv label="姓名">
@@ -129,11 +129,11 @@
         [nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''"></nz-date-picker>
     </sv>
     <sv label="营业期限">
-      <ng-container *ngIf="isEdit; else elseTemplate">
+      <ng-container *ngIf="isEdit; else operatingelseTemplate">
         <nz-range-picker [ngModel]="[detailData?.operatingStartTime,detailData?.operatingEndTime]"
           (ngModelChange)="changeTime($event)"></nz-range-picker>
       </ng-container>
-      <ng-template #elseTemplate>
+      <ng-template #operatingelseTemplate>
         <div *ngIf="!!detailData?.operatingStartTime && !!detailData?.operatingEndTime">
           {{ detailData?.operatingStartTime }} 至 {{ detailData?.operatingEndTime }}
         </div>
@@ -143,10 +143,10 @@
       </ng-template>
     </sv>
     <sv label="公司所在地" col="3">
-      <ng-container *ngIf="!isEdit; else elseTemplate">
-        <nz-cascader [nzLoadData]="loadData" (ngModelChange)="changeCascader($event)"></nz-cascader>
+      <ng-container *ngIf="isEdit; else cascaderelseTemplate">
+        <nz-cascader [(ngModel)]="values" [nzLoadData]="loadData" (ngModelChange)="changeCascader($event)"></nz-cascader>
       </ng-container>
-      <ng-template #elseTemplate>
+      <ng-template #cascaderelseTemplate>
         {{ detailData?.fullRegionVO?.provinceName }}{{ detailData?.fullRegionVO?.cityName }}{{
         detailData?.fullRegionVO?.areaName }}
       </ng-template>
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 05d969fe..0c589129 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
@@ -46,11 +46,12 @@ export class FreightComponentsEnterpriseAuditViewComponent implements OnInit {
 
   uploadURl = apiConf.waterFileUpload;
   disabledUpload = false;
+
+  values: string[] | null = null;
   constructor(private nzModalService: NzModalService, public service: UsermanageService, private route: ActivatedRoute) {}
 
   ngOnInit() {
     this.initData();
-    this.loadData({}, 0).then(res => console.log(res));
     // this.launchSign();
   }
 
@@ -159,21 +160,19 @@ export class FreightComponentsEnterpriseAuditViewComponent implements OnInit {
     return this.service.request(this.service.$api_get_region_by_code, { regionCode });
   }
 
-  loadData(node: any, index: number): PromiseLike<void> {
+  loadData = (node: any, index: number) => {
     return new Promise(resolve => {
       this.getRegionDetailByCode(node?.regionCode || '').subscribe(
         res => {
-          console.log(1);
-
-          node.children = res.map((item: any) => ({ ...item, isLeaf: index === 1 }));
+          node.children = res.map((item: any) => ({ ...item, isLeaf: index === 1, value: item.regionCode, label: item.name }));
         },
         _ => {},
         () => {
-          resolve();
+          resolve(node);
         }
       );
     });
-  }
+  };
 
   reset() {
     this.detailData = { ...this.tempalateData };
diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json
index 15f3aad9..15614a17 100644
--- a/src/assets/mocks/menu-data.json
+++ b/src/assets/mocks/menu-data.json
@@ -32,7 +32,7 @@
               "link": "/demo/zorro",
               "children": [
                 {
-                  "text": "货主列表",
+                  "text": "企业列表",
                   "icon": "anticon anticon-dashboard",
                   "link": "/usercenter/freight/list"
                 },