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

src/app/routes/partner/advice-feedback/components/feedback-detail/feedback-detail.component.less

@@ -1,27 +1,29 @@
 :host {
   .head-box {
     img {
-      width: 80px;
+      width  : 80px;
-      height: 80px;
+      height : 80px;
       padding: 8px;
     }
-    .right-h{
+
+    .right-h {
       font-size: 16px;
     }
-    .right-s{
+
+    .right-s {
       color: #7f7f7f;
     }
 
     .left-rt {
       font-weight: bold;
-      font-size: 16px;
+      font-size  : 16px;
-      text-align: right;
+      text-align : right;
     }
 
     .left-rb {
-      display: flex;
+      display        : flex;
-      justify-content: end;
+      justify-content: flex-end;
-      padding-top: 16px;
+      padding-top    : 16px;
     }
   }
 }

src/app/routes/partner/claim-audit/components/channel-detail/channel-detail.component.less

@@ -20,7 +20,7 @@
 
     .left-rb {
       display: flex;
-      justify-content: end;
+      justify-content: flex-end;
       padding-top: 16px;
     }
   }

src/app/routes/partner/claim-audit/components/partner-detail/partner-detail.component.less

@@ -1,26 +1,29 @@
 :host {
   .head-box {
     img {
-      width: 80px;
+      width  : 80px;
-      height: 80px;
+      height : 80px;
       padding: 8px;
     }
-    .right-h{
+
+    .right-h {
       font-size: 16px;
     }
-    .right-s{
+
+    .right-s {
       color: #7f7f7f;
     }
+
     .left-rt {
       font-weight: bold;
-      font-size: 16px;
+      font-size  : 16px;
-      text-align: right;
+      text-align : right;
     }
 
     .left-rb {
-      display: flex;
+      display        : flex;
-      justify-content: end;
+      justify-content: flex-end;
-      padding-top: 16px;
+      padding-top    : 16px;
     }
   }
-}
+}

src/app/routes/partner/partner-list/components/index/partner-list.component.html

@@ -3,15 +3,11 @@
 <nz-card class="search-box" nzBordered>
   <div nz-row nzGutter="8">
     <div nz-col [nzXl]="_$expand ? 24 : 17" [nzLg]="24" [nzSm]="24" [nzXs]="24">
-      <sf
+      <sf #sf [schema]="searchSchema" [ui]="{ '*': { spanLabelFixed: 110, grid: { lg: 8, md: 12, sm: 12, xs: 24 } } }"
-        #sf
+        [compact]="true" [button]="'none'"></sf>
-        [schema]="searchSchema"
-        [ui]="{ '*': { spanLabelFixed: 110, grid: { lg: 8, md: 12, sm: 12, xs: 24 } } }"
-        [compact]="true"
-        [button]="'none'"
-      ></sf>
     </div>
-    <div nz-col [nzXl]="_$expand ? 24 : 7" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right" [class.expend-options]="_$expand">
+    <div nz-col [nzXl]="_$expand ? 24 : 7" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right"
+      [class.expend-options]="_$expand">
       <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
       <button nz-button (click)="resetSF()">重置</button>
       <button nz-button nzType="link" (click)="expandToggle()">
@@ -25,27 +21,21 @@
 <nz-card class="content-box" nzBordered>
   <div class="d-flex align-items-center mb-md mt-md">
     <button nz-button (click)="this.routeTo('/partner/partner-list/add-etp-partner')" nzType="primary">新增企业合伙人</button>
-    <button nz-button (click)="this.routeTo('/partner/partner-list/add-personal-partner')" nzType="primary">新增个人合伙人</button>
+    <button nz-button (click)="this.routeTo('/partner/partner-list/add-personal-partner')"
+      nzType="primary">新增个人合伙人</button>
   </div>
 
-  <st
+  <st #st [data]="service.$api_get_partner_page" [columns]="columns" [req]="{ process: beforeReq }"
-    #st
+    [loading]="service.http.loading" [scroll]="{ x: '1200px' }" [page]="{}">
-    [data]="service.$api_get_partner_page"
-    [columns]="columns"
-    [req]="{ process: beforeReq }"
-    [loading]="service.http.loading"
-    [scroll]="{ x: '1200px' }"
-    [page]="{}"
-  >
   </st>
 </nz-card>
 
 <ng-template #editTemplate>
   <div nz-row nzGutter="8">
     <div nz-col nzSpan="24" se-container [labelWidth]="120">
-      <se [col]="1" label="合伙人名称"> 深圳某某有限公司 </se>
+      <se [col]="1" label="合伙人名称"> {{selectItem?.enterpriseName}} </se>
       <se [col]="1" label="返佣模板" required>
-        <nz-select ngModel="lucy" style="width: 100%">
+        <nz-select [(ngModel)]="templateId" style="width: 100%">
           <nz-option nzValue="jack" nzLabel="Jack"></nz-option>
           <nz-option nzValue="lucy" nzLabel="Lucy"></nz-option>
         </nz-select>
@@ -94,7 +84,5 @@
       </se>
     </div>
   </div>
-  <p class="text-center mt-md"
+  <p class="text-center mt-md">客户转移：客户跟着上级合伙人转移一并到新渠道销售下，会同步发起CRM《客户转移》流程；不转移的，客户会与上级合伙人解绑，成为渠道销售的直客</p>
-    >客户转移：客户跟着上级合伙人转移一并到新渠道销售下，会同步发起CRM《客户转移》流程；不转移的，客户会与上级合伙人解绑，成为渠道销售的直客</p
+</ng-template>
-  >
-</ng-template>

src/app/routes/partner/partner-list/components/index/partner-list.component.ts

@@ -24,11 +24,14 @@ export class PartnerListComponent {
 
   @ViewChild('editTemplate', { static: true })
   editTemplate: any;
+  templateId: any;
 
   @ViewChild('editCannel', { static: true })
   editCannel: any;
   customers: any[] = [];
 
+  selectItem: any = {};
+
   constructor(public service: PartnerListService, private nzModalService: NzModalService, private router: Router) {}
 
   beforeReq = (requestOptions: STRequestOptions) => {
@@ -46,12 +49,13 @@ export class PartnerListComponent {
     const modal = this.nzModalService.create({
       nzTitle: '审核',
       nzContent: PartnerAuditModalComponent,
-      nzComponentParams: { info: item },
+      nzComponentParams: { info: { ...item, enterpriseName: item.enterpriseName || item.contactName } },
       nzFooter: null
     });
   }
 
   editTemplateAction(item: any) {
+    this.selectItem = item;
     const modal = this.nzModalService.create({
       nzTitle: '修改返佣模板',
       nzContent: this.editTemplate,
@@ -66,24 +70,36 @@ export class PartnerListComponent {
     const modal = this.nzModalService.confirm({
       nzTitle: '确定要修改返佣模板吗？',
       nzOnOk: () => {
-        this.nzModalService.closeAll();
+        this.service
-      }
+          .request(this.service.$api_update_partner_template, {
-    });
+            id: this.selectItem.id,
-  }
+            templateId: this.templateId
-
+          })
-  editCannelAction(item: any) {
+          .subscribe(res => {
-    const modal = this.nzModalService.create({
+            if (res) {
-      nzTitle: '修改返佣模板',
+              this.service.msgSrv.success('修改成功');
-      nzWidth: 650,
+              this.nzModalService.closeAll();
-      nzContent: this.editCannel,
+            }
-      nzOnOk: () => {
+          });
-        this.confirmEditCannel();
         return false;
       }
     });
   }
 
-  confirmEditCannel() {
+  editCannelAction(item: any) {
+    this.selectItem = item;
+    const modal = this.nzModalService.create({
+      nzTitle: '修改渠道销售',
+      nzWidth: 650,
+      nzContent: this.editCannel,
+      nzOnOk: () => {
+        this.confirmEditCannel(item);
+        return false;
+      }
+    });
+  }
+
+  confirmEditCannel(item: any) {
     const modal = this.nzModalService.confirm({
       nzTitle: '确定提交吗？',
       nzOnOk: () => {
@@ -92,6 +108,29 @@ export class PartnerListComponent {
     });
   }
 
+  /**
+   * 重新发起crm
+   * @param item
+   */
+  reSendCRM(item: any) {
+    const modal = this.nzModalService.confirm({
+      nzTitle: '是否确定重新发起CRM？',
+      nzOnOk: () => {
+        this.service
+          .request(this.service.$api_resend_crm, {
+            id: item.id
+          })
+          .subscribe(res => {
+            if (res) {
+              this.service.msgSrv.success('发起成功');
+            } else {
+              this.service.msgSrv.warning('发起失败');
+            }
+          });
+      }
+    });
+  }
+
   routeTo(route: string) {
     this.router.navigate([route]);
   }
@@ -261,15 +300,15 @@ export class PartnerListComponent {
 
   private initST(): STColumn[] {
     return [
-      { title: '合伙人名称', index: 'enterpriseName', width: 180 },
+      { title: '合伙人名称', index: 'enterpriseName', width: 180, format: item => `${item.enterpriseName || item.contactName}` },
-      { title: '付款编码', index: 'ltdName', width: 160 },
+      { title: '付款编码', index: 'payCode', width: 160 },
       { title: '邀请码', index: 'invitationCode', className: 'text-center', width: 130 },
       { title: '企业管理员', index: 'contactName', width: 150 },
       { title: '手机号', index: 'contactMobile', className: 'text-center', width: 150 },
       { title: '类型', index: 'partnerType', className: 'text-center', width: 130, type: 'enum', enum: { 1: '企业', 2: '个人' } },
-      { title: '注册渠道', index: 'payDate', type: 'date', width: 130 },
+      { title: '注册渠道', index: 'source', type: 'enum', enum: { 1: '合伙人注册', 2: '平台添加' }, width: 130 },
       { title: '注册时间', index: 'createTime', className: 'text-center', width: 170 },
-      { title: '渠道销售', index: 'payDate', width: 170 },
+      { title: '渠道销售', index: 'channelId', width: 170 },
       { title: '返佣模板', index: 'templateName', width: 150 },
       {
         title: '认证审核状态',
@@ -325,7 +364,7 @@ export class PartnerListComponent {
         buttons: [
           { type: 'divider' },
           {
-            text: '详情<br>',
+            text: '详情',
             click: item => {
               if (item.partnerType === 1) {
                 this.router.navigate([`/partner/partner-list/etp-detail/${item.appUserId}`]);
@@ -334,6 +373,10 @@ export class PartnerListComponent {
               }
             }
           },
+          {
+            text: '审核<br>',
+            click: item => this.auditPartner(item)
+          },
           {
             text: '修改返佣模板',
             click: item => this.editTemplateAction(item)
@@ -342,13 +385,9 @@ export class PartnerListComponent {
             text: '修改渠道销售',
             click: item => this.editCannelAction(item)
           },
-          {
-            text: '审核<br>',
-            click: item => this.auditPartner(item)
-          },
           {
             text: '重发CRM流程',
-            click: item => this.router.navigate([`/partner/account-management/list/detail/${item.id}`])
+            click: item => this.reSendCRM(item)
           }
         ]
       }

src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.html

@@ -3,5 +3,5 @@
 </div>
 <div class="modal-footer">
     <button nz-button type="button" (click)="close()">取消</button>
-    <button nz-button type="button" nzType="primary" (click)="sure()" [disabled]="!sf.valid">保存</button>
+    <button nz-button type="button" nzType="primary" (click)="sure()" [disabled]="!sf.valid">确定</button>
 </div>

src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts

@@ -34,7 +34,7 @@ export class PartnerAuditModalComponent implements OnInit {
           title: '合伙人名称',
           type: 'string',
           ui: { widget: 'text' },
-          default: user.name
+          default: user.enterpriseName
         },
         status: {
           title: '审核结果',
@@ -50,7 +50,7 @@ export class PartnerAuditModalComponent implements OnInit {
           },
           default: true
         },
-        a: {
+        channelId: {
           title: '渠道销售',
           type: 'string',
           enum: [
@@ -70,7 +70,7 @@ export class PartnerAuditModalComponent implements OnInit {
           },
           default: ''
         },
-        b: {
+        approvalOpinion: {
           title: '备注',
           type: 'string',
           maxLength: 100,
@@ -88,43 +88,41 @@ export class PartnerAuditModalComponent implements OnInit {
           }
         }
       },
-      required: ['a', 'b']
+      required: ['channelId', 'approvalOpinion']
     };
   }
 
   sure() {
-    this.nzModalService.confirm({
+    if (this.info.isPass || this.sf.value.status) {
-      nzTitle: `确定以“${this.info.userName}/${this.info.mobile}”的名义重新发起CRM《付款对象合同管理》吗？`,
+      this.nzModalService.confirm({
-      nzOnOk: () => {
+        nzTitle: `确定以“${this.info.channelIdLabel}”的名义重新发起CRM《付款对象合同管理》吗？`,
-        this.close();
+        nzOnOk: () => {
-      }
+          this.audit();
-    });
+        }
-    // if (!this.sf.value.roleId || this.sf.value.roleId.length === 0) {
+      });
-    //   this.service.msgSrv.error('员工角色不能为空！');
+    } else {
-    //   return;
+      this.audit();
-    // }
+    }
-    // if (this.i.userId === 0) {
+  }
-    //   const params: any = {
+
-    //     ...this.sf.value
+  audit() {
-    //   };
+    const params: any = {
-    //   this.service.request(this.service.$api_add_staff, params).subscribe(res => {
+      ...this.sf.value,
-    //     if (res) {
+      id: this.info.id,
-    //       this.service.msgSrv.success('保存成功！');
+      auditStatusEnum: this.info.isPass || this.sf.value.status ? '20' : '30'
-    //       this.modal.close(true);
+    };
-    //     }
+    this.service
-    //   });
+      .request(this.service.$api_audit_partner, {
-    // } else {
+        auditStatusEnum: params.auditStatusEnum,
-    //   const params: any = {
+        id: params.id,
-    //     appUserId: this.i.appUserId,
+        approvalOpinion: params.approvalOpinion
-    //     ...this.sf.value
+      })
-    //   };
+      .subscribe(res => {
-    //   this.service.request(this.service.$api_edit_staff, params).subscribe(res => {
+        if (res) {
-    //     if (res) {
+          this.service.msgSrv.success('审核成功！');
-    //       this.service.msgSrv.success('编辑成功！');
+          this.close();
-    //       this.modal.close(true);
+        }
-    //     }
+      });
-    //   });
-    // }
   }
 
   close() {

src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html

@@ -29,7 +29,7 @@
             <div nz-row>
               <div nz-col [nzLg]="12" [nzSm]="24" [nzXs]="24"> 注册时间：{{ detailData?.createTime }} </div>
               <div nz-col [nzLg]="12" [nzSm]="24" [nzXs]="24">
-                所属城市：{{ detailData?.cityCodesList?.provinceName }}{{ detailData?.cityCodesList?.cityName }}
+                所属城市：{{enterpriseDefaultCityName}}
               </div>
             </div>
           </div>
@@ -45,32 +45,14 @@
               <button [disabled]="service.http.loading" nz-button nzDanger (click)="auditPartner(false)"> 驳回 </button>
             </ng-container>
             <ng-container *ngIf="detailData?.approvalStatus != 10">
-              <button
+              <button [disabled]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="enable"
-                [disabled]="service.http.loading"
+                (nzOnConfirm)="freezeOrResume(0)" nzPopconfirmPlacement="bottomRight" *ngIf="detailData?.stateLocked"
-                nz-button
+                acl [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-lock']">
-                nzDanger
-                nz-popconfirm
-                [nzPopconfirmTitle]="enable"
-                (nzOnConfirm)="freezeOrResume(0)"
-                nzPopconfirmPlacement="bottomRight"
-                *ngIf="detailData?.stateLocked"
-                acl
-                [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-lock']"
-              >
                 启用
               </button>
-              <button
+              <button [disabled]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="frozen"
-                [disabled]="service.http.loading"
+                (nzOnConfirm)="freezeOrResume(1)" nzPopconfirmPlacement="bottomRight" *ngIf="!detailData?.stateLocked"
-                nz-button
+                acl [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-lock']">
-                nzDanger
-                nz-popconfirm
-                [nzPopconfirmTitle]="frozen"
-                (nzOnConfirm)="freezeOrResume(1)"
-                nzPopconfirmPlacement="bottomRight"
-                *ngIf="!detailData?.stateLocked"
-                acl
-                [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-lock']"
-              >
                 冻结
               </button>
             </ng-container>
@@ -82,21 +64,17 @@
   </ng-template>
 
   <ng-template #frozen>
-    <ng-container
+    <ng-container *ngTemplateOutlet="
-      *ngTemplateOutlet="
         PopconfirmTempalte;
-        context: { title: '确定冻结该企业吗？', content: '停用后，该企业将被限制使用，不限于访问受限、无法发布货源等，请谨慎操作' }
+        context: { title: '确定冻结该合伙人吗？', content: '停用后，该合伙人将被限制使用，不限于访问受限、邀请客户、佣金收益等，请谨慎操作' }
-      "
+      ">
-    >
     </ng-container>
   </ng-template>
   <ng-template #enable>
-    <ng-container
+    <ng-container *ngTemplateOutlet="
-      *ngTemplateOutlet="
         PopconfirmTempalte;
-        context: { title: '确定启用该企业吗？', content: '启用后，该企业将恢复正常使用功能，请再次确认' }
+        context: { title: '确定启用该合伙人吗？', content: '启用后，该该合伙人将恢复正常使用功能，请再次确认' }
-      "
+      ">
-    >
     </ng-container>
   </ng-template>
 </page-header-wrapper>
@@ -105,39 +83,20 @@
   <sv-container col="3">
     <sv-title>企业管理员信息</sv-title>
     <sv label="姓名">
-      <input
+      <input nz-input type="text" [(ngModel)]="detailData.adminUserInfo.name" [readonly]="!isEdit"
-        nz-input
+        [nzBorderless]="!isEdit" [placeholder]="isEdit ? '' : '-'" />
-        type="text"
-        [(ngModel)]="detailData.adminUserInfo.name"
-        [readonly]="!isEdit"
-        [nzBorderless]="!isEdit"
-        [placeholder]="isEdit ? '' : '-'"
-      />
     </sv>
     <sv label="手机号">
-      <input
+      <input nz-input type="text" [(ngModel)]="detailData.adminUserInfo.mobile" [readonly]="!isEdit"
-        nz-input
+        [nzBorderless]="!isEdit" [placeholder]="isEdit ? '' : '-'" />
-        type="text"
-        [(ngModel)]="detailData.adminUserInfo.mobile"
-        [readonly]="!isEdit"
-        [nzBorderless]="!isEdit"
-        [placeholder]="isEdit ? '' : '-'"
-      />
     </sv>
     <sv label="身份证号">
-      <input
+      <input nz-input type="text" [(ngModel)]="detailData.adminUserInfo.certificateNumber" [readonly]="!isEdit"
-        nz-input
+        [nzBorderless]="!isEdit" [placeholder]="isEdit ? '' : '-'" />
-        type="text"
-        [(ngModel)]="detailData.adminUserInfo.certificateNumber"
-        [readonly]="!isEdit"
-        [nzBorderless]="!isEdit"
-        [placeholder]="isEdit ? '' : '-'"
-      />
     </sv>
     <sv label="身份证照" col="2">
       <div class="d-flex">
-        <ng-container
+        <ng-container *ngTemplateOutlet="
-          *ngTemplateOutlet="
             uploadTemplate;
             context: {
               data: detailData?.adminUserInfo,
@@ -146,11 +105,9 @@
               key2: 'certificatePhotoFront',
               hover: 'certificateBackFront'
             }
-          "
+          ">
-        >
         </ng-container>
-        <ng-container
+        <ng-container *ngTemplateOutlet="
-          *ngTemplateOutlet="
             uploadTemplate;
             context: {
               data: detailData?.adminUserInfo,
@@ -159,44 +116,24 @@
               key2: 'certificatePhotoBack',
               hover: 'certificateBack'
             }
-          "
+          ">
-        >
         </ng-container>
       </div>
     </sv>
     <sv label="身份证有效期" col="1">
-      <nz-date-picker
+      <nz-date-picker [(ngModel)]="detailData.operatingStartTime" [nzDisabled]="!isEdit" nzPlaceHolder=" "
-        [(ngModel)]="detailData.operatingStartTime"
+        [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''" style="width: 100px" class="calendar">
-        [nzDisabled]="!isEdit"
-        nzPlaceHolder=" "
-        [nzBorderless]="!isEdit"
-        [nzSuffixIcon]="isEdit ? 'calendar' : ''"
-        style="width: 100px"
-        class="calendar"
-      >
       </nz-date-picker>
       -
       <ng-container *ngIf="!isEdit && !detailData?.operatingEndTime && detailData?.operatingStartTime">
         <label style="padding-left: 11px">长期</label>
       </ng-container>
-      <nz-date-picker
+      <nz-date-picker [(ngModel)]="detailData.operatingEndTime" [nzDisabled]="!isEdit" nzPlaceHolder=" "
-        [(ngModel)]="detailData.operatingEndTime"
+        [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''" style="width: 100px" class="calendar">
-        [nzDisabled]="!isEdit"
-        nzPlaceHolder=" "
-        [nzBorderless]="!isEdit"
-        [nzSuffixIcon]="isEdit ? 'calendar' : ''"
-        style="width: 100px"
-        class="calendar"
-      >
       </nz-date-picker>
       <ng-container *ngIf="isEdit">
-        <label
+        <label nz-checkbox [ngModel]="!!!detailData.operatingEndTime"
-          nz-checkbox
+          (ngModelChange)="$event ? (detailData.operatingEndTime = '') : ''" class="ml-sm">长期</label>
-          [ngModel]="!!!detailData.operatingEndTime"
-          (ngModelChange)="$event ? (detailData.operatingEndTime = '') : ''"
-          class="ml-sm"
-          >长期</label
-        >
       </ng-container>
     </sv>
   </sv-container>
@@ -205,91 +142,58 @@
   <sv-container col="3" class="mt16">
     <sv-title>
       <label class="mr-md">企业基本信息</label>
-      <label *ngIf="detailData?.approvalStatus === 10" style="color: #1890ff"
+      <label *ngIf="detailData?.approvalStatus === 10" style="color: #1890ff"><i nz-icon nzType="info-circle"
-        ><i nz-icon nzType="info-circle" nzTheme="fill" class="mr-xs"></i>待审核
+          nzTheme="fill" class="mr-xs"></i>待审核
       </label>
-      <label *ngIf="detailData?.approvalStatus === 20" style="color: #52c41a"
+      <label *ngIf="detailData?.approvalStatus === 20" style="color: #52c41a"><i nz-icon nzType="check-circle"
-        ><i nz-icon nzType="check-circle" nzTheme="fill" class="mr-xs"></i>审核通过
+          nzTheme="fill" class="mr-xs"></i>审核通过
       </label>
-      <label *ngIf="detailData?.approvalStatus === 30" style="color: #ff4d4f"
+      <label *ngIf="detailData?.approvalStatus === 30" style="color: #ff4d4f"><i nz-icon nzType="close-circle"
-        ><i nz-icon nzType="close-circle" nzTheme="fill" class="mr-xs"></i>驳回&nbsp;驳回原因:{{ detailData?.approvalOpinion }}
+          nzTheme="fill" class="mr-xs"></i>驳回&nbsp;驳回原因:{{ detailData?.approvalOpinion }}
       </label>
       <p style="margin-bottom: 0">
         四要素验证：
-        <label *ngIf="detailData?.esignCheckStatus === 0" style="color: #ff4d4f"
+        <label *ngIf="detailData?.esignCheckStatus === 0" style="color: #ff4d4f"><i nz-icon nzType="info-circle"
-          ><i nz-icon nzType="info-circle" nzTheme="fill" class="mr-xs"></i>不通过&nbsp;&nbsp;驳回原因:{{ detailData?.esignCheckMsg }}
+            nzTheme="fill" class="mr-xs"></i>不通过&nbsp;&nbsp;驳回原因:{{ detailData?.esignCheckMsg }}
         </label>
-        <label *ngIf="detailData?.esignCheckStatus === 1" style="color: #52c41a"
+        <label *ngIf="detailData?.esignCheckStatus === 1" style="color: #52c41a"><i nz-icon nzType="check-circle"
-          ><i nz-icon nzType="check-circle" nzTheme="fill" class="mr-xs"></i>通过
+            nzTheme="fill" class="mr-xs"></i>通过
         </label>
-        <label *ngIf="detailData?.esignCheckStatus === 2" style="color: #1890ff"
+        <label *ngIf="detailData?.esignCheckStatus === 2" style="color: #1890ff"><i nz-icon nzType="close-circle"
-          ><i nz-icon nzType="close-circle" nzTheme="fill" class="mr-xs"></i>未认证
+            nzTheme="fill" class="mr-xs"></i>未认证
         </label>
       </p>
     </sv-title>
     <sv label="公司名称">
-      <input
+      <input nz-input type="text" [(ngModel)]="detailData.enterpriseName" [readonly]="!isEdit" [nzBorderless]="!isEdit"
-        nz-input
+        [placeholder]="isEdit ? '' : '-'" />
-        type="text"
-        [(ngModel)]="detailData.enterpriseName"
-        [readonly]="!isEdit"
-        [nzBorderless]="!isEdit"
-        [placeholder]="isEdit ? '' : '-'"
-      />
     </sv>
     <sv label="统一社会信用代码">
-      <input
+      <input nz-input type="text" [(ngModel)]="detailData.unifiedSocialCreditCode" [readonly]="!isEdit"
-        nz-input
+        [nzBorderless]="!isEdit" [placeholder]="isEdit ? '' : '-'" />
-        type="text"
-        [(ngModel)]="detailData.unifiedSocialCreditCode"
-        [readonly]="!isEdit"
-        [nzBorderless]="!isEdit"
-        [placeholder]="isEdit ? '' : '-'"
-      />
     </sv>
     <sv label="营业执照" col="2">
-      <ng-container
+      <ng-container *ngTemplateOutlet="
-        *ngTemplateOutlet="
           uploadTemplate;
           context: { data: detailData, status: isEdit, key: 'licensePhotoWatermark', key2: 'licensePhoto', hover: 'detailPhoto' }
-        "
+        ">
-      >
       </ng-container>
     </sv>
 
     <sv label="营业期限" col="1">
-      <nz-date-picker
+      <nz-date-picker [(ngModel)]="detailData.operatingStartTime" [nzDisabled]="!isEdit" nzPlaceHolder=" "
-        [(ngModel)]="detailData.operatingStartTime"
+        [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''" style="width: 100px" class="calendar">
-        [nzDisabled]="!isEdit"
-        nzPlaceHolder=" "
-        [nzBorderless]="!isEdit"
-        [nzSuffixIcon]="isEdit ? 'calendar' : ''"
-        style="width: 100px"
-        class="calendar"
-      >
       </nz-date-picker>
       -
       <ng-container *ngIf="!isEdit && !detailData?.operatingEndTime && detailData?.operatingStartTime">
         <label style="padding-left: 11px">长期</label>
       </ng-container>
-      <nz-date-picker
+      <nz-date-picker [(ngModel)]="detailData.operatingEndTime" [nzDisabled]="!isEdit" nzPlaceHolder=" "
-        [(ngModel)]="detailData.operatingEndTime"
+        [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''" style="width: 100px" class="calendar">
-        [nzDisabled]="!isEdit"
-        nzPlaceHolder=" "
-        [nzBorderless]="!isEdit"
-        [nzSuffixIcon]="isEdit ? 'calendar' : ''"
-        style="width: 100px"
-        class="calendar"
-      >
       </nz-date-picker>
       <ng-container *ngIf="isEdit">
-        <label
+        <label nz-checkbox [ngModel]="!!!detailData.operatingEndTime"
-          nz-checkbox
+          (ngModelChange)="$event ? (detailData.operatingEndTime = '') : ''" class="ml-sm">长期</label>
-          [ngModel]="!!!detailData.operatingEndTime"
-          (ngModelChange)="$event ? (detailData.operatingEndTime = '') : ''"
-          class="ml-sm"
-          >长期</label
-        >
       </ng-container>
     </sv>
   </sv-container>
@@ -297,62 +201,33 @@
   <sv-container col="3" class="mt16">
     <sv-title>企业法人信息</sv-title>
     <sv label="法定代表人">
-      <input
+      <input nz-input type="text" [(ngModel)]="detailData.legalPersonIdentity.name" [readonly]="!isEdit"
-        nz-input
+        [nzBorderless]="!isEdit" [placeholder]="isEdit ? '' : '-'" />
-        type="text"
-        [(ngModel)]="detailData.legalPersonIdentity.name"
-        [readonly]="!isEdit"
-        [nzBorderless]="!isEdit"
-        [placeholder]="isEdit ? '' : '-'"
-      />
     </sv>
     <sv label="身份证号码">
-      <input
+      <input nz-input type="text" [(ngModel)]="detailData.legalPersonIdentity.certificateNumber" [readonly]="!isEdit"
-        nz-input
+        [nzBorderless]="!isEdit" [placeholder]="isEdit ? '' : '-'" />
-        type="text"
-        [(ngModel)]="detailData.legalPersonIdentity.certificateNumber"
-        [readonly]="!isEdit"
-        [nzBorderless]="!isEdit"
-        [placeholder]="isEdit ? '' : '-'"
-      />
     </sv>
     <sv label="身份证有效期" col="1">
-      <nz-date-picker
+      <nz-date-picker [(ngModel)]="detailData.legalPersonIdentity.validStartTime" [nzDisabled]="!isEdit"
-        [(ngModel)]="detailData.legalPersonIdentity.validStartTime"
+        nzPlaceHolder=" " [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''" style="width: 100px"
-        [nzDisabled]="!isEdit"
+        class="calendar"></nz-date-picker>
-        nzPlaceHolder=" "
-        [nzBorderless]="!isEdit"
-        [nzSuffixIcon]="isEdit ? 'calendar' : ''"
-        style="width: 100px"
-        class="calendar"
-      ></nz-date-picker>
       -
-      <ng-container *ngIf="!isEdit && !detailData?.legalPersonIdentity?.validEndTime && detailData.legalPersonIdentity.validStartTime">
+      <ng-container
+        *ngIf="!isEdit && !detailData?.legalPersonIdentity?.validEndTime && detailData.legalPersonIdentity.validStartTime">
         <label style="padding-left: 11px">长期</label>
       </ng-container>
-      <nz-date-picker
+      <nz-date-picker [(ngModel)]="detailData.legalPersonIdentity.validEndTime" [nzDisabled]="!isEdit" nzPlaceHolder=" "
-        [(ngModel)]="detailData.legalPersonIdentity.validEndTime"
+        [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''" style="width: 100px" class="calendar">
-        [nzDisabled]="!isEdit"
+      </nz-date-picker>
-        nzPlaceHolder=" "
-        [nzBorderless]="!isEdit"
-        [nzSuffixIcon]="isEdit ? 'calendar' : ''"
-        style="width: 100px"
-        class="calendar"
-      ></nz-date-picker>
       <ng-container *ngIf="isEdit">
-        <label
+        <label nz-checkbox [ngModel]="!!!detailData.legalPersonIdentity.validEndTime"
-          nz-checkbox
+          (ngModelChange)="$event ? (detailData.legalPersonIdentity.validEndTime = '') : ''" class="ml-sm">长期</label>
-          [ngModel]="!!!detailData.legalPersonIdentity.validEndTime"
-          (ngModelChange)="$event ? (detailData.legalPersonIdentity.validEndTime = '') : ''"
-          class="ml-sm"
-          >长期</label
-        >
       </ng-container>
     </sv>
     <sv label="身份证照" col="1">
       <div class="d-flex">
-        <ng-container
+        <ng-container *ngTemplateOutlet="
-          *ngTemplateOutlet="
             uploadTemplate;
             context: {
               data: detailData?.legalPersonIdentity,
@@ -361,11 +236,9 @@
               key2: 'certificatePhotoFront',
               hover: 'legalFront'
             }
-          "
+          ">
-        >
         </ng-container>
-        <ng-container
+        <ng-container *ngTemplateOutlet="
-          *ngTemplateOutlet="
             uploadTemplate;
             context: {
               data: detailData?.legalPersonIdentity,
@@ -374,17 +247,20 @@
               key2: 'certificatePhotoBack',
               hover: 'legalBack'
             }
-          "
+          ">
-        >
         </ng-container>
       </div>
     </sv>
     <sv label="所属城市">
       <ng-container *ngIf="isEdit; else cascaderelseTemplate">
-        <nz-cascader [(ngModel)]="enterpriseAddressCode" [nzLoadData]="loadRegionData"> </nz-cascader>
+        <nz-tree-select #areaTreeSelect style="width: 350px" [(ngModel)]="enterpriseAddressCode"
+          [nzDropdownStyle]="{ 'max-height': '300px' }" [nzExpandedKeys]="enterpriseDefaultAddressCode"
+          [nzNodes]="areaList" [nzAsyncData]="true" [nzCheckStrictly]="true" nzCheckable
+          (nzExpandChange)="onExpandChange($event.node)" nzDropdownClassName="area-tree-select">
+        </nz-tree-select>
       </ng-container>
       <ng-template #cascaderelseTemplate>
-        {{ detailData?.fullRegionVO?.provinceName }}{{ detailData?.fullRegionVO?.cityName }}{{ detailData?.fullRegionVO?.areaName }}
+        {{ enterpriseDefaultCityName || '-' }}
       </ng-template>
     </sv>
   </sv-container>
@@ -392,9 +268,9 @@
   <nz-divider></nz-divider>
   <sv-container col="3" class="mt16">
     <sv-title>渠道销售信息</sv-title>
-    <sv label="姓名"> 张学友 </sv>
+    <sv label="姓名"> {{ detailData?.channelName }} </sv>
-    <sv label="手机号"> 13999999999 </sv>
+    <sv label="手机号"> {{ detailData?.channelMobile }} </sv>
-    <sv label="绑定时间"> 2021-09-23 14:43:31 </sv>
+    <sv label="绑定时间"> {{ detailData?.bindChannelTime }} </sv>
   </sv-container>
 </nz-card>
 
@@ -402,16 +278,8 @@
   <sv-container col="3" class="mt16">
     <sv-title>修改渠道销售记录</sv-title>
     <sv label="">
-      <st
+      <st #st [data]="service.$api_get_personal_channel_list" [columns]="columns.logsColumn"
-        #st
+        [loading]="service.http.loading" bordered size="small" [page]="{ show: false }" [scroll]="{ x: '1200px' }">
-        [data]="service.$api_get_personal_channel_list"
-        [columns]="columns.logsColumn"
-        [loading]="service.http.loading"
-        bordered
-        size="small"
-        [page]="{ show: false }"
-        [scroll]="{ x: '1200px' }"
-      >
       </st>
     </sv>
   </sv-container>
@@ -420,7 +288,8 @@
 <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 self-ant-popover-title" style="font-size: 16px">{{ title }}
+    </div>
     <div class="ant-popover-message-title ng-star-inserted">
       {{ content }}
     </div>
@@ -428,27 +297,15 @@
 </ng-template>
 
 <ng-template #uploadTemplate let-data="data" let-status="status" let-key="key" let-key2="key2" let-hover="hover">
-  <nz-upload
+  <nz-upload class="avatar-uploader" [nzAction]="uploadURl" nzName="multipartFile" nzListType="picture-card"
-    class="avatar-uploader"
+    [nzShowUploadList]="false" nzFileType="image/png,image/jpeg,image/jpg,image/gif"
-    [nzAction]="uploadURl"
+    [nzDisabled]="!isEdit || disabledUpload" (nzChange)="changeUpload($event, data, key, key2, hover)">
-    nzName="multipartFile"
-    nzListType="picture-card"
-    [nzShowUploadList]="false"
-    nzFileType="image/png,image/jpeg,image/jpg,image/gif"
-    [nzDisabled]="!isEdit || disabledUpload"
-    (nzChange)="changeUpload($event, data, key, key2, hover)"
-  >
     <ng-container *ngIf="!data[key] && isEdit">
       <i class="upload-icon" nz-icon [nzType]="service.http.loading ? 'loading' : 'plus'"></i>
       <div class="ant-upload-text">上传</div>
     </ng-container>
-    <div
+    <div *ngIf="data[key]" (mouseover)="detailData[hover] = true" (mouseleave)="detailData[hover] = false"
-      *ngIf="data[key]"
+      (click)="$event.cancelBubble = true" class="image-hover">
-      (mouseover)="detailData[hover] = true"
-      (mouseleave)="detailData[hover] = false"
-      (click)="$event.cancelBubble = true"
-      class="image-hover"
-    >
       <img [src]="data[key]" style="width: 200px; height: 160px" (click)="service.showImg(data[key])" />
       <div class="mask" *ngIf="detailData[hover] && isEdit"></div>
       <div class="mask-over" *ngIf="detailData[hover] && isEdit">
@@ -463,30 +320,14 @@
 
 <ng-template #logModal>
   <h2>转移客户数：10</h2>
-  <st
+  <st #st [data]="service.$mock_url" [columns]="columns.changeColumn" [loading]="service.http.loading" bordered
-    #st
+    size="small" [page]="{ show: false }" [scroll]="{ x: '750px' }">
-    [data]="service.$mock_url"
-    [columns]="columns.changeColumn"
-    [loading]="service.http.loading"
-    bordered
-    size="small"
-    [page]="{ show: false }"
-    [scroll]="{ x: '750px' }"
-  >
   </st>
   <h2>不转移客户数：10</h2>
-  <st
+  <st #st [data]="service.$mock_url" [columns]="columns.beChangeColumn" [loading]="service.http.loading" bordered
-    #st
+    size="small" [page]="{ show: false }" [scroll]="{ x: '750px' }">
-    [data]="service.$mock_url"
-    [columns]="columns.beChangeColumn"
-    [loading]="service.http.loading"
-    bordered
-    size="small"
-    [page]="{ show: false }"
-    [scroll]="{ x: '750px' }"
-  >
   </st>
   <p>
     客户转移：客户跟着上级合伙人转移一并到新渠道销售下，会同步发起CRM《客户转移》流程；不转移的，客户会与上级合伙人解绑，修改成功后，修改时间也是合伙人与客户的结算结束时间，成为原来渠道销售的直客。
   </p>
-</ng-template>
+</ng-template>

src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts

@@ -4,6 +4,8 @@ import { ActivatedRoute } from '@angular/router';
 import { apiConf } from '@conf/api.conf';
 import { STColumn } from '@delon/abc/st';
 import { NzModalService } from 'ng-zorro-antd/modal';
+import { NzFormatEmitEvent, NzTreeNode, NzTreeNodeOptions } from 'ng-zorro-antd/tree';
+import { NzTreeSelectComponent } from 'ng-zorro-antd/tree-select';
 import { Subscription, fromEvent } from 'rxjs';
 
 import { PartnerListService } from '../../services/partner-list.service';
@@ -18,6 +20,8 @@ import { PartnerAuditModalComponent } from '../partner-audit-modal/partner-audit
 export class PartnerDetailComponent implements OnInit, OnDestroy {
   @ViewChild('logModal')
   logModal: any;
+  @ViewChild('areaTreeSelect')
+  areaTreeSelect!: NzTreeSelectComponent;
 
   columns: { logsColumn: STColumn[]; changeColumn: STColumn[]; beChangeColumn: STColumn[] } = this.initST();
 
@@ -28,8 +32,10 @@ export class PartnerDetailComponent implements OnInit, OnDestroy {
 
   uploadURl = apiConf.waterFileUpload;
   disabledUpload = false;
-  enterpriseAddressCode: any = [];
+  enterpriseAddressCode: string[] = [];
-  ltdId: any = [];
+  enterpriseDefaultAddressCode: string[] = [];
+  enterpriseDefaultCityName: string = '';
+  areaList = [];
 
   esignCheckStatus: any = {
     0: '不通过',
@@ -51,17 +57,25 @@ export class PartnerDetailComponent implements OnInit, OnDestroy {
 
   ngOnInit() {
     this.initData();
-    this.loadltdId();
+    this.loadlAreaList();
     this.subscribeScoll = fromEvent(window, 'scroll').subscribe(event => {
       this.scrollTop = document.documentElement.scrollTop;
     });
   }
-  loadltdId() {
+
-    // this.service.getNetworkFreightForwarder().subscribe(res => {
+  loadlAreaList() {
-    //   if (res) {
+    this.service.request(this.service.$api_get_region_by_code, { regionCode: '' }).subscribe(res => {
-    //     this.ltdId = res;
+      if (res) {
-    //   }
+        this.areaList = res.map((item: any) => ({
-    // });
+          ...item,
+          isLeaf: false,
+          title: item.name,
+          key: item.regionCode.toString(),
+          disabled: true,
+          isDisableCheckbox: true
+        }));
+      }
+    });
   }
 
   initData() {
@@ -72,11 +86,23 @@ export class PartnerDetailComponent implements OnInit, OnDestroy {
       .subscribe(res => {
         if (res) {
           this.detailData = res;
-          console.log(this.detailData);
+          // 存储数据源
-
           this.tempalateData = { ...this.detailData };
-          if (this.detailData?.cityCodes) {
+          // 拼接所属城市
-            this.enterpriseAddressCode = JSON.parse(this.detailData.cityCodes);
+          if (this.detailData?.cityCodesList?.length > 0) {
+            this.enterpriseAddressCode = (this.detailData?.cityCodesList as any[]).map(city => city.cityCode);
+            this.enterpriseDefaultCityName = (this.detailData?.cityCodesList as any[]).map(city => city.cityName).join('、');
+            this.enterpriseDefaultAddressCode = [
+              ...new Set<string>((this.detailData?.cityCodesList as any[]).map(city => city.provinceCode))
+            ];
+          }
+          // 拼接渠道销售信息
+          if (this.detailData?.channelIdLabel) {
+            const channel = (this.detailData.channelIdLabel as string).split('/');
+            Object.assign(this.detailData, {
+              channelName: channel[0],
+              channelMobile: channel[1]
+            });
           }
         }
       });
@@ -89,23 +115,23 @@ export class PartnerDetailComponent implements OnInit, OnDestroy {
    * 冻结
    */
   freezeOrResume(type: number) {
-    // this.service.http
+    this.service.http
-    //   .post(this.service.$api_lock_freight, {
+      .post(this.service.$api_lock_freight, {
-    //     id: this.route.snapshot.params.id,
+        id: this.route.snapshot.params.id,
-    //     statedLocked: !!type
+        statedLocked: !!type
-    //   })
+      })
-    //   .subscribe(res => {
+      .subscribe(res => {
-    //     if (res.data === true) {
+        if (res.data === true) {
-    //       if (type === 0) {
+          if (type === 0) {
-    //         this.service.msgSrv.success(`启用成功！`);
+            this.service.msgSrv.success(`启用成功！`);
-    //       } else {
+          } else {
-    //         this.service.msgSrv.success(`冻结成功！`);
+            this.service.msgSrv.success(`冻结成功！`);
-    //       }
+          }
-    //       this.initData();
+          this.initData();
-    //     } else {
+        } else {
-    //       this.service.msgSrv.error(res.msg || '操作失败！');
+          this.service.msgSrv.error(res.msg || '操作失败！');
-    //     }
+        }
-    //   });
+      });
   }
 
   auditPartner(isPass: boolean) {
@@ -129,6 +155,18 @@ export class PartnerDetailComponent implements OnInit, OnDestroy {
 
   ratify() {
     this.isEdit = true;
+    // 搜索展开省份并选中节点
+    setTimeout(() => {
+      if (this.enterpriseDefaultAddressCode?.length > 0 && this.areaTreeSelect) {
+        this.enterpriseDefaultAddressCode.forEach(code => {
+          const node = this.areaTreeSelect.getTreeNodeByKey(code);
+          if (node) {
+            node.setExpanded(true);
+            this.onExpandChange(node);
+          }
+        });
+      }
+    }, 500);
   }
 
   deleteImg(data: any, key: string, key2: string) {
@@ -160,6 +198,25 @@ export class PartnerDetailComponent implements OnInit, OnDestroy {
     }
   }
 
+  onExpandChange(node: NzTreeNode | null | undefined): void {
+    if (node && node.getChildren().length === 0 && node.isExpanded) {
+      this.loadRegionData(node).then(data => {
+        node.addChildren(data);
+        // 更新选中数据
+        this.areaTreeSelect.updateSelectedNodes(true);
+        // 修改子节点选中状态
+        const children = node.getChildren();
+        if (children?.length > 0) {
+          children.forEach(childNode => {
+            if (this.enterpriseAddressCode.find(area => area === childNode.key)) {
+              childNode.setChecked(true);
+            }
+          });
+        }
+      });
+    }
+  }
+
   /**
    * 级联获取地区数据
    *
@@ -167,19 +224,28 @@ export class PartnerDetailComponent implements OnInit, OnDestroy {
    * @param index 层级
    * @returns
    */
-  loadRegionData = (node: any, index: number) => {
+  loadRegionData(node: NzTreeNode): Promise<NzTreeNodeOptions[]> {
+    let rs: any[] = [];
     return new Promise(resolve => {
-      this.service.request(this.service.$api_get_region_by_code, { regionCode: node?.regionCode || '' }).subscribe(
+      this.service.request(this.service.$api_get_region_by_code, { regionCode: node?.origin.regionCode || '' }).subscribe(
         res => {
-          node.children = res.map((item: any) => ({ ...item, isLeaf: index === 1, value: item.regionCode, label: item.name }));
+          rs = res.map((item: any) => ({
+            ...item,
+            isLeaf: true,
+            title: item.name,
+            key: item.regionCode.toString(),
+            isSelectable: true,
+            isSelected: true,
+            isChecked: true
+          }));
         },
         _ => {},
         () => {
-          resolve(node);
+          resolve(rs);
         }
       );
     });
-  };
+  }
 
   reset() {
     this.detailData = { ...this.tempalateData };
@@ -322,13 +388,13 @@ export class PartnerDetailComponent implements OnInit, OnDestroy {
   private initST(): { logsColumn: STColumn[]; changeColumn: STColumn[]; beChangeColumn: STColumn[] } {
     return {
       logsColumn: [
-        { title: '修改后渠道销售', index: 'newChannelId', width: 180 },
+        { title: '修改后渠道销售', index: 'newChannelName', width: 180 },
-        { title: '修改前渠道销售', index: 'originalChannelId', width: 160 },
+        { title: '修改前渠道销售', index: 'originalChannelName', width: 160 },
         { title: '转移客户数', index: 'quantity', className: 'text-center', width: 130 },
         { title: '生效节点', index: 'effectiveNode', width: 150, type: 'enum', enum: { 1: '立即生效', 2: 'CRM审核后生效' } },
         { title: '备注', index: 'remark', className: 'text-center', width: 150 },
-        { title: '修改时间', index: 'modifyTime', className: 'text-center', width: 130 },
+        { title: '修改时间', index: 'effectiveTime', className: 'text-center', width: 130, type: 'date' },
-        { title: '操作人', index: 'modifyUserId', type: 'date', width: 130 },
+        { title: '操作人', index: 'modifyUserId', width: 130 },
         {
           title: '操作',
           fixed: 'right',

src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.html

@@ -13,7 +13,7 @@
           <div style="flex: 1">
             <div nz-row>
               <div nz-col [nzLg]="12" [nzSm]="24" [nzXs]="24">
-                <p style="margin-bottom: 0">{{ detailData?.enterpriseName }}</p>
+                <p style="margin-bottom: 0">{{ detailData?.adminUserInfo?.name }}</p>
               </div>
               <div nz-col [nzLg]="12" [nzSm]="24" [nzXs]="24">
                 <nz-badge nzStatus="success" nzText="正常" *ngIf="detailData?.stateLocked === 0"> </nz-badge>
@@ -22,14 +22,14 @@
             </div>
             <div nz-row>
               <div nz-col [nzLg]="12" [nzSm]="24" [nzXs]="24">
-                <p>{{ detailData?.unifiedSocialCreditCode }}</p>
+                <p>{{ detailData?.adminUserInfo?.certificateNumber }}</p>
               </div>
               <div nz-col [nzLg]="12" [nzSm]="24" [nzXs]="24"> 个人合伙人 </div>
             </div>
             <div nz-row>
               <div nz-col [nzLg]="12" [nzSm]="24" [nzXs]="24"> 注册时间：{{ detailData?.createTime }} </div>
               <div nz-col [nzLg]="12" [nzSm]="24" [nzXs]="24">
-                所属城市：{{ detailData?.cityCodesList?.provinceName }}{{ detailData?.cityCodesList?.cityName }}
+                所属城市：{{enterpriseDefaultCityName}}
               </div>
             </div>
           </div>
@@ -45,32 +45,14 @@
               <button [disabled]="service.http.loading" nz-button nzDanger (click)="auditPartner(false)"> 驳回 </button>
             </ng-container>
             <ng-container *ngIf="detailData?.approvalStatus != 10">
-              <button
+              <button [disabled]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="enable"
-                [disabled]="service.http.loading"
+                (nzOnConfirm)="freezeOrResume(0)" nzPopconfirmPlacement="bottomRight" *ngIf="detailData?.stateLocked"
-                nz-button
+                acl [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-lock']">
-                nzDanger
-                nz-popconfirm
-                [nzPopconfirmTitle]="enable"
-                (nzOnConfirm)="freezeOrResume(0)"
-                nzPopconfirmPlacement="bottomRight"
-                *ngIf="detailData?.stateLocked"
-                acl
-                [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-lock']"
-              >
                 启用
               </button>
-              <button
+              <button [disabled]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="frozen"
-                [disabled]="service.http.loading"
+                (nzOnConfirm)="freezeOrResume(1)" nzPopconfirmPlacement="bottomRight" *ngIf="!detailData?.stateLocked"
-                nz-button
+                acl [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-lock']">
-                nzDanger
-                nz-popconfirm
-                [nzPopconfirmTitle]="frozen"
-                (nzOnConfirm)="freezeOrResume(1)"
-                nzPopconfirmPlacement="bottomRight"
-                *ngIf="!detailData?.stateLocked"
-                acl
-                [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-lock']"
-              >
                 冻结
               </button>
             </ng-container>
@@ -82,21 +64,17 @@
   </ng-template>
 
   <ng-template #frozen>
-    <ng-container
+    <ng-container *ngTemplateOutlet="
-      *ngTemplateOutlet="
+    PopconfirmTempalte;
-        PopconfirmTempalte;
+    context: { title: '确定冻结该合伙人吗？', content: '停用后，该合伙人将被限制使用，不限于访问受限、邀请客户、佣金收益等，请谨慎操作' }
-        context: { title: '确定冻结该企业吗？', content: '停用后，该企业将被限制使用，不限于访问受限、无法发布货源等，请谨慎操作' }
+  ">
-      "
-    >
     </ng-container>
   </ng-template>
   <ng-template #enable>
-    <ng-container
+    <ng-container *ngTemplateOutlet="
-      *ngTemplateOutlet="
+    PopconfirmTempalte;
-        PopconfirmTempalte;
+    context: { title: '确定启用该合伙人吗？', content: '启用后，该该合伙人将恢复正常使用功能，请再次确认' }
-        context: { title: '确定启用该企业吗？', content: '启用后，该企业将恢复正常使用功能，请再次确认' }
+  ">
-      "
-    >
     </ng-container>
   </ng-template>
 </page-header-wrapper>
@@ -105,72 +83,37 @@
   <sv-container col="3" class="mt16">
     <sv-title>合伙人信息</sv-title>
     <sv label="姓名">
-      <input
+      <input nz-input type="text" [(ngModel)]="detailData.adminUserInfo.name" [readonly]="!isEdit"
-        nz-input
+        [nzBorderless]="!isEdit" [placeholder]="isEdit ? '' : '-'" />
-        type="text"
-        [(ngModel)]="detailData.adminUserInfo.name"
-        [readonly]="!isEdit"
-        [nzBorderless]="!isEdit"
-        [placeholder]="isEdit ? '' : '-'"
-      />
     </sv>
     <sv label="手机号">
-      <input
+      <input nz-input type="text" [(ngModel)]="detailData.adminUserInfo.certificateNumber" [readonly]="!isEdit"
-        nz-input
+        [nzBorderless]="!isEdit" [placeholder]="isEdit ? '' : '-'" />
-        type="text"
-        [(ngModel)]="detailData.adminUserInfo.certificateNumber"
-        [readonly]="!isEdit"
-        [nzBorderless]="!isEdit"
-        [placeholder]="isEdit ? '' : '-'"
-      />
     </sv>
     <sv label="身份证号">
-      <input
+      <input nz-input type="text" [(ngModel)]="detailData.adminUserInfo.certificateNumber" [readonly]="!isEdit"
-        nz-input
+        [nzBorderless]="!isEdit" [placeholder]="isEdit ? '' : '-'" />
-        type="text"
-        [(ngModel)]="detailData.adminUserInfo.certificateNumber"
-        [readonly]="!isEdit"
-        [nzBorderless]="!isEdit"
-        [placeholder]="isEdit ? '' : '-'"
-      />
     </sv>
     <sv label="身份证有效期" col="1">
-      <nz-date-picker
+      <nz-date-picker [(ngModel)]="detailData.adminUserInfo.validStartTime" [nzDisabled]="!isEdit" nzPlaceHolder=" "
-        [(ngModel)]="detailData.adminUserInfo.validStartTime"
+        [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''" style="width: 100px" class="calendar">
-        [nzDisabled]="!isEdit"
+      </nz-date-picker>
-        nzPlaceHolder=" "
-        [nzBorderless]="!isEdit"
-        [nzSuffixIcon]="isEdit ? 'calendar' : ''"
-        style="width: 100px"
-        class="calendar"
-      ></nz-date-picker>
       -
-      <ng-container *ngIf="!isEdit && !detailData?.adminUserInfo?.validEndTime && detailData.adminUserInfo.validStartTime">
+      <ng-container
+        *ngIf="!isEdit && !detailData?.adminUserInfo?.validEndTime && detailData.adminUserInfo.validStartTime">
         <label style="padding-left: 11px">长期</label>
       </ng-container>
-      <nz-date-picker
+      <nz-date-picker [(ngModel)]="detailData.adminUserInfo.validEndTime" [nzDisabled]="!isEdit" nzPlaceHolder=" "
-        [(ngModel)]="detailData.adminUserInfo.validEndTime"
+        [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''" style="width: 100px" class="calendar">
-        [nzDisabled]="!isEdit"
+      </nz-date-picker>
-        nzPlaceHolder=" "
-        [nzBorderless]="!isEdit"
-        [nzSuffixIcon]="isEdit ? 'calendar' : ''"
-        style="width: 100px"
-        class="calendar"
-      ></nz-date-picker>
       <ng-container *ngIf="isEdit">
-        <label
+        <label nz-checkbox [ngModel]="!!!detailData.adminUserInfo.validEndTime"
-          nz-checkbox
+          (ngModelChange)="$event ? (detailData.adminUserInfo.validEndTime = '') : ''" class="ml-sm">长期</label>
-          [ngModel]="!!!detailData.adminUserInfo.validEndTime"
-          (ngModelChange)="$event ? (detailData.adminUserInfo.validEndTime = '') : ''"
-          class="ml-sm"
-          >长期</label
-        >
       </ng-container>
     </sv>
     <sv label="身份证照" col="1">
       <div class="d-flex">
-        <ng-container
+        <ng-container *ngTemplateOutlet="
-          *ngTemplateOutlet="
             uploadTemplate;
             context: {
               data: detailData?.adminUserInfo,
@@ -179,11 +122,9 @@
               key2: 'certificatePhotoFront',
               hover: 'legalFront'
             }
-          "
+          ">
-        >
         </ng-container>
-        <ng-container
+        <ng-container *ngTemplateOutlet="
-          *ngTemplateOutlet="
             uploadTemplate;
             context: {
               data: detailData?.adminUserInfo,
@@ -192,17 +133,20 @@
               key2: 'certificatePhotoBack',
               hover: 'legalBack'
             }
-          "
+          ">
-        >
         </ng-container>
       </div>
     </sv>
     <sv label="所属城市">
       <ng-container *ngIf="isEdit; else cascaderelseTemplate">
-        <nz-cascader [(ngModel)]="enterpriseAddressCode" [nzLoadData]="loadRegionData"> </nz-cascader>
+        <nz-tree-select #areaTreeSelect style="width: 350px" [(ngModel)]="enterpriseAddressCode"
+          [nzDropdownStyle]="{ 'max-height': '300px' }" [nzExpandedKeys]="enterpriseDefaultAddressCode"
+          [nzNodes]="areaList" [nzAsyncData]="true" [nzCheckStrictly]="true" nzCheckable
+          (nzExpandChange)="onExpandChange($event.node)" nzDropdownClassName="area-tree-select">
+        </nz-tree-select>
       </ng-container>
       <ng-template #cascaderelseTemplate>
-        {{ detailData?.fullRegionVO?.provinceName }}{{ detailData?.fullRegionVO?.cityName }}{{ detailData?.fullRegionVO?.areaName }}
+        {{ enterpriseDefaultCityName || '-' }}
       </ng-template>
     </sv>
   </sv-container>
@@ -211,7 +155,8 @@
 <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 self-ant-popover-title" style="font-size: 16px">{{ title }}
+    </div>
     <div class="ant-popover-message-title ng-star-inserted">
       {{ content }}
     </div>
@@ -219,27 +164,15 @@
 </ng-template>
 
 <ng-template #uploadTemplate let-data="data" let-status="status" let-key="key" let-key2="key2" let-hover="hover">
-  <nz-upload
+  <nz-upload class="avatar-uploader" [nzAction]="uploadURl" nzName="multipartFile" nzListType="picture-card"
-    class="avatar-uploader"
+    [nzShowUploadList]="false" nzFileType="image/png,image/jpeg,image/jpg,image/gif"
-    [nzAction]="uploadURl"
+    [nzDisabled]="!isEdit || disabledUpload" (nzChange)="changeUpload($event, data, key, key2, hover)">
-    nzName="multipartFile"
-    nzListType="picture-card"
-    [nzShowUploadList]="false"
-    nzFileType="image/png,image/jpeg,image/jpg,image/gif"
-    [nzDisabled]="!isEdit || disabledUpload"
-    (nzChange)="changeUpload($event, data, key, key2, hover)"
-  >
     <ng-container *ngIf="!data[key] && isEdit">
       <i class="upload-icon" nz-icon [nzType]="service.http.loading ? 'loading' : 'plus'"></i>
       <div class="ant-upload-text">上传</div>
     </ng-container>
-    <div
+    <div *ngIf="data[key]" (mouseover)="detailData[hover] = true" (mouseleave)="detailData[hover] = false"
-      *ngIf="data[key]"
+      (click)="$event.cancelBubble = true" class="image-hover">
-      (mouseover)="detailData[hover] = true"
-      (mouseleave)="detailData[hover] = false"
-      (click)="$event.cancelBubble = true"
-      class="image-hover"
-    >
       <img [src]="data[key]" style="width: 200px; height: 160px" (click)="service.showImg(data[key])" />
       <div class="mask" *ngIf="detailData[hover] && isEdit"></div>
       <div class="mask-over" *ngIf="detailData[hover] && isEdit">
@@ -250,4 +183,4 @@
       </div>
     </div>
   </nz-upload>
-</ng-template>
+</ng-template>

src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts

@@ -4,6 +4,8 @@ import { ActivatedRoute } from '@angular/router';
 import { apiConf } from '@conf/api.conf';
 import { STColumn } from '@delon/abc/st';
 import { NzModalService } from 'ng-zorro-antd/modal';
+import { NzTreeNode, NzTreeNodeOptions } from 'ng-zorro-antd/tree';
+import { NzTreeSelectComponent } from 'ng-zorro-antd/tree-select';
 import { Subscription, fromEvent } from 'rxjs';
 
 import { PartnerListService } from '../../services/partner-list.service';
@@ -16,6 +18,9 @@ import { PartnerAuditModalComponent } from '../partner-audit-modal/partner-audit
   providers: [DatePipe]
 })
 export class PersonalPartnerDetailComponent implements OnInit {
+  @ViewChild('areaTreeSelect')
+  areaTreeSelect!: NzTreeSelectComponent;
+
   detailData: any = { adminUserInfo: { name: '' }, legalPersonIdentity: { name: '' } };
   tempalateData = { ...this.detailData };
 
@@ -23,7 +28,10 @@ export class PersonalPartnerDetailComponent implements OnInit {
 
   uploadURl = apiConf.waterFileUpload;
   disabledUpload = false;
-  enterpriseAddressCode: any = [];
+  enterpriseAddressCode: string[] = [];
+  enterpriseDefaultAddressCode: string[] = [];
+  enterpriseDefaultCityName: string = '';
+  areaList = [];
 
   constructor(
     public service: PartnerListService,
@@ -34,6 +42,22 @@ export class PersonalPartnerDetailComponent implements OnInit {
 
   ngOnInit() {
     this.initData();
+    this.loadlAreaList();
+  }
+
+  loadlAreaList() {
+    this.service.request(this.service.$api_get_region_by_code, { regionCode: '' }).subscribe(res => {
+      if (res) {
+        this.areaList = res.map((item: any) => ({
+          ...item,
+          isLeaf: false,
+          title: item.name,
+          key: item.regionCode.toString(),
+          disabled: true,
+          isDisableCheckbox: true
+        }));
+      }
+    });
   }
 
   initData() {
@@ -47,8 +71,13 @@ export class PersonalPartnerDetailComponent implements OnInit {
           console.log(this.detailData);
 
           this.tempalateData = { ...this.detailData };
-          if (this.detailData?.cityCodes) {
+          // 拼接所属城市
-            this.enterpriseAddressCode = JSON.parse(this.detailData.cityCodes);
+          if (this.detailData?.cityCodesList?.length > 0) {
+            this.enterpriseAddressCode = (this.detailData?.cityCodesList as any[]).map(city => city.cityCode);
+            this.enterpriseDefaultCityName = (this.detailData?.cityCodesList as any[]).map(city => city.cityName).join('、');
+            this.enterpriseDefaultAddressCode = [
+              ...new Set<string>((this.detailData?.cityCodesList as any[]).map(city => city.provinceCode))
+            ];
           }
         }
       });
@@ -61,36 +90,48 @@ export class PersonalPartnerDetailComponent implements OnInit {
    * 冻结
    */
   freezeOrResume(type: number) {
-    // this.service.http
+    this.service.http
-    //   .post(this.service.$api_lock_freight, {
+      .post(this.service.$api_lock_freight, {
-    //     id: this.route.snapshot.params.id,
+        id: this.route.snapshot.params.id,
-    //     statedLocked: !!type
+        statedLocked: !!type
-    //   })
+      })
-    //   .subscribe(res => {
+      .subscribe(res => {
-    //     if (res.data === true) {
+        if (res.data === true) {
-    //       if (type === 0) {
+          if (type === 0) {
-    //         this.service.msgSrv.success(`启用成功！`);
+            this.service.msgSrv.success(`启用成功！`);
-    //       } else {
+          } else {
-    //         this.service.msgSrv.success(`冻结成功！`);
+            this.service.msgSrv.success(`冻结成功！`);
-    //       }
+          }
-    //       this.initData();
+          this.initData();
-    //     } else {
+        } else {
-    //       this.service.msgSrv.error(res.msg || '操作失败！');
+          this.service.msgSrv.error(res.msg || '操作失败！');
-    //     }
+        }
-    //   });
+      });
   }
 
   auditPartner(isPass: boolean) {
     const modal = this.nzModalService.create({
       nzTitle: '审核',
       nzContent: PartnerAuditModalComponent,
-      nzComponentParams: { info: { ...this.detailData, isPass } },
+      nzComponentParams: { info: { ...this.detailData, isPass, enterpriseName: this.detailData.adminUserInfo?.name } },
       nzFooter: null
     });
   }
 
   ratify() {
     this.isEdit = true;
+    // 搜索展开省份并选中节点
+    setTimeout(() => {
+      if (this.enterpriseDefaultAddressCode?.length > 0 && this.areaTreeSelect) {
+        this.enterpriseDefaultAddressCode.forEach(code => {
+          const node = this.areaTreeSelect.getTreeNodeByKey(code);
+          if (node) {
+            node.setExpanded(true);
+            this.onExpandChange(node);
+          }
+        });
+      }
+    }, 500);
   }
 
   deleteImg(data: any, key: string, key2: string) {
@@ -119,6 +160,25 @@ export class PersonalPartnerDetailComponent implements OnInit {
     }
   }
 
+  onExpandChange(node: NzTreeNode | null | undefined): void {
+    if (node && node.getChildren().length === 0 && node.isExpanded) {
+      this.loadRegionData(node).then(data => {
+        node.addChildren(data);
+        // 更新选中数据
+        this.areaTreeSelect.updateSelectedNodes(true);
+        // 修改子节点选中状态
+        const children = node.getChildren();
+        if (children?.length > 0) {
+          children.forEach(childNode => {
+            if (this.enterpriseAddressCode.find(area => area === childNode.key)) {
+              childNode.setChecked(true);
+            }
+          });
+        }
+      });
+    }
+  }
+
   /**
    * 级联获取地区数据
    *
@@ -126,19 +186,28 @@ export class PersonalPartnerDetailComponent implements OnInit {
    * @param index 层级
    * @returns
    */
-  loadRegionData = (node: any, index: number) => {
+  loadRegionData(node: NzTreeNode): Promise<NzTreeNodeOptions[]> {
+    let rs: any[] = [];
     return new Promise(resolve => {
-      this.service.request(this.service.$api_get_region_by_code, { regionCode: node?.regionCode || '' }).subscribe(
+      this.service.request(this.service.$api_get_region_by_code, { regionCode: node?.origin.regionCode || '' }).subscribe(
         res => {
-          node.children = res.map((item: any) => ({ ...item, isLeaf: index === 1, value: item.regionCode, label: item.name }));
+          rs = res.map((item: any) => ({
+            ...item,
+            isLeaf: true,
+            title: item.name,
+            key: item.regionCode.toString(),
+            isSelectable: true,
+            isSelected: true,
+            isChecked: true
+          }));
         },
         _ => {},
         () => {
-          resolve(node);
+          resolve(rs);
         }
       );
     });
-  };
+  }
 
   reset() {
     this.detailData = { ...this.tempalateData };

src/app/routes/partner/partner-list/services/partner-list.service.ts

@@ -17,8 +17,18 @@ export class PartnerListService extends BaseService {
   $api_get_ent_partner_detail = '/api/mdc/partner/getEnterprise';
   // 获取合伙人信息
   $api_get_personal_partner_detail = '/api/mdc/partner/getPersonally';
+  // 审核合伙人
+  $api_audit_partner= '/api/mdc/partner/audit';
+  // 修改返佣模板
+  $api_update_partner_template= '/api/mdc/partner/updateTemplate';
+  // 更新渠道销售
+  $api_update_partner_channel= '/api/mdc/partner/updateChannelSale';
+  // 重新发起CRM
+  $api_resend_crm= '/api/mdc/partner/reSendCrm';
   // 查询合伙人修改渠道渠道销售记录
   $api_get_personal_channel_list = '/api/mdc/partnerChannelRelLog/list/page';
+  // 冻结/启用企业业
+  $api_lock_freight = '/api/mdc/cuc/enterpriseInfo/operate/lock';
 
   // 根据地区code查询列表
   $api_get_region_by_code = '/api/mdc/pbc/region/getRegionByCode';

src/app/shared/shared-zorro.module.ts

@@ -47,6 +47,7 @@ import { NzAffixModule } from 'ng-zorro-antd/affix';
 import { NzTypographyModule } from 'ng-zorro-antd/typography';
 import { NzSwitchModule } from 'ng-zorro-antd/switch';
 import { NzImageModule } from 'ng-zorro-antd/image';
+import { NzTreeSelectModule } from 'ng-zorro-antd/tree-select';
 
 export const SHARED_ZORRO_MODULES = [
   NzButtonModule,
@@ -88,5 +89,6 @@ export const SHARED_ZORRO_MODULES = [
   NzAffixModule,
   NzTypographyModule,
   NzSwitchModule,
-  NzImageModule
+  NzImageModule,
+  NzTreeSelectModule 
 ];

src/styles.less

@@ -63,4 +63,22 @@ input[type="number"] {
         color : unset;
         cursor: not-allowed;
     }
+}
+
+.area-tree-select {
+    .ant-select-tree .ant-select-tree-treenode-disabled {
+        .ant-select-tree-checkbox {
+            margin: 0;
+
+            .ant-select-tree-checkbox-inner {
+                width       : 0px;
+                border-color: #ffffff !important;
+            }
+        }
+
+        .ant-select-tree-node-content-wrapper {
+            color : unset;
+            cursor: not-allowed;
+        }
+    }
 }