From 2badc08f3c2841aa1d42e3c5567176bd13b6b7e3 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Tue, 10 May 2022 15:33:41 +0800
Subject: [PATCH] fix bug

---
 .../index/partner-list.component.html         |   5 +-
 .../personal-partner-detail.component.html    | 228 +++++++++++++-----
 2 files changed, 174 insertions(+), 59 deletions(-)

diff --git a/src/app/routes/partner/partner-list/components/index/partner-list.component.html b/src/app/routes/partner/partner-list/components/index/partner-list.component.html
index ab28c37c..1c6ed118 100644
--- a/src/app/routes/partner/partner-list/components/index/partner-list.component.html
+++ b/src/app/routes/partner/partner-list/components/index/partner-list.component.html
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-04-29 17:28:23
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-05-10 11:39:19
+ * @LastEditTime : 2022-05-10 15:33:15
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\partner-list\\components\\index\\partner-list.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -93,12 +93,11 @@
       <se label="当前渠道销售"> {{ selectItem?.channelIdLabel }} </se>
       <se label="渠道销售修改为" required>
         <nz-select
-        nzMode="multiple"
         nzPlaceHolder="请搜索"
-        nzAllowClear
         nzShowSearch
         nzServerSearch
         [(ngModel)]="cannelItem.channelId"
+        [nzShowArrow]="false"
         (nzOnSearch)="onSearch($event)"
       >
         <ng-container *ngFor="let item of cannels">
diff --git a/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.html b/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.html
index 9387bbd0..c9d6ad84 100644
--- a/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.html
+++ b/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.html
@@ -28,9 +28,7 @@
             </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">
-                所属城市：{{enterpriseDefaultCityName}}
-              </div>
+              <div nz-col [nzLg]="12" [nzSm]="24" [nzXs]="24"> 所属城市：{{ enterpriseDefaultCityName }} </div>
             </div>
           </div>
         </div>
@@ -40,19 +38,33 @@
             <button [disabled]="service.http.loading" nz-button nzDanger (click)="save()"> 保存 </button>
           </ng-container>
           <ng-template #editButton>
-            <ng-container *ngIf="detailData?.approvalStatus === 10">
-              <button [disabled]="service.http.loading" nz-button nzDanger (click)="auditPartner(true)"> 通过 </button>
-              <button [disabled]="service.http.loading" nz-button nzDanger (click)="auditPartner(false)"> 驳回 </button>
-            </ng-container>
             <ng-container *ngIf="detailData?.approvalStatus != 10">
