From 80db95843798c7c5085ee98af35eeba690ed984f Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Wed, 11 May 2022 14:49:07 +0800
Subject: [PATCH] fix bug

---
 .../driver-account.component.ts               |  2 +-
 .../channel-log-modal.component.html          | 15 ++++++++--
 .../channel-log-modal.component.less          | 10 +++++++
 .../channel-log-modal.component.ts            | 30 +++++++++++--------
 .../components/record/record.component.ts     |  2 +-
 5 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/src/app/routes/financial-management/components/driver-account/driver-account.component.ts b/src/app/routes/financial-management/components/driver-account/driver-account.component.ts
index 1b52b343..0420e091 100644
--- a/src/app/routes/financial-management/components/driver-account/driver-account.component.ts
+++ b/src/app/routes/financial-management/components/driver-account/driver-account.component.ts
@@ -168,7 +168,7 @@ export class DriverAccountComponent extends BasicTableComponent implements OnIni
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.freezeBalance }) }
       },
       {
-        title: '本月累计提现金额',
+        title: '累计提现金额',
         index: 'withdrawBalance',
         width: 160,
         type: 'widget',
diff --git a/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.html b/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.html
index c98cb372..6ac91690 100644
--- a/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.html
+++ b/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.html
@@ -4,24 +4,32 @@
  * @Author       : Shiming
  * @Date         : 2022-04-28 20:27:08
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-05-11 13:40:12
+ * @LastEditTime : 2022-05-11 14:44:15
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\partner-list\\components\\channel-log-modal\\channel-log-modal.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
-<h2>转移客户数：{{ changeST?.total }}</h2>
+<div class="bbod">
+    <h2>转移客户数：{{ changeST?.list?.length }}</h2>
 <st
   #changeST
   [data]="service.$api_get_partner_change_list"
   [columns]="columns.changeColumn"
   [req]="{ params: { id: id, type: 1 } }"
+  [res]="{ reName: { list: 'data' } }"
   [loading]="service.http.loading"
   bordered
   size="small"
   [page]="{ show: false }"
   [scroll]="{ x: '750px' }"
 >
+<ng-template st-row="crmStatus" let-item let-index="index" let-column="column">
+    <div *ngIf="item.crmStatus == '0'">未发起</div>
+    <div *ngIf="item.crmStatus == '10'">待审核</div>
+    <div *ngIf="item.crmStatus == '20'">审核通过</div>
+    <div *ngIf="item.crmStatus == '30'">驳回</div>
+  </ng-template>
 </st>
-<h2>不转移客户数：{{ noChangeST?.total }}</h2>
+<h2>不转移客户数：{{ noChangeST?.list?.length }}</h2>
 <st
   #noChangeST
   [data]="service.$api_get_partner_change_list"
@@ -38,3 +46,4 @@
 <p>
   客户转移：客户跟着上级合伙人转移一并到新渠道销售下，会同步发起CRM《客户转移》流程；不转移的，客户会与上级合伙人解绑，修改成功后，修改时间也是合伙人与客户的结算结束时间，成为原来渠道销售的直客。
 </p>
+</div>
diff --git a/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.less b/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.less
index e69de29b..3148fb3e 100644
--- a/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.less
+++ b/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.less
@@ -0,0 +1,10 @@
+/* stylelint-disable-next-line CssSyntaxError */
+:host {
+    ::ng-deep {
+        .bbod{
+            height: 600px;
+            overflow-y: hidden;
+        }
+  
+  }
+}
\ No newline at end of file
diff --git a/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.ts b/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.ts
index c081235d..16ff04e7 100644
--- a/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.ts
+++ b/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.ts
@@ -1,41 +1,47 @@
 /*
- * @Description  : 
+ * @Description  :
  * @Version      : 1.0
  * @Author       : Shiming
  * @Date         : 2022-05-09 10:49:35
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-05-11 13:40:11
+ * @LastEditTime : 2022-05-11 14:47:57
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\partner-list\\components\\channel-log-modal\\channel-log-modal.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
-import { Component, OnInit } from '@angular/core';
-import { STColumn } from '@delon/abc/st';
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { STColumn, STComponent } from '@delon/abc/st';
 import { PartnerListService } from '../../services/partner-list.service';
 
 @Component({
   selector: 'app-channel-log-modal',
+  styleUrls: ['./channel-log-modal.component.less'],
   templateUrl: './channel-log-modal.component.html'
 })
 export class ChannelLogModalComponent implements OnInit {
+  @ViewChild('changeST', { static: true }) changeST!: STComponent;
+  @ViewChild('noChangeST', { static: true }) noChangeST!: STComponent;
   columns: { changeColumn: STColumn[]; beChangeColumn: STColumn[] } = this.initST();
   id = '';
   constructor(public service: PartnerListService) {}
 
-  ngOnInit(): void {}
+  ngOnInit(): void {
+    console.log(this.changeST);
+    
+  }
 
   private initST(): { changeColumn: STColumn[]; beChangeColumn: STColumn[] } {
     return {
       changeColumn: [
-        { title: '客户名称', index: 'enterpriceName', width: 180 },
-        { title: '合伙人', index: 'enterpriseName', width: 160 },
-        { title: '渠道销售', index: 'newChannelId', className: 'text-center', width: 130 },
-        { title: 'CRM审核状态', index: 'payDate', width: 150 },
+        { title: '客户名称', index: 'enterpriseName', width: 180 },
+        { title: '合伙人', index: 'newPartnerName', width: 160 },
+        { title: '渠道销售', index: 'newChannelName', className: 'text-center', width: 130 },
+        { title: 'CRM审核状态', render: 'crmStatus', width: 150 },
         { title: '生效时间', index: 'effectiveTime', className: 'text-center', width: 130 }
       ],
       beChangeColumn: [
-        { title: '客户名称', index: 'enterpriceName', width: 180 },
-        { title: '合伙人', index: 'enterpriseName', width: 160 },
-        { title: '渠道销售', index: 'newChannelId', className: 'text-center', width: 130 },
+        { title: '客户名称', index: 'enterpriseName', width: 180 },
+        { title: '合伙人', index: 'newPartnerName', width: 160 },
+        { title: '渠道销售', index: 'newChannelName', className: 'text-center', width: 130 },
         { title: '生效时间', index: 'effectiveTime', className: 'text-center', width: 130 }
       ]
     };
diff --git a/src/app/routes/partner/recorded/components/record/record.component.ts b/src/app/routes/partner/recorded/components/record/record.component.ts
index 08c2af1d..8b1c9fc4 100644
--- a/src/app/routes/partner/recorded/components/record/record.component.ts
+++ b/src/app/routes/partner/recorded/components/record/record.component.ts
@@ -71,7 +71,7 @@ export class PartnerRecordedRecordComponent implements OnInit {
   };
 
   afterRes = (data: any[], rawData?: any) => {
-    // data = data.map(node => ({ ...node, disabled: node.sts !== '0' }));
+    data = data.map(node => ({ ...node, disabled: node.sts !== '0' }));
     return data;
   };