-              <button [disabled]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="enable"
-                (nzOnConfirm)="freezeOrResume(0)" nzPopconfirmPlacement="bottomRight" *ngIf="detailData?.lockedStatus"
-                acl [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-lock']">
+              <button
+                [disabled]="service.http.loading"
+                nz-button
+                nzDanger
+                nz-popconfirm
+                [nzPopconfirmTitle]="enable"
+                (nzOnConfirm)="freezeOrResume(0)"
+                nzPopconfirmPlacement="bottomRight"
+                *ngIf="detailData?.lockedStatus"
+                acl
+                [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-lock']"
+              >
                 启用
               </button>
-              <button [disabled]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="frozen"
-                (nzOnConfirm)="freezeOrResume(1)" nzPopconfirmPlacement="bottomRight" *ngIf="!detailData?.lockedStatus"
-                acl [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-lock']">
+              <button
+                [disabled]="service.http.loading"
+                nz-button
+                nzDanger
+                nz-popconfirm
+                [nzPopconfirmTitle]="frozen"
+                (nzOnConfirm)="freezeOrResume(1)"
+                nzPopconfirmPlacement="bottomRight"
+                *ngIf="!detailData?.lockedStatus"
+                acl
+                [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-lock']"
+              >
                 冻结
               </button>
             </ng-container>
@@ -64,57 +76,124 @@
   </ng-template>
 
   <ng-template #frozen>
-    <ng-container *ngTemplateOutlet="
-    PopconfirmTempalte;
-    context: { title: '确定冻结该合伙人吗？', content: '停用后，该合伙人将被限制使用，不限于访问受限、邀请客户、佣金收益等，请谨慎操作' }
-  ">
+    <ng-container
+      *ngTemplateOutlet="
+        PopconfirmTempalte;
+        context: {
+          title: '确定冻结该合伙人吗？',
+          content: '停用后，该合伙人将被限制使用，不限于访问受限、邀请客户、佣金收益等，请谨慎操作'
+        }
+      "
+    >
     </ng-container>
   </ng-template>
   <ng-template #enable>
-    <ng-container *ngTemplateOutlet="
-    PopconfirmTempalte;
-    context: { title: '确定启用该合伙人吗？', content: '启用后，该该合伙人将恢复正常使用功能，请再次确认' }
-  ">
+    <ng-container
+      *ngTemplateOutlet="
+        PopconfirmTempalte;
+        context: { title: '确定启用该合伙人吗？', content: '启用后，该该合伙人将恢复正常使用功能，请再次确认' }
+      "
+    >
     </ng-container>
   </ng-template>
 </page-header-wrapper>
 
 <nz-card [class]="isEdit ? 'edit-box' : 'readOnly-box'">
+  <div class="font-weight-blod text-md detail-title" style="justify-content: space-between;">
+    <div  style="display: flex; justify-content: center;align-items: center;">
+      <a class="sign"></a>
+      <p style="margin-bottom: 0">
+        合伙人信息
+        <label *ngIf="detailData?.approvalStatus===30" style="color: #ff4d4f"><i nz-icon nzType="info-circle"
+            nzTheme="fill" class="mr-xs"></i>驳回：<span nz-popover [nzPopoverTitle]="titleTemplate1" [nzPopoverContent]="contentTemplate1">
+              驳回原因
+              <ng-template #titleTemplate1>
+                原因
+              </ng-template>
+              <ng-template #contentTemplate1>
+                {{detailData?.approvalOpinion}}
+              </ng-template>
+            </span>
+        </label>
+        <label *ngIf="detailData?.approvalStatus===20" style="color: #52c41a"><i nz-icon nzType="check-circle"
+          nzTheme="fill" class="mr-xs"></i>审核通过
+      </label>
+      </p>
+    </div>
+    <div>
+      <ng-container *ngIf="detailData?.approvalStatus === 10">
+        <button [disabled]="service.http.loading" nz-button nzDanger (click)="auditPartner(true)"> 通过 </button>
+        <button [disabled]="service.http.loading" nz-button nzDanger (click)="auditPartner(false)"> 驳回 </button>
+      </ng-container>
+     
+    </div>
+  </div>
   <sv-container col="3" class="mt16">
-    <sv-title>合伙人信息</sv-title>
+    <!-- <sv-title>合伙人信息</sv-title> -->
     <sv label="姓名">
-      <input nz-input type="text" [(ngModel)]="detailData.adminUserInfo.name" [readonly]="!isEdit"
-        [nzBorderless]="!isEdit" [placeholder]="isEdit ? '' : '-'" />
+      <input
+        nz-input
+        type="text"
+        [(ngModel)]="detailData.adminUserInfo.name"
+        [readonly]="!isEdit"
+        [nzBorderless]="!isEdit"
+        [placeholder]="isEdit ? '' : '-'"
+      />
     </sv>
     <sv label="手机号">
       <!-- <input nz-input type="text" [(ngModel)]="detailData.adminUserInfo.certificateNumber" [readonly]="!isEdit"
         [nzBorderless]="!isEdit" [placeholder]="isEdit ? '' : '-'" /> -->
-        {{detailData.adminUserInfo.mobile}}
+      {{ detailData.adminUserInfo.mobile }}
     </sv>
     <sv label="身份证号">
-      <input nz-input type="text" [(ngModel)]="detailData.adminUserInfo.certificateNumber" [readonly]="!isEdit"
-        [nzBorderless]="!isEdit" [placeholder]="isEdit ? '' : '-'" />
+      <input
+        nz-input
+        type="text"
+        [(ngModel)]="detailData.adminUserInfo.certificateNumber"
+        [readonly]="!isEdit"
+        [nzBorderless]="!isEdit"
+        [placeholder]="isEdit ? '' : '-'"
+      />
     </sv>
     <sv label="身份证有效期" col="1">
-      <nz-date-picker [(ngModel)]="detailData.adminUserInfo.validStartTime" [nzDisabled]="!isEdit" nzPlaceHolder=" "
-        [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''" style="width: 140px" class="calendar">
+      <nz-date-picker
+        [(ngModel)]="detailData.adminUserInfo.validStartTime"
+        [nzDisabled]="!isEdit"
+        nzPlaceHolder=" "
+        [nzBorderless]="!isEdit"
+        [nzSuffixIcon]="isEdit ? 'calendar' : ''"
+        style="width: 140px"
+        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 [(ngModel)]="detailData.adminUserInfo.validEndTime" [nzDisabled]="!isEdit" nzPlaceHolder=" "
-        [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''" style="width: 140px" class="calendar">
+      <nz-date-picker
+        [(ngModel)]="detailData.adminUserInfo.validEndTime"
+        [nzDisabled]="!isEdit"
+        nzPlaceHolder=" "
+        [nzBorderless]="!isEdit"
+        [nzSuffixIcon]="isEdit ? 'calendar' : ''"
+        style="width: 140px"
+        class="calendar"
+      >
       </nz-date-picker>
       <ng-container *ngIf="isEdit">
-        <label nz-checkbox [ngModel]="!!!detailData.adminUserInfo.validEndTime"
-          (ngModelChange)="$event ? (detailData.adminUserInfo.validEndTime = '') : ''" class="ml-sm">长期</label>
+        <label
+          nz-checkbox
+          [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 *ngTemplateOutlet="
+        <ng-container
+          *ngTemplateOutlet="
             uploadTemplate;
             context: {
               data: detailData?.adminUserInfo,
@@ -123,9 +202,11 @@
               key2: 'certificatePhotoFront',
               hover: 'legalFront'
             }
-          ">
+          "
+        >
         </ng-container>
-        <ng-container *ngTemplateOutlet="
+        <ng-container
+          *ngTemplateOutlet="
             uploadTemplate;
             context: {
               data: detailData?.adminUserInfo,
@@ -134,16 +215,26 @@
               key2: 'certificatePhotoBack',
               hover: 'legalBack'
             }
-          ">
+          "
+        >
         </ng-container>
       </div>
     </sv>
     <sv label="所属城市">
       <ng-container *ngIf="isEdit; else cascaderelseTemplate">
-        <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
+          #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>
@@ -164,9 +255,17 @@
   <sv-container col="3" class="mt16">
     <sv-title>修改渠道销售记录</sv-title>
     <sv label="">
-      <st #st [data]="service.$api_get_personal_channel_list" [columns]="columns"
-        [req]="{params:{partnerId:route.snapshot.params.id}}" [loading]="service.http.loading" bordered size="small"
-        [page]="{ show: false }" [scroll]="{ x: '1200px' }">
+      <st
+        #st
+        [data]="service.$api_get_personal_channel_list"
+        [columns]="columns"
+        [req]="{ params: { partnerId: route.snapshot.params.id } }"
+        [loading]="service.http.loading"
+        bordered
+        size="small"
+        [page]="{ show: false }"
+        [scroll]="{ x: '1200px' }"
+      >
       </st>
     </sv>
   </sv-container>
@@ -175,8 +274,7 @@
 <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>
@@ -184,18 +282,36 @@
 </ng-template>
 
 <ng-template #uploadTemplate let-data="data" let-status="status" let-key="key" let-key2="key2" let-hover="hover">
-  <nz-upload class="avatar-uploader" [nzAction]="uploadURl" 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)">
+  <nz-upload
+    class="avatar-uploader"
+    [nzAction]="uploadURl"
+    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 *ngIf="data[key]" (mouseover)="detailData[hover] = true" (mouseleave)="detailData[hover] = false"
-      (click)="$event.cancelBubble = true" class="image-hover">
+    <div
+      *ngIf="data[key]"
+      (mouseover)="detailData[hover] = true"
+      (mouseleave)="detailData[hover] = false"
+      (click)="$event.cancelBubble = true"
+      class="image-hover"
+    >
       <img nz-image [nzSrc]="data[key]" style="width: 200px; height: 160px" />
-      <i nz-icon *ngIf="detailData[hover] && isEdit" nzType="close-circle" nzTheme="fill" class="delete-icon"
-        (click)="deleteImg(data, key, key2)"></i>
+      <i
+        nz-icon
+        *ngIf="detailData[hover] && isEdit"
+        nzType="close-circle"
+        nzTheme="fill"
+        class="delete-icon"
+        (click)="deleteImg(data, key, key2)"
+      ></i>
     </div>
   </nz-upload>
-</ng-template>
\ No newline at end of file
+</ng-template>