From 0eb12cdf75713de6e0e9e09a0265f9b7de9401d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= <xiaoyun.pan@eascs.com>
Date: Thu, 24 Feb 2022 11:23:05 +0800
Subject: [PATCH 01/70] =?UTF-8?q?=E9=80=80=E6=AC=BE=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/core/startup/startup.service.ts       |    4 +-
 .../components/index/index.component.html     |   20 +-
 .../components/index/index.component.ts       |   40 +-
 .../partner-statistics.component.html         |   24 +
 .../partner-statistics.component.spec.ts      |   24 +
 .../partner-statistics.component.ts           |   79 ++
 .../sale-statistics.component.html            |   21 +
 .../sale-statistics.component.spec.ts         |   24 +
 .../sale-statistics.component.ts              |   62 +
 .../routes/partner/partner-routing.module.ts  |    6 +-
 src/app/routes/partner/partner.module.ts      |    6 +-
 .../shared/services/business/user.service.ts  |   20 +-
 src/assets/mocks/menu-data.json               | 1042 ++++++++---------
 13 files changed, 799 insertions(+), 573 deletions(-)
 create mode 100644 src/app/routes/partner/business-statistics/components/partner-statistics/partner-statistics.component.html
 create mode 100644 src/app/routes/partner/business-statistics/components/partner-statistics/partner-statistics.component.spec.ts
 create mode 100644 src/app/routes/partner/business-statistics/components/partner-statistics/partner-statistics.component.ts
 create mode 100644 src/app/routes/partner/business-statistics/components/sale-statistics/sale-statistics.component.html
 create mode 100644 src/app/routes/partner/business-statistics/components/sale-statistics/sale-statistics.component.spec.ts
 create mode 100644 src/app/routes/partner/business-statistics/components/sale-statistics/sale-statistics.component.ts

diff --git a/src/app/core/startup/startup.service.ts b/src/app/core/startup/startup.service.ts
index b6c0d1dc..5c3efc42 100644
--- a/src/app/core/startup/startup.service.ts
+++ b/src/app/core/startup/startup.service.ts
@@ -49,9 +49,9 @@ export class StartupService {
       let data;
       if (this.coreSrv.loginStatus) {
         // 本地菜单
-        // data = this.loadMockData();
+        data = this.loadMockData();
         // 远程菜单
-        data = this.loadRemoteData();
+        // data = this.loadRemoteData();
       } else {
         data = this.loadMockData();
       }
diff --git a/src/app/routes/partner/business-statistics/components/index/index.component.html b/src/app/routes/partner/business-statistics/components/index/index.component.html
index 482ccb06..fa15bb93 100644
--- a/src/app/routes/partner/business-statistics/components/index/index.component.html
+++ b/src/app/routes/partner/business-statistics/components/index/index.component.html
@@ -1,9 +1,11 @@
-<page-header [action]="phActionTpl">
-  <ng-template #phActionTpl>
-    <button (click)="add()" nz-button nzType="primary">新建</button>
-  </ng-template>
-</page-header>
-<nz-card>
-  <sf mode="search" [schema]="searchSchema" (formSubmit)="st.reset($event)" (formReset)="st.reset($event)"></sf>
-  <st #st [data]="url" [columns]="columns"></st>
-</nz-card>
+<page-header-wrapper [title]="''" [tab]="tpTab">
+
+</page-header-wrapper>
+<ng-template #tpTab>
+  <nz-tabset [(nzSelectedIndex)]="selectedIndex" (nzSelectChange)="change($event)">
+    <nz-tab [nzTitle]="item.name" *ngFor="let item of tabs">
+    </nz-tab>
+  </nz-tabset>
+</ng-template>
+<app-partner-partner-statistics *ngIf="selectedIndex === 0"></app-partner-partner-statistics>
+<app-partner-sale-statistics *ngIf="selectedIndex === 1"></app-partner-sale-statistics>
diff --git a/src/app/routes/partner/business-statistics/components/index/index.component.ts b/src/app/routes/partner/business-statistics/components/index/index.component.ts
index 1b409e25..96ffd6d5 100644
--- a/src/app/routes/partner/business-statistics/components/index/index.component.ts
+++ b/src/app/routes/partner/business-statistics/components/index/index.component.ts
@@ -9,37 +9,31 @@ import { ModalHelper, _HttpClient } from '@delon/theme';
 })
 export class PartnerBusinessStatisticsIndexComponent implements OnInit {
   url = `/user`;
-  searchSchema: SFSchema = {
-    properties: {
-      no: {
-        type: 'string',
-        title: '编号'
-      }
-    }
-  };
+  schema!: SFSchema;
   @ViewChild('st') private readonly st!: STComponent;
-  columns: STColumn[] = [
-    { title: '编号', index: 'no' },
-    { title: '调用次数', type: 'number', index: 'callNo' },
-    { title: '头像', type: 'img', width: '50px', index: 'avatar' },
-    { title: '时间', type: 'date', index: 'updatedAt' },
+  columns: STColumn[] = [];
+  selectedIndex = 0;
+  tabs = [
     {
-      title: '',
-      buttons: [
-        // { text: '查看', click: (item: any) => `/form/${item.id}` },
-        // { text: '编辑', type: 'static', component: FormEditComponent, click: 'reload' },
-      ]
+      name: '合伙人统计',
+      value: '0'
+    },
+    {
+      name: '渠道销售统计',
+      value: '1'
     }
-  ];
+  ]
 
-  constructor(private http: _HttpClient, private modal: ModalHelper) { }
+  constructor() { }
 
+  change(e: any) {
+    console.log(this.selectedIndex);
+  }
   ngOnInit(): void { }
 
+
+
   add(): void {
-    // this.modal
-    //   .createStatic(FormEditComponent, { i: { id: 0 } })
-    //   .subscribe(() => this.st.reload());
   }
 
 }
diff --git a/src/app/routes/partner/business-statistics/components/partner-statistics/partner-statistics.component.html b/src/app/routes/partner/business-statistics/components/partner-statistics/partner-statistics.component.html
new file mode 100644
index 00000000..8dd7ef1a
--- /dev/null
+++ b/src/app/routes/partner/business-statistics/components/partner-statistics/partner-statistics.component.html
@@ -0,0 +1,24 @@
+<nz-card>
+  <sf mode="search" [schema]="schema" [ui]="ui" (formSubmit)="st.reset($event)" (formReset)="st.reset($event)"></sf>
+
+</nz-card>
+<nz-card>
+  <st #st [data]="url" [columns]="columns">
+    <ng-template st-row="approvalStatus" let-item>
+      <a [routerLink]="'/'">{{item.approvalStatus}}</a>
+    </ng-template>
+    <ng-template st-row="approvalStatus1" let-item>
+      <div class="text-right">{{item.approvalStatus1 | currency:' '}}</div>
+    </ng-template>
+    <ng-template st-row="approvalStatus2" let-item>
+      <div class="text-right">{{item.approvalStatus1 | currency:' '}}</div>
+    </ng-template>
+
+    <ng-template st-row="approvalStatus3" let-item>
+      <div class="text-right">{{item.approvalStatus1 | currency:' '}}</div>
+    </ng-template>
+    <ng-template st-row="approvalStatus4" let-item>
+      <div class="text-right">{{item.approvalStatus1 | currency:' '}}</div>
+    </ng-template>
+  </st>
+</nz-card>
diff --git a/src/app/routes/partner/business-statistics/components/partner-statistics/partner-statistics.component.spec.ts b/src/app/routes/partner/business-statistics/components/partner-statistics/partner-statistics.component.spec.ts
new file mode 100644
index 00000000..5396aaf2
--- /dev/null
+++ b/src/app/routes/partner/business-statistics/components/partner-statistics/partner-statistics.component.spec.ts
@@ -0,0 +1,24 @@
+import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import { PartnerPartnerStatisticsComponent } from './partner-statistics.component';
+
+describe('PartnerPartnerStatisticsComponent', () => {
+  let component: PartnerPartnerStatisticsComponent;
+  let fixture: ComponentFixture<PartnerPartnerStatisticsComponent>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ PartnerPartnerStatisticsComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(PartnerPartnerStatisticsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/routes/partner/business-statistics/components/partner-statistics/partner-statistics.component.ts b/src/app/routes/partner/business-statistics/components/partner-statistics/partner-statistics.component.ts
new file mode 100644
index 00000000..ad508c7d
--- /dev/null
+++ b/src/app/routes/partner/business-statistics/components/partner-statistics/partner-statistics.component.ts
@@ -0,0 +1,79 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { STColumn, STComponent } from '@delon/abc/st';
+import { SFSchema, SFUISchema } from '@delon/form';
+import { ModalHelper, _HttpClient } from '@delon/theme';
+
+@Component({
+  selector: 'app-partner-partner-statistics',
+  templateUrl: './partner-statistics.component.html',
+})
+export class PartnerPartnerStatisticsComponent implements OnInit {
+  url = `/user`;
+  schema!: SFSchema;
+  ui!: SFUISchema;
+  @ViewChild('st') private readonly st!: STComponent;
+  columns: STColumn[] = [];
+
+  constructor(private http: _HttpClient, private modal: ModalHelper) { }
+
+  ngOnInit(): void {
+    this.initSF();
+    this.initST();
+  }
+
+  initSF() {
+    this.schema = {
+      properties: {
+        abnormalCause: {
+          title: '合伙人名称',
+          type: 'string',
+          ui: {
+            placeholder: '请输入',
+          },
+        },
+        abnormalCause1: {
+          title: '类型',
+          type: 'string',
+          default: '',
+          enum: [
+            {
+              label: '全部',
+              value: ''
+            },
+            {
+              label: '个人',
+              value: '1'
+            },
+            {
+              label: '企业',
+              value: '2'
+            }
+          ],
+          ui: {
+            widget: 'select'
+          },
+        },
+      }
+    }
+    this.ui = { '*': { spanLabelFixed: 120, grid: { span: 8, gutter: 4 } } };
+  }
+  /**
+ * 初始化数据列表
+ */
+  initST() {
+    this.columns = [
+      { title: '合伙人名称', index: 'carNo', className: 'text-center' },
+      { title: '类型', render: 'carModelLabel', className: 'text-center' },
+      { title: '注册时间', index: 'carNo', className: 'text-center' },
+      { title: '本月新增客户', render: 'approvalStatus', className: 'text-center', sort: true },
+      { title: '客户总数', render: 'approvalStatus', className: 'text-center', sort: true },
+      { title: '本月已结算金额（元）', render: 'approvalStatus1', className: 'text-center', sort: true },
+      { title: '累计已结算金额（元）', render: 'approvalStatus2', className: 'text-center', sort: true },
+      { title: '本月预估收益（元）', render: 'approvalStatus3', className: 'text-center', sort: true },
+      { title: '累计收益（元）', render: 'approvalStatus4', className: 'text-center', sort: true },
+
+    ];
+  }
+
+
+}
diff --git a/src/app/routes/partner/business-statistics/components/sale-statistics/sale-statistics.component.html b/src/app/routes/partner/business-statistics/components/sale-statistics/sale-statistics.component.html
new file mode 100644
index 00000000..7868ebf7
--- /dev/null
+++ b/src/app/routes/partner/business-statistics/components/sale-statistics/sale-statistics.component.html
@@ -0,0 +1,21 @@
+<nz-card>
+  <sf mode="search" [schema]="schema" (formSubmit)="st.load(1)" (formReset)="st.reset($event)"></sf>
+
+</nz-card>
+<nz-card>
+  <st #st [data]="url" [columns]="columns">
+    <ng-template st-row="approvalStatus" let-item>
+      <a [routerLink]="'/'">{{item.approvalStatus}}</a>
+    </ng-template>
+    <ng-template st-row="approvalStatus1" let-item>
+      <div>{{item.approvalStatus1 | currency:' '}}</div>
+    </ng-template>
+    <ng-template st-row="approvalStatus2" let-item>
+      <div class="text-right">{{item.approvalStatus1 | currency:' '}}</div>
+    </ng-template>
+
+    <ng-template st-row="approvalStatus3" let-item>
+      <div class="text-right">{{item.approvalStatus1 | currency:' '}}</div>
+    </ng-template>
+  </st>
+</nz-card>
diff --git a/src/app/routes/partner/business-statistics/components/sale-statistics/sale-statistics.component.spec.ts b/src/app/routes/partner/business-statistics/components/sale-statistics/sale-statistics.component.spec.ts
new file mode 100644
index 00000000..bfa13cd2
--- /dev/null
+++ b/src/app/routes/partner/business-statistics/components/sale-statistics/sale-statistics.component.spec.ts
@@ -0,0 +1,24 @@
+import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import { PartnerSaleStatisticsComponent } from './sale-statistics.component';
+
+describe('PartnerSaleStatisticsComponent', () => {
+  let component: PartnerSaleStatisticsComponent;
+  let fixture: ComponentFixture<PartnerSaleStatisticsComponent>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ PartnerSaleStatisticsComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(PartnerSaleStatisticsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/routes/partner/business-statistics/components/sale-statistics/sale-statistics.component.ts b/src/app/routes/partner/business-statistics/components/sale-statistics/sale-statistics.component.ts
new file mode 100644
index 00000000..247777db
--- /dev/null
+++ b/src/app/routes/partner/business-statistics/components/sale-statistics/sale-statistics.component.ts
@@ -0,0 +1,62 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { STColumn, STComponent } from '@delon/abc/st';
+import { SFSchema, SFUISchema } from '@delon/form';
+import { ModalHelper, _HttpClient } from '@delon/theme';
+
+@Component({
+  selector: 'app-partner-sale-statistics',
+  templateUrl: './sale-statistics.component.html',
+})
+export class PartnerSaleStatisticsComponent implements OnInit {
+  url = `/user`;
+  schema!: SFSchema;
+  @ViewChild('st') private readonly st!: STComponent;
+  columns: STColumn[] = [];
+  ui!: SFUISchema;
+
+  constructor(private http: _HttpClient, private modal: ModalHelper) { }
+
+  ngOnInit(): void {
+    this.initSF();
+    this.initST();
+  }
+
+  initSF() {
+    this.schema = {
+      properties: {
+        abnormalCause: {
+          title: '渠道销售姓名',
+          type: 'string',
+          ui: {
+            placeholder: '请输入',
+          },
+        },
+        abnormalCause1: {
+          title: '手机号',
+          type: 'string',
+          ui: {
+            placeholder: '请输入'
+          },
+        },
+      }
+    };
+    this.ui = { '*': { spanLabelFixed: 120, grid: { span: 8, gutter: 8 } } };
+  }
+  /**
+ * 初始化数据列表
+ */
+  initST() {
+    this.columns = [
+      { title: '姓名', index: 'carNo', className: 'text-center' },
+      { title: '手机号', render: 'carModelLabel', className: 'text-center' },
+      { title: '添加时间', index: 'carNo', className: 'text-center' },
+      { title: '本月新增客户', render: 'approvalStatus', className: 'text-center', sort: true },
+      { title: '客户总数', render: 'approvalStatus', className: 'text-center', sort: true },
+      { title: '本月新增合伙人', render: 'approvalStatus1', className: 'text-center', sort: true },
+      { title: '合伙人总数', render: 'approvalStatus1', className: 'text-center', sort: true },
+      { title: '本月已结算金额（元）', render: 'approvalStatus2', className: 'text-center', sort: true },
+      { title: '累计已结算金额（元）', render: 'approvalStatus3', className: 'text-center', sort: true },
+    ];
+  }
+
+}
diff --git a/src/app/routes/partner/partner-routing.module.ts b/src/app/routes/partner/partner-routing.module.ts
index 9b76c2c4..5de586a3 100644
--- a/src/app/routes/partner/partner-routing.module.ts
+++ b/src/app/routes/partner/partner-routing.module.ts
@@ -1,9 +1,13 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 import { PartnerBusinessStatisticsIndexComponent } from './business-statistics/components/index/index.component';
+import { PartnerPartnerStatisticsComponent } from './business-statistics/components/partner-statistics/partner-statistics.component';
+import { PartnerSaleStatisticsComponent } from './business-statistics/components/sale-statistics/sale-statistics.component';
 
 const routes: Routes = [
-  { path: 'index', component: PartnerBusinessStatisticsIndexComponent }];
+  { path: 'business-statistics/index', component: PartnerBusinessStatisticsIndexComponent },
+  { path: 'partner-statistics', component: PartnerPartnerStatisticsComponent },
+  { path: 'sale-statistics', component: PartnerSaleStatisticsComponent }];
 
 @NgModule({
   imports: [RouterModule.forChild(routes)],
diff --git a/src/app/routes/partner/partner.module.ts b/src/app/routes/partner/partner.module.ts
index c1198f85..ec2a3f5c 100644
--- a/src/app/routes/partner/partner.module.ts
+++ b/src/app/routes/partner/partner.module.ts
@@ -3,9 +3,13 @@ import { CommonModule } from '@angular/common';
 import { SharedModule } from '@shared';
 import { PartnerRoutingModule } from './partner-routing.module';
 import { PartnerBusinessStatisticsIndexComponent } from './business-statistics/components/index/index.component';
+import { PartnerPartnerStatisticsComponent } from './business-statistics/components/partner-statistics/partner-statistics.component';
+import { PartnerSaleStatisticsComponent } from './business-statistics/components/sale-statistics/sale-statistics.component';
 
 const COMPONENTS: any[] = [
-  PartnerBusinessStatisticsIndexComponent];
+  PartnerBusinessStatisticsIndexComponent,
+  PartnerPartnerStatisticsComponent,
+  PartnerSaleStatisticsComponent];
 @NgModule({
   declarations: [...COMPONENTS],
   imports: [CommonModule, PartnerRoutingModule, SharedModule]
diff --git a/src/app/shared/services/business/user.service.ts b/src/app/shared/services/business/user.service.ts
index caf9afe4..3fd685f9 100644
--- a/src/app/shared/services/business/user.service.ts
+++ b/src/app/shared/services/business/user.service.ts
@@ -152,22 +152,22 @@ export class EAUserService extends BaseService {
    * 加载用户菜单
    */
   async loadUserMenus() {
-    return this.asyncRequest(this.$api_get_user_menus, {
-      appId: this.envSrv.getEnvironment().appId
-    }).then(res => {
-      this.cacheSrv.set(cacheConf.menu, res);
-      this.menuService.add(res);
-    });
-    // this.request('assets/mocks/menu-data.json', {}, 'GET').subscribe((res: any) => {
-    //   this.cacheSrv.set(cacheConf.menu, res.menu);
-    //   this.menuService.add(res.menu);
+    // return this.asyncRequest(this.$api_get_user_menus, {
+    //   appId: this.envSrv.getEnvironment().appId
+    // }).then(res => {
+    //   this.cacheSrv.set(cacheConf.menu, res);
+    //   this.menuService.add(res);
     // });
+    this.request('assets/mocks/menu-data.json', {}, 'GET').subscribe((res: any) => {
+      this.cacheSrv.set(cacheConf.menu, res.menu);
+      this.menuService.add(res.menu);
+    });
   }
 
   /**
    * 加载用户角色
    */
-  loadUserRoles() {}
+  loadUserRoles() { }
 
   /**
    * 登出
diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json
index 3ef4f890..28ac960c 100644
--- a/src/assets/mocks/menu-data.json
+++ b/src/assets/mocks/menu-data.json
@@ -1,531 +1,519 @@
 {
   "success": true,
   "data": {
-    "menu": [
-      {
-        "text": "主导航",
-        "hideInBreadcrumb": true,
-        "children": [
-          {
-            "text": "用户中心",
-            "icon": "iconfont icon-yonghu-copy",
-            "group": true,
-            "children": [
-              {
-                "text": "货主管理",
-                "children": [
-                  {
-                    "text": "企业列表",
-                    "link": "/usercenter/freight/list"
-                  },
-                  {
-                    "text": "道运证",
-                    "hide": true,
-                    "link": "/usercenter/freight/list/view/:id"
-                  },
-                  {
-                    "text": "货主详情",
-                    "hide": true,
-                    "link": "/usercenter/freight/list/detail/:id"
-                  },
-                  {
-                    "text": "企业认证",
-                    "hide": true,
-                    "link": "/usercenter/freight/new"
-                  },
-                  {
-                    "text": "企业审核列表",
-                    "link": "/usercenter/freight/enterprise"
-                  },
-                  {
-                    "text": "企业审核列表详情",
-                    "hide": true,
-                    "link": "/usercenter/freight/enterprise/view/:id"
-                  },
-                  {
-                    "text": "货主员工列表",
-                    "link": "/usercenter/freight/user"
-                  },
-                  {
-                    "text": "货主员工详情",
-                    "hide": true,
-                    "link": "/usercenter/freight/user/view/:id"
-                  }
-                ]
-              },
-              {
-                "text": "司机管理",
-                "link": "/demo/zorro",
-                "children": [
-                  {
-                    "text": "司机列表",
-                    "link": "/usercenter/driver"
-                  },
-                  {
-                    "text": "司机详情",
-                    "hide": true,
-                    "link": "/usercenter/driver/detail/:id"
-                  },
-                  {
-                    "text": "车队长列表",
-                    "link": "/usercenter/driver/captain"
-                  },
-                  {
-                    "text": "司机配置",
-                    "link": "/usercenter/driver/config"
-                  }
-                ]
-              }
-            ]
-          },
-          {
-            "text": "运力管理",
-            "icon": "iconfont icon-yunli-copy",
-            "group": true,
-            "children": [
-              {
-                "text": "车辆列表",
-                "link": "/vehicle/list"
-              },
-              {
-                "hide": true,
-                "text": "车辆列表详情",
-                "link": "/vehicle/list/detail/:id"
-              },
-              {
-                "text": "车辆审核列表",
-                "link": "/vehicle/audit"
-              },
-              {
-                "hide": true,
-                "text": "车辆审核列表详情",
-                "link": "/vehicle/audit/detail/:id"
-              }
-            ]
-          },
-          {
-            "text": "货源管理",
-            "icon": "iconfont icon-huoyuan-copy",
-            "group": true,
-            "children": [
-              {
-                "text": "货源管理",
-                "link": "/supply-management/index",
-                "reuse": true
-              },
-              {
-                "text": "货源详情",
-                "link": "/supply-management/bulk-detail",
-                "hide": true
-              },
-              {
-                "text": "修改货源",
-                "link": "/supply-management/vehicle-amend/:id",
-                "hide": true
-              },
-              {
-                "text": "整车代发货源",
-                "link": "/supply-management/vehicle-release",
-                "hide": true
-              },
-              {
-                "text": "大宗代发货源",
-                "link": "/supply-management/bulk-release",
-                "hide": true
-              },
-              {
-                "text": "货源详情",
-                "link": "/supply-management/vehicle-detail/:id",
-                "hide": true
-              }
-            ]
-          },
-          {
-            "text": "订单管理",
-            "icon": "iconfont icon-dingdan-copy",
-            "group": true,
-            "children": [
-              {
-                "text": "整车订单",
-                "link": "/order-management/vehicle"
-              },
-              {
-                "text": "大宗订单",
-                "link": "/order-management/bulk"
-              },
-              {
-                "text": "风险单管理",
-                "link": "/order-management/risk"
-              },
-              {
-                "text": "单据审核",
-                "link": "/order-management/receipts-audit"
-              },
-              {
-                "text": "投诉管理",
-                "link": "/order-management/complaint"
-              },
-              {
-                "text": "合规抽查",
-                "link": "/order-management/compliance-audit"
-              },
-              {
-                "text": "整车订单详情",
-                "link": "/order-management/vehicle-detail/:id",
-                "hide": true
-              },
-              {
-                "text": "大宗订单详情",
-                "link": "/order-management/bulk-detail/:id",
-                "hide": true
-              }
-            ]
-          },
-          {
-            "text": "运单管理",
-            "icon": "iconfont icon-yundan-copy",
-            "group": true,
-            "children": [
-              {
-                "text": "整车运单",
-                "link": "/waybill-management/vehicle"
-              },
-              {
-                "hide": true,
-                "text": "整车运单详情",
-                "link": "/waybill-management/vehicle-detail/:id"
-              },
-              {
-                "text": "大宗运单",
-                "link": "/waybill-management/bulk"
-              },
-              {
-                "hide": true,
-                "text": "大宗运单详情",
-                "link": "/waybill-management/bulk-detail/:id"
-              },
-              {
-                "text": "异常上报",
-                "link": "/waybill-management/abnormal-appear"
-              }
-            ]
-          },
-          {
-            "text": "保险管理",
-            "icon": "iconfont icon-yundan-copy",
-            "group": true,
-            "children": [
-              {
-                "text": "保险列表",
-                "link": "/insurance-management/list"
-              }
-            ]
-          },
-          {
-            "text": "财务管理",
-            "icon": "iconfont icon-caiwu-copy",
-            "group": true,
-            "children": [
-              {
-                "text": "费用管理",
-                "link": "/financial-management/cost-management"
-              },
-              {
-                "text": "费用浏览",
-                "hide": true,
-                "link": "/financial-management/cost-management/detail/:id"
-              },
-              {
-                "text": "凭证管理",
-                "link": "/financial-management/voucher-management"
-              },
-              {
-                "text": "凭证汇总",
-                "link": "/financial-management/voucher-summary"
-              },
-              {
-                "text": "应收费用单",
-                "hide": true,
-                "link": "/financial-management/cost-management/expenses-receivable/:id"
-              },
-              {
-                "text": "应付费用单",
-                "hide": true,
-                "link": "/financial-management/cost-management/expenses-payable/:id"
-              },
-              {
-                "text": "付款单",
-                "link": "/financial-management/payment-order"
-              },
-              {
-                "text": "收款单",
-                "link": "/financial-management/receipt-order"
-              },
-              {
-                "text": "应收核销",
-                "link": "/financial-management/receivable-order"
-              },
-              {
-                "text": "应收核销详情",
-                "hide": true,
-                "link": "/financial-management/receivable-order/detail/:id"
-              },
-              {
-                "text": "应付核销",
-                "link": "/financial-management/payable-order"
-              },
-              {
-                "text": "应收核销详情",
-                "hide": true,
-                "link": "/financial-management/payable-order/detail/:id"
-              },
-              {
-                "text": "货主账户",
-                "link": "/financial-management/freight-account"
-              },
-              {
-                "text": "货主账户详情",
-                "hide": true,
-                "link": "/financial-management/freight-account/detail/:id"
-              },
-              {
-                "text": "平台账户",
-                "link": "/financial-management/platform-account"
-              },
-              {
-                "text": "司机账户",
-                "link": "/financial-management/driver-account"
-              },
-              {
-                "text": "司机账户详情",
-                "hide": true,
-                "link": "/financial-management/driver-account/detail/:id"
-              },
-              {
-                "text": "充值记录",
-                "link": "/financial-management/recharge-record"
-              },
-              {
-                "text": "提现记录",
-                "link": "/financial-management/withdrawals-record"
-              },
-              {
-                "text": "提现详情",
-                "hide": true,
-                "link": "/financial-management/withdrawals-record/detail/:id"
-              },
-              {
-                "text": "异常入金",
-                "link": "/financial-management/abnormal-gold"
-              },
-              {
-                "text": "支付记录",
-                "link": "/financial-management/payment-record"
-              },
-              {
-                "text": "交易流水",
-                "link": "/financial-management/transaction-flow"
-              }
-            ]
-          },
-          {
-            "text": "票务管理",
-            "icon": "iconfont icon-piaowu-copy",
-            "group": true,
-            "children": [
-              {
-                "text": "销项发票",
-                "children": [
-                  {
-                    "text": "开票申请",
-                    "link": "/ticket/invoice-requested"
-                  },
-                  {
-                    "text": "开票订单明细",
-                    "link": "/ticket/invoice-requested/detail/:id",
-                    "hide": true
-                  },
-                  {
-                    "text": "销票处理",
-                    "link": "/ticket/cancellation-invoice"
-                  },
-                  {
-                    "text": "销票订单明细",
-                    "link": "/ticket/cancellation-invoice/detail/:id",
-                    "hide": true
-                  },
-                  {
-                    "text": "已开发票",
-                    "link": "/ticket/invoice-list"
-                  },
-                  {
-                    "text": "已开订单明细",
-                    "link": "/ticket/invoice-list/detail/:id",
-                    "hide": true
-                  },
-                  {
-                    "text": "快递信息",
-                    "link": "/ticket/express-info"
-                  }
-                ]
-              },
-              {
-                "text": "ETC发票",
-                "children": [
-                  {
-                    "text": "申请发票",
-                    "link": "/ticket/etc-invoice-requested"
-                  },
-                  {
-                    "text": "开票记录",
-                    "link": "/ticket/etc-invoice-list"
-                  },
-                  {
-                    "text": "已开发票",
-                    "link": "/ticket/etc-invoiced-logs"
-                  },
-                  {
-                    "text": "ETC白名单",
-                    "link": "/ticket/etc-blacklist"
-                  }
-                ]
-              },
-              {
-                "text": "进项发票",
-                "link": "/ticket/input-invoice"
-              },
-              {
-                "text": "修改收票信息",
-                "link": "/ticket/input-invoice/detail/:id",
-                "hide": true
-              },
-              {
-                "text": "进项发票",
-                "link": "/ticket/input-invoice/edit/:id",
-                "hide": true
-              }
-            ]
-          },
-          {
-            "text": "合同管理",
-            "icon": "iconfont icon-hetong-copy",
-            "group": true,
-            "children": [
-              {
-                "text": "保单管理",
-                "link": "/contract-management/policy"
-              },
-              {
-                "text": "合同管理",
-                "link": "/contract-management/index"
-              },
-              {
-                "text": "合同模板",
-                "link": "/contract-management/template"
-              }
-            ]
-          },
-          {
-            "text": "系统设置",
-            "icon": "iconfont icon-shezhi-copy",
-            "group": true,
-            "children": [
-              {
-                "text": "员工管理",
-                "group": true,
-                "children": [
-                  {
-                    "text": "员工管理",
-                    "link": "/system/staff-management"
-                  },
-                  {
-                    "text": "角色管理",
-                    "link": "/system/role-management"
-                  }
-                ]
-              },
-              {
-                "text": "操作日志",
-                "group": true,
-                "children": [
-                  {
-                    "text": "系统操作日志",
-                    "link": "/logs/system-logs"
-                  },
-                  {
-                    "text": "货源操作日志",
-                    "link": "/logs/system-supply-logs"
-                  },
-                  {
-                    "text": "订单操作日志",
-                    "link": "/logs/system-waybill-logs"
-                  },
-                  {
-                    "text": "用户登录日志",
-                    "link": "/logs/user-logs"
-                  },
-                  {
-                    "text": "版本发布记录",
-                    "link": "/logs/version-logs"
-                  }
-                ]
-              },
-              {
-                "text": "CRM客户管理",
-                "link": "/system/crm-management"
-              },
-              {
-                "text": "结算客户管理",
-                "link": "/system/close-account"
-              },
-              {
-                "text": "网络货运人",
-                "link": "/system/network-freight"
-              },
-              {
-                "text": "基础设置",
-                "link": "/system/basic-setting"
-              },
-              {
-                "text": "保险配置",
-                "link": "/system/insurance-set"
-              },
-              {
-                "text": "公告信息管理",
-                "link": "/system/announcement-message"
-              },
-              {
-                "text": "车型车长配置",
-                "link": "/system/cart-config"
-              },
-              {
-                "text": "基础配置",
-                "link": "/system/basic-config"
-              },
-              {
-                "text": "协议配置",
-                "link": "/system/agreement-config"
-              },
-              {
-                "text": "菜单管理",
-                "link": "/menu-management/index"
-              },
-              {
-                "text": "接口权限",
-                "link": "/menu-management/auth"
-              },
-              {
-                "text": "系统配置",
-                "link": "/system/system-config"
-              },
-              {
-                "text": "货物名称配置",
-                "link": "/system/goods-name-config"
-              }
-            ]
-          }
-        ]
-      }
-    ]
+    "menu": [{
+      "text": "主导航",
+      "hideInBreadcrumb": true,
+      "children": [{
+          "text": "用户中心",
+          "icon": "iconfont icon-yonghu-copy",
+          "group": true,
+          "children": [{
+              "text": "货主管理",
+              "children": [{
+                  "text": "企业列表",
+                  "link": "/usercenter/freight/list"
+                },
+                {
+                  "text": "道运证",
+                  "hide": true,
+                  "link": "/usercenter/freight/list/view/:id"
+                },
+                {
+                  "text": "货主详情",
+                  "hide": true,
+                  "link": "/usercenter/freight/list/detail/:id"
+                },
+                {
+                  "text": "企业认证",
+                  "hide": true,
+                  "link": "/usercenter/freight/new"
+                },
+                {
+                  "text": "企业审核列表",
+                  "link": "/usercenter/freight/enterprise"
+                },
+                {
+                  "text": "企业审核列表详情",
+                  "hide": true,
+                  "link": "/usercenter/freight/enterprise/view/:id"
+                },
+                {
+                  "text": "货主员工列表",
+                  "link": "/usercenter/freight/user"
+                },
+                {
+                  "text": "货主员工详情",
+                  "hide": true,
+                  "link": "/usercenter/freight/user/view/:id"
+                }
+              ]
+            },
+            {
+              "text": "司机管理",
+              "link": "/demo/zorro",
+              "children": [{
+                  "text": "司机列表",
+                  "link": "/usercenter/driver"
+                },
+                {
+                  "text": "司机详情",
+                  "hide": true,
+                  "link": "/usercenter/driver/detail/:id"
+                },
+                {
+                  "text": "车队长列表",
+                  "link": "/usercenter/driver/captain"
+                },
+                {
+                  "text": "司机配置",
+                  "link": "/usercenter/driver/config"
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "text": "运力管理",
+          "icon": "iconfont icon-yunli-copy",
+          "group": true,
+          "children": [{
+              "text": "车辆列表",
+              "link": "/vehicle/list"
+            },
+            {
+              "hide": true,
+              "text": "车辆列表详情",
+              "link": "/vehicle/list/detail/:id"
+            },
+            {
+              "text": "车辆审核列表",
+              "link": "/vehicle/audit"
+            },
+            {
+              "hide": true,
+              "text": "车辆审核列表详情",
+              "link": "/vehicle/audit/detail/:id"
+            }
+          ]
+        },
+        {
+          "text": "货源管理",
+          "icon": "iconfont icon-huoyuan-copy",
+          "group": true,
+          "children": [{
+              "text": "货源管理",
+              "link": "/supply-management/index",
+              "reuse": true
+            },
+            {
+              "text": "货源详情",
+              "link": "/supply-management/bulk-detail",
+              "hide": true
+            },
+            {
+              "text": "修改货源",
+              "link": "/supply-management/vehicle-amend/:id",
+              "hide": true
+            },
+            {
+              "text": "整车代发货源",
+              "link": "/supply-management/vehicle-release",
+              "hide": true
+            },
+            {
+              "text": "大宗代发货源",
+              "link": "/supply-management/bulk-release",
+              "hide": true
+            },
+            {
+              "text": "货源详情",
+              "link": "/supply-management/vehicle-detail/:id",
+              "hide": true
+            }
+          ]
+        },
+        {
+          "text": "订单管理",
+          "icon": "iconfont icon-dingdan-copy",
+          "group": true,
+          "children": [{
+              "text": "整车订单",
+              "link": "/order-management/vehicle"
+            },
+            {
+              "text": "大宗订单",
+              "link": "/order-management/bulk"
+            },
+            {
+              "text": "风险单管理",
+              "link": "/order-management/risk"
+            },
+            {
+              "text": "单据审核",
+              "link": "/order-management/receipts-audit"
+            },
+            {
+              "text": "投诉管理",
+              "link": "/order-management/complaint"
+            },
+            {
+              "text": "合规抽查",
+              "link": "/order-management/compliance-audit"
+            },
+            {
+              "text": "整车订单详情",
+              "link": "/order-management/vehicle-detail/:id",
+              "hide": true
+            },
+            {
+              "text": "大宗订单详情",
+              "link": "/order-management/bulk-detail/:id",
+              "hide": true
+            }
+          ]
+        },
+        {
+          "text": "运单管理",
+          "icon": "iconfont icon-yundan-copy",
+          "group": true,
+          "children": [{
+              "text": "整车运单",
+              "link": "/waybill-management/vehicle"
+            },
+            {
+              "hide": true,
+              "text": "整车运单详情",
+              "link": "/waybill-management/vehicle-detail/:id"
+            },
+            {
+              "text": "大宗运单",
+              "link": "/waybill-management/bulk"
+            },
+            {
+              "hide": true,
+              "text": "大宗运单详情",
+              "link": "/waybill-management/bulk-detail/:id"
+            },
+            {
+              "text": "异常上报",
+              "link": "/waybill-management/abnormal-appear"
+            }
+          ]
+        },
+        {
+          "text": "保险管理",
+          "icon": "iconfont icon-yundan-copy",
+          "group": true,
+          "children": [{
+            "text": "保险列表",
+            "link": "/insurance-management/list"
+          }]
+        },
+        {
+          "text": "财务管理",
+          "icon": "iconfont icon-caiwu-copy",
+          "group": true,
+          "children": [{
+              "text": "费用管理",
+              "link": "/financial-management/cost-management"
+            },
+            {
+              "text": "费用浏览",
+              "hide": true,
+              "link": "/financial-management/cost-management/detail/:id"
+            },
+            {
+              "text": "凭证管理",
+              "link": "/financial-management/voucher-management"
+            },
+            {
+              "text": "凭证汇总",
+              "link": "/financial-management/voucher-summary"
+            },
+            {
+              "text": "应收费用单",
+              "hide": true,
+              "link": "/financial-management/cost-management/expenses-receivable/:id"
+            },
+            {
+              "text": "应付费用单",
+              "hide": true,
+              "link": "/financial-management/cost-management/expenses-payable/:id"
+            },
+            {
+              "text": "付款单",
+              "link": "/financial-management/payment-order"
+            },
+            {
+              "text": "收款单",
+              "link": "/financial-management/receipt-order"
+            },
+            {
+              "text": "应收核销",
+              "link": "/financial-management/receivable-order"
+            },
+            {
+              "text": "应收核销详情",
+              "hide": true,
+              "link": "/financial-management/receivable-order/detail/:id"
+            },
+            {
+              "text": "应付核销",
+              "link": "/financial-management/payable-order"
+            },
+            {
+              "text": "应收核销详情",
+              "hide": true,
+              "link": "/financial-management/payable-order/detail/:id"
+            },
+            {
+              "text": "货主账户",
+              "link": "/financial-management/freight-account"
+            },
+            {
+              "text": "货主账户详情",
+              "hide": true,
+              "link": "/financial-management/freight-account/detail/:id"
+            },
+            {
+              "text": "平台账户",
+              "link": "/financial-management/platform-account"
+            },
+            {
+              "text": "司机账户",
+              "link": "/financial-management/driver-account"
+            },
+            {
+              "text": "司机账户详情",
+              "hide": true,
+              "link": "/financial-management/driver-account/detail/:id"
+            },
+            {
+              "text": "充值记录",
+              "link": "/financial-management/recharge-record"
+            },
+            {
+              "text": "提现记录",
+              "link": "/financial-management/withdrawals-record"
+            },
+            {
+              "text": "提现详情",
+              "hide": true,
+              "link": "/financial-management/withdrawals-record/detail/:id"
+            },
+            {
+              "text": "异常入金",
+              "link": "/financial-management/abnormal-gold"
+            },
+            {
+              "text": "支付记录",
+              "link": "/financial-management/payment-record"
+            },
+            {
+              "text": "交易流水",
+              "link": "/financial-management/transaction-flow"
+            }
+          ]
+        },
+        {
+          "text": "票务管理",
+          "icon": "iconfont icon-piaowu-copy",
+          "group": true,
+          "children": [{
+              "text": "销项发票",
+              "children": [{
+                  "text": "开票申请",
+                  "link": "/ticket/invoice-requested"
+                },
+                {
+                  "text": "开票订单明细",
+                  "link": "/ticket/invoice-requested/detail/:id",
+                  "hide": true
+                },
+                {
+                  "text": "销票处理",
+                  "link": "/ticket/cancellation-invoice"
+                },
+                {
+                  "text": "销票订单明细",
+                  "link": "/ticket/cancellation-invoice/detail/:id",
+                  "hide": true
+                },
+                {
+                  "text": "已开发票",
+                  "link": "/ticket/invoice-list"
+                },
+                {
+                  "text": "已开订单明细",
+                  "link": "/ticket/invoice-list/detail/:id",
+                  "hide": true
+                },
+                {
+                  "text": "快递信息",
+                  "link": "/ticket/express-info"
+                }
+              ]
+            },
+            {
+              "text": "ETC发票",
+              "children": [{
+                  "text": "申请发票",
+                  "link": "/ticket/etc-invoice-requested"
+                },
+                {
+                  "text": "开票记录",
+                  "link": "/ticket/etc-invoice-list"
+                },
+                {
+                  "text": "已开发票",
+                  "link": "/ticket/etc-invoiced-logs"
+                },
+                {
+                  "text": "ETC白名单",
+                  "link": "/ticket/etc-blacklist"
+                }
+              ]
+            },
+            {
+              "text": "进项发票",
+              "link": "/ticket/input-invoice"
+            },
+            {
+              "text": "修改收票信息",
+              "link": "/ticket/input-invoice/detail/:id",
+              "hide": true
+            },
+            {
+              "text": "进项发票",
+              "link": "/ticket/input-invoice/edit/:id",
+              "hide": true
+            }
+          ]
+        },
+        {
+          "text": "合同管理",
+          "icon": "iconfont icon-hetong-copy",
+          "group": true,
+          "children": [{
+              "text": "保单管理",
+              "link": "/contract-management/policy"
+            },
+            {
+              "text": "合同管理",
+              "link": "/contract-management/index"
+            },
+            {
+              "text": "合同模板",
+              "link": "/contract-management/template"
+            }
+          ]
+        },
+        {
+          "text": "系统设置",
+          "icon": "iconfont icon-shezhi-copy",
+          "group": true,
+          "children": [{
+              "text": "员工管理",
+              "group": true,
+              "children": [{
+                  "text": "员工管理",
+                  "link": "/system/staff-management"
+                },
+                {
+                  "text": "角色管理",
+                  "link": "/system/role-management"
+                }
+              ]
+            },
+            {
+              "text": "操作日志",
+              "group": true,
+              "children": [{
+                  "text": "系统操作日志",
+                  "link": "/logs/system-logs"
+                },
+                {
+                  "text": "货源操作日志",
+                  "link": "/logs/system-supply-logs"
+                },
+                {
+                  "text": "订单操作日志",
+                  "link": "/logs/system-waybill-logs"
+                },
+                {
+                  "text": "用户登录日志",
+                  "link": "/logs/user-logs"
+                },
+                {
+                  "text": "版本发布记录",
+                  "link": "/logs/version-logs"
+                }
+              ]
+            },
+            {
+              "text": "CRM客户管理",
+              "link": "/system/crm-management"
+            },
+            {
+              "text": "结算客户管理",
+              "link": "/system/close-account"
+            },
+            {
+              "text": "网络货运人",
+              "link": "/system/network-freight"
+            },
+            {
+              "text": "基础设置",
+              "link": "/system/basic-setting"
+            },
+            {
+              "text": "保险配置",
+              "link": "/system/insurance-set"
+            },
+            {
+              "text": "公告信息管理",
+              "link": "/system/announcement-message"
+            },
+            {
+              "text": "车型车长配置",
+              "link": "/system/cart-config"
+            },
+            {
+              "text": "基础配置",
+              "link": "/system/basic-config"
+            },
+            {
+              "text": "协议配置",
+              "link": "/system/agreement-config"
+            },
+            {
+              "text": "菜单管理",
+              "link": "/menu-management/index"
+            },
+            {
+              "text": "接口权限",
+              "link": "/menu-management/auth"
+            },
+            {
+              "text": "系统配置",
+              "link": "/system/system-config"
+            },
+            {
+              "text": "货物名称配置",
+              "link": "/system/goods-name-config"
+            }
+          ]
+        },
+        {
+          "text": "合伙人管理",
+          "icon": "anticon anticon-dashboard",
+          "children": [{
+            "text": "业务统计",
+            "link": "/partner/business-statistics/index"
+          }]
+        }
+      ]
+    }]
   }
-}
\ No newline at end of file
+}

From d198a69eefa262081d2e7e95cd2362faa605350c Mon Sep 17 00:00:00 2001
From: heqinghang <qinghang.he@eascs.com>
Date: Thu, 24 Feb 2022 14:11:57 +0800
Subject: [PATCH 02/70] 666

---
 .../components/edit/edit.component.html       |   7 +
 .../components/edit/edit.component.ts         | 114 +++++++++++
 .../components/list/list.component.html       |  28 +++
 .../components/list/list.component.ts         | 175 +++++++++++++++++
 .../services/channel-sales.service.ts         |  12 ++
 .../components/edit/edit.component.html       |   7 +
 .../components/edit/edit.component.ts         |  88 +++++++++
 .../components/list/list.component.html       |  28 +++
 .../components/list/list.component.ts         | 180 ++++++++++++++++++
 .../services/level-config.service.ts          |  12 ++
 .../routes/partner/partner-routing.module.ts  |  20 +-
 src/app/routes/partner/partner.module.ts      |  11 +-
 12 files changed, 680 insertions(+), 2 deletions(-)
 create mode 100644 src/app/routes/partner/channel-sales/components/edit/edit.component.html
 create mode 100644 src/app/routes/partner/channel-sales/components/edit/edit.component.ts
 create mode 100644 src/app/routes/partner/channel-sales/components/list/list.component.html
 create mode 100644 src/app/routes/partner/channel-sales/components/list/list.component.ts
 create mode 100644 src/app/routes/partner/channel-sales/services/channel-sales.service.ts
 create mode 100644 src/app/routes/partner/level-config/components/edit/edit.component.html
 create mode 100644 src/app/routes/partner/level-config/components/edit/edit.component.ts
 create mode 100644 src/app/routes/partner/level-config/components/list/list.component.html
 create mode 100644 src/app/routes/partner/level-config/components/list/list.component.ts
 create mode 100644 src/app/routes/partner/level-config/services/level-config.service.ts

diff --git a/src/app/routes/partner/channel-sales/components/edit/edit.component.html b/src/app/routes/partner/channel-sales/components/edit/edit.component.html
new file mode 100644
index 00000000..ba3e7981
--- /dev/null
+++ b/src/app/routes/partner/channel-sales/components/edit/edit.component.html
@@ -0,0 +1,7 @@
+<sf #sf [ui]="ui" [schema]="schema" [button]="'none'" [formData]="i">
+</sf>
+
+<div *nzModalFooter>
+  <button nz-button nzType="default" (click)="close()">取消</button>
+  <button nz-button nzType="primary" (click)="save()">确认</button>
+</div>
diff --git a/src/app/routes/partner/channel-sales/components/edit/edit.component.ts b/src/app/routes/partner/channel-sales/components/edit/edit.component.ts
new file mode 100644
index 00000000..5e5d6e85
--- /dev/null
+++ b/src/app/routes/partner/channel-sales/components/edit/edit.component.ts
@@ -0,0 +1,114 @@
+import { AfterViewInit, ChangeDetectorRef, Component, OnChanges, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { SFComponent, SFRadioWidgetSchema, SFSchema, SFSchemaEnumType, SFSelectWidgetSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form';
+import { _HttpClient } from '@delon/theme';
+import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
+import { map } from 'rxjs/operators';
+import { AmapPoiPickerComponent } from 'src/app/shared/components/amap';
+import { ChannelSalesService } from '../../services/channel-sales.service';
+
+@Component({
+  selector: 'app-parter-channel-sales-edit',
+  templateUrl: './edit.component.html'
+})
+export class ParterChannelSalesEditComponent implements OnInit {
+  @ViewChild('sf', { static: false }) sf!: SFComponent;
+  schema!: SFSchema;
+  ui!: SFUISchema;
+  i: any;
+  type: any;
+
+  constructor(
+    public http: _HttpClient,
+    private cdr: ChangeDetectorRef,
+    private route: ActivatedRoute,
+    private modalService: NzModalService,
+    public service: ChannelSalesService,
+    private modalRef: NzModalRef
+  ) {}
+
+  ngOnInit(): void {
+    this.initSF();
+  }
+  initSF() {
+    this.schema = {
+      properties: {
+        id: {
+          type: 'string',
+          title: '',
+          ui: { hidden: true }
+        },
+        name1: {
+          title: '业务员选择',
+          type: 'string',
+          enum: [
+            { label: '王武', value: '1'},
+          ],
+          ui: {
+            widget: 'select',
+            placeholder:'请选择'
+          } as SFSelectWidgetSchema,
+        },
+        name2: {
+          type: 'string',
+          title: '授权登录运营后台',
+          enum: [
+            { label: '否', value: '0' },
+            { label: '是', value: '1' }
+          ],
+          ui: {
+            widget: 'radio',
+          } as SFRadioWidgetSchema,
+          default: 'A',
+        },
+        name: {
+          title: '',
+          type: 'string',
+          enum: [
+            { label: '管理员', value: '1'},
+          ],
+          ui: {
+            widget: 'select',
+            placeholder:'授权角色',
+            visibleIf: { name2: (value: string) => value === '1' }
+          } as SFSelectWidgetSchema,
+        },
+        name3: {
+          type: 'string',
+          title: '备注',
+          maxLength: 50,
+          ui: {
+            widget: 'textarea',
+            autosize: { minRows: 3, maxRows: 6 },
+            placeholder:'请输入50字符'
+          } as SFTextareaWidgetSchema,
+        },
+      },
+      required: ['name1', 'name2']
+    };
+    this.ui = {
+      '*': {
+        spanLabelFixed: 150,
+        grid: { span: 24 }
+      },
+      $name:{ spanLabelFixed: 10, grid: { span: 12 }},
+      $name2:{  grid: { span: 12 }},
+
+    };
+  }
+
+  close() {
+    this.modalRef.destroy();
+  }
+  save() {
+    this.sf.validator({ emitError: true });
+    if(!this.sf.valid) return;
+    // this.service.request('', { ...this.sf.value }).subscribe(res => {
+    //   if (res) {
+    //     this.modalRef.destroy(true);
+    //   } else {
+    //     this.service.msgSrv.error(res.msg);
+    //   }
+    // });
+  }
+}
diff --git a/src/app/routes/partner/channel-sales/components/list/list.component.html b/src/app/routes/partner/channel-sales/components/list/list.component.html
new file mode 100644
index 00000000..6cc8f619
--- /dev/null
+++ b/src/app/routes/partner/channel-sales/components/list/list.component.html
@@ -0,0 +1,28 @@
+<nz-card>
+  <!-- 搜索区 -->
+  <sf
+    #sf
+    [ui]="ui"
+    [schema]="schema"
+    [mode]="'search'"
+    (formSubmit)="st?.load(1)"
+    (formReset)="resetSF()"
+  ></sf>
+</nz-card>
+
+<nz-card>
+  <button nz-button nzType="primary" style="margin-bottom: 24px" (click)="add()"><i nz-icon nzType="plus"></i>新增</button>
+  <!-- 数据列表 -->
+  <st
+    #st
+    [bordered]="true"
+    [data]="data"
+    [columns]="columns"
+    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+    [loadingDelay]="500"
+    [loading]="service.http.loading"
+  >
+  </st>
+</nz-card>
diff --git a/src/app/routes/partner/channel-sales/components/list/list.component.ts b/src/app/routes/partner/channel-sales/components/list/list.component.ts
new file mode 100644
index 00000000..2debda3f
--- /dev/null
+++ b/src/app/routes/partner/channel-sales/components/list/list.component.ts
@@ -0,0 +1,175 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st';
+import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
+import { processSingleSort } from '@shared';
+import { NzModalService } from 'ng-zorro-antd/modal';
+import { ChannelSalesService } from '../../services/channel-sales.service';
+import { ParterChannelSalesEditComponent } from '../edit/edit.component';
+
+@Component({
+  selector: 'app-parter-channel-sales-list',
+  templateUrl: './list.component.html'
+})
+export class ParterChannelSalesListComponent implements OnInit {
+  schema: SFSchema = {};
+  columns!: STColumn[];
+  ui!: SFUISchema;
+  @ViewChild('st', { static: false })
+  st!: STComponent;
+  @ViewChild('sf', { static: false })
+  sf!: SFComponent;
+  spuStatus = '1';
+
+  data=[{name1:1111}]
+  constructor(
+    public router: Router,
+    public ar: ActivatedRoute,
+    public service: ChannelSalesService,
+    private modalService: NzModalService
+  ) {}
+
+  /**
+   * 查询参数
+   */
+  get reqParams() {
+    return { ...this.sf?.value };
+  }
+  ngOnInit() {
+    this.initSF();
+    this.initST();
+  }
+
+  initSF() {
+    this.schema = {
+      properties: {
+        name: {
+          type: 'string',
+          title: '销售渠道姓名'
+        },
+        phone: {
+          type: 'string',
+          title: '手机号'
+        },
+      }
+    };
+    this.ui = {
+      '*': {
+        grid: { span: 8, gutter: 4 }
+      }
+    };
+  }
+
+  initST() {
+    this.columns = [
+      {
+        title: '销售渠道姓名',
+        index: 'name1'
+      },
+      {
+        title: '手机号',
+        index: 'name1'
+      },
+      {
+        title: '所属组织',
+        index: 'name1'
+      },
+      {
+        title: '职级',
+        index: 'name1'
+      },
+      {
+        title: '等级',
+        index: 'name1'
+      },
+      {
+        title: '省市',
+        index: 'name1'
+      },
+      {
+        title: '邀请码',
+        index: 'name1'
+      },
+      {
+        title: '操作',
+        className: 'text-center',
+        buttons: [
+          {
+            text: '编辑',
+            click: (_record, _modal, _instance) => this.edit(_record),
+          },
+          {
+            text: '查看',
+            click: (_record, _modal, _instance) => this.view(_record),
+          },
+          {
+            text: '冻结',
+            click: (_record, _modal, _instance) => this.stop(_record.id),
+          }
+        ]
+      }
+    ];
+  }
+
+  add() {
+    const modalRef = this.modalService.create({
+      nzWidth:600,
+      nzTitle: '新增',
+      nzContent: ParterChannelSalesEditComponent,
+      nzComponentParams: { type: this.spuStatus }
+    });
+    modalRef.afterClose.subscribe(res => {
+      if (res) {
+        this.st.reload();
+      }
+    });
+  }
+
+  // 编辑
+  edit(record: STData) {
+    const modalRef = this.modalService.create({
+      nzWidth:600,
+      nzTitle: '编辑',
+      nzContent: ParterChannelSalesEditComponent,
+      nzComponentParams: { i: record, type: this.spuStatus }
+    });
+    modalRef.afterClose.subscribe(res => {
+      if (res) {
+        this.st.reload();
+      }
+    });
+  }
+
+   // 编辑
+   view(record: STData) {
+    const modalRef = this.modalService.create({
+      nzTitle: '查看',
+      nzContent: ParterChannelSalesEditComponent,
+      nzComponentParams: { i: record }
+    });
+  }
+
+  stop(id: any) {
+    this.modalService.confirm({
+      nzTitle: '<i>冻结确认</i>',
+      nzContent: `<b>确定冻结该账号吗？</br>`,
+      // nzOnOk: () =>
+      //   this.service.request('', '').subscribe(res => {
+      //     if (res) {
+      //       this.service.msgSrv.success('冻结成功！');
+      //       this.st.reload();
+      //     }
+      //   })
+    });
+  }
+
+  /**
+   * 重置表单
+   */
+  resetSF() {
+    this.sf.reset();
+    this.st.load(1);
+  }
+
+
+}
diff --git a/src/app/routes/partner/channel-sales/services/channel-sales.service.ts b/src/app/routes/partner/channel-sales/services/channel-sales.service.ts
new file mode 100644
index 00000000..6e7cb18c
--- /dev/null
+++ b/src/app/routes/partner/channel-sales/services/channel-sales.service.ts
@@ -0,0 +1,12 @@
+import { Injectable, Injector } from '@angular/core';
+import { BaseService } from '@shared';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class ChannelSalesService extends BaseService {
+
+  constructor(public injector: Injector) {
+    super(injector);
+  }
+}
diff --git a/src/app/routes/partner/level-config/components/edit/edit.component.html b/src/app/routes/partner/level-config/components/edit/edit.component.html
new file mode 100644
index 00000000..ba3e7981
--- /dev/null
+++ b/src/app/routes/partner/level-config/components/edit/edit.component.html
@@ -0,0 +1,7 @@
+<sf #sf [ui]="ui" [schema]="schema" [button]="'none'" [formData]="i">
+</sf>
+
+<div *nzModalFooter>
+  <button nz-button nzType="default" (click)="close()">取消</button>
+  <button nz-button nzType="primary" (click)="save()">确认</button>
+</div>
diff --git a/src/app/routes/partner/level-config/components/edit/edit.component.ts b/src/app/routes/partner/level-config/components/edit/edit.component.ts
new file mode 100644
index 00000000..35bc59a3
--- /dev/null
+++ b/src/app/routes/partner/level-config/components/edit/edit.component.ts
@@ -0,0 +1,88 @@
+import { AfterViewInit, ChangeDetectorRef, Component, OnChanges, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { SFComponent, SFRadioWidgetSchema, SFSchema, SFSchemaEnumType, SFSelectWidgetSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form';
+import { _HttpClient } from '@delon/theme';
+import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
+import { map } from 'rxjs/operators';
+import { AmapPoiPickerComponent } from 'src/app/shared/components/amap';
+import { ChannelSalesService } from '../../services/level-config.service';
+
+@Component({
+  selector: 'app-parter-LevelConfig-edit',
+  templateUrl: './edit.component.html'
+})
+export class ParterLevelConfigEditComponent implements OnInit {
+  @ViewChild('sf', { static: false }) sf!: SFComponent;
+  schema!: SFSchema;
+  ui!: SFUISchema;
+  i: any;
+  type: any;
+
+  constructor(
+    public http: _HttpClient,
+    private cdr: ChangeDetectorRef,
+    private route: ActivatedRoute,
+    private modalService: NzModalService,
+    public service: ChannelSalesService,
+    private modalRef: NzModalRef
+  ) {}
+
+  ngOnInit(): void {
+    this.initSF();
+  }
+  initSF() {
+    this.schema = {
+      properties: {
+        id: {
+          type: 'string',
+          title: '',
+          ui: { hidden: true }
+        },
+        name: {
+          title: '合伙人等级',
+          type: 'string',
+          enum: [
+            { label: '管理员', value: '1'},
+          ],
+          ui: {
+            widget: 'select',
+            placeholder:'请选择',
+            visibleIf: { name2: (value: string) => value === '1' }
+          } as SFSelectWidgetSchema,
+        },
+        name3: {
+          type: 'string',
+          title: '备注',
+          maxLength: 50,
+          ui: {
+            widget: 'textarea',
+            autosize: { minRows: 3, maxRows: 6 },
+            placeholder:'请输入50字符'
+          } as SFTextareaWidgetSchema,
+        },
+      },
+      required: ['name1', 'name2']
+    };
+    this.ui = {
+      '*': {
+        spanLabelFixed: 120,
+        grid: { span: 24 }
+      },
+    };
+  }
+
+  close() {
+    this.modalRef.destroy();
+  }
+  save() {
+    this.sf.validator({ emitError: true });
+    if(!this.sf.valid) return;
+    // this.service.request('', { ...this.sf.value }).subscribe(res => {
+    //   if (res) {
+    //     this.modalRef.destroy(true);
+    //   } else {
+    //     this.service.msgSrv.error(res.msg);
+    //   }
+    // });
+  }
+}
diff --git a/src/app/routes/partner/level-config/components/list/list.component.html b/src/app/routes/partner/level-config/components/list/list.component.html
new file mode 100644
index 00000000..6cc8f619
--- /dev/null
+++ b/src/app/routes/partner/level-config/components/list/list.component.html
@@ -0,0 +1,28 @@
+<nz-card>
+  <!-- 搜索区 -->
+  <sf
+    #sf
+    [ui]="ui"
+    [schema]="schema"
+    [mode]="'search'"
+    (formSubmit)="st?.load(1)"
+    (formReset)="resetSF()"
+  ></sf>
+</nz-card>
+
+<nz-card>
+  <button nz-button nzType="primary" style="margin-bottom: 24px" (click)="add()"><i nz-icon nzType="plus"></i>新增</button>
+  <!-- 数据列表 -->
+  <st
+    #st
+    [bordered]="true"
+    [data]="data"
+    [columns]="columns"
+    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+    [loadingDelay]="500"
+    [loading]="service.http.loading"
+  >
+  </st>
+</nz-card>
diff --git a/src/app/routes/partner/level-config/components/list/list.component.ts b/src/app/routes/partner/level-config/components/list/list.component.ts
new file mode 100644
index 00000000..25e56d43
--- /dev/null
+++ b/src/app/routes/partner/level-config/components/list/list.component.ts
@@ -0,0 +1,180 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st';
+import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
+import { processSingleSort } from '@shared';
+import { NzModalService } from 'ng-zorro-antd/modal';
+import { ChannelSalesService } from '../../services/level-config.service';
+import { ParterLevelConfigEditComponent } from '../edit/edit.component';
+
+@Component({
+  selector: 'app-parter-LevelConfig-list',
+  templateUrl: './list.component.html'
+})
+export class ParterLevelConfigListComponent implements OnInit {
+  schema: SFSchema = {};
+  columns!: STColumn[];
+  ui!: SFUISchema;
+  @ViewChild('st', { static: false })
+  st!: STComponent;
+  @ViewChild('sf', { static: false })
+  sf!: SFComponent;
+  spuStatus = '1';
+
+  data=[{name1:1111}]
+  constructor(
+    public router: Router,
+    public ar: ActivatedRoute,
+    public service: ChannelSalesService,
+    private modalService: NzModalService
+  ) {}
+
+  /**
+   * 查询参数
+   */
+  get reqParams() {
+    return { ...this.sf?.value };
+  }
+  ngOnInit() {
+    this.initSF();
+    this.initST();
+  }
+
+  initSF() {
+    this.schema = {
+      properties: {
+        name: {
+          type: 'string',
+          title: '等级姓名'
+        },
+        phone: {
+          type: 'string',
+          title: '状态'
+        },
+      }
+    };
+    this.ui = {
+      '*': {
+        grid: { span: 8, gutter: 4 }
+      }
+    };
+  }
+
+  initST() {
+    this.columns = [
+      {
+        title: '等级姓名',
+        index: 'name1'
+      },
+      {
+        title: '备注',
+        index: 'name1'
+      },
+      {
+        title: '创建时间',
+        index: 'name1'
+      },
+      {
+        title: '启用时间',
+        index: 'name1'
+      },
+      {
+        title: '状态',
+        index: 'name1'
+      },
+      {
+        title: '操作',
+        className: 'text-center',
+        buttons: [
+          {
+            text: '编辑',
+            click: (_record, _modal, _instance) => this.edit(_record),
+          },
+          {
+            text: '禁用',
+            click: (_record, _modal, _instance) => this.stop(_record),
+          },
+          {
+            text: '启用',
+            click: (_record, _modal, _instance) => this.restart(_record),
+          }
+        ]
+      }
+    ];
+  }
+
+  add() {
+    const modalRef = this.modalService.create({
+      nzWidth:500,
+      nzTitle: '新增',
+      nzContent: ParterLevelConfigEditComponent,
+      nzComponentParams: { type: this.spuStatus }
+    });
+    modalRef.afterClose.subscribe(res => {
+      if (res) {
+        this.st.reload();
+      }
+    });
+  }
+
+  // 编辑
+  edit(record: STData) {
+    const modalRef = this.modalService.create({
+      nzWidth:500,
+      nzTitle: '编辑',
+      nzContent: ParterLevelConfigEditComponent,
+      nzComponentParams: { i: record, type: this.spuStatus }
+    });
+    modalRef.afterClose.subscribe(res => {
+      if (res) {
+        this.st.reload();
+      }
+    });
+  }
+
+   // 编辑
+   view(record: STData) {
+    const modalRef = this.modalService.create({
+      nzTitle: '查看',
+      nzContent: ParterLevelConfigEditComponent,
+      nzComponentParams: { i: record }
+    });
+  }
+
+  restart(id: any) {
+    this.modalService.confirm({
+      nzTitle: '<i>冻结确认</i>',
+      nzContent: `<b>确定启用该账号吗？</br>`,
+      // nzOnOk: () =>
+      //   this.service.request('', '').subscribe(res => {
+      //     if (res) {
+      //       this.service.msgSrv.success('冻结成功！');
+      //       this.st.reload();
+      //     }
+      //   })
+    });
+  }
+  stop(id: any) {
+    this.modalService.confirm({
+      nzTitle: '<i>冻结确认</i>',
+      nzContent: `<b>确定禁用该账号吗？</br>`,
+      // nzOnOk: () =>
+      //   this.service.request('', '').subscribe(res => {
+      //     if (res) {
+      //       this.service.msgSrv.success('冻结成功！');
+      //       this.st.reload();
+      //     }
+      //   })
+    });
+  }
+
+  /**
+   * 重置表单
+   */
+  resetSF() {
+    this.sf.reset();
+    this.st.load(1);
+  }
+
+
+}
diff --git a/src/app/routes/partner/level-config/services/level-config.service.ts b/src/app/routes/partner/level-config/services/level-config.service.ts
new file mode 100644
index 00000000..6e7cb18c
--- /dev/null
+++ b/src/app/routes/partner/level-config/services/level-config.service.ts
@@ -0,0 +1,12 @@
+import { Injectable, Injector } from '@angular/core';
+import { BaseService } from '@shared';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class ChannelSalesService extends BaseService {
+
+  constructor(public injector: Injector) {
+    super(injector);
+  }
+}
diff --git a/src/app/routes/partner/partner-routing.module.ts b/src/app/routes/partner/partner-routing.module.ts
index 9b76c2c4..95585b24 100644
--- a/src/app/routes/partner/partner-routing.module.ts
+++ b/src/app/routes/partner/partner-routing.module.ts
@@ -1,9 +1,27 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 import { PartnerBusinessStatisticsIndexComponent } from './business-statistics/components/index/index.component';
+import { ParterChannelSalesEditComponent } from './channel-sales/components/edit/edit.component';
+import { ParterChannelSalesListComponent } from './channel-sales/components/list/list.component';
+import { ParterLevelConfigEditComponent } from './level-config/components/edit/edit.component';
+import { ParterLevelConfigListComponent } from './level-config/components/list/list.component';
 
 const routes: Routes = [
-  { path: 'index', component: PartnerBusinessStatisticsIndexComponent }];
+  { path: 'index', component: PartnerBusinessStatisticsIndexComponent },
+  { path: 'channel-sales',
+    children:[
+      {path: 'list', component: ParterChannelSalesListComponent},
+      {path: 'edit', component: ParterChannelSalesEditComponent},
+    ]
+  },
+  { path: 'level-config',
+    children:[
+      {path: 'list', component: ParterLevelConfigListComponent},
+      {path: 'edit', component: ParterLevelConfigEditComponent},
+    ]
+  },
+
+];
 
 @NgModule({
   imports: [RouterModule.forChild(routes)],
diff --git a/src/app/routes/partner/partner.module.ts b/src/app/routes/partner/partner.module.ts
index c1198f85..bb93e84d 100644
--- a/src/app/routes/partner/partner.module.ts
+++ b/src/app/routes/partner/partner.module.ts
@@ -3,9 +3,18 @@ import { CommonModule } from '@angular/common';
 import { SharedModule } from '@shared';
 import { PartnerRoutingModule } from './partner-routing.module';
 import { PartnerBusinessStatisticsIndexComponent } from './business-statistics/components/index/index.component';
+import { ParterChannelSalesListComponent } from './channel-sales/components/list/list.component';
+import { ParterChannelSalesEditComponent } from './channel-sales/components/edit/edit.component';
+import { ParterLevelConfigEditComponent } from './level-config/components/edit/edit.component';
+import { ParterLevelConfigListComponent } from './level-config/components/list/list.component';
 
 const COMPONENTS: any[] = [
-  PartnerBusinessStatisticsIndexComponent];
+  PartnerBusinessStatisticsIndexComponent,
+  ParterChannelSalesListComponent,
+  ParterChannelSalesEditComponent,
+  ParterLevelConfigListComponent,
+  ParterLevelConfigEditComponent
+];
 @NgModule({
   declarations: [...COMPONENTS],
   imports: [CommonModule, PartnerRoutingModule, SharedModule]

From d6a5eab32069f2222a3a9bbd9b49798447c5def1 Mon Sep 17 00:00:00 2001
From: heqinghang <qinghang.he@eascs.com>
Date: Thu, 24 Feb 2022 14:21:29 +0800
Subject: [PATCH 03/70] 666

---
 src/app/routes/partner/partner-routing.module.ts |  2 ++
 src/assets/mocks/menu-data.json                  | 14 ++++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/app/routes/partner/partner-routing.module.ts b/src/app/routes/partner/partner-routing.module.ts
index 822197ac..f268d89d 100644
--- a/src/app/routes/partner/partner-routing.module.ts
+++ b/src/app/routes/partner/partner-routing.module.ts
@@ -14,12 +14,14 @@ const routes: Routes = [
   { path: 'sale-statistics', component: PartnerSaleStatisticsComponent },
   { path: 'channel-sales',
     children:[
+      {path: '', component: ParterChannelSalesListComponent},
       {path: 'list', component: ParterChannelSalesListComponent},
       {path: 'edit', component: ParterChannelSalesEditComponent},
     ]
   },
   { path: 'level-config',
     children:[
+      {path: '', component: ParterLevelConfigListComponent},
       {path: 'list', component: ParterLevelConfigListComponent},
       {path: 'edit', component: ParterLevelConfigEditComponent},
     ]
diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json
index 28ac960c..0ee7956f 100644
--- a/src/assets/mocks/menu-data.json
+++ b/src/assets/mocks/menu-data.json
@@ -508,10 +508,20 @@
         {
           "text": "合伙人管理",
           "icon": "anticon anticon-dashboard",
-          "children": [{
+          "children": [
+            {
             "text": "业务统计",
             "link": "/partner/business-statistics/index"
-          }]
+            },
+            {
+            "text": "销售渠道管理",
+            "link": "/partner/channel-sales/list"
+            },
+            {
+            "text": "等级配置",
+            "link": "/partner/level-config/list"
+            }
+          ]
         }
       ]
     }]

From 2870adbe6e9a49336aaa7e8b1acef62f272a120c Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Thu, 24 Feb 2022 15:36:43 +0800
Subject: [PATCH 04/70] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../routes/partner/partner-routing.module.ts  |  16 ++
 src/app/routes/partner/partner.module.ts      |   4 +-
 .../list/particulars.component.html           |  27 +++
 .../components/list/particulars.component.ts  | 165 ++++++++++++++++++
 .../services/rebate-management.service.ts     |  12 ++
 src/assets/mocks/menu-data.json               |  18 ++
 6 files changed, 241 insertions(+), 1 deletion(-)
 create mode 100644 src/app/routes/partner/rebate-management/components/list/particulars.component.html
 create mode 100644 src/app/routes/partner/rebate-management/components/list/particulars.component.ts
 create mode 100644 src/app/routes/partner/rebate-management/services/rebate-management.service.ts

diff --git a/src/app/routes/partner/partner-routing.module.ts b/src/app/routes/partner/partner-routing.module.ts
index f268d89d..c4ca409f 100644
--- a/src/app/routes/partner/partner-routing.module.ts
+++ b/src/app/routes/partner/partner-routing.module.ts
@@ -1,3 +1,13 @@
+/*
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-02-24 15:07:57
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-02-24 15:23:48
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\partner-routing.module.ts
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+ */
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 import { PartnerBusinessStatisticsIndexComponent } from './business-statistics/components/index/index.component';
@@ -7,6 +17,7 @@ import { ParterLevelConfigEditComponent } from './level-config/components/edit/e
 import { ParterLevelConfigListComponent } from './level-config/components/list/list.component';
 import { PartnerPartnerStatisticsComponent } from './business-statistics/components/partner-statistics/partner-statistics.component';
 import { PartnerSaleStatisticsComponent } from './business-statistics/components/sale-statistics/sale-statistics.component';
+import { ParterRebateManageMentParticularsComponent } from './rebate-management/components/list/particulars.component';
 
 const routes: Routes = [
   { path: 'index', component: PartnerBusinessStatisticsIndexComponent },
@@ -26,6 +37,11 @@ const routes: Routes = [
       {path: 'edit', component: ParterLevelConfigEditComponent},
     ]
   },
+  { path: 'rebate',
+  children:[
+    {path: 'particulars', component: ParterRebateManageMentParticularsComponent},
+  ]
+},
 
 ];
 @NgModule({
diff --git a/src/app/routes/partner/partner.module.ts b/src/app/routes/partner/partner.module.ts
index cb08d463..844832b6 100644
--- a/src/app/routes/partner/partner.module.ts
+++ b/src/app/routes/partner/partner.module.ts
@@ -9,6 +9,7 @@ import { ParterLevelConfigEditComponent } from './level-config/components/edit/e
 import { ParterLevelConfigListComponent } from './level-config/components/list/list.component';
 import { PartnerPartnerStatisticsComponent } from './business-statistics/components/partner-statistics/partner-statistics.component';
 import { PartnerSaleStatisticsComponent } from './business-statistics/components/sale-statistics/sale-statistics.component';
+import { ParterRebateManageMentParticularsComponent } from './rebate-management/components/list/particulars.component';
 
 const COMPONENTS: any[] = [
   PartnerBusinessStatisticsIndexComponent,
@@ -17,7 +18,8 @@ const COMPONENTS: any[] = [
   ParterLevelConfigListComponent,
   ParterLevelConfigEditComponent,
   PartnerPartnerStatisticsComponent,
-  PartnerSaleStatisticsComponent
+  PartnerSaleStatisticsComponent,
+  ParterRebateManageMentParticularsComponent
 ];
 
 @NgModule({
diff --git a/src/app/routes/partner/rebate-management/components/list/particulars.component.html b/src/app/routes/partner/rebate-management/components/list/particulars.component.html
new file mode 100644
index 00000000..f252aa0e
--- /dev/null
+++ b/src/app/routes/partner/rebate-management/components/list/particulars.component.html
@@ -0,0 +1,27 @@
+<nz-card>
+  <!-- 搜索区 -->
+  <sf
+    #sf
+    [ui]="ui"
+    [schema]="schema"
+    [mode]="'search'"
+    (formSubmit)="st?.load(1)"
+    (formReset)="resetSF()"
+  ></sf>
+</nz-card>
+
+<nz-card>
+  <!-- 数据列表 -->
+  <st
+    #st
+    [bordered]="true"
+    [data]="data"
+    [columns]="columns"
+    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+    [loadingDelay]="500"
+    [loading]="service.http.loading"
+  >
+  </st>
+</nz-card>
diff --git a/src/app/routes/partner/rebate-management/components/list/particulars.component.ts b/src/app/routes/partner/rebate-management/components/list/particulars.component.ts
new file mode 100644
index 00000000..5894e71d
--- /dev/null
+++ b/src/app/routes/partner/rebate-management/components/list/particulars.component.ts
@@ -0,0 +1,165 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st';
+import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
+import { processSingleSort, ShipperBaseService } from '@shared';
+import { NzModalService } from 'ng-zorro-antd/modal';
+import {  RebateManagementService } from '../../services/rebate-management.service';
+
+@Component({
+  selector: 'app-parter-channel-rebate-management-particulars',
+  templateUrl: './particulars.component.html'
+})
+export class ParterRebateManageMentParticularsComponent implements OnInit {
+  schema: SFSchema = {};
+  columns!: STColumn[];
+  ui!: SFUISchema;
+  @ViewChild('st', { static: false })
+  st!: STComponent;
+  @ViewChild('sf', { static: false })
+  sf!: SFComponent;
+  spuStatus = '1';
+
+  data=[{name1:1111}]
+  constructor(
+    public router: Router,
+    public ar: ActivatedRoute,
+    public service: RebateManagementService,
+    private modalService: NzModalService,
+    public shipperservice: ShipperBaseService
+
+  ) {}
+
+  /**
+   * 查询参数
+   */
+  get reqParams() {
+    return { ...this.sf?.value };
+  }
+  ngOnInit() {
+    this.initSF();
+    this.initST();
+  }
+
+  initSF() {
+    this.schema = {
+      properties: {
+        name: {
+          type: 'string',
+          title: '订单号'
+        },
+        phone: {
+          type: 'string',
+          title: '付款单号'
+        },
+        phone2: {
+          type: 'string',
+          title: '下单客户'
+        },
+        enterpriseInfoId: {
+          type: 'string',
+          title: '网络货运人',
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+            allowClear: true,
+            asyncData: () => this.shipperservice.getNetworkFreightForwarder(),
+          },
+        },
+        phone3: {
+          type: 'string',
+          title: '合伙人名称'
+        },
+        deadlineTime: {
+          title: '时间范围',
+          type: 'string',
+          ui: {
+            widget: 'date',
+            mode: 'range',
+            format: 'yyyy-MM-dd',
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+            allowClear: true,
+          } as SFDateWidgetSchema,
+        },
+      }
+    };
+    this.ui = {
+      '*': {
+        grid: { span: 8, gutter: 4 }
+      }
+    };
+  }
+
+  initST() {
+    this.columns = [
+      {
+        title: '订单号',
+        index: 'name1'
+      },
+      {
+        title: '订单金额（元）',
+        index: 'name1'
+      },
+      {
+        title: '付款金额（元）',
+        index: 'name1'
+      },
+      {
+        title: '返佣金额（元）',
+        index: 'name1'
+      },
+      {
+        title: '附加费率',
+        index: 'name1'
+      },
+      {
+        title: '下单客户',
+        index: 'name1'
+      },
+      {
+        title: '网络货运人',
+        index: 'name1'
+      },
+      {
+        title: '合伙人名称',
+        index: 'name1'
+      },
+      {
+        title: '网络货运人',
+        index: 'name1'
+      },
+      {
+        title: '合伙人等级',
+        index: 'name1'
+      },
+      {
+        title: '管理费比例',
+        index: 'name1'
+      },
+      {
+        title: '固定结算费率',
+        index: 'name1'
+      },
+      {
+        title: '返佣时间',
+        index: 'name1'
+      },
+
+    ];
+  }
+
+  /**
+   * 重置表单
+   */
+  resetSF() {
+    this.sf.reset();
+    this.st.load(1);
+  }
+
+
+}
diff --git a/src/app/routes/partner/rebate-management/services/rebate-management.service.ts b/src/app/routes/partner/rebate-management/services/rebate-management.service.ts
new file mode 100644
index 00000000..5430876a
--- /dev/null
+++ b/src/app/routes/partner/rebate-management/services/rebate-management.service.ts
@@ -0,0 +1,12 @@
+import { Injectable, Injector } from '@angular/core';
+import { BaseService } from '@shared';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class RebateManagementService extends BaseService {
+
+  constructor(public injector: Injector) {
+    super(injector);
+  }
+}
diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json
index 0ee7956f..90c2212b 100644
--- a/src/assets/mocks/menu-data.json
+++ b/src/assets/mocks/menu-data.json
@@ -513,6 +513,24 @@
             "text": "业务统计",
             "link": "/partner/business-statistics/index"
             },
+            {
+              "text": "返佣管理",
+              "group": true,
+              "children": [
+                {
+                  "text": "返佣配置",
+                  "link": "/partner/rebate/"
+                },
+                {
+                  "text": "返佣明细",
+                  "link": "/partner/rebate/particulars"
+                },
+                {
+                  "text": "返佣记录",
+                  "link": "/partner/rebate/"
+                }
+              ]
+            },
             {
             "text": "销售渠道管理",
             "link": "/partner/channel-sales/list"

From 984a9a85f0563ad676b66c9c77bf5487559718d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= <xiaoyun.pan@eascs.com>
Date: Thu, 24 Feb 2022 17:18:22 +0800
Subject: [PATCH 05/70] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../partner-custom-detail.component.html      |  42 ++++++
 .../partner-custom-detail.component.less      |  11 ++
 .../partner-custom-detail.component.spec.ts   |  24 ++++
 .../partner-custom-detail.component.ts        | 132 ++++++++++++++++++
 .../partner-statistics.component.html         |  12 +-
 .../partner-statistics.component.ts           |  14 +-
 .../sale-custom-detail.component.html         |  27 ++++
 .../sale-custom-detail.component.spec.ts      |  24 ++++
 .../sale-custom-detail.component.ts           |  53 +++++++
 .../services/bussiness-statistics.service.ts  |  13 ++
 .../routes/partner/partner-routing.module.ts  |   9 +-
 src/app/routes/partner/partner.module.ts      |   7 +-
 .../enterprise-audit/view/view.component.html |   4 +-
 13 files changed, 355 insertions(+), 17 deletions(-)
 create mode 100644 src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.html
 create mode 100644 src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.less
 create mode 100644 src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.spec.ts
 create mode 100644 src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.ts
 create mode 100644 src/app/routes/partner/business-statistics/components/sale-custom-detail/sale-custom-detail.component.html
 create mode 100644 src/app/routes/partner/business-statistics/components/sale-custom-detail/sale-custom-detail.component.spec.ts
 create mode 100644 src/app/routes/partner/business-statistics/components/sale-custom-detail/sale-custom-detail.component.ts
 create mode 100644 src/app/routes/partner/business-statistics/services/bussiness-statistics.service.ts

diff --git a/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.html b/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.html
new file mode 100644
index 00000000..df667e4f
--- /dev/null
+++ b/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.html
@@ -0,0 +1,42 @@
+<page-header-wrapper [title]="'客户明细'" [logo]="logo">
+  <ng-template #logo>
+    <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
+      <i nz-icon nzType="left" nzTheme="outline"></i>
+    </button>
+  </ng-template>
+</page-header-wrapper>
+<nz-card>
+  <div class="user-info border-1" nz-row>
+    <div nz-col nzSpan="24" class="d-flex p-md">
+      <img class="user-logo" [src]="detailInfo?.logo" />
+      <div style="flex: 1;">
+        <div>
+          <h3>{{detailInfo?.company}}</h3>
+          <div class="mb-sm">
+            <span class="letf-box text-grey-dark">{{detailInfo?.code}}</span>
+            <span class="mr-xs">{{detailInfo?.proxy}}</span>
+          </div>
+          <div>
+            <span class="letf-box">添加时间：{{detailInfo?.createTime}}</span>
+            <span c>所属城市：{{detailInfo?.belongCity}}</span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="mt-md" nz-row>
+    <div nz-col [nzSpan]="12">
+      <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"> </sf>
+    </div>
+    <div nz-col [nzSpan]="8">
+      <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading"
+        (click)="search()">查询</button>
+      <button nz-button (click)="resetSF()">重置</button>
+      <button nz-button (click)="export()" nzType="primary" nzGhost>导出</button>
+    </div>
+  </div>
+</nz-card>
+<nz-card>
+
+  <st #st [data]="service.$api_get_partner_statistics_page" [columns]="columns"></st>
+</nz-card>
diff --git a/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.less b/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.less
new file mode 100644
index 00000000..7372f925
--- /dev/null
+++ b/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.less
@@ -0,0 +1,11 @@
+:host {
+  .user-logo {
+    width: 90px;
+  }
+
+  .letf-box {
+    width: 250px;
+    display: inline-block;
+  }
+
+}
diff --git a/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.spec.ts b/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.spec.ts
new file mode 100644
index 00000000..4fddfb5d
--- /dev/null
+++ b/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.spec.ts
@@ -0,0 +1,24 @@
+import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import { PartnerPartnerCustomDetailComponent } from './partner-custom-detail.component';
+
+describe('PartnerPartnerCustomDetailComponent', () => {
+  let component: PartnerPartnerCustomDetailComponent;
+  let fixture: ComponentFixture<PartnerPartnerCustomDetailComponent>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ PartnerPartnerCustomDetailComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(PartnerPartnerCustomDetailComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.ts b/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.ts
new file mode 100644
index 00000000..c48476d9
--- /dev/null
+++ b/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.ts
@@ -0,0 +1,132 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { STColumn, STComponent } from '@delon/abc/st';
+import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
+import { ModalHelper, _HttpClient } from '@delon/theme';
+import { BussinessStatisticsService } from '../../services/bussiness-statistics.service';
+
+@Component({
+  selector: 'app-partner-partner-custom-detail',
+  templateUrl: './partner-custom-detail.component.html',
+  styleUrls: ['./partner-custom-detail.component.less']
+})
+export class PartnerPartnerCustomDetailComponent implements OnInit {
+  schema: SFSchema = {};
+  ui!: SFUISchema;
+  detailInfo: any = {
+    logo: './assets/images/user/logo.svg',
+    company: '张三',
+    code: '91440300357887492H',
+    proxy: '企业合伙人',
+    belongCity: '深圳、上海、北京',
+    createTime: '2021-09-23 14:43:31'
+  }
+  @ViewChild('st') private readonly st!: STComponent;
+  @ViewChild('sf') private readonly sf!: SFComponent;
+  columns: STColumn[] = [
+    { title: '编号', index: 'no' },
+    { title: '调用次数', type: 'number', index: 'callNo' },
+    { title: '头像', type: 'img', width: '50px', index: 'avatar' },
+    { title: '时间', type: 'date', index: 'updatedAt' },
+    {
+      title: '',
+      buttons: [
+        // { text: '查看', click: (item: any) => `/form/${item.id}` },
+        // { text: '编辑', type: 'static', component: FormEditComponent, click: 'reload' },
+      ]
+    }
+  ];
+  _$expand = false;
+
+  constructor(public service: BussinessStatisticsService) {
+
+  }
+
+  ngOnInit(): void {
+    this.initST();
+    this.initSF();
+  }
+
+  resetSF() {
+    this._$expand = false;
+    this.sf.reset()
+  }
+  /**
+* 伸缩查询条件
+*/
+  expandToggle() {
+    this._$expand = !this._$expand;
+    this.sf?.setValue('/_$expand', this._$expand);
+  }
+
+  add(): void {
+    // this.modal
+    //   .createStatic(FormEditComponent, { i: { id: 0 } })
+    //   .subscribe(() => this.st.reload());
+  }
+  search() {
+    this.st.load(1);
+  }
+  export() {
+
+  }
+
+  initSF() {
+    this.schema = {
+      properties: {
+        abnormalCause: {
+          title: '客户名称',
+          type: 'string',
+          ui: {
+            placeholder: '请输入',
+          },
+        },
+        abnormalCause1: {
+          title: '客户状态',
+          type: 'string',
+          default: '',
+          enum: [
+            {
+              label: '全部',
+              value: ''
+            },
+            {
+              label: '个人',
+              value: '1'
+            },
+            {
+              label: '企业',
+              value: '2'
+            }
+          ],
+          ui: {
+            widget: 'select'
+          },
+        },
+      }
+    }
+    this.ui = {
+      '*': { spanLabelFixed: 100, grid: { span: 11, gutter: 4 } },
+    };
+  }
+  /**
+ * 初始化数据列表
+ */
+  initST() {
+    this.columns = [
+      { title: '合伙人名称', index: 'carNo', className: 'text-center' },
+      { title: '类型', render: 'carModelLabel', className: 'text-center' },
+      { title: '注册时间', index: 'carNo', className: 'text-center' },
+      { title: '本月新增客户', render: 'approvalStatus0', className: 'text-center', sort: true },
+      { title: '客户总数', render: 'approvalStatus', className: 'text-center', sort: true },
+      { title: '本月已结算金额（元）', render: 'approvalStatus1', className: 'text-center', sort: true },
+      { title: '累计已结算金额（元）', render: 'approvalStatus2', className: 'text-center', sort: true },
+      { title: '本月预估收益（元）', render: 'approvalStatus3', className: 'text-center', sort: true },
+      { title: '累计收益（元）', render: 'approvalStatus4', className: 'text-center', sort: true },
+    ];
+  }
+
+  goBack() {
+    window.history.go(-1);
+  }
+
+}
diff --git a/src/app/routes/partner/business-statistics/components/partner-statistics/partner-statistics.component.html b/src/app/routes/partner/business-statistics/components/partner-statistics/partner-statistics.component.html
index 8dd7ef1a..d6240182 100644
--- a/src/app/routes/partner/business-statistics/components/partner-statistics/partner-statistics.component.html
+++ b/src/app/routes/partner/business-statistics/components/partner-statistics/partner-statistics.component.html
@@ -1,24 +1,24 @@
 <nz-card>
-  <sf mode="search" [schema]="schema" [ui]="ui" (formSubmit)="st.reset($event)" (formReset)="st.reset($event)"></sf>
+  <sf mode="search" [schema]="schema" [ui]="ui" (formSubmit)="st.load(1)" (formReset)="resetSF()" #sf></sf>
 
 </nz-card>
 <nz-card>
-  <st #st [data]="url" [columns]="columns">
+  <st #st [data]="service.$api_get_partner_statistics_page" [columns]="columns">
     <ng-template st-row="approvalStatus" let-item>
-      <a [routerLink]="'/'">{{item.approvalStatus}}</a>
+      <a [routerLink]="'/partner/partner-custom/detail/'+item?.id">{{item.yskmoney}}</a>
     </ng-template>
     <ng-template st-row="approvalStatus1" let-item>
       <div class="text-right">{{item.approvalStatus1 | currency:' '}}</div>
     </ng-template>
     <ng-template st-row="approvalStatus2" let-item>
-      <div class="text-right">{{item.approvalStatus1 | currency:' '}}</div>
+      <a class="text-right text-blue-dark">{{item.yskmoney | currency:' '}}</a>
     </ng-template>
 
     <ng-template st-row="approvalStatus3" let-item>
-      <div class="text-right">{{item.approvalStatus1 | currency:' '}}</div>
+      <div class="text-right">{{item.yskmoney | currency:' '}}</div>
     </ng-template>
     <ng-template st-row="approvalStatus4" let-item>
-      <div class="text-right">{{item.approvalStatus1 | currency:' '}}</div>
+      <div class="text-right">{{item.armoney | currency:' '}}</div>
     </ng-template>
   </st>
 </nz-card>
diff --git a/src/app/routes/partner/business-statistics/components/partner-statistics/partner-statistics.component.ts b/src/app/routes/partner/business-statistics/components/partner-statistics/partner-statistics.component.ts
index ad508c7d..db1de887 100644
--- a/src/app/routes/partner/business-statistics/components/partner-statistics/partner-statistics.component.ts
+++ b/src/app/routes/partner/business-statistics/components/partner-statistics/partner-statistics.component.ts
@@ -1,7 +1,8 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { STColumn, STComponent } from '@delon/abc/st';
-import { SFSchema, SFUISchema } from '@delon/form';
+import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
 import { ModalHelper, _HttpClient } from '@delon/theme';
+import { BussinessStatisticsService } from '../../services/bussiness-statistics.service';
 
 @Component({
   selector: 'app-partner-partner-statistics',
@@ -12,9 +13,10 @@ export class PartnerPartnerStatisticsComponent implements OnInit {
   schema!: SFSchema;
   ui!: SFUISchema;
   @ViewChild('st') private readonly st!: STComponent;
+  @ViewChild('sf') private readonly sf!: SFComponent;
   columns: STColumn[] = [];
 
-  constructor(private http: _HttpClient, private modal: ModalHelper) { }
+  constructor(public service: BussinessStatisticsService) { }
 
   ngOnInit(): void {
     this.initSF();
@@ -65,15 +67,19 @@ export class PartnerPartnerStatisticsComponent implements OnInit {
       { title: '合伙人名称', index: 'carNo', className: 'text-center' },
       { title: '类型', render: 'carModelLabel', className: 'text-center' },
       { title: '注册时间', index: 'carNo', className: 'text-center' },
-      { title: '本月新增客户', render: 'approvalStatus', className: 'text-center', sort: true },
+      { title: '本月新增客户', render: 'approvalStatus0', className: 'text-center', sort: true },
       { title: '客户总数', render: 'approvalStatus', className: 'text-center', sort: true },
       { title: '本月已结算金额（元）', render: 'approvalStatus1', className: 'text-center', sort: true },
       { title: '累计已结算金额（元）', render: 'approvalStatus2', className: 'text-center', sort: true },
       { title: '本月预估收益（元）', render: 'approvalStatus3', className: 'text-center', sort: true },
       { title: '累计收益（元）', render: 'approvalStatus4', className: 'text-center', sort: true },
-
     ];
   }
 
+  resetSF() {
+    this.sf.reset();
+    this.st.reset();
+  }
+
 
 }
diff --git a/src/app/routes/partner/business-statistics/components/sale-custom-detail/sale-custom-detail.component.html b/src/app/routes/partner/business-statistics/components/sale-custom-detail/sale-custom-detail.component.html
new file mode 100644
index 00000000..b376f70a
--- /dev/null
+++ b/src/app/routes/partner/business-statistics/components/sale-custom-detail/sale-custom-detail.component.html
@@ -0,0 +1,27 @@
+<page-header-wrapper [title]="''" [content]="content">
+  <ng-template #content>
+    <div class="user-info border-1" nz-row>
+      <div nz-col nzSpan="24" class="d-flex p-md">
+        <img class="user-logo" [src]="detailInfo?.logo" />
+        <div style="flex: 1;">
+          <div>
+            <h3>{{detailInfo?.name}}</h3>
+            <div>
+              <span class="mr-md">{{detailInfo?.phone}}</span>
+              <span class="mr-xs">{{detailInfo?.proxy}}</span>
+              <span>{{detailInfo?.level}}</span>
+            </div>
+            <p>添加时间：{{detailInfo?.createTime}}</p>
+          </div>
+        </div>
+      </div>
+    </div>
+  </ng-template>
+</page-header-wrapper>
+<nz-card>
+
+</nz-card>
+<nz-card>
+  <sf mode="search" [schema]="searchSchema" (formSubmit)="st.reset($event)" (formReset)="st.reset($event)"></sf>
+  <st #st [data]="url" [columns]="columns"></st>
+</nz-card>
diff --git a/src/app/routes/partner/business-statistics/components/sale-custom-detail/sale-custom-detail.component.spec.ts b/src/app/routes/partner/business-statistics/components/sale-custom-detail/sale-custom-detail.component.spec.ts
new file mode 100644
index 00000000..d88e4632
--- /dev/null
+++ b/src/app/routes/partner/business-statistics/components/sale-custom-detail/sale-custom-detail.component.spec.ts
@@ -0,0 +1,24 @@
+import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import { PartnerSaleCustomDetailComponent } from './sale-custom-detail.component';
+
+describe('PartnerSaleCustomDetailComponent', () => {
+  let component: PartnerSaleCustomDetailComponent;
+  let fixture: ComponentFixture<PartnerSaleCustomDetailComponent>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ PartnerSaleCustomDetailComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(PartnerSaleCustomDetailComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/routes/partner/business-statistics/components/sale-custom-detail/sale-custom-detail.component.ts b/src/app/routes/partner/business-statistics/components/sale-custom-detail/sale-custom-detail.component.ts
new file mode 100644
index 00000000..c3a63716
--- /dev/null
+++ b/src/app/routes/partner/business-statistics/components/sale-custom-detail/sale-custom-detail.component.ts
@@ -0,0 +1,53 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { STColumn, STComponent } from '@delon/abc/st';
+import { SFSchema } from '@delon/form';
+import { ModalHelper, _HttpClient } from '@delon/theme';
+
+@Component({
+  selector: 'app-partner-sale-custom-detail',
+  templateUrl: './sale-custom-detail.component.html',
+})
+export class PartnerSaleCustomDetailComponent implements OnInit {
+  url = `/user`;
+  searchSchema: SFSchema = {
+    properties: {
+      no: {
+        type: 'string',
+        title: '编号'
+      }
+    }
+  };
+  detailInfo: any = {
+    logo: './assets/images/user/logo.svg',
+    name: '张三',
+    phone: '1399999999',
+    proxy: '城市代理',
+    level: '二级',
+    createTime: '添加时间'
+  }
+  @ViewChild('st') private readonly st!: STComponent;
+  columns: STColumn[] = [
+    { title: '编号', index: 'no' },
+    { title: '调用次数', type: 'number', index: 'callNo' },
+    { title: '头像', type: 'img', width: '50px', index: 'avatar' },
+    { title: '时间', type: 'date', index: 'updatedAt' },
+    {
+      title: '',
+      buttons: [
+        // { text: '查看', click: (item: any) => `/form/${item.id}` },
+        // { text: '编辑', type: 'static', component: FormEditComponent, click: 'reload' },
+      ]
+    }
+  ];
+
+  constructor(private http: _HttpClient, private modal: ModalHelper) { }
+
+  ngOnInit(): void { }
+
+  add(): void {
+    // this.modal
+    //   .createStatic(FormEditComponent, { i: { id: 0 } })
+    //   .subscribe(() => this.st.reload());
+  }
+
+}
diff --git a/src/app/routes/partner/business-statistics/services/bussiness-statistics.service.ts b/src/app/routes/partner/business-statistics/services/bussiness-statistics.service.ts
new file mode 100644
index 00000000..894da58b
--- /dev/null
+++ b/src/app/routes/partner/business-statistics/services/bussiness-statistics.service.ts
@@ -0,0 +1,13 @@
+import { Injectable, Injector } from '@angular/core';
+import { BaseService } from '@shared';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class BussinessStatisticsService extends BaseService {
+
+  $api_get_partner_statistics_page = `/api/fcc/ficoBrmH/list/page`;
+  constructor(public injector: Injector) {
+    super(injector);
+  }
+}
diff --git a/src/app/routes/partner/partner-routing.module.ts b/src/app/routes/partner/partner-routing.module.ts
index 5de586a3..37df1da1 100644
--- a/src/app/routes/partner/partner-routing.module.ts
+++ b/src/app/routes/partner/partner-routing.module.ts
@@ -1,13 +1,14 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 import { PartnerBusinessStatisticsIndexComponent } from './business-statistics/components/index/index.component';
-import { PartnerPartnerStatisticsComponent } from './business-statistics/components/partner-statistics/partner-statistics.component';
-import { PartnerSaleStatisticsComponent } from './business-statistics/components/sale-statistics/sale-statistics.component';
+import { PartnerPartnerCustomDetailComponent } from './business-statistics/components/partner-custom-detail/partner-custom-detail.component';
+import { PartnerSaleCustomDetailComponent } from './business-statistics/components/sale-custom-detail/sale-custom-detail.component';
 
 const routes: Routes = [
   { path: 'business-statistics/index', component: PartnerBusinessStatisticsIndexComponent },
-  { path: 'partner-statistics', component: PartnerPartnerStatisticsComponent },
-  { path: 'sale-statistics', component: PartnerSaleStatisticsComponent }];
+  { path: 'sale-custom/detail/:id', component: PartnerSaleCustomDetailComponent },
+  { path: 'partner-custom/detail/:id', component: PartnerPartnerCustomDetailComponent },
+];
 
 @NgModule({
   imports: [RouterModule.forChild(routes)],
diff --git a/src/app/routes/partner/partner.module.ts b/src/app/routes/partner/partner.module.ts
index ec2a3f5c..d42eba8c 100644
--- a/src/app/routes/partner/partner.module.ts
+++ b/src/app/routes/partner/partner.module.ts
@@ -5,11 +5,16 @@ import { PartnerRoutingModule } from './partner-routing.module';
 import { PartnerBusinessStatisticsIndexComponent } from './business-statistics/components/index/index.component';
 import { PartnerPartnerStatisticsComponent } from './business-statistics/components/partner-statistics/partner-statistics.component';
 import { PartnerSaleStatisticsComponent } from './business-statistics/components/sale-statistics/sale-statistics.component';
+import { PartnerSaleCustomDetailComponent } from './business-statistics/components/sale-custom-detail/sale-custom-detail.component';
+import { PartnerPartnerCustomDetailComponent } from './business-statistics/components/partner-custom-detail/partner-custom-detail.component';
 
 const COMPONENTS: any[] = [
   PartnerBusinessStatisticsIndexComponent,
   PartnerPartnerStatisticsComponent,
-  PartnerSaleStatisticsComponent];
+  PartnerSaleStatisticsComponent,
+  PartnerPartnerCustomDetailComponent,
+  PartnerPartnerCustomDetailComponent,
+  PartnerSaleCustomDetailComponent];
 @NgModule({
   declarations: [...COMPONENTS],
   imports: [CommonModule, PartnerRoutingModule, SharedModule]
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 017f5691..c88df339 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
@@ -8,7 +8,7 @@
   <ng-template #content>
     <div class="user-info" nz-row>
       <div nz-col nzSpan="24" class="d-flex">
-        <img [src]="detailData?.enterpriseLogo" />
+        <img [src]="detailData?.enterpriseLogo" style="width: 120px;" />
         <div style="flex: 1;">
           <div nz-row>
             <div nz-col [nzLg]="12" [nzSm]="24" [nzXs]="24">
@@ -266,4 +266,4 @@
       </div>
     </div>
   </nz-upload>
-</ng-template>
\ No newline at end of file
+</ng-template>

From d370708e980fca9688736b5dcfd17be0a34373d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= <xiaoyun.pan@eascs.com>
Date: Thu, 24 Feb 2022 20:10:36 +0800
Subject: [PATCH 06/70] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/index/index.component.html     |  2 +-
 .../components/index/index.component.ts       |  4 +-
 .../partner-custom-detail.component.html      |  5 ++-
 .../partner-custom-detail.component.less      |  2 +-
 .../partner-custom-detail.component.ts        | 41 +++++++++++++----
 ...partner-custom-order-detail.component.html |  9 ++++
 ...tner-custom-order-detail.component.spec.ts | 24 ++++++++++
 .../partner-custom-order-detail.component.ts  | 45 +++++++++++++++++++
 .../partner-statistics.component.html         |  2 +-
 .../partner-statistics.component.ts           |  1 +
 .../sale-partner-detail.component.html        |  9 ++++
 .../sale-partner-detail.component.spec.ts     | 24 ++++++++++
 .../sale-partner-detail.component.ts          | 45 +++++++++++++++++++
 .../routes/partner/partner-routing.module.ts  | 16 ++++---
 src/app/routes/partner/partner.module.ts      |  6 ++-
 15 files changed, 212 insertions(+), 23 deletions(-)
 create mode 100644 src/app/routes/partner/business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component.html
 create mode 100644 src/app/routes/partner/business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component.spec.ts
 create mode 100644 src/app/routes/partner/business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component.ts
 create mode 100644 src/app/routes/partner/business-statistics/components/sale-partner-detail/sale-partner-detail.component.html
 create mode 100644 src/app/routes/partner/business-statistics/components/sale-partner-detail/sale-partner-detail.component.spec.ts
 create mode 100644 src/app/routes/partner/business-statistics/components/sale-partner-detail/sale-partner-detail.component.ts

diff --git a/src/app/routes/partner/business-statistics/components/index/index.component.html b/src/app/routes/partner/business-statistics/components/index/index.component.html
index fa15bb93..5074b929 100644
--- a/src/app/routes/partner/business-statistics/components/index/index.component.html
+++ b/src/app/routes/partner/business-statistics/components/index/index.component.html
@@ -2,7 +2,7 @@
 
 </page-header-wrapper>
 <ng-template #tpTab>
-  <nz-tabset [(nzSelectedIndex)]="selectedIndex" (nzSelectChange)="change($event)">
+  <nz-tabset [(nzSelectedIndex)]="selectedIndex">
     <nz-tab [nzTitle]="item.name" *ngFor="let item of tabs">
     </nz-tab>
   </nz-tabset>
diff --git a/src/app/routes/partner/business-statistics/components/index/index.component.ts b/src/app/routes/partner/business-statistics/components/index/index.component.ts
index 96ffd6d5..a39d1fa2 100644
--- a/src/app/routes/partner/business-statistics/components/index/index.component.ts
+++ b/src/app/routes/partner/business-statistics/components/index/index.component.ts
@@ -26,9 +26,7 @@ export class PartnerBusinessStatisticsIndexComponent implements OnInit {
 
   constructor() { }
 
-  change(e: any) {
-    console.log(this.selectedIndex);
-  }
+
   ngOnInit(): void { }
 
 
diff --git a/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.html b/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.html
index df667e4f..f64e394c 100644
--- a/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.html
+++ b/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.html
@@ -38,5 +38,8 @@
 </nz-card>
 <nz-card>
 
-  <st #st [data]="service.$api_get_partner_statistics_page" [columns]="columns"></st>
+  <st #st [data]="service.$api_get_partner_statistics_page" [columns]="columns" [scroll]="{x:'1500px'}"
+    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500] }"></st>
 </nz-card>
diff --git a/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.less b/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.less
index 7372f925..06c7da1f 100644
--- a/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.less
+++ b/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.less
@@ -4,8 +4,8 @@
   }
 
   .letf-box {
-    width: 250px;
     display: inline-block;
+    width: 250px;
   }
 
 }
diff --git a/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.ts b/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.ts
index c48476d9..57a8d4f4 100644
--- a/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.ts
+++ b/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.ts
@@ -41,6 +41,10 @@ export class PartnerPartnerCustomDetailComponent implements OnInit {
 
   }
 
+  get reqParams() {
+    return { ...this.sf?.value };
+  }
+
   ngOnInit(): void {
     this.initST();
     this.initSF();
@@ -113,18 +117,37 @@ export class PartnerPartnerCustomDetailComponent implements OnInit {
  */
   initST() {
     this.columns = [
-      { title: '合伙人名称', index: 'carNo', className: 'text-center' },
-      { title: '类型', render: 'carModelLabel', className: 'text-center' },
-      { title: '注册时间', index: 'carNo', className: 'text-center' },
-      { title: '本月新增客户', render: 'approvalStatus0', className: 'text-center', sort: true },
-      { title: '客户总数', render: 'approvalStatus', className: 'text-center', sort: true },
-      { title: '本月已结算金额（元）', render: 'approvalStatus1', className: 'text-center', sort: true },
-      { title: '累计已结算金额（元）', render: 'approvalStatus2', className: 'text-center', sort: true },
-      { title: '本月预估收益（元）', render: 'approvalStatus3', className: 'text-center', sort: true },
-      { title: '累计收益（元）', render: 'approvalStatus4', className: 'text-center', sort: true },
+      { title: '客户名称', index: 'carNo', className: 'text-center', width: 150 },
+      { title: '客户状态', render: 'carModelLabel', className: 'text-center', width: 120 },
+      { title: '结算时间段', index: 'carNo', className: 'text-center', width: 200 },
+      { title: '本月交易数', render: 'approvalStatus0', className: 'text-center', sort: true, width: 150 },
+      { title: '客户总数', render: 'approvalStatus', className: 'text-center', sort: true, width: 150 },
+      { title: '累计交易数', render: 'approvalStatus1', className: 'text-center', sort: true, width: 120 },
+      { title: '本月已结算订单', render: 'approvalStatus2', className: 'text-center', sort: true, width: 180 },
+      { title: '累计已结算订单', render: 'approvalStatus3', className: 'text-center', sort: true, width: 180 },
+      { title: '本月交易金额（元）', index: 'approvalStatus5', className: 'text-right', sort: true, type: 'currency', width: 180 },
+      { title: '累计交易金额（元）', index: 'approvalStatus6', className: 'text-right', sort: true, type: 'currency', width: 180 },
+      { title: '本月已结算金额（元）', index: 'approvalStatus7', className: 'text-right', sort: true, type: 'currency', width: 200 },
+      { title: '累计已结算金额（元）', index: 'approvalStatus8', className: 'text-right', sort: true, type: 'currency', width: 200 },
+      { title: '本月已开票金额（元）', index: 'approvalStatus9', className: 'text-right', sort: true, type: 'currency', width: 200 },
+      { title: '累计已开票金额（元）', index: 'approvalStatus10', className: 'text-right', sort: true, type: 'currency', width: 200 },
+      { title: '本月申请开票金额（元）', index: 'approvalStatus11', className: 'text-right', sort: true, type: 'currency', width: 200 },
+      {
+        title: '操作',
+        width: 150,
+        buttons: [
+          {
+            text: '查看订单明细',
+            click: (_record) => this.viewOrderDetail(_record)
+          }
+        ]
+      },
     ];
   }
 
+  viewOrderDetail(record: any) {
+
+  }
   goBack() {
     window.history.go(-1);
   }
diff --git a/src/app/routes/partner/business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component.html b/src/app/routes/partner/business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component.html
new file mode 100644
index 00000000..482ccb06
--- /dev/null
+++ b/src/app/routes/partner/business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component.html
@@ -0,0 +1,9 @@
+<page-header [action]="phActionTpl">
+  <ng-template #phActionTpl>
+    <button (click)="add()" nz-button nzType="primary">新建</button>
+  </ng-template>
+</page-header>
+<nz-card>
+  <sf mode="search" [schema]="searchSchema" (formSubmit)="st.reset($event)" (formReset)="st.reset($event)"></sf>
+  <st #st [data]="url" [columns]="columns"></st>
+</nz-card>
diff --git a/src/app/routes/partner/business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component.spec.ts b/src/app/routes/partner/business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component.spec.ts
new file mode 100644
index 00000000..dc51f832
--- /dev/null
+++ b/src/app/routes/partner/business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component.spec.ts
@@ -0,0 +1,24 @@
+import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import { PartnerPartnerCustomOrderDetailComponent } from './partner-custom-order-detail.component';
+
+describe('PartnerPartnerCustomOrderDetailComponent', () => {
+  let component: PartnerPartnerCustomOrderDetailComponent;
+  let fixture: ComponentFixture<PartnerPartnerCustomOrderDetailComponent>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ PartnerPartnerCustomOrderDetailComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(PartnerPartnerCustomOrderDetailComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/routes/partner/business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component.ts b/src/app/routes/partner/business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component.ts
new file mode 100644
index 00000000..11ecb65c
--- /dev/null
+++ b/src/app/routes/partner/business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component.ts
@@ -0,0 +1,45 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { STColumn, STComponent } from '@delon/abc/st';
+import { SFSchema } from '@delon/form';
+import { ModalHelper, _HttpClient } from '@delon/theme';
+
+@Component({
+  selector: 'app-partner-partner-custom-order-detail',
+  templateUrl: './partner-custom-order-detail.component.html',
+})
+export class PartnerPartnerCustomOrderDetailComponent implements OnInit {
+  url = `/user`;
+  searchSchema: SFSchema = {
+    properties: {
+      no: {
+        type: 'string',
+        title: '编号'
+      }
+    }
+  };
+  @ViewChild('st') private readonly st!: STComponent;
+  columns: STColumn[] = [
+    { title: '编号', index: 'no' },
+    { title: '调用次数', type: 'number', index: 'callNo' },
+    { title: '头像', type: 'img', width: '50px', index: 'avatar' },
+    { title: '时间', type: 'date', index: 'updatedAt' },
+    {
+      title: '',
+      buttons: [
+        // { text: '查看', click: (item: any) => `/form/${item.id}` },
+        // { text: '编辑', type: 'static', component: FormEditComponent, click: 'reload' },
+      ]
+    }
+  ];
+
+  constructor(private http: _HttpClient, private modal: ModalHelper) { }
+
+  ngOnInit(): void { }
+
+  add(): void {
+    // this.modal
+    //   .createStatic(FormEditComponent, { i: { id: 0 } })
+    //   .subscribe(() => this.st.reload());
+  }
+
+}
diff --git a/src/app/routes/partner/business-statistics/components/partner-statistics/partner-statistics.component.html b/src/app/routes/partner/business-statistics/components/partner-statistics/partner-statistics.component.html
index d6240182..70f3e8ba 100644
--- a/src/app/routes/partner/business-statistics/components/partner-statistics/partner-statistics.component.html
+++ b/src/app/routes/partner/business-statistics/components/partner-statistics/partner-statistics.component.html
@@ -5,7 +5,7 @@
 <nz-card>
   <st #st [data]="service.$api_get_partner_statistics_page" [columns]="columns">
     <ng-template st-row="approvalStatus" let-item>
-      <a [routerLink]="'/partner/partner-custom/detail/'+item?.id">{{item.yskmoney}}</a>
+      <a [routerLink]="'/partner/business-statistics/partner-custom/detail/'+item?.id">{{item.yskmoney}}</a>
     </ng-template>
     <ng-template st-row="approvalStatus1" let-item>
       <div class="text-right">{{item.approvalStatus1 | currency:' '}}</div>
diff --git a/src/app/routes/partner/business-statistics/components/partner-statistics/partner-statistics.component.ts b/src/app/routes/partner/business-statistics/components/partner-statistics/partner-statistics.component.ts
index db1de887..ffb9d09c 100644
--- a/src/app/routes/partner/business-statistics/components/partner-statistics/partner-statistics.component.ts
+++ b/src/app/routes/partner/business-statistics/components/partner-statistics/partner-statistics.component.ts
@@ -82,4 +82,5 @@ export class PartnerPartnerStatisticsComponent implements OnInit {
   }
 
 
+
 }
diff --git a/src/app/routes/partner/business-statistics/components/sale-partner-detail/sale-partner-detail.component.html b/src/app/routes/partner/business-statistics/components/sale-partner-detail/sale-partner-detail.component.html
new file mode 100644
index 00000000..482ccb06
--- /dev/null
+++ b/src/app/routes/partner/business-statistics/components/sale-partner-detail/sale-partner-detail.component.html
@@ -0,0 +1,9 @@
+<page-header [action]="phActionTpl">
+  <ng-template #phActionTpl>
+    <button (click)="add()" nz-button nzType="primary">新建</button>
+  </ng-template>
+</page-header>
+<nz-card>
+  <sf mode="search" [schema]="searchSchema" (formSubmit)="st.reset($event)" (formReset)="st.reset($event)"></sf>
+  <st #st [data]="url" [columns]="columns"></st>
+</nz-card>
diff --git a/src/app/routes/partner/business-statistics/components/sale-partner-detail/sale-partner-detail.component.spec.ts b/src/app/routes/partner/business-statistics/components/sale-partner-detail/sale-partner-detail.component.spec.ts
new file mode 100644
index 00000000..673661d9
--- /dev/null
+++ b/src/app/routes/partner/business-statistics/components/sale-partner-detail/sale-partner-detail.component.spec.ts
@@ -0,0 +1,24 @@
+import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import { PartnerSalePartnerDetailComponent } from './sale-partner-detail.component';
+
+describe('PartnerSalePartnerDetailComponent', () => {
+  let component: PartnerSalePartnerDetailComponent;
+  let fixture: ComponentFixture<PartnerSalePartnerDetailComponent>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ PartnerSalePartnerDetailComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(PartnerSalePartnerDetailComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/routes/partner/business-statistics/components/sale-partner-detail/sale-partner-detail.component.ts b/src/app/routes/partner/business-statistics/components/sale-partner-detail/sale-partner-detail.component.ts
new file mode 100644
index 00000000..229daf8d
--- /dev/null
+++ b/src/app/routes/partner/business-statistics/components/sale-partner-detail/sale-partner-detail.component.ts
@@ -0,0 +1,45 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { STColumn, STComponent } from '@delon/abc/st';
+import { SFSchema } from '@delon/form';
+import { ModalHelper, _HttpClient } from '@delon/theme';
+
+@Component({
+  selector: 'app-partner-sale-partner-detail',
+  templateUrl: './sale-partner-detail.component.html',
+})
+export class PartnerSalePartnerDetailComponent implements OnInit {
+  url = `/user`;
+  searchSchema: SFSchema = {
+    properties: {
+      no: {
+        type: 'string',
+        title: '编号'
+      }
+    }
+  };
+  @ViewChild('st') private readonly st!: STComponent;
+  columns: STColumn[] = [
+    { title: '编号', index: 'no' },
+    { title: '调用次数', type: 'number', index: 'callNo' },
+    { title: '头像', type: 'img', width: '50px', index: 'avatar' },
+    { title: '时间', type: 'date', index: 'updatedAt' },
+    {
+      title: '',
+      buttons: [
+        // { text: '查看', click: (item: any) => `/form/${item.id}` },
+        // { text: '编辑', type: 'static', component: FormEditComponent, click: 'reload' },
+      ]
+    }
+  ];
+
+  constructor(private http: _HttpClient, private modal: ModalHelper) { }
+
+  ngOnInit(): void { }
+
+  add(): void {
+    // this.modal
+    //   .createStatic(FormEditComponent, { i: { id: 0 } })
+    //   .subscribe(() => this.st.reload());
+  }
+
+}
diff --git a/src/app/routes/partner/partner-routing.module.ts b/src/app/routes/partner/partner-routing.module.ts
index e45e7358..017a9f27 100644
--- a/src/app/routes/partner/partner-routing.module.ts
+++ b/src/app/routes/partner/partner-routing.module.ts
@@ -18,14 +18,20 @@ import { ParterChannelSalesListComponent } from './channel-sales/components/list
 import { ParterLevelConfigEditComponent } from './level-config/components/edit/edit.component';
 import { ParterLevelConfigListComponent } from './level-config/components/list/list.component';
 import { ParterRebateManageMentParticularsComponent } from './rebate-management/components/list/particulars.component';
+import { PartnerSalePartnerDetailComponent } from './business-statistics/components/sale-partner-detail/sale-partner-detail.component';
+import { PartnerPartnerCustomOrderDetailComponent } from './business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component';
 
 const routes: Routes = [
   {
-    path: 'business-statistics', children: [
+    path: 'business-statistics',
+    children: [
       { path: '', redirectTo: 'index' },
       { path: 'index', component: PartnerBusinessStatisticsIndexComponent },
-      { path: 'sale-custom/detail/:id', component: PartnerSaleCustomDetailComponent },
-      { path: 'partner-custom/detail/:id', component: PartnerPartnerCustomDetailComponent },
+      { path: 'partner/order-detail/:id', component: PartnerPartnerCustomOrderDetailComponent },
+      { path: 'partner/custom-detail/:id', component: PartnerPartnerCustomDetailComponent },
+      { path: 'partner/custom-order-detail/:id', component: PartnerPartnerCustomOrderDetailComponent },
+      { path: 'sale/custom-detail/:id', component: PartnerSaleCustomDetailComponent },
+      { path: 'sale/partner-detail/:id', component: PartnerSalePartnerDetailComponent },
     ]
   },
   {
@@ -49,9 +55,7 @@ const routes: Routes = [
     children: [
       { path: 'particulars', component: ParterRebateManageMentParticularsComponent },
     ]
-  },
-
-];
+  }];
 @NgModule({
   imports: [RouterModule.forChild(routes)],
   exports: [RouterModule]
diff --git a/src/app/routes/partner/partner.module.ts b/src/app/routes/partner/partner.module.ts
index e0de725e..ed9b3d2a 100644
--- a/src/app/routes/partner/partner.module.ts
+++ b/src/app/routes/partner/partner.module.ts
@@ -12,6 +12,8 @@ import { PartnerSaleStatisticsComponent } from './business-statistics/components
 import { PartnerSaleCustomDetailComponent } from './business-statistics/components/sale-custom-detail/sale-custom-detail.component';
 import { PartnerPartnerCustomDetailComponent } from './business-statistics/components/partner-custom-detail/partner-custom-detail.component';
 import { ParterRebateManageMentParticularsComponent } from './rebate-management/components/list/particulars.component';
+import { PartnerSalePartnerDetailComponent } from './business-statistics/components/sale-partner-detail/sale-partner-detail.component';
+import { PartnerPartnerCustomOrderDetailComponent } from './business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component';
 
 const COMPONENTS: any[] = [
   PartnerBusinessStatisticsIndexComponent,
@@ -24,7 +26,9 @@ const COMPONENTS: any[] = [
   PartnerPartnerCustomDetailComponent,
   PartnerPartnerCustomDetailComponent,
   PartnerSaleCustomDetailComponent,
-  ParterRebateManageMentParticularsComponent
+  ParterRebateManageMentParticularsComponent,
+  PartnerSalePartnerDetailComponent,
+  PartnerPartnerCustomOrderDetailComponent
 ];
 
 @NgModule({

From 3a90d710eb53bb28741d2a3da02aa77b15f887af Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Thu, 24 Feb 2022 20:19:42 +0800
Subject: [PATCH 07/70] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../list/particulars.component.html           | 51 ++++++++++++---
 .../components/list/particulars.component.ts  | 63 +++++++++++++------
 2 files changed, 85 insertions(+), 29 deletions(-)

diff --git a/src/app/routes/partner/rebate-management/components/list/particulars.component.html b/src/app/routes/partner/rebate-management/components/list/particulars.component.html
index f252aa0e..0ebf82f0 100644
--- a/src/app/routes/partner/rebate-management/components/list/particulars.component.html
+++ b/src/app/routes/partner/rebate-management/components/list/particulars.component.html
@@ -1,13 +1,46 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-02-24 20:09:49
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-02-24 20:14:21
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\list\\particulars.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
+<page-header-wrapper [title]="''"> </page-header-wrapper>
 <nz-card>
-  <!-- 搜索区 -->
-  <sf
-    #sf
-    [ui]="ui"
-    [schema]="schema"
-    [mode]="'search'"
-    (formSubmit)="st?.load(1)"
-    (formReset)="resetSF()"
-  ></sf>
+  <div nz-row nzGutter="8">
+    <!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
+    <div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
+      <sf
+        #sf
+        [schema]="schema"
+        [ui]="ui"
+        [mode]="'search'"
+        [disabled]="!sf?.valid"
+        [loading]="service.http.loading"
+        (formSubmit)="st?.load(1)"
+        (formReset)="resetSF()"
+      ></sf>
+    </div>
+
+    <!-- 查询字段大于3个时，根据展开状态调整布局 -->
+    <ng-container *ngIf="queryFieldCount > 4">
+      <div nz-col [nzSpan]="_$expand ? 24 : 18">
+        <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
+      </div>
+      <div nz-col [nzSpan]="_$expand ? 24 : 6" class="text-right">
+        <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1);">查询</button>
+        <button nz-button nzType="primary" [disabled]="service.http.loading" >导出</button>
+        <button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
+        <button nz-button nzType="link" (click)="expandToggle()">
+          {{ !_$expand ? '展开' : '收起' }}
+          <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
+        </button>
+      </div>
+    </ng-container>
+  </div>
 </nz-card>
 
 <nz-card>
diff --git a/src/app/routes/partner/rebate-management/components/list/particulars.component.ts b/src/app/routes/partner/rebate-management/components/list/particulars.component.ts
index 5894e71d..88bc6e8f 100644
--- a/src/app/routes/partner/rebate-management/components/list/particulars.component.ts
+++ b/src/app/routes/partner/rebate-management/components/list/particulars.component.ts
@@ -4,7 +4,7 @@ import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st';
 import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
 import { processSingleSort, ShipperBaseService } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
-import {  RebateManagementService } from '../../services/rebate-management.service';
+import { RebateManagementService } from '../../services/rebate-management.service';
 
 @Component({
   selector: 'app-parter-channel-rebate-management-particulars',
@@ -19,22 +19,41 @@ export class ParterRebateManageMentParticularsComponent implements OnInit {
   @ViewChild('sf', { static: false })
   sf!: SFComponent;
   spuStatus = '1';
-
-  data=[{name1:1111}]
+  _$expand = false;
+  data = [{ name1: 1111 }];
   constructor(
     public router: Router,
     public ar: ActivatedRoute,
     public service: RebateManagementService,
     private modalService: NzModalService,
     public shipperservice: ShipperBaseService
-
   ) {}
-
   /**
-   * 查询参数
+   * 查询字段个数
    */
-  get reqParams() {
-    return { ...this.sf?.value };
+  get queryFieldCount(): number {
+    return Object.keys(this.schema?.properties || {}).length;
+  }
+    /**
+  * 伸缩查询条件
+  */
+     expandToggle(): void {
+      this._$expand = !this._$expand;
+      this.sf?.setValue('/_$expand', this._$expand);
+    }
+  /**
+ * 查询参数
+ */
+   get reqParams() {
+    const params: any = Object.assign({}, this.sf?.value || {});
+    delete params._$expand;
+    return { 
+      ...params,
+      deadlineTime: {
+        start: this.sf?.value?.deadlineTime?.[0] || '',
+        end: this.sf?.value?.deadlineTime?.[1] || '',
+      },
+     };
   }
   ngOnInit() {
     this.initSF();
@@ -44,6 +63,7 @@ export class ParterRebateManageMentParticularsComponent implements OnInit {
   initSF() {
     this.schema = {
       properties: {
+        _$expand: { type: 'boolean', ui: { hidden: true } },
         name: {
           type: 'string',
           title: '订单号'
@@ -63,15 +83,20 @@ export class ParterRebateManageMentParticularsComponent implements OnInit {
             widget: 'select',
             placeholder: '请选择',
             visibleIf: {
-              _$expand: (value: boolean) => value,
+              _$expand: (value: boolean) => value
             },
             allowClear: true,
-            asyncData: () => this.shipperservice.getNetworkFreightForwarder(),
-          },
+            asyncData: () => this.shipperservice.getNetworkFreightForwarder()
+          }
         },
         phone3: {
           type: 'string',
-          title: '合伙人名称'
+          title: '合伙人名称',
+          ui: {
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            },
+          }
         },
         deadlineTime: {
           title: '时间范围',
@@ -81,15 +106,16 @@ export class ParterRebateManageMentParticularsComponent implements OnInit {
             mode: 'range',
             format: 'yyyy-MM-dd',
             visibleIf: {
-              _$expand: (value: boolean) => value,
+              _$expand: (value: boolean) => value
             },
-            allowClear: true,
-          } as SFDateWidgetSchema,
-        },
+            allowClear: true
+          } as SFDateWidgetSchema
+        }
       }
     };
     this.ui = {
       '*': {
+        spanLabelFixed: 140,
         grid: { span: 8, gutter: 4 }
       }
     };
@@ -148,8 +174,7 @@ export class ParterRebateManageMentParticularsComponent implements OnInit {
       {
         title: '返佣时间',
         index: 'name1'
-      },
-
+      }
     ];
   }
 
@@ -160,6 +185,4 @@ export class ParterRebateManageMentParticularsComponent implements OnInit {
     this.sf.reset();
     this.st.load(1);
   }
-
-
 }

From caa7dac4939ea0642dbe4752f78f886340a411a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= <xiaoyun.pan@eascs.com>
Date: Tue, 1 Mar 2022 16:07:48 +0800
Subject: [PATCH 08/70] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../partner-custom-detail.component.html      |   5 +-
 .../partner-custom-detail.component.ts        |  14 +-
 ...partner-custom-order-detail.component.html |  47 ++++-
 ...partner-custom-order-detail.component.less |  11 ++
 .../partner-custom-order-detail.component.ts  | 167 ++++++++++++++---
 .../partner-order-detail.component.html       |  49 +++++
 .../partner-order-detail.component.less       |  11 ++
 .../partner-order-detail.component.spec.ts    |  24 +++
 .../partner-order-detail.component.ts         | 174 ++++++++++++++++++
 .../partner-statistics.component.html         |  19 +-
 .../partner-statistics.component.ts           |  33 +++-
 .../sale-statistics.component.html            |  17 +-
 .../sale-statistics.component.ts              |  27 ++-
 .../routes/partner/partner-routing.module.ts  |   6 +-
 src/app/routes/partner/partner.module.ts      |   4 +-
 15 files changed, 545 insertions(+), 63 deletions(-)
 create mode 100644 src/app/routes/partner/business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component.less
 create mode 100644 src/app/routes/partner/business-statistics/components/partner-order-detail/partner-order-detail.component.html
 create mode 100644 src/app/routes/partner/business-statistics/components/partner-order-detail/partner-order-detail.component.less
 create mode 100644 src/app/routes/partner/business-statistics/components/partner-order-detail/partner-order-detail.component.spec.ts
 create mode 100644 src/app/routes/partner/business-statistics/components/partner-order-detail/partner-order-detail.component.ts

diff --git a/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.html b/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.html
index f64e394c..b6cc6783 100644
--- a/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.html
+++ b/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.html
@@ -18,7 +18,7 @@
           </div>
           <div>
             <span class="letf-box">添加时间：{{detailInfo?.createTime}}</span>
-            <span c>所属城市：{{detailInfo?.belongCity}}</span>
+            <span>所属城市：{{detailInfo?.belongCity}}</span>
           </div>
         </div>
       </div>
@@ -29,8 +29,7 @@
       <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"> </sf>
     </div>
     <div nz-col [nzSpan]="8">
-      <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading"
-        (click)="search()">查询</button>
+      <button nz-button nzType="primary" [disabled]="!sf.valid" (click)="search()">查询</button>
       <button nz-button (click)="resetSF()">重置</button>
       <button nz-button (click)="export()" nzType="primary" nzGhost>导出</button>
     </div>
diff --git a/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.ts b/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.ts
index 57a8d4f4..f273d209 100644
--- a/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.ts
+++ b/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.ts
@@ -1,4 +1,5 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
+import { Router } from '@angular/router';
 import { STColumn, STComponent } from '@delon/abc/st';
 import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
 import { ModalHelper, _HttpClient } from '@delon/theme';
@@ -37,7 +38,7 @@ export class PartnerPartnerCustomDetailComponent implements OnInit {
   ];
   _$expand = false;
 
-  constructor(public service: BussinessStatisticsService) {
+  constructor(public service: BussinessStatisticsService, public router: Router) {
 
   }
 
@@ -52,7 +53,10 @@ export class PartnerPartnerCustomDetailComponent implements OnInit {
 
   resetSF() {
     this._$expand = false;
-    this.sf.reset()
+    this.sf.reset();
+    setTimeout(() => {
+      this.st.reset();
+    })
   }
   /**
 * 伸缩查询条件
@@ -145,8 +149,12 @@ export class PartnerPartnerCustomDetailComponent implements OnInit {
     ];
   }
 
+  /**
+   * 查看订单明细
+   * @param record 当前对象
+   */
   viewOrderDetail(record: any) {
-
+    this.router.navigate([`/partner/business-statistics/partner/custom-order-detail/${record?.id}`])
   }
   goBack() {
     window.history.go(-1);
diff --git a/src/app/routes/partner/business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component.html b/src/app/routes/partner/business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component.html
index 482ccb06..227ab356 100644
--- a/src/app/routes/partner/business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component.html
+++ b/src/app/routes/partner/business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component.html
@@ -1,9 +1,44 @@
-<page-header [action]="phActionTpl">
-  <ng-template #phActionTpl>
-    <button (click)="add()" nz-button nzType="primary">新建</button>
+<page-header-wrapper [title]="'客户明细'" [logo]="logo">
+  <ng-template #logo>
+    <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
+      <i nz-icon nzType="left" nzTheme="outline"></i>
+    </button>
   </ng-template>
-</page-header>
+</page-header-wrapper>
 <nz-card>
-  <sf mode="search" [schema]="searchSchema" (formSubmit)="st.reset($event)" (formReset)="st.reset($event)"></sf>
-  <st #st [data]="url" [columns]="columns"></st>
+  <div class="user-info border-1" nz-row>
+    <div nz-col nzSpan="24" class="d-flex p-md">
+      <img class="user-logo" [src]="detailInfo?.logo" />
+      <div style="flex: 1;">
+        <div>
+          <h3>{{detailInfo?.company}}</h3>
+          <div class="mb-sm">
+            <span class="letf-box text-grey-dark">{{detailInfo?.code}}</span>
+            <span class="mr-xs">{{detailInfo?.proxy}}</span>
+          </div>
+          <div>
+            <span class="letf-box">添加时间：{{detailInfo?.createTime}}</span>
+            <span c>所属城市：{{detailInfo?.belongCity}}</span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="mt-md" nz-row>
+    <div nz-col [nzSpan]="18">
+      <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"> </sf>
+    </div>
+    <div nz-col [nzSpan]="6">
+      <button nz-button nzType="primary" [disabled]="!sf.valid" (click)="search()">查询</button>
+      <button nz-button (click)="resetSF()">重置</button>
+      <button nz-button (click)="export()" nzType="primary" nzGhost>导出</button>
+    </div>
+  </div>
+</nz-card>
+<nz-card>
+
+  <st #st [data]="service.$api_get_partner_statistics_page" [columns]="columns" [scroll]="{x:'1500px'}"
+    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500] }"></st>
 </nz-card>
diff --git a/src/app/routes/partner/business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component.less b/src/app/routes/partner/business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component.less
new file mode 100644
index 00000000..06c7da1f
--- /dev/null
+++ b/src/app/routes/partner/business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component.less
@@ -0,0 +1,11 @@
+:host {
+  .user-logo {
+    width: 90px;
+  }
+
+  .letf-box {
+    display: inline-block;
+    width: 250px;
+  }
+
+}
diff --git a/src/app/routes/partner/business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component.ts b/src/app/routes/partner/business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component.ts
index 11ecb65c..71a30096 100644
--- a/src/app/routes/partner/business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component.ts
+++ b/src/app/routes/partner/business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component.ts
@@ -1,45 +1,162 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { STColumn, STComponent } from '@delon/abc/st';
-import { SFSchema } from '@delon/form';
+import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
 import { ModalHelper, _HttpClient } from '@delon/theme';
+import { BussinessStatisticsService } from '../../services/bussiness-statistics.service';
 
 @Component({
   selector: 'app-partner-partner-custom-order-detail',
   templateUrl: './partner-custom-order-detail.component.html',
+  styleUrls: ['./partner-custom-order-detail.component.less']
 })
 export class PartnerPartnerCustomOrderDetailComponent implements OnInit {
-  url = `/user`;
-  searchSchema: SFSchema = {
-    properties: {
-      no: {
-        type: 'string',
-        title: '编号'
-      }
-    }
-  };
+  schema: SFSchema = {};
+  ui!: SFUISchema;
+  detailInfo: any = {
+    logo: './assets/images/user/logo.svg',
+    company: '张三',
+    code: '91440300357887492H',
+    proxy: '企业合伙人',
+    belongCity: '深圳、上海、北京',
+    createTime: '2021-09-23 14:43:31'
+  }
   @ViewChild('st') private readonly st!: STComponent;
-  columns: STColumn[] = [
-    { title: '编号', index: 'no' },
-    { title: '调用次数', type: 'number', index: 'callNo' },
-    { title: '头像', type: 'img', width: '50px', index: 'avatar' },
-    { title: '时间', type: 'date', index: 'updatedAt' },
-    {
-      title: '',
-      buttons: [
-        // { text: '查看', click: (item: any) => `/form/${item.id}` },
-        // { text: '编辑', type: 'static', component: FormEditComponent, click: 'reload' },
-      ]
-    }
-  ];
+  @ViewChild('sf') private readonly sf!: SFComponent;
+  columns: STColumn[] = [];
+  _$expand = false;
 
-  constructor(private http: _HttpClient, private modal: ModalHelper) { }
+  constructor(public service: BussinessStatisticsService) {
 
-  ngOnInit(): void { }
+  }
+
+  get reqParams() {
+    return { ...this.sf?.value };
+  }
+
+  ngOnInit(): void {
+    this.initST();
+    this.initSF();
+  }
+
+  resetSF() {
+    this._$expand = false;
+    this.sf.reset();
+    setTimeout(() => {
+      this.st.reset();
+    })
+  }
+  /**
+* 伸缩查询条件
+*/
+  expandToggle() {
+    this._$expand = !this._$expand;
+    this.sf?.setValue('/_$expand', this._$expand);
+  }
 
   add(): void {
     // this.modal
     //   .createStatic(FormEditComponent, { i: { id: 0 } })
     //   .subscribe(() => this.st.reload());
   }
+  search() {
+    this.st.load(1);
+  }
+  export() {
+
+  }
+
+  initSF() {
+    this.schema = {
+      properties: {
+        abnormalCause: {
+          title: '订单号',
+          type: 'string',
+          ui: {
+            placeholder: '请输入',
+          },
+        },
+        abnormalCause1: {
+          title: '订单状态',
+          type: 'string',
+          default: '',
+          enum: [
+            {
+              label: '全部',
+              value: ''
+            },
+            {
+              label: '个人',
+              value: '1'
+            },
+            {
+              label: '企业',
+              value: '2'
+            }
+          ],
+          ui: {
+            widget: 'select'
+          },
+        },
+        abnormalCause2: {
+          title: '开票状态',
+          type: 'string',
+          default: '',
+          enum: [
+            {
+              label: '全部',
+              value: ''
+            },
+            {
+              label: '个人',
+              value: '1'
+            },
+            {
+              label: '企业',
+              value: '2'
+            }
+          ],
+          ui: {
+            widget: 'select'
+          },
+        },
+      }
+    }
+    this.ui = {
+      '*': { spanLabelFixed: 100, grid: { span: 7, gutter: 4 } },
+    };
+  }
+  /**
+ * 初始化数据列表
+ */
+  initST() {
+    this.columns = [
+      { title: '订单号', index: 'carNo', className: 'text-center', width: 150 },
+      { title: '订单状态', render: 'carModelLabel', className: 'text-center', width: 120 },
+      { title: '订单金额（元）', index: 'carNo', className: 'text-center', width: 200 },
+      { title: '实际付款金额（元）', render: 'approvalStatus0', className: 'text-center', sort: true, width: 150 },
+      { title: '客户附加费率', render: 'approvalStatus', className: 'text-center', sort: true, width: 150 },
+      { title: '预估收益（元）', render: 'approvalStatus1', className: 'text-center', sort: true, width: 120 },
+      { title: '开票状态', render: 'approvalStatus2', className: 'text-center', sort: true, width: 180 },
+      { title: '开票金额（元）', render: 'approvalStatus3', className: 'text-center', sort: true, width: 180 },
+      { title: '下单时间', index: 'approvalStatus5', className: 'text-right', sort: true, type: 'currency', width: 180 },
+      {
+        title: '操作',
+        width: 150,
+        buttons: [
+          {
+            text: '查看订单详情',
+            click: (_record) => this.viewOrderDetail(_record)
+          }
+        ]
+      },
+    ];
+  }
+
+  viewOrderDetail(record: any) {
+
+  }
+  goBack() {
+    window.history.go(-1);
+  }
 
 }
diff --git a/src/app/routes/partner/business-statistics/components/partner-order-detail/partner-order-detail.component.html b/src/app/routes/partner/business-statistics/components/partner-order-detail/partner-order-detail.component.html
new file mode 100644
index 00000000..6700912c
--- /dev/null
+++ b/src/app/routes/partner/business-statistics/components/partner-order-detail/partner-order-detail.component.html
@@ -0,0 +1,49 @@
+<page-header-wrapper [title]="'客户明细'" [logo]="logo">
+  <ng-template #logo>
+    <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
+      <i nz-icon nzType="left" nzTheme="outline"></i>
+    </button>
+  </ng-template>
+</page-header-wrapper>
+<nz-card>
+  <div class="user-info border-1" nz-row>
+    <div nz-col nzSpan="24" class="d-flex p-md">
+      <img class="user-logo" [src]="detailInfo?.logo" />
+      <div style="flex: 1;">
+        <div>
+          <h3>{{detailInfo?.company}}</h3>
+          <div class="mb-sm">
+            <span class="letf-box text-grey-dark">{{detailInfo?.code}}</span>
+            <span class="mr-xs">{{detailInfo?.proxy}}</span>
+          </div>
+          <div>
+            <span class="letf-box">添加时间：{{detailInfo?.createTime}}</span>
+            <span c>所属城市：{{detailInfo?.belongCity}}</span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="mt-md" nzGutter="8" nz-row>
+    <div nz-col [nzSpan]="_$expand ? 24 : 18">
+      <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
+    </div>
+    <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
+      <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading"
+        (click)="st?.load(1)">查询</button>
+      <button nz-button (click)="resetSF()">重置</button>
+      <button nz-button (click)="export()" nzType="primary" nzGhost>导出</button>
+      <button nz-button nzType="link" (click)="expandToggle()">
+        {{ !_$expand ? '展开' : '收起' }}
+        <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
+      </button>
+    </div>
+  </div>
+</nz-card>
+<nz-card>
+
+  <st #st [data]="service.$api_get_partner_statistics_page" [columns]="columns" [scroll]="{x:'1500px'}"
+    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500] }"></st>
+</nz-card>
diff --git a/src/app/routes/partner/business-statistics/components/partner-order-detail/partner-order-detail.component.less b/src/app/routes/partner/business-statistics/components/partner-order-detail/partner-order-detail.component.less
new file mode 100644
index 00000000..06c7da1f
--- /dev/null
+++ b/src/app/routes/partner/business-statistics/components/partner-order-detail/partner-order-detail.component.less
@@ -0,0 +1,11 @@
+:host {
+  .user-logo {
+    width: 90px;
+  }
+
+  .letf-box {
+    display: inline-block;
+    width: 250px;
+  }
+
+}
diff --git a/src/app/routes/partner/business-statistics/components/partner-order-detail/partner-order-detail.component.spec.ts b/src/app/routes/partner/business-statistics/components/partner-order-detail/partner-order-detail.component.spec.ts
new file mode 100644
index 00000000..a77b84eb
--- /dev/null
+++ b/src/app/routes/partner/business-statistics/components/partner-order-detail/partner-order-detail.component.spec.ts
@@ -0,0 +1,24 @@
+import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import { PartnerPartnerOrderDetailComponent } from './partner-order-detail.component';
+
+describe('PartnerPartnerOrderDetailComponent', () => {
+  let component: PartnerPartnerOrderDetailComponent;
+  let fixture: ComponentFixture<PartnerPartnerOrderDetailComponent>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ PartnerPartnerOrderDetailComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(PartnerPartnerOrderDetailComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/routes/partner/business-statistics/components/partner-order-detail/partner-order-detail.component.ts b/src/app/routes/partner/business-statistics/components/partner-order-detail/partner-order-detail.component.ts
new file mode 100644
index 00000000..bfda06d7
--- /dev/null
+++ b/src/app/routes/partner/business-statistics/components/partner-order-detail/partner-order-detail.component.ts
@@ -0,0 +1,174 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { STColumn, STComponent } from '@delon/abc/st';
+import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
+import { ModalHelper, _HttpClient } from '@delon/theme';
+import { BussinessStatisticsService } from '../../services/bussiness-statistics.service';
+
+@Component({
+  selector: 'app-partner-partner-order-detail',
+  templateUrl: './partner-order-detail.component.html',
+  styleUrls: ['./partner-order-detail.component.less']
+})
+export class PartnerPartnerOrderDetailComponent implements OnInit {
+  schema: SFSchema = {};
+  ui!: SFUISchema;
+  detailInfo: any = {
+    logo: './assets/images/user/logo.svg',
+    company: '张三',
+    code: '91440300357887492H',
+    proxy: '企业合伙人',
+    belongCity: '深圳、上海、北京',
+    createTime: '2021-09-23 14:43:31'
+  }
+  @ViewChild('st') private readonly st!: STComponent;
+  @ViewChild('sf') private readonly sf!: SFComponent;
+  columns: STColumn[] = [];
+  _$expand = false;
+
+  constructor(public service: BussinessStatisticsService) {
+
+  }
+
+  get reqParams() {
+    return { ...this.sf?.value };
+  }
+
+  ngOnInit(): void {
+    this.initST();
+    this.initSF();
+  }
+
+  resetSF() {
+    this._$expand = false;
+    this.sf.reset();
+    setTimeout(() => {
+      this.st.reset();
+    })
+  }
+  /**
+* 伸缩查询条件
+*/
+  expandToggle() {
+    this._$expand = !this._$expand;
+    this.sf?.setValue('/_$expand', this._$expand);
+  }
+
+  add(): void {
+    // this.modal
+    //   .createStatic(FormEditComponent, { i: { id: 0 } })
+    //   .subscribe(() => this.st.reload());
+  }
+  search() {
+    this.st.load(1);
+  }
+  export() {
+
+  }
+
+  initSF() {
+    this.schema = {
+      properties: {
+        _$expand: { type: 'boolean', ui: { hidden: true } },
+        abnormalCause: {
+          title: '订单号',
+          type: 'string',
+          ui: {
+            placeholder: '请输入',
+          },
+        },
+        abnormalCause1: {
+          title: '订单状态',
+          type: 'string',
+          default: '',
+          enum: [
+            {
+              label: '全部',
+              value: ''
+            },
+            {
+              label: '个人',
+              value: '1'
+            },
+            {
+              label: '企业',
+              value: '2'
+            }
+          ],
+          ui: {
+            widget: 'select'
+          },
+        },
+        abnormalCause2: {
+          title: '开票状态',
+          type: 'string',
+          default: '',
+          enum: [
+            {
+              label: '全部',
+              value: ''
+            },
+            {
+              label: '个人',
+              value: '1'
+            },
+            {
+              label: '企业',
+              value: '2'
+            }
+          ],
+          ui: {
+            widget: 'select'
+          },
+        },
+        abnormalCause3: {
+          title: '客户名称',
+          type: 'string',
+          ui: {
+            placeholder: '请输入',
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+          },
+        },
+      }
+    }
+    this.ui = {
+      '*': { spanLabelFixed: 100, grid: { span: 8, gutter: 4 } },
+    };
+  }
+  /**
+ * 初始化数据列表
+ */
+  initST() {
+    this.columns = [
+      { title: '订单号', index: 'carNo', className: 'text-center', width: 150 },
+      { title: '订单状态', render: 'carModelLabel', className: 'text-center', width: 120 },
+      { title: '订单金额（元）', index: 'carNo', className: 'text-center', width: 200 },
+      { title: '实际付款金额（元）', render: 'approvalStatus0', className: 'text-center', sort: true, width: 150 },
+      { title: '客户附加费率', render: 'approvalStatus', className: 'text-center', sort: true, width: 150 },
+      { title: '预估收益（元）', render: 'approvalStatus1', className: 'text-center', sort: true, width: 120 },
+      { title: '开票状态', render: 'approvalStatus2', className: 'text-center', sort: true, width: 180 },
+      { title: '开票金额（元）', render: 'approvalStatus3', className: 'text-center', sort: true, width: 180 },
+      { title: '下单时间', index: 'approvalStatus5', className: 'text-right', sort: true, type: 'currency', width: 180 },
+      {
+        title: '操作',
+        width: 150,
+        buttons: [
+          {
+            text: '查看订单详情',
+            click: (_record) => this.viewOrderDetail(_record)
+          }
+        ]
+      },
+    ];
+  }
+
+  viewOrderDetail(record: any) {
+
+  }
+  goBack() {
+    window.history.go(-1);
+  }
+
+
+}
diff --git a/src/app/routes/partner/business-statistics/components/partner-statistics/partner-statistics.component.html b/src/app/routes/partner/business-statistics/components/partner-statistics/partner-statistics.component.html
index 70f3e8ba..eff67eb6 100644
--- a/src/app/routes/partner/business-statistics/components/partner-statistics/partner-statistics.component.html
+++ b/src/app/routes/partner/business-statistics/components/partner-statistics/partner-statistics.component.html
@@ -1,17 +1,28 @@
 <nz-card>
-  <sf mode="search" [schema]="schema" [ui]="ui" (formSubmit)="st.load(1)" (formReset)="resetSF()" #sf></sf>
+  <sf mode="search" [schema]="schema" [ui]="ui" [button]="'none'" (formSubmit)="st.load(1)" (formReset)="resetSF()" #sf>
+    <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading"
+      (click)="st?.load(1)">查询</button>
+    <button nz-button (click)="resetSF()">重置</button>
+    <button nz-button (click)="export()" nzType="primary" nzGhost>导出</button>
+  </sf>
 
 </nz-card>
 <nz-card>
-  <st #st [data]="service.$api_get_partner_statistics_page" [columns]="columns">
+  <st #st [data]="service.$api_get_partner_statistics_page" [columns]="columns" [scroll]="{ x: '1200px' }"
+    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+    [loading]="service.http.loading">
     <ng-template st-row="approvalStatus" let-item>
-      <a [routerLink]="'/partner/business-statistics/partner-custom/detail/'+item?.id">{{item.yskmoney}}</a>
+      <a [routerLink]="'/partner/business-statistics/partner/custom-detail/'+item?.id">{{item.yskmoney}}</a>
     </ng-template>
     <ng-template st-row="approvalStatus1" let-item>
       <div class="text-right">{{item.approvalStatus1 | currency:' '}}</div>
     </ng-template>
     <ng-template st-row="approvalStatus2" let-item>
-      <a class="text-right text-blue-dark">{{item.yskmoney | currency:' '}}</a>
+      <a class="text-right text-blue-dark"
+        [routerLink]="'/partner/business-statistics/partner/order-detail/'+item?.id">{{item.yskmoney | currency:'
+        '}}</a>
     </ng-template>
 
     <ng-template st-row="approvalStatus3" let-item>
diff --git a/src/app/routes/partner/business-statistics/components/partner-statistics/partner-statistics.component.ts b/src/app/routes/partner/business-statistics/components/partner-statistics/partner-statistics.component.ts
index ffb9d09c..11bca202 100644
--- a/src/app/routes/partner/business-statistics/components/partner-statistics/partner-statistics.component.ts
+++ b/src/app/routes/partner/business-statistics/components/partner-statistics/partner-statistics.component.ts
@@ -17,6 +17,13 @@ export class PartnerPartnerStatisticsComponent implements OnInit {
   columns: STColumn[] = [];
 
   constructor(public service: BussinessStatisticsService) { }
+  /**
+   * 查询参数
+   */
+  get reqParams() {
+    const params = { ...this.sf?.value };
+    return params
+  }
 
   ngOnInit(): void {
     this.initSF();
@@ -64,21 +71,27 @@ export class PartnerPartnerStatisticsComponent implements OnInit {
  */
   initST() {
     this.columns = [
-      { title: '合伙人名称', index: 'carNo', className: 'text-center' },
-      { title: '类型', render: 'carModelLabel', className: 'text-center' },
-      { title: '注册时间', index: 'carNo', className: 'text-center' },
-      { title: '本月新增客户', render: 'approvalStatus0', className: 'text-center', sort: true },
-      { title: '客户总数', render: 'approvalStatus', className: 'text-center', sort: true },
-      { title: '本月已结算金额（元）', render: 'approvalStatus1', className: 'text-center', sort: true },
-      { title: '累计已结算金额（元）', render: 'approvalStatus2', className: 'text-center', sort: true },
-      { title: '本月预估收益（元）', render: 'approvalStatus3', className: 'text-center', sort: true },
-      { title: '累计收益（元）', render: 'approvalStatus4', className: 'text-center', sort: true },
+      { title: '合伙人名称', index: 'carNo', className: 'text-center', width: 150 },
+      { title: '类型', render: 'carModelLabel', className: 'text-center', width: 150 },
+      { title: '注册时间', index: 'carNo', className: 'text-center', width: 150 },
+      { title: '本月新增客户', render: 'approvalStatus0', className: 'text-center', sort: true, width: 150 },
+      { title: '客户总数', render: 'approvalStatus', className: 'text-center', sort: true, width: 150 },
+      { title: '本月已结算金额（元）', render: 'approvalStatus1', className: 'text-right', sort: true, width: 180 },
+      { title: '累计已结算金额（元）', render: 'approvalStatus2', className: 'text-right', sort: true, width: 180 },
+      { title: '本月预估收益（元）', render: 'approvalStatus3', className: 'text-right', sort: true, width: 180 },
+      { title: '累计收益（元）', render: 'approvalStatus4', className: 'text-right', sort: true, width: 180 },
     ];
   }
 
   resetSF() {
     this.sf.reset();
-    this.st.reset();
+    setTimeout(() => {
+      this.st.reset();
+    })
+  }
+
+  export() {
+
   }
 
 
diff --git a/src/app/routes/partner/business-statistics/components/sale-statistics/sale-statistics.component.html b/src/app/routes/partner/business-statistics/components/sale-statistics/sale-statistics.component.html
index 7868ebf7..aa6f6c90 100644
--- a/src/app/routes/partner/business-statistics/components/sale-statistics/sale-statistics.component.html
+++ b/src/app/routes/partner/business-statistics/components/sale-statistics/sale-statistics.component.html
@@ -1,11 +1,20 @@
 <nz-card>
-  <sf mode="search" [schema]="schema" (formSubmit)="st.load(1)" (formReset)="st.reset($event)"></sf>
+  <sf mode="search" [schema]="schema" [button]="'none'" #sf>
+    <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading"
+      (click)="st?.load(1)">查询</button>
+    <button nz-button (click)="resetSF()">重置</button>
+    <button nz-button (click)="export()" nzType="primary" nzGhost>导出</button>
+  </sf>
 
 </nz-card>
 <nz-card>
-  <st #st [data]="url" [columns]="columns">
+  <st #st [data]="service.$api_get_partner_statistics_page" [columns]="columns" [scroll]="{ x: '1200px' }"
+    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+    [loading]="service.http.loading">
     <ng-template st-row="approvalStatus" let-item>
-      <a [routerLink]="'/'">{{item.approvalStatus}}</a>
+      <a [routerLink]="'/'">{{item.yskmoney | currency:' ':false:'1.0-2'}}</a>
     </ng-template>
     <ng-template st-row="approvalStatus1" let-item>
       <div>{{item.approvalStatus1 | currency:' '}}</div>
@@ -15,7 +24,7 @@
     </ng-template>
 
     <ng-template st-row="approvalStatus3" let-item>
-      <div class="text-right">{{item.approvalStatus1 | currency:' '}}</div>
+      <div class="text-right">{{item.yskmoney | currency:' '}}</div>
     </ng-template>
   </st>
 </nz-card>
diff --git a/src/app/routes/partner/business-statistics/components/sale-statistics/sale-statistics.component.ts b/src/app/routes/partner/business-statistics/components/sale-statistics/sale-statistics.component.ts
index 247777db..d9279bd2 100644
--- a/src/app/routes/partner/business-statistics/components/sale-statistics/sale-statistics.component.ts
+++ b/src/app/routes/partner/business-statistics/components/sale-statistics/sale-statistics.component.ts
@@ -1,7 +1,8 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { STColumn, STComponent } from '@delon/abc/st';
-import { SFSchema, SFUISchema } from '@delon/form';
+import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
 import { ModalHelper, _HttpClient } from '@delon/theme';
+import { BussinessStatisticsService } from '../../services/bussiness-statistics.service';
 
 @Component({
   selector: 'app-partner-sale-statistics',
@@ -11,11 +12,19 @@ export class PartnerSaleStatisticsComponent implements OnInit {
   url = `/user`;
   schema!: SFSchema;
   @ViewChild('st') private readonly st!: STComponent;
+  @ViewChild('sf') private readonly sf!: SFComponent;
   columns: STColumn[] = [];
   ui!: SFUISchema;
 
-  constructor(private http: _HttpClient, private modal: ModalHelper) { }
+  constructor(public service: BussinessStatisticsService) { }
 
+  /**
+  * 查询参数
+  */
+  get reqParams() {
+    const params = { ...this.sf?.value };
+    return params
+  }
   ngOnInit(): void {
     this.initSF();
     this.initST();
@@ -47,16 +56,24 @@ export class PartnerSaleStatisticsComponent implements OnInit {
  */
   initST() {
     this.columns = [
-      { title: '姓名', index: 'carNo', className: 'text-center' },
+      { title: '联系人', index: 'carNo', className: 'text-center' },
       { title: '手机号', render: 'carModelLabel', className: 'text-center' },
       { title: '添加时间', index: 'carNo', className: 'text-center' },
       { title: '本月新增客户', render: 'approvalStatus', className: 'text-center', sort: true },
       { title: '客户总数', render: 'approvalStatus', className: 'text-center', sort: true },
       { title: '本月新增合伙人', render: 'approvalStatus1', className: 'text-center', sort: true },
       { title: '合伙人总数', render: 'approvalStatus1', className: 'text-center', sort: true },
-      { title: '本月已结算金额（元）', render: 'approvalStatus2', className: 'text-center', sort: true },
-      { title: '累计已结算金额（元）', render: 'approvalStatus3', className: 'text-center', sort: true },
+      { title: '本月已结算金额（元）', render: 'approvalStatus2', className: 'text-right', sort: true },
+      { title: '累计已结算金额（元）', render: 'approvalStatus3', className: 'text-right', sort: true },
     ];
   }
+  export() {
 
+  }
+  resetSF() {
+    this.sf.reset();
+    setTimeout(() => {
+      this.st.reset();
+    })
+  }
 }
diff --git a/src/app/routes/partner/partner-routing.module.ts b/src/app/routes/partner/partner-routing.module.ts
index 017a9f27..91b30b99 100644
--- a/src/app/routes/partner/partner-routing.module.ts
+++ b/src/app/routes/partner/partner-routing.module.ts
@@ -20,6 +20,7 @@ import { ParterLevelConfigListComponent } from './level-config/components/list/l
 import { ParterRebateManageMentParticularsComponent } from './rebate-management/components/list/particulars.component';
 import { PartnerSalePartnerDetailComponent } from './business-statistics/components/sale-partner-detail/sale-partner-detail.component';
 import { PartnerPartnerCustomOrderDetailComponent } from './business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component';
+import { PartnerPartnerOrderDetailComponent } from './business-statistics/components/partner-order-detail/partner-order-detail.component';
 
 const routes: Routes = [
   {
@@ -27,7 +28,7 @@ const routes: Routes = [
     children: [
       { path: '', redirectTo: 'index' },
       { path: 'index', component: PartnerBusinessStatisticsIndexComponent },
-      { path: 'partner/order-detail/:id', component: PartnerPartnerCustomOrderDetailComponent },
+      { path: 'partner/order-detail/:id', component: PartnerPartnerOrderDetailComponent },
       { path: 'partner/custom-detail/:id', component: PartnerPartnerCustomDetailComponent },
       { path: 'partner/custom-order-detail/:id', component: PartnerPartnerCustomOrderDetailComponent },
       { path: 'sale/custom-detail/:id', component: PartnerSaleCustomDetailComponent },
@@ -55,7 +56,8 @@ const routes: Routes = [
     children: [
       { path: 'particulars', component: ParterRebateManageMentParticularsComponent },
     ]
-  }];
+  },
+];
 @NgModule({
   imports: [RouterModule.forChild(routes)],
   exports: [RouterModule]
diff --git a/src/app/routes/partner/partner.module.ts b/src/app/routes/partner/partner.module.ts
index ed9b3d2a..4932f777 100644
--- a/src/app/routes/partner/partner.module.ts
+++ b/src/app/routes/partner/partner.module.ts
@@ -14,6 +14,7 @@ import { PartnerPartnerCustomDetailComponent } from './business-statistics/compo
 import { ParterRebateManageMentParticularsComponent } from './rebate-management/components/list/particulars.component';
 import { PartnerSalePartnerDetailComponent } from './business-statistics/components/sale-partner-detail/sale-partner-detail.component';
 import { PartnerPartnerCustomOrderDetailComponent } from './business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component';
+import { PartnerPartnerOrderDetailComponent } from './business-statistics/components/partner-order-detail/partner-order-detail.component';
 
 const COMPONENTS: any[] = [
   PartnerBusinessStatisticsIndexComponent,
@@ -29,7 +30,8 @@ const COMPONENTS: any[] = [
   ParterRebateManageMentParticularsComponent,
   PartnerSalePartnerDetailComponent,
   PartnerPartnerCustomOrderDetailComponent
-];
+,
+  PartnerPartnerOrderDetailComponent];
 
 @NgModule({
   declarations: [...COMPONENTS],

From 647d42690c78db1958fb3e94f62190b1f7eb6fa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= <xiaoyun.pan@eascs.com>
Date: Wed, 9 Mar 2022 14:08:38 +0800
Subject: [PATCH 09/70] =?UTF-8?q?=E8=B4=A6=E6=88=B7=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/list/list.component.html       |  9 ++++
 .../components/list/list.component.spec.ts    | 24 ++++++++++
 .../components/list/list.component.ts         | 45 +++++++++++++++++++
 .../routes/partner/partner-routing.module.ts  |  8 +++-
 src/app/routes/partner/partner.module.ts      |  7 +--
 src/app/routes/routes-routing.module.ts       |  2 +-
 src/assets/mocks/menu-data.json               | 26 ++++++-----
 7 files changed, 106 insertions(+), 15 deletions(-)
 create mode 100644 src/app/routes/partner/account-management/components/list/list.component.html
 create mode 100644 src/app/routes/partner/account-management/components/list/list.component.spec.ts
 create mode 100644 src/app/routes/partner/account-management/components/list/list.component.ts

diff --git a/src/app/routes/partner/account-management/components/list/list.component.html b/src/app/routes/partner/account-management/components/list/list.component.html
new file mode 100644
index 00000000..482ccb06
--- /dev/null
+++ b/src/app/routes/partner/account-management/components/list/list.component.html
@@ -0,0 +1,9 @@
+<page-header [action]="phActionTpl">
+  <ng-template #phActionTpl>
+    <button (click)="add()" nz-button nzType="primary">新建</button>
+  </ng-template>
+</page-header>
+<nz-card>
+  <sf mode="search" [schema]="searchSchema" (formSubmit)="st.reset($event)" (formReset)="st.reset($event)"></sf>
+  <st #st [data]="url" [columns]="columns"></st>
+</nz-card>
diff --git a/src/app/routes/partner/account-management/components/list/list.component.spec.ts b/src/app/routes/partner/account-management/components/list/list.component.spec.ts
new file mode 100644
index 00000000..da38a52c
--- /dev/null
+++ b/src/app/routes/partner/account-management/components/list/list.component.spec.ts
@@ -0,0 +1,24 @@
+import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import { PartnerAccountManagementListComponent } from './list.component';
+
+describe('PartnerAccountManagementListComponent', () => {
+  let component: PartnerAccountManagementListComponent;
+  let fixture: ComponentFixture<PartnerAccountManagementListComponent>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [PartnerAccountManagementListComponent]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(PartnerAccountManagementListComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/routes/partner/account-management/components/list/list.component.ts b/src/app/routes/partner/account-management/components/list/list.component.ts
new file mode 100644
index 00000000..f4133c97
--- /dev/null
+++ b/src/app/routes/partner/account-management/components/list/list.component.ts
@@ -0,0 +1,45 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { STColumn, STComponent } from '@delon/abc/st';
+import { SFSchema } from '@delon/form';
+import { ModalHelper, _HttpClient } from '@delon/theme';
+
+@Component({
+  selector: 'app-partner-list',
+  templateUrl: './list.component.html',
+})
+export class PartnerAccountManagementListComponent implements OnInit {
+  url = `/user`;
+  searchSchema: SFSchema = {
+    properties: {
+      no: {
+        type: 'string',
+        title: '编号'
+      }
+    }
+  };
+  @ViewChild('st') private readonly st!: STComponent;
+  columns: STColumn[] = [
+    { title: '编号', index: 'no' },
+    { title: '调用次数', type: 'number', index: 'callNo' },
+    { title: '头像', type: 'img', width: '50px', index: 'avatar' },
+    { title: '时间', type: 'date', index: 'updatedAt' },
+    {
+      title: '',
+      buttons: [
+        // { text: '查看', click: (item: any) => `/form/${item.id}` },
+        // { text: '编辑', type: 'static', component: FormEditComponent, click: 'reload' },
+      ]
+    }
+  ];
+
+  constructor(private http: _HttpClient, private modal: ModalHelper) { }
+
+  ngOnInit(): void { }
+
+  add(): void {
+    // this.modal
+    //   .createStatic(FormEditComponent, { i: { id: 0 } })
+    //   .subscribe(() => this.st.reload());
+  }
+
+}
diff --git a/src/app/routes/partner/partner-routing.module.ts b/src/app/routes/partner/partner-routing.module.ts
index 91b30b99..6cd0f164 100644
--- a/src/app/routes/partner/partner-routing.module.ts
+++ b/src/app/routes/partner/partner-routing.module.ts
@@ -21,6 +21,7 @@ import { ParterRebateManageMentParticularsComponent } from './rebate-management/
 import { PartnerSalePartnerDetailComponent } from './business-statistics/components/sale-partner-detail/sale-partner-detail.component';
 import { PartnerPartnerCustomOrderDetailComponent } from './business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component';
 import { PartnerPartnerOrderDetailComponent } from './business-statistics/components/partner-order-detail/partner-order-detail.component';
+import { PartnerAccountManagementListComponent } from './account-management/components/list/list.component';
 
 const routes: Routes = [
   {
@@ -57,7 +58,12 @@ const routes: Routes = [
       { path: 'particulars', component: ParterRebateManageMentParticularsComponent },
     ]
   },
-];
+  {
+    path: 'account-management',
+    children: [
+      { path: 'list', component: PartnerAccountManagementListComponent },
+    ]
+  }];
 @NgModule({
   imports: [RouterModule.forChild(routes)],
   exports: [RouterModule]
diff --git a/src/app/routes/partner/partner.module.ts b/src/app/routes/partner/partner.module.ts
index 4932f777..157b33d6 100644
--- a/src/app/routes/partner/partner.module.ts
+++ b/src/app/routes/partner/partner.module.ts
@@ -15,6 +15,7 @@ import { ParterRebateManageMentParticularsComponent } from './rebate-management/
 import { PartnerSalePartnerDetailComponent } from './business-statistics/components/sale-partner-detail/sale-partner-detail.component';
 import { PartnerPartnerCustomOrderDetailComponent } from './business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component';
 import { PartnerPartnerOrderDetailComponent } from './business-statistics/components/partner-order-detail/partner-order-detail.component';
+import { PartnerAccountManagementListComponent } from './account-management/components/list/list.component';
 
 const COMPONENTS: any[] = [
   PartnerBusinessStatisticsIndexComponent,
@@ -29,9 +30,9 @@ const COMPONENTS: any[] = [
   PartnerSaleCustomDetailComponent,
   ParterRebateManageMentParticularsComponent,
   PartnerSalePartnerDetailComponent,
-  PartnerPartnerCustomOrderDetailComponent
-,
-  PartnerPartnerOrderDetailComponent];
+  PartnerPartnerCustomOrderDetailComponent,
+  PartnerPartnerOrderDetailComponent,
+  PartnerAccountManagementListComponent];
 
 @NgModule({
   declarations: [...COMPONENTS],
diff --git a/src/app/routes/routes-routing.module.ts b/src/app/routes/routes-routing.module.ts
index dc6d02c9..47be637f 100644
--- a/src/app/routes/routes-routing.module.ts
+++ b/src/app/routes/routes-routing.module.ts
@@ -72,7 +72,7 @@ const routes: Routes = [
         path: 'download',
         loadChildren: () => import('./download/download.module').then(m => m.DownloadModule)
       }
-    ]
+    { path: 'account-management', loadChildren: () => import('./account-management/account-management.module').then((m) => m.AccountManagementModule) },]
   },
   // passport
   { path: '', loadChildren: () => import('./passport/passport.module').then(m => m.PassportModule) },
diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json
index 90c2212b..223b2212 100644
--- a/src/assets/mocks/menu-data.json
+++ b/src/assets/mocks/menu-data.json
@@ -508,16 +508,14 @@
         {
           "text": "合伙人管理",
           "icon": "anticon anticon-dashboard",
-          "children": [
-            {
-            "text": "业务统计",
-            "link": "/partner/business-statistics/index"
+          "children": [{
+              "text": "业务统计",
+              "link": "/partner/business-statistics/index"
             },
             {
               "text": "返佣管理",
               "group": true,
-              "children": [
-                {
+              "children": [{
                   "text": "返佣配置",
                   "link": "/partner/rebate/"
                 },
@@ -532,12 +530,20 @@
               ]
             },
             {
-            "text": "销售渠道管理",
-            "link": "/partner/channel-sales/list"
+              "text": "销售渠道管理",
+              "link": "/partner/channel-sales/list"
             },
             {
-            "text": "等级配置",
-            "link": "/partner/level-config/list"
+              "text": "等级配置",
+              "link": "/partner/level-config/list"
+            },
+            {
+              "text": "账户管理",
+              "group": true,
+              "children": [{
+                "text": "账户管理",
+                "link": "/partner/account-management/list"
+              }]
             }
           ]
         }

From 957a66254fdf8ef46d5a610bdfc33ab219d37c5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= <xiaoyun.pan@eascs.com>
Date: Wed, 9 Mar 2022 14:18:56 +0800
Subject: [PATCH 10/70] -

---
 .../components/list/list.component.html       |  40 +++++--
 .../components/list/list.component.ts         | 106 +++++++++++++-----
 .../services/account-managemant.service.ts    |  12 ++
 src/app/routes/routes-routing.module.ts       |   4 +-
 4 files changed, 126 insertions(+), 36 deletions(-)
 create mode 100644 src/app/routes/partner/account-management/services/account-managemant.service.ts

diff --git a/src/app/routes/partner/account-management/components/list/list.component.html b/src/app/routes/partner/account-management/components/list/list.component.html
index 482ccb06..eff67eb6 100644
--- a/src/app/routes/partner/account-management/components/list/list.component.html
+++ b/src/app/routes/partner/account-management/components/list/list.component.html
@@ -1,9 +1,35 @@
-<page-header [action]="phActionTpl">
-  <ng-template #phActionTpl>
-    <button (click)="add()" nz-button nzType="primary">新建</button>
-  </ng-template>
-</page-header>
 <nz-card>
-  <sf mode="search" [schema]="searchSchema" (formSubmit)="st.reset($event)" (formReset)="st.reset($event)"></sf>
-  <st #st [data]="url" [columns]="columns"></st>
+  <sf mode="search" [schema]="schema" [ui]="ui" [button]="'none'" (formSubmit)="st.load(1)" (formReset)="resetSF()" #sf>
+    <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading"
+      (click)="st?.load(1)">查询</button>
+    <button nz-button (click)="resetSF()">重置</button>
+    <button nz-button (click)="export()" nzType="primary" nzGhost>导出</button>
+  </sf>
+
+</nz-card>
+<nz-card>
+  <st #st [data]="service.$api_get_partner_statistics_page" [columns]="columns" [scroll]="{ x: '1200px' }"
+    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+    [loading]="service.http.loading">
+    <ng-template st-row="approvalStatus" let-item>
+      <a [routerLink]="'/partner/business-statistics/partner/custom-detail/'+item?.id">{{item.yskmoney}}</a>
+    </ng-template>
+    <ng-template st-row="approvalStatus1" let-item>
+      <div class="text-right">{{item.approvalStatus1 | currency:' '}}</div>
+    </ng-template>
+    <ng-template st-row="approvalStatus2" let-item>
+      <a class="text-right text-blue-dark"
+        [routerLink]="'/partner/business-statistics/partner/order-detail/'+item?.id">{{item.yskmoney | currency:'
+        '}}</a>
+    </ng-template>
+
+    <ng-template st-row="approvalStatus3" let-item>
+      <div class="text-right">{{item.yskmoney | currency:' '}}</div>
+    </ng-template>
+    <ng-template st-row="approvalStatus4" let-item>
+      <div class="text-right">{{item.armoney | currency:' '}}</div>
+    </ng-template>
+  </st>
 </nz-card>
diff --git a/src/app/routes/partner/account-management/components/list/list.component.ts b/src/app/routes/partner/account-management/components/list/list.component.ts
index f4133c97..e072fc3c 100644
--- a/src/app/routes/partner/account-management/components/list/list.component.ts
+++ b/src/app/routes/partner/account-management/components/list/list.component.ts
@@ -1,7 +1,8 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { STColumn, STComponent } from '@delon/abc/st';
-import { SFSchema } from '@delon/form';
+import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
 import { ModalHelper, _HttpClient } from '@delon/theme';
+import { BussinessStatisticsService } from '../../../business-statistics/services/bussiness-statistics.service';
 
 @Component({
   selector: 'app-partner-list',
@@ -9,37 +10,88 @@ import { ModalHelper, _HttpClient } from '@delon/theme';
 })
 export class PartnerAccountManagementListComponent implements OnInit {
   url = `/user`;
-  searchSchema: SFSchema = {
-    properties: {
-      no: {
-        type: 'string',
-        title: '编号'
+  schema!: SFSchema;
+  ui!: SFUISchema;
+  @ViewChild('st') private readonly st!: STComponent;
+  @ViewChild('sf') private readonly sf!: SFComponent;
+  columns: STColumn[] = [];
+
+  constructor(public service: BussinessStatisticsService) { }
+  /**
+   * 查询参数
+   */
+  get reqParams() {
+    const params = { ...this.sf?.value };
+    return params
+  }
+
+  ngOnInit(): void {
+    this.initSF();
+    this.initST();
+  }
+
+  initSF() {
+    this.schema = {
+      properties: {
+        abnormalCause: {
+          title: '合伙人名称',
+          type: 'string',
+          ui: {
+            placeholder: '请输入',
+          },
+        },
+        abnormalCause1: {
+          title: '类型',
+          type: 'string',
+          default: '',
+          enum: [
+            {
+              label: '全部',
+              value: ''
+            },
+            {
+              label: '个人',
+              value: '1'
+            },
+            {
+              label: '企业',
+              value: '2'
+            }
+          ],
+          ui: {
+            widget: 'select'
+          },
+        },
       }
     }
-  };
-  @ViewChild('st') private readonly st!: STComponent;
-  columns: STColumn[] = [
-    { title: '编号', index: 'no' },
-    { title: '调用次数', type: 'number', index: 'callNo' },
-    { title: '头像', type: 'img', width: '50px', index: 'avatar' },
-    { title: '时间', type: 'date', index: 'updatedAt' },
-    {
-      title: '',
-      buttons: [
-        // { text: '查看', click: (item: any) => `/form/${item.id}` },
-        // { text: '编辑', type: 'static', component: FormEditComponent, click: 'reload' },
-      ]
-    }
-  ];
+    this.ui = { '*': { spanLabelFixed: 120, grid: { span: 8, gutter: 4 } } };
+  }
+  /**
+ * 初始化数据列表
+ */
+  initST() {
+    this.columns = [
+      { title: '合伙人名称', index: 'carNo', className: 'text-center', width: 150 },
+      { title: '类型', render: 'carModelLabel', className: 'text-center', width: 150 },
+      { title: '注册时间', index: 'carNo', className: 'text-center', width: 150 },
+      { title: '本月新增客户', render: 'approvalStatus0', className: 'text-center', sort: true, width: 150 },
+      { title: '客户总数', render: 'approvalStatus', className: 'text-center', sort: true, width: 150 },
+      { title: '本月已结算金额（元）', render: 'approvalStatus1', className: 'text-right', sort: true, width: 180 },
+      { title: '累计已结算金额（元）', render: 'approvalStatus2', className: 'text-right', sort: true, width: 180 },
+      { title: '本月预估收益（元）', render: 'approvalStatus3', className: 'text-right', sort: true, width: 180 },
+      { title: '累计收益（元）', render: 'approvalStatus4', className: 'text-right', sort: true, width: 180 },
+    ];
+  }
 
-  constructor(private http: _HttpClient, private modal: ModalHelper) { }
+  resetSF() {
+    this.sf.reset();
+    setTimeout(() => {
+      this.st.reset();
+    })
+  }
 
-  ngOnInit(): void { }
+  export() {
 
-  add(): void {
-    // this.modal
-    //   .createStatic(FormEditComponent, { i: { id: 0 } })
-    //   .subscribe(() => this.st.reload());
   }
 
 }
diff --git a/src/app/routes/partner/account-management/services/account-managemant.service.ts b/src/app/routes/partner/account-management/services/account-managemant.service.ts
new file mode 100644
index 00000000..3ca08cb0
--- /dev/null
+++ b/src/app/routes/partner/account-management/services/account-managemant.service.ts
@@ -0,0 +1,12 @@
+import { Injectable, Injector } from '@angular/core';
+import { BaseService } from '@shared';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class AccountManagemantService extends BaseService {
+
+  constructor(public injector: Injector) {
+    super(injector)
+  }
+}
diff --git a/src/app/routes/routes-routing.module.ts b/src/app/routes/routes-routing.module.ts
index 47be637f..68b60fe7 100644
--- a/src/app/routes/routes-routing.module.ts
+++ b/src/app/routes/routes-routing.module.ts
@@ -72,7 +72,7 @@ const routes: Routes = [
         path: 'download',
         loadChildren: () => import('./download/download.module').then(m => m.DownloadModule)
       }
-    { path: 'account-management', loadChildren: () => import('./account-management/account-management.module').then((m) => m.AccountManagementModule) },]
+    ]
   },
   // passport
   { path: '', loadChildren: () => import('./passport/passport.module').then(m => m.PassportModule) },
@@ -92,4 +92,4 @@ const routes: Routes = [
   ],
   exports: [RouterModule]
 })
-export class RouteRoutingModule {}
+export class RouteRoutingModule { }

From b848978d70bcacd6c0e21aaf6ac491660af70e51 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Wed, 9 Mar 2022 14:49:59 +0800
Subject: [PATCH 11/70] fix bug

---
 .../components/list/particulars.component.ts  |   6 +-
 .../rebate-record.component.html              |  60 ++++++
 .../rebate-record/rebate-record.component.ts  | 188 ++++++++++++++++++
 3 files changed, 251 insertions(+), 3 deletions(-)
 create mode 100644 src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.html
 create mode 100644 src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.ts

diff --git a/src/app/routes/partner/rebate-management/components/list/particulars.component.ts b/src/app/routes/partner/rebate-management/components/list/particulars.component.ts
index 88bc6e8f..55ed5dd9 100644
--- a/src/app/routes/partner/rebate-management/components/list/particulars.component.ts
+++ b/src/app/routes/partner/rebate-management/components/list/particulars.component.ts
@@ -136,7 +136,7 @@ export class ParterRebateManageMentParticularsComponent implements OnInit {
         index: 'name1'
       },
       {
-        title: '返佣金额（元）',
+        title: '预估返佣金额（元）',
         index: 'name1'
       },
       {
@@ -152,11 +152,11 @@ export class ParterRebateManageMentParticularsComponent implements OnInit {
         index: 'name1'
       },
       {
-        title: '合伙人名称',
+        title: '销售渠道',
         index: 'name1'
       },
       {
-        title: '网络货运人',
+        title: '合伙人名称',
         index: 'name1'
       },
       {
diff --git a/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.html b/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.html
new file mode 100644
index 00000000..0ebf82f0
--- /dev/null
+++ b/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.html
@@ -0,0 +1,60 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-02-24 20:09:49
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-02-24 20:14:21
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\list\\particulars.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
+<page-header-wrapper [title]="''"> </page-header-wrapper>
+<nz-card>
+  <div nz-row nzGutter="8">
+    <!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
+    <div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
+      <sf
+        #sf
+        [schema]="schema"
+        [ui]="ui"
+        [mode]="'search'"
+        [disabled]="!sf?.valid"
+        [loading]="service.http.loading"
+        (formSubmit)="st?.load(1)"
+        (formReset)="resetSF()"
+      ></sf>
+    </div>
+
+    <!-- 查询字段大于3个时，根据展开状态调整布局 -->
+    <ng-container *ngIf="queryFieldCount > 4">
+      <div nz-col [nzSpan]="_$expand ? 24 : 18">
+        <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
+      </div>
+      <div nz-col [nzSpan]="_$expand ? 24 : 6" class="text-right">
+        <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1);">查询</button>
+        <button nz-button nzType="primary" [disabled]="service.http.loading" >导出</button>
+        <button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
+        <button nz-button nzType="link" (click)="expandToggle()">
+          {{ !_$expand ? '展开' : '收起' }}
+          <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
+        </button>
+      </div>
+    </ng-container>
+  </div>
+</nz-card>
+
+<nz-card>
+  <!-- 数据列表 -->
+  <st
+    #st
+    [bordered]="true"
+    [data]="data"
+    [columns]="columns"
+    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+    [loadingDelay]="500"
+    [loading]="service.http.loading"
+  >
+  </st>
+</nz-card>
diff --git a/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.ts b/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.ts
new file mode 100644
index 00000000..55ed5dd9
--- /dev/null
+++ b/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.ts
@@ -0,0 +1,188 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st';
+import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
+import { processSingleSort, ShipperBaseService } from '@shared';
+import { NzModalService } from 'ng-zorro-antd/modal';
+import { RebateManagementService } from '../../services/rebate-management.service';
+
+@Component({
+  selector: 'app-parter-channel-rebate-management-particulars',
+  templateUrl: './particulars.component.html'
+})
+export class ParterRebateManageMentParticularsComponent implements OnInit {
+  schema: SFSchema = {};
+  columns!: STColumn[];
+  ui!: SFUISchema;
+  @ViewChild('st', { static: false })
+  st!: STComponent;
+  @ViewChild('sf', { static: false })
+  sf!: SFComponent;
+  spuStatus = '1';
+  _$expand = false;
+  data = [{ name1: 1111 }];
+  constructor(
+    public router: Router,
+    public ar: ActivatedRoute,
+    public service: RebateManagementService,
+    private modalService: NzModalService,
+    public shipperservice: ShipperBaseService
+  ) {}
+  /**
+   * 查询字段个数
+   */
+  get queryFieldCount(): number {
+    return Object.keys(this.schema?.properties || {}).length;
+  }
+    /**
+  * 伸缩查询条件
+  */
+     expandToggle(): void {
+      this._$expand = !this._$expand;
+      this.sf?.setValue('/_$expand', this._$expand);
+    }
+  /**
+ * 查询参数
+ */
+   get reqParams() {
+    const params: any = Object.assign({}, this.sf?.value || {});
+    delete params._$expand;
+    return { 
+      ...params,
+      deadlineTime: {
+        start: this.sf?.value?.deadlineTime?.[0] || '',
+        end: this.sf?.value?.deadlineTime?.[1] || '',
+      },
+     };
+  }
+  ngOnInit() {
+    this.initSF();
+    this.initST();
+  }
+
+  initSF() {
+    this.schema = {
+      properties: {
+        _$expand: { type: 'boolean', ui: { hidden: true } },
+        name: {
+          type: 'string',
+          title: '订单号'
+        },
+        phone: {
+          type: 'string',
+          title: '付款单号'
+        },
+        phone2: {
+          type: 'string',
+          title: '下单客户'
+        },
+        enterpriseInfoId: {
+          type: 'string',
+          title: '网络货运人',
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            },
+            allowClear: true,
+            asyncData: () => this.shipperservice.getNetworkFreightForwarder()
+          }
+        },
+        phone3: {
+          type: 'string',
+          title: '合伙人名称',
+          ui: {
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            },
+          }
+        },
+        deadlineTime: {
+          title: '时间范围',
+          type: 'string',
+          ui: {
+            widget: 'date',
+            mode: 'range',
+            format: 'yyyy-MM-dd',
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            },
+            allowClear: true
+          } as SFDateWidgetSchema
+        }
+      }
+    };
+    this.ui = {
+      '*': {
+        spanLabelFixed: 140,
+        grid: { span: 8, gutter: 4 }
+      }
+    };
+  }
+
+  initST() {
+    this.columns = [
+      {
+        title: '订单号',
+        index: 'name1'
+      },
+      {
+        title: '订单金额（元）',
+        index: 'name1'
+      },
+      {
+        title: '付款金额（元）',
+        index: 'name1'
+      },
+      {
+        title: '预估返佣金额（元）',
+        index: 'name1'
+      },
+      {
+        title: '附加费率',
+        index: 'name1'
+      },
+      {
+        title: '下单客户',
+        index: 'name1'
+      },
+      {
+        title: '网络货运人',
+        index: 'name1'
+      },
+      {
+        title: '销售渠道',
+        index: 'name1'
+      },
+      {
+        title: '合伙人名称',
+        index: 'name1'
+      },
+      {
+        title: '合伙人等级',
+        index: 'name1'
+      },
+      {
+        title: '管理费比例',
+        index: 'name1'
+      },
+      {
+        title: '固定结算费率',
+        index: 'name1'
+      },
+      {
+        title: '返佣时间',
+        index: 'name1'
+      }
+    ];
+  }
+
+  /**
+   * 重置表单
+   */
+  resetSF() {
+    this.sf.reset();
+    this.st.load(1);
+  }
+}

From 737cfd55bba3fc6d9421518be01c80e3a45a9577 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Wed, 9 Mar 2022 15:16:10 +0800
Subject: [PATCH 12/70] fix bug

---
 .../routes/partner/partner-routing.module.ts  |   4 +-
 src/app/routes/partner/partner.module.ts      |  14 +-
 .../particulars.component.html                |   0
 .../particulars.component.ts                  |   0
 .../rebate-record.component.html              |  29 +--
 .../rebate-record/rebate-record.component.ts  | 113 ++++-------
 .../record-detail.component.html              |  34 ++++
 .../record-detail/record-detail.component.ts  | 189 ++++++++++++++++++
 .../supply-management.module.ts               |   6 +-
 src/assets/mocks/menu-data.json               |   2 +-
 10 files changed, 289 insertions(+), 102 deletions(-)
 rename src/app/routes/partner/rebate-management/components/{list => particulars}/particulars.component.html (100%)
 rename src/app/routes/partner/rebate-management/components/{list => particulars}/particulars.component.ts (100%)
 create mode 100644 src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.html
 create mode 100644 src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.ts

diff --git a/src/app/routes/partner/partner-routing.module.ts b/src/app/routes/partner/partner-routing.module.ts
index 6cd0f164..96ed5adc 100644
--- a/src/app/routes/partner/partner-routing.module.ts
+++ b/src/app/routes/partner/partner-routing.module.ts
@@ -17,11 +17,12 @@ import { ParterChannelSalesEditComponent } from './channel-sales/components/edit
 import { ParterChannelSalesListComponent } from './channel-sales/components/list/list.component';
 import { ParterLevelConfigEditComponent } from './level-config/components/edit/edit.component';
 import { ParterLevelConfigListComponent } from './level-config/components/list/list.component';
-import { ParterRebateManageMentParticularsComponent } from './rebate-management/components/list/particulars.component';
+import { ParterRebateManageMentParticularsComponent } from './rebate-management/components/particulars/particulars.component';
 import { PartnerSalePartnerDetailComponent } from './business-statistics/components/sale-partner-detail/sale-partner-detail.component';
 import { PartnerPartnerCustomOrderDetailComponent } from './business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component';
 import { PartnerPartnerOrderDetailComponent } from './business-statistics/components/partner-order-detail/partner-order-detail.component';
 import { PartnerAccountManagementListComponent } from './account-management/components/list/list.component';
+import { ParterRebateManageMentRecordComponent } from './rebate-management/components/rebate-record/rebate-record.component';
 
 const routes: Routes = [
   {
@@ -56,6 +57,7 @@ const routes: Routes = [
     path: 'rebate',
     children: [
       { path: 'particulars', component: ParterRebateManageMentParticularsComponent },
+      { path: 'record', component: ParterRebateManageMentRecordComponent },
     ]
   },
   {
diff --git a/src/app/routes/partner/partner.module.ts b/src/app/routes/partner/partner.module.ts
index 157b33d6..830876e7 100644
--- a/src/app/routes/partner/partner.module.ts
+++ b/src/app/routes/partner/partner.module.ts
@@ -1,3 +1,13 @@
+/*
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-03-09 14:34:55
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-03-09 14:56:46
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\partner.module.ts
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+ */
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { SharedModule } from '@shared';
@@ -11,11 +21,12 @@ import { PartnerPartnerStatisticsComponent } from './business-statistics/compone
 import { PartnerSaleStatisticsComponent } from './business-statistics/components/sale-statistics/sale-statistics.component';
 import { PartnerSaleCustomDetailComponent } from './business-statistics/components/sale-custom-detail/sale-custom-detail.component';
 import { PartnerPartnerCustomDetailComponent } from './business-statistics/components/partner-custom-detail/partner-custom-detail.component';
-import { ParterRebateManageMentParticularsComponent } from './rebate-management/components/list/particulars.component';
+import { ParterRebateManageMentParticularsComponent } from './rebate-management/components/particulars/particulars.component';
 import { PartnerSalePartnerDetailComponent } from './business-statistics/components/sale-partner-detail/sale-partner-detail.component';
 import { PartnerPartnerCustomOrderDetailComponent } from './business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component';
 import { PartnerPartnerOrderDetailComponent } from './business-statistics/components/partner-order-detail/partner-order-detail.component';
 import { PartnerAccountManagementListComponent } from './account-management/components/list/list.component';
+import { ParterRebateManageMentRecordComponent } from './rebate-management/components/rebate-record/rebate-record.component';
 
 const COMPONENTS: any[] = [
   PartnerBusinessStatisticsIndexComponent,
@@ -29,6 +40,7 @@ const COMPONENTS: any[] = [
   PartnerPartnerCustomDetailComponent,
   PartnerSaleCustomDetailComponent,
   ParterRebateManageMentParticularsComponent,
+  ParterRebateManageMentRecordComponent,
   PartnerSalePartnerDetailComponent,
   PartnerPartnerCustomOrderDetailComponent,
   PartnerPartnerOrderDetailComponent,
diff --git a/src/app/routes/partner/rebate-management/components/list/particulars.component.html b/src/app/routes/partner/rebate-management/components/particulars/particulars.component.html
similarity index 100%
rename from src/app/routes/partner/rebate-management/components/list/particulars.component.html
rename to src/app/routes/partner/rebate-management/components/particulars/particulars.component.html
diff --git a/src/app/routes/partner/rebate-management/components/list/particulars.component.ts b/src/app/routes/partner/rebate-management/components/particulars/particulars.component.ts
similarity index 100%
rename from src/app/routes/partner/rebate-management/components/list/particulars.component.ts
rename to src/app/routes/partner/rebate-management/components/particulars/particulars.component.ts
diff --git a/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.html b/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.html
index 0ebf82f0..9ddc7ac3 100644
--- a/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.html
+++ b/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.html
@@ -4,15 +4,14 @@
  * @Author       : Shiming
  * @Date         : 2022-02-24 20:09:49
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-24 20:14:21
- * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\list\\particulars.component.html
+ * @LastEditTime : 2022-03-09 15:04:50
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-record\\rebate-record.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
 <page-header-wrapper [title]="''"> </page-header-wrapper>
 <nz-card>
   <div nz-row nzGutter="8">
     <!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
-    <div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
       <sf
         #sf
         [schema]="schema"
@@ -20,26 +19,13 @@
         [mode]="'search'"
         [disabled]="!sf?.valid"
         [loading]="service.http.loading"
-        (formSubmit)="st?.load(1)"
-        (formReset)="resetSF()"
+        [button]="'none'"
       ></sf>
-    </div>
-
-    <!-- 查询字段大于3个时，根据展开状态调整布局 -->
-    <ng-container *ngIf="queryFieldCount > 4">
-      <div nz-col [nzSpan]="_$expand ? 24 : 18">
-        <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
-      </div>
       <div nz-col [nzSpan]="_$expand ? 24 : 6" class="text-right">
-        <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1);">查询</button>
-        <button nz-button nzType="primary" [disabled]="service.http.loading" >导出</button>
-        <button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
-        <button nz-button nzType="link" (click)="expandToggle()">
-          {{ !_$expand ? '展开' : '收起' }}
-          <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
-        </button>
-      </div>
-    </ng-container>
+      <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1);">查询</button>
+      <button nz-button nzType="primary" [disabled]="service.http.loading" >导出</button>
+      <button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
+    </div>
   </div>
 </nz-card>
 
@@ -47,7 +33,6 @@
   <!-- 数据列表 -->
   <st
     #st
-    [bordered]="true"
     [data]="data"
     [columns]="columns"
     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
diff --git a/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.ts b/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.ts
index 55ed5dd9..54e8e57b 100644
--- a/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.ts
+++ b/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.ts
@@ -1,3 +1,4 @@
+import { ModalHelper } from '@delon/theme';
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st';
@@ -5,12 +6,13 @@ import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/fo
 import { processSingleSort, ShipperBaseService } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { RebateManagementService } from '../../services/rebate-management.service';
+import { ParterRebateManageMenRecordDetailComponent } from '../../model/record-detail/record-detail.component';
 
 @Component({
-  selector: 'app-parter-channel-rebate-management-particulars',
-  templateUrl: './particulars.component.html'
+  selector: 'app-parter-channel-rebate-management-record',
+  templateUrl: './rebate-record.component.html'
 })
-export class ParterRebateManageMentParticularsComponent implements OnInit {
+export class ParterRebateManageMentRecordComponent implements OnInit {
   schema: SFSchema = {};
   columns!: STColumn[];
   ui!: SFUISchema;
@@ -26,7 +28,8 @@ export class ParterRebateManageMentParticularsComponent implements OnInit {
     public ar: ActivatedRoute,
     public service: RebateManagementService,
     private modalService: NzModalService,
-    public shipperservice: ShipperBaseService
+    public shipperservice: ShipperBaseService,
+    private modal: ModalHelper
   ) {}
   /**
    * 查询字段个数
@@ -64,53 +67,15 @@ export class ParterRebateManageMentParticularsComponent implements OnInit {
     this.schema = {
       properties: {
         _$expand: { type: 'boolean', ui: { hidden: true } },
-        name: {
+        month: {
           type: 'string',
-          title: '订单号'
+          title: '时间月份',
+          format: 'month',
         },
         phone: {
           type: 'string',
-          title: '付款单号'
+          title: '合伙人名称'
         },
-        phone2: {
-          type: 'string',
-          title: '下单客户'
-        },
-        enterpriseInfoId: {
-          type: 'string',
-          title: '网络货运人',
-          ui: {
-            widget: 'select',
-            placeholder: '请选择',
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            },
-            allowClear: true,
-            asyncData: () => this.shipperservice.getNetworkFreightForwarder()
-          }
-        },
-        phone3: {
-          type: 'string',
-          title: '合伙人名称',
-          ui: {
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            },
-          }
-        },
-        deadlineTime: {
-          title: '时间范围',
-          type: 'string',
-          ui: {
-            widget: 'date',
-            mode: 'range',
-            format: 'yyyy-MM-dd',
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            },
-            allowClear: true
-          } as SFDateWidgetSchema
-        }
       }
     };
     this.ui = {
@@ -124,35 +89,11 @@ export class ParterRebateManageMentParticularsComponent implements OnInit {
   initST() {
     this.columns = [
       {
-        title: '订单号',
+        title: '月份',
         index: 'name1'
       },
       {
-        title: '订单金额（元）',
-        index: 'name1'
-      },
-      {
-        title: '付款金额（元）',
-        index: 'name1'
-      },
-      {
-        title: '预估返佣金额（元）',
-        index: 'name1'
-      },
-      {
-        title: '附加费率',
-        index: 'name1'
-      },
-      {
-        title: '下单客户',
-        index: 'name1'
-      },
-      {
-        title: '网络货运人',
-        index: 'name1'
-      },
-      {
-        title: '销售渠道',
+        title: '返佣金额（元）',
         index: 'name1'
       },
       {
@@ -160,7 +101,7 @@ export class ParterRebateManageMentParticularsComponent implements OnInit {
         index: 'name1'
       },
       {
-        title: '合伙人等级',
+        title: '实际等级',
         index: 'name1'
       },
       {
@@ -168,16 +109,38 @@ export class ParterRebateManageMentParticularsComponent implements OnInit {
         index: 'name1'
       },
       {
-        title: '固定结算费率',
+        title: '返佣时间',
         index: 'name1'
       },
       {
-        title: '返佣时间',
+        title: '异常反馈',
         index: 'name1'
+      },
+      {
+        title: '操作',
+        fixed: 'right',
+        width: '90px',
+        className: 'text-left',
+        buttons: [
+          {
+            text: '明细',
+            click: _record => this.viewEvaluate(_record),
+          }
+        ]
       }
     ];
   }
+  /**
+   *查看详情
+   */
+   viewEvaluate(item: any) {
+    //  this.modalService
+    this.modal.createStatic(ParterRebateManageMenRecordDetailComponent, {i:item}).subscribe((res: boolean)=> {
+      if(res) {
 
+      }
+    })
+  }
   /**
    * 重置表单
    */
diff --git a/src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.html b/src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.html
new file mode 100644
index 00000000..65099230
--- /dev/null
+++ b/src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.html
@@ -0,0 +1,34 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-02-24 20:09:49
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-03-09 15:14:50
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\model\\record-detail\\record-detail.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
+  <div nz-row nzGutter="8">
+      <sf
+        #sf
+        [schema]="schema"
+        [ui]="ui"
+        [mode]="'search'"
+        [disabled]="!sf?.valid"
+        [loading]="service.http.loading"
+        [button]="'none'"
+      ></sf>
+  </div>
+  <!-- 数据列表 -->
+  <st
+    #st
+    [bordered]="true"
+    [data]="data"
+    [columns]="columns"
+    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+    [loadingDelay]="500"
+    [loading]="service.http.loading"
+  >
+  </st>
diff --git a/src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.ts b/src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.ts
new file mode 100644
index 00000000..b5c70083
--- /dev/null
+++ b/src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.ts
@@ -0,0 +1,189 @@
+import { ModalHelper } from '@delon/theme';
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st';
+import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
+import { processSingleSort, ShipperBaseService } from '@shared';
+import { NzModalService } from 'ng-zorro-antd/modal';
+import { RebateManagementService } from '../../services/rebate-management.service';
+
+@Component({
+  selector: 'app-parter-channel-rebate-management-record-detail',
+  templateUrl: './record-detail.component.html'
+})
+export class ParterRebateManageMenRecordDetailComponent implements OnInit {
+  schema: SFSchema = {};
+  columns!: STColumn[];
+  ui!: SFUISchema;
+  @ViewChild('st', { static: false })
+  st!: STComponent;
+  @ViewChild('sf', { static: false })
+  sf!: SFComponent;
+  spuStatus = '1';
+  _$expand = false;
+  data = [{ name1: 1111 }];
+  constructor(
+    public router: Router,
+    public ar: ActivatedRoute,
+    public service: RebateManagementService,
+    private modalService: NzModalService,
+    public shipperservice: ShipperBaseService,
+  ) {}
+  /**
+   * 查询字段个数
+   */
+  get queryFieldCount(): number {
+    return Object.keys(this.schema?.properties || {}).length;
+  }
+    /**
+  * 伸缩查询条件
+  */
+     expandToggle(): void {
+      this._$expand = !this._$expand;
+      this.sf?.setValue('/_$expand', this._$expand);
+    }
+  /**
+ * 查询参数
+ */
+   get reqParams() {
+    const params: any = Object.assign({}, this.sf?.value || {});
+    delete params._$expand;
+    return { 
+      ...params,
+      deadlineTime: {
+        start: this.sf?.value?.deadlineTime?.[0] || '',
+        end: this.sf?.value?.deadlineTime?.[1] || '',
+      },
+     };
+  }
+  ngOnInit() {
+    this.initSF();
+    this.initST();
+  }
+
+  initSF() {
+    this.schema = {
+      properties: {
+        _$expand: { type: 'boolean', ui: { hidden: true } },
+        name: {
+          type: 'string',
+          title: '订单号'
+        },
+        phone: {
+          type: 'string',
+          title: '付款单号'
+        },
+        phone2: {
+          type: 'string',
+          title: '下单客户'
+        },
+        enterpriseInfoId: {
+          type: 'string',
+          title: '网络货运人',
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            },
+            allowClear: true,
+            asyncData: () => this.shipperservice.getNetworkFreightForwarder()
+          }
+        },
+        phone3: {
+          type: 'string',
+          title: '合伙人名称',
+          ui: {
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            },
+          }
+        },
+        deadlineTime: {
+          title: '时间范围',
+          type: 'string',
+          ui: {
+            widget: 'date',
+            mode: 'range',
+            format: 'yyyy-MM-dd',
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            },
+            allowClear: true
+          } as SFDateWidgetSchema
+        }
+      }
+    };
+    this.ui = {
+      '*': {
+        spanLabelFixed: 140,
+        grid: { span: 8, gutter: 4 }
+      }
+    };
+  }
+
+  initST() {
+    this.columns = [
+      {
+        title: '订单号',
+        index: 'name1'
+      },
+      {
+        title: '订单金额（元）',
+        index: 'name1'
+      },
+      {
+        title: '付款金额（元）',
+        index: 'name1'
+      },
+      {
+        title: '预估返佣金额（元）',
+        index: 'name1'
+      },
+      {
+        title: '附加费率',
+        index: 'name1'
+      },
+      {
+        title: '下单客户',
+        index: 'name1'
+      },
+      {
+        title: '网络货运人',
+        index: 'name1'
+      },
+      {
+        title: '销售渠道',
+        index: 'name1'
+      },
+      {
+        title: '合伙人名称',
+        index: 'name1'
+      },
+      {
+        title: '合伙人等级',
+        index: 'name1'
+      },
+      {
+        title: '管理费比例',
+        index: 'name1'
+      },
+      {
+        title: '固定结算费率',
+        index: 'name1'
+      },
+      {
+        title: '返佣时间',
+        index: 'name1'
+      }
+    ];
+  }
+
+  /**
+   * 重置表单
+   */
+  resetSF() {
+    this.sf.reset();
+    this.st.load(1);
+  }
+}
diff --git a/src/app/routes/supply-management/supply-management.module.ts b/src/app/routes/supply-management/supply-management.module.ts
index 7ab115ec..233c6ed7 100644
--- a/src/app/routes/supply-management/supply-management.module.ts
+++ b/src/app/routes/supply-management/supply-management.module.ts
@@ -4,13 +4,14 @@
  * @Author       : Shiming
  * @Date         : 2021-12-20 10:13:02
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-18 17:26:40
+ * @LastEditTime : 2022-03-09 14:53:50
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\supply-management\\supply-management.module.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
 
 import { NgModule, Type } from '@angular/core';
 import { SharedModule } from '@shared';
+import { ParterRebateManageMenRecordDetailComponent } from '../partner/rebate-management/model/record-detail/record-detail.component';
 import { CarAddDriverComponent } from './components/add-driver/add-driver.component';
 import { SupplyManagementAddDriversComponent } from './components/add-drivers/add-drivers.component';
 import { CarAddmodalComponent } from './components/addmodal/addmodal.component';
@@ -61,7 +62,8 @@ const COMPONENTS: Type<void>[] = [
   SupplyManagementReleasePublishComponent,
   SupplyManagementBulkReleasePublishComponent,
   TranAgreementComponent,
-  SupplyManagementBulkAssignedCarComponent
+  SupplyManagementBulkAssignedCarComponent,
+  ParterRebateManageMenRecordDetailComponent
 ];
 
 @NgModule({
diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json
index 223b2212..ef1ba117 100644
--- a/src/assets/mocks/menu-data.json
+++ b/src/assets/mocks/menu-data.json
@@ -525,7 +525,7 @@
                 },
                 {
                   "text": "返佣记录",
-                  "link": "/partner/rebate/"
+                  "link": "/partner/rebate/record"
                 }
               ]
             },

From b0a7611ae4b7b1bb3a177ac9ebbe3598abcb031f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= <xiaoyun.pan@eascs.com>
Date: Wed, 9 Mar 2022 16:33:45 +0800
Subject: [PATCH 13/70] =?UTF-8?q?=E6=9B=BF=E6=8D=A2containsAllLable?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../contract-list/contract-list.component.ts  | 136 +++---
 .../contract-template.component.ts            |  30 +-
 .../payment-order/payment-order.component.ts  |  32 +-
 .../components/list/list.component.ts         |  60 +--
 .../components/bulk/bulk.component.ts         |  76 +--
 .../compliance-audit.component.ts             | 214 ++++----
 .../receipts-audit.component.ts               |  34 +-
 .../components/risk/risk.component.ts         |  62 +--
 .../components/vehicle/vehicle.component.ts   | 456 +++++++++---------
 .../components/list/list.component.html       |  14 +-
 .../components/list/list.component.ts         |  72 +--
 .../virtual-account-detail.component.html     |  27 ++
 .../virtual-account-detail.component.spec.ts  |  24 +
 .../virtual-account-detail.component.ts       | 174 +++++++
 .../services/account-managemant.service.ts    |   1 +
 .../routes/partner/partner-routing.module.ts  |   4 +-
 src/app/routes/partner/partner.module.ts      |   4 +-
 .../components/bulk/bulk.component.ts         | 240 ++++-----
 .../release-publish.component.ts              | 174 +++----
 .../components/vehicle/vehicle.component.ts   |  10 +-
 .../cancellation-invoice.component.ts         |  12 +-
 .../components/audit/audit.component.ts       |  36 +-
 .../vehicle/components/list/list.component.ts |   8 +-
 .../abnormal-appear.component.ts              | 334 ++++++-------
 .../components/bulk/bulk.component.ts         | 150 +++---
 .../components/vehicle/vehicle.component.ts   |  80 +--
 .../dict-select/dict-select.component.ts      |   4 +-
 .../dict-select/dict-select.widget.html       |   2 +-
 28 files changed, 1365 insertions(+), 1105 deletions(-)
 create mode 100644 src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.html
 create mode 100644 src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.spec.ts
 create mode 100644 src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.ts

diff --git a/src/app/routes/contract-management/components/contract-list/contract-list.component.ts b/src/app/routes/contract-management/components/contract-list/contract-list.component.ts
index dd3947da..c9777ad6 100644
--- a/src/app/routes/contract-management/components/contract-list/contract-list.component.ts
+++ b/src/app/routes/contract-management/components/contract-list/contract-list.component.ts
@@ -27,17 +27,17 @@ export class ContractManagementContractListComponent implements OnInit {
   /**
  * 查询参数
  */
-   get reqParams() {
+  get reqParams() {
     const params = {
       ...this.sf?.value,
     }
     delete params.signTime;
     delete params._$expand;
-    if(this.datePipe.transform(this.sf?.value?.signTime?.[0], 'yyyy-MM-dd HH:mm:ss') && this.datePipe.transform(this.sf?.value?.signTime?.[1], 'yyyy-MM-dd HH:mm:ss')) {
+    if (this.datePipe.transform(this.sf?.value?.signTime?.[0], 'yyyy-MM-dd HH:mm:ss') && this.datePipe.transform(this.sf?.value?.signTime?.[1], 'yyyy-MM-dd HH:mm:ss')) {
       params.signTime = {
         start: this.datePipe.transform(this.sf?.value?.signTime?.[0], 'yyyy-MM-dd HH:mm:ss'),
         end: this.datePipe.transform(this.sf?.value?.signTime?.[1], 'yyyy-MM-dd HH:mm:ss'),
-       }
+      }
     }
     return {
       ...params
@@ -49,7 +49,7 @@ export class ContractManagementContractListComponent implements OnInit {
     private nzModalService: NzModalService,
     private router: Router,
     private datePipe: DatePipe,
-    ) {}
+  ) { }
 
   ngOnInit(): void {
     this.initST()
@@ -58,7 +58,7 @@ export class ContractManagementContractListComponent implements OnInit {
   /**
    * 初始化数据列表
    */
-   initST() {
+  initST() {
     this.columns = [
       {
         title: '合同编号',
@@ -70,13 +70,13 @@ export class ContractManagementContractListComponent implements OnInit {
         title: '单据类型',
         width: '100px',
         className: 'text-center',
-        index:'documentType'
+        index: 'documentType'
       },
       {
         title: '合同名称',
         width: '100px',
         className: 'text-center',
-        index:'contractName'
+        index: 'contractName'
       },
       { title: '托运人', index: 'shipperName', width: '120px', className: 'text-center' },
       { title: '承运人', index: 'carrierName', width: '120px', className: 'text-center' },
@@ -108,69 +108,69 @@ export class ContractManagementContractListComponent implements OnInit {
           '7': { text: '已拒签', color: 'warning' },
         },
       },
-   
+
     ];
   }
-    /**
- * 初始化查询表单
- */
-     initSF() {
-      this.schema = {
-        properties: {
-          _$expand: { type: 'boolean', ui: { hidden: true } },
-          contractCode: {
-            type: 'string',
-            title: '合同编号',
-          },
-          businessCode: {
-            type: 'string',
-            title: '业务单号'
-          },
-          shipperName: {
-            type: 'string',
-            title: '托运人'
-          },
-          carrierName: {
-            type: 'string',
-            title: '承运人',
-            ui: {
-              visibleIf: {
-                _$expand: (value: boolean) => value,
-              },
-            }
-          },
-          documentType: {
-            title: '单据类型',
-            type: 'string',
-            default: '',
-            ui: {
-              widget: 'dict-select',
-              containsAllLable: true,
-              params: { dictKey: 'contract:document:type' },
-              containAllLable:true,
-              visibleIf: {
-                _$expand: (value: boolean) => value,
-              },
-            } as SFSelectWidgetSchema,
-          },
-          signTime: {
-            title: '签署日期',
-            type: 'string',
-            ui: {
-              widget: 'custom',
-              visibleIf: {
-                _$expand: (value: boolean) => value,
-              },
-            }
-          },
+  /**
+* 初始化查询表单
+*/
+  initSF() {
+    this.schema = {
+      properties: {
+        _$expand: { type: 'boolean', ui: { hidden: true } },
+        contractCode: {
+          type: 'string',
+          title: '合同编号',
         },
-        type: 'object',
-      };
-      this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
-    }
-      /**
-   * 查询字段个数
-   */
+        businessCode: {
+          type: 'string',
+          title: '业务单号'
+        },
+        shipperName: {
+          type: 'string',
+          title: '托运人'
+        },
+        carrierName: {
+          type: 'string',
+          title: '承运人',
+          ui: {
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+          }
+        },
+        documentType: {
+          title: '单据类型',
+          type: 'string',
+          default: '',
+          ui: {
+            widget: 'dict-select',
+            containsAllLabel: true,
+            params: { dictKey: 'contract:document:type' },
+            containAllLable: true,
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+          } as SFSelectWidgetSchema,
+        },
+        signTime: {
+          title: '签署日期',
+          type: 'string',
+          ui: {
+            widget: 'custom',
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+          }
+        },
+      },
+      type: 'object',
+    };
+    this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
+  }
+  /**
+* 查询字段个数
+*/
   get queryFieldCount(): number {
     return Object.keys(this.schema?.properties || {}).length;
   }
@@ -239,7 +239,7 @@ export class ContractManagementContractListComponent implements OnInit {
   /**
    * 伸缩查询条件
    */
-   expandToggle(): void {
+  expandToggle(): void {
     this._$expand = !this._$expand;
     this.sf?.setValue('/_$expand', this._$expand);
   }
diff --git a/src/app/routes/contract-management/components/contract-template/contract-template.component.ts b/src/app/routes/contract-management/components/contract-template/contract-template.component.ts
index 3a28c9f8..416936b7 100644
--- a/src/app/routes/contract-management/components/contract-template/contract-template.component.ts
+++ b/src/app/routes/contract-management/components/contract-template/contract-template.component.ts
@@ -26,23 +26,23 @@ export class ContractManagementTemplateComponent implements OnInit {
   columns: STColumn[] = [];
   datass: any = [
     {
-    one: '1',
-    two: '1',
-    three: '1',
-    id: 1
-   },
+      one: '1',
+      two: '1',
+      three: '1',
+      id: 1
+    },
     {
-    one: '2',
-    two: '2',
-    three: '2',
-    id: 2
-   },
-];
+      one: '2',
+      two: '2',
+      three: '2',
+      id: 2
+    },
+  ];
   constructor(
     public service: ContractManagementService,
     private modal: NzModalService,
     private router: Router
-     ) { }
+  ) { }
 
   /**
  * 查询参数
@@ -80,7 +80,7 @@ export class ContractManagementTemplateComponent implements OnInit {
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'contract:template:type' },
-            containsAllLable: true,
+            containsAllLabel: true,
             visibleIf: {
               _$expand: (value: boolean) => value,
             },
@@ -178,7 +178,7 @@ export class ContractManagementTemplateComponent implements OnInit {
   }
 
   edit(value: any) {
-    this.router.navigate(['/contract-management/template/detail/' + value.id],{
+    this.router.navigate(['/contract-management/template/detail/' + value.id], {
       queryParams: {
         status: 2
       }
@@ -195,7 +195,7 @@ export class ContractManagementTemplateComponent implements OnInit {
     window.history.go(-1)
   }
   view(value: any) {
-    this.router.navigate(['/contract-management/template/detail/' + value.id],{
+    this.router.navigate(['/contract-management/template/detail/' + value.id], {
       queryParams: {
         status: 3
       }
diff --git a/src/app/routes/financial-management/components/payment-order/payment-order.component.ts b/src/app/routes/financial-management/components/payment-order/payment-order.component.ts
index 95454878..179783d9 100644
--- a/src/app/routes/financial-management/components/payment-order/payment-order.component.ts
+++ b/src/app/routes/financial-management/components/payment-order/payment-order.component.ts
@@ -23,26 +23,26 @@ export class PaymentOrderComponent implements OnInit {
   _$expand = false;
 
   selectedRows: any[] = [];
-  constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) {}
+  constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) { }
 
-  ngOnInit(): void {}
+  ngOnInit(): void { }
 
   beforeReq = (requestOptions: STRequestOptions) => {
     if (this.sf) {
-      let params = {...this.sf.value}; 
-      if(params.payDate){
-        const payDate  = {start:this.sf?.value?.payDate?.[0],end:this.sf?.value?.payDate?.[1]}
-        params.payDate  = payDate;
+      let params = { ...this.sf.value };
+      if (params.payDate) {
+        const payDate = { start: this.sf?.value?.payDate?.[0], end: this.sf?.value?.payDate?.[1] }
+        params.payDate = payDate;
       }
-      if(params.payDate2){
-        const payDate2  = {start:this.sf?.value?.payDate2?.[0],end:this.sf?.value?.payDate2?.[1]}
-        params.payDate2  = payDate2;
+      if (params.payDate2) {
+        const payDate2 = { start: this.sf?.value?.payDate2?.[0], end: this.sf?.value?.payDate2?.[1] }
+        params.payDate2 = payDate2;
       }
-      if(params.createTime){
-        const createTime  = {start:this.sf?.value?.createTime?.[0],end:this.sf?.value?.createTime?.[1]}
-        params.createTime  = createTime;
+      if (params.createTime) {
+        const createTime = { start: this.sf?.value?.createTime?.[0], end: this.sf?.value?.createTime?.[1] }
+        params.createTime = createTime;
       }
-      Object.assign(requestOptions.body,params );
+      Object.assign(requestOptions.body, params);
     }
     return requestOptions;
   };
@@ -113,7 +113,7 @@ export class PaymentOrderComponent implements OnInit {
           title: '付款状态',
           ui: {
             widget: 'dict-select',
-            containsAllLable: true,
+            containsAllLabel: true,
             params: { dictKey: 'refund:apply:status' },
             placeholder: '请选择'
           }
@@ -123,7 +123,7 @@ export class PaymentOrderComponent implements OnInit {
           title: '付款类型',
           ui: {
             widget: 'dict-select',
-            containsAllLable: true,
+            containsAllLabel: true,
             params: { dictKey: 'pay:type' },
             placeholder: '请选择',
             visibleIf: {
@@ -136,7 +136,7 @@ export class PaymentOrderComponent implements OnInit {
           title: '付款方式',
           ui: {
             widget: 'dict-select',
-            containsAllLable: true,
+            containsAllLabel: true,
             params: { dictKey: 'pay:mode' },
             placeholder: '请选择',
             visibleIf: {
diff --git a/src/app/routes/insurance-management/components/list/list.component.ts b/src/app/routes/insurance-management/components/list/list.component.ts
index 7cc54aaa..8f2522e5 100644
--- a/src/app/routes/insurance-management/components/list/list.component.ts
+++ b/src/app/routes/insurance-management/components/list/list.component.ts
@@ -64,7 +64,7 @@ export class insuranceManagementListComponent implements OnInit {
     public shipperservice: ShipperBaseService,
     private router: Router,
     private modale: ModalHelper,
-  ) {}
+  ) { }
 
   /**
    * 查询参数
@@ -176,7 +176,7 @@ export class insuranceManagementListComponent implements OnInit {
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'insure:type' },
-            containsAllLable: true,
+            containsAllLabel: true,
             visibleIf: {
               _$expand: (value: boolean) => value
             }
@@ -238,7 +238,7 @@ export class insuranceManagementListComponent implements OnInit {
             },
           } as SFSelectWidgetSchema
         },
-      
+
         driverName: {
           title: '承运司机',
           type: 'string',
@@ -263,7 +263,7 @@ export class insuranceManagementListComponent implements OnInit {
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'insure:status' },
-            containsAllLable: true,
+            containsAllLabel: true,
             visibleIf: {
               _$expand: (value: boolean) => value
             }
@@ -321,33 +321,33 @@ export class insuranceManagementListComponent implements OnInit {
             }
           } as SFDateWidgetSchema
         },
-     
+
       },
       type: 'object'
     };
     this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
   }
-     // 获取城市列表
-     getRegionCode(regionCode: any) {
-      console.log(regionCode);
-      return this.service
-        .request(this.service.$api_get_enterprise_project, { id: regionCode })
-        .pipe(
-          map(res =>
-            res.map((item: any) => ({
-              label: item.projectName,
-              value: item.id
-            }))
-          )
+  // 获取城市列表
+  getRegionCode(regionCode: any) {
+    console.log(regionCode);
+    return this.service
+      .request(this.service.$api_get_enterprise_project, { id: regionCode })
+      .pipe(
+        map(res =>
+          res.map((item: any) => ({
+            label: item.projectName,
+            value: item.id
+          }))
         )
-        .subscribe(res => {
-          this.sf.getProperty('/enterpriseProjectId')!.schema.enum = res;
-          this.sf.getProperty('/enterpriseProjectId')!.widget.reset(res);
-          // if (this.enterpriseProjectIds) {
-          //   this.sf1.setValue('/enterpriseProjectId', this.enterpriseProjectIds);
-          // }
-        });
-    }
+      )
+      .subscribe(res => {
+        this.sf.getProperty('/enterpriseProjectId')!.schema.enum = res;
+        this.sf.getProperty('/enterpriseProjectId')!.widget.reset(res);
+        // if (this.enterpriseProjectIds) {
+        //   this.sf1.setValue('/enterpriseProjectId', this.enterpriseProjectIds);
+        // }
+      });
+  }
   /**
    * 初始化数据列表
    */
@@ -501,7 +501,7 @@ export class insuranceManagementListComponent implements OnInit {
     this._$expand = !this._$expand;
     this.sf?.setValue('/_$expand', this._$expand);
   }
-  tabChange(item: any) {}
+  tabChange(item: any) { }
   /**
    * 重置表单
    */
@@ -541,8 +541,8 @@ export class insuranceManagementListComponent implements OnInit {
       }
     });
   }
-    // 保险配置
-    changeOrder() {
-      this.router.navigate(['/insurance-management/list-set', 1]);
-    }
+  // 保险配置
+  changeOrder() {
+    this.router.navigate(['/insurance-management/list-set', 1]);
+  }
 }
diff --git a/src/app/routes/order-management/components/bulk/bulk.component.ts b/src/app/routes/order-management/components/bulk/bulk.component.ts
index 734c6771..917aa662 100644
--- a/src/app/routes/order-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/order-management/components/bulk/bulk.component.ts
@@ -72,7 +72,7 @@ export class OrderManagementBulkComponent implements OnInit {
     private modal: NzModalService,
     public shipperservice: ShipperBaseService,
     private router: Router
-  ) {}
+  ) { }
 
   /**
    * 查询参数
@@ -257,7 +257,7 @@ export class OrderManagementBulkComponent implements OnInit {
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'overall:payment:status' },
-            containsAllLable: true,
+            containsAllLabel: true,
             visibleIf: {
               _$expand: (value: boolean) => value
             }
@@ -312,7 +312,7 @@ export class OrderManagementBulkComponent implements OnInit {
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'service:type' },
-            containsAllLable: true,
+            containsAllLabel: true,
             visibleIf: {
               _$expand: (value: boolean) => value
             }
@@ -323,7 +323,7 @@ export class OrderManagementBulkComponent implements OnInit {
           type: 'string',
           ui: {
             widget: 'dict-select',
-            containsAllLable: true,
+            containsAllLabel: true,
             params: { dictKey: 'goodresource:settlement:type' },
             containAllLable: true,
             visibleIf: {
@@ -372,27 +372,27 @@ export class OrderManagementBulkComponent implements OnInit {
     };
     this.uiView = { '*': { spanLabelFixed: 80, grid: { span: 12, gutter: 4 } } };
   }
-     // 获取城市列表
-     getRegionCode(regionCode: any) {
-      console.log(regionCode);
-      return this.service
-        .request(this.service.$api_get_enterprise_project, { id: regionCode })
-        .pipe(
-          map(res =>
-            res.map((item: any) => ({
-              label: item.projectName,
-              value: item.id
-            }))
-          )
+  // 获取城市列表
+  getRegionCode(regionCode: any) {
+    console.log(regionCode);
+    return this.service
+      .request(this.service.$api_get_enterprise_project, { id: regionCode })
+      .pipe(
+        map(res =>
+          res.map((item: any) => ({
+            label: item.projectName,
+            value: item.id
+          }))
         )
-        .subscribe(res => {
-          this.sf.getProperty('/enterpriseProjectId')!.schema.enum = res;
-          this.sf.getProperty('/enterpriseProjectId')!.widget.reset(res);
-          // if (this.enterpriseProjectIds) {
-          //   this.sf1.setValue('/enterpriseProjectId', this.enterpriseProjectIds);
-          // }
-        });
-    }
+      )
+      .subscribe(res => {
+        this.sf.getProperty('/enterpriseProjectId')!.schema.enum = res;
+        this.sf.getProperty('/enterpriseProjectId')!.widget.reset(res);
+        // if (this.enterpriseProjectIds) {
+        //   this.sf1.setValue('/enterpriseProjectId', this.enterpriseProjectIds);
+        // }
+      });
+  }
   /**
    * 初始化数据列表
    */
@@ -510,7 +510,7 @@ export class OrderManagementBulkComponent implements OnInit {
             click: _record => this.cancellation(_record),
             iif: item =>
               item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '1',
-              acl: { ability: ['ORDER-BULK-signBulkOrder'] },
+            acl: { ability: ['ORDER-BULK-signBulkOrder'] },
           },
           {
             text: '申请退款　',
@@ -605,7 +605,7 @@ export class OrderManagementBulkComponent implements OnInit {
     this._$expand = !this._$expand;
     this.sf?.setValue('/_$expand', this._$expand);
   }
-  tabChange(item: any) {}
+  tabChange(item: any) { }
   /**
    * 重置表单
    */
@@ -617,8 +617,8 @@ export class OrderManagementBulkComponent implements OnInit {
   /**
    * 导入货源
    */
-  importGoodsSource() {}
-  audit(item: any) {}
+  importGoodsSource() { }
+  audit(item: any) { }
 
   /*
   * 审核关闭弹窗
@@ -639,7 +639,7 @@ export class OrderManagementBulkComponent implements OnInit {
   /**
    * 审核通过按钮
    */
-  handleOK() {}
+  handleOK() { }
   OpenPrice(item: any) {
     this.changeId = item.id;
     this.isVisible = true;
@@ -692,10 +692,10 @@ export class OrderManagementBulkComponent implements OnInit {
           nzFooter: null
         });
         modal.afterClose.subscribe((res: any) => {
-        if(res) {
-          this.st.reload(1);
-          this.getGoodsSourceStatistical();
-        }
+          if (res) {
+            this.st.reload(1);
+            this.getGoodsSourceStatistical();
+          }
         });
       }
     });
@@ -772,10 +772,10 @@ export class OrderManagementBulkComponent implements OnInit {
   changeOrder(value: any) {
     this.router.navigate(['order-management/bulk-detailChange', value.id]);
   }
-      /**
-   *申请退款
-   */
-   applyRefund(item: any) {
+  /**
+*申请退款
+*/
+  applyRefund(item: any) {
     const modalRef = this.modal.create({
       nzTitle: '申请退款',
       nzContent: OneCarOrderCancelConfirmComponent,
@@ -786,7 +786,7 @@ export class OrderManagementBulkComponent implements OnInit {
       nzFooter: null
     });
     modalRef.afterClose.subscribe((res: boolean) => {
-      if(res) {
+      if (res) {
         this.resetSF;
         this.st.load();
       }
diff --git a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts
index d6e0fa51..d890942d 100644
--- a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts
+++ b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts
@@ -51,7 +51,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
     private modal: NzModalService,
     public shipperservice: ShipperBaseService,
     private router: Router
-  ) {}
+  ) { }
 
   /**
    * 查询参数
@@ -232,7 +232,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'overall:payment:status' },
-            containsAllLable: true,
+            containsAllLabel: true,
             visibleIf: {
               _$expand: (value: boolean) => value
             }
@@ -258,7 +258,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'service:type' },
-            containsAllLable: true,
+            containsAllLabel: true,
             visibleIf: {
               _$expand: (value: boolean) => value
             }
@@ -282,27 +282,27 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
     };
     this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
   }
-     // 获取城市列表
-     getRegionCode(regionCode: any) {
-      console.log(regionCode);
-      return this.service
-        .request(this.service.$api_get_enterprise_project, { id: regionCode })
-        .pipe(
-          map(res =>
-            res.map((item: any) => ({
-              label: item.projectName,
-              value: item.id
-            }))
-          )
+  // 获取城市列表
+  getRegionCode(regionCode: any) {
+    console.log(regionCode);
+    return this.service
+      .request(this.service.$api_get_enterprise_project, { id: regionCode })
+      .pipe(
+        map(res =>
+          res.map((item: any) => ({
+            label: item.projectName,
+            value: item.id
+          }))
         )
-        .subscribe(res => {
-          this.sf.getProperty('/enterpriseProjectId')!.schema.enum = res;
-          this.sf.getProperty('/enterpriseProjectId')!.widget.reset(res);
-          // if (this.enterpriseProjectIds) {
-          //   this.sf1.setValue('/enterpriseProjectId', this.enterpriseProjectIds);
-          // }
-        });
-    }
+      )
+      .subscribe(res => {
+        this.sf.getProperty('/enterpriseProjectId')!.schema.enum = res;
+        this.sf.getProperty('/enterpriseProjectId')!.widget.reset(res);
+        // if (this.enterpriseProjectIds) {
+        //   this.sf1.setValue('/enterpriseProjectId', this.enterpriseProjectIds);
+        // }
+      });
+  }
   /**
    * 初始化数据列表
    */
@@ -428,7 +428,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
         className: 'text-center',
         index: 'applyUserName'
       },
-      { title: '状态',     index: 'handleStatusLabel',  className: 'text-center' },
+      { title: '状态', index: 'handleStatusLabel', className: 'text-center' },
       {
         title: '操作',
         fixed: 'right',
@@ -441,7 +441,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
           {
             text: '撤销',
             click: (_record) => this.revoke(_record),
-           iif: item => item.handleStatus === '1' || item.handleStatus === 1,
+            iif: item => item.handleStatus === '1' || item.handleStatus === 1,
           },
         ],
       },
@@ -462,16 +462,20 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
         index: 'amountAfterChange',
         render: 'amountAfterChange'
       },
-      { title: '变更值',
+      {
+        title: '变更值',
         index: 'amountchangeValue',
         render: 'amountchangeValue',
         width: '120px',
-        className: 'text-center' },
-      { title: '变更后',
+        className: 'text-center'
+      },
+      {
+        title: '变更后',
         index: 'amountBeforeChange',
         render: 'amountBeforeChange',
         width: '120px',
-        className: 'text-center' }
+        className: 'text-center'
+      }
     ];
   }
   /**
@@ -480,30 +484,30 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
   get queryFieldCount(): number {
     return Object.keys(this.schema?.properties || {}).length;
   }
-     /**
-  * 浮动费用查看
-  */
-      FloatView(item: any) {
-        console.log(item)
-        this.changeViewId = item.id;
-        this.service.request(this.service.$api_getChangeRecordWholeDetail, {id: this.changeViewId}).subscribe((res) => {
-          this.ViewCause = res;
+  /**
+* 浮动费用查看
+*/
+  FloatView(item: any) {
+    console.log(item)
+    this.changeViewId = item.id;
+    this.service.request(this.service.$api_getChangeRecordWholeDetail, { id: this.changeViewId }).subscribe((res) => {
+      this.ViewCause = res;
+    })
+    this.isVisibleView = true
+  }
+  revoke(item: any) {
+    this.modal.confirm({
+      nzTitle: '是否确定立即撤销费用变更！</i>',
+      nzOnOk: () =>
+        this.service.request(this.service.$api_get_revokeChangeRecord, { id: item.id }).subscribe((res) => {
+          console.log(res)
+          if (res) {
+            this.service.msgSrv.success('撤销成功！')
+            this.stFloat.reload()
+          }
         })
-        this.isVisibleView = true
-      }
-      revoke(item: any) {
-        this.modal.confirm({
-          nzTitle: '是否确定立即撤销费用变更！</i>',
-          nzOnOk: () => 
-          this.service.request(this.service.$api_get_revokeChangeRecord, { id: item.id}).subscribe((res) => {
-            console.log(res)
-            if(res) {
-              this.service.msgSrv.success('撤销成功！')
-              this.stFloat.reload()
-            }
-          })
-        });
-      }
+    });
+  }
   /**
    * 伸缩查询条件
    */
@@ -511,7 +515,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
     this._$expand = !this._$expand;
     this.sf?.setValue('/_$expand', this._$expand);
   }
-  tabChange(item: any) {}
+  tabChange(item: any) { }
   /**
    * 重置表单
    */
@@ -523,7 +527,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
   /**
    * 导入货源
    */
-  importGoodsSource() {}
+  importGoodsSource() { }
   OpenPrice(item: any) {
     this.changeId = item.id;
     this.isVisible = true;
@@ -580,24 +584,24 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
 
     this.uiView = { '*': { spanLabelFixed: 110, grid: { span: 24 } } };
   }
-    /*
-   * 审核关闭弹窗
-   */
-    handleCancel(value?: string) {
-      if(value === '0') {
-        this.isVisible = false;
-      } else if(value === '1') {
-        this.isVisibleRE = false;
-      } else if(value === '2') {
-        this.isVisibleView = false;
-      }
+  /*
+ * 审核关闭弹窗
+ */
+  handleCancel(value?: string) {
+    if (value === '0') {
+      this.isVisible = false;
+    } else if (value === '1') {
+      this.isVisibleRE = false;
+    } else if (value === '2') {
+      this.isVisibleView = false;
     }
-      /**
-   * 审核通过按钮
-   */
+  }
+  /**
+* 审核通过按钮
+*/
   handleOK() {
     let idList: any[] = [];
-    if(this.selectedRows.length > 0) {
+    if (this.selectedRows.length > 0) {
       this.selectedRows.forEach(item => {
         idList.push(item.id);
       });
@@ -614,55 +618,55 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
         this.service.msgSrv.success('提交成功！');
         this.isVisibleRE = false;
         this.st?.load(1);
-         this.getGoodsSourceStatistical()
+        this.getGoodsSourceStatistical()
       }
     });
   }
-    /**
-   * 审核拒绝按钮
-   */
-     reject() {
-       if(!this.sfView.value.complianceRemark) {
-        this.service.msgSrv.error('备注不能为空！');
-        return;
-       }
-      let idList: any[] = [];
-      if(this.selectedRows.length > 0) {
-        this.selectedRows.forEach(item => {
-          idList.push(item.id);
-        });
-      } else {
-        idList.push(this.sfView.value.billCode)
-      }
-      const parms = {
-        ids: idList,
-        complianceRemark: this.sfView.value.complianceRemark,
-        complianceStatus: 2,
-      };
-      this.service.request(this.service.$api_get_updateBillByCompliance, parms).subscribe(res => {
-        if (res) {
-          this.service.msgSrv.success('提交成功！');
-          this.isVisibleRE = false;
-          this.st?.load(1);
-          this.getGoodsSourceStatistical()
-        }
-      });
+  /**
+ * 审核拒绝按钮
+ */
+  reject() {
+    if (!this.sfView.value.complianceRemark) {
+      this.service.msgSrv.error('备注不能为空！');
+      return;
     }
-      /**
-   *合规抽查
-   */
+    let idList: any[] = [];
+    if (this.selectedRows.length > 0) {
+      this.selectedRows.forEach(item => {
+        idList.push(item.id);
+      });
+    } else {
+      idList.push(this.sfView.value.billCode)
+    }
+    const parms = {
+      ids: idList,
+      complianceRemark: this.sfView.value.complianceRemark,
+      complianceStatus: 2,
+    };
+    this.service.request(this.service.$api_get_updateBillByCompliance, parms).subscribe(res => {
+      if (res) {
+        this.service.msgSrv.success('提交成功！');
+        this.isVisibleRE = false;
+        this.st?.load(1);
+        this.getGoodsSourceStatistical()
+      }
+    });
+  }
+  /**
+*合规抽查
+*/
   audit(item?: any) {
     if (item) {
       this.isVisibleRE = true;
       this.auditId = item.id;
       this.initSTAudit(1);
     } else {
-      if(this.selectedRows.length <= 0) {
+      if (this.selectedRows.length <= 0) {
         this.service.msgSrv.error('请选择订单！')
         return;
       } else {
-      this.isVisibleRE = true;
-      this.initSTAudit(2);
+        this.isVisibleRE = true;
+        this.initSTAudit(2);
       }
     }
   }
diff --git a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts
index bdce2344..a32f28c6 100644
--- a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts
+++ b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts
@@ -41,7 +41,7 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
     private modal: NzModalService,
     public shipperservice: ShipperBaseService,
     private router: Router
-  ) {}
+  ) { }
 
   /**
    * 查询参数
@@ -207,7 +207,7 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'overall:payment:status' },
-            containsAllLable: true,
+            containsAllLabel: true,
             visibleIf: {
               _$expand: (value: boolean) => value
             }
@@ -233,7 +233,7 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'service:type' },
-            containsAllLable: true,
+            containsAllLabel: true,
             visibleIf: {
               _$expand: (value: boolean) => value
             }
@@ -244,7 +244,7 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
           type: 'string',
           ui: {
             widget: 'dict-select',
-            containsAllLable: true,
+            containsAllLabel: true,
             params: { dictKey: 'goodresource:settlement:type' },
             containAllLable: true,
             visibleIf: {
@@ -347,7 +347,7 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
           {
             text: '修改　　　　',
             click: _record => this.modification(_record),
-            iif: item => item.auditStatus == '1' ,
+            iif: item => item.auditStatus == '1',
             acl: { ability: ['ORDER-RECEIPTS-updateBillExamine'] },
           },
           {
@@ -373,7 +373,7 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
     this._$expand = !this._$expand;
     this.sf?.setValue('/_$expand', this._$expand);
   }
-  tabChange(item: any) {}
+  tabChange(item: any) { }
   /**
    * 重置表单
    */
@@ -385,13 +385,13 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
   /**
    * 导入货源
    */
-  importGoodsSource() {}
-  audit(item: any) {}
+  importGoodsSource() { }
+  audit(item: any) { }
 
   /**
    * 审核通过按钮
    */
-  handleOK() {}
+  handleOK() { }
   OpenPrice(item: any) {
     this.isVisible = true;
   }
@@ -410,12 +410,12 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
     modalRef.afterClose.subscribe((result: any) => {
       this.st.load(1);
       this.getGoodsSourceStatistical()
-  });
+    });
   }
   // 生成电子单据
   generate(item: any, sts?: number) {
     let text = '查看凭证';
-    if(sts == 2) {
+    if (sts == 2) {
       text = '生成电子单据';
     }
     const modalRef = this.modal.create({
@@ -431,23 +431,23 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
     modalRef.afterClose.subscribe((result: any) => {
       this.st.load(1);
       this.getGoodsSourceStatistical()
-  });
+    });
   }
   // 通过
   sign(item?: any) {
     let params: any = []
     let text = '';
-    if(item === '1') {
-      if(this.selectedRows.length <= 0) {
+    if (item === '1') {
+      if (this.selectedRows.length <= 0) {
         this.service.msgSrv.error('请选择订单！')
         return
       }
       this.selectedRows.forEach(ite => {
         params.push(ite.id);
       });
-      text =  `<b>已选择${this.selectedRows.length}条订单，确认批量通过审核吗？</b>`
+      text = `<b>已选择${this.selectedRows.length}条订单，确认批量通过审核吗？</b>`
     } else {
-      text =  `<b>确认通过审核吗？</b>`
+      text = `<b>确认通过审核吗？</b>`
       params.push(item.id);
     }
     console.log(this.selectedRows)
@@ -470,7 +470,7 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
   }
   // 批量生成电子单据
   sign1(item?: any) {
-    if(this.selectedRows.length <= 0) {
+    if (this.selectedRows.length <= 0) {
       this.service.msgSrv.error('请选择订单！')
       return
     }
diff --git a/src/app/routes/order-management/components/risk/risk.component.ts b/src/app/routes/order-management/components/risk/risk.component.ts
index 541c4424..b08f0a3d 100644
--- a/src/app/routes/order-management/components/risk/risk.component.ts
+++ b/src/app/routes/order-management/components/risk/risk.component.ts
@@ -40,34 +40,34 @@ export class OrderManagementRiskComponent implements OnInit {
     public shipperservice: ShipperBaseService,
     private modal: NzModalService,
     public router: Router
-  ) {}
+  ) { }
 
   /**
    * 查询参数
    */
-   get reqParams() {
+  get reqParams() {
     // const a:any = {};
     // if(this.resourceStatus) {
-    //   a.representationsStatus = this.resourceStatus 
+    //   a.representationsStatus = this.resourceStatus
     // }
     // return {
     //   ...a,
     //   ...this.sf?.value,
     // };
-    const a:any = {};
-    if(this.resourceStatus) {
-      a.representationsStatus = this.resourceStatus 
+    const a: any = {};
+    if (this.resourceStatus) {
+      a.representationsStatus = this.resourceStatus
     }
     const params: any = Object.assign({}, this.sf?.value || {});
     delete params._$expand;
-    return { 
+    return {
       ...a,
       ...params,
       createTime: {
         start: this.sf?.value?.createTime?.[0] || '',
         end: this.sf?.value?.createTime?.[1] || '',
       },
-     };
+    };
   }
   search() {
     this.st?.load(1);
@@ -84,17 +84,17 @@ export class OrderManagementRiskComponent implements OnInit {
   getGoodsSourceStatistical() {
     this.service.request(this.service.$api_get_listStatisticalStatus, this.reqParams).subscribe(res => {
       if (res) {
-       res.forEach((element: any) => {
-        if(element.representationsStatusLabel === '待申述') {
-          this.tabs.stayQuantity = element.quantity
-        } else if (element.representationsStatusLabel === '申诉失败') {
-          this.tabs.receivedQuantity = element.quantity
-        } else if (element.representationsStatusLabel === '申述成功') {
-          this.tabs.cancelQuantity = element.quantity
-        } else if (element.representationsStatusLabel === '申诉中') {
-          this.tabs.underwayQuantity = element.quantity
-        } 
-       });
+        res.forEach((element: any) => {
+          if (element.representationsStatusLabel === '待申述') {
+            this.tabs.stayQuantity = element.quantity
+          } else if (element.representationsStatusLabel === '申诉失败') {
+            this.tabs.receivedQuantity = element.quantity
+          } else if (element.representationsStatusLabel === '申述成功') {
+            this.tabs.cancelQuantity = element.quantity
+          } else if (element.representationsStatusLabel === '申诉中') {
+            this.tabs.underwayQuantity = element.quantity
+          }
+        });
       }
     })
   }
@@ -168,7 +168,7 @@ export class OrderManagementRiskComponent implements OnInit {
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'freight:type' },
-            containsAllLable: true,
+            containsAllLabel: true,
             visibleIf: {
               _$expand: (value: boolean) => value
             }
@@ -180,7 +180,7 @@ export class OrderManagementRiskComponent implements OnInit {
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'BulkFreightUnitPriceType' },
-            containsAllLable: true,
+            containsAllLabel: true,
             visibleIf: {
               _$expand: (value: boolean) => value
             }
@@ -307,7 +307,7 @@ export class OrderManagementRiskComponent implements OnInit {
           {
             text: '审核',
             click: _record => this.audit(_record),
-            iif: item => item.representationsStatus == '1' || item.representationsStatus == '2' ,
+            iif: item => item.representationsStatus == '1' || item.representationsStatus == '2',
             acl: { ability: ['ORDER-RISK-audit'] },
           },
           {
@@ -405,7 +405,7 @@ export class OrderManagementRiskComponent implements OnInit {
   /**
    * 导入货源
    */
-  importGoodsSource() {}
+  importGoodsSource() { }
 
   /*
    * 审核关闭弹窗
@@ -418,7 +418,7 @@ export class OrderManagementRiskComponent implements OnInit {
    */
   handleOK() {
     let idList: any[] = [];
-    if(this.selectedRows.length > 0) {
+    if (this.selectedRows.length > 0) {
       this.selectedRows.forEach(item => {
         idList.push(item.id);
       });
@@ -435,7 +435,7 @@ export class OrderManagementRiskComponent implements OnInit {
         this.service.msgSrv.success('审核通过成功！');
         this.isVisibleRE = false;
         this.st?.load(1);
-         this.getGoodsSourceStatistical()
+        this.getGoodsSourceStatistical()
       }
     });
   }
@@ -444,14 +444,14 @@ export class OrderManagementRiskComponent implements OnInit {
    */
   reject() {
     let idList: any[] = [];
-    if(this.selectedRows.length > 0) {
+    if (this.selectedRows.length > 0) {
       this.selectedRows.forEach(item => {
         idList.push(item.id);
       });
     } else {
       idList.push(this.sfView.value.billCode)
     }
-    if(!this.sfView.value.representationsCause) {
+    if (!this.sfView.value.representationsCause) {
       this.service.msgSrv.error('拒绝原因为空！');
       return;
     }
@@ -476,14 +476,14 @@ export class OrderManagementRiskComponent implements OnInit {
     if (item) {
       this.auditId = item.id;
       this.initSTAudit(1);
-       this.isVisibleRE = true;
+      this.isVisibleRE = true;
     } else {
-      if(this.selectedRows.length <= 0) {
+      if (this.selectedRows.length <= 0) {
         this.service.msgSrv.error('请选择订单！')
         return;
       } else {
-      this.initSTAudit(2);
-      this.isVisibleRE = true;
+        this.initSTAudit(2);
+        this.isVisibleRE = true;
       }
     }
   }
diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
index 09e49f8c..b942ed34 100644
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
@@ -43,34 +43,34 @@ export class OrderManagementVehicleComponent implements OnInit {
   columnsFloatView: STColumn[] = [];
   datass: any = [
     {
-    one: '1',
-    two: '1',
-    three: '1',
-    id: 1
-   },
+      one: '1',
+      two: '1',
+      three: '1',
+      id: 1
+    },
     {
-    one: '2',
-    two: '2',
-    three: '2',
-    id: 2
-   },
-];
-tabs = {
-  cancelQuantity: 0,
-  receivedQuantity: 0,
-  stayQuantity: 0,
-  signQuantity: 0,
-  compolatelQuantity: 0,
-  GoingQuantity: 0,
-  totalCount: 0
-};
-resourceStatus: any;
+      one: '2',
+      two: '2',
+      three: '2',
+      id: 2
+    },
+  ];
+  tabs = {
+    cancelQuantity: 0,
+    receivedQuantity: 0,
+    stayQuantity: 0,
+    signQuantity: 0,
+    compolatelQuantity: 0,
+    GoingQuantity: 0,
+    totalCount: 0
+  };
+  resourceStatus: any;
   constructor(
     public service: OrderManagementService,
     private modal: NzModalService,
     public shipperservice: ShipperBaseService,
     public router: Router,
-     ) { }
+  ) { }
 
   /**
  * 查询参数
@@ -86,20 +86,20 @@ resourceStatus: any;
     };
   }
   get reqParams() {
-    const a:any = {};
-    if(this.resourceStatus) {
+    const a: any = {};
+    if (this.resourceStatus) {
       a.billStatus = this.resourceStatus;
-     }
+    }
     const params: any = Object.assign({}, this.sf?.value || {});
     delete params._$expand;
-    return { 
+    return {
       ...a,
       ...params,
       createTime: {
         start: this.sf?.value?.createTime?.[0] || '',
         end: this.sf?.value?.createTime?.[1] || '',
       },
-     };
+    };
   }
   get selectedRows() {
     return this.st?.list.filter((item) => item.checked) || [];
@@ -112,8 +112,8 @@ resourceStatus: any;
     this.initSTFloatView();
   }
   search() {
-  this.st?.load(1);
-  this.getGoodsSourceStatistical()
+    this.st?.load(1);
+    this.getGoodsSourceStatistical()
   }
   getGoodsSourceStatistical() {
     this.tabs = {
@@ -127,26 +127,26 @@ resourceStatus: any;
     };
     const params: any = Object.assign({}, this.reqParams || {});
     delete params.billStatus
-    this.service.request(this.service.$api_statisticalStatus,params).subscribe(res => {
+    this.service.request(this.service.$api_statisticalStatus, params).subscribe(res => {
       if (res) {
         let totalCount = 0;
-       res.forEach((element: any) => {
-        if(element.billStatusLabel === '待发车') {
-          this.tabs.stayQuantity = element.quantity
-        } else if (element.billStatusLabel === '待接单') {
-          this.tabs.receivedQuantity = element.quantity
-        } else if (element.billStatusLabel === '运输中') {
-          this.tabs.GoingQuantity = element.quantity
-        } else if (element.billStatusLabel === '待签收') {
-          this.tabs.signQuantity = element.quantity
-        } else if (element.billStatusLabel === '已完成') {
-          this.tabs.compolatelQuantity = element.quantity
-        } else if (element.billStatusLabel === '已取消') {
-          this.tabs.cancelQuantity = element.quantity
-        } 
-        totalCount += element.quantity
-       });
-       this.tabs.totalCount = totalCount
+        res.forEach((element: any) => {
+          if (element.billStatusLabel === '待发车') {
+            this.tabs.stayQuantity = element.quantity
+          } else if (element.billStatusLabel === '待接单') {
+            this.tabs.receivedQuantity = element.quantity
+          } else if (element.billStatusLabel === '运输中') {
+            this.tabs.GoingQuantity = element.quantity
+          } else if (element.billStatusLabel === '待签收') {
+            this.tabs.signQuantity = element.quantity
+          } else if (element.billStatusLabel === '已完成') {
+            this.tabs.compolatelQuantity = element.quantity
+          } else if (element.billStatusLabel === '已取消') {
+            this.tabs.cancelQuantity = element.quantity
+          }
+          totalCount += element.quantity
+        });
+        this.tabs.totalCount = totalCount
       }
     })
   }
@@ -154,14 +154,14 @@ resourceStatus: any;
   /**
  * 初始化查询表单
  */
-   initSF() {
+  initSF() {
     this.schema = {
       properties: {
         _$expand: { type: 'boolean', ui: { hidden: true } },
         billCode: {
           type: 'string',
           title: '订单号'
-          
+
         },
         resourceCode: {
           type: 'string',
@@ -179,7 +179,7 @@ resourceStatus: any;
             onSearch: (q: any) => {
               if (!!q) {
                 return this.service
-                  .request(this.service.$api_enterpriceList, { enterpriseName: q})
+                  .request(this.service.$api_enterpriceList, { enterpriseName: q })
                   .pipe(map((res: any) => (res as any[]).map((i) => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum))))
                   .toPromise();
               } else {
@@ -247,14 +247,14 @@ resourceStatus: any;
               _$expand: (value: boolean) => value,
             },
           }
-        }, 
+        },
         paymentStatus: {
           title: '支付状态',
           type: 'string',
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'overall:payment:status' },
-            containsAllLable: true,
+            containsAllLabel: true,
             visibleIf: {
               _$expand: (value: boolean) => value,
             },
@@ -328,7 +328,7 @@ resourceStatus: any;
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'service:type' },
-            containsAllLable: true,
+            containsAllLabel: true,
             visibleIf: {
               _$expand: (value: boolean) => value,
             },
@@ -345,7 +345,7 @@ resourceStatus: any;
    */
   initST() {
     this.columns = [
-      { title: '', type: 'checkbox',   fixed: 'left', width: '50px', className: 'text-center' },
+      { title: '', type: 'checkbox', fixed: 'left', width: '50px', className: 'text-center' },
       {
         title: '订单号',
         width: '200px',
@@ -411,11 +411,11 @@ resourceStatus: any;
         width: '120px',
         className: 'text-left',
         buttons: [
-         
+
           {
             text: '运费变更记录',
             click: (_record) => this.OpenPrice(_record),
-            iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '6', 
+            iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '6',
             acl: { ability: ['ORDER-VEHICLE-ChangeApplyList'] },
           },
           {
@@ -460,7 +460,7 @@ resourceStatus: any;
             iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3',
             // acl: { ability: ['VEHICLE-LIST-view'] },
           },
-          
+
         ],
       },
     ];
@@ -482,7 +482,7 @@ resourceStatus: any;
         className: 'text-center',
         index: 'applyUserName'
       },
-      { title: '状态',     index: 'handleStatusLabel',  className: 'text-center' },
+      { title: '状态', index: 'handleStatusLabel', className: 'text-center' },
       {
         title: '操作',
         fixed: 'right',
@@ -495,7 +495,7 @@ resourceStatus: any;
           {
             text: '撤销',
             click: (_record) => this.revoke(_record),
-           iif: item => item.handleStatus === '1' || item.handleStatus === 1,
+            iif: item => item.handleStatus === '1' || item.handleStatus === 1,
           },
         ],
       },
@@ -516,39 +516,43 @@ resourceStatus: any;
         index: 'amountAfterChange',
         render: 'amountAfterChange'
       },
-      { title: '变更值',
+      {
+        title: '变更值',
         index: 'amountchangeValue',
         render: 'amountchangeValue',
         width: '120px',
-        className: 'text-center' },
-      { title: '变更后',
+        className: 'text-center'
+      },
+      {
+        title: '变更后',
         index: 'amountBeforeChange',
         render: 'amountBeforeChange',
         width: '120px',
-        className: 'text-center' }
+        className: 'text-center'
+      }
     ];
   }
-     // 获取城市列表
- getRegionCode(regionCode: any) {
-  console.log(regionCode);
-  return this.service
-    .request(this.service.$api_get_enterprise_project, { id: regionCode })
-    .pipe(
-      map(res =>
-        res.map((item: any) => ({
-          label: item.projectName,
-          value: item.id
-        }))
+  // 获取城市列表
+  getRegionCode(regionCode: any) {
+    console.log(regionCode);
+    return this.service
+      .request(this.service.$api_get_enterprise_project, { id: regionCode })
+      .pipe(
+        map(res =>
+          res.map((item: any) => ({
+            label: item.projectName,
+            value: item.id
+          }))
+        )
       )
-    )
-    .subscribe(res => {
-      this.sf.getProperty('/enterpriseProjectId')!.schema.enum = res;
-      this.sf.getProperty('/enterpriseProjectId')!.widget.reset(res);
-      // if (this.enterpriseProjectIds) {
-      //   this.sf1.setValue('/enterpriseProjectId', this.enterpriseProjectIds);
-      // }
-    });
-}
+      .subscribe(res => {
+        this.sf.getProperty('/enterpriseProjectId')!.schema.enum = res;
+        this.sf.getProperty('/enterpriseProjectId')!.widget.reset(res);
+        // if (this.enterpriseProjectIds) {
+        //   this.sf1.setValue('/enterpriseProjectId', this.enterpriseProjectIds);
+        // }
+      });
+  }
   /**
    * 查询字段个数
    */
@@ -588,19 +592,19 @@ resourceStatus: any;
   audit(item: any) {
   }
 
- /*
-  * 审核关闭弹窗
-  view: 1
-  浮动费用： 0
-  查看评价： 3
-  */
+  /*
+   * 审核关闭弹窗
+   view: 1
+   浮动费用： 0
+   查看评价： 3
+   */
   handleCancel(type: string) {
     console.log(type)
-    if(type === '0') {
+    if (type === '0') {
       this.isVisible = false
-    } else if(type === '1') {
+    } else if (type === '1') {
       this.isVisibleView = false
-    } else if(type === '2') {
+    } else if (type === '2') {
       this.isVisibleEvaluate = false
     }
   }
@@ -608,20 +612,20 @@ resourceStatus: any;
     this.changeId = value.id;
     this.isVisible = true
   }
-   /**
-  * 浮动费用查看
-  */
+  /**
+ * 浮动费用查看
+ */
   FloatView(item: any) {
     console.log(item)
     this.changeViewId = item.id;
-    this.service.request(this.service.$api_getChangeRecordWholeDetail, {id: this.changeViewId}).subscribe((res) => {
+    this.service.request(this.service.$api_getChangeRecordWholeDetail, { id: this.changeViewId }).subscribe((res) => {
       this.ViewCause = res;
     })
     this.isVisibleView = true
   }
-   /**
-  *查看评价
-  */
+  /**
+ *查看评价
+ */
   viewEvaluate(item: any) {
     console.log(item)
     this.isVisibleEvaluate = true
@@ -643,22 +647,22 @@ resourceStatus: any;
       this.diverList = res.evaluateInfos
     });
   }
-      /**
-   *变更运费
-   */
-   updateFreight(item: any) {
-     console.log(item?.isFreightChangeApplication)
+  /**
+*变更运费
+*/
+  updateFreight(item: any) {
+    console.log(item?.isFreightChangeApplication)
     this.service.request(this.service.$api_get_getFreightChangeWholeDetail, { id: item.id }).subscribe(data => {
       if (data) {
         const modal = this.modal.create({
           nzTitle: '变更运费',
           nzWidth: 580,
           nzContent: VehicleUpdateFreightComponent,
-          nzComponentParams: { data: { ...data, id: item.id,isFreightChangeApplication: item?.isFreightChangeApplication } },
+          nzComponentParams: { data: { ...data, id: item.id, isFreightChangeApplication: item?.isFreightChangeApplication } },
           nzFooter: null,
         });
-        modal.afterClose.subscribe((res: Boolean) => {  
-          if(res) {
+        modal.afterClose.subscribe((res: Boolean) => {
+          if (res) {
             this.st.load();
             this.getGoodsSourceStatistical()
           }
@@ -669,33 +673,33 @@ resourceStatus: any;
   /**
    *修改附加费率
    */
-   modifyRate() {
+  modifyRate() {
     let params: any[] = [];
     this.selectedRows.forEach(item => {
       params.push(item.id);
     });
-    if(params.length  === 0) {
+    if (params.length === 0) {
       this.service.msgSrv.error('请先选择订单！')
       return
     }
-        const modal = this.modal.create({
-          nzTitle: '修改附加费率',
-          nzWidth: 600,
-          nzContent: VehicleModifyRateComponent,
-          nzComponentParams: { data: { ids: params } },
-          nzFooter: null,
-        });
-        modal.afterClose.subscribe((result) => {
-          if (result) {
-            this.st.load(1);
-            this.getGoodsSourceStatistical()
-          }
-        });
+    const modal = this.modal.create({
+      nzTitle: '修改附加费率',
+      nzWidth: 600,
+      nzContent: VehicleModifyRateComponent,
+      nzComponentParams: { data: { ids: params } },
+      nzFooter: null,
+    });
+    modal.afterClose.subscribe((result) => {
+      if (result) {
+        this.st.load(1);
+        this.getGoodsSourceStatistical()
+      }
+    });
   }
-      /**
-   *修改网络货运人
-   */
-   modifyFreightPeople() {
+  /**
+*修改网络货运人
+*/
+  modifyFreightPeople() {
     let params: any[] = [];
     this.selectedRows.forEach(item => {
       params.push(item.id);
@@ -704,73 +708,73 @@ resourceStatus: any;
     this.selectedRows.forEach(item => {
       params2.push(item.enterpriseInfoId);
     });
-    if(params.length  === 0) {
+    if (params.length === 0) {
       this.service.msgSrv.error('请先选择订单！')
       return
     }
-        const modal = this.modal.create({
-          nzTitle: '修改网络货运人',
-          nzWidth: 600,
-          nzContent: VehicleFreightPeopleComponent,
-          nzComponentParams: { data: { ids: params, enterpriseInfoIds: params2, } },
-          nzFooter: null,
-          // nzOnOk: sin => {
-          //   this.service.request(this.service.$api_change_bulk, { billId: item.id, ...sin.sf.value }).subscribe(res => {
-          //     if (res) {
-          //       this.service.msgSrv.success('变更运费成功');
-          //       modal.destroy();
-          //       this.st.reload();
-          //     }
-          //   });
-          //   return false;
-          // }
-        });
-        modal.afterClose.subscribe((result) => {
-          if (result) {
-            this.st.load(1);
-            this.getGoodsSourceStatistical()
-          }
-        });
+    const modal = this.modal.create({
+      nzTitle: '修改网络货运人',
+      nzWidth: 600,
+      nzContent: VehicleFreightPeopleComponent,
+      nzComponentParams: { data: { ids: params, enterpriseInfoIds: params2, } },
+      nzFooter: null,
+      // nzOnOk: sin => {
+      //   this.service.request(this.service.$api_change_bulk, { billId: item.id, ...sin.sf.value }).subscribe(res => {
+      //     if (res) {
+      //       this.service.msgSrv.success('变更运费成功');
+      //       modal.destroy();
+      //       this.st.reload();
+      //     }
+      //   });
+      //   return false;
+      // }
+    });
+    modal.afterClose.subscribe((result) => {
+      if (result) {
+        this.st.load(1);
+        this.getGoodsSourceStatistical()
+      }
+    });
   }
-      /**
-   *修改网络货运人
-   */
-   modifycaptain() {
+  /**
+*修改网络货运人
+*/
+  modifycaptain() {
     let params: any[] = [];
     this.selectedRows.forEach(item => {
       params.push(item.id);
     });
-    if(params.length  === 0) {
+    if (params.length === 0) {
       this.service.msgSrv.error('请先选择订单！')
       return
     }
-        const modal = this.modal.create({
-          nzTitle: '修改车队长',
-          nzWidth: 900,
-          nzContent: VehicleModifyCaptainComponent,
-          nzComponentParams: { data: { ids: params,  } },
-          nzFooter: null,
-          // nzOnOk: sin => {
-          //   this.service.request(this.service.$api_change_bulk, { billId: item.id, ...sin.sf.value }).subscribe(res => {
-          //     if (res) {
-          //       this.service.msgSrv.success('变更运费成功');
-          //       modal.destroy();
-          //       this.st.reload();
-          //     }
-          //   });
-          //   return false;
-          // }
-        });
-        modal.afterClose.subscribe((result) => {
-          if (result) {
-            this.st.load(1);
-            this.getGoodsSourceStatistical()
-          }
-        });
+    const modal = this.modal.create({
+      nzTitle: '修改车队长',
+      nzWidth: 900,
+      nzContent: VehicleModifyCaptainComponent,
+      nzComponentParams: { data: { ids: params, } },
+      nzFooter: null,
+      // nzOnOk: sin => {
+      //   this.service.request(this.service.$api_change_bulk, { billId: item.id, ...sin.sf.value }).subscribe(res => {
+      //     if (res) {
+      //       this.service.msgSrv.success('变更运费成功');
+      //       modal.destroy();
+      //       this.st.reload();
+      //     }
+      //   });
+      //   return false;
+      // }
+    });
+    modal.afterClose.subscribe((result) => {
+      if (result) {
+        this.st.load(1);
+        this.getGoodsSourceStatistical()
+      }
+    });
   }
-  
+
   //  *确认签收
-   
+
   confirmReceipt(item: any) {
     const modalRef = this.modal.create({
       nzTitle: '确认签收',
@@ -783,61 +787,61 @@ resourceStatus: any;
       nzFooter: null
     });
   }
-    revoke(item: any) {
-      this.modal.confirm({
-        nzTitle: '是否确定立即撤销费用变更！</i>',
-        nzOnOk: () => 
-        this.service.request(this.service.$api_get_revokeChangeRecord, { id: item.id}).subscribe((res) => {
+  revoke(item: any) {
+    this.modal.confirm({
+      nzTitle: '是否确定立即撤销费用变更！</i>',
+      nzOnOk: () =>
+        this.service.request(this.service.$api_get_revokeChangeRecord, { id: item.id }).subscribe((res) => {
           console.log(res)
-          if(res) {
+          if (res) {
             this.service.msgSrv.success('撤销成功！')
             this.stFloat.reload()
           }
         })
-      });
+    });
+  }
+  // 取消订单
+  cancellation(item: any) {
+    // api_get_cancelAnOrder
+    this.modal.confirm({
+      nzTitle: '<b>确定取消该订单吗?</b>',
+      nzContent: `<b>取消后无法恢复，请确认</b>`,
+      nzOnOk: () =>
+        this.service.request(this.service.$api_get_cancelAnOrder, { id: item.id }).subscribe((res) => {
+          if (res === true) {
+            this.service.msgSrv.success('操作成功！');
+            this.st.load(1);
+            this.getGoodsSourceStatistical()
+            this.initST();
+          }
+        }),
+    })
+  }
+  userAction() {
+    let params: any[] = [];
+    this.selectedRows.forEach(item => {
+      params.push(item.id);
+    });
+    if (params.length === 0) {
+      this.service.msgSrv.error('请先选择订单！')
+      return
     }
-    // 取消订单
-    cancellation(item: any) {
-      // api_get_cancelAnOrder
-      this.modal.confirm({
-        nzTitle: '<b>确定取消该订单吗?</b>',
-        nzContent: `<b>取消后无法恢复，请确认</b>`,
-        nzOnOk: () =>
-          this.service.request(this.service.$api_get_cancelAnOrder, {id: item.id}).subscribe((res) => {
-            if (res === true) {
-              this.service.msgSrv.success('操作成功！');
-              this.st.load(1);
-              this.getGoodsSourceStatistical()
-              this.initST();
-            }
-          }),
-      })
-    }
-    userAction() {
-      let params: any[] = [];
-      this.selectedRows.forEach(item => {
-        params.push(item.id);
-      });
-      if(params.length  === 0) {
-        this.service.msgSrv.error('请先选择订单！')
-        return
+    this.service.request(this.service.$api_get_batchSignWholeOrder, params).subscribe(res => {
+      if (res) {
+        console.log(res);
+        this.st.load(1);
+        this.getGoodsSourceStatistical()
       }
-      this.service.request(this.service.$api_get_batchSignWholeOrder, params).subscribe(res => {
-        if (res) {
-          console.log(res);
-          this.st.load(1);
-          this.getGoodsSourceStatistical()
-        }
-      });
-    }
-      // 修改订单
+    });
+  }
+  // 修改订单
   changeOrder(value: any) {
     this.router.navigate(['order-management/vehicle-detailChange', value.id]);
   }
-    /**
-   *申请退款
-   */
-   applyRefund(item: any) {
+  /**
+ *申请退款
+ */
+  applyRefund(item: any) {
     const modalRef = this.modal.create({
       nzTitle: '申请退款',
       nzContent: OneCarOrderCancelConfirmComponent,
@@ -848,7 +852,7 @@ resourceStatus: any;
       nzFooter: null
     });
     modalRef.afterClose.subscribe((res: boolean) => {
-      if(res) {
+      if (res) {
         this.resetSF;
         this.st.load();
       }
diff --git a/src/app/routes/partner/account-management/components/list/list.component.html b/src/app/routes/partner/account-management/components/list/list.component.html
index eff67eb6..a32db2ca 100644
--- a/src/app/routes/partner/account-management/components/list/list.component.html
+++ b/src/app/routes/partner/account-management/components/list/list.component.html
@@ -1,5 +1,11 @@
 <nz-card>
-  <sf mode="search" [schema]="schema" [ui]="ui" [button]="'none'" (formSubmit)="st.load(1)" (formReset)="resetSF()" #sf>
+  <!-- <div nz-row>
+    <div [nzSpan]="" nz-col>
+
+    </div>
+  </div> -->
+  <sf [schema]="schema" [mode]="'search'" [ui]="ui" [button]="'none'" (formSubmit)="st.load(1)" (formReset)="resetSF()"
+    #sf>
     <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading"
       (click)="st?.load(1)">查询</button>
     <button nz-button (click)="resetSF()">重置</button>
@@ -8,7 +14,7 @@
 
 </nz-card>
 <nz-card>
-  <st #st [data]="service.$api_get_partner_statistics_page" [columns]="columns" [scroll]="{ x: '1200px' }"
+  <st #st [data]="service. $api_get_account_management_page" [columns]="columns" [scroll]="{ x: '1200px' }"
     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
     [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
     [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
@@ -28,8 +34,6 @@
     <ng-template st-row="approvalStatus3" let-item>
       <div class="text-right">{{item.yskmoney | currency:' '}}</div>
     </ng-template>
-    <ng-template st-row="approvalStatus4" let-item>
-      <div class="text-right">{{item.armoney | currency:' '}}</div>
-    </ng-template>
+
   </st>
 </nz-card>
diff --git a/src/app/routes/partner/account-management/components/list/list.component.ts b/src/app/routes/partner/account-management/components/list/list.component.ts
index e072fc3c..d49477c8 100644
--- a/src/app/routes/partner/account-management/components/list/list.component.ts
+++ b/src/app/routes/partner/account-management/components/list/list.component.ts
@@ -2,7 +2,10 @@ import { Component, OnInit, ViewChild } from '@angular/core';
 import { STColumn, STComponent } from '@delon/abc/st';
 import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
 import { ModalHelper, _HttpClient } from '@delon/theme';
+import { NzModalService } from 'ng-zorro-antd/modal';
 import { BussinessStatisticsService } from '../../../business-statistics/services/bussiness-statistics.service';
+import { AccountManagemantService } from '../../services/account-managemant.service';
+import { PartnerAccountManagementVirtualAccountDetailComponent } from '../virtual-account-detail/virtual-account-detail.component';
 
 @Component({
   selector: 'app-partner-list',
@@ -16,7 +19,7 @@ export class PartnerAccountManagementListComponent implements OnInit {
   @ViewChild('sf') private readonly sf!: SFComponent;
   columns: STColumn[] = [];
 
-  constructor(public service: BussinessStatisticsService) { }
+  constructor(public service: AccountManagemantService, public modal: NzModalService) { }
   /**
    * 查询参数
    */
@@ -41,45 +44,36 @@ export class PartnerAccountManagementListComponent implements OnInit {
           },
         },
         abnormalCause1: {
-          title: '类型',
+          title: '手机号',
           type: 'string',
-          default: '',
-          enum: [
-            {
-              label: '全部',
-              value: ''
-            },
-            {
-              label: '个人',
-              value: '1'
-            },
-            {
-              label: '企业',
-              value: '2'
-            }
-          ],
           ui: {
-            widget: 'select'
+            placeholder: '请输入',
           },
         },
       }
     }
-    this.ui = { '*': { spanLabelFixed: 120, grid: { span: 8, gutter: 4 } } };
+    this.ui = { '*': { spanLabelFixed: 120, grid: { span: 8, gutter: 12 } }, };
   }
   /**
  * 初始化数据列表
  */
   initST() {
     this.columns = [
-      { title: '合伙人名称', index: 'carNo', className: 'text-center', width: 150 },
-      { title: '类型', render: 'carModelLabel', className: 'text-center', width: 150 },
-      { title: '注册时间', index: 'carNo', className: 'text-center', width: 150 },
-      { title: '本月新增客户', render: 'approvalStatus0', className: 'text-center', sort: true, width: 150 },
-      { title: '客户总数', render: 'approvalStatus', className: 'text-center', sort: true, width: 150 },
-      { title: '本月已结算金额（元）', render: 'approvalStatus1', className: 'text-right', sort: true, width: 180 },
-      { title: '累计已结算金额（元）', render: 'approvalStatus2', className: 'text-right', sort: true, width: 180 },
-      { title: '本月预估收益（元）', render: 'approvalStatus3', className: 'text-right', sort: true, width: 180 },
-      { title: '累计收益（元）', render: 'approvalStatus4', className: 'text-right', sort: true, width: 180 },
+      { title: '合伙人名称', index: 'carNo', className: 'text-center', width: 300 },
+      { title: '手机号', render: 'carModelLabel', className: 'text-center', width: 200 },
+      { title: '账户总额（元）', render: 'approvalStatus1', className: 'text-right', sort: true, width: 200 },
+      { title: '待入账余额（元）', render: 'approvalStatus2', className: 'text-right', sort: true, width: 200 },
+      { title: '可用余额（元）', render: 'approvalStatus3', className: 'text-right', sort: true, width: 250 },
+      { title: '虚拟账户', index: 'approvalStatus4', className: 'text-center', width: 200 },
+      {
+        title: '操作',
+        buttons: [
+          {
+            text: '虚拟账户明细',
+            click: (_record) => this.viewVirtual(_record)
+          }
+        ]
+      }
     ];
   }
 
@@ -90,6 +84,28 @@ export class PartnerAccountManagementListComponent implements OnInit {
     })
   }
 
+  /**
+   *
+   * @param _record 当前行信息
+   */
+  viewVirtual(_record: any) {
+
+    const modalRef = this.modal.create({
+      nzTitle: '虚拟账户明细',
+      nzContent: PartnerAccountManagementVirtualAccountDetailComponent,
+      nzComponentParams: {
+        id: _record?.id
+      },
+      nzWidth: '85%',
+      nzFooter: null
+    });
+    modalRef.afterClose.subscribe(result => {
+    });
+  }
+
+  /**
+   *
+   */
   export() {
 
   }
diff --git a/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.html b/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.html
new file mode 100644
index 00000000..649ddc1c
--- /dev/null
+++ b/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.html
@@ -0,0 +1,27 @@
+<nz-card>
+  <div nz-row>
+    <div nz-col [nzSpan]="_$expand ? 24 : 18">
+      <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
+    </div>
+    <div nz-col [nzSpan]="_$expand ? 24 : 6" class="text-right">
+      <button nz-button nzType="primary" [disabled]="!sf.valid" (click)="st?.load(1)">查询</button>
+      <button nz-button (click)="resetSF()">重置</button>
+      <button nz-button (click)="export()" nzType="primary" nzGhost>导出</button>
+      <button nz-button nzType="link" (click)="expandToggle()">
+        {{ !_$expand ? '展开' : '收起' }}
+        <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
+      </button>
+    </div>
+  </div>
+  <div class="mt-sm">
+    <st #st [data]="amService.$api_get_account_management_page" [columns]="columns" [columns]="columns"
+      [scroll]="{ x: '1200px' }"
+      [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+      [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+      [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+      [loading]="amService.http.loading"></st>
+  </div>
+</nz-card>
+<div class="modal-footer text-center">
+  <button nz-button type="button" nzType="primary" (click)="close()">确定</button>
+</div>
diff --git a/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.spec.ts b/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.spec.ts
new file mode 100644
index 00000000..9a7da573
--- /dev/null
+++ b/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.spec.ts
@@ -0,0 +1,24 @@
+import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import { PartnerAccountManagementVirtualAccountDetailComponent } from './virtual-account-detail.component';
+
+describe('PartnerAccountManagementVirtualAccountDetailComponent', () => {
+  let component: PartnerAccountManagementVirtualAccountDetailComponent;
+  let fixture: ComponentFixture<PartnerAccountManagementVirtualAccountDetailComponent>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [PartnerAccountManagementVirtualAccountDetailComponent]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(PartnerAccountManagementVirtualAccountDetailComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.ts b/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.ts
new file mode 100644
index 00000000..efd4933f
--- /dev/null
+++ b/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.ts
@@ -0,0 +1,174 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { STColumn, STComponent } from '@delon/abc/st';
+import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
+import { _HttpClient } from '@delon/theme';
+import { NzModalRef } from 'ng-zorro-antd/modal';
+import { ShipperBaseService } from 'src/app/shared/services/business/shipper-base.service';
+import { AccountManagemantService } from '../../services/account-managemant.service';
+
+@Component({
+  selector: 'app-partner-virtual-account-detail',
+  templateUrl: './virtual-account-detail.component.html',
+})
+export class PartnerAccountManagementVirtualAccountDetailComponent implements OnInit {
+  url = `/user`;
+  schema!: SFSchema;
+  ui!: SFUISchema;
+  @ViewChild('st') private readonly st!: STComponent;
+  @ViewChild('sf') private readonly sf!: SFComponent;
+  columns: STColumn[] = [];
+  id = '';
+  _$expand = false;
+
+  constructor(public shipperservice: ShipperBaseService, public amService: AccountManagemantService, private modalRef: NzModalRef) { }
+
+  get reqParams() {
+    return { ...this.sf?.value };
+  }
+  ngOnInit(): void {
+    this.initSF();
+    this.initST();
+  }
+
+  initSF() {
+    this.schema = {
+      properties: {
+        _$expand: {
+          type: 'boolean', ui: { hidden: true }
+        },
+        abnormalCause: {
+          title: '合伙人名称',
+          type: 'string',
+          ui: {
+            placeholder: '请输入',
+          },
+        },
+        abnormalCause1: {
+          title: '手机号',
+          type: 'string',
+          ui: {
+            placeholder: '请输入',
+          },
+        },
+        abnormalCause2: {
+          title: '网络货运人',
+          type: 'string',
+          default: '',
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            allowClear: true,
+            asyncData: () => this.shipperservice.getNetworkFreightForwarder({}, true)
+          }
+
+        },
+        bankType: {
+          type: 'string',
+          title: '银行类型',
+          default: '',
+          ui: {
+            widget: 'dict-select',
+            params: {
+              dictKey: 'bankname:type'
+            },
+            placeholder: '请选择',
+            allowClear: true,
+            containsAllLabel: true,
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+          },
+        },
+        abnormalCause3: {
+          title: '虚拟账户',
+          type: 'string',
+          ui: {
+            placeholder: '请输入',
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            },
+          },
+        },
+        createTime: {
+          type: 'string',
+          title: '创建时间',
+          ui: {
+            widget: 'sl-from-to',
+            type: 'date',
+            autoComplete: 'off',
+            format: 'yyyy-MM-dd',
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            },
+          } as SFDateWidgetSchema,
+        },
+      }
+    }
+    this.ui = { '*': { spanLabelFixed: 100, grid: { span: 8, gutter: 4 } }, };
+  }
+
+  /**
+* 初始化数据列表
+*/
+  initST() {
+    this.columns = [
+      { title: '合伙人', index: 'carNo', className: 'text-center', width: 200 },
+      { title: '手机号', render: 'carModelLabel', className: 'text-center', width: 150 },
+      { title: '网络货运人', render: 'carModelLabel', className: 'text-center', width: 200 },
+      { title: '银行类型', render: 'carModelLabel', className: 'text-center', width: 120 },
+      { title: '虚拟账户', render: 'carModelLabel', className: 'text-center', width: 180 },
+      { title: '可用余额', render: 'approvalStatus1', className: 'text-right', width: 180 },
+      { title: '账户总余额', render: 'approvalStatus2', className: 'text-right', width: 180 },
+      { title: '可用余额（元）', render: 'approvalStatus3', className: 'text-right', width: 180 },
+      { title: '创建时间', index: 'approvalStatus4', className: 'text-center', width: 200 },
+      { title: '状态', index: 'approvalStatus4', className: 'text-center', width: 120 },
+      {
+        title: '操作',
+        width: 120,
+        buttons: [
+          {
+            text: '查看明细',
+            click: (_record) => this.viewDetail(_record)
+          }
+        ]
+      }
+    ];
+  }
+
+  resetSF() {
+    this._$expand = false;
+    this.sf.reset();
+    setTimeout(() => {
+      this.st.reset();
+    })
+  }
+  /**
+* 伸缩查询条件
+*/
+  expandToggle() {
+    this._$expand = !this._$expand;
+    this.sf?.setValue('/_$expand', this._$expand);
+  }
+
+  add(): void {
+    // this.modal
+    //   .createStatic(FormEditComponent, { i: { id: 0 } })
+    //   .subscribe(() => this.st.reload());
+  }
+  search() {
+    this.st.load(1);
+  }
+  export() { }
+  /**
+   *
+   * @param _record 当前行信息
+   */
+  viewDetail(_record: any) {
+
+  }
+
+  close() {
+    this.modalRef.destroy();
+  }
+
+}
diff --git a/src/app/routes/partner/account-management/services/account-managemant.service.ts b/src/app/routes/partner/account-management/services/account-managemant.service.ts
index 3ca08cb0..d88522a1 100644
--- a/src/app/routes/partner/account-management/services/account-managemant.service.ts
+++ b/src/app/routes/partner/account-management/services/account-managemant.service.ts
@@ -6,6 +6,7 @@ import { BaseService } from '@shared';
 })
 export class AccountManagemantService extends BaseService {
 
+  $api_get_account_management_page = `/api/fcc/ficoBrmH/list/page`;
   constructor(public injector: Injector) {
     super(injector)
   }
diff --git a/src/app/routes/partner/partner-routing.module.ts b/src/app/routes/partner/partner-routing.module.ts
index 6cd0f164..8664f185 100644
--- a/src/app/routes/partner/partner-routing.module.ts
+++ b/src/app/routes/partner/partner-routing.module.ts
@@ -22,6 +22,7 @@ import { PartnerSalePartnerDetailComponent } from './business-statistics/compone
 import { PartnerPartnerCustomOrderDetailComponent } from './business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component';
 import { PartnerPartnerOrderDetailComponent } from './business-statistics/components/partner-order-detail/partner-order-detail.component';
 import { PartnerAccountManagementListComponent } from './account-management/components/list/list.component';
+import { PartnerAccountManagementVirtualAccountDetailComponent } from './account-management/components/virtual-account-detail/virtual-account-detail.component';
 
 const routes: Routes = [
   {
@@ -63,7 +64,8 @@ const routes: Routes = [
     children: [
       { path: 'list', component: PartnerAccountManagementListComponent },
     ]
-  }];
+  },
+];
 @NgModule({
   imports: [RouterModule.forChild(routes)],
   exports: [RouterModule]
diff --git a/src/app/routes/partner/partner.module.ts b/src/app/routes/partner/partner.module.ts
index 157b33d6..bdd2ef14 100644
--- a/src/app/routes/partner/partner.module.ts
+++ b/src/app/routes/partner/partner.module.ts
@@ -16,6 +16,7 @@ import { PartnerSalePartnerDetailComponent } from './business-statistics/compone
 import { PartnerPartnerCustomOrderDetailComponent } from './business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component';
 import { PartnerPartnerOrderDetailComponent } from './business-statistics/components/partner-order-detail/partner-order-detail.component';
 import { PartnerAccountManagementListComponent } from './account-management/components/list/list.component';
+import { PartnerAccountManagementVirtualAccountDetailComponent } from './account-management/components/virtual-account-detail/virtual-account-detail.component';
 
 const COMPONENTS: any[] = [
   PartnerBusinessStatisticsIndexComponent,
@@ -32,7 +33,8 @@ const COMPONENTS: any[] = [
   PartnerSalePartnerDetailComponent,
   PartnerPartnerCustomOrderDetailComponent,
   PartnerPartnerOrderDetailComponent,
-  PartnerAccountManagementListComponent];
+  PartnerAccountManagementListComponent,
+  PartnerAccountManagementVirtualAccountDetailComponent];
 
 @NgModule({
   declarations: [...COMPONENTS],
diff --git a/src/app/routes/supply-management/components/bulk/bulk.component.ts b/src/app/routes/supply-management/components/bulk/bulk.component.ts
index f64e2a74..e79fa857 100644
--- a/src/app/routes/supply-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/supply-management/components/bulk/bulk.component.ts
@@ -43,7 +43,7 @@ export class SupplyManagementBulkComponent implements OnInit {
     private modal: NzModalService,
     private router: Router,
     public shipperservice: ShipperBaseService
-    ) { }
+  ) { }
 
   ngOnInit(): void {
     this.initSF();
@@ -54,14 +54,14 @@ export class SupplyManagementBulkComponent implements OnInit {
   /**
  * 查询参数
  */
-   get reqParams() {
-    const a:any = {};
-    if(this.resourceStatus) {
-      a.resourceStatus = this.resourceStatus 
+  get reqParams() {
+    const a: any = {};
+    if (this.resourceStatus) {
+      a.resourceStatus = this.resourceStatus
     }
     const params: any = Object.assign({}, this.sf?.value || {});
     delete params._$expand;
-    return { 
+    return {
       ...a,
       ...params,
       releaseTime: {
@@ -72,7 +72,7 @@ export class SupplyManagementBulkComponent implements OnInit {
         start: this.sf?.value?.deadlineTime?.[0] || '',
         end: this.sf?.value?.deadlineTime?.[1] || '',
       },
-     };
+    };
   }
   search() {
     this.st?.load(1);
@@ -82,7 +82,7 @@ export class SupplyManagementBulkComponent implements OnInit {
     console.log(data)
     return data.map(item => ({
       ...item,
-      disabled: item.auditStatus !== '1' 
+      disabled: item.auditStatus !== '1'
     }));
   };
   /**
@@ -110,9 +110,9 @@ export class SupplyManagementBulkComponent implements OnInit {
           default: '',
           ui: {
             widget: 'dict-select',
-            containsAllLable: true,
+            containsAllLabel: true,
             params: { dictKey: 'service:type' },
-            containAllLable:true,
+            containAllLable: true,
             visibleIf: {
               _$expand: (value: boolean) => value,
             },
@@ -123,9 +123,9 @@ export class SupplyManagementBulkComponent implements OnInit {
           type: 'string',
           ui: {
             widget: 'dict-select',
-            containsAllLable: true,
+            containsAllLabel: true,
             params: { dictKey: 'goodresource:settlement:type' },
-            containAllLable:true,
+            containAllLable: true,
             visibleIf: {
               _$expand: (value: boolean) => value,
             },
@@ -186,7 +186,7 @@ export class SupplyManagementBulkComponent implements OnInit {
               console.log(q)
               if (!!q) {
                 return this.service
-                  .request(this.service.$api_enterpriceList, { enterpriseName: q})
+                  .request(this.service.$api_enterpriceList, { enterpriseName: q })
                   .pipe(map((res: any) => (res as any[]).map((i) => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum))))
                   .toPromise();
               } else {
@@ -204,24 +204,24 @@ export class SupplyManagementBulkComponent implements OnInit {
     this.freightSchema = {
       properties: {
         remarks: {
-        title: '备注',
-        type: 'string',
-        maxLength: 50,
-        ui: {
-          placeholder: '请输入备注',
-          widget: 'textarea',
+          title: '备注',
+          type: 'string',
+          maxLength: 50,
+          ui: {
+            placeholder: '请输入备注',
+            widget: 'textarea',
+          },
         },
-      },
-    }
-  };
-  this.ui2 = { '*': { spanLabelFixed: 120, grid: { span: 16 } } };
+      }
+    };
+    this.ui2 = { '*': { spanLabelFixed: 120, grid: { span: 16 } } };
   }
   /**
    * 初始化数据列表
    */
   initST() {
     this.columns = [
-      { title: '', type: 'checkbox',   fixed: 'left', width: '50px', className: 'text-center' },
+      { title: '', type: 'checkbox', fixed: 'left', width: '50px', className: 'text-center' },
       {
         title: '货源编号',
         width: '200px',
@@ -236,12 +236,12 @@ export class SupplyManagementBulkComponent implements OnInit {
       {
         title: '装货地',
         className: 'text-left',
-        index: 'loadingAddressArr', 
+        index: 'loadingAddressArr',
         width: '200px',
       }, {
         title: '卸货地',
         className: 'text-left',
-        index: 'unloadingAddressArr', 
+        index: 'unloadingAddressArr',
         width: '200px',
       },
       {
@@ -306,7 +306,7 @@ export class SupplyManagementBulkComponent implements OnInit {
             iif: item => item.auditStatus === '1',
             acl: { ability: ['SUPPLY-INDEX-bulkBatchAudit'] },
           },
-          { 
+          {
             text: '二维码　',
             click: (_record) => this.assignedQrcode(_record),
             iif: item => item.resourceStatus == 1,
@@ -314,7 +314,7 @@ export class SupplyManagementBulkComponent implements OnInit {
           {
             text: '修改单价',
             click: (_record) => this.modification(_record),
-            iif: item => item.resourceStatus == 1 ,
+            iif: item => item.resourceStatus == 1,
             acl: { ability: ['SUPPLY-INDEX-modificationUnitPrice'] },
           },
           {
@@ -389,86 +389,86 @@ export class SupplyManagementBulkComponent implements OnInit {
   tabChange(item: any) {
     console.log(item)
   }
-   /**
-  * 审核
-  * status ： 1 单个  2：批量
-  * value ： 单个单条数据
-  */
-    audit(value: any, status?: any) {
-      console.log(value)
-      console.log(status)
-      if(status === 2) {
-        if(this.selectedRows.length <= 0) {
-          this.service.msgSrv.error('未选择货源单！');
-          return
-        }
-        let list: any[] = [];
-        this.selectedRows.forEach(item => {
-          list.push(item.id);
-        });
-        this.auditID = list;
-        this.auditMany = true;
-      } else {
-        this.auditID = value.id
-        this.auditMany = false;
+  /**
+ * 审核
+ * status ： 1 单个  2：批量
+ * value ： 单个单条数据
+ */
+  audit(value: any, status?: any) {
+    console.log(value)
+    console.log(status)
+    if (status === 2) {
+      if (this.selectedRows.length <= 0) {
+        this.service.msgSrv.error('未选择货源单！');
+        return
       }
-      this.isVisible = true;
+      let list: any[] = [];
+      this.selectedRows.forEach(item => {
+        list.push(item.id);
+      });
+      this.auditID = list;
+      this.auditMany = true;
+    } else {
+      this.auditID = value.id
+      this.auditMany = false;
     }
-      /**
-  * 审核关闭弹窗
-  */
+    this.isVisible = true;
+  }
+  /**
+* 审核关闭弹窗
+*/
   handleCancel(type: any) {
     this.isVisible = false
   }
-   /**
-   * 代发货源
-   */
-    releaseGoods() {
-      this.router.navigate(['/supply-management/bulk-release']);
-    }
+  /**
+  * 代发货源
+  */
+  releaseGoods() {
+    this.router.navigate(['/supply-management/bulk-release']);
+  }
   /**
   * 审核通过按钮
   */
   handleOK(value: any) {
-    if(this.selectedRows.length <= 0) { 
-    const params: any = {
-      id: this.auditID,
-      remarks: this.sfFre.value.remarks,
-    }
-    if(value == 1) {
-      params.auditStatus = 2
-    } else {
-      params.auditStatus = 3
-    }
-    console.log(params)
-    this.service.request(this.service.$api_goodsResourceAudit, params).subscribe(res => {
-      if (res === true) {
-        this.service.msgSrv.success('审核成功！');
-        this.isVisible = false;
-        this.st?.reload();
-        this.getGoodsSourceStatistical();
+    if (this.selectedRows.length <= 0) {
+      const params: any = {
+        id: this.auditID,
+        remarks: this.sfFre.value.remarks,
       }
-    })
-  } else {
-    const params: any = {
-      ids: this.auditID,
-      remarks: this.sfFre.value.remarks,
-    }
-    if(value == 1) {
-      params.auditStatus = 2
-    } else {
-      params.auditStatus = 3
-    }
-    console.log(params)
-    this.service.request(this.service.$api_batchGoodsResourceAudit, params).subscribe(res => {
-      if (res === true) {
-        this.service.msgSrv.success('审核成功！');
-        this.isVisible = false;
-        this.st?.reload();
-        this.getGoodsSourceStatistical();
+      if (value == 1) {
+        params.auditStatus = 2
+      } else {
+        params.auditStatus = 3
       }
-    })
-  }
+      console.log(params)
+      this.service.request(this.service.$api_goodsResourceAudit, params).subscribe(res => {
+        if (res === true) {
+          this.service.msgSrv.success('审核成功！');
+          this.isVisible = false;
+          this.st?.reload();
+          this.getGoodsSourceStatistical();
+        }
+      })
+    } else {
+      const params: any = {
+        ids: this.auditID,
+        remarks: this.sfFre.value.remarks,
+      }
+      if (value == 1) {
+        params.auditStatus = 2
+      } else {
+        params.auditStatus = 3
+      }
+      console.log(params)
+      this.service.request(this.service.$api_batchGoodsResourceAudit, params).subscribe(res => {
+        if (res === true) {
+          this.service.msgSrv.success('审核成功！');
+          this.isVisible = false;
+          this.st?.reload();
+          this.getGoodsSourceStatistical();
+        }
+      })
+    }
   }
   // 修改单价
   modification(item: any) {
@@ -509,34 +509,34 @@ export class SupplyManagementBulkComponent implements OnInit {
       nzTitle: '<b>确定取消货源吗?</b>',
       nzContent: `<b>取消后不可恢复，谨慎操作</b>`,
       nzOnOk: () =>
-        this.service.request(this.service.$api_cancelSource, {id: item.id}).subscribe((res) => {
-          if(res) {
+        this.service.request(this.service.$api_cancelSource, { id: item.id }).subscribe((res) => {
+          if (res) {
             this.service.msgSrv.success('已取消货源！')
             this.st?.reload();
             this.getGoodsSourceStatistical();
           }
         })
     })
- 
+
+  }
+  // 获取货源状态统计
+  getGoodsSourceStatistical() {
+    this.tabs = {
+      totalQuantity: 0,
+      cancelQuantity: 0,
+      receivedQuantity: 0,
+      stayQuantity: 0
+    };
+    const params: any = Object.assign({}, this.reqParams || {});
+    delete params.resourceStatus
+    this.service.request(this.service.$api_get_goods_resource_statistical, { resourceType: 2, ...params }).subscribe(res => {
+      if (res) {
+        console.log(res)
+        this.tabs = res;
+      }
+    })
+  }
+  userAction() {
+
   }
-    // 获取货源状态统计
-    getGoodsSourceStatistical() {
-      this.tabs = {
-        totalQuantity: 0,
-        cancelQuantity: 0,
-        receivedQuantity: 0,
-        stayQuantity: 0
-      };
-      const params: any = Object.assign({}, this.reqParams || {});
-      delete params.resourceStatus
-      this.service.request(this.service.$api_get_goods_resource_statistical, { resourceType: 2, ...params }).subscribe(res => {
-        if (res) {
-          console.log(res)
-          this.tabs = res;
-        }
-      })
-    }
-    userAction() {
-      
-    }
 }
diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts
index 214ed987..16d5ec3b 100644
--- a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts
+++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts
@@ -65,10 +65,10 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
     this.validateForm1 = fb.group({
       loadAddress0: [null, [Validators.required]],
       loadName0: [null, [Validators.required]],
-      loadPhone0: [null, [Validators.required,Validators.pattern('^[0-9]*$')]],
+      loadPhone0: [null, [Validators.required, Validators.pattern('^[0-9]*$')]],
       unloadAddress0: [null, [Validators.required]],
       unloadName0: [null, [Validators.required]],
-      unloadPhone0: [null, [Validators.required,Validators.pattern('^[0-9]*$')]],
+      unloadPhone0: [null, [Validators.required, Validators.pattern('^[0-9]*$')]],
       loadingTime: [null, []],
       unloadingTime: [null, []]
     });
@@ -89,7 +89,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
   @ViewChild('sf5', { static: false }) sf5!: SFComponent;
   schema5: SFSchema = {};
   ui5!: SFUISchema;
-  
+
   @ViewChild('sf55', { static: false }) sf55!: SFComponent;
   schema55: SFSchema = {};
   ui55!: SFUISchema;
@@ -101,15 +101,15 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
   @ViewChild('sf7', { static: false }) sf7!: SFComponent;
   schema7: SFSchema = {};
   ui7!: SFUISchema;
-  formatterRmb = (value: number): string =>{
-    if(value){
-      let  value2 = Number(value).toLocaleString(undefined,{'minimumFractionDigits':2,'maximumFractionDigits':2});
+  formatterRmb = (value: number): string => {
+    if (value) {
+      let value2 = Number(value).toLocaleString(undefined, { 'minimumFractionDigits': 2, 'maximumFractionDigits': 2 });
       return `￥ ${value2}`;
     }
     return `￥ 0.00`
-     
-  } ;
-  parserRmb = (value: string): string => value.replace('￥ ', '').replace(',','');
+
+  };
+  parserRmb = (value: string): string => value.replace('￥ ', '').replace(',', '');
   // 页面初始化
   ngOnInit(): void {
     this.initSF1();
@@ -221,7 +221,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
           } as SFSelectWidgetSchema
         }
       },
-      required: ['shipperAppUserId', 'enterpriseProjectId', 'enterpriseInfoName', ]
+      required: ['shipperAppUserId', 'enterpriseProjectId', 'enterpriseInfoName',]
     };
     this.ui1 = {
       '*': {
@@ -343,13 +343,13 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
           ui: {
             widget: 'select',
             mode: 'multiple',
-            maxMultipleCount:3,
+            maxMultipleCount: 3,
             placeholder: '请选择车型',
             errors: { required: '请选择车型' },
             asyncData: () => this.service.getDictOptions({ dictKey: 'car:model' }),
-            change:(tag:any , org:any)=>{
-              if(tag.includes("999")){
-                this.sf4.setValue('/carModel',["999"]);
+            change: (tag: any, org: any) => {
+              if (tag.includes("999")) {
+                this.sf4.setValue('/carModel', ["999"]);
               }
             }
           }
@@ -360,13 +360,13 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
           ui: {
             widget: 'select',
             mode: 'multiple',
-            maxMultipleCount:3,
+            maxMultipleCount: 3,
             placeholder: '请选择车长',
             errors: { required: '请选择车长' },
             asyncData: () => this.service.getDictOptions({ dictKey: 'car:length' }),
-            change:(tag:any , org:any)=>{
-              if(tag.includes("999")){
-                this.sf4.setValue('/carModel',["999"]);
+            change: (tag: any, org: any) => {
+              if (tag.includes("999")) {
+                this.sf4.setValue('/carModel', ["999"]);
               }
             }
           }
@@ -443,29 +443,29 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
           ui: {
             widget: 'select'
           },
-          default:'0'
+          default: '0'
         },
         type1: {
           type: 'string',
           title: '',
-          enum: ['车辆实时定位', '轨迹查询', '数据保护','赠送基本险'],
+          enum: ['车辆实时定位', '轨迹查询', '数据保护', '赠送基本险'],
           readOnly: true,
           ui: {
             widget: 'checkbox',
-            visibleIf: {insuranceType: (value: string) => value ==='1'},
+            visibleIf: { insuranceType: (value: string) => value === '1' },
           } as SFCheckboxWidgetSchema,
-          default: ['车辆实时定位', '轨迹查询', '数据保护','赠送基本险'],
+          default: ['车辆实时定位', '轨迹查询', '数据保护', '赠送基本险'],
         },
         type2: {
           type: 'string',
           title: '',
-          enum: ['车辆实时定位', '轨迹查询', '数据保护','专属技术服务','赠送综合险'],
+          enum: ['车辆实时定位', '轨迹查询', '数据保护', '专属技术服务', '赠送综合险'],
           readOnly: true,
           ui: {
             widget: 'checkbox',
-            visibleIf: {insuranceType: (value: string) => value ==='2'},
+            visibleIf: { insuranceType: (value: string) => value === '2' },
           } as SFCheckboxWidgetSchema,
-          default: ['车辆实时定位', '轨迹查询', '数据保护','专属技术服务','赠送综合险'],
+          default: ['车辆实时定位', '轨迹查询', '数据保护', '专属技术服务', '赠送综合险'],
         }
       }
     };
@@ -501,7 +501,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'receipt:type' },
-            containsAllLable: false,
+            containsAllLabel: false,
             placeholder: '请选择',
             errors: { required: '请选择' },
             visibleIf: {
@@ -573,7 +573,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
           } as SFTextareaWidgetSchema
         }
       },
-      required: ['stateReceipt', 'receiptType', 'receiptUserName','receiptUserPhone','receiptAddressArea','receiptAddress']
+      required: ['stateReceipt', 'receiptType', 'receiptUserName', 'receiptUserPhone', 'receiptAddressArea', 'receiptAddress']
     };
     this.ui6 = {
       '*': {
@@ -589,19 +589,19 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
           type: 'number',
           title: '预付',
           default: 0,
-          ui: {widget: 'custom'}
+          ui: { widget: 'custom' }
         },
         toPay: {
           type: 'number',
           title: '到付',
           default: 0,
-          ui: { widget: 'custom'}
+          ui: { widget: 'custom' }
         },
         receiptPay: {
           type: 'number',
           title: '回单付',
           default: 0,
-          ui: {widget: 'custom'}
+          ui: { widget: 'custom' }
         },
         subtotal: { type: 'number', title: '小计', default: 0, ui: { widget: 'custom' } as SFNumberWidgetSchema },
         appendFee: { type: 'number', title: '附加费', default: 0, ui: { widget: 'custom' } as SFNumberWidgetSchema },
@@ -651,12 +651,12 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
     const params = {
       shipperId: this.envCache?.enterpriseId,
       enterpriseInfoId: this.envCache?.networkTransporterId,
-      totalFreight:subtotal,
-      fuelCardAmount:oilCardPay,
-      resourcetype:'1'
+      totalFreight: subtotal,
+      fuelCardAmount: oilCardPay,
+      resourcetype: '1'
     }
     this.service
-      .request(this.service.$api_getCalculatedSurcharge,params)
+      .request(this.service.$api_getCalculatedSurcharge, params)
       .subscribe(res => {
         if (res) {
           this.sf7.setValue('/appendFee', res.surcharge);
@@ -818,7 +818,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
       ...this.sf6.value,
       expenseDTOList: expenseList,
       paymentDays: this.sf7.value.paymentDays,
-      insuranceType:this.sf55.value.insuranceType,
+      insuranceType: this.sf55.value.insuranceType,
     };
 
     let reqUrl = this.service.$api_consignWhole;
@@ -977,63 +977,63 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
   goBack() {
     window.history.go(-1);
   }
-    // 装卸货地址互换
-    swapAddress(){
-      this.startInfo.forEach((element:any, index:any) => {
-        this.validateForm1.removeControl(`loadAddress${index}`);
-        this.validateForm1.removeControl(`loadName${index}`);
-        this.validateForm1.removeControl(`loadPhone${index}`);
-      });
-      this.endInfo.forEach((element:any, index:any) => {
-        this.validateForm1.removeControl(`unloadAddress${index}`);
-        this.validateForm1.removeControl(`unloadName${index}`);
-        this.validateForm1.removeControl(`unloadPhone${index}`);
-      });
-  
-      let item = this.startInfo;
-      this.startInfo = this.endInfo;
-      this.endInfo = item;
-  
-      this.startInfo.forEach((element:any,index:any) => {
-        element.type = '1';
-        this.validateForm1.addControl(`loadAddress${index}`, new FormControl(null, Validators.required));
-        this.validateForm1.addControl(`loadName${index}`, new FormControl(null, Validators.required));
-        this.validateForm1.addControl(`loadPhone${index}`, new FormControl(null, [Validators.required, Validators.pattern('^[0-9]*$')]));
-      });
-      this.endInfo.forEach((element:any,index:any) => {
-        element.type = '2';
-        this.validateForm1.addControl(`unloadAddress${index}`, new FormControl(null, Validators.required));
-        this.validateForm1.addControl(`unloadName${index}`, new FormControl(null, Validators.required));
-        this.validateForm1.addControl(`unloadPhone${index}`, new FormControl(null, [Validators.required, Validators.pattern('^[0-9]*$')]));
-      });
-  
-     // 计算里程，时间
-     if (this.startInfo[0]?.area && this.endInfo[0]?.area) {
+  // 装卸货地址互换
+  swapAddress() {
+    this.startInfo.forEach((element: any, index: any) => {
+      this.validateForm1.removeControl(`loadAddress${index}`);
+      this.validateForm1.removeControl(`loadName${index}`);
+      this.validateForm1.removeControl(`loadPhone${index}`);
+    });
+    this.endInfo.forEach((element: any, index: any) => {
+      this.validateForm1.removeControl(`unloadAddress${index}`);
+      this.validateForm1.removeControl(`unloadName${index}`);
+      this.validateForm1.removeControl(`unloadPhone${index}`);
+    });
+
+    let item = this.startInfo;
+    this.startInfo = this.endInfo;
+    this.endInfo = item;
+
+    this.startInfo.forEach((element: any, index: any) => {
+      element.type = '1';
+      this.validateForm1.addControl(`loadAddress${index}`, new FormControl(null, Validators.required));
+      this.validateForm1.addControl(`loadName${index}`, new FormControl(null, Validators.required));
+      this.validateForm1.addControl(`loadPhone${index}`, new FormControl(null, [Validators.required, Validators.pattern('^[0-9]*$')]));
+    });
+    this.endInfo.forEach((element: any, index: any) => {
+      element.type = '2';
+      this.validateForm1.addControl(`unloadAddress${index}`, new FormControl(null, Validators.required));
+      this.validateForm1.addControl(`unloadName${index}`, new FormControl(null, Validators.required));
+      this.validateForm1.addControl(`unloadPhone${index}`, new FormControl(null, [Validators.required, Validators.pattern('^[0-9]*$')]));
+    });
+
+    // 计算里程，时间
+    if (this.startInfo[0]?.area && this.endInfo[0]?.area) {
       this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => {
         this.totalDistance = res.distance;
         this.totalTime = res.time;
       });
     }
-    }
-    goodsValuesChange(value: any) {
-      console.log(value);
-      console.log(this.totalDistance);
-      
-      if(value >= 50000 && this.totalDistance > 0){
-        const params = {
-          goodsValue: value,
-          insuranceType: this.sf55.value.insuranceType,
-          km: this.totalDistance
-        };
-        this.service
-          .request(this.service.$api_getWholeInsuranceInfo, params)
-          .subscribe(res => {
-            if (res) {
-              this.sf5.setValue('/insurancePremium',res.insurancePremium);
-            }else{
-              this.sf5.setValue('/insurancePremium',null);
-            }
+  }
+  goodsValuesChange(value: any) {
+    console.log(value);
+    console.log(this.totalDistance);
+
+    if (value >= 50000 && this.totalDistance > 0) {
+      const params = {
+        goodsValue: value,
+        insuranceType: this.sf55.value.insuranceType,
+        km: this.totalDistance
+      };
+      this.service
+        .request(this.service.$api_getWholeInsuranceInfo, params)
+        .subscribe(res => {
+          if (res) {
+            this.sf5.setValue('/insurancePremium', res.insurancePremium);
+          } else {
+            this.sf5.setValue('/insurancePremium', null);
+          }
         });
-      }
     }
+  }
 }
diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
index 1d192fa2..bfd8ca69 100644
--- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
@@ -44,7 +44,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
     private router: Router,
     private ar: ActivatedRoute,
     public shipperSrv: ShipperBaseService
-  ) {}
+  ) { }
 
   /**
    * 查询参数
@@ -147,7 +147,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
   /**
    * 导入货源
    */
-  importGoodsSource() {}
+  importGoodsSource() { }
 
   /**
    * 修改运费
@@ -382,7 +382,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
         //       _$expand: (value: boolean) => value
         //     },
         //     allowClear: true,
-        //     containsAllLable: true,
+        //     containsAllLabel: true,
         //     asyncData: () => this.shipperSrv.getEnterpriseProject(this.sf.value?.shipperAppUserId)
         //   } as SFSelectWidgetSchema
         // },
@@ -402,7 +402,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
           type: 'string',
           ui: {
             widget: 'dict-select',
-            containsAllLable: true,
+            containsAllLabel: true,
             params: { dictKey: 'service:type' },
             visibleIf: {
               _$expand: (value: boolean) => value
@@ -416,7 +416,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
           ui: {
             widget: 'dict-select',
             allowClear: true,
-            containsAllLable: true,
+            containsAllLabel: true,
             params: { dictKey: 'goodresource:audit:status' },
             visibleIf: {
               _$expand: (value: boolean) => value
diff --git a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts
index 8bc8f0f2..985007bc 100644
--- a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts
+++ b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts
@@ -30,9 +30,9 @@ export class CancellationInvoiceComponent implements OnInit {
   totalCallNo = 0;
 
   openInfo: any = { invoicedate: null, invoiceno: null };
-  constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) {}
+  constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) { }
 
-  ngOnInit(): void {}
+  ngOnInit(): void { }
 
   beforeReq = (requestOptions: STRequestOptions) => {
     if (this.sf) {
@@ -113,7 +113,7 @@ export class CancellationInvoiceComponent implements OnInit {
     this.nzModalService.warning({
       nzTitle: '确定将所选待处理开票申请推送开票？',
       nzContent: '推送开票后发票信息不可修改，待系统开票完成后会自动返回开票结果',
-      nzOnOk: () => {}
+      nzOnOk: () => { }
     });
   }
 
@@ -130,7 +130,7 @@ export class CancellationInvoiceComponent implements OnInit {
     this.nzModalService.warning({
       nzTitle: '确定将所选待确认开票申请撤回？',
       nzContent: '提交税控后发票信息不可修改，待税控开票完成后返回开票结果',
-      nzOnOk: () => {}
+      nzOnOk: () => { }
     });
   }
 
@@ -147,7 +147,7 @@ export class CancellationInvoiceComponent implements OnInit {
     this.nzModalService.warning({
       nzTitle: '确定将所选待确认开票申请撤回？',
       nzContent: '提交税控后发票信息不可修改，待税控开票完成后返回开票结果',
-      nzOnOk: () => {}
+      nzOnOk: () => { }
     });
   }
 
@@ -232,7 +232,7 @@ export class CancellationInvoiceComponent implements OnInit {
           type: 'string',
           ui: {
             widget: 'dict-select',
-            containsAllLable: true,
+            containsAllLabel: true,
             params: { dictKey: 'vatinv:status' },
             containAllLable: true,
             visibleIf: {
diff --git a/src/app/routes/vehicle/components/audit/audit.component.ts b/src/app/routes/vehicle/components/audit/audit.component.ts
index 6a46ee14..dcf50b10 100644
--- a/src/app/routes/vehicle/components/audit/audit.component.ts
+++ b/src/app/routes/vehicle/components/audit/audit.component.ts
@@ -22,7 +22,7 @@ export class VehicleComponentsAuditComponent implements OnInit {
   @ViewChild('st', { static: false }) st!: STComponent;
   @ViewChild('sf', { static: false }) sf!: SFComponent;
 
-  constructor(public service: VehicleService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute, private modalHelper: ModalHelper) {}
+  constructor(public service: VehicleService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute, private modalHelper: ModalHelper) { }
   /**
    * 查询字段个数navigate
    */
@@ -34,14 +34,14 @@ export class VehicleComponentsAuditComponent implements OnInit {
    * 查询参数
    */
   get reqParams() {
-    const a:any = {};
-    if(this.resourceStatus === 1) {
+    const a: any = {};
+    if (this.resourceStatus === 1) {
       a.approvalStatus = 10
-    } else if(this.resourceStatus === 2) {
+    } else if (this.resourceStatus === 2) {
       a.approvalStatus = 20
-    } else if(this.resourceStatus === 3) {
+    } else if (this.resourceStatus === 3) {
       a.approvalStatus = 30
-    } 
+    }
     return {
       ...a,
       ...this.sf?.value,
@@ -106,7 +106,7 @@ export class VehicleComponentsAuditComponent implements OnInit {
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'car:color' },
-            containsAllLable: true,
+            containsAllLabel: true,
           }
         },
         isSelf: {
@@ -157,17 +157,17 @@ export class VehicleComponentsAuditComponent implements OnInit {
   initST() {
     this.columns = [
       // { title: '', type: 'checkbox', className: 'text-center' },
-      { title: '车牌号',  width:'180px', className: 'text-center', index: 'carNo' },
-      { title: '车牌颜色',  width:'180px', className: 'text-center', index: 'carNoColorLabel' },
-      { title: '车型-车长-载重',   width:'180px',className: 'text-center', render: 'carLength' },
-      { title: '是否挂靠',  width:'180px', className: 'text-center', render: 'isSelf' },
-      { title: '所有人',  width:'180px', className: 'text-center', index: 'carOwner' },
-      { title: '录入人员',  width:'180px', className: 'text-center', index: 'saveUser', },
+      { title: '车牌号', width: '180px', className: 'text-center', index: 'carNo' },
+      { title: '车牌颜色', width: '180px', className: 'text-center', index: 'carNoColorLabel' },
+      { title: '车型-车长-载重', width: '180px', className: 'text-center', render: 'carLength' },
+      { title: '是否挂靠', width: '180px', className: 'text-center', render: 'isSelf' },
+      { title: '所有人', width: '180px', className: 'text-center', index: 'carOwner' },
+      { title: '录入人员', width: '180px', className: 'text-center', index: 'saveUser', },
       {
         title: '审核状态',
         className: 'text-center',
         index: 'approvalStatus',
-        width:'180px',
+        width: '180px',
         type: 'badge',
         badge: {
           '-1': { text: '未上传', color: 'default' },
@@ -179,7 +179,7 @@ export class VehicleComponentsAuditComponent implements OnInit {
           40: { text: '证件过期', color: 'error' },
         },
       },
-      { title: '申请时间',  width:'180px', className: 'text-center', index: 'createTime' },
+      { title: '申请时间', width: '180px', className: 'text-center', index: 'createTime' },
       {
         title: '操作',
         fixed: 'right',
@@ -190,7 +190,7 @@ export class VehicleComponentsAuditComponent implements OnInit {
             text: '查看',
             acl: { ability: ['VEHICLE-AUDIT-view'] },
             click: (item) => {
-              this.router.navigate(['./detail', item.id], { relativeTo: this.ar,queryParams: { carId: item.carId } });
+              this.router.navigate(['./detail', item.id], { relativeTo: this.ar, queryParams: { carId: item.carId } });
               // this.router.navigate(['./view', item.id], { relativeTo: this.ar, queryParams: { tenantId: item.tenantId } });
             },
           },
@@ -224,13 +224,13 @@ export class VehicleComponentsAuditComponent implements OnInit {
   }
   // 导出
   exportFire() {
-    this.service.downloadFile(this.service.$api_carLicenseAudit_export,  this.reqParams );
+    this.service.downloadFile(this.service.$api_carLicenseAudit_export, this.reqParams);
   }
   addModal() {
     const i = {
       appUserId: '',
     }
-    this.modalHelper.create(CarSettleCarauthComponent, {i}, { size: 900 }).subscribe((res) => {
+    this.modalHelper.create(CarSettleCarauthComponent, { i }, { size: 900 }).subscribe((res) => {
       this.st.load()
     });
   }
diff --git a/src/app/routes/vehicle/components/list/list.component.ts b/src/app/routes/vehicle/components/list/list.component.ts
index 817881c3..4a7ca3bf 100644
--- a/src/app/routes/vehicle/components/list/list.component.ts
+++ b/src/app/routes/vehicle/components/list/list.component.ts
@@ -19,7 +19,7 @@ export class VehicleComponentsListComponent implements OnInit {
   @ViewChild('st', { static: false }) st!: STComponent;
   @ViewChild('sf', { static: false }) sf!: SFComponent;
 
-  constructor(public service: VehicleService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute) {}
+  constructor(public service: VehicleService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute) { }
 
   /**
    * 查询参数
@@ -87,7 +87,7 @@ export class VehicleComponentsListComponent implements OnInit {
           title: '车牌颜色',
           ui: {
             widget: 'dict-select',
-            containsAllLable: true,
+            containsAllLabel: true,
             params: { dictKey: 'car:color' }
           }
         },
@@ -109,7 +109,7 @@ export class VehicleComponentsListComponent implements OnInit {
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'car:model' },
-            containsAllLable: true,
+            containsAllLabel: true,
             visibleIf: {
               expand: (value: boolean) => value
             }
@@ -121,7 +121,7 @@ export class VehicleComponentsListComponent implements OnInit {
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'car:length' },
-            containsAllLable: true,
+            containsAllLabel: true,
             visibleIf: {
               expand: (value: boolean) => value
             }
diff --git a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts
index c2be082a..aa2ba3f9 100644
--- a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts
+++ b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts
@@ -24,55 +24,57 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
   addSchema: SFSchema = {};
   _$expand = false;
   editText = '';
-  formData :any;
+  formData: any;
   isVisible = false;
   edit = false;
   editId = false;
   selectedIndex = 0;
 
   columns: STColumn[] = [
-    { title: '异常编号', index: 'exceptionCode',width: '180px',className: 'text-left', },
-    { title: '关联运单号', index: 'wayBillCode',width: '180px',className: 'text-left', },
-    { title: '网络货运人', index: 'enterpriseInfoName',width: '220px',className: 'text-left', },
-    { title: '货主', index: 'shipperAppUserName' ,width: '220px',className: 'text-left',},
-    { title: '装货地', index: 'loadingAddressArr' ,width: '220px',className: 'text-left',},
-    { title: '卸货地', index: 'unloadingAddressArr' ,width: '220px',className: 'text-left',},
-    { title: '承运司机', index: 'driver' ,width: '250px',className: 'text-left',},
-    { title: '异常信息', index: 'exceptionContent',width: '250px',className: 'text-left', },
-    { title: '异常图片', render: 'exceptionCertificateFirstFilePath' ,width: '200px',className: 'text-left',},
-    { title: '上报时间', index: 'createTime',width: '180px' ,className: 'text-left',},
+    { title: '异常编号', index: 'exceptionCode', width: '180px', className: 'text-left', },
+    { title: '关联运单号', index: 'wayBillCode', width: '180px', className: 'text-left', },
+    { title: '网络货运人', index: 'enterpriseInfoName', width: '220px', className: 'text-left', },
+    { title: '货主', index: 'shipperAppUserName', width: '220px', className: 'text-left', },
+    { title: '装货地', index: 'loadingAddressArr', width: '220px', className: 'text-left', },
+    { title: '卸货地', index: 'unloadingAddressArr', width: '220px', className: 'text-left', },
+    { title: '承运司机', index: 'driver', width: '250px', className: 'text-left', },
+    { title: '异常信息', index: 'exceptionContent', width: '250px', className: 'text-left', },
+    { title: '异常图片', render: 'exceptionCertificateFirstFilePath', width: '200px', className: 'text-left', },
+    { title: '上报时间', index: 'createTime', width: '180px', className: 'text-left', },
   ];
   columns2: STColumn[] = [
-    { title: '异常编号', index: 'exceptionCode',width: '180px',className: 'text-left' },
-    { title: '关联运单号', index: 'wayBillCode',width: '180px' ,className: 'text-left'},
-    { title: '网络货运人', index: 'enterpriseInfoName',width: '180px',className: 'text-left' },
-    { title: '货主', index: 'shipperAppUserName' ,width: '180px',className: 'text-left'},
-    { title: '装货地', index: 'loadingPlace' ,width: '180px',className: 'text-left'},
-    { title: '卸货地', index: 'dischargePlace' ,width: '180px',className: 'text-left'},
-    { title: '承运司机', index: 'driver' ,width: '90px',className: 'text-left'},
-    { title: '异常信息', index: 'exceptionContent',width: '250px' ,className: 'text-left'},
-    { title: '异常图片', render: 'exceptionCertificateFirstFilePath' ,width: '220px',className: 'text-left'},
-    { title: '上报时间', index: 'reportingTime',width: '180px' ,className: 'text-left'},
-    { title: '回复内容', index: 'replyContent',width: '180px' ,className: 'text-left'},
-    { title: '回复人', index: 'replyAppUserName',width: '180px' ,className: 'text-left'},
-    { title: '回复时间', index: 'replyTime',width: '180px' ,className: 'text-left'},
+    { title: '异常编号', index: 'exceptionCode', width: '180px', className: 'text-left' },
+    { title: '关联运单号', index: 'wayBillCode', width: '180px', className: 'text-left' },
+    { title: '网络货运人', index: 'enterpriseInfoName', width: '180px', className: 'text-left' },
+    { title: '货主', index: 'shipperAppUserName', width: '180px', className: 'text-left' },
+    { title: '装货地', index: 'loadingPlace', width: '180px', className: 'text-left' },
+    { title: '卸货地', index: 'dischargePlace', width: '180px', className: 'text-left' },
+    { title: '承运司机', index: 'driver', width: '90px', className: 'text-left' },
+    { title: '异常信息', index: 'exceptionContent', width: '250px', className: 'text-left' },
+    { title: '异常图片', render: 'exceptionCertificateFirstFilePath', width: '220px', className: 'text-left' },
+    { title: '上报时间', index: 'reportingTime', width: '180px', className: 'text-left' },
+    { title: '回复内容', index: 'replyContent', width: '180px', className: 'text-left' },
+    { title: '回复人', index: 'replyAppUserName', width: '180px', className: 'text-left' },
+    { title: '回复时间', index: 'replyTime', width: '180px', className: 'text-left' },
   ];
 
-  get reqParams (){ 
+  get reqParams() {
     return {
-    ...this.sf?.value,
-  }};
-  get reqParams2 (){ 
+      ...this.sf?.value,
+    }
+  };
+  get reqParams2() {
     return {
-    ...this.sf?.value,
-  }};
+      ...this.sf?.value,
+    }
+  };
 
   constructor(
     public service: WaybillManagementServe,
     private nzModalService: NzModalService,
     public shipperSrv: ShipperBaseService
 
-     ) {}
+  ) { }
 
   ngOnInit(): void {
     this.initSF()
@@ -82,131 +84,131 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
   * 伸缩查询条件
   */
   expandToggle(): void {
-      this._$expand = !this._$expand;
-      this.sf?.setValue('/_$expand', this._$expand);
+    this._$expand = !this._$expand;
+    this.sf?.setValue('/_$expand', this._$expand);
   }
-    /**
-   * 查询字段个数
-   */
+  /**
+ * 查询字段个数
+ */
   get queryFieldCount(): number {
-      return Object.keys(this.schema?.properties || {}).length;
+    return Object.keys(this.schema?.properties || {}).length;
   }
-  initSF(){
-  this.schema = {
-    properties: {
-      _$expand: { type: 'boolean', ui: { hidden: true } },
-      exceptionCode: {
-        type: 'string',
-        title: '异常编号',
-        ui: { placeholder: '请输入' }
-      },
-      wayBillCode: {
-        type: 'string',
-        title: '运单号',
-        ui: { placeholder: '请输入' }
-      },
-      exceptionType: {
-        title: '异常类型',
-        type: 'string',
-        ui: {
-          widget: 'dict-select',
-          containsAllLable: true,
-          params: { dictKey: 'exception:report:type' },
-        } as SFSelectWidgetSchema
-      },
-      shipperAppUserId: {
-        type: 'string',
-        title: '货主',
-        ui: {
-          widget: 'select',
-          serverSearch: true,
-          searchDebounceTime: 300,
-          searchLoadingText: '搜索中...',
-          allowClear: true,
-          onSearch: (q: any) => {
-            console.log(q)
-            if (!!q) {
-              return this.service
-                .request(this.service.$api_enterpriceList, { enterpriseName: q})
-                .pipe(map((res: any) => (res as any[]).map((i) => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum))))
-                .toPromise();
-            } else {
-              return of([]);
+  initSF() {
+    this.schema = {
+      properties: {
+        _$expand: { type: 'boolean', ui: { hidden: true } },
+        exceptionCode: {
+          type: 'string',
+          title: '异常编号',
+          ui: { placeholder: '请输入' }
+        },
+        wayBillCode: {
+          type: 'string',
+          title: '运单号',
+          ui: { placeholder: '请输入' }
+        },
+        exceptionType: {
+          title: '异常类型',
+          type: 'string',
+          ui: {
+            widget: 'dict-select',
+            containsAllLabel: true,
+            params: { dictKey: 'exception:report:type' },
+          } as SFSelectWidgetSchema
+        },
+        shipperAppUserId: {
+          type: 'string',
+          title: '货主',
+          ui: {
+            widget: 'select',
+            serverSearch: true,
+            searchDebounceTime: 300,
+            searchLoadingText: '搜索中...',
+            allowClear: true,
+            onSearch: (q: any) => {
+              console.log(q)
+              if (!!q) {
+                return this.service
+                  .request(this.service.$api_enterpriceList, { enterpriseName: q })
+                  .pipe(map((res: any) => (res as any[]).map((i) => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum))))
+                  .toPromise();
+              } else {
+                return of([]);
+              }
+            },
+            change: (q: any) => {
+              this.getRegionCode(q);
+            },
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+          } as SFSelectWidgetSchema,
+        },
+        enterpriseProjectId: {
+          type: 'string',
+          title: '所属项目',
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            },
+          } as SFSelectWidgetSchema
+        },
+        driverName: {
+          title: '承运司机',
+          type: 'string',
+          ui: {
+            visibleIf: {
+              _$expand: (value: boolean) => value
             }
-          },
-          change: (q: any) => {
-            this.getRegionCode(q);
-          },
-          visibleIf: {
-            _$expand: (value: boolean) => value,
-          },
-        } as SFSelectWidgetSchema,
-      },
-      enterpriseProjectId: {
-        type: 'string',
-        title: '所属项目',
-        ui: {
-          widget: 'select',
-          placeholder: '请选择',
-          visibleIf: {
-            _$expand: (value: boolean) => value
-          },
-        } as SFSelectWidgetSchema
-      },
-      driverName: {
-        title: '承运司机',
-        type: 'string',
-        ui: {
-          visibleIf: {
-            _$expand: (value: boolean) => value
           }
+        },
+        carNo: {
+          title: '车牌号',
+          type: 'string',
+          ui: {
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            }
+          }
+        },
+        reportingTime: {
+          title: '上报时间',
+          type: 'string',
+          ui: {
+            widget: 'date',
+            mode: 'range',
+            format: 'yyyy-MM-dd',
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            }
+          } as SFDateWidgetSchema
+        },
+        enterpriseInfoId: {
+          type: 'string',
+          title: '网络货运人',
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+            allowClear: true,
+            asyncData: () => this.shipperSrv.getNetworkFreightForwarder(),
+          },
         }
-      },
-      carNo: {
-        title: '车牌号',
-        type: 'string',
-        ui: {
-          visibleIf: {
-            _$expand: (value: boolean) => value
-          }
-        }
-      },
-      reportingTime: {
-        title: '上报时间',
-        type: 'string',
-        ui: {
-          widget: 'date',
-          mode: 'range',
-          format: 'yyyy-MM-dd',
-          visibleIf: {
-            _$expand: (value: boolean) => value
-          }
-        } as SFDateWidgetSchema
-      },
-      enterpriseInfoId: {
-        type: 'string',
-        title: '网络货运人',
-        ui: {
-          widget: 'select',
-          placeholder: '请选择',
-          visibleIf: {
-            _$expand: (value: boolean) => value,
-          },
-          allowClear: true,
-          asyncData: () => this.shipperSrv.getNetworkFreightForwarder(),
-      },
-    }
-  }
-  };
-  this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
+      }
+    };
+    this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
   }
 
   search() {
     console.log(this.selectedIndex)
-    if(this.selectedIndex === 0) {
-        this.st?.load(1)
+    if (this.selectedIndex === 0) {
+      this.st?.load(1)
     } else {
-        this.st2?.load(1)
+      this.st2?.load(1)
     }
   }
   /**
@@ -215,25 +217,25 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
   resetSF() {
     this.sf.reset();
   }
-       // 获取城市列表
-       getRegionCode(regionCode: any) {
-        console.log(regionCode);
-        return this.service
-          .request(this.service.$api_get_enterprise_project, { id: regionCode })
-          .pipe(
-            map(res =>
-              res.map((item: any) => ({
-                label: item.projectName,
-                value: item.id
-              }))
-            )
-          )
-          .subscribe(res => {
-            this.sf.getProperty('/enterpriseProjectId')!.schema.enum = res;
-            this.sf.getProperty('/enterpriseProjectId')!.widget.reset(res);
-            // if (this.enterpriseProjectIds) {
-            //   this.sf1.setValue('/enterpriseProjectId', this.enterpriseProjectIds);
-            // }
-          });
-      }
+  // 获取城市列表
+  getRegionCode(regionCode: any) {
+    console.log(regionCode);
+    return this.service
+      .request(this.service.$api_get_enterprise_project, { id: regionCode })
+      .pipe(
+        map(res =>
+          res.map((item: any) => ({
+            label: item.projectName,
+            value: item.id
+          }))
+        )
+      )
+      .subscribe(res => {
+        this.sf.getProperty('/enterpriseProjectId')!.schema.enum = res;
+        this.sf.getProperty('/enterpriseProjectId')!.widget.reset(res);
+        // if (this.enterpriseProjectIds) {
+        //   this.sf1.setValue('/enterpriseProjectId', this.enterpriseProjectIds);
+        // }
+      });
+  }
 }
diff --git a/src/app/routes/waybill-management/components/bulk/bulk.component.ts b/src/app/routes/waybill-management/components/bulk/bulk.component.ts
index 26890393..0c1b2017 100644
--- a/src/app/routes/waybill-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/waybill-management/components/bulk/bulk.component.ts
@@ -27,37 +27,37 @@ export class WaybillManagementBulkComponent implements OnInit {
   @ViewChild('sf', { static: false }) sf!: SFComponent;
   columns: STColumn[] = [];
   resourceStatus: any;
-tabs = {
-  signQuantity: 0,
-  cancelQuantity: 0,
-  receivedQuantity: 0,
-  totalQuantity: 0,
-  compolatelQuantity: 0,
-  deltQuantity: 0
-};
+  tabs = {
+    signQuantity: 0,
+    cancelQuantity: 0,
+    receivedQuantity: 0,
+    totalQuantity: 0,
+    compolatelQuantity: 0,
+    deltQuantity: 0
+  };
   constructor(
-    public service: WaybillManagementServe, 
-    private modal: NzModalService, 
+    public service: WaybillManagementServe,
+    private modal: NzModalService,
     public shipperservice: ShipperBaseService) { }
 
   /**
  * 查询参数
  */
   get reqParams() {
-    const a:any = {};
-    if(this.resourceStatus) {
-      a.wayBillStatus = this.resourceStatus 
+    const a: any = {};
+    if (this.resourceStatus) {
+      a.wayBillStatus = this.resourceStatus
     }
     const params: any = Object.assign({}, this.sf?.value || {});
     delete params._$expand;
-    return { 
+    return {
       ...a,
       ...params,
       createTime: {
         start: this.sf?.value?.createTime?.[0] || '',
         end: this.sf?.value?.createTime?.[1] || '',
       },
-     };
+    };
   }
   get selectedRows() {
     return this.st?.list.filter((item) => item.checked) || [];
@@ -98,14 +98,14 @@ tabs = {
               console.log(q)
               if (!!q) {
                 return this.service
-                  .request(this.service.$api_enterpriceList, { enterpriseName: q})
+                  .request(this.service.$api_enterpriceList, { enterpriseName: q })
                   .pipe(map((res: any) => (res as any[]).map((i) => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum))))
                   .toPromise();
               } else {
                 return of([]);
               }
             },
-            
+
           } as SFSelectWidgetSchema,
         },
         loadingPlace: {
@@ -152,14 +152,14 @@ tabs = {
               _$expand: (value: boolean) => value,
             },
           }
-        }, 
+        },
         paymentstatus: {
           title: '支付状态',
           type: 'string',
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'overall:payment:status' },
-            containsAllLable: true,
+            containsAllLabel: true,
             visibleIf: {
               _$expand: (value: boolean) => value,
             },
@@ -170,14 +170,14 @@ tabs = {
           type: 'string',
           ui: {
             widget: 'dict-select',
-            containsAllLable: true,
+            containsAllLabel: true,
             params: { dictKey: 'service:type' },
             visibleIf: {
               _$expand: (value: boolean) => value
             }
           } as SFSelectWidgetSchema
         },
-   
+
         riskStatus: {
           type: 'string',
           title: '是否风险单',
@@ -230,9 +230,9 @@ tabs = {
   /**
    * 初始化数据列表
    */
-   initST() {
+  initST() {
     this.columns = [
-      { title: '', type: 'checkbox',   fixed: 'left', width: '50px', className: 'text-center' },
+      { title: '', type: 'checkbox', fixed: 'left', width: '50px', className: 'text-center' },
       {
         title: '运单号',
         width: '180px',
@@ -257,7 +257,7 @@ tabs = {
         width: '220px',
         index: 'dischargePlace'
       },
-     {
+      {
         title: '货物信息',
         className: 'text-left',
         width: '250px',
@@ -315,13 +315,13 @@ tabs = {
           {
             text: '确认发车',
             click: (_record) => this.sureDepart(_record),
-            iif: item => item.wayBillStatus == '2' ,
+            iif: item => item.wayBillStatus == '2',
             acl: { ability: ['WAYBILL-BULK-insertBulkStartCarInfo'] },
           },
           {
             text: '确认到车',
             click: (_record) => this.sureArrive(_record),
-            iif: item => item.wayBillStatus == '3'  ,
+            iif: item => item.wayBillStatus == '3',
             acl: { ability: ['WAYBILL-BULK-insertBulkUnloadCarInfo'] },
           },
         ],
@@ -357,8 +357,8 @@ tabs = {
   }
   selectChange(e: number) {
     console.log(e);
-    if(e>=1) {
-    this.resourceStatus = e + 1;
+    if (e >= 1) {
+      this.resourceStatus = e + 1;
     }
     this.initST();
     setTimeout(() => {
@@ -374,15 +374,15 @@ tabs = {
   audit(item: any) {
     console.log(item)
   }
-    /**
-  * 审核通过按钮
-  */
+  /**
+* 审核通过按钮
+*/
   handleOK() {
-    
+
   }
-   /**
-  *查看评价
-  */
+  /**
+ *查看评价
+ */
   viewEvaluate(item: any) {
     console.log(item)
     this.isVisibleEvaluate = true
@@ -402,62 +402,62 @@ tabs = {
       if (res) {
         let totalCount = 0;
         res.forEach((ele: any) => {
-          switch(ele.wayBillStatus) {
+          switch (ele.wayBillStatus) {
             case '2':
               this.tabs.receivedQuantity = ele?.count;
               break;
             case '3':
               this.tabs.cancelQuantity = ele?.count;
-            break;
+              break;
             case '4':
               this.tabs.signQuantity = ele?.count;
-            break;
+              break;
             case '5':
               this.tabs.compolatelQuantity = ele?.count;
-            break;
+              break;
             case '6':
               this.tabs.deltQuantity = ele?.count;
-            break;
+              break;
           }
           totalCount += ele.count
-       });
-       this.tabs.totalQuantity = totalCount
+        });
+        this.tabs.totalQuantity = totalCount
       }
     })
   }
-    //  *确认发车
-   
-    sureDepart(item: any) {
-      const modalRef = this.modal.create({
-        nzTitle: '确认发车',
-        nzWidth: '50%',
-        nzContent: VehicleSureDepartComponent,
-        nzComponentParams: {
-          i: item,
-         Status: 2
-        },
-        nzFooter: null
-      });
-      modalRef.afterClose.subscribe((result: any) => {
-        this.st.load(1);
-        this.getGoodsSourceStatistical()
+  //  *确认发车
+
+  sureDepart(item: any) {
+    const modalRef = this.modal.create({
+      nzTitle: '确认发车',
+      nzWidth: '50%',
+      nzContent: VehicleSureDepartComponent,
+      nzComponentParams: {
+        i: item,
+        Status: 2
+      },
+      nzFooter: null
     });
-    }
-    // 确认到车
-    sureArrive(item: any) {
-      const modalRef = this.modal.create({
-        nzTitle: '确认到车',
-        nzWidth: '50%',
-        nzContent: VehicleSureArriveComponent,
-        nzComponentParams: {
-          i: item,
-         Status: 2
-        },
-        nzFooter: null
-      });
-      modalRef.afterClose.subscribe((result: any) => {
-        this.st.load(1);
-        this.getGoodsSourceStatistical()
+    modalRef.afterClose.subscribe((result: any) => {
+      this.st.load(1);
+      this.getGoodsSourceStatistical()
     });
-    }
+  }
+  // 确认到车
+  sureArrive(item: any) {
+    const modalRef = this.modal.create({
+      nzTitle: '确认到车',
+      nzWidth: '50%',
+      nzContent: VehicleSureArriveComponent,
+      nzComponentParams: {
+        i: item,
+        Status: 2
+      },
+      nzFooter: null
+    });
+    modalRef.afterClose.subscribe((result: any) => {
+      this.st.load(1);
+      this.getGoodsSourceStatistical()
+    });
+  }
 }
diff --git a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
index fa427fd6..b70676e2 100644
--- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
@@ -37,27 +37,27 @@ export class WaybillManagementVehicleComponent implements OnInit {
   };
   constructor(
     public service: WaybillManagementServe,
-     private modal: NzModalService,
-      public shipperservice: ShipperBaseService) {}
+    private modal: NzModalService,
+    public shipperservice: ShipperBaseService) { }
 
   /**
    * 查询参数
    */
   get reqParams() {
-    const a:any = {};
+    const a: any = {};
     if (this.resourceStatus) {
       a.wayBillStatus = this.resourceStatus;
     }
     const params: any = Object.assign({}, this.sf?.value || {});
     delete params._$expand;
-    return { 
+    return {
       ...a,
       ...params,
       createTime: {
         start: this.sf?.value?.createTime?.[0] || '',
         end: this.sf?.value?.createTime?.[1] || '',
       },
-     };
+    };
   }
   get selectedRows() {
     return this.st?.list.filter(item => item.checked) || [];
@@ -96,7 +96,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
               console.log(q)
               if (!!q) {
                 return this.service
-                  .request(this.service.$api_enterpriceList, { enterpriseName: q})
+                  .request(this.service.$api_enterpriceList, { enterpriseName: q })
                   .pipe(map((res: any) => (res as any[]).map((i) => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum))))
                   .toPromise();
               } else {
@@ -137,7 +137,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
             }
           }
         },
-        
+
         driverName: {
           title: '承运司机',
           type: 'string',
@@ -164,14 +164,14 @@ export class WaybillManagementVehicleComponent implements OnInit {
               _$expand: (value: boolean) => value,
             },
           }
-        }, 
+        },
         paymentstatus: {
           title: '支付状态',
           type: 'string',
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'overall:payment:status' },
-            containsAllLable: true,
+            containsAllLabel: true,
             visibleIf: {
               _$expand: (value: boolean) => value
             }
@@ -182,14 +182,14 @@ export class WaybillManagementVehicleComponent implements OnInit {
           type: 'string',
           ui: {
             widget: 'dict-select',
-            containsAllLable: true,
+            containsAllLabel: true,
             params: { dictKey: 'service:type' },
             visibleIf: {
               _$expand: (value: boolean) => value
             }
           } as SFSelectWidgetSchema
         },
-     
+
         riskStatus: {
           type: 'string',
           title: '是否风险单',
@@ -238,34 +238,34 @@ export class WaybillManagementVehicleComponent implements OnInit {
     };
     this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
   }
-   // 获取城市列表
- getRegionCode(regionCode: any) {
-  console.log(regionCode);
-  return this.service
-    .request(this.service.$api_get_enterprise_project, { id: regionCode })
-    .pipe(
-      map(res =>
-        res.map((item: any) => ({
-          label: item.projectName,
-          value: item.id
-        }))
+  // 获取城市列表
+  getRegionCode(regionCode: any) {
+    console.log(regionCode);
+    return this.service
+      .request(this.service.$api_get_enterprise_project, { id: regionCode })
+      .pipe(
+        map(res =>
+          res.map((item: any) => ({
+            label: item.projectName,
+            value: item.id
+          }))
+        )
       )
-    )
-    .subscribe(res => {
-      this.sf.getProperty('/enterpriseProjectId')!.schema.enum = res;
-      this.sf.getProperty('/enterpriseProjectId')!.widget.reset(res);
-      // if (this.enterpriseProjectIds) {
-      //   this.sf1.setValue('/enterpriseProjectId', this.enterpriseProjectIds);
-      // }
-    });
-}
+      .subscribe(res => {
+        this.sf.getProperty('/enterpriseProjectId')!.schema.enum = res;
+        this.sf.getProperty('/enterpriseProjectId')!.widget.reset(res);
+        // if (this.enterpriseProjectIds) {
+        //   this.sf1.setValue('/enterpriseProjectId', this.enterpriseProjectIds);
+        // }
+      });
+  }
 
   /**
    * 初始化数据列表
    */
   initST() {
     this.columns = [
-      { title: '', type: 'checkbox',   fixed: 'left', width: '50px', className: 'text-center' },
+      { title: '', type: 'checkbox', fixed: 'left', width: '50px', className: 'text-center' },
       {
         title: '运单号',
         width: '180px',
@@ -391,7 +391,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
   /**
    * 导入货源
    */
-  importGoodsSource() {}
+  importGoodsSource() { }
   /**
    *查看评价
    */
@@ -428,16 +428,16 @@ export class WaybillManagementVehicleComponent implements OnInit {
             case '4':
               this.tabs.signQuantity = ele?.count;
               break;
-              case '5':
-                this.tabs.compolatelQuantity = ele?.count;
+            case '5':
+              this.tabs.compolatelQuantity = ele?.count;
               break;
-              case '6':
-                this.tabs.deltQuantity = ele?.count;
+            case '6':
+              this.tabs.deltQuantity = ele?.count;
               break;
           }
           totalCount += ele.count
         });
-       this.tabs.totalQuantity = totalCount
+        this.tabs.totalQuantity = totalCount
       }
     });
   }
@@ -457,7 +457,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
     modalRef.afterClose.subscribe((result: any) => {
       this.st.load(1);
       this.getGoodsSourceStatistical()
-  });
+    });
   }
   // 确认到车
   sureArrive(item: any) {
@@ -474,6 +474,6 @@ export class WaybillManagementVehicleComponent implements OnInit {
     modalRef.afterClose.subscribe((result: any) => {
       this.st.load(1);
       this.getGoodsSourceStatistical()
-  });
+    });
   }
 }
diff --git a/src/app/shared/components/dict-select/dict-select.component.ts b/src/app/shared/components/dict-select/dict-select.component.ts
index a1936ea9..661bce83 100644
--- a/src/app/shared/components/dict-select/dict-select.component.ts
+++ b/src/app/shared/components/dict-select/dict-select.component.ts
@@ -27,7 +27,7 @@ export class DictSelectComponent implements OnInit, ControlValueAccessor {
   @Input() params = {};// 请求参数
 
   dictList: any[] = [];
-  @Input() containsAllLable = true; // 是否包含全部这一选项
+  @Input() containsAllLabel = true; // 是否包含全部这一选项
   @Input() mode: 'multiple' | 'tags' | 'default' = 'default';
 
 
@@ -55,7 +55,7 @@ export class DictSelectComponent implements OnInit, ControlValueAccessor {
     this.service.getDictList(this.url || this.defaultUrl, this.params).subscribe(res => {
       if (res) {
         this.dictList = res || [];
-        if (this.dictList.length > 0 && this.containsAllLable) {
+        if (this.dictList.length > 0 && this.containsAllLabel) {
           const obj = { label: '全部', value: '' };
           this.dictList.unshift(obj);
         }
diff --git a/src/app/shared/widget/dict-select/dict-select.widget.html b/src/app/shared/widget/dict-select/dict-select.widget.html
index b54a3e88..c014b4fc 100644
--- a/src/app/shared/widget/dict-select/dict-select.widget.html
+++ b/src/app/shared/widget/dict-select/dict-select.widget.html
@@ -8,7 +8,7 @@
 -->
 <sf-item-wrap [id]="id" [schema]="schema" [ui]="ui" [showError]="showError" [error]="error" [showTitle]="schema.title">
   <app-dict-select [url]="ui?.url" [ngModel]="value" [params]="ui?.params" (ngModelChange)="change($event)"
-    [containsAllLable]="ui?.containsAllLable" [mode]="ui?.mode" name="sf.dict.select">
+    [containsAllLabel]="ui?.containsAllLabel" [mode]="ui?.mode" name="sf.dict.select">
   </app-dict-select>
 </sf-item-wrap>
 <!-- <sf-item-wrap [id]="id" [schema]="schema" [ui]="ui" [showError]="showError" [error]="error" [showTitle]="schema.title">

From 0230886f3ac40bba5b55b00f80d532852f01b969 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= <xiaoyun.pan@eascs.com>
Date: Wed, 9 Mar 2022 20:06:29 +0800
Subject: [PATCH 14/70] =?UTF-8?q?=E5=BE=85=E5=85=A5=E8=B4=A6=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../account-detail.component.html             |  54 +++++++
 .../account-detail.component.less             |  21 +++
 .../account-detail.component.spec.ts          |  24 +++
 .../account-detail.component.ts               | 153 ++++++++++++++++++
 .../components/list/list.component.html       |   4 +-
 .../recorded-detail.component.html            |  59 +++++++
 .../recorded-detail.component.spec.ts         |  24 +++
 .../recorded-detail.component.ts              | 146 +++++++++++++++++
 .../virtual-account-detail.component.ts       |   2 +-
 .../routes/partner/partner-routing.module.ts  |   4 +
 src/app/routes/partner/partner.module.ts      |   6 +-
 src/assets/mocks/menu-data.json               |  12 +-
 12 files changed, 502 insertions(+), 7 deletions(-)
 create mode 100644 src/app/routes/partner/account-management/components/account-detail/account-detail.component.html
 create mode 100644 src/app/routes/partner/account-management/components/account-detail/account-detail.component.less
 create mode 100644 src/app/routes/partner/account-management/components/account-detail/account-detail.component.spec.ts
 create mode 100644 src/app/routes/partner/account-management/components/account-detail/account-detail.component.ts
 create mode 100644 src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.html
 create mode 100644 src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.spec.ts
 create mode 100644 src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts

diff --git a/src/app/routes/partner/account-management/components/account-detail/account-detail.component.html b/src/app/routes/partner/account-management/components/account-detail/account-detail.component.html
new file mode 100644
index 00000000..e37a9ce3
--- /dev/null
+++ b/src/app/routes/partner/account-management/components/account-detail/account-detail.component.html
@@ -0,0 +1,54 @@
+<nz-card>
+  <sv-container layout="vertical" [noColon]="true" col="4">
+    <sv [label]="labelTpl">
+      <b class="text-md ">{{accountInfo?.company}}</b>
+    </sv>
+    <sv label="可用余额">
+      {{totalInfo?.balance |currency}}
+    </sv>
+    <sv label="收入金额">
+      {{totalInfo?.income |currency}}
+    </sv>
+    <sv label="支出金额">
+      {{totalInfo?.spending |currency}}
+    </sv>
+  </sv-container>
+  <ng-template #labelTpl>
+    <b class="text-md" style="color: black;">{{accountInfo?.name}} {{accountInfo?.phone}}</b>
+  </ng-template>
+</nz-card>
+<nz-card>
+  <div nz-row>
+    <div nz-col [nzSpan]="_$expand ? 24 : 18">
+      <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
+    </div>
+    <div nz-col [nzSpan]="_$expand ? 24 : 6" class="text-right">
+      <button nz-button nzType="primary" [disabled]="!sf.valid" (click)="st?.load(1)">查询</button>
+      <button nz-button (click)="resetSF()">重置</button>
+      <button nz-button (click)="export()" nzType="primary" nzGhost>导出</button>
+      <button nz-button nzType="link" (click)="expandToggle()">
+        {{ !_$expand ? '展开' : '收起' }}
+        <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
+      </button>
+    </div>
+  </div>
+  <div class="table-content">
+    <st #st [data]="service.$api_get_account_management_page " [columns]="columns"
+      [req]="{ method: 'POST', allInBody: true, reName: {pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+      [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+      [page]="{ show: true, showSize: true, pageSizes:  [5,10, 20, 50, 100, 200, 500] }"
+      [loading]="service.http.loading" [scroll]="{x:'1200px'}">
+      <ng-template st-row="amount" let-item>
+        <div *ngIf="item.incomeType === '1'"> - {{item.amount | currency }}</div>
+        <div *ngIf="item.incomeType === '2'"> + {{item.amount | currency }}</div>
+      </ng-template>
+    </st>
+    <div class="total-footer text-md" *ngIf="st?.list?.length !== 0 ">
+      合计 <label class="text-red-dark">{{ totalInfo?.total }}</label> 项，收入 <label
+        class="text-red-dark font-weight-bold">{{
+        totalInfo?.income | currency
+        }}</label>，支出 <label class="text-red-dark font-weight-bold">{{
+        totalInfo?.spending | currency }}</label>
+    </div>
+  </div>
+</nz-card>
diff --git a/src/app/routes/partner/account-management/components/account-detail/account-detail.component.less b/src/app/routes/partner/account-management/components/account-detail/account-detail.component.less
new file mode 100644
index 00000000..a485bd4c
--- /dev/null
+++ b/src/app/routes/partner/account-management/components/account-detail/account-detail.component.less
@@ -0,0 +1,21 @@
+:host {
+  ::ng-deep {
+    .search-header {
+      nz-range-picker {
+        width: 100%;
+      }
+    }
+  }
+
+  .table-content {
+    position: relative;
+
+    .total-footer {
+      position: absolute;
+      bottom: 0;
+      height: 32px;
+      margin: 16px 0;
+      line-height: 32px;
+    }
+  }
+}
diff --git a/src/app/routes/partner/account-management/components/account-detail/account-detail.component.spec.ts b/src/app/routes/partner/account-management/components/account-detail/account-detail.component.spec.ts
new file mode 100644
index 00000000..1233feec
--- /dev/null
+++ b/src/app/routes/partner/account-management/components/account-detail/account-detail.component.spec.ts
@@ -0,0 +1,24 @@
+import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import { PartnerAccountManagementAccountDetailComponent } from './account-detail.component';
+
+describe('PartnerAccountManagementAccountDetailComponent', () => {
+  let component: PartnerAccountManagementAccountDetailComponent;
+  let fixture: ComponentFixture<PartnerAccountManagementAccountDetailComponent>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [PartnerAccountManagementAccountDetailComponent]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(PartnerAccountManagementAccountDetailComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/routes/partner/account-management/components/account-detail/account-detail.component.ts b/src/app/routes/partner/account-management/components/account-detail/account-detail.component.ts
new file mode 100644
index 00000000..589fc368
--- /dev/null
+++ b/src/app/routes/partner/account-management/components/account-detail/account-detail.component.ts
@@ -0,0 +1,153 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { STColumn, STComponent } from '@delon/abc/st';
+import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
+import { ModalHelper, _HttpClient } from '@delon/theme';
+import { AccountManagemantService } from '../../services/account-managemant.service';
+
+@Component({
+  selector: 'app-partner-account-detail',
+  templateUrl: './account-detail.component.html',
+  styleUrls: ['./account-detail.component.less']
+})
+export class PartnerAccountManagementAccountDetailComponent implements OnInit {
+  totalInfo: any = {
+    balance: 0,
+    income: 1500,
+    spending: 2400,
+    total: 186
+  };
+  accountInfo = {
+    name: '张三',
+    phone: '13812345678',
+    company: '天津怡亚通物流科技有限公司（平安）'
+  }
+
+  url = `/user`;
+  schema: SFSchema = {};
+  ui!: SFUISchema;
+  _$expand = false;
+  @ViewChild('st') private readonly st!: STComponent;
+  @ViewChild('sf') private readonly sf!: SFComponent;
+
+
+  columns: STColumn[] = [];
+
+  constructor(public service: AccountManagemantService) { }
+
+
+  get reqParams() {
+    return { ...this.sf?.value };
+  }
+  ngOnInit(): void {
+    this.initSF();
+    this.initST();
+  }
+
+  initSF() {
+    this.schema = {
+      properties: {
+        _$expand: {
+          type: 'boolean', ui: { hidden: true }
+        },
+        createTime: {
+          type: 'string',
+          title: '交易时间',
+          ui: {
+            widget: 'sl-from-to',
+            type: 'date',
+            autoComplete: 'off',
+            format: 'yyyy-MM-dd',
+          } as SFDateWidgetSchema,
+        },
+        abnormalCause: {
+          title: '流水号',
+          type: 'string',
+          ui: {
+            placeholder: '请输入',
+          },
+        },
+        abnormalCause1: {
+          title: '交易单号',
+          type: 'string',
+          ui: {
+            placeholder: '请输入',
+          },
+        },
+        bankType: {
+          type: 'string',
+          title: '交易类型',
+          default: '',
+          ui: {
+            widget: 'dict-select',
+            params: {
+              dictKey: 'trade:type'
+            },
+            placeholder: '请选择',
+            allowClear: true,
+            containsAllLabel: true,
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+          },
+        },
+        bankType1: {
+          type: 'string',
+          title: '收支类型',
+          default: '',
+          ui: {
+            widget: 'dict-select',
+            params: {
+              dictKey: 'income:type'
+            },
+            placeholder: '请选择',
+            allowClear: true,
+            containsAllLabel: true,
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+          },
+        },
+
+      }
+    }
+    this.ui = { '*': { spanLabelFixed: 100, grid: { span: 8, gutter: 4 } }, };
+  }
+
+  /**
+* 初始化数据列表
+*/
+  initST() {
+    this.columns = [
+      { title: '交易时间', index: 'carNo', className: 'text-center', width: 200 },
+      { title: '流水号', render: 'carModelLabel', className: 'text-center', width: 150 },
+      { title: '交易类型', render: 'carModelLabel', className: 'text-center', width: 200 },
+      { title: '交易单号', render: 'carModelLabel', className: 'text-center', width: 120 },
+      { title: '备注', index: 'remark', className: 'text-center', width: 180 },
+      { title: '收支类型', render: 'approvalStatus1', className: 'text-center', width: 180 },
+      { title: '交易金额', render: 'amount', className: 'text-right', width: 180 },
+      { title: '账户余额', render: 'approvalStatus3', className: 'text-right', width: 180 },
+      { title: '付款方', index: 'approvalStatus4', className: 'text-center', width: 200 },
+      { title: '收款方', index: 'approvalStatus4', className: 'text-center', width: 120 },
+    ];
+  }
+  resetSF() {
+    this._$expand = false;
+    this.sf.reset();
+    setTimeout(() => {
+      this.st.reset();
+    })
+  }
+
+  /**
+* 伸缩查询条件
+*/
+  expandToggle() {
+    this._$expand = !this._$expand;
+    this.sf?.setValue('/_$expand', this._$expand);
+  }
+
+  search() {
+    this.st.load(1);
+  }
+  export() { }
+}
diff --git a/src/app/routes/partner/account-management/components/list/list.component.html b/src/app/routes/partner/account-management/components/list/list.component.html
index a32db2ca..9992f0ab 100644
--- a/src/app/routes/partner/account-management/components/list/list.component.html
+++ b/src/app/routes/partner/account-management/components/list/list.component.html
@@ -20,14 +20,14 @@
     [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
     [loading]="service.http.loading">
     <ng-template st-row="approvalStatus" let-item>
-      <a [routerLink]="'/partner/business-statistics/partner/custom-detail/'+item?.id">{{item.yskmoney}}</a>
+      <a [routerLink]="'/partner/account-management/recorded-detail/'+item?.id">{{item.yskmoney}}</a>
     </ng-template>
     <ng-template st-row="approvalStatus1" let-item>
       <div class="text-right">{{item.approvalStatus1 | currency:' '}}</div>
     </ng-template>
     <ng-template st-row="approvalStatus2" let-item>
       <a class="text-right text-blue-dark"
-        [routerLink]="'/partner/business-statistics/partner/order-detail/'+item?.id">{{item.yskmoney | currency:'
+        [routerLink]="'/partner/account-management/recorded-detail/'+item?.id">{{item.yskmoney | currency:'
         '}}</a>
     </ng-template>
 
diff --git a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.html b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.html
new file mode 100644
index 00000000..dd218401
--- /dev/null
+++ b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.html
@@ -0,0 +1,59 @@
+<nz-card>
+  <sv-container layout="vertical" [noColon]="true" col="4">
+    <sv [label]="labelTpl">
+      <b class="text-md ">{{accountInfo?.company}}</b>
+    </sv>
+    <sv label="可用余额">
+      {{totalInfo?.balance |currency}}
+    </sv>
+    <sv label="收入金额">
+      {{totalInfo?.income |currency}}
+    </sv>
+    <sv label="支出金额">
+      {{totalInfo?.spending |currency}}
+    </sv>
+  </sv-container>
+  <ng-template #labelTpl>
+    <b class="text-md" style="color: black;">{{accountInfo?.name}} {{accountInfo?.phone}}</b>
+  </ng-template>
+</nz-card>
+<nz-card>
+  <div>
+    <sf mode="search" #sf [schema]="schema" [ui]="ui" (formSubmit)="search()" (formReset)="resetSF()"></sf>
+  </div>
+  <div class="table-content">
+    <st #st [data]="service.$api_get_account_management_page " [columns]="columns"
+      [req]="{ method: 'POST', allInBody: true, reName: {pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+      [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+      [page]="{ show: true, showSize: true, pageSizes:  [5,10, 20, 50, 100, 200, 500] }"
+      [loading]="service.http.loading" [scroll]="{x:'1200px'}">
+      <ng-template st-row="amount" let-item>
+        <div *ngIf="item.incomeType === '1'"> - {{item.amount | currency }}</div>
+        <div *ngIf="item.incomeType === '2'"> + {{item.amount | currency }}</div>
+      </ng-template>
+    </st>
+    <div class="total-footer text-md" *ngIf="st?.list?.length !== 0 ">
+      合计 <label class="text-red-dark">{{ totalInfo?.total }}</label> 项，收入 <label
+        class="text-red-dark font-weight-bold">{{
+        totalInfo?.income | currency
+        }}</label>，支出 <label class="text-red-dark font-weight-bold">{{
+        totalInfo?.spending | currency }}</label>
+    </div>
+  </div>
+</nz-card>
+
+<nz-modal [(nzVisible)]="showBillDetail" nzTitle="账户明细" [nzFooter]="null" (nzOnCancel)="handleCancel()" nzWidth="700px">
+  <div *nzModalContent>
+    <div class="mb-sm">
+      <span class="mr-xxl text-md font-weight-bold"><label>网络货运人：</label>{{accountInfo?.name}}</span>
+      <span class="text-md font-weight-bold"><label>返佣总额（元）：</label>{{totalInfo?.spending |currency: ' '}}</span>
+    </div>
+    <st #st [data]="service.$api_get_account_management_page " [columns]="billDetailColumns"
+      [res]="{ reName: { list: 'data' } }" [req]="{ method: 'POST', allInBody: true, params:{}}" [page]="{show:false}">
+      <ng-template st-row="amount" let-item>
+        <div *ngIf="item.paAccount">{{item?.amount |currency :' '}}</div>
+      </ng-template>
+
+    </st>
+  </div>
+</nz-modal>
diff --git a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.spec.ts b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.spec.ts
new file mode 100644
index 00000000..95af39f8
--- /dev/null
+++ b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.spec.ts
@@ -0,0 +1,24 @@
+import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import { PartnerAccountManagementRecordedDetailComponent } from './recorded-detail.component';
+
+describe('PartnerAccountManagementRecordedDetailComponent', () => {
+  let component: PartnerAccountManagementRecordedDetailComponent;
+  let fixture: ComponentFixture<PartnerAccountManagementRecordedDetailComponent>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [PartnerAccountManagementRecordedDetailComponent]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(PartnerAccountManagementRecordedDetailComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts
new file mode 100644
index 00000000..49dfd681
--- /dev/null
+++ b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts
@@ -0,0 +1,146 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { Router } from '@angular/router';
+import { STColumn, STComponent } from '@delon/abc/st';
+import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
+import { ModalHelper, _HttpClient } from '@delon/theme';
+import { AccountManagemantService } from '../../services/account-managemant.service';
+
+@Component({
+  selector: 'app-partner-recorded-detail',
+  templateUrl: './recorded-detail.component.html',
+})
+export class PartnerAccountManagementRecordedDetailComponent implements OnInit {
+  totalInfo: any = {
+    balance: 0,
+    income: 1500,
+    spending: 2400,
+    total: 186
+  };
+  accountInfo = {
+    name: '张三',
+    phone: '13812345678',
+    company: '天津怡亚通物流科技有限公司（平安）'
+  }
+
+  url = `/user`;
+  schema: SFSchema = {};
+  ui!: SFUISchema;
+  @ViewChild('st') private readonly st!: STComponent;
+  @ViewChild('sf') private readonly sf!: SFComponent;
+
+
+  columns: STColumn[] = [];
+  billDetailColumns: STColumn[] = [];
+  showBillDetail = false;
+
+  constructor(public service: AccountManagemantService, public router: Router) { }
+
+
+  get reqParams() {
+    return { ...this.sf?.value };
+  }
+
+  get billDetailReqParams() {
+    return {};
+  }
+  ngOnInit(): void {
+    this.initSF();
+    this.initST();
+    this.initBillDetailST();
+  }
+
+  initSF() {
+    this.schema = {
+      properties: {
+
+        abnormalCause: {
+          title: '网络货运人',
+          type: 'string',
+          ui: {
+            placeholder: '请输入',
+          },
+        },
+
+      }
+    }
+    this.ui = { '*': { spanLabelFixed: 120, grid: { span: 8, gutter: 4 } }, };
+  }
+
+  /**
+* 初始化数据列表
+*/
+  initST() {
+    this.columns = [
+      { title: '网络货运人', index: 'carNo', className: 'text-center', width: 200 },
+      { title: '银行类型', render: 'carModelLabel', className: 'text-center', width: 150 },
+      { title: '虚拟账户', render: 'carModelLabel', className: 'text-center', width: 200 },
+      { title: '返佣总额（元）', render: 'carModelLabel', className: 'text-center', width: 120 },
+      { title: '已入账金额（元）', index: 'remark', className: 'text-center', width: 180 },
+      { title: '代缴个税（元）', render: 'approvalStatus1', className: 'text-center', width: 180 },
+      { title: '待入账金额（元）', render: 'amount', className: 'text-right', width: 180 },
+      {
+        title: '操作', className: 'text-center', width: 300,
+        buttons: [
+          {
+            text: '查看入账记录',
+            click: (_record) => this.viewBookedRecord(_record)
+          },
+          {
+            text: '查看账单明细',
+            click: (_record) => this.viewAccountDetail(_record)
+          },
+        ]
+      },
+    ];
+  }
+
+  initBillDetailST() {
+    this.billDetailColumns = [
+      { title: '账单月份', index: 'carNo', className: 'text-center', width: '40%' },
+      { title: '返佣金额（元）', render: 'amount', className: 'text-center', width: '40%' },
+      {
+        title: '操作', className: 'text-center', width: '20%', buttons: [
+          {
+            text: '订单明细',
+            click: (_record) => this.router.navigate(['/'])
+          }
+        ]
+      },
+    ]
+  }
+
+
+  resetSF() {
+    this.sf.reset();
+    setTimeout(() => {
+      this.st.reset();
+    })
+  }
+
+
+
+  search() {
+    this.st.load(1);
+  }
+  export() { }
+
+  /**
+ * 查看入账记录
+ * @param record 当前行
+ */
+  viewBookedRecord(record: any) {
+
+  }
+
+  /**
+   * 查看账单明细
+   * @param record 当前行
+   */
+  viewAccountDetail(record: any) {
+    this.showBillDetail = true;
+  }
+  handleCancel() {
+    this.showBillDetail = false;
+  }
+
+}
diff --git a/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.ts b/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.ts
index efd4933f..9a583480 100644
--- a/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.ts
+++ b/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.ts
@@ -164,7 +164,7 @@ export class PartnerAccountManagementVirtualAccountDetailComponent implements On
    * @param _record 当前行信息
    */
   viewDetail(_record: any) {
-
+    window.open(location.origin + '/#/partner/account-management/account-detail');
   }
 
   close() {
diff --git a/src/app/routes/partner/partner-routing.module.ts b/src/app/routes/partner/partner-routing.module.ts
index 3c836b4a..f70fd812 100644
--- a/src/app/routes/partner/partner-routing.module.ts
+++ b/src/app/routes/partner/partner-routing.module.ts
@@ -23,6 +23,8 @@ import { PartnerPartnerCustomOrderDetailComponent } from './business-statistics/
 import { PartnerPartnerOrderDetailComponent } from './business-statistics/components/partner-order-detail/partner-order-detail.component';
 import { PartnerAccountManagementListComponent } from './account-management/components/list/list.component';
 import { ParterRebateManageMentRecordComponent } from './rebate-management/components/rebate-record/rebate-record.component';
+import { PartnerAccountManagementAccountDetailComponent } from './account-management/components/account-detail/account-detail.component';
+import { PartnerAccountManagementRecordedDetailComponent } from './account-management/components/recorded-detail/recorded-detail.component';
 
 const routes: Routes = [
   {
@@ -64,6 +66,8 @@ const routes: Routes = [
     path: 'account-management',
     children: [
       { path: 'list', component: PartnerAccountManagementListComponent },
+      { path: 'account-detail', component: PartnerAccountManagementAccountDetailComponent },
+      { path: 'recorded-detail/:id', component: PartnerAccountManagementRecordedDetailComponent }
     ]
   },
 ];
diff --git a/src/app/routes/partner/partner.module.ts b/src/app/routes/partner/partner.module.ts
index a2e956c4..7e3d1570 100644
--- a/src/app/routes/partner/partner.module.ts
+++ b/src/app/routes/partner/partner.module.ts
@@ -28,6 +28,8 @@ import { PartnerPartnerOrderDetailComponent } from './business-statistics/compon
 import { PartnerAccountManagementListComponent } from './account-management/components/list/list.component';
 import { PartnerAccountManagementVirtualAccountDetailComponent } from './account-management/components/virtual-account-detail/virtual-account-detail.component';
 import { ParterRebateManageMentRecordComponent } from './rebate-management/components/rebate-record/rebate-record.component';
+import { PartnerAccountManagementAccountDetailComponent } from './account-management/components/account-detail/account-detail.component';
+import { PartnerAccountManagementRecordedDetailComponent } from './account-management/components/recorded-detail/recorded-detail.component';
 
 const COMPONENTS: any[] = [
   PartnerBusinessStatisticsIndexComponent,
@@ -46,7 +48,9 @@ const COMPONENTS: any[] = [
   PartnerPartnerCustomOrderDetailComponent,
   PartnerPartnerOrderDetailComponent,
   PartnerAccountManagementListComponent,
-  PartnerAccountManagementVirtualAccountDetailComponent];
+  PartnerAccountManagementVirtualAccountDetailComponent,
+  PartnerAccountManagementAccountDetailComponent,
+  PartnerAccountManagementRecordedDetailComponent];
 
 @NgModule({
   declarations: [...COMPONENTS],
diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json
index ef1ba117..3307c095 100644
--- a/src/assets/mocks/menu-data.json
+++ b/src/assets/mocks/menu-data.json
@@ -541,9 +541,15 @@
               "text": "账户管理",
               "group": true,
               "children": [{
-                "text": "账户管理",
-                "link": "/partner/account-management/list"
-              }]
+                  "text": "账户管理",
+                  "link": "/partner/account-management/list"
+                },
+                {
+                  "text": "账户明细",
+                  "link": "/partner/account-management/account-detail",
+                  "hide": true
+                }
+              ]
             }
           ]
         }

From da3b427a7792657502c128740db1b4dc63402387 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= <xiaoyun.pan@eascs.com>
Date: Thu, 10 Mar 2022 10:16:00 +0800
Subject: [PATCH 15/70] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8F=90=E7=8E=B0?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../account-detail.component.ts               |   2 +-
 .../components/list/list.component.ts         |   2 +-
 .../recorded-detail.component.ts              |   2 +-
 .../virtual-account-detail.component.ts       |   2 +-
 .../withdrawals-detail.component.html         |  63 ++++
 .../withdrawals-detail.component.less         |  17 +
 .../withdrawals-detail.component.ts           |  73 +++++
 .../withdrawals-record.component.html         |  85 +++++
 .../withdrawals-record.component.ts           | 294 ++++++++++++++++++
 .../routes/partner/partner-routing.module.ts  |   6 +-
 src/app/routes/partner/partner.module.ts      |   7 +-
 src/assets/mocks/menu-data.json               |  10 +
 12 files changed, 557 insertions(+), 6 deletions(-)
 create mode 100644 src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html
 create mode 100644 src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.less
 create mode 100644 src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts
 create mode 100644 src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.html
 create mode 100644 src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts

diff --git a/src/app/routes/partner/account-management/components/account-detail/account-detail.component.ts b/src/app/routes/partner/account-management/components/account-detail/account-detail.component.ts
index 589fc368..9dd83dc6 100644
--- a/src/app/routes/partner/account-management/components/account-detail/account-detail.component.ts
+++ b/src/app/routes/partner/account-management/components/account-detail/account-detail.component.ts
@@ -5,7 +5,7 @@ import { ModalHelper, _HttpClient } from '@delon/theme';
 import { AccountManagemantService } from '../../services/account-managemant.service';
 
 @Component({
-  selector: 'app-partner-account-detail',
+  selector: 'app-partner-account-management-account-detail',
   templateUrl: './account-detail.component.html',
   styleUrls: ['./account-detail.component.less']
 })
diff --git a/src/app/routes/partner/account-management/components/list/list.component.ts b/src/app/routes/partner/account-management/components/list/list.component.ts
index d49477c8..84e281a5 100644
--- a/src/app/routes/partner/account-management/components/list/list.component.ts
+++ b/src/app/routes/partner/account-management/components/list/list.component.ts
@@ -8,7 +8,7 @@ import { AccountManagemantService } from '../../services/account-managemant.serv
 import { PartnerAccountManagementVirtualAccountDetailComponent } from '../virtual-account-detail/virtual-account-detail.component';
 
 @Component({
-  selector: 'app-partner-list',
+  selector: 'app-partner-account-management-list',
   templateUrl: './list.component.html',
 })
 export class PartnerAccountManagementListComponent implements OnInit {
diff --git a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts
index 49dfd681..4efdf3a2 100644
--- a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts
+++ b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts
@@ -6,7 +6,7 @@ import { ModalHelper, _HttpClient } from '@delon/theme';
 import { AccountManagemantService } from '../../services/account-managemant.service';
 
 @Component({
-  selector: 'app-partner-recorded-detail',
+  selector: 'app-partner-account-management-recorded-detail',
   templateUrl: './recorded-detail.component.html',
 })
 export class PartnerAccountManagementRecordedDetailComponent implements OnInit {
diff --git a/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.ts b/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.ts
index 9a583480..c4c969dd 100644
--- a/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.ts
+++ b/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.ts
@@ -7,7 +7,7 @@ import { ShipperBaseService } from 'src/app/shared/services/business/shipper-bas
 import { AccountManagemantService } from '../../services/account-managemant.service';
 
 @Component({
-  selector: 'app-partner-virtual-account-detail',
+  selector: 'app-partner-account-management-virtual-account-detail',
   templateUrl: './virtual-account-detail.component.html',
 })
 export class PartnerAccountManagementVirtualAccountDetailComponent implements OnInit {
diff --git a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html
new file mode 100644
index 00000000..82f0ce06
--- /dev/null
+++ b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html
@@ -0,0 +1,63 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-01-05 20:15:41
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-01-18 17:17:19
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\withdrawals-record\\withdrawals-detail\\withdrawals-detail.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
+<page-header-wrapper [title]="'提现详情'" [logo]="logo">
+    <ng-template #logo>
+        <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
+            <i nz-icon nzType="left" nzTheme="outline"></i>
+        </button>
+    </ng-template>
+</page-header-wrapper>
+
+<nz-card>
+    <nz-alert nzType="info" nzMessage="提现信息" class="mb-md"></nz-alert>
+    <div se-container [labelWidth]="100">
+        <se label="网络货运人">
+            {{formData?.ltdName}}
+        </se>
+        <se label="银行类型">
+            {{formData?.bankType==='1'?'平安银行':'浦发银行'}}
+        </se>
+        <se label="提现单号">
+            {{formData?.refundApplyCode}}
+        </se>
+        <se label="账户名称">
+            {{formData?.bankAccountName}}
+        </se>
+        <se label="提现时间">
+            {{formData?.createTime}}
+        </se>
+        <se label="虚拟账户">
+            {{formData?.virtualAccount}}
+        </se>
+        <se label="提现状态">
+            {{formData?.refundStatusLabel}}
+        </se>
+        <se label="提现金额">
+            {{formData?.amount}}
+        </se>
+        <se label="银行流水号">
+            {{formData?.bankSerialNumber}}
+        </se>
+        <se label="提现至银行卡">
+            {{formData?.bankId}}
+        </se>
+        <se label="银行回单" col="1">
+            <img [src]="formData?.bankCardNumber" alt="" style="width: 200px;height: 160px;">
+        </se>
+    </div>
+
+    <nz-alert nzType="info" nzMessage="提现进度" class="mb-md mt-md"></nz-alert>
+    <div nz-row class="mt-xl">
+        <div nz-col nzSpan="12" nzOffset="1">
+            <app-logistics-time-line [data]="timeLineData"></app-logistics-time-line>
+        </div>
+    </div>
+</nz-card>
\ No newline at end of file
diff --git a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.less b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.less
new file mode 100644
index 00000000..e299b7d1
--- /dev/null
+++ b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.less
@@ -0,0 +1,17 @@
+:host::ng-deep {
+
+    .ant-alert-info {
+        background-color: #f3f3f3;
+        border          : 1px solid #dbdbdb;
+
+        .ant-alert-message {
+            color: rgba(0, 0, 0, 0.85);
+            font-weight: 600;
+            font-size: 16px;
+        }
+    }
+
+    .ant-form-item {
+        margin-bottom: 15px;
+    }
+}
\ No newline at end of file
diff --git a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts
new file mode 100644
index 00000000..74f5b1d4
--- /dev/null
+++ b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts
@@ -0,0 +1,73 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { FreightAccountService } from 'src/app/routes/financial-management/services/freight-account.service';
+
+@Component({
+  selector: 'app-partner-account-management-withdrawals-detail',
+  templateUrl: './withdrawals-detail.component.html',
+  styleUrls: ['./withdrawals-detail.component.less']
+})
+export class PartnerAccountManagementWithdrawalsDetailComponent implements OnInit {
+  formData: any = {};
+
+  timeLineData: any = [];
+
+  constructor(public service: FreightAccountService, private route: ActivatedRoute) {
+    const id = route.snapshot.params.id;
+    this.loadRefundDetail(id);
+  }
+
+  ngOnInit(): void { }
+
+  loadRefundDetail(id: string) {
+    this.service.request(this.service.$api_get_refund_detail, { id }).subscribe(res => {
+      if (res) {
+        this.formData = res;
+        // 处理流程节点数据
+        // 流程是否结束
+        let isEnd = false;
+        if (res.successTime) {
+          isEnd = true;
+          if (res.refundStatus === '3') {
+            this.timeLineData.push({ time: res.successTime, value: `到账成功`, color: 'green' });
+          } else {
+            this.timeLineData.push({ time: res.successTime, value: `提现失败`, color: 'red' });
+          }
+        }
+        if (res.agreeTime && res.refundStatus !== '4') {
+          this.timeLineData.push({ time: res.agreeTime, value: `银行处理中`, color: 'gray' });
+        }
+        if (res.agreeTime) {
+          if (res.refundStatus === '4') {
+            isEnd = true;
+            this.timeLineData.push({
+              time: res.agreeTime,
+              value: `拒绝提现<br/>操作人员：${res.handlerUserIdLabel}`,
+              color: 'red'
+            });
+          } else {
+            this.timeLineData.push({
+              time: res.agreeTime,
+              value: `审核通过<br/>操作人员：${res.handlerUserIdLabel}`,
+              color: 'gray'
+            });
+          }
+        }
+        if (res.createTime) {
+          this.timeLineData.push({
+            time: res.createTime,
+            value: `提交提现申请<br/>提现${res.amount}元至${res.bankName}(${res.bankCardNumber})<br/>操作人员：${res.userIdLabel}`,
+            color: 'gray'
+          });
+        }
+        if (this.timeLineData?.length > 0 && !isEnd) {
+          this.timeLineData[0].color = 'green';
+        }
+      }
+    });
+  }
+
+  goBack() {
+    history.go(-1);
+  }
+}
diff --git a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.html b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.html
new file mode 100644
index 00000000..f81ec9dc
--- /dev/null
+++ b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.html
@@ -0,0 +1,85 @@
+<page-header-wrapper [title]="'提现记录'">
+</page-header-wrapper>
+
+<!-- <nz-card>
+    <nz-row [nzGutter]="16">
+        <nz-col [nzXl]="6" [nzLg]="6" [nzSm]="12">
+            <nz-statistic nzValue="100 笔" [nzTitle]="'待审核订单数'" [nzValueStyle]="{'font-size':'21px'}">
+            </nz-statistic>
+        </nz-col>
+        <nz-col [nzXl]="6" [nzLg]="6" [nzSm]="12">
+            <nz-statistic nzValue="80000.00 元" [nzTitle]="'待审核提现金额'" [nzValueStyle]="{'font-size':'21px'}">
+            </nz-statistic>
+        </nz-col>
+        <nz-col [nzXl]="6" [nzLg]="6" [nzSm]="12">
+            <nz-statistic nzValue="100 笔" [nzTitle]="'已提现订单数'" [nzValueStyle]="{'font-size':'21px'}">
+            </nz-statistic>
+        </nz-col>
+        <nz-col [nzXl]="6" [nzLg]="6" [nzSm]="12">
+            <nz-statistic nzValue="80000.00 元" [nzTitle]="'已提现金额'" [nzValueStyle]="{'font-size':'21px'}">
+            </nz-statistic>
+        </nz-col>
+    </nz-row>
+</nz-card> -->
+
+<nz-card class="search-box" nzBordered>
+    <div nz-row nzGutter="8">
+        <div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
+            <sf #sf [schema]="searchSchema"
+                [ui]="{ '*': { spanLabelFixed: 90,grid: { lg: 8, md: 12, sm: 12, xs: 24,gutter:15 } }}" [compact]="true"
+                [button]="'none'"></sf>
+        </div>
+        <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand"
+            class="text-right">
+            <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
+            <button nz-button (click)="resetSF()">重置</button>
+            <button nz-button> 导出</button>
+            <button nz-button nzType="link" (click)="expandToggle()">
+                {{ !_$expand ? '展开' : '收起' }}
+                <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
+            </button>
+        </div>
+    </div>
+</nz-card>
+
+<nz-card class="content-box" nzBordered>
+    <nz-tabset [nzTabBarExtraContent]="extraTemplate">
+        <nz-tab nzTitle="全部" (nzClick)="changeRefundStatus()"></nz-tab>
+        <nz-tab nzTitle="待审核" (nzClick)="changeRefundStatus('1')"></nz-tab>
+        <nz-tab nzTitle="处理中" (nzClick)="changeRefundStatus('2')"></nz-tab>
+        <nz-tab nzTitle="提现成功" (nzClick)="changeRefundStatus('3')"></nz-tab>
+        <nz-tab nzTitle="提现失败" (nzClick)="changeRefundStatus('5')"></nz-tab>
+        <nz-tab nzTitle="已拒绝" (nzClick)="changeRefundStatus('4')"></nz-tab>
+    </nz-tabset>
+
+    <ng-template #extraTemplate>
+        <div class="d-flex align-items-center ">
+            <div class="mr-md">
+                已选择
+                <strong class="text-red">{{ selectedRows.length }}</strong> 条数据&nbsp;&nbsp; 累计提现 <strong
+                    class="text-red">{{
+                    totalCallNo }}</strong>
+                <a *ngIf="totalCallNo > 0" (click)="st.clearCheck()" class="ml-lg">清空</a>
+            </div>
+            <button nz-button (click)="this.auditAction(null)">审核</button>
+        </div>
+    </ng-template>
+
+    <st #st [data]="service.$api_get_refund_page" [columns]="columns" [req]="{  process: beforeReq }"
+        [loading]="service.http.loading" [scroll]="{ x:'1200px' }" (change)="stChange($event)">
+        <ng-template st-row="bankCardNumber" let-item let-index="index" let-column="column">
+            {{ item.bankName }} <br> {{ item.bankCardNumber }}
+        </ng-template>
+    </st>
+</nz-card>
+
+<ng-template #auditModal>
+    <div nz-row nzGutter="8">
+        <div nz-col nzSpan="24" se-container [labelWidth]="80">
+            <se [col]="1" label="备注">
+                <textarea nz-input rows="3" [(ngModel)]="msg" placeholder="同意可以不用填写原因 ，拒绝必须说明原因"
+                    style="width: 325px;margin-left: 14px;"></textarea>
+            </se>
+        </div>
+    </div>
+</ng-template>
\ No newline at end of file
diff --git a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts
new file mode 100644
index 00000000..054a9b09
--- /dev/null
+++ b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts
@@ -0,0 +1,294 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { Router } from '@angular/router';
+import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st';
+import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form';
+import { NzModalService } from 'ng-zorro-antd/modal';
+import { FreightAccountService } from 'src/app/routes/financial-management/services/freight-account.service';
+
+
+@Component({
+  selector: 'app-partner-account-management-withdrawals-record',
+  templateUrl: './withdrawals-record.component.html',
+  styleUrls: ['../../../../commom/less/box.less', '../../../../commom/less/expend-but.less']
+})
+export class PartnerAccountManagementWithdrawalsRecordComponent implements OnInit {
+  @ViewChild('st', { static: true })
+  st!: STComponent;
+  @ViewChild('sf', { static: false })
+  sf!: SFComponent;
+  @ViewChild('auditModal', { static: false })
+  auditModal!: any;
+  columns: STColumn[] = this.initST();
+  searchSchema: SFSchema = this.initSF();
+
+  _$expand = false;
+
+  selectedRows: any[] = [];
+  totalCallNo = 0;
+  refundStatus: any = '';
+
+  msg = '';
+  constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) { }
+
+  ngOnInit(): void { }
+
+  beforeReq = (requestOptions: STRequestOptions) => {
+    if (this.sf) {
+      Object.assign(requestOptions.body, {
+        ...this.sf.value,
+        createTime: {
+          start: this.sf.value.createTime?.[0] || '',
+          end: this.sf.value.createTime?.[1] || ''
+        },
+        refundStatus: this.refundStatus || null
+      });
+    }
+    return requestOptions;
+  };
+
+  afterRes = (data: any[], rawData?: any) => {
+    data = data.map(node => ({ ...node, disabled: node.refundStatus !== '1' }));
+    return data;
+  };
+
+  stChange(e: STChange): void {
+    switch (e.type) {
+      case 'checkbox':
+        this.selectedRows = e.checkbox!;
+        this.totalCallNo = this.selectedRows.reduce((total, cv) => total + cv.amount, 0).toFixed(2);
+        break;
+    }
+  }
+
+  changeRefundStatus(status?: string) {
+    this.refundStatus = status || null;
+    this.st.load(1);
+  }
+
+  auditAction(item?: any) {
+    this.msg = '';
+    let params: Array<string> = [];
+    if (item) {
+      params = [item.id];
+    } else {
+      params = this.selectedRows.map(node => node.id);
+    }
+    const modal = this.nzModalService.create({
+      nzTitle: '审核',
+      nzContent: this.auditModal,
+      nzFooter: [
+        {
+          label: '拒绝',
+          type: 'default',
+          onClick: () => {
+            this.service
+              .request(this.service.$api_disagree_refund, {
+                refundApplicationId: params,
+                msg: this.msg
+              })
+              .subscribe(res => {
+                if (res) {
+                  this.service.msgSrv.success('审核拒绝成功');
+                  modal.destroy();
+                  this.st.load(1);
+                }
+              });
+          }
+        },
+        {
+          label: '通过',
+          type: 'primary',
+          onClick: () => {
+            this.service
+              .request(this.service.$api_agree_refund, {
+                refundApplicationId: params,
+                msg: this.msg
+              })
+              .subscribe(res => {
+                if (res) {
+                  this.service.msgSrv.success('审核通过成功');
+                  modal.destroy();
+                  this.st.load(1);
+                }
+              });
+          }
+        }
+      ]
+    });
+    modal.afterClose.subscribe(res => {
+      this.st.load();
+    });
+  }
+
+  showReason(item: any) {
+    const modal = this.nzModalService.create({
+      nzTitle: '查看原因',
+      nzContent: '运单数据异常，暂时无法开票，请联系客服400-xxxx-xxxx',
+      nzFooter: [
+        {
+          label: '关闭',
+          type: 'primary',
+          onClick: () => {
+            modal.destroy();
+          }
+        }
+      ]
+    });
+  }
+
+  /**
+   * 重置表单
+   */
+  resetSF() {
+    this.sf.reset();
+    this._$expand = false;
+  }
+
+  /**
+   * 伸缩查询条件
+   */
+  expandToggle() {
+    this._$expand = !this._$expand;
+    this.sf?.setValue('/expand', this._$expand);
+  }
+
+  private initSF(): SFSchema {
+    return {
+      properties: {
+        expand: {
+          type: 'boolean',
+          ui: {
+            hidden: true
+          }
+        },
+        refundApplyCode: {
+          type: 'string',
+          title: '提现单号',
+          ui: {
+            placeholder: '请输入'
+          }
+        },
+        refundStatus: {
+          type: 'string',
+          title: '提现状态',
+          ui: {
+            widget: 'dict-select',
+            params: { dictKey: 'refund:apply:status' },
+            placeholder: '请选择'
+          }
+        },
+        createTime: {
+          title: '提现时间',
+          type: 'string',
+          ui: {
+            widget: 'sl-from-to-search',
+            format: 'yyyy-MM-dd',
+            placeholder: '请选择',
+            nzShowTime: true
+          } as SFDateWidgetSchema
+        },
+        bankAccountName: {
+          type: 'string',
+          title: '账户名称',
+          ui: {
+            placeholder: '请输入',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        accountType: {
+          type: 'string',
+          title: '账户类型',
+          ui: {
+            widget: 'dict-select',
+            params: { dictKey: 'bank:type' },
+            placeholder: '请选择',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        ltdId: {
+          type: 'string',
+          title: '网络货运人',
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            allowClear: true,
+            asyncData: () => this.service.getNetworkFreightForwarder(),
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        bankType: {
+          type: 'string',
+          title: '银行类型',
+          ui: {
+            widget: 'dict-select',
+            params: { dictKey: 'bankname:type' },
+            placeholder: '请输入',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        }
+      }
+    };
+  }
+
+  private initST(): STColumn[] {
+    return [
+      { title: '', index: 'key', type: 'checkbox' },
+      { title: '提现时间', index: 'createTime', width: 180 },
+      { title: '提现单号', index: 'refundApplyCode', width: 120 },
+      { title: '网络货运人', index: 'ltdName', width: 140 },
+      { title: '银行类型', index: 'bankTypeLabel', width: 100 },
+      { title: '账户类型', index: 'bankTypeLabel', width: 100 },
+      { title: '账户名称', index: 'bankAccountName', width: 140 },
+      { title: '虚拟账户', index: 'virtualAccount', width: 100 },
+      {
+        title: '提现金额',
+        index: 'amount',
+        width: 120,
+        type: 'widget',
+        className: 'text-right',
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.amount }) }
+      },
+      { title: '提现银行账户', render: 'bankCardNumber', width: 180 },
+      { title: '提现状态', index: 'refundStatusLabel', width: 100 },
+      { title: '银行流水号', index: 'bankSerialNumber', width: 120 },
+      { title: '核心交易流水', index: 'coreSerNo', width: 120 },
+      { title: '失败原因', index: 'rejectionCause', width: 150, format: item => item.failCause || item.rejectionCause },
+      {
+        title: '操作',
+        fixed: 'right',
+        width: '110px',
+        buttons: [
+          {
+            text: '查看回单',
+            iif: item => item.refundStatus === '3',
+            click: item =>
+              this.service.getReceiptUrl(item.receiptUrl, {
+                bankType: item.bankType,
+                rmYll: item.userId,
+                snglFlgCd: item.coreSerNo,
+                bussType: '06',
+                ltdId: item.ltdId
+              })
+          },
+          {
+            text: '审核',
+            iif: item => item.refundStatus === '1',
+            click: item => this.auditAction(item)
+          },
+          {
+            text: '详情',
+            click: item => this.router.navigate(['/financial-management/withdrawals-record/detail/' + item.id])
+          }
+        ]
+      }
+    ];
+  }
+}
diff --git a/src/app/routes/partner/partner-routing.module.ts b/src/app/routes/partner/partner-routing.module.ts
index f70fd812..9fef0745 100644
--- a/src/app/routes/partner/partner-routing.module.ts
+++ b/src/app/routes/partner/partner-routing.module.ts
@@ -25,6 +25,8 @@ import { PartnerAccountManagementListComponent } from './account-management/comp
 import { ParterRebateManageMentRecordComponent } from './rebate-management/components/rebate-record/rebate-record.component';
 import { PartnerAccountManagementAccountDetailComponent } from './account-management/components/account-detail/account-detail.component';
 import { PartnerAccountManagementRecordedDetailComponent } from './account-management/components/recorded-detail/recorded-detail.component';
+import { PartnerAccountManagementWithdrawalsRecordComponent } from './account-management/components/withdrawals-record/withdrawals-record.component';
+import { PartnerAccountManagementWithdrawalsDetailComponent } from './account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component';
 
 const routes: Routes = [
   {
@@ -67,7 +69,9 @@ const routes: Routes = [
     children: [
       { path: 'list', component: PartnerAccountManagementListComponent },
       { path: 'account-detail', component: PartnerAccountManagementAccountDetailComponent },
-      { path: 'recorded-detail/:id', component: PartnerAccountManagementRecordedDetailComponent }
+      { path: 'recorded-detail/:id', component: PartnerAccountManagementRecordedDetailComponent },
+      { path: 'withdraw-record', component: PartnerAccountManagementWithdrawalsRecordComponent },
+      { path: 'withdraw-record/:id', component: PartnerAccountManagementWithdrawalsDetailComponent },
     ]
   },
 ];
diff --git a/src/app/routes/partner/partner.module.ts b/src/app/routes/partner/partner.module.ts
index 7e3d1570..66b8695d 100644
--- a/src/app/routes/partner/partner.module.ts
+++ b/src/app/routes/partner/partner.module.ts
@@ -30,6 +30,8 @@ import { PartnerAccountManagementVirtualAccountDetailComponent } from './account
 import { ParterRebateManageMentRecordComponent } from './rebate-management/components/rebate-record/rebate-record.component';
 import { PartnerAccountManagementAccountDetailComponent } from './account-management/components/account-detail/account-detail.component';
 import { PartnerAccountManagementRecordedDetailComponent } from './account-management/components/recorded-detail/recorded-detail.component';
+import { PartnerAccountManagementWithdrawalsRecordComponent } from './account-management/components/withdrawals-record/withdrawals-record.component';
+import { PartnerAccountManagementWithdrawalsDetailComponent } from './account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component';
 
 const COMPONENTS: any[] = [
   PartnerBusinessStatisticsIndexComponent,
@@ -50,7 +52,10 @@ const COMPONENTS: any[] = [
   PartnerAccountManagementListComponent,
   PartnerAccountManagementVirtualAccountDetailComponent,
   PartnerAccountManagementAccountDetailComponent,
-  PartnerAccountManagementRecordedDetailComponent];
+  PartnerAccountManagementRecordedDetailComponent,
+  PartnerAccountManagementWithdrawalsRecordComponent,
+  PartnerAccountManagementWithdrawalsDetailComponent
+];
 
 @NgModule({
   declarations: [...COMPONENTS],
diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json
index 3307c095..82b7732b 100644
--- a/src/assets/mocks/menu-data.json
+++ b/src/assets/mocks/menu-data.json
@@ -548,6 +548,16 @@
                   "text": "账户明细",
                   "link": "/partner/account-management/account-detail",
                   "hide": true
+                },
+                {
+                  "text": "提现记录",
+                  "link": "/partner/account-management/withdraw-record",
+                  "hide": true
+                },
+                {
+                  "text": "提现详情",
+                  "link": "/partner/account-management/withdraw-record/:id",
+                  "hide": true
                 }
               ]
             }

From 7ce80e8036d8e0fe6b913be0435bf48e8490a9df Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Thu, 10 Mar 2022 10:38:05 +0800
Subject: [PATCH 16/70] edit

---
 src/app/core/guards/auth.guard.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/app/core/guards/auth.guard.ts b/src/app/core/guards/auth.guard.ts
index 89c471f8..da4d1331 100644
--- a/src/app/core/guards/auth.guard.ts
+++ b/src/app/core/guards/auth.guard.ts
@@ -30,7 +30,7 @@ export class AuthGuard extends ACLGuard {
   }
 
   canActivateChild(childRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> {
-    if (childRoute.routeConfig?.loadChildren) {
+    if (childRoute.routeConfig?.loadChildren || childRoute.routeConfig?.children) {
       return super.canActivateChild(childRoute, state);
     } else {
       return this.handle(childRoute, state, 2, this.settingRoute(childRoute.params, state.url));
@@ -38,6 +38,8 @@ export class AuthGuard extends ACLGuard {
   }
 
   private handle(route: ActivatedRouteSnapshot, state: RouterStateSnapshot, type: 1 | 2, router?: string): Observable<boolean> {
+    console.log(route, state);
+
     if (!router) {
       return type === 1 ? super.canActivate(route, state) : super.canActivateChild(route, state);
     }

From 31cb7bd194081c9ce2c1c5d6fcd48b45384ad745 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= <xiaoyun.pan@eascs.com>
Date: Thu, 10 Mar 2022 11:20:21 +0800
Subject: [PATCH 17/70] -

---
 .../withdrawals-record.component.html         | 125 ++++------
 .../withdrawals-record.component.ts           |  94 +++++--
 src/app/shared/utils/deal-precision.ts        | 236 ++++++++++++++++++
 src/assets/mocks/menu-data.json               |   3 +-
 4 files changed, 355 insertions(+), 103 deletions(-)
 create mode 100644 src/app/shared/utils/deal-precision.ts

diff --git a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.html b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.html
index f81ec9dc..14e2ff3e 100644
--- a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.html
+++ b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.html
@@ -1,85 +1,62 @@
-<page-header-wrapper [title]="'提现记录'">
-</page-header-wrapper>
-
-<!-- <nz-card>
-    <nz-row [nzGutter]="16">
-        <nz-col [nzXl]="6" [nzLg]="6" [nzSm]="12">
-            <nz-statistic nzValue="100 笔" [nzTitle]="'待审核订单数'" [nzValueStyle]="{'font-size':'21px'}">
-            </nz-statistic>
-        </nz-col>
-        <nz-col [nzXl]="6" [nzLg]="6" [nzSm]="12">
-            <nz-statistic nzValue="80000.00 元" [nzTitle]="'待审核提现金额'" [nzValueStyle]="{'font-size':'21px'}">
-            </nz-statistic>
-        </nz-col>
-        <nz-col [nzXl]="6" [nzLg]="6" [nzSm]="12">
-            <nz-statistic nzValue="100 笔" [nzTitle]="'已提现订单数'" [nzValueStyle]="{'font-size':'21px'}">
-            </nz-statistic>
-        </nz-col>
-        <nz-col [nzXl]="6" [nzLg]="6" [nzSm]="12">
-            <nz-statistic nzValue="80000.00 元" [nzTitle]="'已提现金额'" [nzValueStyle]="{'font-size':'21px'}">
-            </nz-statistic>
-        </nz-col>
-    </nz-row>
-</nz-card> -->
-
 <nz-card class="search-box" nzBordered>
-    <div nz-row nzGutter="8">
-        <div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
-            <sf #sf [schema]="searchSchema"
-                [ui]="{ '*': { spanLabelFixed: 90,grid: { lg: 8, md: 12, sm: 12, xs: 24,gutter:15 } }}" [compact]="true"
-                [button]="'none'"></sf>
-        </div>
-        <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand"
-            class="text-right">
-            <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
-            <button nz-button (click)="resetSF()">重置</button>
-            <button nz-button> 导出</button>
-            <button nz-button nzType="link" (click)="expandToggle()">
-                {{ !_$expand ? '展开' : '收起' }}
-                <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
-            </button>
-        </div>
+  <div nz-row nzGutter="8">
+    <div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
+      <sf #sf [schema]="searchSchema"
+        [ui]="{ '*': { spanLabelFixed: 90,grid: { lg: 8, md: 12, sm: 12, xs: 24,gutter:15 } }}" [compact]="true"
+        [button]="'none'"></sf>
     </div>
+    <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand"
+      class="text-right">
+      <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
+      <button nz-button (click)="resetSF()">重置</button>
+      <button nz-button> 导出</button>
+      <button nz-button nzType="link" (click)="expandToggle()">
+        {{ !_$expand ? '展开' : '收起' }}
+        <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
+      </button>
+    </div>
+  </div>
 </nz-card>
 
 <nz-card class="content-box" nzBordered>
-    <nz-tabset [nzTabBarExtraContent]="extraTemplate">
-        <nz-tab nzTitle="全部" (nzClick)="changeRefundStatus()"></nz-tab>
-        <nz-tab nzTitle="待审核" (nzClick)="changeRefundStatus('1')"></nz-tab>
-        <nz-tab nzTitle="处理中" (nzClick)="changeRefundStatus('2')"></nz-tab>
-        <nz-tab nzTitle="提现成功" (nzClick)="changeRefundStatus('3')"></nz-tab>
-        <nz-tab nzTitle="提现失败" (nzClick)="changeRefundStatus('5')"></nz-tab>
-        <nz-tab nzTitle="已拒绝" (nzClick)="changeRefundStatus('4')"></nz-tab>
-    </nz-tabset>
+  <nz-tabset [nzTabBarExtraContent]="extraTemplate">
+    <nz-tab nzTitle="全部" (nzClick)="changeRefundStatus()"></nz-tab>
+    <nz-tab nzTitle="待审核" (nzClick)="changeRefundStatus('1')"></nz-tab>
+    <nz-tab nzTitle="处理中" (nzClick)="changeRefundStatus('2')"></nz-tab>
+    <nz-tab nzTitle="提现成功" (nzClick)="changeRefundStatus('3')"></nz-tab>
+    <nz-tab nzTitle="提现失败" (nzClick)="changeRefundStatus('5')"></nz-tab>
+    <nz-tab nzTitle="已拒绝" (nzClick)="changeRefundStatus('4')"></nz-tab>
+  </nz-tabset>
 
-    <ng-template #extraTemplate>
-        <div class="d-flex align-items-center ">
-            <div class="mr-md">
-                已选择
-                <strong class="text-red">{{ selectedRows.length }}</strong> 条数据&nbsp;&nbsp; 累计提现 <strong
-                    class="text-red">{{
-                    totalCallNo }}</strong>
-                <a *ngIf="totalCallNo > 0" (click)="st.clearCheck()" class="ml-lg">清空</a>
-            </div>
-            <button nz-button (click)="this.auditAction(null)">审核</button>
-        </div>
+  <ng-template #extraTemplate>
+    <div class="d-flex align-items-center ">
+      <div class="mr-md">
+        已选择
+        <strong class="text-red">{{ selectedRows.length }}</strong> 条数据&nbsp;&nbsp; 累计提现 <strong class="text-red">{{
+          totalCallNo }}</strong>
+        <!-- <a *ngIf="totalCallNo > 0" (click)="st.clearCheck()" class="ml-lg">清空</a> -->
+      </div>
+      <button nz-button (click)="this.auditAction(null)">审核</button>
+    </div>
+  </ng-template>
+
+  <st #st [data]="service.$api_get_refund_page" [columns]="columns" [req]="{  process: beforeReq }"
+    [loading]="service.http.loading" [scroll]="{ x:'1200px' }" (change)="stChange($event)"
+    [res]="{ reName: { list: 'data.records', total: 'data.total' }, process: afterRes }"
+    [page]="{ show: true,  pageSizes:  [10, 20, 50, 100, 200, 500] }" [loading]="service.http.loading">
+    <ng-template st-row="bankCardNumber" let-item let-index="index" let-column="column">
+      {{ item.bankName }} <br> {{ item.bankCardNumber }}
     </ng-template>
-
-    <st #st [data]="service.$api_get_refund_page" [columns]="columns" [req]="{  process: beforeReq }"
-        [loading]="service.http.loading" [scroll]="{ x:'1200px' }" (change)="stChange($event)">
-        <ng-template st-row="bankCardNumber" let-item let-index="index" let-column="column">
-            {{ item.bankName }} <br> {{ item.bankCardNumber }}
-        </ng-template>
-    </st>
+  </st>
 </nz-card>
 
 <ng-template #auditModal>
-    <div nz-row nzGutter="8">
-        <div nz-col nzSpan="24" se-container [labelWidth]="80">
-            <se [col]="1" label="备注">
-                <textarea nz-input rows="3" [(ngModel)]="msg" placeholder="同意可以不用填写原因 ，拒绝必须说明原因"
-                    style="width: 325px;margin-left: 14px;"></textarea>
-            </se>
-        </div>
+  <div nz-row nzGutter="8">
+    <div nz-col nzSpan="24" se-container [labelWidth]="80">
+      <se [col]="1" label="备注">
+        <textarea nz-input rows="3" [(ngModel)]="msg" placeholder="同意可以不用填写原因 ，拒绝必须说明原因"
+          style="width: 325px;margin-left: 14px;"></textarea>
+      </se>
     </div>
-</ng-template>
\ No newline at end of file
+  </div>
+</ng-template>
diff --git a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts
index 054a9b09..16738ce9 100644
--- a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts
+++ b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts
@@ -1,9 +1,10 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { Router } from '@angular/router';
-import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st';
+import { STComponent, STColumn, STChange, STRequestOptions, STData } from '@delon/abc/st';
 import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { FreightAccountService } from 'src/app/routes/financial-management/services/freight-account.service';
+import Big from 'src/app/shared/utils/deal-precision';
 
 
 @Component({
@@ -12,12 +13,10 @@ import { FreightAccountService } from 'src/app/routes/financial-management/servi
   styleUrls: ['../../../../commom/less/box.less', '../../../../commom/less/expend-but.less']
 })
 export class PartnerAccountManagementWithdrawalsRecordComponent implements OnInit {
-  @ViewChild('st', { static: true })
-  st!: STComponent;
-  @ViewChild('sf', { static: false })
-  sf!: SFComponent;
-  @ViewChild('auditModal', { static: false })
-  auditModal!: any;
+  @ViewChild('st', { static: true }) st!: STComponent;
+  @ViewChild('sf', { static: false }) sf!: SFComponent;
+  @ViewChild('auditModal', { static: false }) auditModal!: any;
+  @ViewChild('viewReasonModal', { static: false }) viewReasonModal!: any;
   columns: STColumn[] = this.initST();
   searchSchema: SFSchema = this.initSF();
 
@@ -52,11 +51,47 @@ export class PartnerAccountManagementWithdrawalsRecordComponent implements OnIni
   };
 
   stChange(e: STChange): void {
-    switch (e.type) {
-      case 'checkbox':
-        this.selectedRows = e.checkbox!;
-        this.totalCallNo = this.selectedRows.reduce((total, cv) => total + cv.amount, 0).toFixed(2);
-        break;
+    if (e.type === 'checkbox') {
+      const checkRows = (e.checkbox as STData[]) || [];
+      //判断当前页是否有选中的行
+      if (checkRows.length === 0) {
+        // 当前页没有存在已勾选的行，移除之前所记录的当前页的行
+        const stList = this.st.list;
+        stList.forEach(item => {
+          this.selectedRows = this.selectedRows.filter((e: any) => e.id !== item.id);
+        })
+      } else {
+        //添加新增的行
+        checkRows.forEach((item: any) => {
+          const newSelectedList = this.selectedRows.filter((r: any) => r.id === item.id);
+          if (newSelectedList.length === 0) {
+            this.selectedRows.push(item);
+
+          }
+        })
+        // 移除取消选中的行
+        const stList = this.st.list;
+        stList.forEach(item => {
+          if (!item.checked) {
+            const index = this.selectedRows.findIndex(_item => item.id === _item.id);
+            if (index !== -1) this.selectedRows.splice(index, 1);
+          }
+        })
+      }
+      let totalCallNo = 0;
+      this.selectedRows.forEach((item => {
+        totalCallNo = new Big(this.totalCallNo).plus(item?.amount).parse();
+      }));
+      this.totalCallNo = totalCallNo;
+    } else if (e.type === 'loaded') {
+      // 页面加载时勾选
+      (e?.loaded || []).forEach((r) => {
+        this.selectedRows.forEach((x) => {
+          if (x.id === r.id) {
+            r.checked = true;
+          }
+        });
+      });
     }
   }
 
@@ -123,7 +158,7 @@ export class PartnerAccountManagementWithdrawalsRecordComponent implements OnIni
   showReason(item: any) {
     const modal = this.nzModalService.create({
       nzTitle: '查看原因',
-      nzContent: '运单数据异常，暂时无法开票，请联系客服400-xxxx-xxxx',
+      nzContent: item?.rejectionCause || item?.failCause,
       nzFooter: [
         {
           label: '关闭',
@@ -240,27 +275,27 @@ export class PartnerAccountManagementWithdrawalsRecordComponent implements OnIni
 
   private initST(): STColumn[] {
     return [
-      { title: '', index: 'key', type: 'checkbox' },
-      { title: '提现时间', index: 'createTime', width: 180 },
-      { title: '提现单号', index: 'refundApplyCode', width: 120 },
-      { title: '网络货运人', index: 'ltdName', width: 140 },
-      { title: '银行类型', index: 'bankTypeLabel', width: 100 },
-      { title: '账户类型', index: 'bankTypeLabel', width: 100 },
-      { title: '账户名称', index: 'bankAccountName', width: 140 },
-      { title: '虚拟账户', index: 'virtualAccount', width: 100 },
+      { title: '', index: 'key', type: 'checkbox', className: 'text-center' },
+      { title: '提现时间', index: 'createTime', width: 180, className: 'text-center' },
+      { title: '提现单号', index: 'refundApplyCode', width: 180, className: 'text-center' },
+      { title: '网络货运人', index: 'ltdName', width: 220, className: 'text-center' },
+      { title: '银行类型', index: 'bankTypeLabel', width: 100, className: 'text-center' },
+      { title: '账户类型', index: 'bankTypeLabel', width: 100, className: 'text-center' },
+      { title: '账户名称', index: 'bankAccountName', width: 220, className: 'text-center' },
+      { title: '虚拟账户', index: 'virtualAccount', width: 180, className: 'text-center' },
       {
         title: '提现金额',
         index: 'amount',
-        width: 120,
+        width: 150,
         type: 'widget',
         className: 'text-right',
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.amount }) }
       },
-      { title: '提现银行账户', render: 'bankCardNumber', width: 180 },
-      { title: '提现状态', index: 'refundStatusLabel', width: 100 },
-      { title: '银行流水号', index: 'bankSerialNumber', width: 120 },
-      { title: '核心交易流水', index: 'coreSerNo', width: 120 },
-      { title: '失败原因', index: 'rejectionCause', width: 150, format: item => item.failCause || item.rejectionCause },
+      { title: '提现银行账户', render: 'bankCardNumber', width: 200, className: 'text-center' },
+      { title: '提现状态', index: 'refundStatusLabel', width: 100, className: 'text-center' },
+      { title: '银行流水号', index: 'bankSerialNumber', width: 160, className: 'text-center' },
+      { title: '核心交易流水', index: 'coreSerNo', width: 180, className: 'text-center' },
+      { title: '失败原因', index: 'rejectionCause', width: 200, format: item => item.failCause, className: 'text-center' },
       {
         title: '操作',
         fixed: 'right',
@@ -278,6 +313,11 @@ export class PartnerAccountManagementWithdrawalsRecordComponent implements OnIni
                 ltdId: item.ltdId
               })
           },
+          {
+            text: '查看原因',
+            iif: item => item.refundStatus === '4',
+            click: item => this.showReason(item)
+          },
           {
             text: '审核',
             iif: item => item.refundStatus === '1',
diff --git a/src/app/shared/utils/deal-precision.ts b/src/app/shared/utils/deal-precision.ts
new file mode 100644
index 00000000..52a47ad4
--- /dev/null
+++ b/src/app/shared/utils/deal-precision.ts
@@ -0,0 +1,236 @@
+/**
+ * 操作符类型运算符
+ * +：加法运算
+ * -：减法运算
+ * *：乘法运算
+ * /：除法运算
+ */
+type OperationType = '+' | '-' | '*' | '/';
+
+class Big {
+  /**
+   * Big值
+   */
+  private v: number;
+  /**
+   * 构造函数
+   * @param v 初始值
+   */
+  constructor(v: number) {
+    this.v = v;
+  }
+  /**
+   * 转换整数，返回倍数及整数值，比如
+   * 100  >>> { times: 1, num: 100 }   ===> 100
+   * 3.14 >>> { times: 100, num: 3.14} ===> 314
+   * @param n number
+   */
+  private toInteger(n: number) {
+    const ret = { times: 1, num: 0 };
+    if (Number.isInteger(n)) {
+      ret.num = n;
+      return ret;
+    }
+    ret.times = Math.pow(10, n.toString().split('.')[1].length);
+    ret.num = parseInt((n * ret.times + 0.5).toString(), 10);
+    return ret;
+  }
+  /**
+   * 执行运算
+   * @param m 数值m
+   * @param n 数值n
+   * @param key 运算符
+   */
+  private operation(m: number = 0, n: number = 0, key: OperationType) {
+    const o1 = this.toInteger(m);
+    const o2 = this.toInteger(n);
+
+    const n1 = o1.num;
+    const n2 = o2.num;
+
+    const t1 = o1.times;
+    const t2 = o2.times;
+
+    const max = Math.max(t1, t2);
+    let result = 0;
+    switch (key) {
+      case '+':
+        if (t1 === t2) {
+          // 两个小数位数相同
+          result = n1 + n2;
+        } else if (t1 > t2) {
+          // o1 小数位 大于 o2
+          result = n1 + n2 * (t1 / t2);
+        } else {
+          // o1 小数位 小于 o2
+          result = n1 * (t2 / t1) + n2;
+        }
+        result /= max;
+        break;
+      case '-':
+        if (t1 === t2) {
+          result = n1 - n2;
+        } else if (t1 > t2) {
+          result = n1 - n2 * (t1 / t2);
+        } else {
+          result = n1 * (t2 / t1) - n2;
+        }
+        result /= max;
+        break;
+      case '*':
+        result = (n1 * n2) / (t1 * t2);
+        break;
+      case '/':
+        result = (n1 * t2) / (t1 * n2);
+        break;
+      default:
+        result = 0;
+    }
+    return new Big(result);
+  }
+  /**
+   * 数值化
+   * @param n
+   */
+  private numeric(n: number | Big) {
+    return n instanceof Big ? n.v : n;
+  }
+
+  /**
+   * 加法运算
+   * @param n
+   */
+  public plus(n: number | Big) {
+    return this.operation(this.v, this.numeric(n), '+');
+  }
+  /**
+   * 减法运算
+   * @param n
+   */
+  public minus(n: number | Big) {
+    return this.operation(this.v, this.numeric(n), '-');
+  }
+  /**
+   * 乘法运算
+   * @param n
+   */
+  public multipliedBy(n: number | Big) {
+    return this.operation(this.v, this.numeric(n), '*');
+  }
+  /**
+   * 除法运算
+   * @param n
+   */
+  public dividedBy(n: number | Big) {
+    return this.operation(this.v, this.numeric(n), '/');
+  }
+  /**
+   * 解析结果
+   */
+  public parse() {
+    return this.v;
+  }
+
+  /**
+   * 小数点后固定指定位数，比如固定小数点后5位数字，则有
+   * 30 ==> 30.00000
+   * 3.14 ===> 3.14000
+   * @param n
+   */
+  public static digits(v: number | Big, len: number = 2) {
+    if (Number.isInteger(v)) {
+      return `${v}.${Array(len).fill(0).join('')}`;
+    } else {
+      const [prefix, suffix] = v.toString().split('.');
+      const sLen = suffix.length;
+      if (sLen > len) {
+        return `${prefix}.${suffix.slice(0, len)}`;
+      } else if (sLen < len) {
+        return `${prefix}.${suffix}${Array(len - sLen)
+          .fill(0)
+          .join('')}`;
+      } else {
+        return `${prefix}.${suffix}`;
+      }
+    }
+  }
+  public digits(len: number) {
+    return Big.digits(this.v, len);
+  }
+
+  /**
+   * 人民币格式处理
+   * - 非数字：返回0
+   * - 整数：直接返回
+   * - 小数：保留小数点后两位，超出两位则截取
+   * @param v
+   */
+  public static rmb(v: string | number) {
+    if (isNaN(Number(v))) {
+      return '0';
+    } else {
+      const foo = v.toString();
+      if (/^[0-9]+$/.test(foo)) {
+        return foo;
+      } else {
+        const [prefix, suffix] = foo.split('.');
+        const sLen = suffix.length;
+        if (sLen > 2) {
+          return `${prefix}.${suffix.slice(0, 2)}`;
+        } else if (sLen < 2) {
+          return `${foo}0`;
+        } else {
+          return foo;
+        }
+      }
+    }
+  }
+  public rmb() {
+    return Big.rmb(this.v);
+  }
+  /**
+   * 切割数字
+   * @param v
+   */
+  public static split(v: string | number) {
+    if (isNaN(Number(v))) {
+      return [];
+    } else {
+      return v
+        .toString()
+        .split('.')
+        .map((item, i) => {
+          if (i === 1) {
+            return item && item.length < 2 ? `${item}0` : item;
+          }
+          return item;
+        });
+    }
+  }
+  public split() {
+    return Big.split(this.v);
+  }
+
+  /**
+   * 省略 --> 如果超过1万，则返回万制，转换后小数点后保留两位
+   * 比如：12345 返回 1.23万
+   * @param v
+   */
+  public static ellipsis(v: string | number) {
+    // 如果不是数值类型并且转换之后不为数字，则直接返回传入值
+    if (isNaN(Number(v))) {
+      return v.toString();
+    }
+    // 如果传入数值小于1万则没必要转换，直接返回
+    if (+v < 10000) {
+      return v.toString();
+    }
+    // 超过1万，处理之后再返回
+    return Big.rmb(+v / 10000) + '万';
+  }
+  public ellipsis(v: string | number) {
+    return Big.ellipsis(this.v);
+  }
+}
+
+export default Big;
diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json
index 82b7732b..55c6deb3 100644
--- a/src/assets/mocks/menu-data.json
+++ b/src/assets/mocks/menu-data.json
@@ -551,8 +551,7 @@
                 },
                 {
                   "text": "提现记录",
-                  "link": "/partner/account-management/withdraw-record",
-                  "hide": true
+                  "link": "/partner/account-management/withdraw-record"
                 },
                 {
                   "text": "提现详情",

From 09a22bab297112a697e1c40e14fcdc388f0b0e45 Mon Sep 17 00:00:00 2001
From: heqinghang <qinghang.he@eascs.com>
Date: Thu, 10 Mar 2022 11:22:26 +0800
Subject: [PATCH 18/70] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=AE=A4=E9=A2=86?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E9=9D=99=E6=80=81=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/list/list.component.html       |   1 -
 .../channel-approve.component.html            |   9 +
 .../channel-approve.component.ts              |  98 ++++++++
 .../channel-detail.component.html             |  62 +++++
 .../channel-detail.component.less             |  27 ++
 .../channel-detail.component.ts               |  82 +++++++
 .../channel-reject.component.html             |   9 +
 .../channel-reject.component.ts               |  98 ++++++++
 .../components/list/list.component.html       |  66 +++++
 .../components/list/list.component.ts         | 230 ++++++++++++++++++
 .../partner-approve.component.html            |   9 +
 .../partner-approve.component.ts              |  98 ++++++++
 .../partner-detail.component.html             |  79 ++++++
 .../partner-detail.component.less             |  26 ++
 .../partner-detail.component.ts               |  82 +++++++
 .../partner-reject.component.html             |   9 +
 .../partner-reject.component.ts               |  98 ++++++++
 .../services/claim-audit.service.ts           |  12 +
 .../components/list/list.component.html       |   1 -
 .../routes/partner/partner-routing.module.ts  |  17 +-
 src/app/routes/partner/partner.module.ts      |  19 +-
 src/assets/mocks/menu-data.json               |   4 +
 22 files changed, 1131 insertions(+), 5 deletions(-)
 create mode 100644 src/app/routes/partner/claim-audit/components/channel-approve/channel-approve.component.html
 create mode 100644 src/app/routes/partner/claim-audit/components/channel-approve/channel-approve.component.ts
 create mode 100644 src/app/routes/partner/claim-audit/components/channel-detail/channel-detail.component.html
 create mode 100644 src/app/routes/partner/claim-audit/components/channel-detail/channel-detail.component.less
 create mode 100644 src/app/routes/partner/claim-audit/components/channel-detail/channel-detail.component.ts
 create mode 100644 src/app/routes/partner/claim-audit/components/channel-reject/channel-reject.component.html
 create mode 100644 src/app/routes/partner/claim-audit/components/channel-reject/channel-reject.component.ts
 create mode 100644 src/app/routes/partner/claim-audit/components/list/list.component.html
 create mode 100644 src/app/routes/partner/claim-audit/components/list/list.component.ts
 create mode 100644 src/app/routes/partner/claim-audit/components/partner-approve/partner-approve.component.html
 create mode 100644 src/app/routes/partner/claim-audit/components/partner-approve/partner-approve.component.ts
 create mode 100644 src/app/routes/partner/claim-audit/components/partner-detail/partner-detail.component.html
 create mode 100644 src/app/routes/partner/claim-audit/components/partner-detail/partner-detail.component.less
 create mode 100644 src/app/routes/partner/claim-audit/components/partner-detail/partner-detail.component.ts
 create mode 100644 src/app/routes/partner/claim-audit/components/partner-reject/partner-reject.component.html
 create mode 100644 src/app/routes/partner/claim-audit/components/partner-reject/partner-reject.component.ts
 create mode 100644 src/app/routes/partner/claim-audit/services/claim-audit.service.ts

diff --git a/src/app/routes/partner/channel-sales/components/list/list.component.html b/src/app/routes/partner/channel-sales/components/list/list.component.html
index 6cc8f619..fd0078d8 100644
--- a/src/app/routes/partner/channel-sales/components/list/list.component.html
+++ b/src/app/routes/partner/channel-sales/components/list/list.component.html
@@ -15,7 +15,6 @@
   <!-- 数据列表 -->
   <st
     #st
-    [bordered]="true"
     [data]="data"
     [columns]="columns"
     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
diff --git a/src/app/routes/partner/claim-audit/components/channel-approve/channel-approve.component.html b/src/app/routes/partner/claim-audit/components/channel-approve/channel-approve.component.html
new file mode 100644
index 00000000..dc134ee2
--- /dev/null
+++ b/src/app/routes/partner/claim-audit/components/channel-approve/channel-approve.component.html
@@ -0,0 +1,9 @@
+<sf #sf [ui]="ui" [schema]="schema" [button]="'none'" [formData]="i">
+</sf>
+<div style="font-size: 8px;">
+  结算起算日：指给合伙人结算佣金的起算时间，更换合伙人，该日期是当前合伙人的结算起算日，原合伙人的结算结束时间则为此日期的前一天
+</div>
+<div *nzModalFooter>
+  <button nz-button nzType="default" (click)="close()">取消</button>
+  <button nz-button nzType="primary" (click)="save()">确认</button>
+</div>
diff --git a/src/app/routes/partner/claim-audit/components/channel-approve/channel-approve.component.ts b/src/app/routes/partner/claim-audit/components/channel-approve/channel-approve.component.ts
new file mode 100644
index 00000000..8856e337
--- /dev/null
+++ b/src/app/routes/partner/claim-audit/components/channel-approve/channel-approve.component.ts
@@ -0,0 +1,98 @@
+import { AfterViewInit, ChangeDetectorRef, Component, OnChanges, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { SFComponent, SFRadioWidgetSchema, SFSchema, SFSchemaEnumType, SFSelectWidgetSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form';
+import { _HttpClient } from '@delon/theme';
+import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
+import { map } from 'rxjs/operators';
+import { AmapPoiPickerComponent } from 'src/app/shared/components/amap';
+import { ClaimAuditService } from '../../services/claim-audit.service';
+
+
+@Component({
+  selector: 'app-parter-claim-audit-channel-approve',
+  templateUrl: './channel-approve.component.html'
+})
+export class ParterClaimAuditListChannelApproveComponent implements OnInit {
+  @ViewChild('sf', { static: false }) sf!: SFComponent;
+  schema!: SFSchema;
+  ui!: SFUISchema;
+  i: any;
+  type: any;
+
+  constructor(
+    public http: _HttpClient,
+    private cdr: ChangeDetectorRef,
+    private route: ActivatedRoute,
+    private modalService: NzModalService,
+    public service: ClaimAuditService,
+    private modalRef: NzModalRef
+  ) {}
+
+  ngOnInit(): void {
+    this.initSF();
+  }
+  initSF() {
+    this.schema = {
+      properties: {
+        id: {
+          type: 'string',
+          title: '',
+          ui: { hidden: true }
+        },
+        name1: {
+          title: '合伙人(认领人)',
+          type: 'string',
+          ui: {
+            widget: 'text',
+          } ,
+        },
+        name2: {
+          title: '认领客户名称',
+          type: 'string',
+          ui: {
+            widget: 'text',
+          } ,
+        },
+        data: {
+          title: '结算起算日期',
+          type: 'string',
+          format: 'date',
+        },
+        name3: {
+          type: 'string',
+          title: '备注',
+          maxLength: 50,
+          ui: {
+            widget: 'textarea',
+            autosize: { minRows: 3, maxRows: 6 },
+            placeholder:'请不要超过50个字'
+          } as SFTextareaWidgetSchema,
+        },
+      },
+      required: ['name3']
+    };
+    this.ui = {
+      '*': {
+        spanLabelFixed: 120,
+        grid: { span: 24 }
+      },
+    };
+  }
+
+  close() {
+    this.modalRef.destroy();
+  }
+  save() {
+    this.sf.validator({ emitError: true });
+    if(!this.sf.valid) return;
+    // this.service.request('', { ...this.sf.value }).subscribe(res => {
+    //   if (res) {
+    //     this.modalRef.destroy(true);
+    //   } else {
+    //     this.service.msgSrv.error(res.msg);
+    //   }
+    // });
+  }
+
+  
+}
diff --git a/src/app/routes/partner/claim-audit/components/channel-detail/channel-detail.component.html b/src/app/routes/partner/claim-audit/components/channel-detail/channel-detail.component.html
new file mode 100644
index 00000000..08f52a77
--- /dev/null
+++ b/src/app/routes/partner/claim-audit/components/channel-detail/channel-detail.component.html
@@ -0,0 +1,62 @@
+
+<page-header-wrapper [title]="''" [logo]="logo" [content]="headerContent">
+    <ng-template #logo>
+      <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
+        <i nz-icon nzType="left" nzTheme="outline"></i>
+      </button>
+    </ng-template>
+    <ng-template #headerContent>
+      <div nz-row class="head-box">
+        <div nz-col nzSpan="1">
+          <img src="./assets/images/usercenter/拉货车.png" alt="" />
+        </div>
+        <div nz-col nzSpan="11" class="pl-lg">
+          <div class="right-h">深圳市XXXXXXX有限公司</div>
+          <div class="right-s">91440300357887492H</div>
+          <sv-container col="2" >
+            <sv label="联系人">  </sv>
+            <sv label="注册时间">  </sv>
+            <sv label="合同有效期">  </sv>
+            <sv label="运营主体"> </sv>
+          </sv-container>
+        </div>
+        <div nz-col nzSpan="10">
+          <div class="left-rt">待审核</div>
+          <div class="left-rb">
+            <button nz-button (click) ="reject()">拒绝</button>
+            <button nz-button nzType="primary" (click) ="approve()">通过</button>
+          </div>
+        </div>
+      </div>
+    </ng-template>
+  </page-header-wrapper>
+  <nz-card nzTitle="运单进度">
+    <div nz-row>
+      <div nz-col nzSpan="12">
+        <sv-container col="1" labelWidth="120">
+          <sv-title>现渠道销售（提交人）</sv-title>
+          <sv label="姓名">  </sv>
+          <sv label="手机号">  </sv>
+          <sv label="绑定时间">  </sv>
+          <sv label="认领备注">  </sv>
+          <sv label="提交时间">  </sv>
+        </sv-container>
+      </div>
+    </div>
+    <nz-divider></nz-divider>
+    <div nz-row>
+      <div nz-col nzSpan="12">
+        <sv-container col="1" labelWidth="120">
+          <sv-title>原渠道销售</sv-title>
+          <sv label="姓名">  </sv>
+          <sv label="手机号">  </sv>
+          <sv label="绑定时间">  </sv>
+        </sv-container>
+      </div>
+    </div>
+  </nz-card>
+  
+  <nz-card nzTitle="操作日志">
+    <st #st [data]="data" [columns]="columns"></st>
+  </nz-card>
+  
\ No newline at end of file
diff --git a/src/app/routes/partner/claim-audit/components/channel-detail/channel-detail.component.less b/src/app/routes/partner/claim-audit/components/channel-detail/channel-detail.component.less
new file mode 100644
index 00000000..e62642d0
--- /dev/null
+++ b/src/app/routes/partner/claim-audit/components/channel-detail/channel-detail.component.less
@@ -0,0 +1,27 @@
+:host {
+  .head-box {
+    img {
+      width: 80px;
+      height: 80px;
+      padding: 8px;
+    }
+    .right-h{
+      font-size: 16px;
+    }
+    .right-s{
+      color: #7f7f7f;
+    }
+
+    .left-rt {
+      font-weight: bold;
+      font-size: 16px;
+      text-align: right;
+    }
+
+    .left-rb {
+      display: flex;
+      justify-content: end;
+      padding-top: 16px;
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/app/routes/partner/claim-audit/components/channel-detail/channel-detail.component.ts b/src/app/routes/partner/claim-audit/components/channel-detail/channel-detail.component.ts
new file mode 100644
index 00000000..c3eca870
--- /dev/null
+++ b/src/app/routes/partner/claim-audit/components/channel-detail/channel-detail.component.ts
@@ -0,0 +1,82 @@
+
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { STColumn } from '@delon/abc/st';
+import { _HttpClient } from '@delon/theme';
+import { NzCardComponent } from 'ng-zorro-antd/card';
+import { NzMessageService } from 'ng-zorro-antd/message';
+import { NzModalService } from 'ng-zorro-antd/modal';
+import format from 'date-fns/format';
+
+import { ClaimAuditService } from '../../services/claim-audit.service';
+import { ParterClaimAuditListChannelApproveComponent } from '../channel-approve/channel-approve.component';
+import { ParterClaimAuditListChannelRejectComponent } from '../channel-reject/channel-reject.component';
+
+@Component({
+  selector: 'app-parter-claim-audit-channel-detail',
+  templateUrl: './channel-detail.component.html',
+  styleUrls: ['./channel-detail.component.less']
+})
+export class ParterClaimAuditListChannelDetailComponent implements OnInit {
+  id = this.route.snapshot.queryParams.id;
+  i: any;
+  imges: any;
+  isVisible = false;
+  columns: STColumn[] = [
+    { title: '操作时间', index: 'id', width: 120 },
+    { title: '操作人', type: 'img', width: 120, },
+    { title: '操作人手机号', index: 'email', width: 120 },
+    { title: '操作页面', index: 'phone' },
+    { title: '操作内容', index: 'registered' }
+  ];
+
+  data=[{id:11111}]
+
+  constructor(
+    private route: ActivatedRoute,
+    private msgSrv: NzMessageService,
+    private service: ClaimAuditService,
+    private modalService: NzModalService,
+    private router: Router
+  ) {}
+
+  ngOnInit(): void {
+    this.initData();
+  }
+
+  initData() {
+    // this.service.request(this.service.$api_getBulkBillDetail, { id: this.id }).subscribe(res => {
+    //   if (res) {
+    //     this.i = res;
+    //   
+    //   }
+    // });
+  }
+
+  approve() {
+    const modalRef = this.modalService.create({
+      nzTitle: '同意',
+      nzWidth: 700,
+      nzContent: ParterClaimAuditListChannelApproveComponent,
+      nzComponentParams: {
+        i: this.i
+      },
+      nzFooter: null
+    });
+  }
+  reject() {
+    const modalRef = this.modalService.create({
+      nzTitle: '拒绝',
+      nzWidth: 700,
+      nzContent: ParterClaimAuditListChannelRejectComponent,
+      nzComponentParams: {
+        i: this.i
+      },
+      nzFooter: null
+    });
+  }
+  goBack() {
+    window.history.go(-1);
+  }
+  
+}
diff --git a/src/app/routes/partner/claim-audit/components/channel-reject/channel-reject.component.html b/src/app/routes/partner/claim-audit/components/channel-reject/channel-reject.component.html
new file mode 100644
index 00000000..dc134ee2
--- /dev/null
+++ b/src/app/routes/partner/claim-audit/components/channel-reject/channel-reject.component.html
@@ -0,0 +1,9 @@
+<sf #sf [ui]="ui" [schema]="schema" [button]="'none'" [formData]="i">
+</sf>
+<div style="font-size: 8px;">
+  结算起算日：指给合伙人结算佣金的起算时间，更换合伙人，该日期是当前合伙人的结算起算日，原合伙人的结算结束时间则为此日期的前一天
+</div>
+<div *nzModalFooter>
+  <button nz-button nzType="default" (click)="close()">取消</button>
+  <button nz-button nzType="primary" (click)="save()">确认</button>
+</div>
diff --git a/src/app/routes/partner/claim-audit/components/channel-reject/channel-reject.component.ts b/src/app/routes/partner/claim-audit/components/channel-reject/channel-reject.component.ts
new file mode 100644
index 00000000..27566f45
--- /dev/null
+++ b/src/app/routes/partner/claim-audit/components/channel-reject/channel-reject.component.ts
@@ -0,0 +1,98 @@
+import { AfterViewInit, ChangeDetectorRef, Component, OnChanges, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { SFComponent, SFRadioWidgetSchema, SFSchema, SFSchemaEnumType, SFSelectWidgetSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form';
+import { _HttpClient } from '@delon/theme';
+import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
+import { map } from 'rxjs/operators';
+import { AmapPoiPickerComponent } from 'src/app/shared/components/amap';
+import { ClaimAuditService } from '../../services/claim-audit.service';
+
+
+@Component({
+  selector: 'app-parter-claim-audit-channel-reject',
+  templateUrl: './channel-reject.component.html'
+})
+export class ParterClaimAuditListChannelRejectComponent implements OnInit {
+  @ViewChild('sf', { static: false }) sf!: SFComponent;
+  schema!: SFSchema;
+  ui!: SFUISchema;
+  i: any;
+  type: any;
+
+  constructor(
+    public http: _HttpClient,
+    private cdr: ChangeDetectorRef,
+    private route: ActivatedRoute,
+    private modalService: NzModalService,
+    public service: ClaimAuditService,
+    private modalRef: NzModalRef
+  ) {}
+
+  ngOnInit(): void {
+    this.initSF();
+  }
+  initSF() {
+    this.schema = {
+      properties: {
+        id: {
+          type: 'string',
+          title: '',
+          ui: { hidden: true }
+        },
+        name1: {
+          title: '合伙人(认领人)',
+          type: 'string',
+          ui: {
+            widget: 'text',
+          } ,
+        },
+        name2: {
+          title: '认领客户名称',
+          type: 'string',
+          ui: {
+            widget: 'text',
+          } ,
+        },
+        data: {
+          title: '结算起算日期',
+          type: 'string',
+          format: 'date',
+        },
+        name3: {
+          type: 'string',
+          title: '备注',
+          maxLength: 50,
+          ui: {
+            widget: 'textarea',
+            autosize: { minRows: 3, maxRows: 6 },
+            placeholder:'请不要超过50个字'
+          } as SFTextareaWidgetSchema,
+        },
+      },
+      required: ['name3']
+    };
+    this.ui = {
+      '*': {
+        spanLabelFixed: 120,
+        grid: { span: 24 }
+      },
+    };
+  }
+
+  close() {
+    this.modalRef.destroy();
+  }
+  save() {
+    this.sf.validator({ emitError: true });
+    if(!this.sf.valid) return;
+    // this.service.request('', { ...this.sf.value }).subscribe(res => {
+    //   if (res) {
+    //     this.modalRef.destroy(true);
+    //   } else {
+    //     this.service.msgSrv.error(res.msg);
+    //   }
+    // });
+  }
+
+  
+}
diff --git a/src/app/routes/partner/claim-audit/components/list/list.component.html b/src/app/routes/partner/claim-audit/components/list/list.component.html
new file mode 100644
index 00000000..8e321e48
--- /dev/null
+++ b/src/app/routes/partner/claim-audit/components/list/list.component.html
@@ -0,0 +1,66 @@
+<page-header-wrapper [title]="''"></page-header-wrapper>
+<!-- 搜索表单 -->
+<nz-card>
+  <div nz-row nzGutter="8">
+    <!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
+    <div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
+      <sf
+        #sf
+        [schema]="schema"
+        [ui]="ui"
+        [mode]="'search'"
+        [loading]="service.http.loading"
+        (formSubmit)="search()"
+        (formReset)="resetSF()"
+      ></sf>
+    </div>
+
+    <!-- 查询字段大于3个时，根据展开状态调整布局 -->
+    <ng-container *ngIf="queryFieldCount > 4">
+      <div nz-col [nzSpan]="_$expand ? 24 : 18">
+        <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
+      </div>
+      <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
+        <button nz-button nzType="primary" [disabled]="!sf.valid"  (click)="search()" >查询</button>
+        <button nz-button (click)="resetSF()" >重置</button>
+        <button nz-button nzType="link" (click)="expandToggle()">
+          {{ !_$expand ? '展开' : '收起' }}
+          <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
+        </button>
+      </div>
+    </ng-container>
+  </div>
+</nz-card>
+
+<nz-card>
+  <nz-tabset [nzSelectedIndex]="selectedIndex" (nzSelectChange) = "tabChange($event)">
+    <nz-tab nzTitle="合伙人认领">
+      <st
+        #st1
+        [data]="data"
+        [columns]="columns1"
+        [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+        [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+        [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+        [loadingDelay]="500"
+        [loading]="service.http.loading"
+      >
+      </st>
+    </nz-tab>
+    <nz-tab nzTitle="渠道销售认领">
+      <st
+        #st2
+        [data]="data"
+        [columns]="columns2"
+        [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+        [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+        [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+        [loadingDelay]="500"
+        [loading]="service.http.loading"
+      >
+      </st>
+    </nz-tab>
+  </nz-tabset>
+  
+  
+</nz-card>
diff --git a/src/app/routes/partner/claim-audit/components/list/list.component.ts b/src/app/routes/partner/claim-audit/components/list/list.component.ts
new file mode 100644
index 00000000..cf817568
--- /dev/null
+++ b/src/app/routes/partner/claim-audit/components/list/list.component.ts
@@ -0,0 +1,230 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st';
+import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
+import { processSingleSort } from '@shared';
+import { NzModalService } from 'ng-zorro-antd/modal';
+import { ClaimAuditService } from '../../services/claim-audit.service';
+
+@Component({
+  selector: 'app-parter-claim-audit-list',
+  templateUrl: './list.component.html'
+})
+export class ParterClaimAuditListComponent implements OnInit {
+  schema: SFSchema = {};
+  columns1!: STColumn[];
+  columns2!: STColumn[];
+  @ViewChild('st1', { static: false })
+  st1!: STComponent;
+  @ViewChild('st2', { static: false })
+  st2!: STComponent;
+  ui!: SFUISchema;
+  @ViewChild('sf', { static: false })
+  sf!: SFComponent;
+  _$expand = false;
+  selectedIndex =  0;
+
+  data=[{name1:1111}]
+  constructor(
+    public router: Router,
+    public ar: ActivatedRoute,
+    public service: ClaimAuditService,
+    private modalService: NzModalService
+  ) {}
+
+  /**
+   * 查询参数
+   */
+  get reqParams() {
+    return { ...this.sf?.value };
+  }
+    /**
+   * 查询字段个数
+   */
+     get queryFieldCount(): number {
+      return Object.keys(this.schema?.properties || {}).length;
+    }
+    /**
+     * 伸缩查询条件
+     */
+    expandToggle(): void {
+      this._$expand = !this._$expand;
+      this.sf?.setValue('/_$expand', this._$expand);
+    }
+
+  ngOnInit() {
+    this.initSF();
+    this.initST1();
+    this.initST2();
+  }
+
+  initSF() {
+    this.schema = {
+      properties: {
+        _$expand: { type: 'boolean', ui: { hidden: true } },
+        name: {
+          type: 'string',
+          title: '认领人'
+        },
+        name1: {
+          type: 'string',
+          title: '客户名称'
+        },
+        name2: {
+          type: 'string',
+          title: '平台审核状态'
+        },
+        name3: {
+          type: 'string',
+          title: '渠道销售状态',
+          ui: {
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            }
+          }
+        },
+        name4: {
+          type: 'string',
+          title: 'CRM状态',
+          ui: {
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            }
+          }
+        },
+      }
+    };
+    this.ui = {
+      '*': {
+        grid: { span: 8, gutter: 4 }
+      }
+    };
+  }
+
+  initST1() {
+    this.columns1 = [
+      {
+        title: '提交人',
+        index: 'name1'
+      },
+      {
+        title: '客户名称',
+        index: 'name1'
+      },
+      {
+        title: '认领备注',
+        index: 'name1'
+      },
+      {
+        title: '渠道销售审核状态',
+        index: 'name1'
+      },
+      {
+        title: 'CRM状态',
+        index: 'name1'
+      },
+      {
+        title: '平台审核状态',
+        index: 'name1'
+      },
+      {
+        title: 'CRM状态',
+        index: 'name1'
+      },
+      {
+        title: '提交时间',
+        index: 'name1'
+      },
+      {
+        title: '操作',
+        className: 'text-center',
+        buttons: [
+          {
+            text: '详情',
+            click: (_record, _modal, _instance) => this.partnerView(_record),
+          },
+          {
+            text: '审核',
+            click: (_record, _modal, _instance) => this.partnerView(_record),
+          },
+        ]
+      }
+    ];
+  }
+
+  initST2() {
+    this.columns2 = [
+      {
+        title: '提交人',
+        index: 'name1'
+      },
+      {
+        title: '客户名称',
+        index: 'name1'
+      },
+      {
+        title: '认领备注',
+        index: 'name1'
+      },
+      {
+        title: 'CRM状态',
+        index: 'name1'
+      },
+      {
+        title: '平台审核状态',
+        index: 'name1'
+      },
+      {
+        title: '提交时间',
+        index: 'name1'
+      },
+      {
+        title: '操作',
+        className: 'text-center',
+        buttons: [
+          {
+            text: '详情',
+            click: (_record, _modal, _instance) => this.channelView(_record),
+          },
+          {
+            text: '审核',
+            click: (_record, _modal, _instance) => this.channelView(_record),
+          },
+
+        ]
+      }
+    ];
+  }
+
+  partnerView(record: STData) {
+    this.router.navigate(['/partner/claim-audit/partner-detail'], { queryParams: {} });
+  }
+  
+  channelView(record: STData) {
+    this.router.navigate(['/partner/claim-audit/channel-detail'], { queryParams: {} });
+  }
+  /**
+   * 重置表单
+   */
+  resetSF() {
+    this.sf.reset();
+  }
+  search() {
+    // this.st1?.load(1);
+  }
+
+  tabChange(index:any){
+    console.log(index)
+    switch (index) {
+      case 0:
+        this.initST1();
+        break;
+      case 1:
+        this.initST2();
+        break;
+      default:
+        break;
+    }
+  }
+
+}
diff --git a/src/app/routes/partner/claim-audit/components/partner-approve/partner-approve.component.html b/src/app/routes/partner/claim-audit/components/partner-approve/partner-approve.component.html
new file mode 100644
index 00000000..dc134ee2
--- /dev/null
+++ b/src/app/routes/partner/claim-audit/components/partner-approve/partner-approve.component.html
@@ -0,0 +1,9 @@
+<sf #sf [ui]="ui" [schema]="schema" [button]="'none'" [formData]="i">
+</sf>
+<div style="font-size: 8px;">
+  结算起算日：指给合伙人结算佣金的起算时间，更换合伙人，该日期是当前合伙人的结算起算日，原合伙人的结算结束时间则为此日期的前一天
+</div>
+<div *nzModalFooter>
+  <button nz-button nzType="default" (click)="close()">取消</button>
+  <button nz-button nzType="primary" (click)="save()">确认</button>
+</div>
diff --git a/src/app/routes/partner/claim-audit/components/partner-approve/partner-approve.component.ts b/src/app/routes/partner/claim-audit/components/partner-approve/partner-approve.component.ts
new file mode 100644
index 00000000..86f5e72d
--- /dev/null
+++ b/src/app/routes/partner/claim-audit/components/partner-approve/partner-approve.component.ts
@@ -0,0 +1,98 @@
+import { AfterViewInit, ChangeDetectorRef, Component, OnChanges, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { SFComponent, SFRadioWidgetSchema, SFSchema, SFSchemaEnumType, SFSelectWidgetSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form';
+import { _HttpClient } from '@delon/theme';
+import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
+import { map } from 'rxjs/operators';
+import { AmapPoiPickerComponent } from 'src/app/shared/components/amap';
+import { ClaimAuditService } from '../../services/claim-audit.service';
+
+
+@Component({
+  selector: 'app-parter-claim-audit-partner-approve',
+  templateUrl: './partner-approve.component.html'
+})
+export class ParterClaimAuditListPartnerApproveComponent implements OnInit {
+  @ViewChild('sf', { static: false }) sf!: SFComponent;
+  schema!: SFSchema;
+  ui!: SFUISchema;
+  i: any;
+  type: any;
+
+  constructor(
+    public http: _HttpClient,
+    private cdr: ChangeDetectorRef,
+    private route: ActivatedRoute,
+    private modalService: NzModalService,
+    public service: ClaimAuditService,
+    private modalRef: NzModalRef
+  ) {}
+
+  ngOnInit(): void {
+    this.initSF();
+  }
+  initSF() {
+    this.schema = {
+      properties: {
+        id: {
+          type: 'string',
+          title: '',
+          ui: { hidden: true }
+        },
+        name1: {
+          title: '合伙人(认领人)',
+          type: 'string',
+          ui: {
+            widget: 'text',
+          } ,
+        },
+        name2: {
+          title: '认领客户名称',
+          type: 'string',
+          ui: {
+            widget: 'text',
+          } ,
+        },
+        data: {
+          title: '结算起算日期',
+          type: 'string',
+          format: 'date',
+        },
+        name3: {
+          type: 'string',
+          title: '备注',
+          maxLength: 50,
+          ui: {
+            widget: 'textarea',
+            autosize: { minRows: 3, maxRows: 6 },
+            placeholder:'请不要超过50个字'
+          } as SFTextareaWidgetSchema,
+        },
+      },
+      required: ['name3']
+    };
+    this.ui = {
+      '*': {
+        spanLabelFixed: 120,
+        grid: { span: 24 }
+      },
+    };
+  }
+
+  close() {
+    this.modalRef.destroy();
+  }
+  save() {
+    this.sf.validator({ emitError: true });
+    if(!this.sf.valid) return;
+    // this.service.request('', { ...this.sf.value }).subscribe(res => {
+    //   if (res) {
+    //     this.modalRef.destroy(true);
+    //   } else {
+    //     this.service.msgSrv.error(res.msg);
+    //   }
+    // });
+  }
+
+  
+}
diff --git a/src/app/routes/partner/claim-audit/components/partner-detail/partner-detail.component.html b/src/app/routes/partner/claim-audit/components/partner-detail/partner-detail.component.html
new file mode 100644
index 00000000..c6370656
--- /dev/null
+++ b/src/app/routes/partner/claim-audit/components/partner-detail/partner-detail.component.html
@@ -0,0 +1,79 @@
+
+<page-header-wrapper [title]="''" [logo]="logo" [content]="headerContent">
+  <ng-template #logo>
+    <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
+      <i nz-icon nzType="left" nzTheme="outline"></i>
+    </button>
+  </ng-template>
+  <ng-template #headerContent>
+    <div nz-row class="head-box">
+      <div nz-col nzSpan="1">
+        <img src="./assets/images/usercenter/拉货车.png" alt="" />
+      </div>
+      <div nz-col nzSpan="11" class="pl-lg">
+        <div class="right-h">深圳市XXXXXXX有限公司</div>
+        <div class="right-s">91440300357887492H</div>
+        <sv-container col="2">
+          <sv label="管理员">  </sv>
+          <sv label="注册时间">  </sv>
+          <sv label="合同有效期">  </sv>
+          <sv label="运营主体"> </sv>
+        </sv-container>
+      </div>
+      <div nz-col nzSpan="10">
+        <div class="left-rt">待审核</div>
+        <div class="left-rb">
+          <button nz-button (click) ="reject()">拒绝</button>
+          <button nz-button nzType="primary" (click) ="approve()">通过</button>
+        </div>
+      </div>
+    </div>
+  </ng-template>
+</page-header-wrapper>
+<nz-card nzTitle="运单进度">
+  <div nz-row>
+    <div nz-col nzSpan="12">
+      <sv-container col="1" labelWidth="120">
+        <sv-title>现合伙人（提交人）</sv-title>
+        <sv label="合伙人名称">  </sv>
+        <sv label="手机号">  </sv>
+        <sv label="绑定时间">  </sv>
+        <sv label="结算时间段"> </sv>
+        <sv label="认领备注"> </sv>
+        <sv label="提交时间"> </sv>
+      </sv-container>
+    </div>
+    <div nz-col nzSpan="12">
+      <sv-container col="1" labelWidth="120">
+        <sv-title>现渠道销售</sv-title>
+        <sv label="姓名">  </sv>
+        <sv label="手机号">  </sv>
+        <sv label="绑定时间">  </sv>
+      </sv-container>
+    </div>
+  </div>
+  <nz-divider></nz-divider>
+  <div nz-row>
+    <div nz-col nzSpan="12">
+      <sv-container col="1" labelWidth="120">
+        <sv-title>原合伙人</sv-title>
+        <sv label="合伙人名称">  </sv>
+        <sv label="管理员">  </sv>
+        <sv label="绑定时间">  </sv>
+        <sv label="结算时间段"> </sv>
+      </sv-container>
+    </div>
+    <div nz-col nzSpan="12">
+      <sv-container col="1" labelWidth="120">
+        <sv-title>原渠道销售</sv-title>
+        <sv label="姓名">  </sv>
+        <sv label="手机号">  </sv>
+        <sv label="绑定时间">  </sv>
+      </sv-container>
+    </div>
+  </div>
+</nz-card>
+
+<nz-card nzTitle="操作日志">
+  <st #st [data]="data" [columns]="columns"></st>
+</nz-card>
diff --git a/src/app/routes/partner/claim-audit/components/partner-detail/partner-detail.component.less b/src/app/routes/partner/claim-audit/components/partner-detail/partner-detail.component.less
new file mode 100644
index 00000000..06d8b068
--- /dev/null
+++ b/src/app/routes/partner/claim-audit/components/partner-detail/partner-detail.component.less
@@ -0,0 +1,26 @@
+:host {
+  .head-box {
+    img {
+      width: 80px;
+      height: 80px;
+      padding: 8px;
+    }
+    .right-h{
+      font-size: 16px;
+    }
+    .right-s{
+      color: #7f7f7f;
+    }
+    .left-rt {
+      font-weight: bold;
+      font-size: 16px;
+      text-align: right;
+    }
+
+    .left-rb {
+      display: flex;
+      justify-content: end;
+      padding-top: 16px;
+    }
+  }
+}
diff --git a/src/app/routes/partner/claim-audit/components/partner-detail/partner-detail.component.ts b/src/app/routes/partner/claim-audit/components/partner-detail/partner-detail.component.ts
new file mode 100644
index 00000000..41f5558f
--- /dev/null
+++ b/src/app/routes/partner/claim-audit/components/partner-detail/partner-detail.component.ts
@@ -0,0 +1,82 @@
+
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { STColumn } from '@delon/abc/st';
+import { _HttpClient } from '@delon/theme';
+import { NzCardComponent } from 'ng-zorro-antd/card';
+import { NzMessageService } from 'ng-zorro-antd/message';
+import { NzModalService } from 'ng-zorro-antd/modal';
+import format from 'date-fns/format';
+import { ClaimAuditService } from '../../services/claim-audit.service';
+import { ParterClaimAuditListPartnerRejectComponent } from '../partner-reject/partner-reject.component';
+import {  ParterClaimAuditListPartnerApproveComponent } from '../partner-approve/partner-approve.component';
+
+@Component({
+  selector: 'app-parter-claim-audit-partner-detail',
+  templateUrl: './partner-detail.component.html',
+  styleUrls: ['./partner-detail.component.less']
+})
+export class ParterClaimAuditListPartnerDetailComponent implements OnInit {
+  id = this.route.snapshot.queryParams.id;
+  i: any;
+  imges: any;
+  isVisible = false;
+  columns: STColumn[] = [
+    { title: '操作时间', index: 'id', width: 120 },
+    { title: '操作人', type: 'img', width: 120, },
+    { title: '操作人手机号', index: 'email', width: 120 },
+    { title: '操作页面', index: 'phone' },
+    { title: '操作内容', index: 'registered' }
+  ];
+
+  data=[{id:11111}]
+
+  constructor(
+    private route: ActivatedRoute,
+    private msgSrv: NzMessageService,
+    private service: ClaimAuditService,
+    private modalService: NzModalService,
+    private router: Router
+  ) {}
+
+  ngOnInit(): void {
+    this.initData();
+  }
+
+  initData() {
+    // this.service.request(this.service.$api_getBulkBillDetail, { id: this.id }).subscribe(res => {
+    //   if (res) {
+    //     this.i = res;
+    //   
+    //   }
+    // });
+  }
+
+  approve() {
+    const modalRef = this.modalService.create({
+      nzTitle: '同意',
+      nzWidth: 700,
+      nzContent: ParterClaimAuditListPartnerApproveComponent,
+      nzComponentParams: {
+        i: this.i
+      },
+      nzFooter: null
+    });
+  }
+  reject() {
+    const modalRef = this.modalService.create({
+      nzTitle: '拒绝',
+      nzWidth: 700,
+      nzContent: ParterClaimAuditListPartnerRejectComponent,
+      nzComponentParams: {
+        i: this.i
+      },
+      nzFooter: null
+    });
+  }
+  goBack() {
+    window.history.go(-1);
+  }
+
+
+}
diff --git a/src/app/routes/partner/claim-audit/components/partner-reject/partner-reject.component.html b/src/app/routes/partner/claim-audit/components/partner-reject/partner-reject.component.html
new file mode 100644
index 00000000..dc134ee2
--- /dev/null
+++ b/src/app/routes/partner/claim-audit/components/partner-reject/partner-reject.component.html
@@ -0,0 +1,9 @@
+<sf #sf [ui]="ui" [schema]="schema" [button]="'none'" [formData]="i">
+</sf>
+<div style="font-size: 8px;">
+  结算起算日：指给合伙人结算佣金的起算时间，更换合伙人，该日期是当前合伙人的结算起算日，原合伙人的结算结束时间则为此日期的前一天
+</div>
+<div *nzModalFooter>
+  <button nz-button nzType="default" (click)="close()">取消</button>
+  <button nz-button nzType="primary" (click)="save()">确认</button>
+</div>
diff --git a/src/app/routes/partner/claim-audit/components/partner-reject/partner-reject.component.ts b/src/app/routes/partner/claim-audit/components/partner-reject/partner-reject.component.ts
new file mode 100644
index 00000000..09abe28f
--- /dev/null
+++ b/src/app/routes/partner/claim-audit/components/partner-reject/partner-reject.component.ts
@@ -0,0 +1,98 @@
+import { AfterViewInit, ChangeDetectorRef, Component, OnChanges, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { SFComponent, SFRadioWidgetSchema, SFSchema, SFSchemaEnumType, SFSelectWidgetSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form';
+import { _HttpClient } from '@delon/theme';
+import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
+import { map } from 'rxjs/operators';
+import { AmapPoiPickerComponent } from 'src/app/shared/components/amap';
+import { ClaimAuditService } from '../../services/claim-audit.service';
+
+
+@Component({
+  selector: 'app-parter-claim-audit-partner-reject',
+  templateUrl: './partner-reject.component.html'
+})
+export class ParterClaimAuditListPartnerRejectComponent implements OnInit {
+  @ViewChild('sf', { static: false }) sf!: SFComponent;
+  schema!: SFSchema;
+  ui!: SFUISchema;
+  i: any;
+  type: any;
+
+  constructor(
+    public http: _HttpClient,
+    private cdr: ChangeDetectorRef,
+    private route: ActivatedRoute,
+    private modalService: NzModalService,
+    public service: ClaimAuditService,
+    private modalRef: NzModalRef
+  ) {}
+
+  ngOnInit(): void {
+    this.initSF();
+  }
+  initSF() {
+    this.schema = {
+      properties: {
+        id: {
+          type: 'string',
+          title: '',
+          ui: { hidden: true }
+        },
+        name1: {
+          title: '合伙人(认领人)',
+          type: 'string',
+          ui: {
+            widget: 'text',
+          } ,
+        },
+        name2: {
+          title: '认领客户名称',
+          type: 'string',
+          ui: {
+            widget: 'text',
+          } ,
+        },
+        data: {
+          title: '结算起算日期',
+          type: 'string',
+          format: 'date',
+        },
+        name3: {
+          type: 'string',
+          title: '备注',
+          maxLength: 50,
+          ui: {
+            widget: 'textarea',
+            autosize: { minRows: 3, maxRows: 6 },
+            placeholder:'请不要超过50个字'
+          } as SFTextareaWidgetSchema,
+        },
+      },
+      required: ['name3']
+    };
+    this.ui = {
+      '*': {
+        spanLabelFixed: 120,
+        grid: { span: 24 }
+      },
+    };
+  }
+
+  close() {
+    this.modalRef.destroy();
+  }
+  save() {
+    this.sf.validator({ emitError: true });
+    if(!this.sf.valid) return;
+    // this.service.request('', { ...this.sf.value }).subscribe(res => {
+    //   if (res) {
+    //     this.modalRef.destroy(true);
+    //   } else {
+    //     this.service.msgSrv.error(res.msg);
+    //   }
+    // });
+  }
+
+  
+}
diff --git a/src/app/routes/partner/claim-audit/services/claim-audit.service.ts b/src/app/routes/partner/claim-audit/services/claim-audit.service.ts
new file mode 100644
index 00000000..a102b596
--- /dev/null
+++ b/src/app/routes/partner/claim-audit/services/claim-audit.service.ts
@@ -0,0 +1,12 @@
+import { Injectable, Injector } from '@angular/core';
+import { BaseService } from '@shared';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class ClaimAuditService extends BaseService {
+
+  constructor(public injector: Injector) {
+    super(injector);
+  }
+}
diff --git a/src/app/routes/partner/level-config/components/list/list.component.html b/src/app/routes/partner/level-config/components/list/list.component.html
index 6cc8f619..fd0078d8 100644
--- a/src/app/routes/partner/level-config/components/list/list.component.html
+++ b/src/app/routes/partner/level-config/components/list/list.component.html
@@ -15,7 +15,6 @@
   <!-- 数据列表 -->
   <st
     #st
-    [bordered]="true"
     [data]="data"
     [columns]="columns"
     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
diff --git a/src/app/routes/partner/partner-routing.module.ts b/src/app/routes/partner/partner-routing.module.ts
index 6cd0f164..354f2506 100644
--- a/src/app/routes/partner/partner-routing.module.ts
+++ b/src/app/routes/partner/partner-routing.module.ts
@@ -22,6 +22,9 @@ import { PartnerSalePartnerDetailComponent } from './business-statistics/compone
 import { PartnerPartnerCustomOrderDetailComponent } from './business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component';
 import { PartnerPartnerOrderDetailComponent } from './business-statistics/components/partner-order-detail/partner-order-detail.component';
 import { PartnerAccountManagementListComponent } from './account-management/components/list/list.component';
+import { ParterClaimAuditListComponent } from './claim-audit/components/list/list.component';
+import { ParterClaimAuditListChannelDetailComponent } from './claim-audit/components/channel-detail/channel-detail.component';
+import { ParterClaimAuditListPartnerDetailComponent } from './claim-audit/components/partner-detail/partner-detail.component';
 
 const routes: Routes = [
   {
@@ -62,8 +65,20 @@ const routes: Routes = [
     path: 'account-management',
     children: [
       { path: 'list', component: PartnerAccountManagementListComponent },
+      { path: 'channel-detail', component: ParterClaimAuditListChannelDetailComponent },
+      { path: 'partner-detail', component: ParterClaimAuditListPartnerDetailComponent },
     ]
-  }];
+  },
+  {
+    path: 'claim-audit',
+    children: [
+      { path: '', component: ParterClaimAuditListComponent },
+      { path: 'list', component: ParterClaimAuditListComponent },
+      { path: 'channel-detail', component: ParterClaimAuditListChannelDetailComponent },
+      { path: 'partner-detail', component: ParterClaimAuditListPartnerDetailComponent },
+    ]
+  },
+];
 @NgModule({
   imports: [RouterModule.forChild(routes)],
   exports: [RouterModule]
diff --git a/src/app/routes/partner/partner.module.ts b/src/app/routes/partner/partner.module.ts
index 157b33d6..d276a1a5 100644
--- a/src/app/routes/partner/partner.module.ts
+++ b/src/app/routes/partner/partner.module.ts
@@ -16,7 +16,13 @@ import { PartnerSalePartnerDetailComponent } from './business-statistics/compone
 import { PartnerPartnerCustomOrderDetailComponent } from './business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component';
 import { PartnerPartnerOrderDetailComponent } from './business-statistics/components/partner-order-detail/partner-order-detail.component';
 import { PartnerAccountManagementListComponent } from './account-management/components/list/list.component';
-
+import { ParterClaimAuditListComponent } from './claim-audit/components/list/list.component';
+import { ParterClaimAuditListChannelDetailComponent } from './claim-audit/components/channel-detail/channel-detail.component';
+import { ParterClaimAuditListPartnerDetailComponent } from './claim-audit/components/partner-detail/partner-detail.component';
+import { ParterClaimAuditListChannelApproveComponent } from './claim-audit/components/channel-approve/channel-approve.component';
+import { ParterClaimAuditListPartnerApproveComponent } from './claim-audit/components/partner-approve/partner-approve.component';
+import { ParterClaimAuditListPartnerRejectComponent } from './claim-audit/components/partner-reject/partner-reject.component';
+import { ParterClaimAuditListChannelRejectComponent } from './claim-audit/components/channel-reject/channel-reject.component';
 const COMPONENTS: any[] = [
   PartnerBusinessStatisticsIndexComponent,
   ParterChannelSalesListComponent,
@@ -32,7 +38,16 @@ const COMPONENTS: any[] = [
   PartnerSalePartnerDetailComponent,
   PartnerPartnerCustomOrderDetailComponent,
   PartnerPartnerOrderDetailComponent,
-  PartnerAccountManagementListComponent];
+  PartnerAccountManagementListComponent,
+  ParterClaimAuditListComponent,
+  ParterClaimAuditListChannelDetailComponent,
+  ParterClaimAuditListPartnerDetailComponent,
+  ParterClaimAuditListPartnerApproveComponent,
+  ParterClaimAuditListPartnerRejectComponent,
+  ParterClaimAuditListChannelApproveComponent,
+  ParterClaimAuditListChannelRejectComponent
+];
+
 
 @NgModule({
   declarations: [...COMPONENTS],
diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json
index 223b2212..d3292496 100644
--- a/src/assets/mocks/menu-data.json
+++ b/src/assets/mocks/menu-data.json
@@ -544,6 +544,10 @@
                 "text": "账户管理",
                 "link": "/partner/account-management/list"
               }]
+            },
+            {
+              "text": "客户认领审核",
+              "link": "/partner/claim-audit/list"
             }
           ]
         }

From 1dc6d31ba82be1e754c666da31ed333b3858b394 Mon Sep 17 00:00:00 2001
From: heqinghang <qinghang.he@eascs.com>
Date: Thu, 10 Mar 2022 13:22:30 +0800
Subject: [PATCH 19/70] 666

---
 src/assets/mocks/menu-data.json | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json
index 51557bbf..473d4c2f 100644
--- a/src/assets/mocks/menu-data.json
+++ b/src/assets/mocks/menu-data.json
@@ -562,7 +562,18 @@
             },
             {
               "text": "客户认领审核",
-              "link": "/partner/claim-audit/list"
+              "link": "/partner/claim-audit/list",
+              "children": [{
+                "text": "合伙人客户认领详情",
+                "link": "/partner/claim-audit/partner-detail",
+                "hide": true
+              },
+              {
+                "text": "渠道销售客户认领详情",
+                "link": "/partner/claim-audit/channel-detail",
+                "hide": true
+              }
+            ]
             }
           ]
         }

From 5e93d5de64266d459b4621c3e9e1eef8d1e1b159 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= <xiaoyun.pan@eascs.com>
Date: Thu, 10 Mar 2022 13:39:28 +0800
Subject: [PATCH 20/70] -

---
 .../withdrawals-detail.component.html            | 10 +++++-----
 .../withdrawals-detail.component.ts              | 16 +++++++++++++++-
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html
index 82f0ce06..f9b29185 100644
--- a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html
+++ b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html
@@ -16,9 +16,9 @@
     </ng-template>
 </page-header-wrapper>
 
-<nz-card>
+<nz-card [nzLoading]="service.http.loading">
     <nz-alert nzType="info" nzMessage="提现信息" class="mb-md"></nz-alert>
-    <div se-container [labelWidth]="100">
+    <div se-container [labelWidth]="130">
         <se label="网络货运人">
             {{formData?.ltdName}}
         </se>
@@ -41,16 +41,16 @@
             {{formData?.refundStatusLabel}}
         </se>
         <se label="提现金额">
-            {{formData?.amount}}
+            {{formData?.amount | currency}}
         </se>
         <se label="银行流水号">
             {{formData?.bankSerialNumber}}
         </se>
         <se label="提现至银行卡">
-            {{formData?.bankId}}
+            {{formData?.bankCardNumber}}
         </se>
         <se label="银行回单" col="1">
-            <img [src]="formData?.bankCardNumber" alt="" style="width: 200px;height: 160px;">
+            <a (click)="downBack()">{{formData?.refundStatus==='3'?'下载回单':'暂无回单'}}</a>
         </se>
     </div>
 
diff --git a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts
index 74f5b1d4..2332fd75 100644
--- a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts
+++ b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts
@@ -2,8 +2,9 @@ import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { FreightAccountService } from 'src/app/routes/financial-management/services/freight-account.service';
 
+
 @Component({
-  selector: 'app-partner-account-management-withdrawals-detail',
+  selector: 'app-withdrawals-detail',
   templateUrl: './withdrawals-detail.component.html',
   styleUrls: ['./withdrawals-detail.component.less']
 })
@@ -67,6 +68,19 @@ export class PartnerAccountManagementWithdrawalsDetailComponent implements OnIni
     });
   }
 
+  downBack() {
+    if (this.formData?.refundStatus !== '3') {
+      return;
+    }
+    this.service.getReceiptUrl(this.formData.receiptUrl, {
+      bankType: this.formData.bankType,
+      rmYll: this.formData.userId,
+      snglFlgCd: this.formData.coreSerNo,
+      bussType: '06',
+      ltdId: this.formData.ltdId
+    });
+  }
+
   goBack() {
     history.go(-1);
   }

From 1a353f4c93b4725035cdcdf5ea252c2e8fb21e67 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Thu, 10 Mar 2022 14:15:58 +0800
Subject: [PATCH 21/70] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../record-detail.component.html              |  8 ++-
 .../record-detail.component.less              |  6 ++
 .../record-detail/record-detail.component.ts  | 68 +++++++------------
 .../services/rebate-management.service.ts     | 13 +++-
 4 files changed, 49 insertions(+), 46 deletions(-)
 create mode 100644 src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.less

diff --git a/src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.html b/src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.html
index 65099230..4f7723fe 100644
--- a/src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.html
+++ b/src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.html
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-02-24 20:09:49
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-09 15:14:50
+ * @LastEditTime : 2022-03-10 14:05:25
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\model\\record-detail\\record-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -23,7 +23,7 @@
   <st
     #st
     [bordered]="true"
-    [data]="data"
+    [data]="service.$api_get_listCompliancePage"
     [columns]="columns"
     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
     [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
@@ -32,3 +32,7 @@
     [loading]="service.http.loading"
   >
   </st>
+  <div>合计：2999.00元</div>
+  <div nz-col class="text-center">
+  <button nz-button nzType="primary" (click)="close()">确定</button>
+  </div>
\ No newline at end of file
diff --git a/src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.less b/src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.less
new file mode 100644
index 00000000..52b47a0e
--- /dev/null
+++ b/src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.less
@@ -0,0 +1,6 @@
+:host {
+    [nz-button] {
+        margin-right: 8px;
+        margin-bottom: 12px;
+      }
+}
\ No newline at end of file
diff --git a/src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.ts b/src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.ts
index b5c70083..1efde6a2 100644
--- a/src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.ts
+++ b/src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.ts
@@ -2,10 +2,11 @@ import { ModalHelper } from '@delon/theme';
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st';
-import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
+import { SFComponent, SFDateWidgetSchema, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
 import { processSingleSort, ShipperBaseService } from '@shared';
-import { NzModalService } from 'ng-zorro-antd/modal';
+import { NzModalService, NzModalRef } from 'ng-zorro-antd/modal';
 import { RebateManagementService } from '../../services/rebate-management.service';
+import { NzButtonSize } from 'ng-zorro-antd/button';
 
 @Component({
   selector: 'app-parter-channel-rebate-management-record-detail',
@@ -20,6 +21,7 @@ export class ParterRebateManageMenRecordDetailComponent implements OnInit {
   @ViewChild('sf', { static: false })
   sf!: SFComponent;
   spuStatus = '1';
+  size: NzButtonSize = 'large';
   _$expand = false;
   data = [{ name1: 1111 }];
   constructor(
@@ -28,6 +30,7 @@ export class ParterRebateManageMenRecordDetailComponent implements OnInit {
     public service: RebateManagementService,
     private modalService: NzModalService,
     public shipperservice: ShipperBaseService,
+    public modalRef: NzModalRef,
   ) {}
   /**
    * 查询字段个数
@@ -50,10 +53,6 @@ export class ParterRebateManageMenRecordDetailComponent implements OnInit {
     delete params._$expand;
     return { 
       ...params,
-      deadlineTime: {
-        start: this.sf?.value?.deadlineTime?.[0] || '',
-        end: this.sf?.value?.deadlineTime?.[1] || '',
-      },
      };
   }
   ngOnInit() {
@@ -64,54 +63,33 @@ export class ParterRebateManageMenRecordDetailComponent implements OnInit {
   initSF() {
     this.schema = {
       properties: {
-        _$expand: { type: 'boolean', ui: { hidden: true } },
-        name: {
-          type: 'string',
-          title: '订单号'
-        },
-        phone: {
-          type: 'string',
-          title: '付款单号'
-        },
-        phone2: {
-          type: 'string',
-          title: '下单客户'
-        },
         enterpriseInfoId: {
           type: 'string',
           title: '网络货运人',
           ui: {
             widget: 'select',
             placeholder: '请选择',
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            },
             allowClear: true,
-            asyncData: () => this.shipperservice.getNetworkFreightForwarder()
+            asyncData: () => this.shipperservice.getNetworkFreightForwarder(),
+            change: (value: any) => {
+              console.log(value)
+              this.st.reload()
+            }
           }
         },
-        phone3: {
+        paymentStatus: {
+          title: '银行类型',
           type: 'string',
-          title: '合伙人名称',
           ui: {
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            },
-          }
+            widget: 'dict-select',
+            params: { dictKey: 'overall:payment:status' },
+            containsAllLabel: true,
+            change: (value: any) => {
+              console.log(value)
+              this.st.reload()
+            }
+          } as SFSelectWidgetSchema
         },
-        deadlineTime: {
-          title: '时间范围',
-          type: 'string',
-          ui: {
-            widget: 'date',
-            mode: 'range',
-            format: 'yyyy-MM-dd',
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            },
-            allowClear: true
-          } as SFDateWidgetSchema
-        }
       }
     };
     this.ui = {
@@ -126,7 +104,7 @@ export class ParterRebateManageMenRecordDetailComponent implements OnInit {
     this.columns = [
       {
         title: '订单号',
-        index: 'name1'
+        index: 'billCode'
       },
       {
         title: '订单金额（元）',
@@ -186,4 +164,8 @@ export class ParterRebateManageMenRecordDetailComponent implements OnInit {
     this.sf.reset();
     this.st.load(1);
   }
+  close() {
+    this.modalRef.destroy()
+  }
 }
+
diff --git a/src/app/routes/partner/rebate-management/services/rebate-management.service.ts b/src/app/routes/partner/rebate-management/services/rebate-management.service.ts
index 5430876a..d3a7a412 100644
--- a/src/app/routes/partner/rebate-management/services/rebate-management.service.ts
+++ b/src/app/routes/partner/rebate-management/services/rebate-management.service.ts
@@ -1,3 +1,13 @@
+/*
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-03-10 11:19:00
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-03-10 13:51:05
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\services\\rebate-management.service.ts
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+ */
 import { Injectable, Injector } from '@angular/core';
 import { BaseService } from '@shared';
 
@@ -5,7 +15,8 @@ import { BaseService } from '@shared';
   providedIn: 'root',
 })
 export class RebateManagementService extends BaseService {
-
+  // 查询规则抽查列表
+  public $api_get_listCompliancePage = '/api/sdc/billRiskOperate/listRiskPage';
   constructor(public injector: Injector) {
     super(injector);
   }

From 7406f1234aba58daa21be3f01c5d83f3ca17deb9 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Thu, 10 Mar 2022 14:36:27 +0800
Subject: [PATCH 22/70] fix bug

---
 .../model/record-detail/record-detail.component.html          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.html b/src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.html
index 4f7723fe..63f8290c 100644
--- a/src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.html
+++ b/src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.html
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-02-24 20:09:49
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-10 14:05:25
+ * @LastEditTime : 2022-03-10 14:34:30
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\model\\record-detail\\record-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -34,5 +34,5 @@
   </st>
   <div>合计：2999.00元</div>
   <div nz-col class="text-center">
-  <button nz-button nzType="primary" (click)="close()">确定</button>
+  <button nz-button nzType="primary" style="width: 150px;" (click)="close()">确定</button>
   </div>
\ No newline at end of file

From 15937316dd9edf895254cc379507bdb6f86bff4b Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Thu, 10 Mar 2022 15:40:52 +0800
Subject: [PATCH 23/70] fix bug

---
 .../routes/partner/partner-routing.module.ts  |   2 +
 src/app/routes/partner/partner.module.ts      |   8 +-
 .../rebate-record.component.html              |   5 +-
 .../rebate-record/rebate-record.component.ts  |  39 +++-
 .../rebate-setting.component.html             |  48 +++++
 .../rebate-setting.component.ts               | 172 ++++++++++++++++++
 .../abnormal-feedback.component.html          |  38 ++++
 .../abnormal-feedback.component.less          |   6 +
 .../abnormal-feedback.component.ts            |  72 ++++++++
 src/assets/mocks/menu-data.json               |   2 +-
 10 files changed, 379 insertions(+), 13 deletions(-)
 create mode 100644 src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html
 create mode 100644 src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts
 create mode 100644 src/app/routes/partner/rebate-management/model/abnormal-feedback/abnormal-feedback.component.html
 create mode 100644 src/app/routes/partner/rebate-management/model/abnormal-feedback/abnormal-feedback.component.less
 create mode 100644 src/app/routes/partner/rebate-management/model/abnormal-feedback/abnormal-feedback.component.ts

diff --git a/src/app/routes/partner/partner-routing.module.ts b/src/app/routes/partner/partner-routing.module.ts
index b22dabab..9970f1d9 100644
--- a/src/app/routes/partner/partner-routing.module.ts
+++ b/src/app/routes/partner/partner-routing.module.ts
@@ -30,6 +30,7 @@ import { PartnerAccountManagementAccountDetailComponent } from './account-manage
 import { PartnerAccountManagementRecordedDetailComponent } from './account-management/components/recorded-detail/recorded-detail.component';
 import { PartnerAccountManagementWithdrawalsRecordComponent } from './account-management/components/withdrawals-record/withdrawals-record.component';
 import { PartnerAccountManagementWithdrawalsDetailComponent } from './account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component';
+import { ParterRebateManageMentSettingComponent } from './rebate-management/components/rebate-setting/rebate-setting.component';
 
 const routes: Routes = [
   {
@@ -65,6 +66,7 @@ const routes: Routes = [
     children: [
       { path: 'particulars', component: ParterRebateManageMentParticularsComponent },
       { path: 'record', component: ParterRebateManageMentRecordComponent },
+      { path: 'setting', component: ParterRebateManageMentSettingComponent },
     ]
   },
   {
diff --git a/src/app/routes/partner/partner.module.ts b/src/app/routes/partner/partner.module.ts
index 0d94b9ef..bd2df357 100644
--- a/src/app/routes/partner/partner.module.ts
+++ b/src/app/routes/partner/partner.module.ts
@@ -40,6 +40,8 @@ import { PartnerAccountManagementRecordedDetailComponent } from './account-manag
 import { PartnerAccountManagementWithdrawalsRecordComponent } from './account-management/components/withdrawals-record/withdrawals-record.component';
 import { PartnerAccountManagementWithdrawalsDetailComponent } from './account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component';
 import { ParterRebateManageMentRecordComponent } from './rebate-management/components/rebate-record/rebate-record.component';
+import { ParterRebateManageMenAbnormalFeedbackComponent } from './rebate-management/model/abnormal-feedback/abnormal-feedback.component';
+import { ParterRebateManageMentSettingComponent } from './rebate-management/components/rebate-setting/rebate-setting.component';
 
 const COMPONENTS: any[] = [
   PartnerBusinessStatisticsIndexComponent,
@@ -69,11 +71,13 @@ const COMPONENTS: any[] = [
   PartnerAccountManagementAccountDetailComponent,
   PartnerAccountManagementRecordedDetailComponent,
   PartnerAccountManagementWithdrawalsRecordComponent,
-  PartnerAccountManagementWithdrawalsDetailComponent
+  PartnerAccountManagementWithdrawalsDetailComponent,
+  ParterRebateManageMenAbnormalFeedbackComponent,
+  ParterRebateManageMentSettingComponent
 ];
 
 @NgModule({
   declarations: [...COMPONENTS],
   imports: [CommonModule, PartnerRoutingModule, SharedModule]
 })
-export class PartnerModule { }
+export class PartnerModule {}
diff --git a/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.html b/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.html
index 9ddc7ac3..50b366ea 100644
--- a/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.html
+++ b/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.html
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-02-24 20:09:49
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-09 15:04:50
+ * @LastEditTime : 2022-03-10 15:12:03
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-record\\rebate-record.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -41,5 +41,8 @@
     [loadingDelay]="500"
     [loading]="service.http.loading"
   >
+  <ng-template st-row='name44' let-item let-index='index'>
+    <div style="color: #f59a23;" (click)="feedback()">1223</div>
+  </ng-template>
   </st>
 </nz-card>
diff --git a/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.ts b/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.ts
index 54e8e57b..1f98579d 100644
--- a/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.ts
+++ b/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.ts
@@ -7,6 +7,7 @@ import { processSingleSort, ShipperBaseService } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { RebateManagementService } from '../../services/rebate-management.service';
 import { ParterRebateManageMenRecordDetailComponent } from '../../model/record-detail/record-detail.component';
+import { ParterRebateManageMenAbnormalFeedbackComponent } from '../../model/abnormal-feedback/abnormal-feedback.component';
 
 @Component({
   selector: 'app-parter-channel-rebate-management-record',
@@ -27,9 +28,8 @@ export class ParterRebateManageMentRecordComponent implements OnInit {
     public router: Router,
     public ar: ActivatedRoute,
     public service: RebateManagementService,
-    private modalService: NzModalService,
+    private modal: NzModalService,
     public shipperservice: ShipperBaseService,
-    private modal: ModalHelper
   ) {}
   /**
    * 查询字段个数
@@ -114,7 +114,7 @@ export class ParterRebateManageMentRecordComponent implements OnInit {
       },
       {
         title: '异常反馈',
-        index: 'name1'
+        render: 'name44'
       },
       {
         title: '操作',
@@ -131,15 +131,36 @@ export class ParterRebateManageMentRecordComponent implements OnInit {
     ];
   }
   /**
-   *查看详情
+   *查看明细
    */
    viewEvaluate(item: any) {
-    //  this.modalService
-    this.modal.createStatic(ParterRebateManageMenRecordDetailComponent, {i:item}).subscribe((res: boolean)=> {
-      if(res) {
-
+    const modal = this.modal.create({
+      nzTitle: '明细',
+      nzWidth: 1200,
+      nzContent: ParterRebateManageMenRecordDetailComponent,
+      nzComponentParams: { },
+      nzFooter: null
+    });
+    modal.afterClose.subscribe((res: any) => {
+      if (res) {
       }
-    })
+    });
+  }
+  /**
+   *异常反馈
+   */
+   feedback(item?: any) {
+       const modal = this.modal.create({
+          nzTitle: '异常反馈',
+          nzWidth: 580,
+          nzContent: ParterRebateManageMenAbnormalFeedbackComponent,
+          nzComponentParams: { i: item },
+          nzFooter: null
+        });
+        modal.afterClose.subscribe((res: any) => {
+          if (res) {
+          }
+        });
   }
   /**
    * 重置表单
diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html
new file mode 100644
index 00000000..50b366ea
--- /dev/null
+++ b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html
@@ -0,0 +1,48 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-02-24 20:09:49
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-03-10 15:12:03
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-record\\rebate-record.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
+<page-header-wrapper [title]="''"> </page-header-wrapper>
+<nz-card>
+  <div nz-row nzGutter="8">
+    <!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
+      <sf
+        #sf
+        [schema]="schema"
+        [ui]="ui"
+        [mode]="'search'"
+        [disabled]="!sf?.valid"
+        [loading]="service.http.loading"
+        [button]="'none'"
+      ></sf>
+      <div nz-col [nzSpan]="_$expand ? 24 : 6" class="text-right">
+      <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1);">查询</button>
+      <button nz-button nzType="primary" [disabled]="service.http.loading" >导出</button>
+      <button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
+    </div>
+  </div>
+</nz-card>
+
+<nz-card>
+  <!-- 数据列表 -->
+  <st
+    #st
+    [data]="data"
+    [columns]="columns"
+    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+    [loadingDelay]="500"
+    [loading]="service.http.loading"
+  >
+  <ng-template st-row='name44' let-item let-index='index'>
+    <div style="color: #f59a23;" (click)="feedback()">1223</div>
+  </ng-template>
+  </st>
+</nz-card>
diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts
new file mode 100644
index 00000000..929b96d1
--- /dev/null
+++ b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts
@@ -0,0 +1,172 @@
+import { ModalHelper } from '@delon/theme';
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st';
+import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
+import { processSingleSort, ShipperBaseService } from '@shared';
+import { NzModalService } from 'ng-zorro-antd/modal';
+import { RebateManagementService } from '../../services/rebate-management.service';
+import { ParterRebateManageMenRecordDetailComponent } from '../../model/record-detail/record-detail.component';
+import { ParterRebateManageMenAbnormalFeedbackComponent } from '../../model/abnormal-feedback/abnormal-feedback.component';
+
+@Component({
+  selector: 'app-parter-channel-rebate-management-setting',
+  templateUrl: './rebate-setting.component.html'
+})
+export class ParterRebateManageMentSettingComponent implements OnInit {
+  schema: SFSchema = {};
+  columns!: STColumn[];
+  ui!: SFUISchema;
+  @ViewChild('st', { static: false })
+  st!: STComponent;
+  @ViewChild('sf', { static: false })
+  sf!: SFComponent;
+  spuStatus = '1';
+  _$expand = false;
+  data = [{ name1: 1111 }];
+  constructor(
+    public router: Router,
+    public ar: ActivatedRoute,
+    public service: RebateManagementService,
+    private modal: NzModalService,
+    public shipperservice: ShipperBaseService,
+  ) {}
+  /**
+   * 查询字段个数
+   */
+  get queryFieldCount(): number {
+    return Object.keys(this.schema?.properties || {}).length;
+  }
+    /**
+  * 伸缩查询条件
+  */
+     expandToggle(): void {
+      this._$expand = !this._$expand;
+      this.sf?.setValue('/_$expand', this._$expand);
+    }
+  /**
+ * 查询参数
+ */
+   get reqParams() {
+    const params: any = Object.assign({}, this.sf?.value || {});
+    delete params._$expand;
+    return { 
+      ...params,
+      deadlineTime: {
+        start: this.sf?.value?.deadlineTime?.[0] || '',
+        end: this.sf?.value?.deadlineTime?.[1] || '',
+      },
+     };
+  }
+  ngOnInit() {
+    this.initSF();
+    this.initST();
+  }
+
+  initSF() {
+    this.schema = {
+      properties: {
+        _$expand: { type: 'boolean', ui: { hidden: true } },
+        month: {
+          type: 'string',
+          title: '时间月份',
+          format: 'month',
+        },
+        phone: {
+          type: 'string',
+          title: '合伙人名称'
+        },
+      }
+    };
+    this.ui = {
+      '*': {
+        spanLabelFixed: 140,
+        grid: { span: 8, gutter: 4 }
+      }
+    };
+  }
+
+  initST() {
+    this.columns = [
+      {
+        title: '月份',
+        index: 'name1'
+      },
+      {
+        title: '返佣金额（元）',
+        index: 'name1'
+      },
+      {
+        title: '合伙人名称',
+        index: 'name1'
+      },
+      {
+        title: '实际等级',
+        index: 'name1'
+      },
+      {
+        title: '管理费比例',
+        index: 'name1'
+      },
+      {
+        title: '返佣时间',
+        index: 'name1'
+      },
+      {
+        title: '异常反馈',
+        render: 'name44'
+      },
+      {
+        title: '操作',
+        fixed: 'right',
+        width: '90px',
+        className: 'text-left',
+        buttons: [
+          {
+            text: '明细',
+            click: _record => this.viewEvaluate(_record),
+          }
+        ]
+      }
+    ];
+  }
+  /**
+   *查看明细
+   */
+   viewEvaluate(item: any) {
+    const modal = this.modal.create({
+      nzTitle: '明细',
+      nzWidth: 1200,
+      nzContent: ParterRebateManageMenRecordDetailComponent,
+      nzComponentParams: { },
+      nzFooter: null
+    });
+    modal.afterClose.subscribe((res: any) => {
+      if (res) {
+      }
+    });
+  }
+  /**
+   *异常反馈
+   */
+   feedback(item?: any) {
+       const modal = this.modal.create({
+          nzTitle: '异常反馈',
+          nzWidth: 580,
+          nzContent: ParterRebateManageMenAbnormalFeedbackComponent,
+          nzComponentParams: { i: item },
+          nzFooter: null
+        });
+        modal.afterClose.subscribe((res: any) => {
+          if (res) {
+          }
+        });
+  }
+  /**
+   * 重置表单
+   */
+  resetSF() {
+    this.sf.reset();
+    this.st.load(1);
+  }
+}
diff --git a/src/app/routes/partner/rebate-management/model/abnormal-feedback/abnormal-feedback.component.html b/src/app/routes/partner/rebate-management/model/abnormal-feedback/abnormal-feedback.component.html
new file mode 100644
index 00000000..cef84c44
--- /dev/null
+++ b/src/app/routes/partner/rebate-management/model/abnormal-feedback/abnormal-feedback.component.html
@@ -0,0 +1,38 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-02-24 20:09:49
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-03-10 15:10:47
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\model\\abnormal-feedback\\abnormal-feedback.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
+<sv-container col="1">
+  <sv label="异常反馈">
+    <div>有订单有异常请查看 </div>
+    <div>2022-09-08  00:00:00 </div>
+  </sv>
+  <!-- <sv label="异常反馈">
+    <p *ngFor="let data of i?.mybidDetailInfo; let index = index">
+      <label *ngIf="data?.paymentStatusLabel == '已支付'">
+        <span>{{data?.expenseName}}</span>
+        <span>{{ data.price | number: '0.2-2' }}</span>
+      </label>
+    </p>
+  </sv> -->
+</sv-container>
+<div>
+  <sf
+  style="margin-left: 20px;"
+  #sf
+  [schema]="schema"
+  [ui]="ui"
+  [mode]="'edit'"
+  [button]="'none'"
+></sf>
+</div>
+     
+  <div nz-col class="text-center">
+  <button nz-button nzType="primary"  (click)="close()">确定</button>
+  </div>
\ No newline at end of file
diff --git a/src/app/routes/partner/rebate-management/model/abnormal-feedback/abnormal-feedback.component.less b/src/app/routes/partner/rebate-management/model/abnormal-feedback/abnormal-feedback.component.less
new file mode 100644
index 00000000..52b47a0e
--- /dev/null
+++ b/src/app/routes/partner/rebate-management/model/abnormal-feedback/abnormal-feedback.component.less
@@ -0,0 +1,6 @@
+:host {
+    [nz-button] {
+        margin-right: 8px;
+        margin-bottom: 12px;
+      }
+}
\ No newline at end of file
diff --git a/src/app/routes/partner/rebate-management/model/abnormal-feedback/abnormal-feedback.component.ts b/src/app/routes/partner/rebate-management/model/abnormal-feedback/abnormal-feedback.component.ts
new file mode 100644
index 00000000..3d8c1fd4
--- /dev/null
+++ b/src/app/routes/partner/rebate-management/model/abnormal-feedback/abnormal-feedback.component.ts
@@ -0,0 +1,72 @@
+/*
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-03-10 14:50:45
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-03-10 15:09:51
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\model\\abnormal-feedback\\abnormal-feedback.component.ts
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+ */
+import { ModalHelper } from '@delon/theme';
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st';
+import { SFComponent, SFDateWidgetSchema, SFSchema, SFSelectWidgetSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form';
+import { processSingleSort, ShipperBaseService } from '@shared';
+import { NzModalService, NzModalRef } from 'ng-zorro-antd/modal';
+import { RebateManagementService } from '../../services/rebate-management.service';
+import { NzButtonSize } from 'ng-zorro-antd/button';
+
+@Component({
+  selector: 'app-parter-channel-rebate-management-abnormal-feedback',
+  templateUrl: './abnormal-feedback.component.html'
+})
+export class ParterRebateManageMenAbnormalFeedbackComponent implements OnInit {
+  schema: SFSchema = {};
+  ui!: SFUISchema;
+  @ViewChild('sf', { static: false })
+  sf!: SFComponent;
+  i!: any;
+  data = [{ name1: 1111 }];
+  constructor(
+    public router: Router,
+    public ar: ActivatedRoute,
+    public service: RebateManagementService,
+    private modalService: NzModalService,
+    public shipperservice: ShipperBaseService,
+    public modalRef: NzModalRef,
+  ) {}
+
+
+  ngOnInit() {
+    this.initSF();
+  }
+
+  initSF() {
+    this.schema = {
+      properties: {
+        name3: {
+          type: 'string',
+          title: '回复',
+          maxLength: 50,
+          ui: {
+            widget: 'textarea',
+            autosize: { minRows: 3, maxRows: 6 },
+            placeholder:'请不要超过50个字'
+          } as SFTextareaWidgetSchema,
+        },
+      }
+    };
+    this.ui = {
+      '*': {
+        spanLabelFixed: 60,
+        grid: { span: 16 },
+      }
+    };
+  }
+  close() {
+    this.modalRef.destroy()
+  }
+}
+
diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json
index 473d4c2f..85b1c19b 100644
--- a/src/assets/mocks/menu-data.json
+++ b/src/assets/mocks/menu-data.json
@@ -517,7 +517,7 @@
               "group": true,
               "children": [{
                   "text": "返佣配置",
-                  "link": "/partner/rebate/"
+                  "link": "/partner/rebate/setting"
                 },
                 {
                   "text": "返佣明细",

From 8c06e1f9de9ccb70cf163b04fc9bb98e6efbdabc Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Thu, 10 Mar 2022 16:12:36 +0800
Subject: [PATCH 24/70] edit

---
 proxy.conf.js                                 |   2 +-
 src/app/core/guards/auth.guard.ts             |   2 -
 src/app/global-config.module.ts               |   2 +-
 .../index/partner-list.component.html         |  95 +++++
 .../index/partner-list.component.less         |   0
 .../index/partner-list.component.ts           | 298 +++++++++++++++
 .../partner-audit-modal.component.html        |   7 +
 .../partner-audit-modal.component.less        |   0
 .../partner-audit-modal.component.ts          | 117 ++++++
 .../partner-detail.component.html             | 342 ++++++++++++++++++
 .../partner-detail.component.less             |  30 ++
 .../partner-detail.component.ts               | 337 +++++++++++++++++
 .../services/partner-list.service.ts          |  26 ++
 .../routes/partner/partner-routing.module.ts  |  21 +-
 src/app/routes/partner/partner.module.ts      |  15 +-
 src/assets/mocks/menu-data.json               |   7 +-
 16 files changed, 1286 insertions(+), 15 deletions(-)
 create mode 100644 src/app/routes/partner/partner-list/components/index/partner-list.component.html
 create mode 100644 src/app/routes/partner/partner-list/components/index/partner-list.component.less
 create mode 100644 src/app/routes/partner/partner-list/components/index/partner-list.component.ts
 create mode 100644 src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.html
 create mode 100644 src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.less
 create mode 100644 src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts
 create mode 100644 src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html
 create mode 100644 src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.less
 create mode 100644 src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts
 create mode 100644 src/app/routes/partner/partner-list/services/partner-list.service.ts

diff --git a/proxy.conf.js b/proxy.conf.js
index 31995def..822b7622 100644
--- a/proxy.conf.js
+++ b/proxy.conf.js
@@ -20,7 +20,7 @@ module.exports = {
   // }
   '//api': {
     target: {
-      host: 'tms-api-test.eascs.com',
+      host: 'tms-api-dev.eascs.com',
       protocol: 'https:',
       port: 443
     },
diff --git a/src/app/core/guards/auth.guard.ts b/src/app/core/guards/auth.guard.ts
index da4d1331..b5a30a58 100644
--- a/src/app/core/guards/auth.guard.ts
+++ b/src/app/core/guards/auth.guard.ts
@@ -38,8 +38,6 @@ export class AuthGuard extends ACLGuard {
   }
 
   private handle(route: ActivatedRouteSnapshot, state: RouterStateSnapshot, type: 1 | 2, router?: string): Observable<boolean> {
-    console.log(route, state);
-
     if (!router) {
       return type === 1 ? super.canActivate(route, state) : super.canActivateChild(route, state);
     }
diff --git a/src/app/global-config.module.ts b/src/app/global-config.module.ts
index ec62a552..163c16c9 100644
--- a/src/app/global-config.module.ts
+++ b/src/app/global-config.module.ts
@@ -17,7 +17,7 @@ const alainConfig: AlainConfig = {
     page: { show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] },
     modal: { size: 'lg' }
   },
-  sf: { button: { search: '查询' } },
+  sf: { button: { search: '查询' }, ui: { placeholder: '请输入' } },
   pageHeader: { homeI18n: 'home', recursiveBreadcrumb: true },
   auth: { login_url: '/passport/login' },
   acl: { guard_url: '/exception/403' }
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
new file mode 100644
index 00000000..f1de5a81
--- /dev/null
+++ b/src/app/routes/partner/partner-list/components/index/partner-list.component.html
@@ -0,0 +1,95 @@
+<page-header-wrapper [title]="'合伙人列表'">
+</page-header-wrapper>
+
+<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 [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">
+            <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()">
+                {{ !_$expand ? '展开' : '收起' }}
+                <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
+            </button>
+        </div>
+    </div>
+</nz-card>
+
+<nz-card class="content-box" nzBordered>
+    <div class="d-flex align-items-center mb-md mt-md">
+        <button nz-button (click)="this.routeTo('/partner/add-etp-partner')" nzType="primary">新增企业合伙人</button>
+        <button nz-button (click)="this.routeTo('/partner/add-personal-partner')" nzType="primary">新增个人合伙人</button>
+    </div>
+
+    <st #st [data]="service.$mock_url" [columns]="columns" [req]="{  process: beforeReq }"
+        [loading]="service.http.loading" [scroll]="{ x:'1200px' }">
+    </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="返佣模板" required>
+                <nz-select ngModel="lucy" style="width: 100%;">
+                    <nz-option nzValue="jack" nzLabel="Jack"></nz-option>
+                    <nz-option nzValue="lucy" nzLabel="Lucy"></nz-option>
+                </nz-select>
+            </se>
+        </div>
+    </div>
+    <p class="text-center mt-md">说明：修改模板后，当月开始返佣收益将会按新模板计算</p>
+</ng-template>
+
+<ng-template #editCannel>
+    <div nz-row nzGutter="8">
+        <div nz-col nzSpan="24" se-container [labelWidth]="140" [col]="1">
+            <se label="合伙人名称">
+                深圳某某有限公司
+            </se>
+            <se label="当前渠道销售">
+                张三/13999999999
+            </se>
+            <se label="渠道销售修改为" required>
+                <nz-select ngModel="lucy" style="width: 100%;">
+                    <nz-option nzValue="jack" nzLabel="Jack"></nz-option>
+                    <nz-option nzValue="lucy" nzLabel="Lucy"></nz-option>
+                </nz-select>
+            </se>
+            <se label="备注" required>
+                <textarea rows="3" nz-input></textarea>
+            </se>
+            <se label="一并转移的客户">
+                <p style="margin-top: 8px;">已选（0）</p>
+                <nz-table #rowSelectionTable [nzData]="customers" nzSize="small" nzBordered>
+                    <thead>
+                        <tr>
+                            <th [nzChecked]="false"></th>
+                            <th>客户名称</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr *ngFor="let data of rowSelectionTable.data">
+                            <td [nzChecked]="data.checked"></td>
+                            <td>{{ data.name }}</td>
+                        </tr>
+                    </tbody>
+                </nz-table>
+            </se>
+            <se label="生效节点" required>
+                <nz-radio-group>
+                    <label nz-radio nzValue="A">修改成功后立即生效</label>
+                    <label nz-radio nzValue="B">CRM流程审核通过后生</label>
+                </nz-radio-group>
+            </se>
+        </div>
+    </div>
+    <p class="text-center mt-md">客户转移：客户跟着上级合伙人转移一并到新渠道销售下，会同步发起CRM《客户转移》流程；不转移的，客户会与上级合伙人解绑，成为渠道销售的直客</p>
+</ng-template>
\ No newline at end of file
diff --git a/src/app/routes/partner/partner-list/components/index/partner-list.component.less b/src/app/routes/partner/partner-list/components/index/partner-list.component.less
new file mode 100644
index 00000000..e69de29b
diff --git a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts
new file mode 100644
index 00000000..219a9d6b
--- /dev/null
+++ b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts
@@ -0,0 +1,298 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { Router } from '@angular/router';
+import { STComponent, STColumn, STRequestOptions, STChange } from '@delon/abc/st';
+import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form';
+import { NzModalService } from 'ng-zorro-antd/modal';
+import { AddCollectionInvoiceModalComponent } from 'src/app/routes/ticket-management/components/input-invoice/add-collection-invoice-modal/add-collection-invoice-modal.component';
+import { PartnerListService } from '../../services/partner-list.service';
+import { PartnerAuditModalComponent } from '../partner-audit-modal/partner-audit-modal.component';
+
+@Component({
+  selector: 'app-partner-list',
+  templateUrl: './partner-list.component.html',
+  styleUrls: ['../../../../commom/less/box.less']
+})
+export class PartnerListComponent implements OnInit {
+  @ViewChild('st', { static: true })
+  st!: STComponent;
+  @ViewChild('sf', { static: false })
+  sf!: SFComponent;
+  columns: STColumn[] = this.initST();
+  searchSchema: SFSchema = this.initSF();
+  _$expand = false;
+
+  @ViewChild('editTemplate', { static: true })
+  editTemplate: any;
+
+  @ViewChild('editCannel', { static: true })
+  editCannel: any;
+  customers: any[] = [];
+
+  constructor(public service: PartnerListService, private nzModalService: NzModalService, private router: Router) {}
+
+  ngOnInit(): void {}
+
+  beforeReq = (requestOptions: STRequestOptions) => {
+    if (this.sf) {
+      let params = { ...this.sf.value };
+      if (params.createTime) {
+        params.createTime = { start: this.sf?.value?.createTime?.[0], end: this.sf?.value?.createTime?.[1] };
+      }
+      Object.assign(requestOptions.body, params);
+    }
+    return requestOptions;
+  };
+
+  auditPartner(item: any) {
+    const modal = this.nzModalService.create({
+      nzTitle: '审核',
+      nzContent: PartnerAuditModalComponent,
+      nzComponentParams: { info: item },
+      nzFooter: null
+    });
+  }
+
+  editTemplateAction(item: any) {
+    const modal = this.nzModalService.create({
+      nzTitle: '修改返佣模板',
+      nzContent: this.editTemplate,
+      nzOnOk: () => {
+        this.confirmEditTemplate();
+        return false;
+      }
+    });
+  }
+
+  confirmEditTemplate() {
+    const modal = this.nzModalService.confirm({
+      nzTitle: '确定要修改返佣模板吗？',
+      nzOnOk: () => {
+        this.nzModalService.closeAll();
+      }
+    });
+  }
+
+  editCannelAction(item: any) {
+    const modal = this.nzModalService.create({
+      nzTitle: '修改返佣模板',
+      nzWidth: 650,
+      nzContent: this.editCannel,
+      nzOnOk: () => {
+        this.confirmEditCannel();
+        return false;
+      }
+    });
+  }
+
+  confirmEditCannel() {
+    const modal = this.nzModalService.confirm({
+      nzTitle: '确定提交吗？',
+      nzOnOk: () => {
+        this.nzModalService.closeAll();
+      }
+    });
+  }
+
+  routeTo(route: string) {
+    this.router.navigate([route]);
+  }
+
+  /**
+   * 重置表单
+   */
+  resetSF() {
+    this.sf.reset();
+    this._$expand = false;
+  }
+
+  /**
+   * 伸缩查询条件
+   */
+  expandToggle() {
+    this._$expand = !this._$expand;
+    this.sf?.setValue('/expand', this._$expand);
+  }
+
+  private initSF(): SFSchema {
+    return {
+      properties: {
+        expand: {
+          type: 'boolean',
+          ui: {
+            hidden: true
+          }
+        },
+        paycode: {
+          type: 'string',
+          title: '合伙人名称'
+        },
+        paycode2: {
+          type: 'string',
+          title: '企业管理员'
+        },
+        paycod3e: {
+          type: 'string',
+          title: '手机号'
+        },
+        paycod31e: {
+          type: 'string',
+          title: '渠道销售',
+          ui: {
+            placeholder: '请输入姓名或者手机号',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        orderS2n: {
+          type: 'string',
+          title: '类型',
+          ui: {
+            widget: 'dict-select',
+            containsAllLabel: true,
+            params: { dictKey: 'refund:apply:status' },
+            placeholder: '请选择',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        paytype: {
+          type: 'string',
+          title: '认证审核状态',
+          ui: {
+            widget: 'dict-select',
+            containsAllLabel: true,
+            placeholder: '请选择',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        paymode: {
+          type: 'string',
+          title: '签约状态',
+          ui: {
+            widget: 'dict-select',
+            containsAllLabel: true,
+            params: { dictKey: 'pay:mode' },
+            placeholder: '请选择',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        paymo1de: {
+          type: 'string',
+          title: 'CRM状态',
+          ui: {
+            widget: 'dict-select',
+            containsAllLabel: true,
+            params: { dictKey: 'pay:mode' },
+            placeholder: '请选择',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        paymo11de: {
+          type: 'string',
+          title: '注册渠道',
+          ui: {
+            widget: 'dict-select',
+            containsAllLabel: true,
+            params: { dictKey: 'pay:mode' },
+            placeholder: '请选择',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        paymo11d1e: {
+          type: 'string',
+          title: '返佣模板',
+          ui: {
+            widget: 'dict-select',
+            containsAllLabel: true,
+            params: { dictKey: 'pay:mode' },
+            placeholder: '请选择',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        paymo11d11e: {
+          type: 'string',
+          title: '合伙人状态',
+          ui: {
+            widget: 'dict-select',
+            containsAllLabel: true,
+            params: { dictKey: 'pay:mode' },
+            placeholder: '请选择',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        createTime: {
+          title: '注册时间',
+          type: 'string',
+          ui: {
+            widget: 'sl-from-to-search',
+            format: 'yyyy-MM-dd',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          } as SFDateWidgetSchema
+        }
+      }
+    };
+  }
+
+  private initST(): STColumn[] {
+    return [
+      { title: '合伙人名称', index: 'payCode', width: 180 },
+      { title: '付款编码', index: 'ltdName', width: 160 },
+      { title: '邀请码', index: 'payDate', className: 'text-center', width: 130 },
+      { title: '企业管理员', index: 'payDate', width: 150 },
+      { title: '手机号', index: 'payDate', className: 'text-center', width: 150 },
+      { title: '类型', index: 'payDate', className: 'text-center', width: 130 },
+      { title: '注册渠道', index: 'payDate', type: 'date', width: 130 },
+      { title: '注册时间', index: 'payDate', className: 'text-center', width: 170 },
+      { title: '渠道销售', index: 'payDate', width: 170 },
+      { title: '返佣模板', index: 'payDate', width: 150 },
+      { title: '认证审核状态', index: 'payDate', width: 150 },
+      { title: '签约状态', index: 'payDate', width: 150 },
+      { title: 'CRM状态', index: 'payDate', width: 150 },
+      { title: '合伙人状态', index: 'payDate', className: 'text-center', width: 140 },
+      {
+        title: '操作',
+        fixed: 'right',
+        width: '140px',
+        buttons: [
+          { type: 'divider' },
+          {
+            text: '详情<br>',
+            click: item => this.router.navigate(['/partner/partner-list/detail/' + item.id])
+          },
+          {
+            text: '修改返佣模板',
+            click: item => this.editTemplateAction(item)
+          },
+          {
+            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])
+          }
+        ]
+      }
+    ];
+  }
+}
diff --git a/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.html b/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.html
new file mode 100644
index 00000000..8ea7c9f8
--- /dev/null
+++ b/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.html
@@ -0,0 +1,7 @@
+<div>
+    <sf #sf [ui]="{ '*': { spanLabelFixed: 120, grid: { span: 24 }}}" [schema]="schema" [button]="'none'"></sf>
+</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>
+</div>
\ No newline at end of file
diff --git a/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.less b/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.less
new file mode 100644
index 00000000..e69de29b
diff --git a/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts b/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts
new file mode 100644
index 00000000..eed7b8ac
--- /dev/null
+++ b/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts
@@ -0,0 +1,117 @@
+import { Component, Input, OnInit, ViewChild } from '@angular/core';
+import { SFComponent, SFSchema } from '@delon/form';
+import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
+import { PartnerListService } from '../../services/partner-list.service';
+
+@Component({
+  selector: 'app-partner-audit-modal',
+  templateUrl: './partner-audit-modal.component.html',
+  styleUrls: ['./partner-audit-modal.component.less']
+})
+export class PartnerAuditModalComponent implements OnInit {
+  @ViewChild('sf', { static: false })
+  sf!: SFComponent;
+  @Input()
+  info: any;
+  schema!: SFSchema;
+  constructor(private nzModalService: NzModalService, public service: PartnerListService) {}
+
+  ngOnInit(): void {
+    this.initSF(this.info);
+  }
+
+  initSF(user: any) {
+    this.schema = {
+      properties: {
+        staffName: {
+          title: '合伙人名称',
+          type: 'string',
+          ui: { widget: 'text' },
+          default: user.name
+        },
+        status: {
+          title: '审核结果',
+          type: 'string',
+          maxLength: 11,
+          enum: [
+            { value: true, label: '通过' },
+            { value: false, label: '驳回' }
+          ],
+          ui: { widget: 'radio' },
+          default: true
+        },
+        a: {
+          title: '渠道销售',
+          type: 'string',
+          enum: [
+            { value: true, label: '通过' },
+            { value: false, label: '驳回' }
+          ],
+          ui: {
+            widget: 'select',
+            placeholder: '请选择'
+          },
+          default: ''
+        },
+        b: {
+          title: '备注',
+          type: 'string',
+          maxLength: 100,
+          ui: {
+            widget: 'textarea',
+            placeholder: '请不要超过100个字',
+            autosize: { minRows: 3 }
+          }
+        }
+      },
+      if: {
+        properties: { status: { enum: [true] } }
+      },
+      then: {
+        required: ['a']
+      },
+      else: {
+        required: ['b']
+      }
+    };
+  }
+
+  sure() {
+    this.nzModalService.confirm({
+      nzTitle: `确定以“${this.info.userName}/${this.info.mobile}”的名义重新发起CRM《付款对象合同管理》吗？`,
+      nzOnOk: () => {
+        this.close();
+      }
+    });
+    // if (!this.sf.value.roleId || this.sf.value.roleId.length === 0) {
+    //   this.service.msgSrv.error('员工角色不能为空！');
+    //   return;
+    // }
+    // if (this.i.userId === 0) {
+    //   const params: any = {
+    //     ...this.sf.value
+    //   };
+    //   this.service.request(this.service.$api_add_staff, params).subscribe(res => {
+    //     if (res) {
+    //       this.service.msgSrv.success('保存成功！');
+    //       this.modal.close(true);
+    //     }
+    //   });
+    // } else {
+    //   const params: any = {
+    //     appUserId: this.i.appUserId,
+    //     ...this.sf.value
+    //   };
+    //   this.service.request(this.service.$api_edit_staff, params).subscribe(res => {
+    //     if (res) {
+    //       this.service.msgSrv.success('编辑成功！');
+    //       this.modal.close(true);
+    //     }
+    //   });
+    // }
+  }
+
+  close() {
+    this.nzModalService.closeAll();
+  }
+}
diff --git a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html
new file mode 100644
index 00000000..6dcdbb97
--- /dev/null
+++ b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html
@@ -0,0 +1,342 @@
+<!-- 页头 -->
+<page-header-wrapper [logo]="logo" [content]="content" [title]="'合伙人详情'" [ngClass]="{'affix': scrollTop>210}">
+    <ng-template #logo>
+        <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
+            <i nz-icon nzType="left" nzTheme="outline"></i>
+        </button>
+    </ng-template>
+    <ng-template #content>
+        <nz-skeleton [nzLoading]="false">
+            <div class="user-info" nz-row>
+                <div nz-col [nzXl]="18" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="d-flex">
+                    <img [src]="detailData?.enterpriseLogo" />
+                    <div style="flex: 1;">
+                        <div nz-row>
+                            <div nz-col [nzLg]="12" [nzSm]="24" [nzXs]="24">
+                                <p style="margin-bottom: 0;">{{ detailData?.enterpriseName }}</p>
+                            </div>
+                            <div nz-col [nzLg]="12" [nzSm]="24" [nzXs]="24">
+                                <nz-badge nzStatus="success" nzText="正常" *ngIf="detailData?.stateLocked === 0">
+                                </nz-badge>
+                                <nz-badge nzStatus="error" nzText="冻结" *ngIf="detailData?.stateLocked === 1"></nz-badge>
+                            </div>
+                        </div>
+                        <div nz-row>
+                            <div nz-col [nzLg]="12" [nzSm]="24" [nzXs]="24">
+                                <p>{{ detailData?.unifiedSocialCreditCode }}</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?.createTime}}
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div nz-col [nzXl]="6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right mt-sm">
+                    <ng-container *ngIf="isEdit;else editButton">
+                        <button [disabled]="service.http.loading" nz-button (click)="reset()">
+                            取消
+                        </button>
+                        <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()" acl
+                                [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-audit']">
+                                通过
+                            </button>
+                            <button [disabled]="service.http.loading" nz-button nzDanger (click)="auditPartner()" acl
+                                [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-audit']">
+                                驳回
+                            </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?.stateLocked" 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?.stateLocked" acl
+                                [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-lock']">
+                                冻结
+                            </button>
+                        </ng-container>
+                        <button [disabled]="service.http.loading" nz-button nzDanger (click)="ratify()" acl
+                            [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-save']">
+                            修改
+                        </button>
+                    </ng-template>
+                </div>
+            </div>
+        </nz-skeleton>
+    </ng-template>
+
+    <ng-template #frozen>
+        <ng-container
+            *ngTemplateOutlet="PopconfirmTempalte;context:{title:'确定冻结该企业吗？',content:'停用后，该企业将被限制使用，不限于访问受限、无法发布货源等，请谨慎操作'}">
+        </ng-container>
+    </ng-template>
+    <ng-template #enable>
+        <ng-container
+            *ngTemplateOutlet="PopconfirmTempalte;context:{title:'确定启用该企业吗？',content:'启用后，该企业将恢复正常使用功能，请再次确认'}">
+        </ng-container>
+    </ng-template>
+    <ng-template #Payenable>
+        <ng-container
+            *ngTemplateOutlet="PopconfirmTempalte;context:{title:'确定关闭该企业支付权限吗？',content:'停用后，该企业将被限制使用支付功能，请谨慎操作'}">
+        </ng-container>
+    </ng-template>
+    <ng-template #Payfrozen>
+        <ng-container
+            *ngTemplateOutlet="PopconfirmTempalte;context:{title:'确定开通该企业支付权限吗？',content:'启用后，该企业将恢复正常支付功能，请再次确认'}">
+        </ng-container>
+    </ng-template>
+</page-header-wrapper>
+
+<nz-card [class]="isEdit?'edit-box':'readOnly-box'">
+    <sv-container col="3">
+        <sv-title>企业管理员信息</sv-title>
+        <sv label="姓名">
+            <input nz-input type="text" [(ngModel)]="detailData.adminUserInfo.name" [readonly]="!isEdit"
+                [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
+        </sv>
+        <sv label="手机号">
+            {{detailData.adminUserInfo?.mobile}}
+        </sv>
+        <sv label="身份证号">
+            <input nz-input type="text" [(ngModel)]="detailData.adminUserInfo.certificateNumber" [readonly]="!isEdit"
+                [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
+        </sv>
+        <sv label="身份证照" col="2">
+            <div class="d-flex">
+                <ng-container
+                    *ngTemplateOutlet="uploadTemplate;context:{data:detailData?.adminUserInfo,status:isEdit,key:'certificatePhotoFrontWatermark',key2:'certificatePhotoFront',hover:'certificateBackFront'}">
+                </ng-container>
+                <ng-container
+                    *ngTemplateOutlet="uploadTemplate;context:{data:detailData?.adminUserInfo,status:isEdit,key:'certificatePhotoBackWatermark',key2:'certificatePhotoBack',hover:'certificateBack'}">
+                </ng-container>
+            </div>
+        </sv>
+        <sv label="身份证有效期" col="1">
+            <nz-date-picker [(ngModel)]="detailData.operatingStartTime" [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 [(ngModel)]="detailData.operatingEndTime" [nzDisabled]="!isEdit" nzPlaceHolder=" "
+                [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''" style="width: 100px;" class="calendar">
+            </nz-date-picker>
+            <ng-container *ngIf="isEdit">
+                <label nz-checkbox [ngModel]="!!!detailData.operatingEndTime"
+                    (ngModelChange)="$event?detailData.operatingEndTime='':''" class="ml-sm">长期</label>
+            </ng-container>
+        </sv>
+    </sv-container>
+
+    <nz-divider></nz-divider>
+    <sv-container col="3" class="mt16">
+        <sv-title>
+            <label class="mr-md">企业基本信息</label>
+            <label *ngIf="detailData?.approvalStatus===10" style="color: #1890ff;"><i nz-icon nzType="info-circle"
+                    nzTheme="fill" class="mr-xs"></i>待审核
+            </label>
+            <label *ngIf="detailData?.approvalStatus===20" style="color: #52c41a;"><i nz-icon nzType="check-circle"
+                    nzTheme="fill" class="mr-xs"></i>审核通过
+            </label>
+            <label *ngIf="detailData?.approvalStatus===30" style="color: #ff4d4f;"><i nz-icon nzType="close-circle"
+                    nzTheme="fill" class="mr-xs"></i>驳回&nbsp;驳回原因:{{detailData?.approvalOpinion}}
+            </label>
+            <p style="margin-bottom: 0;">
+                四要素验证：
+                <label *ngIf="detailData?.esignCheckStatus===0" style="color: #ff4d4f;"><i nz-icon nzType="info-circle"
+                        nzTheme="fill" class="mr-xs"></i>不通过&nbsp;&nbsp;驳回原因:{{detailData?.esignCheckMsg}}
+                </label>
+                <label *ngIf="detailData?.esignCheckStatus===1" style="color: #52c41a;"><i nz-icon nzType="check-circle"
+                        nzTheme="fill" class="mr-xs"></i>通过
+                </label>
+                <label *ngIf="detailData?.esignCheckStatus===2" style="color:  #1890ff;"><i nz-icon
+                        nzType="close-circle" nzTheme="fill" class="mr-xs"></i>未认证
+                </label>
+            </p>
+        </sv-title>
+        <sv label="公司名称">
+            <input nz-input type="text" [(ngModel)]="detailData.enterpriseName" [readonly]="!isEdit"
+                [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
+        </sv>
+        <sv label="统一社会信用代码">
+            <input nz-input type="text" [(ngModel)]="detailData.unifiedSocialCreditCode" [readonly]="!isEdit"
+                [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
+        </sv>
+        <sv label="营业执照" col="2">
+            <ng-container
+                *ngTemplateOutlet="uploadTemplate;context:{data:detailData,status:isEdit,key:'licensePhotoWatermark',key2:'licensePhoto',hover:'detailPhoto'}">
+            </ng-container>
+        </sv>
+
+        <sv label="营业期限" col="1">
+            <nz-date-picker [(ngModel)]="detailData.operatingStartTime" [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 [(ngModel)]="detailData.operatingEndTime" [nzDisabled]="!isEdit" nzPlaceHolder=" "
+                [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''" style="width: 100px;" class="calendar">
+            </nz-date-picker>
+            <ng-container *ngIf="isEdit">
+                <label nz-checkbox [ngModel]="!!!detailData.operatingEndTime"
+                    (ngModelChange)="$event?detailData.operatingEndTime='':''" class="ml-sm">长期</label>
+            </ng-container>
+        </sv>
+    </sv-container>
+    <nz-divider></nz-divider>
+    <sv-container col="3" class="mt16">
+        <sv-title>法人信息</sv-title>
+        <sv label="法定代表人">
+            <input nz-input type="text" [(ngModel)]="detailData.legalPersonIdentityVO.name" [readonly]="!isEdit"
+                [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
+        </sv>
+        <sv label="身份证号码">
+            <input nz-input type="text" [(ngModel)]="detailData.legalPersonIdentityVO.certificateNumber"
+                [readonly]="!isEdit" [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
+        </sv>
+        <sv label="身份证有效期" col="1">
+            <nz-date-picker [(ngModel)]="detailData.legalPersonIdentityVO.validStartTime" [nzDisabled]="!isEdit"
+                nzPlaceHolder=" " [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''" style="width: 100px;"
+                class="calendar"></nz-date-picker>
+            -
+            <ng-container
+                *ngIf="!isEdit && !detailData?.legalPersonIdentityVO?.validEndTime && detailData.legalPersonIdentityVO.validStartTime">
+                <label style="padding-left: 11px;">长期</label>
+            </ng-container>
+            <nz-date-picker [(ngModel)]="detailData.legalPersonIdentityVO.validEndTime" [nzDisabled]="!isEdit"
+                nzPlaceHolder=" " [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''" style="width: 100px;"
+                class="calendar"></nz-date-picker>
+            <ng-container *ngIf="isEdit">
+                <label nz-checkbox [ngModel]="!!!detailData.legalPersonIdentityVO.validEndTime"
+                    (ngModelChange)="$event?detailData.legalPersonIdentityVO.validEndTime='':''"
+                    class="ml-sm">长期</label>
+            </ng-container>
+
+        </sv>
+        <sv label="身份证照" col="1">
+            <div class="d-flex">
+                <ng-container
+                    *ngTemplateOutlet="uploadTemplate;context:{data:detailData?.legalPersonIdentityVO,status:isEdit,key:'certificatePhotoFrontWatermark',key2:'certificatePhotoFront',hover:'legalFront'}">
+                </ng-container>
+                <ng-container
+                    *ngTemplateOutlet="uploadTemplate;context:{data:detailData?.legalPersonIdentityVO,status:isEdit,key:'certificatePhotoBackWatermark',key2:'certificatePhotoBack',hover:'legalBack'}">
+                </ng-container>
+            </div>
+        </sv>
+    </sv-container>
+    <nz-divider></nz-divider>
+    <sv-container col="3" class="mt16">
+        <sv-title>所属城市</sv-title>
+        <sv label="">
+            深圳、上海、北京
+        </sv>
+    </sv-container>
+    <nz-divider></nz-divider>
+    <sv-container col="3" class="mt16">
+        <sv-title>渠道销售信息</sv-title>
+        <sv label="姓名">
+            张学友
+        </sv>
+        <sv label="手机号">
+            13999999999
+        </sv>
+        <sv label="绑定时间">
+            2021-09-23 14:43:31
+        </sv>
+    </sv-container>
+</nz-card>
+
+<nz-card>
+    <sv-container col="3" class="mt16">
+        <sv-title>修改渠道销售记录</sv-title>
+        <sv label="">
+            <st #st [data]="service.$mock_url" [columns]="columns" [loading]="service.http.loading" bordered size="small"
+                [page]="{show:false}" [scroll]="{ x:'1200px' }">
+            </st>
+        </sv>
+    </sv-container>
+</nz-card>
+
+<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">
+            {{content}}
+        </div>
+    </div>
+</ng-template>
+
+<ng-template #approvedModal>
+    <div nz-row nzGutter="8">
+        <div nz-col nzSpan="24" se-container [labelWidth]="120">
+            <se [col]="1" label="公司名称">
+                {{ detailData?.enterpriseName }}
+            </se>
+            <se [col]="1" label="网络货运人" required>
+                <nz-select nzPlaceHolder="请选择" [(ngModel)]="networkTransporter">
+                    <nz-option [nzValue]="item.value" [nzLabel]="item.label" *ngFor="let item of ltdId"></nz-option>
+                </nz-select>
+            </se>
+        </div>
+    </div>
+</ng-template>
+
+<ng-template #redectModal>
+    <div nz-row nzGutter="8">
+        <div nz-col nzSpan="24" se-container [labelWidth]="120">
+            <se [col]="1" label="公司名称">
+                {{ detailData?.enterpriseName }}
+            </se>
+            <se [col]="1" label="备注" required>
+                <textarea nz-input rows="3" style="width: 325px;margin-left: 14px;"
+                    [(ngModel)]="approvalOpinion"></textarea>
+            </se>
+        </div>
+    </div>
+</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)">
+        <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">
+            <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">
+                <i nz-icon nzType="close-circle" nzTheme="fill" class="delete-icon"
+                    (click)="deleteImg(data,key,key2)"></i>
+                <div style="display: flex;align-items: center;">
+                    <i nz-icon nzType="eye" nzTheme="fill" class="show-icon" (click)="service.showImg(data[key])"></i>
+                </div>
+            </div>
+        </div>
+    </nz-upload>
+</ng-template>
\ No newline at end of file
diff --git a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.less b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.less
new file mode 100644
index 00000000..eadc3a6a
--- /dev/null
+++ b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.less
@@ -0,0 +1,30 @@
+@import '../../../../usercenter/less/edit.less';
+
+
+.user-info {
+  font-size: 16px;
+
+  .enterprise-name {
+    margin-right: 15px;
+  }
+
+  img {
+    width        : 64px;
+    height       : 64px;
+    margin-right : 15px;
+    border-radius: 50%;
+  }
+
+  .user-info-des {
+    margin-bottom: 5px;
+  }
+}
+
+:host::ng-deep {
+  .affix {
+    position: fixed !important;
+    top     : 20px !important;
+    z-index : 999 !important;
+    width   : 100% !important;
+  }
+}
\ No newline at end of file
diff --git a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts
new file mode 100644
index 00000000..f0e81cf1
--- /dev/null
+++ b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts
@@ -0,0 +1,337 @@
+import { DatePipe } from '@angular/common';
+import { Component, OnInit, ViewChild } from '@angular/core';
+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 { Subscription, fromEvent } from 'rxjs';
+import { PartnerListService } from '../../services/partner-list.service';
+import { PartnerAuditModalComponent } from '../partner-audit-modal/partner-audit-modal.component';
+
+@Component({
+  selector: 'app-partner-detail',
+  templateUrl: './partner-detail.component.html',
+  styleUrls: ['./partner-detail.component.less'],
+  providers: [DatePipe]
+})
+export class PartnerDetailComponent implements OnInit {
+  columns: STColumn[] = this.initST();
+
+  @ViewChild('approvedModal', { static: false })
+  approvedModal!: any;
+  @ViewChild('redectModal', { static: false })
+  redectModal!: any;
+
+  detailData: any = { adminUserInfo: { name: '' }, legalPersonIdentityVO: { name: '' } };
+  tempalateData = { ...this.detailData };
+  suppliersData: any = {};
+
+  isEdit = false;
+
+  uploadURl = apiConf.waterFileUpload;
+  disabledUpload = false;
+  enterpriseAddressCode: any = [];
+  ltdId: any = [];
+
+  approvalOpinion = '';
+  networkTransporter = null;
+
+  esignCheckStatus: any = {
+    0: '不通过',
+    1: '通过',
+    2: '未认证'
+  };
+
+  scrollTop = 0;
+  subscribeScoll!: Subscription;
+  constructor(
+    public service: PartnerListService,
+    private route: ActivatedRoute,
+    private nzModalService: NzModalService,
+    private datePipe: DatePipe
+  ) {}
+  ngOnDestroy(): void {
+    this.subscribeScoll.unsubscribe();
+  }
+
+  ngOnInit() {
+    this.initData();
+    this.loadltdId();
+    this.subscribeScoll = fromEvent(window, 'scroll').subscribe(event => {
+      this.scrollTop = document.documentElement.scrollTop;
+    });
+  }
+  loadltdId() {
+    // this.service.getNetworkFreightForwarder().subscribe(res => {
+    //   if (res) {
+    //     this.ltdId = res;
+    //   }
+    // });
+  }
+
+  initData() {
+    // this.service
+    //   .request(this.service.$api_get_freight_detail, {
+    //     id: this.route.snapshot.params.id
+    //   })
+    //   .subscribe(res => {
+    //     if (res) {
+    //       this.detailData = res;
+    //       this.tempalateData = { ...this.detailData };
+    //       this.enterpriseAddressCode = [
+    //         Number(this.detailData.fullRegionVO?.provinceCode),
+    //         Number(this.detailData.fullRegionVO?.cityCode),
+    //         Number(this.detailData.fullRegionVO?.areaCode)
+    //       ];
+    //     }
+    //   });
+  }
+
+  goBack() {
+    window.history.go(-1);
+  }
+  /**
+   * 冻结
+   */
+  freezeOrResume(type: number) {
+    // this.service.http
+    //   .post(this.service.$api_lock_freight, {
+    //     id: this.route.snapshot.params.id,
+    //     statedLocked: !!type
+    //   })
+    //   .subscribe(res => {
+    //     if (res.data === true) {
+    //       if (type === 0) {
+    //         this.service.msgSrv.success(`启用成功！`);
+    //       } else {
+    //         this.service.msgSrv.success(`冻结成功！`);
+    //       }
+    //       this.initData();
+    //     } else {
+    //       this.service.msgSrv.error(res.msg || '操作失败！');
+    //     }
+    //   });
+  }
+
+  auditPartner() {
+    const modal = this.nzModalService.create({
+      nzTitle: '审核',
+      nzContent: PartnerAuditModalComponent,
+      nzComponentParams: { info: this.detailData },
+      nzFooter: null
+    });
+  }
+
+  ratify() {
+    this.isEdit = true;
+  }
+
+  deleteImg(data: any, key: string, key2: string) {
+    this.nzModalService.warning({
+      nzTitle: '是否确认删除该图片',
+      nzOnOk: () => {
+        this.disabledUpload = true;
+        data[key] = '';
+        data[key2] = '';
+        setTimeout(() => {
+          this.disabledUpload = false;
+        }, 100);
+      }
+    });
+  }
+  changeUpload({ file, fileList, type }: any, data: any, key: string, key2: string, id: string) {
+    if (type === 'success') {
+      data[key] = file.response.data?.fullFileWatermarkPath;
+      data[key2] = file.response.data?.fullFilePath;
+      if (id === 'legalFront' || id === 'legalBack') {
+        this.checkIdCard(file.response.data?.fullFilePath, id === 'legalFront' ? 'front' : 'back', 1);
+      }
+      if (id === 'certificateBackFront' || id === 'certificateBack') {
+        this.checkIdCard(file.response.data?.fullFilePath, id === 'certificateBackFront' ? 'front' : 'back', 0);
+      }
+      if (id === 'detailPhoto') {
+        this.checkBusinessLicense(file.response.data?.fullFilePath);
+      }
+    }
+  }
+
+  /**
+   * 级联获取地区数据
+   * @param node 节点
+   * @param index 层级
+   * @returns
+   */
+  loadRegionData = (node: any, index: number) => {
+    return new Promise(resolve => {
+      this.service.request(this.service.$api_get_region_by_code, { regionCode: node?.regionCode || '' }).subscribe(
+        res => {
+          node.children = res.map((item: any) => ({ ...item, isLeaf: index === 1, value: item.regionCode, label: item.name }));
+        },
+        _ => {},
+        () => {
+          resolve(node);
+        }
+      );
+    });
+  };
+
+  reset() {
+    this.detailData = { ...this.tempalateData };
+    this.isEdit = false;
+  }
+
+  save() {
+    const dateil = { ...this.detailData };
+    Object.assign(dateil.legalPersonIdentityVO, {
+      validStartTime: this.datePipe.transform(dateil.legalPersonIdentityVO.validStartTime, 'yyyy-MM-dd'),
+      validEndTime: this.datePipe.transform(dateil.legalPersonIdentityVO.validEndTime, 'yyyy-MM-dd')
+    });
+    const params = {};
+    Object.assign(params, {
+      adminMobile: dateil.adminMobile,
+      adminAppUserId: dateil.adminAppUserId,
+      adminUserInfo: { ...dateil.adminUserInfo },
+      bankAccount: dateil.bankAccount,
+      businessScope: dateil.businessScope,
+      createBank: dateil.createBank,
+      creditPhoto: dateil.creditPhoto,
+      creditPhotoWatermark: dateil.creditPhotoWatermark,
+      enterpriseAddress: dateil.enterpriseAddress,
+      enterpriseAddressCode: this.enterpriseAddressCode[2],
+      enterpriseLogo: dateil.enterpriseLogo,
+      enterpriseName: dateil.enterpriseName,
+      enterpriseRegistrationTime: this.datePipe.transform(dateil.enterpriseRegistrationTime, 'yyyy-MM-dd'),
+      enterpriseType: dateil.enterpriseType,
+      id: dateil.id,
+      legalPersonIdentityDTO: { ...dateil.legalPersonIdentityVO },
+      licensePhoto: dateil.licensePhoto,
+      licensePhotoWatermark: dateil.licensePhotoWatermark,
+      networkTransporter: dateil.networkTransporter,
+      oftenUsedServices: dateil.oftenUsedServices,
+      operatingEndTime: this.datePipe.transform(dateil.operatingEndTime, 'yyyy-MM-dd'),
+      operatingStartTime: this.datePipe.transform(dateil.operatingStartTime, 'yyyy-MM-dd'),
+      promotersTelephone: dateil.promotersTelephone,
+      registerAddress: dateil.registerAddress,
+      registerPhone: dateil.registerPhone,
+      registrationCapital: dateil.registrationCapital,
+      taxAuthority: dateil.taxAuthority,
+      unifiedSocialCreditCode: dateil.unifiedSocialCreditCode
+    });
+    // this.service.request(this.service.$api_save_enterprise_admin, params).subscribe(res => {
+    //   if (res) {
+    //     this.service.msgSrv.success('企业修改成功');
+    //     this.initData();
+    //     this.isEdit = false;
+    //   }
+    // });
+  }
+
+  // 识别身份证 参数isFront：front-正面、back-背面；type：0-申请人身份证，1-法定代表人身份证
+  checkIdCard(imgurl: any, isFront: string, type: number) {
+    const params = {
+      idCardUrl: imgurl,
+      side: isFront
+    };
+    // this.service.request(this.service.$api_ocr_recognize_id_card, params).subscribe(res => {
+    //   if (res) {
+    //     if (type === 1) {
+    //       // 法定代表人证件照
+    //       if (isFront === 'front') {
+    //         // 正面
+    //         if (res.name) {
+    //           this.detailData.legalPersonIdentityVO.name = res.name;
+    //         }
+    //         if (res.number) {
+    //           this.detailData.legalPersonIdentityVO.certificateNumber = res.number;
+    //         }
+    //       }
+    //       if (isFront === 'back') {
+    //         // 背面
+    //         if (res.validFrom) {
+    //           this.detailData.legalPersonIdentityVO.validStartTime = res.validFrom;
+    //         }
+    //         if (res.validTo) {
+    //           this.detailData.legalPersonIdentityVO.validEndTime = res.validTo;
+    //         } else {
+    //           this.detailData.legalPersonIdentityVO.validEndTime = null;
+    //         }
+    //       }
+    //     }
+    //     // 企业管理员证件照
+    //     if (type === 0) {
+    //       if (isFront === 'front') {
+    //         // 正面
+    //         if (res.name) {
+    //           this.detailData.adminUserInfo.name = res.name;
+    //         }
+    //         if (res.number) {
+    //           this.detailData.adminUserInfo.certificateNumber = res.number;
+    //         }
+    //       }
+    //     }
+    //   }
+    // });
+  }
+
+  // 识别营业执照
+  checkBusinessLicense(imgurl: any) {
+    // this.service.request(this.service.$api_ocr_recognize_business_license, { businessLicenseUrl: imgurl }).subscribe(res => {
+    //   if (res) {
+    //     if (res.registrationNumber) {
+    //       this.detailData.unifiedSocialCreditCode = res.registrationNumber;
+    //     }
+    //     if (res.name) {
+    //       this.detailData.enterpriseName = res.name;
+    //     }
+    //     if (res.type) {
+    //       this.detailData.enterpriseType = res.type;
+    //     }
+    //     if (res.addressRegionCodes) {
+    //       this.detailData.enterpriseAddressCode = res.addressRegionCodes;
+    //     }
+    //     if (res.address) {
+    //       this.detailData.enterpriseAddress = res.address;
+    //     }
+    //     if (res.registeredCapital) {
+    //       this.detailData.registrationCapital = res.registeredCapital;
+    //     }
+    //     if (res.foundDate) {
+    //       this.detailData.enterpriseRegistrationTime = res.foundDate;
+    //     }
+    //     if (res.businessTermStartDate) {
+    //       this.detailData.operatingStartTime = res.businessTermStartDate;
+    //     }
+    //     if (res.businessTermEndDate) {
+    //       this.detailData.operatingEndTime = res.businessTermEndDate;
+    //     } else {
+    //       this.detailData.operatingEndTime = null;
+    //     }
+    //     if (res.businessScope) {
+    //       this.detailData.businessScope = res.businessScope;
+    //     }
+    //   }
+    // });
+  }
+
+  private initST(): STColumn[] {
+    return [
+      { title: '修改后渠道销售', index: 'payCode', width: 180 },
+      { title: '修改前渠道销售', index: 'ltdName', width: 160 },
+      { title: '转移客户数', index: 'payDate', className: 'text-center', width: 130 },
+      { title: '生效节点', index: 'payDate', width: 150 },
+      { title: '备注', index: 'payDate', className: 'text-center', width: 150 },
+      { title: '修改时间', index: 'payDate', className: 'text-center', width: 130 },
+      { title: '操作人', index: 'payDate', type: 'date', width: 130 },
+      {
+        title: '操作',
+        fixed: 'right',
+        width: '140px',
+        buttons: [
+          {
+            text: '详情'
+          }
+        ]
+      }
+    ];
+  }
+}
diff --git a/src/app/routes/partner/partner-list/services/partner-list.service.ts b/src/app/routes/partner/partner-list/services/partner-list.service.ts
new file mode 100644
index 00000000..7b07381f
--- /dev/null
+++ b/src/app/routes/partner/partner-list/services/partner-list.service.ts
@@ -0,0 +1,26 @@
+import { Injectable, Injector } from '@angular/core';
+import { BaseService, EACacheService } from '@shared';
+import { NzModalService } from 'ng-zorro-antd/modal';
+import { ImageViewComponent } from 'src/app/shared/components/imagelist';
+
+@Injectable()
+export class PartnerListService extends BaseService {
+  $mock_url = '/rule?_allow_anonymous=true';
+
+  // 根据地区code查询列表
+  $api_get_region_by_code = '/api/mdc/pbc/region/getRegionByCode';
+  // 根据地区code查询地区详情
+  $api_get_region_detail_by_code = '/api/mdc/pbc/region/getRegionDetailByCode';
+
+  constructor(public injector: Injector, private nzModalService: NzModalService) {
+    super(injector);
+  }
+
+  showImg(url: any) {
+    const params = {
+      imgList: [url],
+      index: 0
+    };
+    this.nzModalService.create({ nzContent: ImageViewComponent, nzComponentParams: { params } });
+  }
+}
diff --git a/src/app/routes/partner/partner-routing.module.ts b/src/app/routes/partner/partner-routing.module.ts
index 9fef0745..5f131455 100644
--- a/src/app/routes/partner/partner-routing.module.ts
+++ b/src/app/routes/partner/partner-routing.module.ts
@@ -27,6 +27,8 @@ import { PartnerAccountManagementAccountDetailComponent } from './account-manage
 import { PartnerAccountManagementRecordedDetailComponent } from './account-management/components/recorded-detail/recorded-detail.component';
 import { PartnerAccountManagementWithdrawalsRecordComponent } from './account-management/components/withdrawals-record/withdrawals-record.component';
 import { PartnerAccountManagementWithdrawalsDetailComponent } from './account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component';
+import { PartnerListComponent } from './partner-list/components/index/partner-list.component';
+import { PartnerDetailComponent } from './partner-list/components/partner-detail/partner-detail.component';
 
 const routes: Routes = [
   {
@@ -38,7 +40,7 @@ const routes: Routes = [
       { path: 'partner/custom-detail/:id', component: PartnerPartnerCustomDetailComponent },
       { path: 'partner/custom-order-detail/:id', component: PartnerPartnerCustomOrderDetailComponent },
       { path: 'sale/custom-detail/:id', component: PartnerSaleCustomDetailComponent },
-      { path: 'sale/partner-detail/:id', component: PartnerSalePartnerDetailComponent },
+      { path: 'sale/partner-detail/:id', component: PartnerSalePartnerDetailComponent }
     ]
   },
   {
@@ -46,7 +48,7 @@ const routes: Routes = [
     children: [
       { path: '', component: ParterChannelSalesListComponent },
       { path: 'list', component: ParterChannelSalesListComponent },
-      { path: 'edit', component: ParterChannelSalesEditComponent },
+      { path: 'edit', component: ParterChannelSalesEditComponent }
     ]
   },
   {
@@ -54,14 +56,14 @@ const routes: Routes = [
     children: [
       { path: '', component: ParterLevelConfigListComponent },
       { path: 'list', component: ParterLevelConfigListComponent },
-      { path: 'edit', component: ParterLevelConfigEditComponent },
+      { path: 'edit', component: ParterLevelConfigEditComponent }
     ]
   },
   {
     path: 'rebate',
     children: [
       { path: 'particulars', component: ParterRebateManageMentParticularsComponent },
-      { path: 'record', component: ParterRebateManageMentRecordComponent },
+      { path: 'record', component: ParterRebateManageMentRecordComponent }
     ]
   },
   {
@@ -71,12 +73,19 @@ const routes: Routes = [
       { path: 'account-detail', component: PartnerAccountManagementAccountDetailComponent },
       { path: 'recorded-detail/:id', component: PartnerAccountManagementRecordedDetailComponent },
       { path: 'withdraw-record', component: PartnerAccountManagementWithdrawalsRecordComponent },
-      { path: 'withdraw-record/:id', component: PartnerAccountManagementWithdrawalsDetailComponent },
+      { path: 'withdraw-record/:id', component: PartnerAccountManagementWithdrawalsDetailComponent }
     ]
   },
+  {
+    path: 'partner-list',
+    children: [
+      { path: '', component: PartnerListComponent },
+      { path: 'detail/:id', component: PartnerDetailComponent }
+    ]
+  }
 ];
 @NgModule({
   imports: [RouterModule.forChild(routes)],
   exports: [RouterModule]
 })
-export class PartnerRoutingModule { }
+export class PartnerRoutingModule {}
diff --git a/src/app/routes/partner/partner.module.ts b/src/app/routes/partner/partner.module.ts
index 66b8695d..49fe831a 100644
--- a/src/app/routes/partner/partner.module.ts
+++ b/src/app/routes/partner/partner.module.ts
@@ -32,6 +32,10 @@ import { PartnerAccountManagementAccountDetailComponent } from './account-manage
 import { PartnerAccountManagementRecordedDetailComponent } from './account-management/components/recorded-detail/recorded-detail.component';
 import { PartnerAccountManagementWithdrawalsRecordComponent } from './account-management/components/withdrawals-record/withdrawals-record.component';
 import { PartnerAccountManagementWithdrawalsDetailComponent } from './account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component';
+import { PartnerDetailComponent } from './partner-list/components/partner-detail/partner-detail.component';
+import { PartnerListComponent } from './partner-list/components/index/partner-list.component';
+import { PartnerAuditModalComponent } from './partner-list/components/partner-audit-modal/partner-audit-modal.component';
+import { PartnerListService } from './partner-list/services/partner-list.service';
 
 const COMPONENTS: any[] = [
   PartnerBusinessStatisticsIndexComponent,
@@ -54,11 +58,14 @@ const COMPONENTS: any[] = [
   PartnerAccountManagementAccountDetailComponent,
   PartnerAccountManagementRecordedDetailComponent,
   PartnerAccountManagementWithdrawalsRecordComponent,
-  PartnerAccountManagementWithdrawalsDetailComponent
+  PartnerAccountManagementWithdrawalsDetailComponent,
+  PartnerListComponent,
+  PartnerDetailComponent
 ];
 
 @NgModule({
-  declarations: [...COMPONENTS],
-  imports: [CommonModule, PartnerRoutingModule, SharedModule]
+  declarations: [...COMPONENTS, PartnerAuditModalComponent],
+  imports: [CommonModule, PartnerRoutingModule, SharedModule],
+  providers: [PartnerListService]
 })
-export class PartnerModule { }
+export class PartnerModule {}
diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json
index 82b7732b..45058d21 100644
--- a/src/assets/mocks/menu-data.json
+++ b/src/assets/mocks/menu-data.json
@@ -508,7 +508,12 @@
         {
           "text": "合伙人管理",
           "icon": "anticon anticon-dashboard",
-          "children": [{
+          "children": [
+            {
+              "text": "合伙人列表",
+              "link": "/partner/partner-list"
+            },
+            {
               "text": "业务统计",
               "link": "/partner/business-statistics/index"
             },

From ab385dea60a6718989fedd1f33e95026dbd68310 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= <xiaoyun.pan@eascs.com>
Date: Thu, 10 Mar 2022 17:51:20 +0800
Subject: [PATCH 25/70] -

---
 .../account-detail.component.html             |  1 +
 .../components/list/list.component.html       |  5 +-
 .../recorded-detail.component.html            |  1 +
 .../virtual-account-detail.component.ts       |  2 +-
 .../withdrawals-detail.component.html         | 99 ++++++++++---------
 .../withdrawals-detail.component.ts           |  2 +-
 .../withdrawals-record.component.html         |  1 +
 .../withdrawals-record.component.ts           |  6 +-
 .../routes/partner/partner-routing.module.ts  | 25 +++--
 src/app/routes/partner/partner.module.ts      |  4 +-
 src/assets/mocks/menu-data.json               | 31 +++---
 11 files changed, 100 insertions(+), 77 deletions(-)

diff --git a/src/app/routes/partner/account-management/components/account-detail/account-detail.component.html b/src/app/routes/partner/account-management/components/account-detail/account-detail.component.html
index e37a9ce3..7f949749 100644
--- a/src/app/routes/partner/account-management/components/account-detail/account-detail.component.html
+++ b/src/app/routes/partner/account-management/components/account-detail/account-detail.component.html
@@ -1,3 +1,4 @@
+<page-header-wrapper [title]="'账户详情'"></page-header-wrapper>
 <nz-card>
   <sv-container layout="vertical" [noColon]="true" col="4">
     <sv [label]="labelTpl">
diff --git a/src/app/routes/partner/account-management/components/list/list.component.html b/src/app/routes/partner/account-management/components/list/list.component.html
index 9992f0ab..e982c4e3 100644
--- a/src/app/routes/partner/account-management/components/list/list.component.html
+++ b/src/app/routes/partner/account-management/components/list/list.component.html
@@ -1,3 +1,4 @@
+<page-header-wrapper [title]="''"></page-header-wrapper>
 <nz-card>
   <!-- <div nz-row>
     <div [nzSpan]="" nz-col>
@@ -20,14 +21,14 @@
     [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
     [loading]="service.http.loading">
     <ng-template st-row="approvalStatus" let-item>
-      <a [routerLink]="'/partner/account-management/recorded-detail/'+item?.id">{{item.yskmoney}}</a>
+      <a [routerLink]="'/partner/account-management/am/recorded/detail/'+item?.id">{{item.yskmoney}}</a>
     </ng-template>
     <ng-template st-row="approvalStatus1" let-item>
       <div class="text-right">{{item.approvalStatus1 | currency:' '}}</div>
     </ng-template>
     <ng-template st-row="approvalStatus2" let-item>
       <a class="text-right text-blue-dark"
-        [routerLink]="'/partner/account-management/recorded-detail/'+item?.id">{{item.yskmoney | currency:'
+        [routerLink]="'/partner/account-management/am/recorded/detail/'+item?.id">{{item.yskmoney | currency:'
         '}}</a>
     </ng-template>
 
diff --git a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.html b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.html
index dd218401..cdbf3b4e 100644
--- a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.html
+++ b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.html
@@ -1,3 +1,4 @@
+<page-header-wrapper [title]="'待入账明细'"></page-header-wrapper>
 <nz-card>
   <sv-container layout="vertical" [noColon]="true" col="4">
     <sv [label]="labelTpl">
diff --git a/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.ts b/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.ts
index c4c969dd..9db2127b 100644
--- a/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.ts
+++ b/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.ts
@@ -164,7 +164,7 @@ export class PartnerAccountManagementVirtualAccountDetailComponent implements On
    * @param _record 当前行信息
    */
   viewDetail(_record: any) {
-    window.open(location.origin + '/#/partner/account-management/account-detail');
+    window.open(location.origin + `/#/partner/account-management/am/detail/${_record?.id}`);
   }
 
   close() {
diff --git a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html
index f9b29185..e2073979 100644
--- a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html
+++ b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html
@@ -1,5 +1,5 @@
 <!--
- * @Description  : 
+ * @Description  :
  * @Version      : 1.0
  * @Author       : Shiming
  * @Date         : 2022-01-05 20:15:41
@@ -9,55 +9,56 @@
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
 <page-header-wrapper [title]="'提现详情'" [logo]="logo">
-    <ng-template #logo>
-        <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
-            <i nz-icon nzType="left" nzTheme="outline"></i>
-        </button>
-    </ng-template>
+  <ng-template #logo>
+    <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
+      <i nz-icon nzType="left" nzTheme="outline"></i>
+    </button>
+  </ng-template>
 </page-header-wrapper>
 
-<nz-card [nzLoading]="service.http.loading">
-    <nz-alert nzType="info" nzMessage="提现信息" class="mb-md"></nz-alert>
-    <div se-container [labelWidth]="130">
-        <se label="网络货运人">
-            {{formData?.ltdName}}
-        </se>
-        <se label="银行类型">
-            {{formData?.bankType==='1'?'平安银行':'浦发银行'}}
-        </se>
-        <se label="提现单号">
-            {{formData?.refundApplyCode}}
-        </se>
-        <se label="账户名称">
-            {{formData?.bankAccountName}}
-        </se>
-        <se label="提现时间">
-            {{formData?.createTime}}
-        </se>
-        <se label="虚拟账户">
-            {{formData?.virtualAccount}}
-        </se>
-        <se label="提现状态">
-            {{formData?.refundStatusLabel}}
-        </se>
-        <se label="提现金额">
-            {{formData?.amount | currency}}
-        </se>
-        <se label="银行流水号">
-            {{formData?.bankSerialNumber}}
-        </se>
-        <se label="提现至银行卡">
-            {{formData?.bankCardNumber}}
-        </se>
-        <se label="银行回单" col="1">
-            <a (click)="downBack()">{{formData?.refundStatus==='3'?'下载回单':'暂无回单'}}</a>
-        </se>
-    </div>
 
-    <nz-alert nzType="info" nzMessage="提现进度" class="mb-md mt-md"></nz-alert>
-    <div nz-row class="mt-xl">
-        <div nz-col nzSpan="12" nzOffset="1">
-            <app-logistics-time-line [data]="timeLineData"></app-logistics-time-line>
-        </div>
+<nz-card [nzLoading]="service.http.loading">
+  <nz-alert nzType="info" nzMessage="提现信息" class="mb-md"></nz-alert>
+  <div se-container [labelWidth]="130">
+    <se label="网络货运人">
+      {{formData?.ltdName}}
+    </se>
+    <se label="银行类型">
+      {{formData?.bankType==='1'?'平安银行':'浦发银行'}}
+    </se>
+    <se label="提现单号">
+      {{formData?.refundApplyCode}}
+    </se>
+    <se label="账户名称">
+      {{formData?.bankAccountName}}
+    </se>
+    <se label="提现时间">
+      {{formData?.createTime}}
+    </se>
+    <se label="虚拟账户">
+      {{formData?.virtualAccount}}
+    </se>
+    <se label="提现状态">
+      {{formData?.refundStatusLabel}}
+    </se>
+    <se label="提现金额">
+      {{formData?.amount | currency}}
+    </se>
+    <se label="银行流水号">
+      {{formData?.bankSerialNumber}}
+    </se>
+    <se label="提现至银行卡">
+      {{formData?.bankCardNumber}}
+    </se>
+    <se label="银行回单" col="1">
+      <a (click)="downBack()">{{formData?.refundStatus==='3'?'下载回单':'暂无回单'}}</a>
+    </se>
+  </div>
+
+  <nz-alert nzType="info" nzMessage="提现进度" class="mb-md mt-md"></nz-alert>
+  <div nz-row class="mt-xl">
+    <div nz-col nzSpan="12" nzOffset="1">
+      <app-logistics-time-line [data]="timeLineData"></app-logistics-time-line>
     </div>
-</nz-card>
\ No newline at end of file
+  </div>
+</nz-card>
diff --git a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts
index 2332fd75..9c6173a1 100644
--- a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts
+++ b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts
@@ -8,7 +8,7 @@ import { FreightAccountService } from 'src/app/routes/financial-management/servi
   templateUrl: './withdrawals-detail.component.html',
   styleUrls: ['./withdrawals-detail.component.less']
 })
-export class PartnerAccountManagementWithdrawalsDetailComponent implements OnInit {
+export class PartnerAccountManagementWithdralDetailComponent implements OnInit {
   formData: any = {};
 
   timeLineData: any = [];
diff --git a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.html b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.html
index 14e2ff3e..d7c20673 100644
--- a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.html
+++ b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.html
@@ -1,3 +1,4 @@
+<page-header-wrapper [title]="''"></page-header-wrapper>
 <nz-card class="search-box" nzBordered>
   <div nz-row nzGutter="8">
     <div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
diff --git a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts
index 16738ce9..6b7b86f4 100644
--- a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts
+++ b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
-import { Router } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { STComponent, STColumn, STChange, STRequestOptions, STData } from '@delon/abc/st';
 import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form';
 import { NzModalService } from 'ng-zorro-antd/modal';
@@ -27,7 +27,7 @@ export class PartnerAccountManagementWithdrawalsRecordComponent implements OnIni
   refundStatus: any = '';
 
   msg = '';
-  constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) { }
+  constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router, public ar: ActivatedRoute) { }
 
   ngOnInit(): void { }
 
@@ -325,7 +325,7 @@ export class PartnerAccountManagementWithdrawalsRecordComponent implements OnIni
           },
           {
             text: '详情',
-            click: item => this.router.navigate(['/financial-management/withdrawals-record/detail/' + item.id])
+            click: item => this.router.navigate(['./detail/' + item.id], { relativeTo: this.ar })
           }
         ]
       }
diff --git a/src/app/routes/partner/partner-routing.module.ts b/src/app/routes/partner/partner-routing.module.ts
index b22dabab..a9bf5669 100644
--- a/src/app/routes/partner/partner-routing.module.ts
+++ b/src/app/routes/partner/partner-routing.module.ts
@@ -29,7 +29,7 @@ import { ParterRebateManageMentRecordComponent } from './rebate-management/compo
 import { PartnerAccountManagementAccountDetailComponent } from './account-management/components/account-detail/account-detail.component';
 import { PartnerAccountManagementRecordedDetailComponent } from './account-management/components/recorded-detail/recorded-detail.component';
 import { PartnerAccountManagementWithdrawalsRecordComponent } from './account-management/components/withdrawals-record/withdrawals-record.component';
-import { PartnerAccountManagementWithdrawalsDetailComponent } from './account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component';
+import { PartnerAccountManagementWithdralDetailComponent } from './account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component';
 
 const routes: Routes = [
   {
@@ -70,13 +70,26 @@ const routes: Routes = [
   {
     path: 'account-management',
     children: [
-      { path: 'list', component: PartnerAccountManagementListComponent },
-      { path: 'account-detail', component: PartnerAccountManagementAccountDetailComponent },
-      { path: 'recorded-detail/:id', component: PartnerAccountManagementRecordedDetailComponent },
-      { path: 'withdraw-record', component: PartnerAccountManagementWithdrawalsRecordComponent },
-      { path: 'withdraw-record/:id', component: PartnerAccountManagementWithdrawalsDetailComponent },
+      {
+        path: 'am',
+        children: [
+          { path: '', redirectTo: 'list' },
+          { path: '', component: PartnerAccountManagementListComponent },
+          { path: 'detail/:id', component: PartnerAccountManagementAccountDetailComponent },
+          { path: 'recorded/detail/:id', component: PartnerAccountManagementRecordedDetailComponent },
+        ]
+      },
+
+      {
+        path: 'withdraw-record',
+        children: [
+          { path: '', component: PartnerAccountManagementWithdrawalsRecordComponent },
+          { path: 'detail/:id', component: PartnerAccountManagementWithdralDetailComponent }
+        ]
+      },
     ]
   },
+
   {
     path: 'claim-audit',
     children: [
diff --git a/src/app/routes/partner/partner.module.ts b/src/app/routes/partner/partner.module.ts
index 0d94b9ef..cbe18425 100644
--- a/src/app/routes/partner/partner.module.ts
+++ b/src/app/routes/partner/partner.module.ts
@@ -38,7 +38,7 @@ import { PartnerAccountManagementVirtualAccountDetailComponent } from './account
 import { PartnerAccountManagementAccountDetailComponent } from './account-management/components/account-detail/account-detail.component';
 import { PartnerAccountManagementRecordedDetailComponent } from './account-management/components/recorded-detail/recorded-detail.component';
 import { PartnerAccountManagementWithdrawalsRecordComponent } from './account-management/components/withdrawals-record/withdrawals-record.component';
-import { PartnerAccountManagementWithdrawalsDetailComponent } from './account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component';
+import { PartnerAccountManagementWithdralDetailComponent } from './account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component';
 import { ParterRebateManageMentRecordComponent } from './rebate-management/components/rebate-record/rebate-record.component';
 
 const COMPONENTS: any[] = [
@@ -69,7 +69,7 @@ const COMPONENTS: any[] = [
   PartnerAccountManagementAccountDetailComponent,
   PartnerAccountManagementRecordedDetailComponent,
   PartnerAccountManagementWithdrawalsRecordComponent,
-  PartnerAccountManagementWithdrawalsDetailComponent
+  PartnerAccountManagementWithdralDetailComponent
 ];
 
 @NgModule({
diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json
index 473d4c2f..3f8a56dc 100644
--- a/src/assets/mocks/menu-data.json
+++ b/src/assets/mocks/menu-data.json
@@ -542,11 +542,11 @@
               "group": true,
               "children": [{
                   "text": "账户管理",
-                  "link": "/partner/account-management/list"
+                  "link": "/partner/account-management/am"
                 },
                 {
                   "text": "账户明细",
-                  "link": "/partner/account-management/account-detail",
+                  "link": "/partner/account-management/am/detail/:id",
                   "hide": true
                 },
                 {
@@ -555,7 +555,12 @@
                 },
                 {
                   "text": "提现详情",
-                  "link": "/partner/account-management/withdraw-record/:id",
+                  "link": "/partner/account-management/withdraw-record/detail/:id",
+                  "hide": true
+                },
+                {
+                  "text": "待入账明细",
+                  "link": "/partner/account-management/am/recorded/detail/:id",
                   "hide": true
                 }
               ]
@@ -564,16 +569,16 @@
               "text": "客户认领审核",
               "link": "/partner/claim-audit/list",
               "children": [{
-                "text": "合伙人客户认领详情",
-                "link": "/partner/claim-audit/partner-detail",
-                "hide": true
-              },
-              {
-                "text": "渠道销售客户认领详情",
-                "link": "/partner/claim-audit/channel-detail",
-                "hide": true
-              }
-            ]
+                  "text": "合伙人客户认领详情",
+                  "link": "/partner/claim-audit/partner-detail",
+                  "hide": true
+                },
+                {
+                  "text": "渠道销售客户认领详情",
+                  "link": "/partner/claim-audit/channel-detail",
+                  "hide": true
+                }
+              ]
             }
           ]
         }

From 28a20973d3da53acf594f5beb4d5ebfb35f86d86 Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Thu, 10 Mar 2022 20:36:10 +0800
Subject: [PATCH 26/70] edit

---
 .../partner-audit-modal.component.ts          | 42 +++++++---
 .../partner-detail.component.html             | 80 ++++++++----------
 .../partner-detail.component.ts               | 82 ++++++++++++-------
 .../freight/list/detail/detail.component.html |  1 -
 4 files changed, 113 insertions(+), 92 deletions(-)

diff --git a/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts b/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts
index eed7b8ac..ab86de05 100644
--- a/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts
+++ b/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts
@@ -1,5 +1,5 @@
 import { Component, Input, OnInit, ViewChild } from '@angular/core';
-import { SFComponent, SFSchema } from '@delon/form';
+import { SFComponent, SFSchema, SFValue } from '@delon/form';
 import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
 import { PartnerListService } from '../../services/partner-list.service';
 
@@ -23,6 +23,13 @@ export class PartnerAuditModalComponent implements OnInit {
   initSF(user: any) {
     this.schema = {
       properties: {
+        isPass: {
+          type: 'boolean',
+          ui: {
+            hidden: true
+          },
+          default: this.info.isPass
+        },
         staffName: {
           title: '合伙人名称',
           type: 'string',
@@ -37,7 +44,10 @@ export class PartnerAuditModalComponent implements OnInit {
             { value: true, label: '通过' },
             { value: false, label: '驳回' }
           ],
-          ui: { widget: 'radio' },
+          ui: {
+            widget: 'radio',
+            hidden: this.info.isPass !== undefined
+          },
           default: true
         },
         a: {
@@ -49,7 +59,14 @@ export class PartnerAuditModalComponent implements OnInit {
           ],
           ui: {
             widget: 'select',
-            placeholder: '请选择'
+            placeholder: '请选择',
+            hidden: this.info.isPass === false,
+            visibleIf: {
+              status: value => value
+            },
+            errors: {
+              required: ' '
+            }
           },
           default: ''
         },
@@ -60,19 +77,18 @@ export class PartnerAuditModalComponent implements OnInit {
           ui: {
             widget: 'textarea',
             placeholder: '请不要超过100个字',
-            autosize: { minRows: 3 }
+            autosize: { minRows: 3 },
+            hidden: this.info.isPass === true,
+            visibleIf: {
+              status: value => !value || this.info.isPass === false
+            },
+            errors: {
+              required: ' '
+            }
           }
         }
       },
-      if: {
-        properties: { status: { enum: [true] } }
-      },
-      then: {
-        required: ['a']
-      },
-      else: {
-        required: ['b']
-      }
+      required: ['a', 'b']
     };
   }
 
diff --git a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html
index 6dcdbb97..f242099c 100644
--- a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html
+++ b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html
@@ -49,13 +49,11 @@
                         </button>
                     </ng-container>
                     <ng-template #editButton>
-                        <ng-container *ngIf="detailData?.approvalStatus===10">
-                            <button [disabled]="service.http.loading" nz-button nzDanger (click)="auditPartner()" acl
-                                [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-audit']">
+                        <ng-container>
+                            <button [disabled]="service.http.loading" nz-button nzDanger (click)="auditPartner(true)">
                                 通过
                             </button>
-                            <button [disabled]="service.http.loading" nz-button nzDanger (click)="auditPartner()" acl
-                                [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-audit']">
+                            <button [disabled]="service.http.loading" nz-button nzDanger (click)="auditPartner(false)">
                                 驳回
                             </button>
                         </ng-container>
@@ -73,8 +71,7 @@
                                 冻结
                             </button>
                         </ng-container>
-                        <button [disabled]="service.http.loading" nz-button nzDanger (click)="ratify()" acl
-                            [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-save']">
+                        <button [disabled]="service.http.loading" nz-button nzDanger (click)="ratify()">
                             修改
                         </button>
                     </ng-template>
@@ -113,7 +110,8 @@
                 [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
         </sv>
         <sv label="手机号">
-            {{detailData.adminUserInfo?.mobile}}
+            <input nz-input type="text" [(ngModel)]="detailData.adminUserInfo.mobile" [readonly]="!isEdit"
+                [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
         </sv>
         <sv label="身份证号">
             <input nz-input type="text" [(ngModel)]="detailData.adminUserInfo.certificateNumber" [readonly]="!isEdit"
@@ -206,7 +204,7 @@
     </sv-container>
     <nz-divider></nz-divider>
     <sv-container col="3" class="mt16">
-        <sv-title>法人信息</sv-title>
+        <sv-title>企业法人信息</sv-title>
         <sv label="法定代表人">
             <input nz-input type="text" [(ngModel)]="detailData.legalPersonIdentityVO.name" [readonly]="!isEdit"
                 [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
@@ -232,7 +230,6 @@
                     (ngModelChange)="$event?detailData.legalPersonIdentityVO.validEndTime='':''"
                     class="ml-sm">长期</label>
             </ng-container>
-
         </sv>
         <sv label="身份证照" col="1">
             <div class="d-flex">
@@ -244,15 +241,19 @@
                 </ng-container>
             </div>
         </sv>
-    </sv-container>
-    <nz-divider></nz-divider>
-    <sv-container col="3" class="mt16">
-        <sv-title>所属城市</sv-title>
-        <sv label="">
-            深圳、上海、北京
+        <sv label="所属城市">
+            <ng-container *ngIf="isEdit; else cascaderelseTemplate">
+                <nz-cascader [(ngModel)]="enterpriseAddressCode" [nzLoadData]="loadRegionData">
+                </nz-cascader>
+            </ng-container>
+            <ng-template #cascaderelseTemplate>
+                {{ detailData?.fullRegionVO?.provinceName }}{{ detailData?.fullRegionVO?.cityName }}{{
+                detailData?.fullRegionVO?.areaName }}
+            </ng-template>
         </sv>
     </sv-container>
     <nz-divider></nz-divider>
+    <nz-divider></nz-divider>
     <sv-container col="3" class="mt16">
         <sv-title>渠道销售信息</sv-title>
         <sv label="姓名">
@@ -271,8 +272,8 @@
     <sv-container col="3" class="mt16">
         <sv-title>修改渠道销售记录</sv-title>
         <sv label="">
-            <st #st [data]="service.$mock_url" [columns]="columns" [loading]="service.http.loading" bordered size="small"
-                [page]="{show:false}" [scroll]="{ x:'1200px' }">
+            <st #st [data]="service.$mock_url" [columns]="columns.logsColumn" [loading]="service.http.loading" bordered
+                size="small" [page]="{show:false}" [scroll]="{ x:'1200px' }">
             </st>
         </sv>
     </sv-container>
@@ -289,35 +290,6 @@
     </div>
 </ng-template>
 
-<ng-template #approvedModal>
-    <div nz-row nzGutter="8">
-        <div nz-col nzSpan="24" se-container [labelWidth]="120">
-            <se [col]="1" label="公司名称">
-                {{ detailData?.enterpriseName }}
-            </se>
-            <se [col]="1" label="网络货运人" required>
-                <nz-select nzPlaceHolder="请选择" [(ngModel)]="networkTransporter">
-                    <nz-option [nzValue]="item.value" [nzLabel]="item.label" *ngFor="let item of ltdId"></nz-option>
-                </nz-select>
-            </se>
-        </div>
-    </div>
-</ng-template>
-
-<ng-template #redectModal>
-    <div nz-row nzGutter="8">
-        <div nz-col nzSpan="24" se-container [labelWidth]="120">
-            <se [col]="1" label="公司名称">
-                {{ detailData?.enterpriseName }}
-            </se>
-            <se [col]="1" label="备注" required>
-                <textarea nz-input rows="3" style="width: 325px;margin-left: 14px;"
-                    [(ngModel)]="approvalOpinion"></textarea>
-            </se>
-        </div>
-    </div>
-</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"
@@ -339,4 +311,18 @@
             </div>
         </div>
     </nz-upload>
+</ng-template>
+
+<ng-template #logModal>
+    <h2>转移客户数：10</h2>
+    <st #st [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 [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>
\ No newline at end of file
diff --git a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts
index f0e81cf1..fdfd31a3 100644
--- a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts
+++ b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts
@@ -15,16 +15,13 @@ import { PartnerAuditModalComponent } from '../partner-audit-modal/partner-audit
   providers: [DatePipe]
 })
 export class PartnerDetailComponent implements OnInit {
-  columns: STColumn[] = this.initST();
+  @ViewChild('logModal')
+  logModal: any;
 
-  @ViewChild('approvedModal', { static: false })
-  approvedModal!: any;
-  @ViewChild('redectModal', { static: false })
-  redectModal!: any;
+  columns: { logsColumn: STColumn[]; changeColumn: STColumn[]; beChangeColumn: STColumn[] } = this.initST();
 
   detailData: any = { adminUserInfo: { name: '' }, legalPersonIdentityVO: { name: '' } };
   tempalateData = { ...this.detailData };
-  suppliersData: any = {};
 
   isEdit = false;
 
@@ -33,9 +30,6 @@ export class PartnerDetailComponent implements OnInit {
   enterpriseAddressCode: any = [];
   ltdId: any = [];
 
-  approvalOpinion = '';
-  networkTransporter = null;
-
   esignCheckStatus: any = {
     0: '不通过',
     1: '通过',
@@ -113,11 +107,21 @@ export class PartnerDetailComponent implements OnInit {
     //   });
   }
 
-  auditPartner() {
+  auditPartner(isPass: boolean) {
     const modal = this.nzModalService.create({
       nzTitle: '审核',
       nzContent: PartnerAuditModalComponent,
-      nzComponentParams: { info: this.detailData },
+      nzComponentParams: { info: { ...this.detailData, isPass } },
+      nzFooter: null
+    });
+  }
+
+  showChangeDetail() {
+    const modal = this.nzModalService.create({
+      nzTitle: '详情',
+      nzContent: this.logModal,
+      nzNoAnimation: true,
+      nzWidth: 700,
       nzFooter: null
     });
   }
@@ -313,25 +317,41 @@ export class PartnerDetailComponent implements OnInit {
     // });
   }
 
-  private initST(): STColumn[] {
-    return [
-      { title: '修改后渠道销售', index: 'payCode', width: 180 },
-      { title: '修改前渠道销售', index: 'ltdName', width: 160 },
-      { title: '转移客户数', index: 'payDate', className: 'text-center', width: 130 },
-      { title: '生效节点', index: 'payDate', width: 150 },
-      { title: '备注', index: 'payDate', className: 'text-center', width: 150 },
-      { title: '修改时间', index: 'payDate', className: 'text-center', width: 130 },
-      { title: '操作人', index: 'payDate', type: 'date', width: 130 },
-      {
-        title: '操作',
-        fixed: 'right',
-        width: '140px',
-        buttons: [
-          {
-            text: '详情'
-          }
-        ]
-      }
-    ];
+  private initST(): { logsColumn: STColumn[]; changeColumn: STColumn[]; beChangeColumn: STColumn[] } {
+    return {
+      logsColumn: [
+        { title: '修改后渠道销售', index: 'payCode', width: 180 },
+        { title: '修改前渠道销售', index: 'ltdName', width: 160 },
+        { title: '转移客户数', index: 'payDate', className: 'text-center', width: 130 },
+        { title: '生效节点', index: 'payDate', width: 150 },
+        { title: '备注', index: 'payDate', className: 'text-center', width: 150 },
+        { title: '修改时间', index: 'payDate', className: 'text-center', width: 130 },
+        { title: '操作人', index: 'payDate', type: 'date', width: 130 },
+        {
+          title: '操作',
+          fixed: 'right',
+          width: '140px',
+          buttons: [
+            {
+              text: '详情',
+              click: () => this.showChangeDetail()
+            }
+          ]
+        }
+      ],
+      changeColumn: [
+        { title: '客户名称', index: 'payCode', width: 180 },
+        { title: '合伙人', index: 'ltdName', width: 160 },
+        { title: '渠道销售', index: 'payDate', className: 'text-center', width: 130 },
+        { title: 'CRM审核状态', index: 'payDate', width: 150 },
+        { title: '生效时间', index: 'payDate', className: 'text-center', width: 130 }
+      ],
+      beChangeColumn: [
+        { title: '客户名称', index: 'payCode', width: 180 },
+        { title: '合伙人', index: 'ltdName', width: 160 },
+        { title: '渠道销售', index: 'payDate', className: 'text-center', width: 130 },
+        { title: '生效时间', index: 'payDate', className: 'text-center', width: 130 }
+      ]
+    };
   }
 }
diff --git a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html
index 7a3798cf..33cb59e6 100644
--- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html
+++ b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html
@@ -278,7 +278,6 @@
         <label nz-checkbox [ngModel]="!!!detailData.legalPersonIdentityVO.validEndTime"
           (ngModelChange)="$event?detailData.legalPersonIdentityVO.validEndTime='':''" class="ml-sm">长期</label>
       </ng-container>
-
     </sv>
     <sv label="身份证照" col="1">
       <div class="d-flex">

From 1db85b00b95f374feb6ed8259591604fa1d50473 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= <xiaoyun.pan@eascs.com>
Date: Fri, 11 Mar 2022 10:36:49 +0800
Subject: [PATCH 27/70] =?UTF-8?q?=E5=85=A5=E8=B4=A6=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../withdrawals-detail.component.ts           |   2 +-
 .../routes/partner/partner-routing.module.ts  |  12 +-
 src/app/routes/partner/partner.module.ts      |   7 +-
 .../components/detail/detail.component.html   |  64 ++++
 .../components/detail/detail.component.less   |  17 +
 .../components/detail/detail.component.ts     |  87 +++++
 .../components/record/record.component.html   |  62 ++++
 .../components/record/record.component.ts     | 334 ++++++++++++++++++
 src/assets/mocks/menu-data.json               |   9 +
 9 files changed, 590 insertions(+), 4 deletions(-)
 create mode 100644 src/app/routes/partner/recorded/components/detail/detail.component.html
 create mode 100644 src/app/routes/partner/recorded/components/detail/detail.component.less
 create mode 100644 src/app/routes/partner/recorded/components/detail/detail.component.ts
 create mode 100644 src/app/routes/partner/recorded/components/record/record.component.html
 create mode 100644 src/app/routes/partner/recorded/components/record/record.component.ts

diff --git a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts
index 9c6173a1..95657e1e 100644
--- a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts
+++ b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts
@@ -4,7 +4,7 @@ import { FreightAccountService } from 'src/app/routes/financial-management/servi
 
 
 @Component({
-  selector: 'app-withdrawals-detail',
+  selector: 'app-partner-account-management-withdrawals-detail',
   templateUrl: './withdrawals-detail.component.html',
   styleUrls: ['./withdrawals-detail.component.less']
 })
diff --git a/src/app/routes/partner/partner-routing.module.ts b/src/app/routes/partner/partner-routing.module.ts
index a9bf5669..1fa7f324 100644
--- a/src/app/routes/partner/partner-routing.module.ts
+++ b/src/app/routes/partner/partner-routing.module.ts
@@ -30,6 +30,8 @@ import { PartnerAccountManagementAccountDetailComponent } from './account-manage
 import { PartnerAccountManagementRecordedDetailComponent } from './account-management/components/recorded-detail/recorded-detail.component';
 import { PartnerAccountManagementWithdrawalsRecordComponent } from './account-management/components/withdrawals-record/withdrawals-record.component';
 import { PartnerAccountManagementWithdralDetailComponent } from './account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component';
+import { PartnerRecordedRecordComponent } from './recorded/components/record/record.component';
+import { PartnerRecordedDetailComponent } from './recorded/components/detail/detail.component';
 
 const routes: Routes = [
   {
@@ -79,7 +81,6 @@ const routes: Routes = [
           { path: 'recorded/detail/:id', component: PartnerAccountManagementRecordedDetailComponent },
         ]
       },
-
       {
         path: 'withdraw-record',
         children: [
@@ -89,7 +90,6 @@ const routes: Routes = [
       },
     ]
   },
-
   {
     path: 'claim-audit',
     children: [
@@ -99,6 +99,14 @@ const routes: Routes = [
       { path: 'partner-detail', component: ParterClaimAuditListPartnerDetailComponent },
     ]
   },
+  {
+    path: 'recorded',
+    children: [
+      { path: 'record', component: PartnerRecordedRecordComponent },
+      { path: 'record/detail/:id', component: PartnerRecordedDetailComponent }
+    ]
+  },
+
 ];
 @NgModule({
   imports: [RouterModule.forChild(routes)],
diff --git a/src/app/routes/partner/partner.module.ts b/src/app/routes/partner/partner.module.ts
index cbe18425..deb047b2 100644
--- a/src/app/routes/partner/partner.module.ts
+++ b/src/app/routes/partner/partner.module.ts
@@ -40,6 +40,8 @@ import { PartnerAccountManagementRecordedDetailComponent } from './account-manag
 import { PartnerAccountManagementWithdrawalsRecordComponent } from './account-management/components/withdrawals-record/withdrawals-record.component';
 import { PartnerAccountManagementWithdralDetailComponent } from './account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component';
 import { ParterRebateManageMentRecordComponent } from './rebate-management/components/rebate-record/rebate-record.component';
+import { PartnerRecordedDetailComponent } from './recorded/components/detail/detail.component';
+import { PartnerRecordedRecordComponent } from './recorded/components/record/record.component';
 
 const COMPONENTS: any[] = [
   PartnerBusinessStatisticsIndexComponent,
@@ -69,7 +71,10 @@ const COMPONENTS: any[] = [
   PartnerAccountManagementAccountDetailComponent,
   PartnerAccountManagementRecordedDetailComponent,
   PartnerAccountManagementWithdrawalsRecordComponent,
-  PartnerAccountManagementWithdralDetailComponent
+  PartnerAccountManagementWithdralDetailComponent,
+  PartnerRecordedRecordComponent,
+  PartnerRecordedDetailComponent
+
 ];
 
 @NgModule({
diff --git a/src/app/routes/partner/recorded/components/detail/detail.component.html b/src/app/routes/partner/recorded/components/detail/detail.component.html
new file mode 100644
index 00000000..ed894907
--- /dev/null
+++ b/src/app/routes/partner/recorded/components/detail/detail.component.html
@@ -0,0 +1,64 @@
+<!--
+ * @Description  :
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-01-05 20:15:41
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-01-18 17:17:19
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\withdrawals-record\\withdrawals-detail\\withdrawals-detail.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
+<page-header-wrapper [title]="'入账详情'" [logo]="logo">
+  <ng-template #logo>
+    <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
+      <i nz-icon nzType="left" nzTheme="outline"></i>
+    </button>
+  </ng-template>
+</page-header-wrapper>
+
+
+<nz-card [nzLoading]="service.http.loading">
+  <nz-alert nzType="info" nzMessage="提现信息" class="mb-md"></nz-alert>
+  <div se-container [labelWidth]="130">
+    <se label="网络货运人">
+      {{formData?.ltdName}}
+    </se>
+    <se label="银行类型">
+      {{formData?.bankType==='1'?'平安银行':'浦发银行'}}
+    </se>
+    <se label="提现单号">
+      {{formData?.refundApplyCode}}
+    </se>
+    <se label="账户名称">
+      {{formData?.bankAccountName}}
+    </se>
+    <se label="提现时间">
+      {{formData?.createTime}}
+    </se>
+    <se label="虚拟账户">
+      {{formData?.virtualAccount}}
+    </se>
+    <se label="提现状态">
+      {{formData?.refundStatusLabel}}
+    </se>
+    <se label="提现金额">
+      {{formData?.amount | currency}}
+    </se>
+    <se label="银行流水号">
+      {{formData?.bankSerialNumber}}
+    </se>
+    <se label="提现至银行卡">
+      {{formData?.bankCardNumber}}
+    </se>
+    <se label="银行回单" col="1">
+      <a (click)="downBack()">{{formData?.refundStatus==='3'?'下载回单':'暂无回单'}}</a>
+    </se>
+  </div>
+
+  <nz-alert nzType="info" nzMessage="提现进度" class="mb-md mt-md"></nz-alert>
+  <div nz-row class="mt-xl">
+    <div nz-col nzSpan="12" nzOffset="1">
+      <app-logistics-time-line [data]="timeLineData"></app-logistics-time-line>
+    </div>
+  </div>
+</nz-card>
diff --git a/src/app/routes/partner/recorded/components/detail/detail.component.less b/src/app/routes/partner/recorded/components/detail/detail.component.less
new file mode 100644
index 00000000..e299b7d1
--- /dev/null
+++ b/src/app/routes/partner/recorded/components/detail/detail.component.less
@@ -0,0 +1,17 @@
+:host::ng-deep {
+
+    .ant-alert-info {
+        background-color: #f3f3f3;
+        border          : 1px solid #dbdbdb;
+
+        .ant-alert-message {
+            color: rgba(0, 0, 0, 0.85);
+            font-weight: 600;
+            font-size: 16px;
+        }
+    }
+
+    .ant-form-item {
+        margin-bottom: 15px;
+    }
+}
\ No newline at end of file
diff --git a/src/app/routes/partner/recorded/components/detail/detail.component.ts b/src/app/routes/partner/recorded/components/detail/detail.component.ts
new file mode 100644
index 00000000..a4c4b5ba
--- /dev/null
+++ b/src/app/routes/partner/recorded/components/detail/detail.component.ts
@@ -0,0 +1,87 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { FreightAccountService } from 'src/app/routes/financial-management/services/freight-account.service';
+
+
+@Component({
+  selector: 'app-partner-recored-detail',
+  templateUrl: './detail.component.html',
+  styleUrls: ['./detail.component.less']
+})
+export class PartnerRecordedDetailComponent implements OnInit {
+  formData: any = {};
+
+  timeLineData: any = [];
+
+  constructor(public service: FreightAccountService, private route: ActivatedRoute) {
+    const id = route.snapshot.params.id;
+    this.loadRefundDetail(id);
+  }
+
+  ngOnInit(): void { }
+
+  loadRefundDetail(id: string) {
+    this.service.request(this.service.$api_get_refund_detail, { id }).subscribe(res => {
+      if (res) {
+        this.formData = res;
+        // 处理流程节点数据
+        // 流程是否结束
+        let isEnd = false;
+        if (res.successTime) {
+          isEnd = true;
+          if (res.refundStatus === '3') {
+            this.timeLineData.push({ time: res.successTime, value: `到账成功`, color: 'green' });
+          } else {
+            this.timeLineData.push({ time: res.successTime, value: `提现失败`, color: 'red' });
+          }
+        }
+        if (res.agreeTime && res.refundStatus !== '4') {
+          this.timeLineData.push({ time: res.agreeTime, value: `银行处理中`, color: 'gray' });
+        }
+        if (res.agreeTime) {
+          if (res.refundStatus === '4') {
+            isEnd = true;
+            this.timeLineData.push({
+              time: res.agreeTime,
+              value: `拒绝提现<br/>操作人员：${res.handlerUserIdLabel}`,
+              color: 'red'
+            });
+          } else {
+            this.timeLineData.push({
+              time: res.agreeTime,
+              value: `审核通过<br/>操作人员：${res.handlerUserIdLabel}`,
+              color: 'gray'
+            });
+          }
+        }
+        if (res.createTime) {
+          this.timeLineData.push({
+            time: res.createTime,
+            value: `提交提现申请<br/>提现${res.amount}元至${res.bankName}(${res.bankCardNumber})<br/>操作人员：${res.userIdLabel}`,
+            color: 'gray'
+          });
+        }
+        if (this.timeLineData?.length > 0 && !isEnd) {
+          this.timeLineData[0].color = 'green';
+        }
+      }
+    });
+  }
+
+  downBack() {
+    if (this.formData?.refundStatus !== '3') {
+      return;
+    }
+    this.service.getReceiptUrl(this.formData.receiptUrl, {
+      bankType: this.formData.bankType,
+      rmYll: this.formData.userId,
+      snglFlgCd: this.formData.coreSerNo,
+      bussType: '06',
+      ltdId: this.formData.ltdId
+    });
+  }
+
+  goBack() {
+    history.go(-1);
+  }
+}
diff --git a/src/app/routes/partner/recorded/components/record/record.component.html b/src/app/routes/partner/recorded/components/record/record.component.html
new file mode 100644
index 00000000..50438e09
--- /dev/null
+++ b/src/app/routes/partner/recorded/components/record/record.component.html
@@ -0,0 +1,62 @@
+<page-header-wrapper [title]="''"></page-header-wrapper>
+<nz-card class="search-box" nzBordered>
+  <div nz-row nzGutter="8">
+    <div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
+      <sf #sf [schema]="searchSchema"
+        [ui]="{ '*': { spanLabelFixed: 90,grid: { lg: 8, md: 12, sm: 12, xs: 24,gutter:15 } }}" [compact]="true"
+        [button]="'none'"></sf>
+    </div>
+    <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand"
+      class="text-right">
+      <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
+      <button nz-button (click)="resetSF()">重置</button>
+      <button nz-button> 导出</button>
+      <button nz-button nzType="link" (click)="expandToggle()">
+        {{ !_$expand ? '展开' : '收起' }}
+        <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
+      </button>
+    </div>
+  </div>
+</nz-card>
+
+<nz-card class="content-box" nzBordered>
+  <nz-tabset [nzTabBarExtraContent]="extraTemplate">
+    <nz-tab nzTitle="全部" (nzClick)="changeRefundStatus()"></nz-tab>
+    <nz-tab nzTitle="待初审" (nzClick)="changeRefundStatus('1')"></nz-tab>
+    <nz-tab nzTitle="待复核" (nzClick)="changeRefundStatus('2')"></nz-tab>
+    <nz-tab nzTitle="已入账" (nzClick)="changeRefundStatus('3')"></nz-tab>
+    <nz-tab nzTitle="已拒绝" (nzClick)="changeRefundStatus('4')"></nz-tab>
+  </nz-tabset>
+
+  <ng-template #extraTemplate>
+    <div class="d-flex align-items-center ">
+      <div class="mr-md">
+        已选择
+        <strong class="text-red">{{ selectedRows.length }}</strong> 条数据&nbsp;&nbsp; 累计提现 <strong class="text-red">{{
+          totalCallNo }}</strong>
+        <!-- <a *ngIf="totalCallNo > 0" (click)="st.clearCheck()" class="ml-lg">清空</a> -->
+      </div>
+      <button nz-button (click)="this.auditAction(null)">审核</button>
+    </div>
+  </ng-template>
+
+  <st #st [data]="service.$api_get_refund_page" [columns]="columns" [req]="{  process: beforeReq }"
+    [loading]="service.http.loading" [scroll]="{ x:'1200px' }" (change)="stChange($event)"
+    [res]="{ reName: { list: 'data.records', total: 'data.total' }, process: afterRes }"
+    [page]="{ show: true,  pageSizes:  [10, 20, 50, 100, 200, 500] }" [loading]="service.http.loading">
+    <ng-template st-row="bankCardNumber" let-item let-index="index" let-column="column">
+      {{ item.bankName }} <br> {{ item.bankCardNumber }}
+    </ng-template>
+  </st>
+</nz-card>
+
+<ng-template #auditModal>
+  <div nz-row nzGutter="8">
+    <div nz-col nzSpan="24" se-container [labelWidth]="80">
+      <se [col]="1" label="备注">
+        <textarea nz-input rows="3" [(ngModel)]="msg" placeholder="同意可以不用填写原因 ，拒绝必须说明原因"
+          style="width: 325px;margin-left: 14px;"></textarea>
+      </se>
+    </div>
+  </div>
+</ng-template>
diff --git a/src/app/routes/partner/recorded/components/record/record.component.ts b/src/app/routes/partner/recorded/components/record/record.component.ts
new file mode 100644
index 00000000..e15f2aaa
--- /dev/null
+++ b/src/app/routes/partner/recorded/components/record/record.component.ts
@@ -0,0 +1,334 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { STComponent, STColumn, STChange, STRequestOptions, STData } from '@delon/abc/st';
+import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form';
+import { NzModalService } from 'ng-zorro-antd/modal';
+import { FreightAccountService } from 'src/app/routes/financial-management/services/freight-account.service';
+import Big from 'src/app/shared/utils/deal-precision';
+
+
+@Component({
+  selector: 'app-partner-recorded-record',
+  templateUrl: './record.component.html',
+  styleUrls: ['../../../../commom/less/box.less', '../../../../commom/less/expend-but.less']
+})
+export class PartnerRecordedRecordComponent implements OnInit {
+  @ViewChild('st', { static: true }) st!: STComponent;
+  @ViewChild('sf', { static: false }) sf!: SFComponent;
+  @ViewChild('auditModal', { static: false }) auditModal!: any;
+  @ViewChild('viewReasonModal', { static: false }) viewReasonModal!: any;
+  columns: STColumn[] = this.initST();
+  searchSchema: SFSchema = this.initSF();
+
+  _$expand = false;
+
+  selectedRows: any[] = [];
+  totalCallNo = 0;
+  refundStatus: any = '';
+
+  msg = '';
+  constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router, public ar: ActivatedRoute) { }
+
+  ngOnInit(): void { }
+
+  beforeReq = (requestOptions: STRequestOptions) => {
+    if (this.sf) {
+      Object.assign(requestOptions.body, {
+        ...this.sf.value,
+        createTime: {
+          start: this.sf.value.createTime?.[0] || '',
+          end: this.sf.value.createTime?.[1] || ''
+        },
+        refundStatus: this.refundStatus || null
+      });
+    }
+    return requestOptions;
+  };
+
+  afterRes = (data: any[], rawData?: any) => {
+    data = data.map(node => ({ ...node, disabled: node.refundStatus !== '1' }));
+    return data;
+  };
+
+  stChange(e: STChange): void {
+    if (e.type === 'checkbox') {
+      const checkRows = (e.checkbox as STData[]) || [];
+      //判断当前页是否有选中的行
+      if (checkRows.length === 0) {
+        // 当前页没有存在已勾选的行，移除之前所记录的当前页的行
+        const stList = this.st.list;
+        stList.forEach(item => {
+          this.selectedRows = this.selectedRows.filter((e: any) => e.id !== item.id);
+        })
+      } else {
+        //添加新增的行
+        checkRows.forEach((item: any) => {
+          const newSelectedList = this.selectedRows.filter((r: any) => r.id === item.id);
+          if (newSelectedList.length === 0) {
+            this.selectedRows.push(item);
+
+          }
+        })
+        // 移除取消选中的行
+        const stList = this.st.list;
+        stList.forEach(item => {
+          if (!item.checked) {
+            const index = this.selectedRows.findIndex(_item => item.id === _item.id);
+            if (index !== -1) this.selectedRows.splice(index, 1);
+          }
+        })
+      }
+      let totalCallNo = 0;
+      this.selectedRows.forEach((item => {
+        totalCallNo = new Big(this.totalCallNo).plus(item?.amount).parse();
+      }));
+      this.totalCallNo = totalCallNo;
+    } else if (e.type === 'loaded') {
+      // 页面加载时勾选
+      (e?.loaded || []).forEach((r) => {
+        this.selectedRows.forEach((x) => {
+          if (x.id === r.id) {
+            r.checked = true;
+          }
+        });
+      });
+    }
+  }
+
+  changeRefundStatus(status?: string) {
+    this.refundStatus = status || null;
+    this.st.load(1);
+  }
+
+  auditAction(item?: any) {
+    this.msg = '';
+    let params: Array<string> = [];
+    if (item) {
+      params = [item.id];
+    } else {
+      params = this.selectedRows.map(node => node.id);
+    }
+    const modal = this.nzModalService.create({
+      nzTitle: '审核',
+      nzContent: this.auditModal,
+      nzFooter: [
+        {
+          label: '拒绝',
+          type: 'default',
+          onClick: () => {
+            this.service
+              .request(this.service.$api_disagree_refund, {
+                refundApplicationId: params,
+                msg: this.msg
+              })
+              .subscribe(res => {
+                if (res) {
+                  this.service.msgSrv.success('审核拒绝成功');
+                  modal.destroy();
+                  this.st.load(1);
+                }
+              });
+          }
+        },
+        {
+          label: '通过',
+          type: 'primary',
+          onClick: () => {
+            this.service
+              .request(this.service.$api_agree_refund, {
+                refundApplicationId: params,
+                msg: this.msg
+              })
+              .subscribe(res => {
+                if (res) {
+                  this.service.msgSrv.success('审核通过成功');
+                  modal.destroy();
+                  this.st.load(1);
+                }
+              });
+          }
+        }
+      ]
+    });
+    modal.afterClose.subscribe(res => {
+      this.st.load();
+    });
+  }
+
+  showReason(item: any) {
+    const modal = this.nzModalService.create({
+      nzTitle: '查看原因',
+      nzContent: item?.rejectionCause || item?.failCause,
+      nzFooter: [
+        {
+          label: '关闭',
+          type: 'primary',
+          onClick: () => {
+            modal.destroy();
+          }
+        }
+      ]
+    });
+  }
+
+  /**
+   * 重置表单
+   */
+  resetSF() {
+    this.sf.reset();
+    this._$expand = false;
+  }
+
+  /**
+   * 伸缩查询条件
+   */
+  expandToggle() {
+    this._$expand = !this._$expand;
+    this.sf?.setValue('/expand', this._$expand);
+  }
+
+  private initSF(): SFSchema {
+    return {
+      properties: {
+        expand: {
+          type: 'boolean',
+          ui: {
+            hidden: true
+          }
+        },
+        refundApplyCode: {
+          type: 'string',
+          title: '提现单号',
+          ui: {
+            placeholder: '请输入'
+          }
+        },
+        refundStatus: {
+          type: 'string',
+          title: '提现状态',
+          ui: {
+            widget: 'dict-select',
+            params: { dictKey: 'refund:apply:status' },
+            placeholder: '请选择'
+          }
+        },
+        createTime: {
+          title: '提现时间',
+          type: 'string',
+          ui: {
+            widget: 'sl-from-to-search',
+            format: 'yyyy-MM-dd',
+            placeholder: '请选择',
+            nzShowTime: true
+          } as SFDateWidgetSchema
+        },
+        bankAccountName: {
+          type: 'string',
+          title: '账户名称',
+          ui: {
+            placeholder: '请输入',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        accountType: {
+          type: 'string',
+          title: '账户类型',
+          ui: {
+            widget: 'dict-select',
+            params: { dictKey: 'bank:type' },
+            placeholder: '请选择',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        ltdId: {
+          type: 'string',
+          title: '网络货运人',
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            allowClear: true,
+            asyncData: () => this.service.getNetworkFreightForwarder(),
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        bankType: {
+          type: 'string',
+          title: '银行类型',
+          ui: {
+            widget: 'dict-select',
+            params: { dictKey: 'bankname:type' },
+            placeholder: '请输入',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        }
+      }
+    };
+  }
+
+  private initST(): STColumn[] {
+    return [
+      { title: '', index: 'key', type: 'checkbox', className: 'text-center' },
+      { title: '提现时间', index: 'createTime', width: 180, className: 'text-center' },
+      { title: '提现单号', index: 'refundApplyCode', width: 180, className: 'text-center' },
+      { title: '网络货运人', index: 'ltdName', width: 220, className: 'text-center' },
+      { title: '银行类型', index: 'bankTypeLabel', width: 100, className: 'text-center' },
+      { title: '账户类型', index: 'bankTypeLabel', width: 100, className: 'text-center' },
+      { title: '账户名称', index: 'bankAccountName', width: 220, className: 'text-center' },
+      { title: '虚拟账户', index: 'virtualAccount', width: 180, className: 'text-center' },
+      {
+        title: '提现金额',
+        index: 'amount',
+        width: 150,
+        type: 'widget',
+        className: 'text-right',
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.amount }) }
+      },
+      { title: '提现银行账户', render: 'bankCardNumber', width: 200, className: 'text-center' },
+      { title: '提现状态', index: 'refundStatusLabel', width: 100, className: 'text-center' },
+      { title: '银行流水号', index: 'bankSerialNumber', width: 160, className: 'text-center' },
+      { title: '核心交易流水', index: 'coreSerNo', width: 180, className: 'text-center' },
+      { title: '失败原因', index: 'rejectionCause', width: 200, format: item => item.failCause, className: 'text-center' },
+      {
+        title: '操作',
+        fixed: 'right',
+        width: '110px',
+        buttons: [
+          {
+            text: '查看回单',
+            iif: item => item.refundStatus === '3',
+            click: item =>
+              this.service.getReceiptUrl(item.receiptUrl, {
+                bankType: item.bankType,
+                rmYll: item.userId,
+                snglFlgCd: item.coreSerNo,
+                bussType: '06',
+                ltdId: item.ltdId
+              })
+          },
+          {
+            text: '查看原因',
+            iif: item => item.refundStatus === '4',
+            click: item => this.showReason(item)
+          },
+          {
+            text: '审核',
+            iif: item => item.refundStatus === '1',
+            click: item => this.auditAction(item)
+          },
+          {
+            text: '详情',
+            click: item => this.router.navigate(['./detail/' + item.id], { relativeTo: this.ar })
+          }
+        ]
+      }
+    ];
+  }
+}
diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json
index 3f8a56dc..ea65b36a 100644
--- a/src/assets/mocks/menu-data.json
+++ b/src/assets/mocks/menu-data.json
@@ -579,6 +579,15 @@
                   "hide": true
                 }
               ]
+            },
+            {
+              "text": "入账记录",
+              "link": "/partner/recorded/record"
+            },
+            {
+              "text": "入账详情",
+              "link": "/partner/recorded/record/:id",
+              "hide": true
             }
           ]
         }

From efa9a6bbad214ad452f1648d91d1e78edae6cbdc Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Fri, 11 Mar 2022 10:50:53 +0800
Subject: [PATCH 28/70] e

---
 .../add-etp-partner.component.html            |  95 +++
 .../add-etp-partner.component.less            |  68 +++
 .../add-etp-partner.component.ts              | 555 ++++++++++++++++++
 .../add-personal-partner.component.html       |   1 +
 .../add-personal-partner.component.less       |   0
 .../add-personal-partner.component.ts         |  15 +
 .../index/partner-list.component.html         |   4 +-
 .../services/partner-list.service.ts          |   4 +
 .../routes/partner/partner-routing.module.ts  |   6 +-
 src/app/routes/partner/partner.module.ts      |   9 +-
 10 files changed, 752 insertions(+), 5 deletions(-)
 create mode 100644 src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.html
 create mode 100644 src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.less
 create mode 100644 src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.ts
 create mode 100644 src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.html
 create mode 100644 src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.less
 create mode 100644 src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts

diff --git a/src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.html b/src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.html
new file mode 100644
index 00000000..2cfb1621
--- /dev/null
+++ b/src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.html
@@ -0,0 +1,95 @@
+<page-header-wrapper [title]="'新增企业合伙人'"></page-header-wrapper>
+<nz-card>
+  <sf #sf1 [ui]="ui" [schema]="schema1" [button]="'none'">
+    <ng-template sf-template="_basicInfoTitle" let-me let-ui="ui" let-schema="schema">
+      <div class="form-title">企业基本信息</div>
+    </ng-template>
+    <ng-template sf-template="_licenseTips" let-me let-ui="ui" let-schema="schema">
+      <div class="pr">
+        请上传营业执照原件的高清照片，若上传复印件，则需加盖公司印章；
+        <div>上传后系统会自动识别并填写</div>
+      </div>
+    </ng-template>
+    <ng-template sf-template="unit" let-me let-ui="ui" let-schema="schema">
+      <div class="pr">万元</div>
+    </ng-template>
+
+    <ng-template sf-template="legalPersonIdentityDTO/_legalPersontitle" let-me let-ui="ui" let-schema="schema">
+      <div class="form-title" style="margin-top: 40px;margin-left: -180px;">营业执照法人信息</div>
+    </ng-template>
+    <ng-template sf-template="legalPersonIdentityDTO/_certificatePhototips" let-me let-ui="ui" let-schema="schema">
+      <div class="pr">
+        <div>请上传身份证原件的高清照片，若上传复印件，则需申请人签字；</div>
+        <div>上传后系统会自动识别并填写</div>
+      </div>
+    </ng-template>
+    <ng-template sf-template="legalPersonIdentityDTO/_certificatePhotoExmplateA" let-me let-ui="ui" let-schema="schema">
+      <div class="pr">
+        <dl class="tips">
+          <dt>正面照（人像面）</dt>
+          <dd>示例</dd>
+        </dl>
+        <div class="pa"><img width="190" src="./assets/images/usercenter/certificate-demo-front.png" /></div>
+      </div>
+    </ng-template>
+    <ng-template sf-template="legalPersonIdentityDTO/_certificatePhotoExmplateB" let-me let-ui="ui" let-schema="schema">
+      <div class="pr">
+        <dl class="tips">
+          <dt>背面照（国徽面）</dt>
+          <dd>示例</dd>
+        </dl>
+        <div class="pa"><img width="190" src="./assets/images/usercenter/certificate-demo-back.png" /></div>
+      </div>
+    </ng-template>
+  </sf>
+
+  <sf #sf [ui]="ui" [schema]="schema" [button]="'none'">
+    <ng-template sf-template="title1" let-me let-ui="ui" let-schema="schema">
+      <div class="form-title">企业开票信息</div>
+    </ng-template>
+    <ng-template sf-template="title99" let-me let-ui="ui" let-schema="schema">
+      <div class="form-title">企业管理员信息</div>
+    </ng-template>
+
+    <ng-template sf-template="tipsD" let-me let-ui="ui" let-schema="schema">
+      <div class="pr" style="z-index: 999;">
+        <div>请上传该企业授权您成为本系统企业管理员的文件的高清照片，需加盖公司印章</div>
+        <div>上传后系统会自动识别并填写</div>
+        <div></div>
+        <div class="pa"><img height="112px" style="margin-top: 12px;z-index: 9999;"
+            (click)="service.showImg('./assets/images/usercenter/agree.png')"
+            src="./assets/images/usercenter/agree.png" /></div>
+      </div>
+    </ng-template>
+    <ng-template sf-template="tips" let-me let-ui="ui" let-schema="schema">
+      <div class="pr">
+        <div>请上传身份证原件的高清照片，若上传复印件，则需申请人签字；</div>
+        <div>上传后系统会自动识别并填写</div>
+      </div>
+    </ng-template>
+    <ng-template sf-template="tipsA" let-me let-ui="ui" let-schema="schema">
+      <div class="pr">
+        <dl class="tips">
+          <dt>正面照（人像面）</dt>
+          <dd>示例</dd>
+        </dl>
+        <div class="pa"><img width="190" src="./assets/images/usercenter/certificate-demo-front.png" /></div>
+      </div>
+    </ng-template>
+    <ng-template sf-template="tipsB" let-me let-ui="ui" let-schema="schema">
+      <div class="pr">
+        <dl class="tips">
+          <dt>背面照（国徽面）</dt>
+          <dd>示例</dd>
+        </dl>
+        <div class="pa"><img width="190" src="./assets/images/usercenter/certificate-demo-back.png" /></div>
+      </div>
+    </ng-template>
+  </sf>
+
+  <div style="padding-left: 379px">
+    <button nz-button type="button" nzType="primary" (click)="submitForm()"
+      [nzLoading]="service.http.loading">确认新增</button>
+    <button nz-button (click)="goBack()">返回</button>
+  </div>
+</nz-card>
\ No newline at end of file
diff --git a/src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.less b/src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.less
new file mode 100644
index 00000000..6b70e074
--- /dev/null
+++ b/src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.less
@@ -0,0 +1,68 @@
+:host {
+    ::ng-deep {
+      nz-card {
+  
+        .pr {
+          position: relative;
+        }
+  
+        .pa {
+          position: absolute;
+          top     : 50px;
+          left    : 150px;
+        }
+  
+        .tips {
+          display      : flex;
+          margin-bottom: 0;
+          color        : #333;
+  
+          dt {
+            width: 150px;
+          }
+  
+          dd {
+            width        : 190px;
+            margin-bottom: 0;
+            text-align   : center;
+          }
+        }
+  
+        .form-title {
+          margin-bottom: 10px;
+          padding-left : 8px;
+          color        : #333;
+          font-weight  : 700;
+          font-size    : 18px;
+          line-height  : 20px;
+          border-left  : solid 3px #1890ff;
+        }
+  
+      }
+  
+      .ant-form-item {
+        margin-left: 180px;
+      }
+  
+      nz-date-picker,
+      nz-input-number {
+        width: 100% !important;
+      }
+  
+      .input-back {
+        nz-form-item {
+          margin-left: 0px;
+  
+          .ant-form-item-label {
+            flex: 0 !important;
+          }
+  
+          .ant-form-item-control {
+            max-width  : 100% !important;
+            margin-left: 20px !important;
+          }
+        }
+      }
+  
+    }
+  }
\ No newline at end of file
diff --git a/src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.ts b/src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.ts
new file mode 100644
index 00000000..580f9f3d
--- /dev/null
+++ b/src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.ts
@@ -0,0 +1,555 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { Router } from '@angular/router';
+import { apiConf } from '@conf/api.conf';
+import {
+  SFUploadWidgetSchema,
+  SFComponent,
+  SFSchema,
+  SFUISchema,
+  SFCascaderWidgetSchema,
+  SFTextareaWidgetSchema,
+  SFDateWidgetSchema,
+  SFCheckboxWidgetSchema
+} from '@delon/form';
+import { NzUploadFile } from 'ng-zorro-antd/upload';
+import { of } from 'rxjs';
+import { PartnerListService } from '../../services/partner-list.service';
+
+const IMAGECONFIG = {
+  previewFile: (file: NzUploadFile) => of(file.url),
+  action: apiConf.waterFileUpload,
+  fileType: 'image/png,image/jpeg,image/jpg,image/gif',
+  fileSize: 5120,
+  limit: 1,
+  limitFileCount: 1,
+  resReName: 'data.fullFileWatermarkPath',
+  urlReName: 'data.fullFileWatermarkPath',
+  widget: 'upload',
+  name: 'multipartFile',
+  multiple: false,
+  listType: 'picture-card'
+} as SFUploadWidgetSchema;
+
+const DATECONFIG = {
+  grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
+  widget: 'date',
+  format: 'yyyy-MM-dd',
+  placeholder: '请选择'
+};
+
+@Component({
+  selector: 'app-add-etp-partner',
+  templateUrl: './add-etp-partner.component.html',
+  styleUrls: ['./add-etp-partner.component.less']
+})
+export class AddEtpPartnerComponent implements OnInit {
+  @ViewChild('sf', { static: false })
+  sf!: SFComponent;
+  @ViewChild('sf1', { static: false })
+  sf1!: SFComponent;
+  schema: SFSchema = this.initOthersSF();
+  schema1: SFSchema = this.initBasicInfoSF();
+  ui: SFUISchema = {
+    '*': {
+      spanLabelFixed: 180,
+      grid: { span: 24 }
+    },
+    $_basicInfoTitle: {
+      spanLabelFixed: 0
+    },
+    $title99: {
+      spanLabelFixed: 0
+    },
+    $_legalPersontitle: {
+      spanLabelFixed: 0
+    },
+    $registrationCapital: {
+      spanLabelFixed: 180,
+      grid: { xxl: 13, xl: 18, lg: 22, md: 22 }
+    },
+    $unit: {
+      grid: { xxl: 6, xl: 6, lg: 2, md: 2 }
+    },
+    $_isLoingDate: {
+      spanLabelFixed: 100,
+      grid: { xxl: 6, xl: 6, lg: 4, md: 6 }
+    }
+  };
+
+  constructor(private router: Router, public service: PartnerListService) {}
+  ngOnInit() {
+  }
+
+  submitForm() {
+    if (!this.sf1.valid || !this.sf.valid) {
+      this.sf.validator({ emitError: true });
+      this.sf1.validator({ emitError: true });
+      this.service.msgSrv.warning('请修改填写错误信息');
+      return;
+    }
+    const enterpriseRegistrationTime = new Date(this.sf1.value.enterpriseRegistrationTime);
+    const operatingStartTime = new Date(this.sf1.value.operatingStartTime);
+    if (enterpriseRegistrationTime.getTime() > operatingStartTime.getTime()) {
+      this.service.msgSrv.warning('营业期限不能小于成立日期');
+      return;
+    }
+    if (this.sf1.value.operatingEndTime) {
+      const operatingEndTime = new Date(this.sf1.value.operatingEndTime);
+      if (operatingStartTime.getTime() > operatingEndTime.getTime()) {
+        this.service.msgSrv.warning('营业期限不能小于期限开始日期');
+        return;
+      }
+    }
+    const validStartTime = new Date(this.sf1.value.legalPersonIdentityDTO.validStartTime);
+    if (this.sf1.value.legalPersonIdentityDTO.validEndTime) {
+      const validEndTime = new Date(this.sf1.value.legalPersonIdentityDTO.validEndTime);
+      if (validStartTime.getTime() > validEndTime.getTime()) {
+        this.service.msgSrv.warning('法人证件有效截止日期小于开始日期');
+        return;
+      }
+    }
+    const sfVlaue = this.sf.value;
+    const params = {};
+    Object.assign(
+      params,
+      { ...this.sf1.value },
+      { ...this.sf.value },
+      {
+        enterpriseAddressCode: this.sf1.value.enterpriseAddressCode[2],
+        oftenUsedServices: sfVlaue.oftenUsedServices,
+        registerAddress: sfVlaue.registerAddress,
+        registerPhone: sfVlaue.registerPhone,
+        creditPhoto: sfVlaue.creditPhoto,
+        creditPhotoWatermark: sfVlaue.creditPhotoWatermark,
+        promotersTelephone: sfVlaue.promotersTelephone,
+        networkTransporter: sfVlaue.networkTransporter,
+        adminUserInfo: {
+          certificateNumber: sfVlaue.certificateNumber,
+          certificatePhotoBack: sfVlaue.certificatePhotoBack,
+          certificatePhotoBackWatermark: sfVlaue.certificatePhotoBackWatermark,
+          certificatePhotoFront: sfVlaue.certificatePhotoFront,
+          certificatePhotoFrontWatermark: sfVlaue.certificatePhotoFrontWatermark,
+          name: sfVlaue.name
+        }
+      }
+    );
+    // this.service.request(this.service.$api_save_enterprise_admin, params).subscribe(res => {
+    //   if (res) {
+    //     this.service.msgSrv.success('企业新增成功');
+    //     this.goBack();
+    //   }
+    // });
+  }
+
+  /*
+   * 根据地区code查询地区列表
+   */
+  getRegionDetailByCode(regionCode: any) {
+    return this.service.request(this.service.$api_get_region_by_code, { regionCode });
+  }
+
+  // 识别身份证 参数isFront：front-正面、back-背面；type：0-申请人身份证，1-法定代表人身份证
+  checkIdCard(imgurl: any, isFront: string, type: number) {
+    const params = {
+      idCardUrl: imgurl,
+      side: isFront
+    };
+    this.service.request(this.service.$api_ocr_recognize_id_card, params).subscribe(res => {
+      if (res) {
+        if (type === 1) {
+          // 法定代表人证件照
+          if (isFront === 'front') {
+            // 正面
+            if (res.name) {
+              this.sf1.setValue('/legalPersonIdentityDTO/name', res.name);
+            }
+            if (res.number) {
+              this.sf1.setValue('/legalPersonIdentityDTO/certificateType', 0);
+              this.sf1.setValue('/legalPersonIdentityDTO/certificateNumber', res.number);
+            }
+          }
+          if (isFront === 'back') {
+            // 背面
+            if (res.validFrom) {
+              this.sf1.setValue('/legalPersonIdentityDTO/validStartTime', res.validFrom);
+            }
+            if (res.validTo) {
+              this.sf1.setValue('/legalPersonIdentityDTO/validEndTime', res.validTo);
+              this.sf1.setValue('/legalPersonIdentityDTO/_isLoingDate', false);
+            } else {
+              this.sf1.setValue('/legalPersonIdentityDTO/_isLoingDate', true);
+            }
+          }
+        }
+        // 企业管理员证件照
+        if (type === 0) {
+          if (isFront === 'front') {
+            // 正面
+            if (res.name) {
+              this.sf.setValue('/name', res.name);
+            }
+            if (res.number) {
+              this.sf.setValue('/certificateNumber', res.number);
+            }
+          }
+        }
+      }
+    });
+  }
+
+  // 识别营业执照
+  checkBusinessLicense(imgurl: any) {
+    this.service.request(this.service.$api_ocr_recognize_business_license, { businessLicenseUrl: imgurl }).subscribe(res => {
+      if (res) {
+        if (res.registrationNumber) {
+          this.sf1.setValue('/unifiedSocialCreditCode', res.registrationNumber);
+        }
+        if (res.name) {
+          this.sf1.setValue('/enterpriseName', res.name);
+        }
+        if (res.type) {
+          this.sf1.setValue('/enterpriseType', res.type);
+        }
+        if (res.addressRegionCodes) {
+          this.sf1.setValue('/enterpriseAddressCode', res.addressRegionCodes);
+        }
+        if (res.address) {
+          this.sf1.setValue('/enterpriseAddress', res.address);
+        }
+        if (res.registeredCapital) {
+          this.sf1.setValue('/registrationCapital', res.registeredCapital);
+        }
+        if (res.foundDate) {
+          this.sf1.setValue('/enterpriseRegistrationTime', res.foundDate);
+        }
+        if (res.businessTermStartDate) {
+          this.sf1.setValue('/operatingStartTime', res.businessTermStartDate);
+        }
+        if (res.businessTermEndDate) {
+          this.sf1.setValue('/operatingEndTime', res.businessTermEndDate);
+        } else {
+          this.sf1.setValue('/_isLoingDate', true);
+        }
+        if (res.businessScope) {
+          this.sf1.setValue('/businessScope', res.businessScope);
+        }
+      }
+    });
+  }
+
+  goBack() {
+    window.history.go(-1);
+  }
+
+  private initBasicInfoSF(): SFSchema {
+    return {
+      properties: {
+        _basicInfoTitle: { title: '', type: 'string', ui: { widget: 'custom' } },
+        _licenseTips: { title: '营业执照', type: 'string', ui: { widget: 'custom' } },
+        licensePhoto: { title: '', type: 'string', ui: { hidden: true } },
+        licensePhotoWatermark: {
+          type: 'string',
+          title: '',
+          ui: {
+            ...IMAGECONFIG,
+            descriptionI18n: '图片支持jpg、jpeg、png、gif格式，大小不超过5M',
+            change: args => {
+              if (args.type === 'success') {
+                this.sf1.setValue('/licensePhoto', args.fileList[0].response.data.fullFilePath);
+                this.checkBusinessLicense(args.fileList[0].response.data.fullFilePath);
+              }
+            }
+          } as SFUploadWidgetSchema
+        },
+        unifiedSocialCreditCode: {
+          title: '统一社会信用代码',
+          type: 'string',
+          minLength: 1,
+          maxLength: 30,
+          ui: {
+            grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
+            optionalHelp:
+              '为了企业用户的使用体验，若公司代码即统一社会信用代码已在本应用其他关联平台注册，则此处填写的公司资料将同步更新至对应已注册的平台',
+            placeholder: '请输入营业执照上的统一社会信用代码',
+            errors: {
+              required: '请输入18位公司代码'
+            }
+          }
+        },
+        enterpriseName: {
+          title: '公司名称',
+          type: 'string',
+          minLength: 1,
+          maxLength: 100,
+          ui: {
+            grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
+            placeholder: '请输入营业执照上的统一社会信用代码',
+            errors: {
+              required: '请输入公司名称'
+            }
+          }
+        },
+        operatingStartTime: {
+          title: '营业期限',
+          type: 'string',
+          ui: {
+            ...DATECONFIG,
+            grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
+            errors: {
+              required: '请选择开始日期'
+            }
+          } as SFDateWidgetSchema
+        },
+        operatingEndTime: {
+          title: '',
+          type: 'string',
+          ui: {
+            ...DATECONFIG,
+            grid: { xxl: 13, xl: 18, lg: 20, md: 18 },
+            errors: {
+              required: '请选择截止日期'
+            },
+            change: i => {
+              this.sf1?.setValue('/_isLoingDate', false);
+            }
+          } as SFDateWidgetSchema
+        },
+        _isLoingDate: {
+          title: '长期',
+          type: 'boolean',
+          ui: {
+            class: 'input-back',
+            widget: 'checkbox',
+            change: i => this.sf1?.setValue('/operatingEndTime', null)
+          } as SFCheckboxWidgetSchema
+        },
+
+        legalPersonIdentityDTO: {
+          type: 'object',
+          properties: {
+            _legalPersontitle: { title: '', type: 'string', ui: { widget: 'custom' } },
+            _certificatePhototips: { title: '法定代表人证件照', type: 'string', ui: { widget: 'custom' } },
+            _certificatePhotoExmplateA: { title: '', type: 'string', ui: { widget: 'custom', offsetControl: 6 } },
+            certificatePhotoFrontWatermark: {
+              type: 'string',
+              title: '',
+              ui: {
+                ...IMAGECONFIG,
+                descriptionI18n: '图片支持jpg、jpeg、png、gif格式，大小不超过5M',
+                change: args => {
+                  if (args.type === 'success') {
+                    this.sf1.setValue('/legalPersonIdentityDTO/certificatePhotoFront', args.fileList[0].response.data.fullFilePath);
+                    this.checkIdCard(args.fileList[0].response.data.fullFilePath, 'front', 1);
+                  }
+                }
+              } as SFUploadWidgetSchema
+            },
+            _certificatePhotoExmplateB: { title: '', type: 'string', ui: { widget: 'custom', offsetControl: 6 } },
+            certificatePhotoFront: { title: '', type: 'string', ui: { hidden: true } },
+            certificatePhotoBack: { title: '', type: 'string', ui: { hidden: true } },
+            certificatePhotoBackWatermark: {
+              type: 'string',
+              title: '',
+              ui: {
+                ...IMAGECONFIG,
+                descriptionI18n: '图片支持jpg、jpeg、png、gif格式，大小不超过5M',
+                change: args => {
+                  if (args.type === 'success') {
+                    this.sf1.setValue('/legalPersonIdentityDTO/certificatePhotoBack', args.fileList[0].response.data.fullFilePath);
+                    this.checkIdCard(args.fileList[0].response.data.fullFilePath, 'back', 1);
+                  }
+                }
+              } as SFUploadWidgetSchema
+            },
+            name: {
+              title: '法人代表姓名',
+              type: 'string',
+              maxLength: 8,
+              ui: {
+                grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
+                placeholder: '请输入营业执照上的法人姓名'
+              }
+            },
+            certificateType: {
+              type: 'string',
+              title: '法人证件类型',
+              enum: [
+                { label: '大陆身份证', value: 0 },
+                { label: '港澳居民通行证', value: 1 },
+                { label: '香港居民通行证', value: 2 }
+              ],
+              default: 0,
+              ui: {
+                grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
+                widget: 'select'
+              }
+            },
+            certificateNumber: {
+              title: ' 法定代表人证件号',
+              type: 'string',
+              format: 'id-card',
+              minLength: 1,
+              maxLength: 18,
+              ui: {
+                grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
+                placeholder: '请输入法定代表人证件号'
+              }
+            },
+            validStartTime: {
+              title: '法人证件有效开始日期',
+              type: 'string',
+              ui: {
+                grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
+                widget: 'date',
+                format: 'yyyy-MM-dd',
+                placeholder: '请选择',
+                errors: {
+                  required: '请选择开始日期'
+                }
+              } as SFDateWidgetSchema
+            },
+            validEndTime: {
+              title: '法人证件有效截止日期',
+              type: 'string',
+              ui: {
+                grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
+                widget: 'date',
+                format: 'yyyy-MM-dd',
+                placeholder: '请选择',
+                errors: {
+                  required: '请选择截止日期'
+                },
+                change: i => {
+                  this.sf1?.setValue('/legalPersonIdentityDTO/_isLoingDate', false);
+                }
+              } as SFDateWidgetSchema
+            },
+            _isLoingDate: {
+              title: '长期',
+              type: 'boolean',
+              ui: {
+                spanLabelFixed: 100,
+                grid: { span: 6 },
+                class: 'input-back',
+                widget: 'checkbox',
+                change: i => this.sf1?.setValue('/legalPersonIdentityDTO/validEndTime', null)
+              } as SFCheckboxWidgetSchema
+            }
+          },
+          required: ['certificatePhotoFront', 'certificatePhotoBack', 'name', 'certificateType', 'certificateNumber', 'validStartTime']
+        }
+      },
+      required: [
+        'licensePhotoWatermark',
+        'unifiedSocialCreditCode',
+        'enterpriseName',
+        'enterpriseType',
+        'enterpriseAddressCode',
+        'enterpriseAddress',
+        'registrationCapital',
+        'enterpriseRegistrationTime',
+        'operatingStartTime',
+        'businessScope'
+      ]
+    };
+  }
+
+  private initOthersSF(): SFSchema {
+    return {
+      properties: {
+        title99: { title: '', type: 'string', ui: { widget: 'custom' } },
+        adminMobile: {
+          title: ' 企业管理员手机号',
+          type: 'string',
+          minLength: 1,
+          format: 'mobile',
+          maxLength: 11,
+          ui: {
+            grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
+            placeholder: '请输入企业管理员手机号',
+            errors: { required: '请输入企业管理员手机号', format: '手机号格式错误' }
+          }
+        },
+        tipsA: {
+          title: '企业管理员证件照',
+          type: 'string',
+          ui: {
+            widget: 'custom'
+          }
+        },
+        certificatePhotoFront: { title: '', type: 'string', ui: { hidden: true } },
+        certificatePhotoBack: { title: '', type: 'string', ui: { hidden: true } },
+        certificatePhotoFrontWatermark: {
+          type: 'string',
+          title: '',
+          ui: {
+            ...IMAGECONFIG,
+            descriptionI18n: '图片支持jpg、jpeg、png、gif格式，大小不超过5M',
+            change: args => {
+              if (args.type === 'success') {
+                this.sf.setValue('/certificatePhotoFront', args.fileList[0].response.data.fullFilePath);
+                this.checkIdCard(args.fileList[0].response.data.fullFilePath, 'front', 0);
+              }
+            }
+          } as SFUploadWidgetSchema
+        },
+        tipsB: {
+          title: '',
+          type: 'string',
+          ui: {
+            widget: 'custom',
+            offsetControl: 6
+          }
+        },
+        certificatePhotoBackWatermark: {
+          type: 'string',
+          title: '',
+          ui: {
+            ...IMAGECONFIG,
+            descriptionI18n: '图片支持jpg、jpeg、png、gif格式，大小不超过5M',
+            change: args => {
+              if (args.type === 'success') {
+                this.sf.setValue('/certificatePhotoBack', args.fileList[0].response.data.fullFilePath);
+              }
+            }
+          } as SFUploadWidgetSchema
+        },
+        name: {
+          title: '企业管理员姓名',
+          type: 'string',
+          maxLength: 8,
+          ui: {
+            grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
+            placeholder: '请输入企业管理员姓名'
+          }
+        },
+        certificateNumber: {
+          title: '企业管理员身份证号',
+          type: 'string',
+          format: 'id-card',
+          minLength: 1,
+          maxLength: 18,
+          ui: {
+            grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
+            placeholder: '请输入企业管理员身份证号'
+          }
+        },
+
+        title1: { title: '', type: 'string', ui: { widget: 'custom' } },
+        createBank: {
+          title: '所属城市',
+          type: 'string',
+          ui: { grid: { xxl: 13, xl: 18, lg: 24, md: 24 }, placeholder: '请输入银行账号' }
+        },
+
+        title3: { title: '', type: 'string', ui: { widget: 'custom' } },
+        bankAccount: {
+          title: '渠道销售邀请码',
+          type: 'string',
+          ui: { grid: { xxl: 13, xl: 18, lg: 24, md: 24 }, placeholder: '请输入银行账号' }
+        }
+      },
+      required: ['createBank', 'bankAccount', 'adminMobile', 'name', 'certificateNumber', 'tipsD', 'creditPhoto']
+    };
+  }
+}
diff --git a/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.html b/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.html
new file mode 100644
index 00000000..8245d202
--- /dev/null
+++ b/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.html
@@ -0,0 +1 @@
+<p>add-personal-partner works!</p>
diff --git a/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.less b/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.less
new file mode 100644
index 00000000..e69de29b
diff --git a/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts b/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts
new file mode 100644
index 00000000..6d31529c
--- /dev/null
+++ b/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-add-personal-partner',
+  templateUrl: './add-personal-partner.component.html',
+  styleUrls: ['./add-personal-partner.component.less']
+})
+export class AddPersonalPartnerComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit(): void {
+  }
+
+}
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 f1de5a81..1e4aa340 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
@@ -22,8 +22,8 @@
 
 <nz-card class="content-box" nzBordered>
     <div class="d-flex align-items-center mb-md mt-md">
-        <button nz-button (click)="this.routeTo('/partner/add-etp-partner')" nzType="primary">新增企业合伙人</button>
-        <button nz-button (click)="this.routeTo('/partner/add-personal-partner')" nzType="primary">新增个人合伙人</button>
+        <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>
     </div>
 
     <st #st [data]="service.$mock_url" [columns]="columns" [req]="{  process: beforeReq }"
diff --git a/src/app/routes/partner/partner-list/services/partner-list.service.ts b/src/app/routes/partner/partner-list/services/partner-list.service.ts
index 7b07381f..eecd75f5 100644
--- a/src/app/routes/partner/partner-list/services/partner-list.service.ts
+++ b/src/app/routes/partner/partner-list/services/partner-list.service.ts
@@ -11,6 +11,10 @@ export class PartnerListService extends BaseService {
   $api_get_region_by_code = '/api/mdc/pbc/region/getRegionByCode';
   // 根据地区code查询地区详情
   $api_get_region_detail_by_code = '/api/mdc/pbc/region/getRegionDetailByCode';
+  // 营业执照识别
+  $api_ocr_recognize_business_license = '/api/mdc/pbc/hwc/ocr/recognizeBusinessLicense';
+  // 身份证识别
+  $api_ocr_recognize_id_card = '/api/mdc/pbc/hwc/ocr/recognizeIdCard';
 
   constructor(public injector: Injector, private nzModalService: NzModalService) {
     super(injector);
diff --git a/src/app/routes/partner/partner-routing.module.ts b/src/app/routes/partner/partner-routing.module.ts
index 396a44ed..6c78c6fe 100644
--- a/src/app/routes/partner/partner-routing.module.ts
+++ b/src/app/routes/partner/partner-routing.module.ts
@@ -33,6 +33,8 @@ import { PartnerAccountManagementWithdrawalsDetailComponent } from './account-ma
 import { PartnerListComponent } from './partner-list/components/index/partner-list.component';
 import { PartnerDetailComponent } from './partner-list/components/partner-detail/partner-detail.component';
 import { ParterRebateManageMentSettingComponent } from './rebate-management/components/rebate-setting/rebate-setting.component';
+import { AddEtpPartnerComponent } from './partner-list/components/add-etp-partner/add-etp-partner.component';
+import { AddPersonalPartnerComponent } from './partner-list/components/add-personal-partner/add-personal-partner.component';
 
 const routes: Routes = [
   {
@@ -85,7 +87,9 @@ const routes: Routes = [
     path: 'partner-list',
     children: [
       { path: '', component: PartnerListComponent },
-      { path: 'detail/:id', component: PartnerDetailComponent }
+      { path: 'detail/:id', component: PartnerDetailComponent },
+      { path: 'add-etp-partner', component: AddEtpPartnerComponent },
+      { path: 'add-personal-partner', component: AddPersonalPartnerComponent },
     ]
   },
   {
diff --git a/src/app/routes/partner/partner.module.ts b/src/app/routes/partner/partner.module.ts
index 11c345dc..50653057 100644
--- a/src/app/routes/partner/partner.module.ts
+++ b/src/app/routes/partner/partner.module.ts
@@ -46,6 +46,8 @@ import { PartnerListService } from './partner-list/services/partner-list.service
 import { ParterRebateManageMentRecordComponent } from './rebate-management/components/rebate-record/rebate-record.component';
 import { ParterRebateManageMenAbnormalFeedbackComponent } from './rebate-management/model/abnormal-feedback/abnormal-feedback.component';
 import { ParterRebateManageMentSettingComponent } from './rebate-management/components/rebate-setting/rebate-setting.component';
+import { AddEtpPartnerComponent } from './partner-list/components/add-etp-partner/add-etp-partner.component';
+import { AddPersonalPartnerComponent } from './partner-list/components/add-personal-partner/add-personal-partner.component';
 
 const COMPONENTS: any[] = [
   PartnerBusinessStatisticsIndexComponent,
@@ -79,11 +81,14 @@ const COMPONENTS: any[] = [
   PartnerListComponent,
   PartnerDetailComponent,
   ParterRebateManageMenAbnormalFeedbackComponent,
-  ParterRebateManageMentSettingComponent
+  ParterRebateManageMentSettingComponent,
+  PartnerAuditModalComponent,
+  AddEtpPartnerComponent,
+  AddPersonalPartnerComponent
 ];
 
 @NgModule({
-  declarations: [...COMPONENTS, PartnerAuditModalComponent],
+  declarations: [...COMPONENTS],
   imports: [CommonModule, PartnerRoutingModule, SharedModule],
   providers: [PartnerListService]
 })

From 403c45c3886071499bb2d25411bf6330f1f1a78a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= <xiaoyun.pan@eascs.com>
Date: Fri, 11 Mar 2022 11:16:46 +0800
Subject: [PATCH 29/70] -

---
 .../components/record/record.component.html   | 26 +++++---
 .../components/record/record.component.ts     | 61 ++++++++++---------
 2 files changed, 49 insertions(+), 38 deletions(-)

diff --git a/src/app/routes/partner/recorded/components/record/record.component.html b/src/app/routes/partner/recorded/components/record/record.component.html
index 50438e09..1fd920b1 100644
--- a/src/app/routes/partner/recorded/components/record/record.component.html
+++ b/src/app/routes/partner/recorded/components/record/record.component.html
@@ -40,14 +40,24 @@
     </div>
   </ng-template>
 
-  <st #st [data]="service.$api_get_refund_page" [columns]="columns" [req]="{  process: beforeReq }"
-    [loading]="service.http.loading" [scroll]="{ x:'1200px' }" (change)="stChange($event)"
-    [res]="{ reName: { list: 'data.records', total: 'data.total' }, process: afterRes }"
-    [page]="{ show: true,  pageSizes:  [10, 20, 50, 100, 200, 500] }" [loading]="service.http.loading">
-    <ng-template st-row="bankCardNumber" let-item let-index="index" let-column="column">
-      {{ item.bankName }} <br> {{ item.bankCardNumber }}
-    </ng-template>
-  </st>
+  <div class="table-content">
+    <st #st [data]="service.$api_get_refund_page" [columns]="columns" [req]="{  process: beforeReq }"
+      [loading]="service.http.loading" [scroll]="{ x:'1200px' }" (change)="stChange($event)"
+      [res]="{ reName: { list: 'data.records', total: 'data.total' }, process: afterRes }"
+      [page]="{ show: true,  pageSizes:  [10, 20, 50, 100, 200, 500] }" [loading]="service.http.loading">
+      <ng-template st-row="bankCardNumber" let-item let-index="index" let-column="column">
+        {{ item.bankName }} <br> {{ item.bankCardNumber }}
+      </ng-template>
+    </st>
+    <div class=" text-md" *ngIf="st?.list?.length !== 0 ">
+      <span class="mr-md">合伙人数：<label class="text-red-dark font-weight-bold">{{totalInfo?.partnerNum}}</label></span>
+      <span class="mr-md">入账笔数：<label class="text-red-dark font-weight-bold">{{totalInfo?.count}}</label></span>
+      <span class="mr-md">开票金额：<label class="text-red-dark font-weight-bold">{{totalInfo?.invoiceAmount}}</label></span>
+      <span class="mr-md">代缴个税：<label class="text-red-dark font-weight-bold">{{totalInfo?.tax}}</label></span>
+      <span class="mr-md">入账金额：<label
+          class="text-red-dark font-weight-bold">{{totalInfo?.recorededAmount}}</label></span>
+    </div>
+  </div>
 </nz-card>
 
 <ng-template #auditModal>
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 e15f2aaa..49b6b08f 100644
--- a/src/app/routes/partner/recorded/components/record/record.component.ts
+++ b/src/app/routes/partner/recorded/components/record/record.component.ts
@@ -19,6 +19,13 @@ export class PartnerRecordedRecordComponent implements OnInit {
   @ViewChild('viewReasonModal', { static: false }) viewReasonModal!: any;
   columns: STColumn[] = this.initST();
   searchSchema: SFSchema = this.initSF();
+  totalInfo: any = {
+    partnerNum: 34,
+    count: 98,
+    invoiceAmount: 978239.98,
+    tax: 9878.00,
+    recorededAmount: 728698.98
+  }
 
   _$expand = false;
 
@@ -113,7 +120,7 @@ export class PartnerRecordedRecordComponent implements OnInit {
       nzContent: this.auditModal,
       nzFooter: [
         {
-          label: '拒绝',
+          label: '备注',
           type: 'default',
           onClick: () => {
             this.service
@@ -276,48 +283,42 @@ export class PartnerRecordedRecordComponent implements OnInit {
   private initST(): STColumn[] {
     return [
       { title: '', index: 'key', type: 'checkbox', className: 'text-center' },
-      { title: '提现时间', index: 'createTime', width: 180, className: 'text-center' },
-      { title: '提现单号', index: 'refundApplyCode', width: 180, className: 'text-center' },
-      { title: '网络货运人', index: 'ltdName', width: 220, className: 'text-center' },
-      { title: '银行类型', index: 'bankTypeLabel', width: 100, className: 'text-center' },
-      { title: '账户类型', index: 'bankTypeLabel', width: 100, className: 'text-center' },
-      { title: '账户名称', index: 'bankAccountName', width: 220, className: 'text-center' },
+      { title: '账户名称', index: 'createTime', width: 180, className: 'text-center' },
       { title: '虚拟账户', index: 'virtualAccount', width: 180, className: 'text-center' },
+      { title: '入账单号', index: 'refundApplyCode', width: 180, className: 'text-center' },
+      { title: '网络货运人', index: 'ltdName', width: 220, className: 'text-center' },
       {
-        title: '提现金额',
+        title: '开票金额',
         index: 'amount',
         width: 150,
         type: 'widget',
         className: 'text-right',
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.amount }) }
       },
-      { title: '提现银行账户', render: 'bankCardNumber', width: 200, className: 'text-center' },
-      { title: '提现状态', index: 'refundStatusLabel', width: 100, className: 'text-center' },
-      { title: '银行流水号', index: 'bankSerialNumber', width: 160, className: 'text-center' },
-      { title: '核心交易流水', index: 'coreSerNo', width: 180, className: 'text-center' },
-      { title: '失败原因', index: 'rejectionCause', width: 200, format: item => item.failCause, className: 'text-center' },
+      {
+        title: '代缴个税',
+        index: 'amount',
+        width: 150,
+        type: 'widget',
+        className: 'text-right',
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.amount }) }
+      },
+      {
+        title: '入账金额',
+        index: 'amount',
+        width: 150,
+        type: 'widget',
+        className: 'text-right',
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.amount }) }
+      },
+
+      { title: '提交时间', index: 'bankSerialNumber', width: 160, className: 'text-center' },
+      { title: '入账状态', index: 'refundStatusLabel', width: 100, className: 'text-center' },
       {
         title: '操作',
         fixed: 'right',
         width: '110px',
         buttons: [
-          {
-            text: '查看回单',
-            iif: item => item.refundStatus === '3',
-            click: item =>
-              this.service.getReceiptUrl(item.receiptUrl, {
-                bankType: item.bankType,
-                rmYll: item.userId,
-                snglFlgCd: item.coreSerNo,
-                bussType: '06',
-                ltdId: item.ltdId
-              })
-          },
-          {
-            text: '查看原因',
-            iif: item => item.refundStatus === '4',
-            click: item => this.showReason(item)
-          },
           {
             text: '审核',
             iif: item => item.refundStatus === '1',

From 06cbff566ac0d18f544ce4ae1e4b31838a1281c1 Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Fri, 11 Mar 2022 14:35:47 +0800
Subject: [PATCH 30/70] edit

---
 package-lock.json                             |  41 ++
 .../add-etp-partner.component.html            |  48 +--
 .../add-etp-partner.component.ts              | 355 ++++++++++--------
 .../add-personal-partner.component.html       |  45 ++-
 .../add-personal-partner.component.less       |  68 ++++
 .../add-personal-partner.component.ts         | 335 ++++++++++++++++-
 6 files changed, 701 insertions(+), 191 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ddf3948b..64c94964 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2879,6 +2879,35 @@
       "integrity": "sha1-vShOV8hPEyXacCur/IKlMoGQwMU=",
       "dev": true
     },
+    "@types/quill": {
+      "version": "2.0.9",
+      "resolved": "https://registry.npmmirror.com/@types/quill/-/quill-2.0.9.tgz",
+      "integrity": "sha512-/n40Ypp+jF3GDLqB/5z1P+Odq1K98txXbBgRDkG6Z90LGC1AwQPtZWNeOdDg0yUlgBSUASmpeDn3eBPUuPXtuw==",
+      "dev": true,
+      "requires": {
+        "parchment": "^1.1.2",
+        "quill-delta": "^4.0.1"
+      },
+      "dependencies": {
+        "fast-diff": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmmirror.com/fast-diff/-/fast-diff-1.2.0.tgz",
+          "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==",
+          "dev": true
+        },
+        "quill-delta": {
+          "version": "4.2.2",
+          "resolved": "https://registry.npmmirror.com/quill-delta/-/quill-delta-4.2.2.tgz",
+          "integrity": "sha512-qjbn82b/yJzOjstBgkhtBjN2TNK+ZHP/BgUQO+j6bRhWQQdmj2lH6hXG7+nwwLF41Xgn//7/83lxs9n2BkTtTg==",
+          "dev": true,
+          "requires": {
+            "fast-diff": "1.2.0",
+            "lodash.clonedeep": "^4.5.0",
+            "lodash.isequal": "^4.5.0"
+          }
+        }
+      }
+    },
     "@types/selenium-webdriver": {
       "version": "3.0.19",
       "resolved": "https://registry.npmmirror.com/@types/selenium-webdriver/download/@types/selenium-webdriver-3.0.19.tgz",
@@ -10136,12 +10165,24 @@
       "resolved": "https://registry.nlark.com/lodash/download/lodash-4.17.21.tgz",
       "integrity": "sha1-Z5WRxWTDv/quhFTPCz3zcMPWkRw="
     },
+    "lodash.clonedeep": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmmirror.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+      "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==",
+      "dev": true
+    },
     "lodash.debounce": {
       "version": "4.0.8",
       "resolved": "https://registry.npm.taobao.org/lodash.debounce/download/lodash.debounce-4.0.8.tgz",
       "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
       "dev": true
     },
+    "lodash.isequal": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmmirror.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
+      "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==",
+      "dev": true
+    },
     "lodash.memoize": {
       "version": "4.1.2",
       "resolved": "https://registry.nlark.com/lodash.memoize/download/lodash.memoize-4.1.2.tgz",
diff --git a/src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.html b/src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.html
index 2cfb1621..60e444bd 100644
--- a/src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.html
+++ b/src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.html
@@ -1,6 +1,7 @@
 <page-header-wrapper [title]="'新增企业合伙人'"></page-header-wrapper>
 <nz-card>
-  <sf #sf1 [ui]="ui" [schema]="schema1" [button]="'none'">
+  <sf #sf [ui]="ui" [schema]="schema" [button]="'none'">
+    <!-- 企业基本信 -->
     <ng-template sf-template="_basicInfoTitle" let-me let-ui="ui" let-schema="schema">
       <div class="form-title">企业基本信息</div>
     </ng-template>
@@ -14,6 +15,7 @@
       <div class="pr">万元</div>
     </ng-template>
 
+     <!-- 企业法人信息 -->
     <ng-template sf-template="legalPersonIdentityDTO/_legalPersontitle" let-me let-ui="ui" let-schema="schema">
       <div class="form-title" style="margin-top: 40px;margin-left: -180px;">营业执照法人信息</div>
     </ng-template>
@@ -41,33 +43,12 @@
         <div class="pa"><img width="190" src="./assets/images/usercenter/certificate-demo-back.png" /></div>
       </div>
     </ng-template>
-  </sf>
 
-  <sf #sf [ui]="ui" [schema]="schema" [button]="'none'">
-    <ng-template sf-template="title1" let-me let-ui="ui" let-schema="schema">
-      <div class="form-title">企业开票信息</div>
+    <!-- 企业管理员信息 -->
+    <ng-template sf-template="adminUserInfo/_adminTitle" let-me let-ui="ui" let-schema="schema">
+      <div class="form-title" style="margin-top: 40px;margin-left: -180px;">企业管理员信息</div>
     </ng-template>
-    <ng-template sf-template="title99" let-me let-ui="ui" let-schema="schema">
-      <div class="form-title">企业管理员信息</div>
-    </ng-template>
-
-    <ng-template sf-template="tipsD" let-me let-ui="ui" let-schema="schema">
-      <div class="pr" style="z-index: 999;">
-        <div>请上传该企业授权您成为本系统企业管理员的文件的高清照片，需加盖公司印章</div>
-        <div>上传后系统会自动识别并填写</div>
-        <div></div>
-        <div class="pa"><img height="112px" style="margin-top: 12px;z-index: 9999;"
-            (click)="service.showImg('./assets/images/usercenter/agree.png')"
-            src="./assets/images/usercenter/agree.png" /></div>
-      </div>
-    </ng-template>
-    <ng-template sf-template="tips" let-me let-ui="ui" let-schema="schema">
-      <div class="pr">
-        <div>请上传身份证原件的高清照片，若上传复印件，则需申请人签字；</div>
-        <div>上传后系统会自动识别并填写</div>
-      </div>
-    </ng-template>
-    <ng-template sf-template="tipsA" let-me let-ui="ui" let-schema="schema">
+    <ng-template sf-template="adminUserInfo/_adminCertificatePhotoTipsA" let-me let-ui="ui" let-schema="schema">
       <div class="pr">
         <dl class="tips">
           <dt>正面照（人像面）</dt>
@@ -76,7 +57,7 @@
         <div class="pa"><img width="190" src="./assets/images/usercenter/certificate-demo-front.png" /></div>
       </div>
     </ng-template>
-    <ng-template sf-template="tipsB" let-me let-ui="ui" let-schema="schema">
+    <ng-template sf-template="adminUserInfo/_adminCertificatePhotoTipsB" let-me let-ui="ui" let-schema="schema">
       <div class="pr">
         <dl class="tips">
           <dt>背面照（国徽面）</dt>
@@ -85,9 +66,20 @@
         <div class="pa"><img width="190" src="./assets/images/usercenter/certificate-demo-back.png" /></div>
       </div>
     </ng-template>
+
+    <!-- 所属城市 -->
+    <ng-template sf-template="_addressTitle" let-me let-ui="ui" let-schema="schema">
+      <div class="form-title" style="margin-top: 40px;margin-left: -180px;">所属城市</div>
+    </ng-template>
+
+     <!-- 渠道销售 -->
+     <ng-template sf-template="_channelTitle" let-me let-ui="ui" let-schema="schema">
+      <div class="form-title" style="margin-top: 40px;margin-left: -180px;">渠道销售</div>
+    </ng-template>
   </sf>
 
-  <div style="padding-left: 379px">
+
+  <div style="display: flex;justify-content: center;">
     <button nz-button type="button" nzType="primary" (click)="submitForm()"
       [nzLoading]="service.http.loading">确认新增</button>
     <button nz-button (click)="goBack()">返回</button>
diff --git a/src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.ts b/src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.ts
index 580f9f3d..00540e31 100644
--- a/src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.ts
+++ b/src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.ts
@@ -9,7 +9,8 @@ import {
   SFCascaderWidgetSchema,
   SFTextareaWidgetSchema,
   SFDateWidgetSchema,
-  SFCheckboxWidgetSchema
+  SFCheckboxWidgetSchema,
+  SFTreeSelectWidgetSchema
 } from '@delon/form';
 import { NzUploadFile } from 'ng-zorro-antd/upload';
 import { of } from 'rxjs';
@@ -45,10 +46,7 @@ const DATECONFIG = {
 export class AddEtpPartnerComponent implements OnInit {
   @ViewChild('sf', { static: false })
   sf!: SFComponent;
-  @ViewChild('sf1', { static: false })
-  sf1!: SFComponent;
-  schema: SFSchema = this.initOthersSF();
-  schema1: SFSchema = this.initBasicInfoSF();
+  schema: SFSchema = this.initBasicInfoSF();
   ui: SFUISchema = {
     '*': {
       spanLabelFixed: 180,
@@ -57,19 +55,9 @@ export class AddEtpPartnerComponent implements OnInit {
     $_basicInfoTitle: {
       spanLabelFixed: 0
     },
-    $title99: {
-      spanLabelFixed: 0
-    },
     $_legalPersontitle: {
       spanLabelFixed: 0
     },
-    $registrationCapital: {
-      spanLabelFixed: 180,
-      grid: { xxl: 13, xl: 18, lg: 22, md: 22 }
-    },
-    $unit: {
-      grid: { xxl: 6, xl: 6, lg: 2, md: 2 }
-    },
     $_isLoingDate: {
       spanLabelFixed: 100,
       grid: { xxl: 6, xl: 6, lg: 4, md: 6 }
@@ -77,32 +65,30 @@ export class AddEtpPartnerComponent implements OnInit {
   };
 
   constructor(private router: Router, public service: PartnerListService) {}
-  ngOnInit() {
-  }
+  ngOnInit() {}
 
   submitForm() {
-    if (!this.sf1.valid || !this.sf.valid) {
+    if (!this.sf.valid ) {
       this.sf.validator({ emitError: true });
-      this.sf1.validator({ emitError: true });
       this.service.msgSrv.warning('请修改填写错误信息');
       return;
     }
-    const enterpriseRegistrationTime = new Date(this.sf1.value.enterpriseRegistrationTime);
-    const operatingStartTime = new Date(this.sf1.value.operatingStartTime);
+    const enterpriseRegistrationTime = new Date(this.sf.value.enterpriseRegistrationTime);
+    const operatingStartTime = new Date(this.sf.value.operatingStartTime);
     if (enterpriseRegistrationTime.getTime() > operatingStartTime.getTime()) {
       this.service.msgSrv.warning('营业期限不能小于成立日期');
       return;
     }
-    if (this.sf1.value.operatingEndTime) {
-      const operatingEndTime = new Date(this.sf1.value.operatingEndTime);
+    if (this.sf.value.operatingEndTime) {
+      const operatingEndTime = new Date(this.sf.value.operatingEndTime);
       if (operatingStartTime.getTime() > operatingEndTime.getTime()) {
         this.service.msgSrv.warning('营业期限不能小于期限开始日期');
         return;
       }
     }
-    const validStartTime = new Date(this.sf1.value.legalPersonIdentityDTO.validStartTime);
-    if (this.sf1.value.legalPersonIdentityDTO.validEndTime) {
-      const validEndTime = new Date(this.sf1.value.legalPersonIdentityDTO.validEndTime);
+    const validStartTime = new Date(this.sf.value.legalPersonIdentityDTO.validStartTime);
+    if (this.sf.value.legalPersonIdentityDTO.validEndTime) {
+      const validEndTime = new Date(this.sf.value.legalPersonIdentityDTO.validEndTime);
       if (validStartTime.getTime() > validEndTime.getTime()) {
         this.service.msgSrv.warning('法人证件有效截止日期小于开始日期');
         return;
@@ -112,10 +98,9 @@ export class AddEtpPartnerComponent implements OnInit {
     const params = {};
     Object.assign(
       params,
-      { ...this.sf1.value },
       { ...this.sf.value },
       {
-        enterpriseAddressCode: this.sf1.value.enterpriseAddressCode[2],
+        enterpriseAddressCode: this.sf.value.enterpriseAddressCode[2],
         oftenUsedServices: sfVlaue.oftenUsedServices,
         registerAddress: sfVlaue.registerAddress,
         registerPhone: sfVlaue.registerPhone,
@@ -161,23 +146,23 @@ export class AddEtpPartnerComponent implements OnInit {
           if (isFront === 'front') {
             // 正面
             if (res.name) {
-              this.sf1.setValue('/legalPersonIdentityDTO/name', res.name);
+              this.sf.setValue('/legalPersonIdentityDTO/name', res.name);
             }
             if (res.number) {
-              this.sf1.setValue('/legalPersonIdentityDTO/certificateType', 0);
-              this.sf1.setValue('/legalPersonIdentityDTO/certificateNumber', res.number);
+              this.sf.setValue('/legalPersonIdentityDTO/certificateType', 0);
+              this.sf.setValue('/legalPersonIdentityDTO/certificateNumber', res.number);
             }
           }
           if (isFront === 'back') {
             // 背面
             if (res.validFrom) {
-              this.sf1.setValue('/legalPersonIdentityDTO/validStartTime', res.validFrom);
+              this.sf.setValue('/legalPersonIdentityDTO/validStartTime', res.validFrom);
             }
             if (res.validTo) {
-              this.sf1.setValue('/legalPersonIdentityDTO/validEndTime', res.validTo);
-              this.sf1.setValue('/legalPersonIdentityDTO/_isLoingDate', false);
+              this.sf.setValue('/legalPersonIdentityDTO/validEndTime', res.validTo);
+              this.sf.setValue('/legalPersonIdentityDTO/_isLoingDate', false);
             } else {
-              this.sf1.setValue('/legalPersonIdentityDTO/_isLoingDate', true);
+              this.sf.setValue('/legalPersonIdentityDTO/_isLoingDate', true);
             }
           }
         }
@@ -202,36 +187,33 @@ export class AddEtpPartnerComponent implements OnInit {
     this.service.request(this.service.$api_ocr_recognize_business_license, { businessLicenseUrl: imgurl }).subscribe(res => {
       if (res) {
         if (res.registrationNumber) {
-          this.sf1.setValue('/unifiedSocialCreditCode', res.registrationNumber);
+          this.sf.setValue('/unifiedSocialCreditCode', res.registrationNumber);
         }
         if (res.name) {
-          this.sf1.setValue('/enterpriseName', res.name);
+          this.sf.setValue('/enterpriseName', res.name);
         }
         if (res.type) {
-          this.sf1.setValue('/enterpriseType', res.type);
+          this.sf.setValue('/enterpriseType', res.type);
         }
         if (res.addressRegionCodes) {
-          this.sf1.setValue('/enterpriseAddressCode', res.addressRegionCodes);
+          this.sf.setValue('/enterpriseAddressCode', res.addressRegionCodes);
         }
         if (res.address) {
-          this.sf1.setValue('/enterpriseAddress', res.address);
-        }
-        if (res.registeredCapital) {
-          this.sf1.setValue('/registrationCapital', res.registeredCapital);
+          this.sf.setValue('/enterpriseAddress', res.address);
         }
         if (res.foundDate) {
-          this.sf1.setValue('/enterpriseRegistrationTime', res.foundDate);
+          this.sf.setValue('/enterpriseRegistrationTime', res.foundDate);
         }
         if (res.businessTermStartDate) {
-          this.sf1.setValue('/operatingStartTime', res.businessTermStartDate);
+          this.sf.setValue('/operatingStartTime', res.businessTermStartDate);
         }
         if (res.businessTermEndDate) {
-          this.sf1.setValue('/operatingEndTime', res.businessTermEndDate);
+          this.sf.setValue('/operatingEndTime', res.businessTermEndDate);
         } else {
-          this.sf1.setValue('/_isLoingDate', true);
+          this.sf.setValue('/_isLoingDate', true);
         }
         if (res.businessScope) {
-          this.sf1.setValue('/businessScope', res.businessScope);
+          this.sf.setValue('/businessScope', res.businessScope);
         }
       }
     });
@@ -244,8 +226,9 @@ export class AddEtpPartnerComponent implements OnInit {
   private initBasicInfoSF(): SFSchema {
     return {
       properties: {
+        // 企业基本信息
         _basicInfoTitle: { title: '', type: 'string', ui: { widget: 'custom' } },
-        _licenseTips: { title: '营业执照', type: 'string', ui: { widget: 'custom' } },
+        _licenseTips: { title: '营业执照', type: 'string', ui: { widget: 'custom' }, default: true },
         licensePhoto: { title: '', type: 'string', ui: { hidden: true } },
         licensePhotoWatermark: {
           type: 'string',
@@ -255,7 +238,7 @@ export class AddEtpPartnerComponent implements OnInit {
             descriptionI18n: '图片支持jpg、jpeg、png、gif格式，大小不超过5M',
             change: args => {
               if (args.type === 'success') {
-                this.sf1.setValue('/licensePhoto', args.fileList[0].response.data.fullFilePath);
+                this.sf.setValue('/licensePhoto', args.fileList[0].response.data.fullFilePath);
                 this.checkBusinessLicense(args.fileList[0].response.data.fullFilePath);
               }
             }
@@ -310,7 +293,7 @@ export class AddEtpPartnerComponent implements OnInit {
               required: '请选择截止日期'
             },
             change: i => {
-              this.sf1?.setValue('/_isLoingDate', false);
+              this.sf?.setValue('/_isLoingDate', false);
             }
           } as SFDateWidgetSchema
         },
@@ -320,15 +303,16 @@ export class AddEtpPartnerComponent implements OnInit {
           ui: {
             class: 'input-back',
             widget: 'checkbox',
-            change: i => this.sf1?.setValue('/operatingEndTime', null)
+            change: i => this.sf?.setValue('/operatingEndTime', null)
           } as SFCheckboxWidgetSchema
         },
 
+        // 法人信息
         legalPersonIdentityDTO: {
           type: 'object',
           properties: {
             _legalPersontitle: { title: '', type: 'string', ui: { widget: 'custom' } },
-            _certificatePhototips: { title: '法定代表人证件照', type: 'string', ui: { widget: 'custom' } },
+            _certificatePhototips: { title: '法定代表人证件照', type: 'string', ui: { widget: 'custom' }, default: true },
             _certificatePhotoExmplateA: { title: '', type: 'string', ui: { widget: 'custom', offsetControl: 6 } },
             certificatePhotoFrontWatermark: {
               type: 'string',
@@ -338,7 +322,7 @@ export class AddEtpPartnerComponent implements OnInit {
                 descriptionI18n: '图片支持jpg、jpeg、png、gif格式，大小不超过5M',
                 change: args => {
                   if (args.type === 'success') {
-                    this.sf1.setValue('/legalPersonIdentityDTO/certificatePhotoFront', args.fileList[0].response.data.fullFilePath);
+                    this.sf.setValue('/legalPersonIdentityDTO/certificatePhotoFront', args.fileList[0].response.data.fullFilePath);
                     this.checkIdCard(args.fileList[0].response.data.fullFilePath, 'front', 1);
                   }
                 }
@@ -355,7 +339,7 @@ export class AddEtpPartnerComponent implements OnInit {
                 descriptionI18n: '图片支持jpg、jpeg、png、gif格式，大小不超过5M',
                 change: args => {
                   if (args.type === 'success') {
-                    this.sf1.setValue('/legalPersonIdentityDTO/certificatePhotoBack', args.fileList[0].response.data.fullFilePath);
+                    this.sf.setValue('/legalPersonIdentityDTO/certificatePhotoBack', args.fileList[0].response.data.fullFilePath);
                     this.checkIdCard(args.fileList[0].response.data.fullFilePath, 'back', 1);
                   }
                 }
@@ -420,7 +404,7 @@ export class AddEtpPartnerComponent implements OnInit {
                   required: '请选择截止日期'
                 },
                 change: i => {
-                  this.sf1?.setValue('/legalPersonIdentityDTO/_isLoingDate', false);
+                  this.sf?.setValue('/legalPersonIdentityDTO/_isLoingDate', false);
                 }
               } as SFDateWidgetSchema
             },
@@ -432,124 +416,177 @@ export class AddEtpPartnerComponent implements OnInit {
                 grid: { span: 6 },
                 class: 'input-back',
                 widget: 'checkbox',
-                change: i => this.sf1?.setValue('/legalPersonIdentityDTO/validEndTime', null)
+                change: i => this.sf?.setValue('/legalPersonIdentityDTO/validEndTime', null)
               } as SFCheckboxWidgetSchema
             }
           },
-          required: ['certificatePhotoFront', 'certificatePhotoBack', 'name', 'certificateType', 'certificateNumber', 'validStartTime']
-        }
-      },
-      required: [
-        'licensePhotoWatermark',
-        'unifiedSocialCreditCode',
-        'enterpriseName',
-        'enterpriseType',
-        'enterpriseAddressCode',
-        'enterpriseAddress',
-        'registrationCapital',
-        'enterpriseRegistrationTime',
-        'operatingStartTime',
-        'businessScope'
-      ]
-    };
-  }
-
-  private initOthersSF(): SFSchema {
-    return {
-      properties: {
-        title99: { title: '', type: 'string', ui: { widget: 'custom' } },
-        adminMobile: {
-          title: ' 企业管理员手机号',
-          type: 'string',
-          minLength: 1,
-          format: 'mobile',
-          maxLength: 11,
-          ui: {
-            grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
-            placeholder: '请输入企业管理员手机号',
-            errors: { required: '请输入企业管理员手机号', format: '手机号格式错误' }
-          }
+          required: [
+            '_certificatePhototips',
+            'certificatePhotoFront',
+            'certificatePhotoBack',
+            'name',
+            'certificateType',
+            'certificateNumber',
+            'validStartTime'
+          ]
         },
-        tipsA: {
-          title: '企业管理员证件照',
-          type: 'string',
-          ui: {
-            widget: 'custom'
-          }
-        },
-        certificatePhotoFront: { title: '', type: 'string', ui: { hidden: true } },
-        certificatePhotoBack: { title: '', type: 'string', ui: { hidden: true } },
-        certificatePhotoFrontWatermark: {
-          type: 'string',
-          title: '',
-          ui: {
-            ...IMAGECONFIG,
-            descriptionI18n: '图片支持jpg、jpeg、png、gif格式，大小不超过5M',
-            change: args => {
-              if (args.type === 'success') {
-                this.sf.setValue('/certificatePhotoFront', args.fileList[0].response.data.fullFilePath);
-                this.checkIdCard(args.fileList[0].response.data.fullFilePath, 'front', 0);
+        // 企业管理员信息
+        adminUserInfo: {
+          type: 'object',
+          properties: {
+            _adminTitle: { title: '', type: 'string', ui: { widget: 'custom' } },
+            adminMobile: {
+              title: ' 企业管理员手机号',
+              type: 'string',
+              minLength: 1,
+              format: 'mobile',
+              maxLength: 11,
+              ui: {
+                grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
+                placeholder: '请输入企业管理员手机号',
+                errors: { required: '请输入企业管理员手机号', format: '手机号格式错误' }
               }
-            }
-          } as SFUploadWidgetSchema
-        },
-        tipsB: {
-          title: '',
-          type: 'string',
-          ui: {
-            widget: 'custom',
-            offsetControl: 6
-          }
-        },
-        certificatePhotoBackWatermark: {
-          type: 'string',
-          title: '',
-          ui: {
-            ...IMAGECONFIG,
-            descriptionI18n: '图片支持jpg、jpeg、png、gif格式，大小不超过5M',
-            change: args => {
-              if (args.type === 'success') {
-                this.sf.setValue('/certificatePhotoBack', args.fileList[0].response.data.fullFilePath);
+            },
+            _adminCertificatePhotoTipsA: {
+              title: '企业管理员证件照',
+              type: 'string',
+              ui: {
+                widget: 'custom'
+              },
+              default: true
+            },
+            certificatePhotoFront: { title: '', type: 'string', ui: { hidden: true } },
+            certificatePhotoBack: { title: '', type: 'string', ui: { hidden: true } },
+            certificatePhotoFrontWatermark: {
+              type: 'string',
+              title: '',
+              ui: {
+                ...IMAGECONFIG,
+                descriptionI18n: '图片支持jpg、jpeg、png、gif格式，大小不超过5M',
+                change: args => {
+                  if (args.type === 'success') {
+                    this.sf.setValue('/certificatePhotoFront', args.fileList[0].response.data.fullFilePath);
+                    this.checkIdCard(args.fileList[0].response.data.fullFilePath, 'front', 0);
+                  }
+                }
+              } as SFUploadWidgetSchema
+            },
+            _adminCertificatePhotoTipsB: {
+              title: '',
+              type: 'string',
+              ui: {
+                widget: 'custom',
+                offsetControl: 6
               }
+            },
+            certificatePhotoBackWatermark: {
+              type: 'string',
+              title: '',
+              ui: {
+                ...IMAGECONFIG,
+                descriptionI18n: '图片支持jpg、jpeg、png、gif格式，大小不超过5M',
+                change: args => {
+                  if (args.type === 'success') {
+                    this.sf.setValue('/certificatePhotoBack', args.fileList[0].response.data.fullFilePath);
+                  }
+                }
+              } as SFUploadWidgetSchema
+            },
+            name: {
+              title: '企业管理员姓名',
+              type: 'string',
+              maxLength: 8,
+              ui: {
+                grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
+                placeholder: '请输入企业管理员姓名'
+              }
+            },
+            certificateNumber: {
+              title: '企业管理员身份证号',
+              type: 'string',
+              format: 'id-card',
+              minLength: 1,
+              maxLength: 18,
+              ui: {
+                grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
+                placeholder: '请输入企业管理员身份证号'
+              }
+            },
+            operatingStartTime: {
+              title: '身份证有效开始日期',
+              type: 'string',
+              ui: {
+                ...DATECONFIG,
+                grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
+                errors: {
+                  required: '请选择开始日期'
+                }
+              } as SFDateWidgetSchema
+            },
+            operatingEndTime: {
+              title: '身份证有效截止日期',
+              type: 'string',
+              ui: {
+                ...DATECONFIG,
+                grid: { xxl: 13, xl: 18, lg: 20, md: 18 },
+                errors: {
+                  required: '请选择截止日期'
+                },
+                change: i => {
+                  this.sf?.setValue('/adminUserInfo/_isLoingDate', false);
+                }
+              } as SFDateWidgetSchema
+            },
+            _isLoingDate: {
+              title: '长期',
+              type: 'boolean',
+              ui: {
+                spanLabelFixed: 100,
+                grid: { span: 6 },
+                class: 'input-back',
+                widget: 'checkbox',
+                change: i => this.sf?.setValue('/adminUserInfo/operatingEndTime', null)
+              } as SFCheckboxWidgetSchema
             }
-          } as SFUploadWidgetSchema
+          },
+          required: ['_adminCertificatePhotoTipsA', 'adminMobile', 'name', 'certificateNumber','operatingStartTime']
         },
-        name: {
-          title: '企业管理员姓名',
+        // 所属城市
+        _addressTitle: { title: '', type: 'string', ui: { widget: 'custom' } },
+        status3: {
           type: 'string',
-          maxLength: 8,
-          ui: {
-            grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
-            placeholder: '请输入企业管理员姓名'
-          }
-        },
-        certificateNumber: {
-          title: '企业管理员身份证号',
-          type: 'string',
-          format: 'id-card',
-          minLength: 1,
-          maxLength: 18,
-          ui: {
-            grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
-            placeholder: '请输入企业管理员身份证号'
-          }
-        },
-
-        title1: { title: '', type: 'string', ui: { widget: 'custom' } },
-        createBank: {
           title: '所属城市',
-          type: 'string',
-          ui: { grid: { xxl: 13, xl: 18, lg: 24, md: 24 }, placeholder: '请输入银行账号' }
+          default: ['WAIT_BUYER_PAY', 'TRADE_FINISHED'],
+          ui: {
+            widget: 'tree-select',
+            grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
+            placeholder: '请选择城市(最多3个)',
+            checkable: true,
+            asyncData: () =>
+              of([
+                { title: '待支付', key: 'WAIT_BUYER_PAY' },
+                { title: '已支付', key: 'TRADE_SUCCESS' },
+                { title: '交易完成', key: 'TRADE_FINISHED' }
+              ])
+          } as SFTreeSelectWidgetSchema,
         },
-
-        title3: { title: '', type: 'string', ui: { widget: 'custom' } },
-        bankAccount: {
+        // 渠道销售
+        _channelTitle: { title: '', type: 'string', ui: { widget: 'custom' } },
+        channel: {
           title: '渠道销售邀请码',
           type: 'string',
-          ui: { grid: { xxl: 13, xl: 18, lg: 24, md: 24 }, placeholder: '请输入银行账号' }
+          minLength: 1,
+          maxLength: 100,
+          ui: {
+            grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
+            placeholder: '请输入渠道销售邀请码',
+            errors: {
+              required: '请输入渠道销售邀请码'
+            }
+          }
         }
       },
-      required: ['createBank', 'bankAccount', 'adminMobile', 'name', 'certificateNumber', 'tipsD', 'creditPhoto']
+      required: ['_licenseTips', 'licensePhotoWatermark', 'unifiedSocialCreditCode', 'enterpriseName', 'operatingStartTime', 'status3','channel']
     };
   }
 }
diff --git a/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.html b/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.html
index 8245d202..e476071d 100644
--- a/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.html
+++ b/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.html
@@ -1 +1,44 @@
-<p>add-personal-partner works!</p>
+<page-header-wrapper [title]="'新增个人合伙人'"></page-header-wrapper>
+<nz-card>
+    <sf #sf [ui]="ui" [schema]="schema" [button]="'none'">
+        <!-- 合伙人信息 -->
+        <ng-template sf-template="adminUserInfo/_adminTitle" let-me let-ui="ui" let-schema="schema">
+            <div class="form-title" style="margin-top: 40px;margin-left: -180px;">合伙人信息</div>
+        </ng-template>
+        <ng-template sf-template="adminUserInfo/_adminCertificatePhotoTipsA" let-me let-ui="ui" let-schema="schema">
+            <div class="pr">
+                <dl class="tips">
+                    <dt>正面照（人像面）</dt>
+                    <dd>示例</dd>
+                </dl>
+                <div class="pa"><img width="190" src="./assets/images/usercenter/certificate-demo-front.png" /></div>
+            </div>
+        </ng-template>
+        <ng-template sf-template="adminUserInfo/_adminCertificatePhotoTipsB" let-me let-ui="ui" let-schema="schema">
+            <div class="pr">
+                <dl class="tips">
+                    <dt>背面照（国徽面）</dt>
+                    <dd>示例</dd>
+                </dl>
+                <div class="pa"><img width="190" src="./assets/images/usercenter/certificate-demo-back.png" /></div>
+            </div>
+        </ng-template>
+
+        <!-- 所属城市 -->
+        <ng-template sf-template="_addressTitle" let-me let-ui="ui" let-schema="schema">
+            <div class="form-title" style="margin-top: 40px;margin-left: -180px;">所属城市</div>
+        </ng-template>
+
+        <!-- 渠道销售 -->
+        <ng-template sf-template="_channelTitle" let-me let-ui="ui" let-schema="schema">
+            <div class="form-title" style="margin-top: 40px;margin-left: -180px;">渠道销售</div>
+        </ng-template>
+    </sf>
+
+
+    <div style="display: flex;justify-content: center;">
+        <button nz-button type="button" nzType="primary" (click)="submitForm()"
+            [nzLoading]="service.http.loading">确认新增</button>
+        <button nz-button (click)="goBack()">返回</button>
+    </div>
+</nz-card>
\ No newline at end of file
diff --git a/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.less b/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.less
index e69de29b..6b70e074 100644
--- a/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.less
+++ b/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.less
@@ -0,0 +1,68 @@
+:host {
+    ::ng-deep {
+      nz-card {
+  
+        .pr {
+          position: relative;
+        }
+  
+        .pa {
+          position: absolute;
+          top     : 50px;
+          left    : 150px;
+        }
+  
+        .tips {
+          display      : flex;
+          margin-bottom: 0;
+          color        : #333;
+  
+          dt {
+            width: 150px;
+          }
+  
+          dd {
+            width        : 190px;
+            margin-bottom: 0;
+            text-align   : center;
+          }
+        }
+  
+        .form-title {
+          margin-bottom: 10px;
+          padding-left : 8px;
+          color        : #333;
+          font-weight  : 700;
+          font-size    : 18px;
+          line-height  : 20px;
+          border-left  : solid 3px #1890ff;
+        }
+  
+      }
+  
+      .ant-form-item {
+        margin-left: 180px;
+      }
+  
+      nz-date-picker,
+      nz-input-number {
+        width: 100% !important;
+      }
+  
+      .input-back {
+        nz-form-item {
+          margin-left: 0px;
+  
+          .ant-form-item-label {
+            flex: 0 !important;
+          }
+  
+          .ant-form-item-control {
+            max-width  : 100% !important;
+            margin-left: 20px !important;
+          }
+        }
+      }
+  
+    }
+  }
\ No newline at end of file
diff --git a/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts b/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts
index 6d31529c..ed2eac4f 100644
--- a/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts
+++ b/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts
@@ -1,4 +1,32 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { Router } from '@angular/router';
+import { apiConf } from '@conf/api.conf';
+import { SFUploadWidgetSchema, SFComponent, SFSchema, SFUISchema, SFDateWidgetSchema, SFCheckboxWidgetSchema, SFTreeSelectWidgetSchema } from '@delon/form';
+import { NzUploadFile } from 'ng-zorro-antd/upload';
+import { of } from 'rxjs';
+import { PartnerListService } from '../../services/partner-list.service';
+
+const IMAGECONFIG = {
+  previewFile: (file: NzUploadFile) => of(file.url),
+  action: apiConf.waterFileUpload,
+  fileType: 'image/png,image/jpeg,image/jpg,image/gif',
+  fileSize: 5120,
+  limit: 1,
+  limitFileCount: 1,
+  resReName: 'data.fullFileWatermarkPath',
+  urlReName: 'data.fullFileWatermarkPath',
+  widget: 'upload',
+  name: 'multipartFile',
+  multiple: false,
+  listType: 'picture-card'
+} as SFUploadWidgetSchema;
+
+const DATECONFIG = {
+  grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
+  widget: 'date',
+  format: 'yyyy-MM-dd',
+  placeholder: '请选择'
+};
 
 @Component({
   selector: 'app-add-personal-partner',
@@ -6,10 +34,311 @@ import { Component, OnInit } from '@angular/core';
   styleUrls: ['./add-personal-partner.component.less']
 })
 export class AddPersonalPartnerComponent implements OnInit {
+  @ViewChild('sf', { static: false })
+  sf!: SFComponent;
+  schema: SFSchema = this.initBasicInfoSF();
+  ui: SFUISchema = {
+    '*': {
+      spanLabelFixed: 180,
+      grid: { span: 24 }
+    },
+    $_basicInfoTitle: {
+      spanLabelFixed: 0
+    },
+    $_legalPersontitle: {
+      spanLabelFixed: 0
+    },
+    $_isLoingDate: {
+      spanLabelFixed: 100,
+      grid: { xxl: 6, xl: 6, lg: 4, md: 6 }
+    }
+  };
 
-  constructor() { }
+  constructor(private router: Router, public service: PartnerListService) {}
+  ngOnInit() {}
 
-  ngOnInit(): void {
+  submitForm() {
+    if (!this.sf.valid) {
+      this.sf.validator({ emitError: true });
+      this.service.msgSrv.warning('请修改填写错误信息');
+      return;
+    }
+    const enterpriseRegistrationTime = new Date(this.sf.value.enterpriseRegistrationTime);
+    const operatingStartTime = new Date(this.sf.value.operatingStartTime);
+    if (enterpriseRegistrationTime.getTime() > operatingStartTime.getTime()) {
+      this.service.msgSrv.warning('营业期限不能小于成立日期');
+      return;
+    }
+    if (this.sf.value.operatingEndTime) {
+      const operatingEndTime = new Date(this.sf.value.operatingEndTime);
+      if (operatingStartTime.getTime() > operatingEndTime.getTime()) {
+        this.service.msgSrv.warning('营业期限不能小于期限开始日期');
+        return;
+      }
+    }
+    const validStartTime = new Date(this.sf.value.legalPersonIdentityDTO.validStartTime);
+    if (this.sf.value.legalPersonIdentityDTO.validEndTime) {
+      const validEndTime = new Date(this.sf.value.legalPersonIdentityDTO.validEndTime);
+      if (validStartTime.getTime() > validEndTime.getTime()) {
+        this.service.msgSrv.warning('法人证件有效截止日期小于开始日期');
+        return;
+      }
+    }
+    const sfVlaue = this.sf.value;
+    const params = {};
+    Object.assign(
+      params,
+      { ...this.sf.value },
+      {
+        enterpriseAddressCode: this.sf.value.enterpriseAddressCode[2],
+        oftenUsedServices: sfVlaue.oftenUsedServices,
+        registerAddress: sfVlaue.registerAddress,
+        registerPhone: sfVlaue.registerPhone,
+        creditPhoto: sfVlaue.creditPhoto,
+        creditPhotoWatermark: sfVlaue.creditPhotoWatermark,
+        promotersTelephone: sfVlaue.promotersTelephone,
+        networkTransporter: sfVlaue.networkTransporter,
+        adminUserInfo: {
+          certificateNumber: sfVlaue.certificateNumber,
+          certificatePhotoBack: sfVlaue.certificatePhotoBack,
+          certificatePhotoBackWatermark: sfVlaue.certificatePhotoBackWatermark,
+          certificatePhotoFront: sfVlaue.certificatePhotoFront,
+          certificatePhotoFrontWatermark: sfVlaue.certificatePhotoFrontWatermark,
+          name: sfVlaue.name
+        }
+      }
+    );
+    // this.service.request(this.service.$api_save_enterprise_admin, params).subscribe(res => {
+    //   if (res) {
+    //     this.service.msgSrv.success('企业新增成功');
+    //     this.goBack();
+    //   }
+    // });
   }
 
+  /*
+   * 根据地区code查询地区列表
+   */
+  getRegionDetailByCode(regionCode: any) {
+    return this.service.request(this.service.$api_get_region_by_code, { regionCode });
+  }
+
+  // 识别身份证 参数isFront：front-正面、back-背面；type：0-申请人身份证，1-法定代表人身份证
+  checkIdCard(imgurl: any, isFront: string, type: number) {
+    const params = {
+      idCardUrl: imgurl,
+      side: isFront
+    };
+    this.service.request(this.service.$api_ocr_recognize_id_card, params).subscribe(res => {
+      if (res) {
+        if (type === 1) {
+          // 法定代表人证件照
+          if (isFront === 'front') {
+            // 正面
+            if (res.name) {
+              this.sf.setValue('/legalPersonIdentityDTO/name', res.name);
+            }
+            if (res.number) {
+              this.sf.setValue('/legalPersonIdentityDTO/certificateType', 0);
+              this.sf.setValue('/legalPersonIdentityDTO/certificateNumber', res.number);
+            }
+          }
+          if (isFront === 'back') {
+            // 背面
+            if (res.validFrom) {
+              this.sf.setValue('/legalPersonIdentityDTO/validStartTime', res.validFrom);
+            }
+            if (res.validTo) {
+              this.sf.setValue('/legalPersonIdentityDTO/validEndTime', res.validTo);
+              this.sf.setValue('/legalPersonIdentityDTO/_isLoingDate', false);
+            } else {
+              this.sf.setValue('/legalPersonIdentityDTO/_isLoingDate', true);
+            }
+          }
+        }
+        // 企业管理员证件照
+        if (type === 0) {
+          if (isFront === 'front') {
+            // 正面
+            if (res.name) {
+              this.sf.setValue('/name', res.name);
+            }
+            if (res.number) {
+              this.sf.setValue('/certificateNumber', res.number);
+            }
+          }
+        }
+      }
+    });
+  }
+
+  goBack() {
+    window.history.go(-1);
+  }
+
+  private initBasicInfoSF(): SFSchema {
+    return {
+      properties: {
+        // 合伙人信息
+        adminUserInfo: {
+          type: 'object',
+          properties: {
+            _adminTitle: { title: '', type: 'string', ui: { widget: 'custom' } },
+            adminMobile: {
+              title: ' 手机号',
+              type: 'string',
+              minLength: 1,
+              format: 'mobile',
+              maxLength: 11,
+              ui: {
+                grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
+                placeholder: '请输入手机号',
+                errors: { required: '请输入手机号', format: '手机号格式错误' }
+              }
+            },
+            _adminCertificatePhotoTipsA: {
+              title: '证件照',
+              type: 'string',
+              ui: {
+                widget: 'custom'
+              },
+              default: true
+            },
+            certificatePhotoFront: { title: '', type: 'string', ui: { hidden: true } },
+            certificatePhotoBack: { title: '', type: 'string', ui: { hidden: true } },
+            certificatePhotoFrontWatermark: {
+              type: 'string',
+              title: '',
+              ui: {
+                ...IMAGECONFIG,
+                descriptionI18n: '图片支持jpg、jpeg、png、gif格式，大小不超过5M',
+                change: args => {
+                  if (args.type === 'success') {
+                    this.sf.setValue('/certificatePhotoFront', args.fileList[0].response.data.fullFilePath);
+                    this.checkIdCard(args.fileList[0].response.data.fullFilePath, 'front', 0);
+                  }
+                }
+              } as SFUploadWidgetSchema
+            },
+            _adminCertificatePhotoTipsB: {
+              title: '',
+              type: 'string',
+              ui: {
+                widget: 'custom',
+                offsetControl: 6
+              }
+            },
+            certificatePhotoBackWatermark: {
+              type: 'string',
+              title: '',
+              ui: {
+                ...IMAGECONFIG,
+                descriptionI18n: '图片支持jpg、jpeg、png、gif格式，大小不超过5M',
+                change: args => {
+                  if (args.type === 'success') {
+                    this.sf.setValue('/certificatePhotoBack', args.fileList[0].response.data.fullFilePath);
+                  }
+                }
+              } as SFUploadWidgetSchema
+            },
+            name: {
+              title: '姓名',
+              type: 'string',
+              maxLength: 8,
+              ui: {
+                grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
+                placeholder: '请输入姓名'
+              }
+            },
+            certificateNumber: {
+              title: '身份证号',
+              type: 'string',
+              format: 'id-card',
+              minLength: 1,
+              maxLength: 18,
+              ui: {
+                grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
+                placeholder: '请输入身份证号'
+              }
+            },
+            operatingStartTime: {
+              title: '身份证有效开始日期',
+              type: 'string',
+              ui: {
+                ...DATECONFIG,
+                grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
+                errors: {
+                  required: '请选择开始日期'
+                }
+              } as SFDateWidgetSchema
+            },
+            operatingEndTime: {
+              title: '身份证有效截止日期',
+              type: 'string',
+              ui: {
+                ...DATECONFIG,
+                grid: { xxl: 13, xl: 18, lg: 20, md: 18 },
+                errors: {
+                  required: '请选择截止日期'
+                },
+                change: i => {
+                  this.sf?.setValue('/adminUserInfo/_isLoingDate', false);
+                }
+              } as SFDateWidgetSchema
+            },
+            _isLoingDate: {
+              title: '长期',
+              type: 'boolean',
+              ui: {
+                spanLabelFixed: 100,
+                grid: { span: 6 },
+                class: 'input-back',
+                widget: 'checkbox',
+                change: i => this.sf?.setValue('/adminUserInfo/operatingEndTime', null)
+              } as SFCheckboxWidgetSchema
+            }
+          },
+          required: ['_adminCertificatePhotoTipsA', 'adminMobile', 'name', 'certificateNumber', 'operatingStartTime']
+        },
+        // 所属城市
+        _addressTitle: { title: '', type: 'string', ui: { widget: 'custom' } },
+        status3: {
+          type: 'string',
+          title: '所属城市',
+          default: ['WAIT_BUYER_PAY', 'TRADE_FINISHED'],
+          ui: {
+            widget: 'tree-select',
+            grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
+            placeholder: '请选择城市(最多3个)',
+            checkable: true,
+            asyncData: () =>
+              of([
+                { title: '待支付', key: 'WAIT_BUYER_PAY' },
+                { title: '已支付', key: 'TRADE_SUCCESS' },
+                { title: '交易完成', key: 'TRADE_FINISHED' }
+              ])
+          } as SFTreeSelectWidgetSchema
+        },
+        // 渠道销售
+        _channelTitle: { title: '', type: 'string', ui: { widget: 'custom' } },
+        channel: {
+          title: '渠道销售邀请码',
+          type: 'string',
+          minLength: 1,
+          maxLength: 100,
+          ui: {
+            grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
+            placeholder: '请输入渠道销售邀请码',
+            errors: {
+              required: '请输入渠道销售邀请码'
+            }
+          }
+        }
+      },
+      required: [
+        'status3',
+        'channel'
+      ]
+    };
+  }
 }

From 3b976844f0774b4d03fb526c4d308e4a82a0132a Mon Sep 17 00:00:00 2001
From: Lingzi <yinyan.quan@eascs.com>
Date: Fri, 11 Mar 2022 14:36:29 +0800
Subject: [PATCH 31/70] fix bug

---
 .../components/freight/list/list.component.ts | 161 +++++++++++++++++-
 src/assets/mocks/menu-data.json               |  14 ++
 2 files changed, 168 insertions(+), 7 deletions(-)

diff --git a/src/app/routes/usercenter/components/freight/list/list.component.ts b/src/app/routes/usercenter/components/freight/list/list.component.ts
index 625cffaf..8f071066 100644
--- a/src/app/routes/usercenter/components/freight/list/list.component.ts
+++ b/src/app/routes/usercenter/components/freight/list/list.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { STChange, STColumn, STColumnBadge, STComponent, STData, STRequestOptions } from '@delon/abc/st';
-import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
+import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
 import { DynamicSettingModalComponent, ShipperBaseService } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { AccountDetailComponent } from 'src/app/shared/components/account-detail/account-detail.component';
@@ -116,7 +116,124 @@ export class FreightComponentsListComponent implements OnInit {
             showRequired: false
           }
         },
-
+        lockedStatus: {
+          type: 'string',
+          title: '企业类型',
+          enum: [
+            { label: '全部', value: '' },
+            { label: '物流企业', value: 0 }
+          ],
+          default: '',
+          ui: {
+            widget: 'select',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        lockedStatus8: {
+          type: 'string',
+          title: '公司所在地',
+          enum: [
+            { label: '全部', value: '' },
+            { label: '物流企业', value: 0 }
+          ],
+          default: '',
+          ui: {
+            widget: 'select',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        lockedStatus7: {
+          type: 'string',
+          title: '常用服务',
+          enum: [
+            { label: '全部', value: '' },
+            { label: '整车服务', value: 0 },
+            { label: '大宗服务', value: 1 }
+          ],
+          default: '',
+          ui: {
+            widget: 'select',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        lockedStatus6: {
+          type: 'string',
+          title: '客户类型',
+          enum: [
+            { label: '全部', value: '' },
+            { label: '直客', value: 0 },
+            { label: '渠道客户', value: 1 }
+          ],
+          default: '',
+          ui: {
+            widget: 'select',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        contactName5: {
+          title: '渠道销售',
+          type: 'string',
+          ui: {
+            placeholder: '请输入',
+            showRequired: false
+          }
+        },
+        contactName4: {
+          title: '合伙人',
+          type: 'string',
+          ui: {
+            placeholder: '请输入',
+            showRequired: false
+          }
+        },
+        contactName3: {
+          title: '客服人员',
+          type: 'string',
+          ui: {
+            placeholder: '请输入',
+            showRequired: false
+          }
+        },
+        contactName2: {
+          title: '审核人',
+          type: 'string',
+          ui: {
+            placeholder: '请输入',
+            showRequired: false
+          }
+        },
+        applyDate: {
+          type: 'string',
+          title: '申请时间',
+          ui: {
+            widget: 'sl-from-to',
+            type: 'date',
+            format: 'yyyy-MM-dd',
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+          } as SFDateWidgetSchema,
+        },
+        applyDate1: {
+          type: 'string',
+          title: '审核时间',
+          ui: {
+            widget: 'sl-from-to',
+            type: 'date',
+            format: 'yyyy-MM-dd',
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+          } as SFDateWidgetSchema,
+        },
         networkTransporter: {
           type: 'string',
           title: '网络货运人',
@@ -138,6 +255,22 @@ export class FreightComponentsListComponent implements OnInit {
             }
           }
         },
+        lockedStatus3: {
+          type: 'string',
+          title: '企业状态',
+          enum: [
+            { label: '全部', value: '' },
+            { label: '正常', value: 0 },
+            { label: '冻结', value: 1 }
+          ],
+          default: '',
+          ui: {
+            widget: 'select',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
         source: {
           type: 'string',
           title: '注册渠道',
@@ -155,13 +288,13 @@ export class FreightComponentsListComponent implements OnInit {
             }
           }
         },
-        lockedStatus: {
+        source2: {
           type: 'string',
-          title: '企业状态',
+          title: '证件是否过期',
           enum: [
             { label: '全部', value: '' },
-            { label: '正常', value: 0 },
-            { label: '冻结', value: 1 }
+            { label: '是', value: 1 },
+            { label: '否', value: 2 }
           ],
           default: '',
           ui: {
@@ -170,7 +303,21 @@ export class FreightComponentsListComponent implements OnInit {
               expand: (value: boolean) => value
             }
           }
-        }
+        },
+        source1: {
+          type: 'string',
+          title: '网络货运人',
+          enum: [
+            { label: '全部', value: '' },
+          ],
+          default: '',
+          ui: {
+            widget: 'select',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
       }
     };
     this.ui = { '*': { spanLabelFixed: 110, grid: { lg: 8, md: 12, sm: 12, xs: 24 }, enter: () => this.st.load() } };
diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json
index 473d4c2f..0f0ab51a 100644
--- a/src/assets/mocks/menu-data.json
+++ b/src/assets/mocks/menu-data.json
@@ -574,6 +574,20 @@
                 "hide": true
               }
             ]
+            },
+            {
+              "text": "轮播图管理",
+              "link": "/partner/scroll-img/list",
+              "hide": true
+            },
+            {
+              "text": "知识库管理",
+              "icon": "iconfont icon-yundan-copy",
+              "group": true,
+              "children": [{
+                "text": "banner管理",
+                "link": "/knowledge/banner"
+              }]
             }
           ]
         }

From 05dfb81a20e750d1c7fd0930222d94d80af940e1 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Fri, 11 Mar 2022 14:50:43 +0800
Subject: [PATCH 32/70] fix bug

---
 .../rebate-setting.component.html             | 10 +++-
 .../rebate-setting.component.ts               | 50 +++++++++++--------
 2 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html
index 50b366ea..a4864e4d 100644
--- a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html
+++ b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html
@@ -4,8 +4,8 @@
  * @Author       : Shiming
  * @Date         : 2022-02-24 20:09:49
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-10 15:12:03
- * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-record\\rebate-record.component.html
+ * @LastEditTime : 2022-03-11 14:45:48
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\rebate-setting.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
 <page-header-wrapper [title]="''"> </page-header-wrapper>
@@ -31,6 +31,12 @@
 
 <nz-card>
   <!-- 数据列表 -->
+  <!-- +新增 -->
+  <div class="d-flex justify-content-end mb-sm">
+    <div>
+        <button nz-button nzType="primary" (click)="configAction()">新增</button>
+    </div>
+</div>
   <st
     #st
     [data]="data"
diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts
index 929b96d1..b655f9a3 100644
--- a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts
+++ b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts
@@ -90,31 +90,35 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
     this.columns = [
       {
         title: '月份',
+        index: '配置名称'
+      },
+      {
+        title: '配置类型',
         index: 'name1'
       },
       {
-        title: '返佣金额（元）',
+        title: '备注',
         index: 'name1'
       },
       {
-        title: '合伙人名称',
+        title: '关联合伙人范围',
         index: 'name1'
       },
       {
-        title: '实际等级',
+        title: '创建时间',
         index: 'name1'
       },
       {
-        title: '管理费比例',
+        title: '启用时间',
         index: 'name1'
       },
       {
-        title: '返佣时间',
-        index: 'name1'
+        title: '优先级',
+        index: 'name44'
       },
       {
-        title: '异常反馈',
-        render: 'name44'
+        title: '状态',
+        index: 'name44'
       },
       {
         title: '操作',
@@ -123,35 +127,34 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
         className: 'text-left',
         buttons: [
           {
-            text: '明细',
+            text: '查看',
             click: _record => this.viewEvaluate(_record),
-          }
+          },
+          {
+            text: '禁用',
+            click: _record => this.viewEvaluate(_record),
+          },
         ]
       }
     ];
   }
   /**
-   *查看明细
+   *禁用
    */
    viewEvaluate(item: any) {
-    const modal = this.modal.create({
-      nzTitle: '明细',
-      nzWidth: 1200,
-      nzContent: ParterRebateManageMenRecordDetailComponent,
-      nzComponentParams: { },
-      nzFooter: null
-    });
-    modal.afterClose.subscribe((res: any) => {
-      if (res) {
+    this.modal.confirm({
+      nzTitle: '是否禁用该配置？',
+      nzOnOk: () => {
+        
       }
     });
   }
   /**
-   *异常反馈
+   *查看
    */
    feedback(item?: any) {
        const modal = this.modal.create({
-          nzTitle: '异常反馈',
+          nzTitle: '查看',
           nzWidth: 580,
           nzContent: ParterRebateManageMenAbnormalFeedbackComponent,
           nzComponentParams: { i: item },
@@ -161,6 +164,9 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
           if (res) {
           }
         });
+  }
+  configAction() {
+    
   }
   /**
    * 重置表单

From 79a1e172dd4d5ad943cf408ecc8fb12bb9065aa9 Mon Sep 17 00:00:00 2001
From: Lingzi <yinyan.quan@eascs.com>
Date: Fri, 11 Mar 2022 15:16:02 +0800
Subject: [PATCH 33/70] fix bug

---
 src/styles.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/styles.less b/src/styles.less
index a25a53de..2464d9a8 100644
--- a/src/styles.less
+++ b/src/styles.less
@@ -47,4 +47,4 @@ input[type="number"] {
 .break-word-all {
     word-break: break-all;
     word-wrap : break-word;
-}
\ No newline at end of file
+}

From 2d4eb18350a597a1acec3851c6e439f2fae91a80 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Fri, 11 Mar 2022 15:28:41 +0800
Subject: [PATCH 34/70] fix bug

---
 .../routes/partner/partner-routing.module.ts  |   6 +-
 src/app/routes/partner/partner.module.ts      |  11 +-
 .../rebate-setting/add/add.component.html     |  16 ++
 .../rebate-setting/add/add.component.ts       |  25 +++
 .../rebate-setting.component.ts               |   2 +-
 .../insurance-table/insurance-table.module.ts |   2 +-
 .../shared/components/rebate-table/index.ts   |  13 ++
 .../rebate-table/rebate-table.component.html  |  92 +++++++++
 .../rebate-table/rebate-table.component.less  |  19 ++
 .../rebate-table/rebate-table.component.ts    | 195 ++++++++++++++++++
 .../rebate-table/rebate-table.module.ts       |  29 +++
 .../rebate-table/rebate-table.service.ts      |  18 ++
 src/app/shared/index.ts                       |   3 +-
 13 files changed, 422 insertions(+), 9 deletions(-)
 create mode 100644 src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html
 create mode 100644 src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts
 create mode 100644 src/app/shared/components/rebate-table/index.ts
 create mode 100644 src/app/shared/components/rebate-table/rebate-table.component.html
 create mode 100644 src/app/shared/components/rebate-table/rebate-table.component.less
 create mode 100644 src/app/shared/components/rebate-table/rebate-table.component.ts
 create mode 100644 src/app/shared/components/rebate-table/rebate-table.module.ts
 create mode 100644 src/app/shared/components/rebate-table/rebate-table.service.ts

diff --git a/src/app/routes/partner/partner-routing.module.ts b/src/app/routes/partner/partner-routing.module.ts
index 5fcfa3a2..42af70fc 100644
--- a/src/app/routes/partner/partner-routing.module.ts
+++ b/src/app/routes/partner/partner-routing.module.ts
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-02-24 15:07:57
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-24 15:23:48
+ * @LastEditTime : 2022-03-11 15:22:36
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\partner-routing.module.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -37,6 +37,7 @@ import { AddEtpPartnerComponent } from './partner-list/components/add-etp-partne
 import { AddPersonalPartnerComponent } from './partner-list/components/add-personal-partner/add-personal-partner.component';
 import { PartnerDetailComponent } from './partner-list/components/partner-detail/partner-detail.component';
 import { PartnerListComponent } from './partner-list/components/index/partner-list.component';
+import { ParterRebateManageMentAddComponent } from './rebate-management/components/rebate-setting/add/add.component';
 
 const routes: Routes = [
   {
@@ -72,7 +73,8 @@ const routes: Routes = [
     children: [
       { path: 'particulars', component: ParterRebateManageMentParticularsComponent },
       { path: 'record', component: ParterRebateManageMentRecordComponent },
-      { path: 'setting', component: ParterRebateManageMentSettingComponent }
+      { path: 'setting', component: ParterRebateManageMentSettingComponent },
+      { path: 'setting/add/:id', component: ParterRebateManageMentAddComponent },
     ]
   },
   {
diff --git a/src/app/routes/partner/partner.module.ts b/src/app/routes/partner/partner.module.ts
index ac40e6ac..6eadaab1 100644
--- a/src/app/routes/partner/partner.module.ts
+++ b/src/app/routes/partner/partner.module.ts
@@ -4,13 +4,13 @@
  * @Author       : Shiming
  * @Date         : 2022-03-09 14:34:55
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-09 14:56:46
+ * @LastEditTime : 2022-03-11 15:28:01
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\partner.module.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
-import { SharedModule } from '@shared';
+import { rebateTableModule, SharedModule } from '@shared';
 import { PartnerAccountManagementAccountDetailComponent } from './account-management/components/account-detail/account-detail.component';
 import { PartnerAccountManagementListComponent } from './account-management/components/list/list.component';
 import { PartnerAccountManagementRecordedDetailComponent } from './account-management/components/recorded-detail/recorded-detail.component';
@@ -49,6 +49,7 @@ import { AddPersonalPartnerComponent } from './partner-list/components/add-perso
 import { ParterRebateManageMenAbnormalFeedbackComponent } from './rebate-management/model/abnormal-feedback/abnormal-feedback.component';
 import { PartnerRecordedDetailComponent } from './recorded/components/detail/detail.component';
 import { PartnerRecordedRecordComponent } from './recorded/components/record/record.component';
+import { ParterRebateManageMentAddComponent } from './rebate-management/components/rebate-setting/add/add.component';
 
 const COMPONENTS: any[] = [
   PartnerBusinessStatisticsIndexComponent,
@@ -86,13 +87,15 @@ const COMPONENTS: any[] = [
   ParterRebateManageMenAbnormalFeedbackComponent,
   ParterRebateManageMentSettingComponent,
   PartnerAuditModalComponent,
+  ParterRebateManageMentAddComponent,
   AddEtpPartnerComponent,
-  AddPersonalPartnerComponent
+  AddPersonalPartnerComponent,
+  
 ];
 
 @NgModule({
   declarations: [...COMPONENTS],
-  imports: [CommonModule, PartnerRoutingModule, SharedModule],
+  imports: [CommonModule, PartnerRoutingModule, SharedModule,rebateTableModule],
   providers: [PartnerListService]
 })
 export class PartnerModule { }
diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html
new file mode 100644
index 00000000..b3c8f933
--- /dev/null
+++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html
@@ -0,0 +1,16 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-02-24 20:09:49
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-03-11 15:25:00
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
+<page-header-wrapper [title]="''"> </page-header-wrapper>
+<nz-card>
+  <!-- 数据列表 -->
+ 12121212
+ <app-rebate-table></app-rebate-table>
+</nz-card>
diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts
new file mode 100644
index 00000000..ebfe0bce
--- /dev/null
+++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts
@@ -0,0 +1,25 @@
+import { ModalHelper } from '@delon/theme';
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st';
+import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
+import { processSingleSort, ShipperBaseService } from '@shared';
+import { NzModalService } from 'ng-zorro-antd/modal';
+import { RebateManagementService } from '../../../services/rebate-management.service';
+@Component({
+  selector: 'app-parter-channel-rebate-management-add',
+  templateUrl: './add.component.html'
+})
+export class ParterRebateManageMentAddComponent implements OnInit {
+  
+  constructor(
+    public router: Router,
+    public ar: ActivatedRoute,
+    public service: RebateManagementService,
+    private modal: NzModalService,
+    public shipperservice: ShipperBaseService,
+  ) {}
+
+  ngOnInit() {
+  }
+}
diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts
index b655f9a3..09f35ff9 100644
--- a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts
+++ b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts
@@ -166,7 +166,7 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
         });
   }
   configAction() {
-    
+    this.router.navigate(['/partner/rebate/setting/add', ''])
   }
   /**
    * 重置表单
diff --git a/src/app/shared/components/insurance-table/insurance-table.module.ts b/src/app/shared/components/insurance-table/insurance-table.module.ts
index ab85e526..28711efd 100644
--- a/src/app/shared/components/insurance-table/insurance-table.module.ts
+++ b/src/app/shared/components/insurance-table/insurance-table.module.ts
@@ -13,11 +13,11 @@ import { NgModule } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { NzInputNumberModule } from 'ng-zorro-antd/input-number';
 import { NzTableModule } from 'ng-zorro-antd/table';
-import { InsuranceTableComponent } from './insurance-table.component';
 import { NzPopconfirmModule } from 'ng-zorro-antd/popconfirm';
 import { NzInputModule } from 'ng-zorro-antd/input';
 import { DelonFormModule } from '@delon/form';
 import { NzButtonModule } from 'ng-zorro-antd/button';
+import { InsuranceTableComponent } from './insurance-table.component';
 const COMPONENTS = [InsuranceTableComponent];
 const MODULES = [NzTableModule, NzInputNumberModule, NzPopconfirmModule, NzInputModule, NzButtonModule, DelonFormModule];
 
diff --git a/src/app/shared/components/rebate-table/index.ts b/src/app/shared/components/rebate-table/index.ts
new file mode 100644
index 00000000..9b459de3
--- /dev/null
+++ b/src/app/shared/components/rebate-table/index.ts
@@ -0,0 +1,13 @@
+/*
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-01-25 20:20:07
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-01-26 11:05:44
+ * @FilePath     : \\tms-obc-web\\src\\app\\shared\\components\\insurance-table\\index.ts
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+ */
+export * from './rebate-table.module'
+export * from './rebate-table.service'
+export * from './rebate-table.component'
\ No newline at end of file
diff --git a/src/app/shared/components/rebate-table/rebate-table.component.html b/src/app/shared/components/rebate-table/rebate-table.component.html
new file mode 100644
index 00000000..a7ab6f02
--- /dev/null
+++ b/src/app/shared/components/rebate-table/rebate-table.component.html
@@ -0,0 +1,92 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-01-25 20:18:52
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-03-11 15:12:01
+ * @FilePath     : \\tms-obc-web\\src\\app\\shared\\components\\rebate-table\\rebate-table.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
+<div nz-row>
+    <div nz-col nzSpan="24">
+        <!-- <div class="mb-md ml-xl" style="text-align: right;">
+            <button nz-button nzType="primary" (click)="add()">新增公里数</button>
+            <button class="ml-md" nz-button nzType="primary" (click)="save()">保存</button>
+        </div> -->
+        <div>
+            <sf #sf [schema]="schema" [formData]="sfdata" [button]="'none'" [ui]="ui">
+                <ng-template sf-template="freightPrice" let-i let-ui="ui">
+                    <nz-input-group [nzAddOnAfter]="addOnAfterTemplate">
+                        <nz-input-number [(ngModel)]="minrebatePrice"  [nzMin]="0" ></nz-input-number>
+                      </nz-input-group>
+                      <ng-template #addOnAfterTemplate>
+                          <span >元</span>
+                      </ng-template>
+                </ng-template>
+              </sf>
+           
+        </div>
+        <nz-table #groupingTable [nzData]="data" nzBordered nzSize="small" [nzFrontPagination]="false"
+            [nzScroll]="{ x: '900px' }" [nzShowPagination]="false" class="ml-xl" style="max-width: 1200px;">
+            <thead>
+                <tr>
+                    <th rowspan="2" nzWidth="250px" nzAlign="center" nzLeft>险种</th>
+                    <th nzWidth="220px" nzAlign="center" >普货-基本险</th>
+                    <th nzWidth="220px" nzAlign="center" >普货-综合险</th>
+                    <th rowspan="2" nzWidth="60px" nzAlign="center" nzRight>操作</th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr *ngFor="let item of groupingTable.data;let i = index">
+                    <td nzWidth="250px" nzAlign="center" nzLeft>
+                        <div style="display: flex;align-items: center;justify-content: space-between;">
+                            <div  >
+                                公里数（km）
+                            </div>
+                            <div style="color:#f0f0f0;">|</div>
+                            <div >
+                                    <label style="width: 65px;text-align: right;"> {{item.startKm}}</label>
+                                    <label>-</label>
+                                 
+                                    <nz-input-number [ngModel]="item.endKm" (ngModelChange)="changeEndKm($event,i)" [nzMin]="0"
+                                        [nzFormatter]="formatterDollar" nzSize="small">
+                                    </nz-input-number>（含）
+                               
+                            </div>
+                        </div>
+                  
+                    </td>
+                    <td nzWidth="220px" nzAlign="center" >
+                        <div style="    margin-left: 26%">
+                            <nz-input-group [nzAddOnAfter]="addOnAfterTemplate2">
+                            <nz-input-number [(ngModel)]="item.baserebateRate" [nzMin]="0" nzSize="small" 
+                               >
+                            </nz-input-number>
+                        </nz-input-group>
+                        <ng-template #addOnAfterTemplate2>
+                            <span >%</span>
+                        </ng-template>
+                        </div>
+                    </td>
+                    <td nzWidth="220px" nzAlign="center" >
+                        <div style="    margin-left: 26%">
+                            <nz-input-group [nzAddOnAfter]="addOnAfterTemplate2">
+                            <nz-input-number [(ngModel)]="item.blanketrebateRate" [nzMin]="0" nzSize="small" >
+                            </nz-input-number>
+                        </nz-input-group>
+                        </div>
+                    </td>
+                    <td nzWidth="60px" nzAlign="center" nzRight>
+                        <a *ngIf="i === groupingTable.data.length-1 && groupingTable.data.length>1"
+                             nz-popconfirm
+                            nzPopconfirmTitle="是否确认删除?" (nzOnConfirm)="deleteRow(i)"
+                            >删除</a>
+                    </td>
+                </tr>
+            </tbody>
+        </nz-table>
+
+
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/app/shared/components/rebate-table/rebate-table.component.less b/src/app/shared/components/rebate-table/rebate-table.component.less
new file mode 100644
index 00000000..bebea5bf
--- /dev/null
+++ b/src/app/shared/components/rebate-table/rebate-table.component.less
@@ -0,0 +1,19 @@
+:host::ng-deep {
+    nz-input-number {
+        width: 85px;
+
+        input {
+            width : 100%;
+            margin: 0;
+        }
+
+        .ant-input-number-handler-wrap {
+            display: none;
+        }
+        
+    }
+    .ant-input-group {
+        display: -webkit-inline-box !important; 
+    }
+    
+}
\ No newline at end of file
diff --git a/src/app/shared/components/rebate-table/rebate-table.component.ts b/src/app/shared/components/rebate-table/rebate-table.component.ts
new file mode 100644
index 00000000..75b3768a
--- /dev/null
+++ b/src/app/shared/components/rebate-table/rebate-table.component.ts
@@ -0,0 +1,195 @@
+import { debounceTime } from 'rxjs/operators';
+import { Subject } from 'rxjs';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core';
+import { BaseService } from '@shared';
+import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
+
+@Component({
+  selector: 'app-rebate-table',
+  templateUrl: './rebate-table.component.html',
+  styleUrls: ['./rebate-table.component.less']
+})
+export class RebateTableComponent implements OnInit {
+  data: any[] = [];
+  headers: any[] = [];
+  sfdata: any; // 货源单设置回显
+
+  @ViewChild('sf', { static: false }) sf!: SFComponent;
+  schema: SFSchema = {};
+  ui!: SFUISchema;
+
+  formatterDollar = (value: number): string => `${value}`;
+  minrebatePrice: number = 0;
+  changeSub = new Subject<string>();
+  constructor(public service: BaseService, private cdr: ChangeDetectorRef) {}
+
+  ngOnInit(): void {
+    this.loadData();
+    this.initSF()
+    this.changeEndKmAction();
+    this.minrebatePrice = 1000
+  }
+
+  loadData() {
+    this.service.request('/api/mdc/cuc/rebateConfig/list').subscribe(res => {
+      if (res) {
+        console.log(res);
+        this.data = res;
+        this.cdr.detectChanges();
+      }
+    });
+    this.service.request('/api/mdc/pbc/sysConfigItem/findItemValueByItemKeys', [
+      "rebate.config.minrebatePrice"
+     ]).subscribe(res => {
+      if (res) {
+        console.log(res);
+        this.minrebatePrice = Number(res[0].itemValue)
+      }
+    });
+  }
+  initSF() {
+    this.schema = {
+      properties: {
+        freightPrice: {
+          type: 'string',
+          title: '单票投保最低保费',
+          ui: {
+            widget: 'custom',
+            placeholder: '请输入',
+            errors: { required: '请填写' }
+          }
+        },
+      },
+      required: ['freightPrice']
+    };
+    this.ui = {
+      '*': {
+        spanLabelFixed: 160,
+        grid: { span: 24 }
+      },
+      $freightPrice: {
+        grid: { span: 8 }
+      },
+    };
+  }
+  /**
+   * 修改结束车长
+   * @param event 车长
+   * @param i 下标
+   */
+  changeEndLength(event: any, i: number) {
+    if (event <= this.headers[i].startLength) {
+      this.headers[i].endLength = this.headers[i].startLength + 1;
+      this.changeNextStartLength(event, i + 1);
+      return;
+    }
+    this.headers[i].endLength = event;
+    this.changeNextStartLength(event, i + 1);
+  }
+
+  /**
+   * 修改结束公里数
+   * @param event 车长
+   * @param i 下标
+   */
+  changeEndKm(event: any, i: number) {
+    if (event) {
+      console.log(event);
+
+      this.changeSub.next(`${event},${i}`);
+    }
+  }
+  changeEndKmAction() {
+    this.changeSub.pipe(debounceTime(500)).subscribe((res: string) => {
+      if (res) {
+        const paras = res.split(',');
+        const num = Number(paras[0]);
+        const i = Number(paras[1]);
+
+        if (num <= this.data[i].startKm) {
+          this.data[i].endKm = null;
+          setTimeout(() => {
+            this.data[i].endKm = this.data[i].startKm + 1 ;
+          }, 0);
+          this.changeNextStartKm(this.data[i].startKm + 1, i + 1);
+          return;
+        }
+        this.data[i].endKm = num;
+        this.changeNextStartKm(num, i + 1);
+      }
+    });
+  }
+
+  add() {
+    console.log(this.data);
+
+    const tem = this.data[this.data?.length - 1];
+    if (tem && tem.endKm) {
+      this.data.push({
+        endKm: '',
+        startKm: tem.endKm
+      });
+      this.data = [...this.data];
+    } else {
+      this.service.msgSrv.warning('请填写完整公里数');
+    }
+  }
+
+  deleteRow(index: number) {
+    console.log(index);
+    var newArr = this.data.concat();
+    newArr.splice(this.data.length-1,1)
+    // this.data = this.data.pop()
+    console.log(newArr);
+    this.data = [...newArr];
+  }
+
+  save() {
+    if(!this.minrebatePrice) {
+        this.service.msgSrv.error('必填项为空！')
+        return
+    }
+    let params= {
+      minrebatePrice: this.minrebatePrice,
+      rebateConfigDTOS: this.data
+    }
+    console.log(params);
+    this.service.request('/api/mdc/cuc/rebateConfig/saveBatch', params).subscribe(res => {
+      if (res) {
+        console.log(res);
+        this.service.msgSrv.success('修改成功');
+        this.loadData();
+      }
+    });
+  }
+
+  /**
+   * 遍历同步后置位车长
+   * @param event  车长
+   * @param i 下标
+   */
+  private changeNextStartLength(event: number, i: number) {
+    if (this.headers[i]) {
+      this.headers[i].startLength = event;
+      if (this.headers[i].endLength <= event) {
+        this.headers[i].endLength = this.headers[i].startLength + 0.5;
+        this.changeNextStartLength(event + 0.5, i + 1);
+      }
+    }
+  }
+
+  /**
+   * 遍历同步后置位公里数
+   * @param event  车长
+   * @param i 下标
+   */
+  private changeNextStartKm(event: number, i: number) {
+    if (this.data[i]) {
+      this.data[i].startKm = event;
+      if (this.data[i].endKm <= event) {
+        this.data[i].endKm = this.data[i].startKm + 1;
+        this.changeNextStartKm(event + 1, i + 1);
+      }
+    }
+  }
+}
diff --git a/src/app/shared/components/rebate-table/rebate-table.module.ts b/src/app/shared/components/rebate-table/rebate-table.module.ts
new file mode 100644
index 00000000..6e65e35b
--- /dev/null
+++ b/src/app/shared/components/rebate-table/rebate-table.module.ts
@@ -0,0 +1,29 @@
+/*
+ * @Description  :
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-01-25 20:23:54
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-02-11 17:20:49
+ * @FilePath     : \\tms-obc-web\\src\\app\\shared\\components\\rebate-table\\rebate-table.module.ts
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+ */
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+import { NzInputNumberModule } from 'ng-zorro-antd/input-number';
+import { NzTableModule } from 'ng-zorro-antd/table';
+import { RebateTableComponent } from './rebate-table.component';
+import { NzPopconfirmModule } from 'ng-zorro-antd/popconfirm';
+import { NzInputModule } from 'ng-zorro-antd/input';
+import { DelonFormModule } from '@delon/form';
+import { NzButtonModule } from 'ng-zorro-antd/button';
+const COMPONENTS = [RebateTableComponent];
+const MODULES = [NzTableModule, NzInputNumberModule, NzPopconfirmModule, NzInputModule, NzButtonModule, DelonFormModule];
+
+@NgModule({
+  declarations: COMPONENTS,
+  imports: [CommonModule, FormsModule, ...MODULES],
+  exports: COMPONENTS
+})
+export class rebateTableModule {}
diff --git a/src/app/shared/components/rebate-table/rebate-table.service.ts b/src/app/shared/components/rebate-table/rebate-table.service.ts
new file mode 100644
index 00000000..ed67d9fb
--- /dev/null
+++ b/src/app/shared/components/rebate-table/rebate-table.service.ts
@@ -0,0 +1,18 @@
+/*
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-01-25 20:21:04
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-01-25 20:35:52
+ * @FilePath     : \\tms-obc-web\\src\\app\\shared\\components\\insurance-table\\insurance-table.service.ts
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+ */
+import { Injectable } from '@angular/core';
+
+
+
+@Injectable({ providedIn: 'root' })
+
+export class RebateService {
+}
diff --git a/src/app/shared/index.ts b/src/app/shared/index.ts
index c61dfbdd..d8f2d2d9 100644
--- a/src/app/shared/index.ts
+++ b/src/app/shared/index.ts
@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-11-29 10:04:12
- * @LastEditTime : 2022-02-11 14:31:22
+ * @LastEditTime : 2022-03-11 15:12:20
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\shared\\index.ts
@@ -21,6 +21,7 @@ export * from './components/dict-select/index';
 export * from './components/dynamic-setting';
 export * from './components/singlepage-setting';
 export * from './components/insurance-table/index';
+export * from './components/rebate-table/index';
 
 // Utils
 export * from './utils';

From e1732480cd07ff9801f06f09c8ec5c308022d6cb Mon Sep 17 00:00:00 2001
From: Lingzi <yinyan.quan@eascs.com>
Date: Fri, 11 Mar 2022 16:14:32 +0800
Subject: [PATCH 35/70] fix bug

---
 .../routes/partner/partner-routing.module.ts  |  4 +-
 src/app/routes/partner/partner.module.ts      |  3 +-
 .../scrollimglist.component.html              |  9 ++++
 .../scrollimglist.component.spec.ts           | 24 ++++++++++
 .../scrollimglist/scrollimglist.component.ts  | 45 +++++++++++++++++++
 src/styles.less                               |  2 +-
 6 files changed, 83 insertions(+), 4 deletions(-)
 create mode 100644 src/app/routes/partner/scroll-img/scrollimglist/scrollimglist.component.html
 create mode 100644 src/app/routes/partner/scroll-img/scrollimglist/scrollimglist.component.spec.ts
 create mode 100644 src/app/routes/partner/scroll-img/scrollimglist/scrollimglist.component.ts

diff --git a/src/app/routes/partner/partner-routing.module.ts b/src/app/routes/partner/partner-routing.module.ts
index 42af70fc..1e743f92 100644
--- a/src/app/routes/partner/partner-routing.module.ts
+++ b/src/app/routes/partner/partner-routing.module.ts
@@ -38,6 +38,7 @@ import { AddPersonalPartnerComponent } from './partner-list/components/add-perso
 import { PartnerDetailComponent } from './partner-list/components/partner-detail/partner-detail.component';
 import { PartnerListComponent } from './partner-list/components/index/partner-list.component';
 import { ParterRebateManageMentAddComponent } from './rebate-management/components/rebate-setting/add/add.component';
+import { PartnerScrollimglistComponent } from './scroll-img/scrollimglist/scrollimglist.component';
 
 const routes: Routes = [
   {
@@ -128,8 +129,7 @@ const routes: Routes = [
       { path: 'record/detail/:id', component: PartnerRecordedDetailComponent }
     ]
   },
-
-];
+  { path: 'scrollimglist', component: PartnerScrollimglistComponent }];
 @NgModule({
   imports: [RouterModule.forChild(routes)],
   exports: [RouterModule]
diff --git a/src/app/routes/partner/partner.module.ts b/src/app/routes/partner/partner.module.ts
index 6eadaab1..3adfcb58 100644
--- a/src/app/routes/partner/partner.module.ts
+++ b/src/app/routes/partner/partner.module.ts
@@ -50,6 +50,7 @@ import { ParterRebateManageMenAbnormalFeedbackComponent } from './rebate-managem
 import { PartnerRecordedDetailComponent } from './recorded/components/detail/detail.component';
 import { PartnerRecordedRecordComponent } from './recorded/components/record/record.component';
 import { ParterRebateManageMentAddComponent } from './rebate-management/components/rebate-setting/add/add.component';
+import { PartnerScrollimglistComponent } from './scroll-img/scrollimglist/scrollimglist.component';
 
 const COMPONENTS: any[] = [
   PartnerBusinessStatisticsIndexComponent,
@@ -90,7 +91,7 @@ const COMPONENTS: any[] = [
   ParterRebateManageMentAddComponent,
   AddEtpPartnerComponent,
   AddPersonalPartnerComponent,
-  
+  PartnerScrollimglistComponent
 ];
 
 @NgModule({
diff --git a/src/app/routes/partner/scroll-img/scrollimglist/scrollimglist.component.html b/src/app/routes/partner/scroll-img/scrollimglist/scrollimglist.component.html
new file mode 100644
index 00000000..482ccb06
--- /dev/null
+++ b/src/app/routes/partner/scroll-img/scrollimglist/scrollimglist.component.html
@@ -0,0 +1,9 @@
+<page-header [action]="phActionTpl">
+  <ng-template #phActionTpl>
+    <button (click)="add()" nz-button nzType="primary">新建</button>
+  </ng-template>
+</page-header>
+<nz-card>
+  <sf mode="search" [schema]="searchSchema" (formSubmit)="st.reset($event)" (formReset)="st.reset($event)"></sf>
+  <st #st [data]="url" [columns]="columns"></st>
+</nz-card>
diff --git a/src/app/routes/partner/scroll-img/scrollimglist/scrollimglist.component.spec.ts b/src/app/routes/partner/scroll-img/scrollimglist/scrollimglist.component.spec.ts
new file mode 100644
index 00000000..78d0192b
--- /dev/null
+++ b/src/app/routes/partner/scroll-img/scrollimglist/scrollimglist.component.spec.ts
@@ -0,0 +1,24 @@
+import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import { PartnerScrollimglistComponent } from './scrollimglist.component';
+
+describe('PartnerScrollimglistComponent', () => {
+  let component: PartnerScrollimglistComponent;
+  let fixture: ComponentFixture<PartnerScrollimglistComponent>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ PartnerScrollimglistComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(PartnerScrollimglistComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/routes/partner/scroll-img/scrollimglist/scrollimglist.component.ts b/src/app/routes/partner/scroll-img/scrollimglist/scrollimglist.component.ts
new file mode 100644
index 00000000..3cd34b22
--- /dev/null
+++ b/src/app/routes/partner/scroll-img/scrollimglist/scrollimglist.component.ts
@@ -0,0 +1,45 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { STColumn, STComponent } from '@delon/abc/st';
+import { SFSchema } from '@delon/form';
+import { ModalHelper, _HttpClient } from '@delon/theme';
+
+@Component({
+  selector: 'app-partner-scrollimglist',
+  templateUrl: './scrollimglist.component.html',
+})
+export class PartnerScrollimglistComponent implements OnInit {
+  url = `/user`;
+  searchSchema: SFSchema = {
+    properties: {
+      no: {
+        type: 'string',
+        title: '编号'
+      }
+    }
+  };
+  @ViewChild('st') private readonly st!: STComponent;
+  columns: STColumn[] = [
+    { title: '编号', index: 'no' },
+    { title: '调用次数', type: 'number', index: 'callNo' },
+    { title: '头像', type: 'img', width: '50px', index: 'avatar' },
+    { title: '时间', type: 'date', index: 'updatedAt' },
+    {
+      title: '',
+      buttons: [
+        // { text: '查看', click: (item: any) => `/form/${item.id}` },
+        // { text: '编辑', type: 'static', component: FormEditComponent, click: 'reload' },
+      ]
+    }
+  ];
+
+  constructor(private http: _HttpClient, private modal: ModalHelper) { }
+
+  ngOnInit(): void { }
+
+  add(): void {
+    // this.modal
+    //   .createStatic(FormEditComponent, { i: { id: 0 } })
+    //   .subscribe(() => this.st.reload());
+  }
+
+}
diff --git a/src/styles.less b/src/styles.less
index 2464d9a8..a25a53de 100644
--- a/src/styles.less
+++ b/src/styles.less
@@ -47,4 +47,4 @@ input[type="number"] {
 .break-word-all {
     word-break: break-all;
     word-wrap : break-word;
-}
+}
\ No newline at end of file

From 867a975a920536ffff035b326d744fc2d7b4c7aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= <xiaoyun.pan@eascs.com>
Date: Fri, 11 Mar 2022 16:16:15 +0800
Subject: [PATCH 36/70] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=A5=E8=B4=A6?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../withdrawals-record.component.ts           | 10 +-
 .../account-detail.component.html             |  2 +-
 .../recorded-detail.component.ts              |  4 +-
 .../withdrawals-record.component.ts           |  2 +-
 .../routes/partner/partner-routing.module.ts  | 39 ++++----
 .../components/detail/detail.component.html   | 74 ++++++++++----
 .../components/detail/detail.component.ts     | 77 ++++++++++++---
 .../components/record/record.component.ts     | 98 +++++++++----------
 src/assets/mocks/menu-data.json               |  5 +-
 9 files changed, 191 insertions(+), 120 deletions(-)

diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts
index aef18902..5113c45c 100644
--- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts
+++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts
@@ -27,9 +27,9 @@ export class WithdrawalsRecordComponent implements OnInit {
   refundStatus: any = '';
 
   msg = '';
-  constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) {}
+  constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) { }
 
-  ngOnInit(): void {}
+  ngOnInit(): void { }
 
   beforeReq = (requestOptions: STRequestOptions) => {
     if (this.sf) {
@@ -42,6 +42,7 @@ export class WithdrawalsRecordComponent implements OnInit {
         refundStatus: this.refundStatus || null
       });
     }
+    delete requestOptions?.body?.expand;
     return requestOptions;
   };
 
@@ -80,6 +81,10 @@ export class WithdrawalsRecordComponent implements OnInit {
           label: '拒绝',
           type: 'default',
           onClick: () => {
+            if (!this.msg || this.msg.trim().length === 0) {
+              this.service.msgSrv.warning('请填写拒绝原因 ');
+              return false;
+            }
             this.service
               .request(this.service.$api_disagree_refund, {
                 refundApplicationId: params,
@@ -92,6 +97,7 @@ export class WithdrawalsRecordComponent implements OnInit {
                   this.st.load(1);
                 }
               });
+            return false;
           }
         },
         {
diff --git a/src/app/routes/partner/account-management/components/account-detail/account-detail.component.html b/src/app/routes/partner/account-management/components/account-detail/account-detail.component.html
index 7f949749..920a35e7 100644
--- a/src/app/routes/partner/account-management/components/account-detail/account-detail.component.html
+++ b/src/app/routes/partner/account-management/components/account-detail/account-detail.component.html
@@ -1,4 +1,4 @@
-<page-header-wrapper [title]="'账户详情'"></page-header-wrapper>
+<page-header-wrapper [title]="'合伙人账户明细'"></page-header-wrapper>
 <nz-card>
   <sv-container layout="vertical" [noColon]="true" col="4">
     <sv [label]="labelTpl">
diff --git a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts
index 4efdf3a2..f773be63 100644
--- a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts
+++ b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { Router } from '@angular/router';
 import { STColumn, STComponent } from '@delon/abc/st';
-import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
+import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema, Widget } from '@delon/form';
 import { ModalHelper, _HttpClient } from '@delon/theme';
 import { AccountManagemantService } from '../../services/account-managemant.service';
 
@@ -129,7 +129,7 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit {
  * @param record 当前行
  */
   viewBookedRecord(record: any) {
-
+    window.open(location.origin + `#/partner/recorded/record?ltdId=${record?.ltdId}&userId=${record?.userId}&userIdLabel=${record?.banktypeLabel}`);
   }
 
   /**
diff --git a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts
index 6b7b86f4..6a428518 100644
--- a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts
+++ b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts
@@ -325,7 +325,7 @@ export class PartnerAccountManagementWithdrawalsRecordComponent implements OnIni
           },
           {
             text: '详情',
-            click: item => this.router.navigate(['./detail/' + item.id], { relativeTo: this.ar })
+            click: item => this.router.navigate(['./../detail/' + item.id], { relativeTo: this.ar })
           }
         ]
       }
diff --git a/src/app/routes/partner/partner-routing.module.ts b/src/app/routes/partner/partner-routing.module.ts
index 5fcfa3a2..79c6269f 100644
--- a/src/app/routes/partner/partner-routing.module.ts
+++ b/src/app/routes/partner/partner-routing.module.ts
@@ -78,11 +78,24 @@ const routes: Routes = [
   {
     path: 'account-management',
     children: [
-      { path: 'list', component: PartnerAccountManagementListComponent },
-      { path: 'account-detail', component: PartnerAccountManagementAccountDetailComponent },
-      { path: 'recorded-detail/:id', component: PartnerAccountManagementRecordedDetailComponent },
-      { path: 'withdraw-record', component: PartnerAccountManagementWithdrawalsRecordComponent },
-      { path: 'withdraw-record/:id', component: PartnerAccountManagementWithdralDetailComponent }
+      {
+        path: 'am',
+        children: [
+          { path: '', redirectTo: 'list' },
+          { path: 'list', component: PartnerAccountManagementListComponent },
+          { path: 'detail/:id', component: PartnerAccountManagementAccountDetailComponent },
+          { path: 'recorded/detail/:id', component: PartnerAccountManagementRecordedDetailComponent },
+        ]
+      },
+      {
+        path: 'withdraw-record',
+        children: [
+          { path: '', redirectTo: 'list' },
+          { path: 'list', component: PartnerAccountManagementWithdrawalsRecordComponent },
+          { path: 'detail/:id', component: PartnerAccountManagementWithdralDetailComponent }
+        ]
+      }
+
     ]
   },
   {
@@ -92,22 +105,6 @@ const routes: Routes = [
       { path: 'detail/:id', component: PartnerDetailComponent },
       { path: 'add-etp-partner', component: AddEtpPartnerComponent },
       { path: 'add-personal-partner', component: AddPersonalPartnerComponent },
-      {
-        path: 'am',
-        children: [
-          { path: '', redirectTo: 'list' },
-          { path: '', component: PartnerAccountManagementListComponent },
-          { path: 'detail/:id', component: PartnerAccountManagementAccountDetailComponent },
-          { path: 'recorded/detail/:id', component: PartnerAccountManagementRecordedDetailComponent },
-        ]
-      },
-      {
-        path: 'withdraw-record',
-        children: [
-          { path: '', component: PartnerAccountManagementWithdrawalsRecordComponent },
-          { path: 'detail/:id', component: PartnerAccountManagementWithdralDetailComponent }
-        ]
-      },
     ]
   },
   {
diff --git a/src/app/routes/partner/recorded/components/detail/detail.component.html b/src/app/routes/partner/recorded/components/detail/detail.component.html
index ed894907..f3d36121 100644
--- a/src/app/routes/partner/recorded/components/detail/detail.component.html
+++ b/src/app/routes/partner/recorded/components/detail/detail.component.html
@@ -8,57 +8,89 @@
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\withdrawals-record\\withdrawals-detail\\withdrawals-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
-<page-header-wrapper [title]="'入账详情'" [logo]="logo">
+<page-header-wrapper [title]="'入账详情'" [logo]="logo" [action]="action">
   <ng-template #logo>
     <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
       <i nz-icon nzType="left" nzTheme="outline"></i>
     </button>
   </ng-template>
+  <ng-template #action>
+    <div class="mr-xl">
+      <p class="text-lg mb-sm mt-xs">待审批</p>
+      <div>
+        <button nz-button [nzType]="'primary'"
+          (click)="auditAction(formData,formData?.refundStatus)">{{formData?.refundStatusLabel ===
+          '1'?'审核':'复审'}}</button>
+      </div>
+    </div>
+  </ng-template>
 </page-header-wrapper>
 
 
 <nz-card [nzLoading]="service.http.loading">
-  <nz-alert nzType="info" nzMessage="提现信息" class="mb-md"></nz-alert>
+  <nz-alert nzType="info" nzMessage="入账信息" class="mb-md"></nz-alert>
   <div se-container [labelWidth]="130">
+    <se label="账户名称">
+      {{formData?.ltdName}}
+    </se>
     <se label="网络货运人">
       {{formData?.ltdName}}
     </se>
+    <se label="入账单号">
+      {{formData?.refundApplyCode}}
+    </se>
     <se label="银行类型">
       {{formData?.bankType==='1'?'平安银行':'浦发银行'}}
     </se>
-    <se label="提现单号">
-      {{formData?.refundApplyCode}}
-    </se>
-    <se label="账户名称">
-      {{formData?.bankAccountName}}
-    </se>
-    <se label="提现时间">
-      {{formData?.createTime}}
-    </se>
     <se label="虚拟账户">
       {{formData?.virtualAccount}}
     </se>
-    <se label="提现状态">
+    <se label="提交时间">
+      {{formData?.createTime}}
+    </se>
+    <se label="开票金额">
+      {{formData?.amount | currency}}
+    </se>
+    <se label="代缴个税">
+      {{formData?.amount | currency}}
+    </se>
+    <se label="入账金额">
+      {{formData?.amount | currency}}
+    </se>
+    <se label="入账状态">
       {{formData?.refundStatusLabel}}
     </se>
-    <se label="提现金额">
-      {{formData?.amount | currency}}
+    <se label="发票图片">
+      <img nz-image width="200px" height="200px"
+        nzSrc="https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png" alt="" />
+    </se>
+    <se label="快递单号">
+      {{formData?.bankCardNumber}}
+    </se>
+    <se label="纳税凭证">
+      <img nz-image width="200px" height="200px"
+        nzSrc="https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png" alt="" />
     </se>
     <se label="银行流水号">
       {{formData?.bankSerialNumber}}
     </se>
-    <se label="提现至银行卡">
-      {{formData?.bankCardNumber}}
-    </se>
-    <se label="银行回单" col="1">
-      <a (click)="downBack()">{{formData?.refundStatus==='3'?'下载回单':'暂无回单'}}</a>
-    </se>
   </div>
 
-  <nz-alert nzType="info" nzMessage="提现进度" class="mb-md mt-md"></nz-alert>
+  <nz-alert nzType="info" nzMessage="入账进度" class="mb-md mt-md"></nz-alert>
   <div nz-row class="mt-xl">
     <div nz-col nzSpan="12" nzOffset="1">
       <app-logistics-time-line [data]="timeLineData"></app-logistics-time-line>
     </div>
   </div>
 </nz-card>
+
+<ng-template #auditModal>
+  <div nz-row nzGutter="8">
+    <div nz-col nzSpan="24" se-container [labelWidth]="80">
+      <se [col]="1" label="备注">
+        <textarea nz-input rows="3" [(ngModel)]="msg" placeholder="同意可以不用填写原因 ，拒绝必须说明原因"
+          style="width: 325px;margin-left: 14px;"></textarea>
+      </se>
+    </div>
+  </div>
+</ng-template>
diff --git a/src/app/routes/partner/recorded/components/detail/detail.component.ts b/src/app/routes/partner/recorded/components/detail/detail.component.ts
index a4c4b5ba..e1dc2eba 100644
--- a/src/app/routes/partner/recorded/components/detail/detail.component.ts
+++ b/src/app/routes/partner/recorded/components/detail/detail.component.ts
@@ -1,5 +1,6 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
+import { NzModalService } from 'ng-zorro-antd/modal';
 import { FreightAccountService } from 'src/app/routes/financial-management/services/freight-account.service';
 
 
@@ -9,13 +10,15 @@ import { FreightAccountService } from 'src/app/routes/financial-management/servi
   styleUrls: ['./detail.component.less']
 })
 export class PartnerRecordedDetailComponent implements OnInit {
+  @ViewChild('auditModal', { static: false }) auditModal!: any;
   formData: any = {};
-
   timeLineData: any = [];
+  msg = '';
+  id = '';
 
-  constructor(public service: FreightAccountService, private route: ActivatedRoute) {
-    const id = route.snapshot.params.id;
-    this.loadRefundDetail(id);
+  constructor(public service: FreightAccountService, private route: ActivatedRoute, private nzModalService: NzModalService) {
+    this.id = route.snapshot.params.id;
+    this.loadRefundDetail(this.id);
   }
 
   ngOnInit(): void { }
@@ -68,19 +71,61 @@ export class PartnerRecordedDetailComponent implements OnInit {
     });
   }
 
-  downBack() {
-    if (this.formData?.refundStatus !== '3') {
-      return;
-    }
-    this.service.getReceiptUrl(this.formData.receiptUrl, {
-      bankType: this.formData.bankType,
-      rmYll: this.formData.userId,
-      snglFlgCd: this.formData.coreSerNo,
-      bussType: '06',
-      ltdId: this.formData.ltdId
+  auditAction(item?: any, type: string = '1') {
+    this.msg = '';
+    let params: Array<string> = [];
+    params = [item.id];
+    const modal = this.nzModalService.create({
+      nzTitle: type === '1' ? '审核' : '复审',
+      nzContent: this.auditModal,
+      nzFooter: [
+        {
+          label: '拒绝',
+          type: 'default',
+          onClick: () => {
+            if (!this.msg || this.msg.trim().length === 0) {
+              this.service.msgSrv.warning('请填写拒绝原因 ');
+              return false;
+            }
+            this.service
+              .request(this.service.$api_disagree_refund, {
+                refundApplicationId: params,
+                msg: this.msg
+              })
+              .subscribe(res => {
+                if (res) {
+                  this.service.msgSrv.success('审核拒绝成功');
+                  modal.destroy(true);
+                }
+              });
+            return false;
+          }
+        },
+        {
+          label: '通过',
+          type: 'primary',
+          onClick: () => {
+            this.service
+              .request(this.service.$api_agree_refund, {
+                refundApplicationId: params,
+                msg: this.msg
+              })
+              .subscribe(res => {
+                if (res) {
+                  this.service.msgSrv.success('审核通过成功');
+                  modal.destroy(true);
+                }
+              });
+          }
+        }
+      ]
+    });
+    modal.afterClose.subscribe((res: any) => {
+      if (res) {
+        this.loadRefundDetail(this.id);
+      }
     });
   }
-
   goBack() {
     history.go(-1);
   }
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 49b6b08f..4b97ba2c 100644
--- a/src/app/routes/partner/recorded/components/record/record.component.ts
+++ b/src/app/routes/partner/recorded/components/record/record.component.ts
@@ -17,8 +17,8 @@ export class PartnerRecordedRecordComponent implements OnInit {
   @ViewChild('sf', { static: false }) sf!: SFComponent;
   @ViewChild('auditModal', { static: false }) auditModal!: any;
   @ViewChild('viewReasonModal', { static: false }) viewReasonModal!: any;
-  columns: STColumn[] = this.initST();
-  searchSchema: SFSchema = this.initSF();
+  columns!: STColumn[];
+  searchSchema!: SFSchema;
   totalInfo: any = {
     partnerNum: 34,
     count: 98,
@@ -34,9 +34,22 @@ export class PartnerRecordedRecordComponent implements OnInit {
   refundStatus: any = '';
 
   msg = '';
-  constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router, public ar: ActivatedRoute) { }
 
-  ngOnInit(): void { }
+  ltdId = ''; // 网络货运人
+  accountName = ''; // 账户名称
+
+
+  constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router, public ar: ActivatedRoute) {
+
+    this.accountName = this.ar.snapshot.queryParams?.userIdLabel || '';
+    this.ltdId = this.ar.snapshot.queryParams?.ltdId || '';
+
+  }
+
+  ngOnInit(): void {
+    this.searchSchema = this.initSF();
+    this.columns = this.initST();
+  }
 
   beforeReq = (requestOptions: STRequestOptions) => {
     if (this.sf) {
@@ -49,6 +62,7 @@ export class PartnerRecordedRecordComponent implements OnInit {
         refundStatus: this.refundStatus || null
       });
     }
+    delete requestOptions?.body?.expand;
     return requestOptions;
   };
 
@@ -107,7 +121,7 @@ export class PartnerRecordedRecordComponent implements OnInit {
     this.st.load(1);
   }
 
-  auditAction(item?: any) {
+  auditAction(item?: any, type: string = '1') {
     this.msg = '';
     let params: Array<string> = [];
     if (item) {
@@ -116,13 +130,17 @@ export class PartnerRecordedRecordComponent implements OnInit {
       params = this.selectedRows.map(node => node.id);
     }
     const modal = this.nzModalService.create({
-      nzTitle: '审核',
+      nzTitle: type === '1' ? '审核' : '复审',
       nzContent: this.auditModal,
       nzFooter: [
         {
-          label: '备注',
+          label: '拒绝',
           type: 'default',
           onClick: () => {
+            if (!this.msg || this.msg.trim().length === 0) {
+              this.service.msgSrv.warning('请填写拒绝原因 ');
+              return false;
+            }
             this.service
               .request(this.service.$api_disagree_refund, {
                 refundApplicationId: params,
@@ -135,6 +153,7 @@ export class PartnerRecordedRecordComponent implements OnInit {
                   this.st.load(1);
                 }
               });
+            return false;
           }
         },
         {
@@ -203,79 +222,47 @@ export class PartnerRecordedRecordComponent implements OnInit {
             hidden: true
           }
         },
-        refundApplyCode: {
+        accountName: {
           type: 'string',
-          title: '提现单号',
+          title: '账户名称',
+          default: this.accountName,
           ui: {
             placeholder: '请输入'
           }
         },
         refundStatus: {
           type: 'string',
-          title: '提现状态',
+          title: '入账状态',
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'refund:apply:status' },
             placeholder: '请选择'
           }
         },
-        createTime: {
-          title: '提现时间',
-          type: 'string',
-          ui: {
-            widget: 'sl-from-to-search',
-            format: 'yyyy-MM-dd',
-            placeholder: '请选择',
-            nzShowTime: true
-          } as SFDateWidgetSchema
-        },
-        bankAccountName: {
-          type: 'string',
-          title: '账户名称',
-          ui: {
-            placeholder: '请输入',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
-          }
-        },
-        accountType: {
-          type: 'string',
-          title: '账户类型',
-          ui: {
-            widget: 'dict-select',
-            params: { dictKey: 'bank:type' },
-            placeholder: '请选择',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
-          }
-        },
         ltdId: {
           type: 'string',
           title: '网络货运人',
+          default: this.ltdId,
           ui: {
             widget: 'select',
             placeholder: '请选择',
             allowClear: true,
             asyncData: () => this.service.getNetworkFreightForwarder(),
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         },
-        bankType: {
+        createTime: {
+          title: '提交时间',
           type: 'string',
-          title: '银行类型',
           ui: {
-            widget: 'dict-select',
-            params: { dictKey: 'bankname:type' },
-            placeholder: '请输入',
+            widget: 'sl-from-to-search',
+            format: 'yyyy-MM-dd',
+            placeholder: '请选择',
+            nzShowTime: true,
             visibleIf: {
               expand: (value: boolean) => value
             }
-          }
-        }
+          } as SFDateWidgetSchema
+        },
       }
     };
   }
@@ -285,7 +272,7 @@ export class PartnerRecordedRecordComponent implements OnInit {
       { title: '', index: 'key', type: 'checkbox', className: 'text-center' },
       { title: '账户名称', index: 'createTime', width: 180, className: 'text-center' },
       { title: '虚拟账户', index: 'virtualAccount', width: 180, className: 'text-center' },
-      { title: '入账单号', index: 'refundApplyCode', width: 180, className: 'text-center' },
+      { title: '入账单号', index: 'refundApplyCode', width: 190, className: 'text-center' },
       { title: '网络货运人', index: 'ltdName', width: 220, className: 'text-center' },
       {
         title: '开票金额',
@@ -324,6 +311,11 @@ export class PartnerRecordedRecordComponent implements OnInit {
             iif: item => item.refundStatus === '1',
             click: item => this.auditAction(item)
           },
+          {
+            text: '复审',
+            iif: item => item.refundStatus === '2',
+            click: item => this.router.navigate(['./detail/' + item.id], { relativeTo: this.ar })
+          },
           {
             text: '详情',
             click: item => this.router.navigate(['./detail/' + item.id], { relativeTo: this.ar })
diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json
index 6fce9bbf..1bc855f6 100644
--- a/src/assets/mocks/menu-data.json
+++ b/src/assets/mocks/menu-data.json
@@ -508,8 +508,7 @@
         {
           "text": "合伙人管理",
           "icon": "anticon anticon-dashboard",
-          "children": [
-            {
+          "children": [{
               "text": "合伙人列表",
               "link": "/partner/partner-list"
             },
@@ -547,7 +546,7 @@
               "group": true,
               "children": [{
                   "text": "账户管理",
-                  "link": "/partner/account-management/am"
+                  "link": "/partner/account-management/am/list"
                 },
                 {
                   "text": "账户明细",

From 63ab601233205acd6e00784ae90ceb9cb917a524 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= <xiaoyun.pan@eascs.com>
Date: Fri, 11 Mar 2022 16:24:17 +0800
Subject: [PATCH 37/70] -

---
 .../account-detail/account-detail.component.html          | 8 +++++++-
 .../components/account-detail/account-detail.component.ts | 4 ++++
 .../recorded-detail/recorded-detail.component.html        | 8 +++++++-
 .../recorded-detail/recorded-detail.component.ts          | 3 +++
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/app/routes/partner/account-management/components/account-detail/account-detail.component.html b/src/app/routes/partner/account-management/components/account-detail/account-detail.component.html
index 920a35e7..8669a08f 100644
--- a/src/app/routes/partner/account-management/components/account-detail/account-detail.component.html
+++ b/src/app/routes/partner/account-management/components/account-detail/account-detail.component.html
@@ -1,4 +1,10 @@
-<page-header-wrapper [title]="'合伙人账户明细'"></page-header-wrapper>
+<page-header-wrapper [title]="'合伙人账户明细'" [logo]="logo">
+  <ng-template #logo>
+    <button nz-button (click)="goBack()">
+      <i nz-icon nzType="left" nzTheme="outline"></i>
+    </button>
+  </ng-template>
+</page-header-wrapper>
 <nz-card>
   <sv-container layout="vertical" [noColon]="true" col="4">
     <sv [label]="labelTpl">
diff --git a/src/app/routes/partner/account-management/components/account-detail/account-detail.component.ts b/src/app/routes/partner/account-management/components/account-detail/account-detail.component.ts
index 9dd83dc6..860ea7c4 100644
--- a/src/app/routes/partner/account-management/components/account-detail/account-detail.component.ts
+++ b/src/app/routes/partner/account-management/components/account-detail/account-detail.component.ts
@@ -150,4 +150,8 @@ export class PartnerAccountManagementAccountDetailComponent implements OnInit {
     this.st.load(1);
   }
   export() { }
+
+  goBack() {
+    window.history.go(-1);
+  }
 }
diff --git a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.html b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.html
index cdbf3b4e..5fbc2ce6 100644
--- a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.html
+++ b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.html
@@ -1,4 +1,10 @@
-<page-header-wrapper [title]="'待入账明细'"></page-header-wrapper>
+<page-header-wrapper [title]="'待入账明细'" [logo]="logo">
+  <ng-template #logo>
+    <button nz-button (click)="goBack()">
+      <i nz-icon nzType="left" nzTheme="outline"></i>
+    </button>
+  </ng-template>
+</page-header-wrapper>
 <nz-card>
   <sv-container layout="vertical" [noColon]="true" col="4">
     <sv [label]="labelTpl">
diff --git a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts
index f773be63..5ba0a4b9 100644
--- a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts
+++ b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts
@@ -142,5 +142,8 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit {
   handleCancel() {
     this.showBillDetail = false;
   }
+  goBack() {
+    window.history.go(-1);
+  }
 
 }

From 98a709c3f18c66deac9f09abe4f902abde924bf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= <xiaoyun.pan@eascs.com>
Date: Fri, 11 Mar 2022 17:35:13 +0800
Subject: [PATCH 38/70] -

---
 .../components/recorded-detail/recorded-detail.component.ts     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts
index 5ba0a4b9..a3dc1911 100644
--- a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts
+++ b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts
@@ -102,7 +102,7 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit {
         title: '操作', className: 'text-center', width: '20%', buttons: [
           {
             text: '订单明细',
-            click: (_record) => this.router.navigate(['/'])
+            click: (_record) => window.open(location.origin + `#/partner/rebate/record?ltdId=${_record?.ltdId}`)
           }
         ]
       },

From 95ed59c7d2f49cdaaf575c567db9e02a276ada68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= <xiaoyun.pan@eascs.com>
Date: Fri, 11 Mar 2022 17:41:28 +0800
Subject: [PATCH 39/70] -

---
 .../account-management/components/list/list.component.html  | 6 ++----
 .../withdrawals-record/withdrawals-record.component.html    | 4 ++--
 .../recorded/components/record/record.component.html        | 4 ++--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/app/routes/partner/account-management/components/list/list.component.html b/src/app/routes/partner/account-management/components/list/list.component.html
index e982c4e3..465b42a3 100644
--- a/src/app/routes/partner/account-management/components/list/list.component.html
+++ b/src/app/routes/partner/account-management/components/list/list.component.html
@@ -5,10 +5,8 @@
 
     </div>
   </div> -->
-  <sf [schema]="schema" [mode]="'search'" [ui]="ui" [button]="'none'" (formSubmit)="st.load(1)" (formReset)="resetSF()"
-    #sf>
-    <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading"
-      (click)="st?.load(1)">查询</button>
+  <sf [schema]="schema" [mode]="'search'" [ui]="ui" [button]="'none'" #sf>
+    <button nz-button nzType="primary" [disabled]="!sf.valid" (click)="st?.load(1)">查询</button>
     <button nz-button (click)="resetSF()">重置</button>
     <button nz-button (click)="export()" nzType="primary" nzGhost>导出</button>
   </sf>
diff --git a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.html b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.html
index d7c20673..449d3e1b 100644
--- a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.html
+++ b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.html
@@ -8,7 +8,7 @@
     </div>
     <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand"
       class="text-right">
-      <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
+      <button nz-button nzType="primary" (click)="st?.load(1)">查询</button>
       <button nz-button (click)="resetSF()">重置</button>
       <button nz-button> 导出</button>
       <button nz-button nzType="link" (click)="expandToggle()">
@@ -44,7 +44,7 @@
   <st #st [data]="service.$api_get_refund_page" [columns]="columns" [req]="{  process: beforeReq }"
     [loading]="service.http.loading" [scroll]="{ x:'1200px' }" (change)="stChange($event)"
     [res]="{ reName: { list: 'data.records', total: 'data.total' }, process: afterRes }"
-    [page]="{ show: true,  pageSizes:  [10, 20, 50, 100, 200, 500] }" [loading]="service.http.loading">
+    [page]="{ show: true,  pageSizes:  [10, 20, 50, 100, 200, 500] }">
     <ng-template st-row="bankCardNumber" let-item let-index="index" let-column="column">
       {{ item.bankName }} <br> {{ item.bankCardNumber }}
     </ng-template>
diff --git a/src/app/routes/partner/recorded/components/record/record.component.html b/src/app/routes/partner/recorded/components/record/record.component.html
index 1fd920b1..60aa8d08 100644
--- a/src/app/routes/partner/recorded/components/record/record.component.html
+++ b/src/app/routes/partner/recorded/components/record/record.component.html
@@ -8,7 +8,7 @@
     </div>
     <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand"
       class="text-right">
-      <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
+      <button nz-button nzType="primary" (click)="st?.load(1)">查询</button>
       <button nz-button (click)="resetSF()">重置</button>
       <button nz-button> 导出</button>
       <button nz-button nzType="link" (click)="expandToggle()">
@@ -44,7 +44,7 @@
     <st #st [data]="service.$api_get_refund_page" [columns]="columns" [req]="{  process: beforeReq }"
       [loading]="service.http.loading" [scroll]="{ x:'1200px' }" (change)="stChange($event)"
       [res]="{ reName: { list: 'data.records', total: 'data.total' }, process: afterRes }"
-      [page]="{ show: true,  pageSizes:  [10, 20, 50, 100, 200, 500] }" [loading]="service.http.loading">
+      [page]="{ show: true,  pageSizes:  [10, 20, 50, 100, 200, 500] }">
       <ng-template st-row="bankCardNumber" let-item let-index="index" let-column="column">
         {{ item.bankName }} <br> {{ item.bankCardNumber }}
       </ng-template>

From f9b176c3c42e3d6d8ebc2ae102fb2cbeaa94f1a9 Mon Sep 17 00:00:00 2001
From: heqinghang <qinghang.he@eascs.com>
Date: Sat, 12 Mar 2022 13:46:46 +0800
Subject: [PATCH 40/70] 666

---
 src/assets/mocks/menu-data.json | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json
index 473d4c2f..8f0987fa 100644
--- a/src/assets/mocks/menu-data.json
+++ b/src/assets/mocks/menu-data.json
@@ -562,18 +562,17 @@
             },
             {
               "text": "客户认领审核",
-              "link": "/partner/claim-audit/list",
-              "children": [{
-                "text": "合伙人客户认领详情",
-                "link": "/partner/claim-audit/partner-detail",
-                "hide": true
-              },
-              {
-                "text": "渠道销售客户认领详情",
-                "link": "/partner/claim-audit/channel-detail",
-                "hide": true
-              }
-            ]
+              "link": "/partner/claim-audit/list"
+            },
+            {
+              "text": "合伙人客户认领详情",
+              "link": "/partner/claim-audit/partner-detail",
+              "hide": true
+            },
+            {
+              "text": "渠道销售客户认领详情",
+              "link": "/partner/claim-audit/channel-detail",
+              "hide": true
             }
           ]
         }

From 5fdcfaa1eed4058a80b1417b5468029c0859d5b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= <xiaoyun.pan@eascs.com>
Date: Sat, 12 Mar 2022 14:22:00 +0800
Subject: [PATCH 41/70] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/list/list.component.html       |  9 ++++
 .../components/list/list.component.spec.ts    | 24 ++++++++++
 .../components/list/list.component.ts         | 45 +++++++++++++++++++
 .../routes/partner/partner-routing.module.ts  |  8 +++-
 src/app/routes/partner/partner.module.ts      |  7 +--
 src/app/shared/shared.module.ts               |  6 ++-
 src/assets/mocks/menu-data.json               |  3 ++
 7 files changed, 96 insertions(+), 6 deletions(-)
 create mode 100644 src/app/routes/partner/knowledge/classification/components/list/list.component.html
 create mode 100644 src/app/routes/partner/knowledge/classification/components/list/list.component.spec.ts
 create mode 100644 src/app/routes/partner/knowledge/classification/components/list/list.component.ts

diff --git a/src/app/routes/partner/knowledge/classification/components/list/list.component.html b/src/app/routes/partner/knowledge/classification/components/list/list.component.html
new file mode 100644
index 00000000..482ccb06
--- /dev/null
+++ b/src/app/routes/partner/knowledge/classification/components/list/list.component.html
@@ -0,0 +1,9 @@
+<page-header [action]="phActionTpl">
+  <ng-template #phActionTpl>
+    <button (click)="add()" nz-button nzType="primary">新建</button>
+  </ng-template>
+</page-header>
+<nz-card>
+  <sf mode="search" [schema]="searchSchema" (formSubmit)="st.reset($event)" (formReset)="st.reset($event)"></sf>
+  <st #st [data]="url" [columns]="columns"></st>
+</nz-card>
diff --git a/src/app/routes/partner/knowledge/classification/components/list/list.component.spec.ts b/src/app/routes/partner/knowledge/classification/components/list/list.component.spec.ts
new file mode 100644
index 00000000..f63ab2ec
--- /dev/null
+++ b/src/app/routes/partner/knowledge/classification/components/list/list.component.spec.ts
@@ -0,0 +1,24 @@
+import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import { PartnerListComponent } from './list.component';
+
+describe('PartnerListComponent', () => {
+  let component: PartnerListComponent;
+  let fixture: ComponentFixture<PartnerListComponent>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ PartnerListComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(PartnerListComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/routes/partner/knowledge/classification/components/list/list.component.ts b/src/app/routes/partner/knowledge/classification/components/list/list.component.ts
new file mode 100644
index 00000000..f90502b6
--- /dev/null
+++ b/src/app/routes/partner/knowledge/classification/components/list/list.component.ts
@@ -0,0 +1,45 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { STColumn, STComponent } from '@delon/abc/st';
+import { SFSchema } from '@delon/form';
+import { ModalHelper, _HttpClient } from '@delon/theme';
+
+@Component({
+  selector: 'app-partner-list',
+  templateUrl: './list.component.html',
+})
+export class PartnerKnowledgeClassificationListComponent implements OnInit {
+  url = `/user`;
+  searchSchema: SFSchema = {
+    properties: {
+      no: {
+        type: 'string',
+        title: '编号'
+      }
+    }
+  };
+  @ViewChild('st') private readonly st!: STComponent;
+  columns: STColumn[] = [
+    { title: '编号', index: 'no' },
+    { title: '调用次数', type: 'number', index: 'callNo' },
+    { title: '头像', type: 'img', width: '50px', index: 'avatar' },
+    { title: '时间', type: 'date', index: 'updatedAt' },
+    {
+      title: '',
+      buttons: [
+        // { text: '查看', click: (item: any) => `/form/${item.id}` },
+        // { text: '编辑', type: 'static', component: FormEditComponent, click: 'reload' },
+      ]
+    }
+  ];
+
+  constructor(private http: _HttpClient, private modal: ModalHelper) { }
+
+  ngOnInit(): void { }
+
+  add(): void {
+    // this.modal
+    //   .createStatic(FormEditComponent, { i: { id: 0 } })
+    //   .subscribe(() => this.st.reload());
+  }
+
+}
diff --git a/src/app/routes/partner/partner-routing.module.ts b/src/app/routes/partner/partner-routing.module.ts
index 2ceac3d8..10c6f422 100644
--- a/src/app/routes/partner/partner-routing.module.ts
+++ b/src/app/routes/partner/partner-routing.module.ts
@@ -38,6 +38,7 @@ import { AddPersonalPartnerComponent } from './partner-list/components/add-perso
 import { PartnerDetailComponent } from './partner-list/components/partner-detail/partner-detail.component';
 import { PartnerListComponent } from './partner-list/components/index/partner-list.component';
 import { ParterRebateManageMentAddComponent } from './rebate-management/components/rebate-setting/add/add.component';
+import { PartnerKnowledgeClassificationListComponent } from './knowledge/classification/components/list/list.component';
 
 const routes: Routes = [
   {
@@ -125,7 +126,12 @@ const routes: Routes = [
       { path: 'record/detail/:id', component: PartnerRecordedDetailComponent }
     ]
   },
-
+  {
+    path: 'knowledge',
+    children: [
+      { path: 'classification', component: PartnerKnowledgeClassificationListComponent },
+    ]
+  },
 ];
 @NgModule({
   imports: [RouterModule.forChild(routes)],
diff --git a/src/app/routes/partner/partner.module.ts b/src/app/routes/partner/partner.module.ts
index 6eadaab1..c38615d4 100644
--- a/src/app/routes/partner/partner.module.ts
+++ b/src/app/routes/partner/partner.module.ts
@@ -10,7 +10,7 @@
  */
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
-import { rebateTableModule, SharedModule } from '@shared';
+import { SharedModule } from '@shared';
 import { PartnerAccountManagementAccountDetailComponent } from './account-management/components/account-detail/account-detail.component';
 import { PartnerAccountManagementListComponent } from './account-management/components/list/list.component';
 import { PartnerAccountManagementRecordedDetailComponent } from './account-management/components/recorded-detail/recorded-detail.component';
@@ -50,6 +50,7 @@ import { ParterRebateManageMenAbnormalFeedbackComponent } from './rebate-managem
 import { PartnerRecordedDetailComponent } from './recorded/components/detail/detail.component';
 import { PartnerRecordedRecordComponent } from './recorded/components/record/record.component';
 import { ParterRebateManageMentAddComponent } from './rebate-management/components/rebate-setting/add/add.component';
+import { PartnerKnowledgeClassificationListComponent } from './knowledge/classification/components/list/list.component';
 
 const COMPONENTS: any[] = [
   PartnerBusinessStatisticsIndexComponent,
@@ -90,12 +91,12 @@ const COMPONENTS: any[] = [
   ParterRebateManageMentAddComponent,
   AddEtpPartnerComponent,
   AddPersonalPartnerComponent,
-  
+  PartnerKnowledgeClassificationListComponent
 ];
 
 @NgModule({
   declarations: [...COMPONENTS],
-  imports: [CommonModule, PartnerRoutingModule, SharedModule,rebateTableModule],
+  imports: [CommonModule, PartnerRoutingModule, SharedModule],
   providers: [PartnerListService]
 })
 export class PartnerModule { }
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 776c0210..51dd9bca 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -1,5 +1,5 @@
 /*
- * @Description  : 
+ * @Description  :
  * @Version      : 1.0
  * @Author       : Shiming
  * @Date         : 2022-01-13 15:10:17
@@ -37,6 +37,7 @@ import { ImageListModule } from './components/imagelist';
 import { DictSelectComponent } from './components/dict-select';
 import { PipeModule } from './pipes';
 import { AccountDetailComponent } from './components/account-detail/account-detail.component';
+import { rebateTableModule } from './components/rebate-table';
 
 const MODULES = [
   AddressModule,
@@ -51,6 +52,7 @@ const MODULES = [
   AmapModule,
   ImageListModule,
   PipeModule,
+  rebateTableModule,
   ...PRO_SHARED_MODULES
 ];
 // #endregion
@@ -88,4 +90,4 @@ const SHAREDCOMPONENTS = [LogisticsTimeLineComponent, DictSelectComponent, Accou
   ],
   declarations: SHAREDCOMPONENTS
 })
-export class SharedModule {}
+export class SharedModule { }
diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json
index 20178a6b..17638a16 100644
--- a/src/assets/mocks/menu-data.json
+++ b/src/assets/mocks/menu-data.json
@@ -604,6 +604,9 @@
               "children": [{
                 "text": "banner管理",
                 "link": "/knowledge/banner"
+              }, {
+                "text": "分类管理",
+                "link": "/partner/knowledge/classification"
               }]
             }
           ]

From 22ca0b0fb1333ff52255c235dd5882f6b2359b9a Mon Sep 17 00:00:00 2001
From: heqinghang <qinghang.he@eascs.com>
Date: Sat, 12 Mar 2022 15:22:03 +0800
Subject: [PATCH 42/70] 666

---
 .../components/edit/edit.component.html       |  17 ++
 .../components/edit/edit.component.ts         | 189 +++++++++++++++++
 .../components/list/list.component.html       |  49 +++++
 .../components/list/list.component.ts         | 200 ++++++++++++++++++
 .../services/channel-sales.service.ts         |  12 ++
 .../routes/partner/partner-routing.module.ts  |  11 +
 src/app/routes/partner/partner.module.ts      |   5 +-
 src/assets/mocks/menu-data.json               |  17 +-
 8 files changed, 498 insertions(+), 2 deletions(-)
 create mode 100644 src/app/routes/partner/article-management/components/edit/edit.component.html
 create mode 100644 src/app/routes/partner/article-management/components/edit/edit.component.ts
 create mode 100644 src/app/routes/partner/article-management/components/list/list.component.html
 create mode 100644 src/app/routes/partner/article-management/components/list/list.component.ts
 create mode 100644 src/app/routes/partner/article-management/services/channel-sales.service.ts

diff --git a/src/app/routes/partner/article-management/components/edit/edit.component.html b/src/app/routes/partner/article-management/components/edit/edit.component.html
new file mode 100644
index 00000000..e8e4a5fc
--- /dev/null
+++ b/src/app/routes/partner/article-management/components/edit/edit.component.html
@@ -0,0 +1,17 @@
+<page-header-wrapper [title]="''"></page-header-wrapper>
+<nz-card>
+  <sf #sf [ui]="ui" [schema]="schema" [button]="'none'">
+  </sf>
+  
+  <div *nzModalFooter>
+    <button nz-button nzType="default" (click)="close()">取消</button>
+    <button nz-button nzType="primary" (click)="save()">确认</button>
+  </div>
+</nz-card>
+<nz-card>
+  <div class="align-center" style="display: flex; justify-content: center;">
+    <button nz-button nzType="default" (click)="close()">取消</button>
+    <button nz-button nzType="primary" (click)="save()" style="margin-left: 48px">确认</button>
+  </div>
+</nz-card>
+
diff --git a/src/app/routes/partner/article-management/components/edit/edit.component.ts b/src/app/routes/partner/article-management/components/edit/edit.component.ts
new file mode 100644
index 00000000..f65dea8f
--- /dev/null
+++ b/src/app/routes/partner/article-management/components/edit/edit.component.ts
@@ -0,0 +1,189 @@
+import { AfterViewInit, ChangeDetectorRef, Component, OnChanges, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { apiConf } from '@conf/api.conf';
+import { SFComponent, SFRadioWidgetSchema, SFSchema, SFSchemaEnumType, SFSelectWidgetSchema, SFTextareaWidgetSchema, SFUISchema, SFUploadWidgetSchema } from '@delon/form';
+import { _HttpClient } from '@delon/theme';
+import { Observable, Observer } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { AmapPoiPickerComponent } from 'src/app/shared/components/amap';
+import { ChannelSalesService } from '../../services/channel-sales.service';
+
+@Component({
+  selector: 'app-parter-article-management-edit',
+  templateUrl: './edit.component.html'
+})
+export class ParterArticleManagementEditComponent implements OnInit {
+  @ViewChild('sf', { static: false }) sf!: SFComponent;
+  schema!: SFSchema;
+  ui!: SFUISchema;
+  i: any;
+  type: any;
+
+  constructor(
+    public http: _HttpClient,
+    private cdr: ChangeDetectorRef,
+    private route: ActivatedRoute,
+    public service: ChannelSalesService,
+  ) {}
+
+  ngOnInit(): void {
+    this.initSF();
+  }
+  initSF() {
+    this.schema = {
+      properties: {
+        id: {
+          type: 'string',
+          title: '',
+          ui: { hidden: true }
+        },
+        name1: {
+          type: 'string',
+          title: '文章标题',
+          maxLength: 50,
+          ui: {
+            widget: 'textarea',
+            autosize: { minRows: 3, maxRows: 6 },
+            placeholder:'请输入50字符'
+          } as SFTextareaWidgetSchema,
+        },
+        name2: {
+          type: 'string',
+          title: '文章简介',
+          maxLength: 50,
+          ui: {
+            widget: 'textarea',
+            autosize: { minRows: 3, maxRows: 6 },
+            placeholder:'请输入50字符'
+          } as SFTextareaWidgetSchema,
+        },
+        name3: {
+          type: 'string',
+          title: '封面图',
+          ui: {
+            action: apiConf.fileUpload,
+            accept: 'image/png,image/jpeg,image/jpg',
+            limit: 1,
+            limitFileCount: 1,
+            resReName: 'data.fullFilePath',
+            urlReName: 'data.fullFilePath',
+            widget: 'upload',
+            descriptionI18n: '支持JPG、PNG格式，文件小于2M（建议尺寸 280px  *  180 px）',
+            name: 'multipartFile',
+            multiple: false,
+            listType: 'picture-card',
+            beforeUpload: (file: any, _fileList: any) => {
+              return new Observable((observer: Observer<boolean>) => {
+                const isLt2M = file.size / 1024 / 1024 < 2;
+                if (!isLt2M) {
+                  this.service.msgSrv.warning('图片大小超过2M!');
+                  observer.complete();
+                  return;
+                }
+                observer.next(isLt2M);
+                observer.complete();
+              });
+            }
+          } as SFUploadWidgetSchema
+        },
+        name: {
+          title: '分类',
+          type: 'string',
+          enum: [
+            { label: '管理员', value: '1'},
+          ],
+          ui: {
+            widget: 'select',
+          } as SFSelectWidgetSchema,
+        },
+        name4: {
+          type: 'number',
+          title: '排序',
+          minimum: 0,
+          maximum: 99,
+          ui: {
+            widgetWidth: 300 ,
+            placeholder:'请输入0~99，数字越大，排序越靠前'
+          }
+        },
+        name5: {
+          type: 'string',
+          title: '跳转路径',
+          enum: [
+            { label: '图文', value: '1'},
+            { label: '视频', value: '2'},
+          ],
+          ui: {
+            widget: 'radio',
+          } as SFRadioWidgetSchema,
+          default: '1',
+        },
+        content: {
+          type: 'string',
+          title: '正文',
+          ui: {
+            widget: 'tinymce',
+            loadingTip: 'loading...',
+            config: {
+              height: 450
+            },
+            visibleIf: { name5: (value: string) => value === '1' }
+          },
+        },
+        name6: {
+          type: 'string',
+          title: '视频',
+          ui: {
+            action: apiConf.fileUpload,
+            accept: 'video/mp4,video/avi,video/mkv,video/vob',
+            limit: 1,
+            limitFileCount: 1,
+            resReName: 'data.fullFilePath',
+            urlReName: 'data.fullFilePath',
+            widget: 'upload',
+            descriptionI18n: '支持MP4、AVI、DAT、MKV、FLV、VOB格式，文件小于20M。',
+            name: 'multipartFile',
+            multiple: false,
+            listType: 'picture-card',
+            beforeUpload: (file: any, _fileList: any) => {
+              return new Observable((observer: Observer<boolean>) => {
+                const isLt2M = file.size / 1024 / 1024 < 20;
+                if (!isLt2M) {
+                  this.service.msgSrv.warning('视频大小超过20M!');
+                  observer.complete();
+                  return;
+                }
+                observer.next(isLt2M);
+                observer.complete();
+              });
+            },
+            visibleIf: { name5: (value: string) => value === '2' }
+          } as SFUploadWidgetSchema
+        },
+      },
+      required: ['name1', 'name2']
+    };
+    this.ui = {
+      '*': {
+        spanLabelFixed: 150,
+        grid: { span: 20 }
+      },
+
+    };
+  }
+
+  close() {
+    
+  }
+  save() {
+    this.sf.validator({ emitError: true });
+    if(!this.sf.valid) return;
+    // this.service.request('', { ...this.sf.value }).subscribe(res => {
+    //   if (res) {
+    //     this.modalRef.destroy(true);
+    //   } else {
+    //     this.service.msgSrv.error(res.msg);
+    //   }
+    // });
+  }
+}
diff --git a/src/app/routes/partner/article-management/components/list/list.component.html b/src/app/routes/partner/article-management/components/list/list.component.html
new file mode 100644
index 00000000..721c85c0
--- /dev/null
+++ b/src/app/routes/partner/article-management/components/list/list.component.html
@@ -0,0 +1,49 @@
+<page-header-wrapper [title]="''"></page-header-wrapper>
+<!-- 搜索表单 -->
+<nz-card>
+  <div nz-row nzGutter="8">
+    <!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
+    <div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
+      <sf
+        #sf
+        [schema]="schema"
+        [ui]="ui"
+        [mode]="'search'"
+        [loading]="service.http.loading"
+        (formSubmit)="search()"
+        (formReset)="resetSF()"
+      ></sf>
+    </div>
+
+    <!-- 查询字段大于3个时，根据展开状态调整布局 -->
+    <ng-container *ngIf="queryFieldCount > 4">
+      <div nz-col [nzSpan]="_$expand ? 24 : 18">
+        <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
+      </div>
+      <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
+        <button nz-button nzType="primary" [disabled]="!sf.valid"  (click)="search()" >查询</button>
+        <button nz-button (click)="resetSF()" >重置</button>
+        <button nz-button nzType="link" (click)="expandToggle()">
+          {{ !_$expand ? '展开' : '收起' }}
+          <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
+        </button>
+      </div>
+    </ng-container>
+  </div>
+</nz-card>
+
+<nz-card>
+  <button nz-button nzType="primary" style="margin-bottom: 24px" (click)="add()">新增文章</button>
+  <!-- 数据列表 -->
+  <st
+    #st
+    [data]="data"
+    [columns]="columns"
+    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+    [loadingDelay]="500"
+    [loading]="service.http.loading"
+  >
+  </st>
+</nz-card>
diff --git a/src/app/routes/partner/article-management/components/list/list.component.ts b/src/app/routes/partner/article-management/components/list/list.component.ts
new file mode 100644
index 00000000..61db7824
--- /dev/null
+++ b/src/app/routes/partner/article-management/components/list/list.component.ts
@@ -0,0 +1,200 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st';
+import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
+import { processSingleSort } from '@shared';
+import { NzModalService } from 'ng-zorro-antd/modal';
+import { ChannelSalesService } from '../../services/channel-sales.service';
+import { ParterArticleManagementEditComponent } from '../edit/edit.component';
+
+@Component({
+  selector: 'app-parter-article-management-list',
+  templateUrl: './list.component.html'
+})
+export class ParterArticleManagementListComponent implements OnInit {
+  schema: SFSchema = {};
+  columns!: STColumn[];
+  ui!: SFUISchema;
+  @ViewChild('st', { static: false })
+  st!: STComponent;
+  @ViewChild('sf', { static: false })
+  sf!: SFComponent;
+  spuStatus = '1';
+  _$expand = false;
+
+  data=[{name1:1111}]
+  constructor(
+    public router: Router,
+    public ar: ActivatedRoute,
+    public service: ChannelSalesService,
+    private modalService: NzModalService
+  ) {}
+
+  /**
+   * 查询参数
+   */
+  get reqParams() {
+    return { ...this.sf?.value };
+  }
+
+  /**
+   * 重置表单
+   */
+   resetSF() {
+    this.sf.reset();
+    this.st.load(1);
+  }
+
+  search() {
+    // this.st1?.load(1);
+  }
+
+   /**
+   * 查询字段个数
+   */
+    get queryFieldCount(): number {
+      return Object.keys(this.schema?.properties || {}).length;
+    }
+    /**
+     * 伸缩查询条件
+     */
+    expandToggle(): void {
+      this._$expand = !this._$expand;
+      this.sf?.setValue('/_$expand', this._$expand);
+    }
+  ngOnInit() {
+    this.initSF();
+    this.initST();
+  }
+
+  initSF() {
+    this.schema = {
+      properties: {
+        _$expand: { type: 'boolean', ui: { hidden: true } },
+        name: {
+          type: 'string',
+          title: '文章标题'
+        },
+        phone: {
+          type: 'string',
+          title: '分类'
+        },
+        phone1: {
+          type: 'string',
+          title: '状态'
+        },
+        phone2: {
+          type: 'string',
+          title: '推荐到首页',
+          ui: {
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            }
+          }
+        },
+       
+      }
+    };
+    this.ui = {
+      '*': {
+        grid: { span: 8, gutter: 4 }
+      }
+    };
+  }
+
+  initST() {
+    this.columns = [
+      {
+        title: '销售渠道姓名',
+        index: 'name1'
+      },
+      {
+        title: '手机号',
+        index: 'name1'
+      },
+      {
+        title: '所属组织',
+        index: 'name1'
+      },
+      {
+        title: '职级',
+        index: 'name1'
+      },
+      {
+        title: '等级',
+        index: 'name1'
+      },
+      {
+        title: '省市',
+        index: 'name1'
+      },
+      {
+        title: '邀请码',
+        index: 'name1'
+      },
+      {
+        title: '操作',
+        className: 'text-center',
+        buttons: [
+          {
+            text: '修改',
+            click: (_record, _modal, _instance) => this.edit(_record),
+          },
+          {
+            text: '禁用',
+            click: (_record, _modal, _instance) => this.stop(_record),
+          },
+          {
+            text: '启用',
+            click: (_record, _modal, _instance) => this.start(_record.id),
+          },
+          {
+            text: '推荐到首页',
+            click: (_record, _modal, _instance) => this.recommend(_record.id),
+          }
+        ]
+      }
+    ];
+  }
+  // 新增
+  add() {
+    this.router.navigate(['/partner/article-management/add'], { queryParams: {} });
+  }
+
+  // 编辑
+  edit(record: STData) {
+    this.router.navigate(['/partner/article-management/edit'], { queryParams: {} });
+  }
+
+ 
+  stop(record: STData) {
+    this.modalService.confirm({
+      nzTitle: '<i>禁用确认</i>',
+      nzContent: `<b>确定禁用此文章吗？</br>`,
+      // nzOnOk: () =>
+      //   this.service.request('', '').subscribe(res => {
+      //     if (res) {
+      //       this.service.msgSrv.success('冻结成功！');
+      //       this.st.reload();
+      //     }
+      //   })
+    });
+  }
+  start(record: STData) {
+    this.modalService.confirm({
+      nzTitle: '<i>启用确认</i>',
+      nzContent: `<b>确定启用此文章吗？</br>`,
+      // nzOnOk: () =>
+      //   this.service.request('', '').subscribe(res => {
+      //     if (res) {
+      //       this.service.msgSrv.success('冻结成功！');
+      //       this.st.reload();
+      //     }
+      //   })
+    });
+  }
+  recommend(record: STData) {
+   
+  }
+  
+}
diff --git a/src/app/routes/partner/article-management/services/channel-sales.service.ts b/src/app/routes/partner/article-management/services/channel-sales.service.ts
new file mode 100644
index 00000000..6e7cb18c
--- /dev/null
+++ b/src/app/routes/partner/article-management/services/channel-sales.service.ts
@@ -0,0 +1,12 @@
+import { Injectable, Injector } from '@angular/core';
+import { BaseService } from '@shared';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class ChannelSalesService extends BaseService {
+
+  constructor(public injector: Injector) {
+    super(injector);
+  }
+}
diff --git a/src/app/routes/partner/partner-routing.module.ts b/src/app/routes/partner/partner-routing.module.ts
index 2ceac3d8..69c8c4da 100644
--- a/src/app/routes/partner/partner-routing.module.ts
+++ b/src/app/routes/partner/partner-routing.module.ts
@@ -38,6 +38,8 @@ import { AddPersonalPartnerComponent } from './partner-list/components/add-perso
 import { PartnerDetailComponent } from './partner-list/components/partner-detail/partner-detail.component';
 import { PartnerListComponent } from './partner-list/components/index/partner-list.component';
 import { ParterRebateManageMentAddComponent } from './rebate-management/components/rebate-setting/add/add.component';
+import { ParterArticleManagementListComponent } from './article-management/components/list/list.component';
+import { ParterArticleManagementEditComponent } from './article-management/components/edit/edit.component';
 
 const routes: Routes = [
   {
@@ -125,6 +127,15 @@ const routes: Routes = [
       { path: 'record/detail/:id', component: PartnerRecordedDetailComponent }
     ]
   },
+  {
+    path: 'article-management',
+    children: [
+      { path: '', component: ParterArticleManagementListComponent },
+      { path: 'list', component: ParterArticleManagementListComponent},
+      { path: 'add', component: ParterArticleManagementEditComponent},
+      { path: 'edit', component: ParterArticleManagementEditComponent},
+    ]
+  },
 
 ];
 @NgModule({
diff --git a/src/app/routes/partner/partner.module.ts b/src/app/routes/partner/partner.module.ts
index 6eadaab1..cb9f380b 100644
--- a/src/app/routes/partner/partner.module.ts
+++ b/src/app/routes/partner/partner.module.ts
@@ -50,6 +50,8 @@ import { ParterRebateManageMenAbnormalFeedbackComponent } from './rebate-managem
 import { PartnerRecordedDetailComponent } from './recorded/components/detail/detail.component';
 import { PartnerRecordedRecordComponent } from './recorded/components/record/record.component';
 import { ParterRebateManageMentAddComponent } from './rebate-management/components/rebate-setting/add/add.component';
+import { ParterArticleManagementEditComponent } from './article-management/components/edit/edit.component';
+import { ParterArticleManagementListComponent } from './article-management/components/list/list.component';
 
 const COMPONENTS: any[] = [
   PartnerBusinessStatisticsIndexComponent,
@@ -90,7 +92,8 @@ const COMPONENTS: any[] = [
   ParterRebateManageMentAddComponent,
   AddEtpPartnerComponent,
   AddPersonalPartnerComponent,
-  
+  ParterArticleManagementEditComponent,
+  ParterArticleManagementListComponent
 ];
 
 @NgModule({
diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json
index 20178a6b..64e38c54 100644
--- a/src/assets/mocks/menu-data.json
+++ b/src/assets/mocks/menu-data.json
@@ -604,7 +604,22 @@
               "children": [{
                 "text": "banner管理",
                 "link": "/knowledge/banner"
-              }]
+              },
+              {
+                "text": "文章管理",
+                "link": "/partner/article-management/list"
+              },
+              {
+                "text": "新增文章",
+                "link": "/partner/article-management/add",
+                "hide": true
+              },
+              {
+                "text": "编辑文章",
+                "link": "/partner/article-management/edit",
+                "hide": true
+              }
+            ]
             }
           ]
         }

From b605210b1186e2d0ac32d6cd9edb639197d228fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= <xiaoyun.pan@eascs.com>
Date: Sat, 12 Mar 2022 15:37:45 +0800
Subject: [PATCH 43/70] =?UTF-8?q?=E5=88=86=E7=B1=BB=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/list/list.component.html       |   2 +-
 .../components/edit/edit.component.html       |   8 +
 .../components/edit/edit.component.spec.ts    |  24 +++
 .../components/edit/edit.component.ts         | 111 +++++++++++
 .../components/list/list.component.html       |  33 +++-
 .../components/list/list.component.ts         | 182 +++++++++++++++---
 .../services/classification.service.ts        |  12 ++
 src/app/routes/partner/partner.module.ts      |   4 +-
 src/app/shared/shared-zorro.module.ts         |   7 +-
 9 files changed, 345 insertions(+), 38 deletions(-)
 create mode 100644 src/app/routes/partner/knowledge/classification/components/edit/edit.component.html
 create mode 100644 src/app/routes/partner/knowledge/classification/components/edit/edit.component.spec.ts
 create mode 100644 src/app/routes/partner/knowledge/classification/components/edit/edit.component.ts
 create mode 100644 src/app/routes/partner/knowledge/classification/services/classification.service.ts

diff --git a/src/app/routes/partner/account-management/components/list/list.component.html b/src/app/routes/partner/account-management/components/list/list.component.html
index 465b42a3..d071efc2 100644
--- a/src/app/routes/partner/account-management/components/list/list.component.html
+++ b/src/app/routes/partner/account-management/components/list/list.component.html
@@ -13,7 +13,7 @@
 
 </nz-card>
 <nz-card>
-  <st #st [data]="service. $api_get_account_management_page" [columns]="columns" [scroll]="{ x: '1200px' }"
+  <st #st [data]="service.$api_get_account_management_page" [columns]="columns" [scroll]="{ x: '1200px' }"
     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
     [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
     [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
diff --git a/src/app/routes/partner/knowledge/classification/components/edit/edit.component.html b/src/app/routes/partner/knowledge/classification/components/edit/edit.component.html
new file mode 100644
index 00000000..855ada53
--- /dev/null
+++ b/src/app/routes/partner/knowledge/classification/components/edit/edit.component.html
@@ -0,0 +1,8 @@
+<nz-spin *ngIf="!i && status !== 'add'" class="modal-spin"></nz-spin>
+<sf #sf mode="edit" [schema]="schema" [ui]="ui" [formData]="i" button="none">
+  <div class="modal-footer">
+    <button nz-button type="button" (click)="close()">关闭</button>
+    <button nz-button type="submit" nzType="primary" (click)="save(sf.value)" [disabled]="!sf.valid"
+      [nzLoading]="service.http.loading">保存</button>
+  </div>
+</sf>
diff --git a/src/app/routes/partner/knowledge/classification/components/edit/edit.component.spec.ts b/src/app/routes/partner/knowledge/classification/components/edit/edit.component.spec.ts
new file mode 100644
index 00000000..e31fd9c9
--- /dev/null
+++ b/src/app/routes/partner/knowledge/classification/components/edit/edit.component.spec.ts
@@ -0,0 +1,24 @@
+import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import { PartnerEditComponent } from './edit.component';
+
+describe('PartnerEditComponent', () => {
+  let component: PartnerEditComponent;
+  let fixture: ComponentFixture<PartnerEditComponent>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ PartnerEditComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(PartnerEditComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/routes/partner/knowledge/classification/components/edit/edit.component.ts b/src/app/routes/partner/knowledge/classification/components/edit/edit.component.ts
new file mode 100644
index 00000000..817ac254
--- /dev/null
+++ b/src/app/routes/partner/knowledge/classification/components/edit/edit.component.ts
@@ -0,0 +1,111 @@
+import { Component, OnInit } from '@angular/core';
+import { apiConf } from '@conf/api.conf';
+import { SFSchema, SFUISchema } from '@delon/form';
+import { NzModalRef } from 'ng-zorro-antd/modal';
+import { Observable, Observer } from 'rxjs';
+import { ClassificationService } from '../../services/classification.service';
+
+@Component({
+  selector: 'app-partner-edit',
+  templateUrl: './edit.component.html',
+})
+export class PartnerEditComponent implements OnInit {
+  record: any = {};
+  i: any;
+  schema!: SFSchema;
+  ui!: SFUISchema;
+  status = 'add';
+
+  constructor(
+    private modal: NzModalRef,
+    public service: ClassificationService
+  ) { }
+
+  ngOnInit(): void {
+    if (this.i) {
+      this.i.icon = [
+        {
+          uid: -1,
+          name: 'xxx.png',
+          status: 'done',
+          url: this.i.url,
+          response: {
+            resource_id: 1,
+          },
+        },
+      ]
+    }
+    this.initSF();
+
+  }
+  initSF() {
+    this.schema = {
+      properties: {
+        abnormalCause: {
+          title: '分类名称',
+          type: 'string',
+          maxLength: 5,
+          ui: {
+            placeholder: '请输入',
+          },
+        },
+        icon: {
+          type: 'string',
+          title: '图标',
+          ui: {
+            action: apiConf.fileUpload,
+            fileType: 'image/png,image/jpeg,image/jpg',
+            limit: 1,
+            resReName: 'url',
+            urlReName: 'url',
+            widget: 'upload',
+            descriptionI18n: '支持JPG、PNG格式，文件小于2M（建议尺寸  88px * 88px）',
+            name: 'multipartFile',
+            multiple: false,
+            listType: 'picture-card',
+            beforeUpload: (file: any, _fileList: any) => {
+              return new Observable((observer: Observer<boolean>) => {
+                const isLt2M = file.size / 1024 / 1024 < 2;
+                if (!isLt2M) {
+                  this.service.msgSrv.warning('图片大小超过2M!');
+                  observer.complete();
+                  return;
+                }
+                observer.next(isLt2M);
+                observer.complete();
+              });
+            }
+          }
+        },
+        abnormalCause2: {
+          title: '排序',
+          type: 'number',
+          maximum: 99,
+          minimum: 0,
+          ui: {
+            placeholder: '请输入',
+            widgetWidth: 350
+          }
+        },
+      },
+      required: ['abnormalCause', 'icon', 'abnormalCause2']
+
+    }
+    this.ui = { '*': { spanLabelFixed: 90, grid: { span: 20, gutter: 4 } }, };
+
+  }
+
+  save(value: any): void {
+    this.service.request(`/user/${this.record.id}`, value).subscribe(res => {
+      if (res) {
+        this.service.msgSrv.success('保存成功');
+        this.modal.close(true);
+      }
+
+    });
+  }
+
+  close(): void {
+    this.modal.destroy();
+  }
+}
diff --git a/src/app/routes/partner/knowledge/classification/components/list/list.component.html b/src/app/routes/partner/knowledge/classification/components/list/list.component.html
index 482ccb06..2947e9a8 100644
--- a/src/app/routes/partner/knowledge/classification/components/list/list.component.html
+++ b/src/app/routes/partner/knowledge/classification/components/list/list.component.html
@@ -1,9 +1,28 @@
-<page-header [action]="phActionTpl">
-  <ng-template #phActionTpl>
-    <button (click)="add()" nz-button nzType="primary">新建</button>
-  </ng-template>
-</page-header>
+<page-header-wrapper [title]="''">
+</page-header-wrapper>
 <nz-card>
-  <sf mode="search" [schema]="searchSchema" (formSubmit)="st.reset($event)" (formReset)="st.reset($event)"></sf>
-  <st #st [data]="url" [columns]="columns"></st>
+  <div nz-row nzGutter="8">
+    <div nz-col [nzSpan]="16">
+      <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
+    </div>
+    <div nz-col [nzSpan]="8">
+      <button nz-button nzType="primary" (click)="st?.load(1)">查询</button>
+      <button nz-button (click)="resetSF()">重置</button>
+    </div>
+  </div>
+</nz-card>
+<nz-card>
+
+  <div class="mb-sm">
+    <button nz-button nzType="primary" (click)="add()">新增分类</button>
+  </div>
+  <st #st [data]="service.$api_get_account_management_page" [columns]="columns" [scroll]="{ x: '1200px' }"
+    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+    [loading]="service.http.loading">
+    <ng-template st-row="icon" let-item>
+      <img nz-image width="64px" height="64px" [nzSrc]="item?.icon" alt="" />
+    </ng-template>
+  </st>
 </nz-card>
diff --git a/src/app/routes/partner/knowledge/classification/components/list/list.component.ts b/src/app/routes/partner/knowledge/classification/components/list/list.component.ts
index f90502b6..db88bed4 100644
--- a/src/app/routes/partner/knowledge/classification/components/list/list.component.ts
+++ b/src/app/routes/partner/knowledge/classification/components/list/list.component.ts
@@ -1,7 +1,11 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { STColumn, STComponent } from '@delon/abc/st';
-import { SFSchema } from '@delon/form';
+import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
 import { ModalHelper, _HttpClient } from '@delon/theme';
+import { NzModalService } from 'ng-zorro-antd/modal';
+import { PartnerAccountManagementVirtualAccountDetailComponent } from 'src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component';
+import { AccountManagemantService } from 'src/app/routes/partner/account-management/services/account-managemant.service';
+import { PartnerEditComponent } from '../edit/edit.component';
 
 @Component({
   selector: 'app-partner-list',
@@ -9,37 +13,161 @@ import { ModalHelper, _HttpClient } from '@delon/theme';
 })
 export class PartnerKnowledgeClassificationListComponent implements OnInit {
   url = `/user`;
-  searchSchema: SFSchema = {
-    properties: {
-      no: {
-        type: 'string',
-        title: '编号'
+  schema!: SFSchema;
+  ui!: SFUISchema;
+  @ViewChild('st') private readonly st!: STComponent;
+  @ViewChild('sf') private readonly sf!: SFComponent;
+  columns: STColumn[] = [];
+
+  constructor(public service: AccountManagemantService, public modal: NzModalService) { }
+  /**
+   * 查询参数
+   */
+  get reqParams() {
+    const params = { ...this.sf?.value };
+    return params
+  }
+
+  ngOnInit(): void {
+    this.initSF();
+    this.initST();
+  }
+
+  initSF() {
+    this.schema = {
+      properties: {
+        abnormalCause: {
+          title: '分类ID',
+          type: 'string',
+          ui: {
+            placeholder: '请输入',
+          },
+        },
+        abnormalCause1: {
+          title: '分类名称',
+          type: 'string',
+          ui: {
+            placeholder: '请输入',
+          },
+        },
+        abnormalCause2: {
+          title: '状态',
+          type: 'string',
+          enum: [
+            { label: '全部', value: '' },
+            { label: '正常', value: '1' },
+            { label: '禁用', value: '2' }
+          ],
+          default: '',
+        },
       }
     }
-  };
-  @ViewChild('st') private readonly st!: STComponent;
-  columns: STColumn[] = [
-    { title: '编号', index: 'no' },
-    { title: '调用次数', type: 'number', index: 'callNo' },
-    { title: '头像', type: 'img', width: '50px', index: 'avatar' },
-    { title: '时间', type: 'date', index: 'updatedAt' },
-    {
-      title: '',
-      buttons: [
-        // { text: '查看', click: (item: any) => `/form/${item.id}` },
-        // { text: '编辑', type: 'static', component: FormEditComponent, click: 'reload' },
-      ]
-    }
-  ];
+    this.ui = { '*': { spanLabelFixed: 90, grid: { span: 8, gutter: 4 } }, };
+  }
+  /**
+ * 初始化数据列表
+ */
+  initST() {
+    this.columns = [
+      { title: '分类ID', index: 'carNo', className: 'text-center', width: 150 },
+      { title: '分类名称', render: 'carModelLabel', className: 'text-center', width: 200 },
+      { title: '图标', render: 'icon', className: 'text-center', width: 200 },
+      { title: '文章数', render: 'approvalStatus2', className: 'text-center', width: 120 },
+      { title: '排序', render: 'approvalStatus3', className: 'text-center', width: 120 },
+      { title: '状态', index: 'approvalStatus4', className: 'text-center', width: 120 },
+      { title: '最后修改时间', index: 'approvalStatus4', className: 'text-center', width: 180 },
+      {
+        title: '操作',
+        width: 150,
+        buttons: [
+          {
+            text: '修改',
+            click: (_record) => this.edit(_record)
+          },
+          {
+            text: '启用',
+            click: (_record) => this.operate(_record, 1)
+          },
+          {
+            text: '禁用',
+            click: (_record) => this.operate(_record, 2)
+          }
+        ]
+      }
+    ];
+  }
 
-  constructor(private http: _HttpClient, private modal: ModalHelper) { }
+  resetSF() {
+    this.sf.reset();
+    setTimeout(() => {
+      this.st.reset();
+    })
+  }
 
-  ngOnInit(): void { }
+  /**
+   *新增
+   * @param _record 当前行信息
+   */
+  add() {
+    const modalRef = this.modal.create({
+      nzTitle: '新增分类',
+      nzContent: PartnerEditComponent,
+      nzWidth: 600,
+      nzComponentParams: {
+        i: null
+      },
+      nzFooter: null
+    });
+    modalRef.afterClose.subscribe((res: any) => {
+      if (res) {
+        this.st.load(1);
+      }
+    });
+  }
+
+  /**
+   *编辑
+   * @param _record 当前行信息
+   */
+  edit(record: any) {
+    const modalRef = this.modal.create({
+      nzTitle: '修改分类',
+      nzContent: PartnerEditComponent,
+      nzWidth: 600,
+      nzComponentParams: {
+        i: record
+      },
+      nzFooter: null
+    });
+    modalRef.afterClose.subscribe((res: any) => {
+      if (res) {
+        this.st.load(1);
+      }
+    });
+  }
+
+  /**
+ *禁用或者启动
+ * @param _record 当前行信息
+ */
+  operate(record: any, type = 1) {
+    this.modal.confirm({
+      nzTitle: `<b>确定${type === 1 ? '启用' : '禁用'}此分类吗？</b>`,
+      nzOnOk: () =>
+        this.service.request(this.service.$api_edit_one, { id: record.id }).subscribe((res) => {
+          if (res) {
+            this.st.load(1);
+            this.service.msgSrv.success(`${type === 1 ? '启用' : '禁用'}成功！`);
+          }
+        }),
+    });
+  }
+
+  /**
+   *
+   */
+  export() {
 
-  add(): void {
-    // this.modal
-    //   .createStatic(FormEditComponent, { i: { id: 0 } })
-    //   .subscribe(() => this.st.reload());
   }
 
 }
diff --git a/src/app/routes/partner/knowledge/classification/services/classification.service.ts b/src/app/routes/partner/knowledge/classification/services/classification.service.ts
new file mode 100644
index 00000000..034cdb74
--- /dev/null
+++ b/src/app/routes/partner/knowledge/classification/services/classification.service.ts
@@ -0,0 +1,12 @@
+import { Injectable, Injector } from '@angular/core';
+import { BaseService } from '@shared';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class ClassificationService extends BaseService {
+
+  constructor(public injector: Injector) {
+    super(injector);
+  }
+}
diff --git a/src/app/routes/partner/partner.module.ts b/src/app/routes/partner/partner.module.ts
index c38615d4..1c3c0486 100644
--- a/src/app/routes/partner/partner.module.ts
+++ b/src/app/routes/partner/partner.module.ts
@@ -51,6 +51,7 @@ import { PartnerRecordedDetailComponent } from './recorded/components/detail/det
 import { PartnerRecordedRecordComponent } from './recorded/components/record/record.component';
 import { ParterRebateManageMentAddComponent } from './rebate-management/components/rebate-setting/add/add.component';
 import { PartnerKnowledgeClassificationListComponent } from './knowledge/classification/components/list/list.component';
+import { PartnerEditComponent } from './knowledge/classification/components/edit/edit.component';
 
 const COMPONENTS: any[] = [
   PartnerBusinessStatisticsIndexComponent,
@@ -92,7 +93,8 @@ const COMPONENTS: any[] = [
   AddEtpPartnerComponent,
   AddPersonalPartnerComponent,
   PartnerKnowledgeClassificationListComponent
-];
+,
+  PartnerEditComponent];
 
 @NgModule({
   declarations: [...COMPONENTS],
diff --git a/src/app/shared/shared-zorro.module.ts b/src/app/shared/shared-zorro.module.ts
index ab105080..bb75f8c0 100644
--- a/src/app/shared/shared-zorro.module.ts
+++ b/src/app/shared/shared-zorro.module.ts
@@ -44,8 +44,10 @@ import { NzUploadModule } from 'ng-zorro-antd/upload';
 import { NzCascaderModule } from 'ng-zorro-antd/cascader';
 import { NzAnchorModule } from 'ng-zorro-antd/anchor';
 import { NzAffixModule } from 'ng-zorro-antd/affix';
-import { NzTypographyModule  } from 'ng-zorro-antd/typography';
+import { NzTypographyModule } from 'ng-zorro-antd/typography';
 import { NzSwitchModule } from 'ng-zorro-antd/switch';
+import { NzImageModule } from 'ng-zorro-antd/image';
+
 export const SHARED_ZORRO_MODULES = [
   NzButtonModule,
   NzGridModule,
@@ -85,5 +87,6 @@ export const SHARED_ZORRO_MODULES = [
   NzAnchorModule,
   NzAffixModule,
   NzTypographyModule,
-  NzSwitchModule 
+  NzSwitchModule,
+  NzImageModule
 ];

From 6e2b7d0b03a944a19df8b207200f1d03b5fe22ca Mon Sep 17 00:00:00 2001
From: Lingzi <yinyan.quan@eascs.com>
Date: Mon, 14 Mar 2022 13:22:37 +0800
Subject: [PATCH 44/70] fix bug

---
 .../ad/components/add/add.component.html      |  24 ++
 .../ad/components/add/add.component.spec.ts   |  24 ++
 .../ad/components/add/add.component.ts        | 309 ++++++++++++++++++
 .../routes/partner/ad/components/add/add.less | 119 +++++++
 .../ad/components/list/list.component.html    |  62 ++++
 .../ad/components/list/list.component.less    |   1 +
 .../ad/components/list/list.component.spec.ts |  24 ++
 .../ad/components/list/list.component.ts      | 281 ++++++++++++++++
 .../partner/ad/components/list/list.less      |   9 +
 .../partner/ad/services/scrollimg.service.ts  |  12 +
 .../routes/partner/partner-routing.module.ts  |  13 +-
 src/app/routes/partner/partner.module.ts      |   6 +-
 .../scrollimglist.component.html              |   9 -
 .../scrollimglist.component.spec.ts           |  24 --
 .../scrollimglist/scrollimglist.component.ts  |  45 ---
 src/assets/mocks/menu-data.json               |   3 +-
 16 files changed, 881 insertions(+), 84 deletions(-)
 create mode 100644 src/app/routes/partner/ad/components/add/add.component.html
 create mode 100644 src/app/routes/partner/ad/components/add/add.component.spec.ts
 create mode 100644 src/app/routes/partner/ad/components/add/add.component.ts
 create mode 100644 src/app/routes/partner/ad/components/add/add.less
 create mode 100644 src/app/routes/partner/ad/components/list/list.component.html
 create mode 100644 src/app/routes/partner/ad/components/list/list.component.less
 create mode 100644 src/app/routes/partner/ad/components/list/list.component.spec.ts
 create mode 100644 src/app/routes/partner/ad/components/list/list.component.ts
 create mode 100644 src/app/routes/partner/ad/components/list/list.less
 create mode 100644 src/app/routes/partner/ad/services/scrollimg.service.ts
 delete mode 100644 src/app/routes/partner/scroll-img/scrollimglist/scrollimglist.component.html
 delete mode 100644 src/app/routes/partner/scroll-img/scrollimglist/scrollimglist.component.spec.ts
 delete mode 100644 src/app/routes/partner/scroll-img/scrollimglist/scrollimglist.component.ts

diff --git a/src/app/routes/partner/ad/components/add/add.component.html b/src/app/routes/partner/ad/components/add/add.component.html
new file mode 100644
index 00000000..f6a39e94
--- /dev/null
+++ b/src/app/routes/partner/ad/components/add/add.component.html
@@ -0,0 +1,24 @@
+<!-- 页头 -->
+<page-header-wrapper [title]="''" [logo]="logo">
+  <ng-template #logo>
+    <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
+      <i nz-icon nzType="left" nzTheme="outline"></i>
+    </button>
+  </ng-template>
+</page-header-wrapper>
+<nz-card>
+  <div class="modal-header">
+    <div class="modal-title" *ngIf="queryParams.type === 'add'">新建广告</div>
+    <div class="modal-title" *ngIf="queryParams.type === 'edit'">编辑广告</div>
+    <div class="modal-title" *ngIf="queryParams.type === 'view'">查看广告</div>
+  </div>
+    <sf #sf [schema]="schema" [ui]="ui" [button]="'none'" [formData]="detailData">
+    </sf>
+  <div class="modal-footer" *ngIf="queryParams.type !== 'view'">
+    <button nz-button type="button" (click)="checkSort()" nzType="primary" [disabled]="validFalg">保存</button>
+    <button nz-button type="button" (click)="goBack()">取消</button>
+  </div>
+</nz-card>
+<!-- <nz-modal [(nzVisible)]="isVisible" nzTitle="The first Modal" (nzOnCancel)="handleCancel()" (nzOnOk)="handleOk()">
+  <baidu-map [inputAddress]="detailData.companyAddress" [inputPoint]="inputPoint" (outputPointAddress)="outputPointAddress($event)"></baidu-map>
+</nz-modal> -->
\ No newline at end of file
diff --git a/src/app/routes/partner/ad/components/add/add.component.spec.ts b/src/app/routes/partner/ad/components/add/add.component.spec.ts
new file mode 100644
index 00000000..80b44d19
--- /dev/null
+++ b/src/app/routes/partner/ad/components/add/add.component.spec.ts
@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { AdComponentsAddComponent } from './add.component';
+
+describe('AdComponentsAddComponent', () => {
+  let component: AdComponentsAddComponent;
+  let fixture: ComponentFixture<AdComponentsAddComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ AdComponentsAddComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AdComponentsAddComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/routes/partner/ad/components/add/add.component.ts b/src/app/routes/partner/ad/components/add/add.component.ts
new file mode 100644
index 00000000..f719a83a
--- /dev/null
+++ b/src/app/routes/partner/ad/components/add/add.component.ts
@@ -0,0 +1,309 @@
+import { ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { SFComponent, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
+import { ModalHelper, _HttpClient } from '@delon/theme';
+import { EAEnvironmentService } from '@shared';
+import differenceInCalendarDays from 'date-fns/differenceInCalendarDays';
+import format from 'date-fns/format';
+import { NzMessageService } from 'ng-zorro-antd/message';
+import { NzModalService } from 'ng-zorro-antd/modal';
+import { NzUploadFile } from 'ng-zorro-antd/upload';
+import { Observable, Observer, of } from 'rxjs';
+import { ScrollImgService } from '../../services/scrollimg.service';
+import { apiConf } from '@conf/api.conf';
+
+@Component({
+  selector: 'app-ad-components-add',
+  templateUrl: './add.component.html',
+  styleUrls: ['./add.less']
+})
+export class ScrollimgComponentsAddComponent implements OnInit {
+  @ViewChild('sf', { static: false }) sf!: SFComponent;
+  record: any = {};
+  i: any;
+  schema: SFSchema = {};
+  contentListData = [];
+  queryParams: any = {};
+  oldTakeEffectTime = '';
+  maxSort = 0;
+  isVisible = false;
+  validFalg = true;
+  detailData: any = {
+    advertisementContentDTOList: []
+  };
+  changeTimeFlag = false;
+  currentIndex = 0;
+  addFlag = true;
+  addId = 1;
+  inputPoint: any = {
+    lng: 0,
+    lat: 0
+  };
+  today = new Date();
+  navData: any = [];
+  navigationName = '';
+  ui: SFUISchema = {
+    '*': {
+      spanLabelFixed: 200,
+      grid: { span: 24 },
+    },
+  };
+  constructor(
+    public msgSrv: NzMessageService,
+    public http: _HttpClient,
+    public service: ScrollImgService,
+    private route: ActivatedRoute,
+    private router: Router,
+    private modal: ModalHelper,
+    private modalSrv: NzModalService,
+    private cdr: ChangeDetectorRef,
+    private envSrv: EAEnvironmentService,
+  ) { }
+
+
+  ngOnInit(): void {
+    this.queryParams = this.route.snapshot.queryParams;
+    if (this.queryParams.type !== 'add') {
+      this.initDetailData();
+    }
+    this.initSF();
+  }
+  initDetailData() {
+
+  }
+  initSF() {
+    this.schema = {
+      properties: {
+        name: {
+          type: 'string',
+          title: '轮播图名称',
+          maxLength: 10,
+          ui: {
+            showRequired: true,
+            placeholder: '请不要超过10个字',
+          }
+        },
+        style: {
+          type: 'string',
+          title: '轮播图',
+          ui: {
+            showRequired: true,
+            widget: 'custom',
+            placeholder: '请选择轮播图',
+          }
+        },
+        licensePhotoWatermark: {
+          type: 'string',
+          title: '轮播图',
+          ui: {
+            action: apiConf.fileUpload,
+            accept: 'image/png,image/jpeg,image/jpg,image/gif',
+            limit: 1,
+            limitFileCount: 1,
+            resReName: 'data.fullFileWatermarkPath',
+            urlReName: 'data.fullFileWatermarkPath',
+            widget: 'upload',
+            descriptionI18n: '图片支持jpg、jpeg、png、gif格式，大小不超过4M',
+            data: {
+              appId: this.envSrv.env.appId,
+            },
+            name: 'multipartFile',
+            multiple: false,
+            listType: 'picture-card',
+            change: (args: any) => {
+              if (args.type === 'success') {
+                this.detailData.enterpriseBaseDTO.licensePhoto = args.file.response.data.fullFilePath
+              }
+            },
+            beforeUpload: (file: any, _fileList: any) => {
+              return new Observable((observer: Observer<boolean>) => {
+                const isLt4M = file.size / 1024 / 1024 < 4;
+                if (!isLt4M) {
+                  this.service.msgSrv.warning('图片大小超过4M!');
+                  observer.complete();
+                  return;
+                }
+                observer.next(isLt4M);
+                observer.complete();
+              });
+            },
+            previewFile: (file: NzUploadFile) => of(file.url),
+          },
+        },
+        takeEffectType: {
+          type: 'string',
+          title: '生效类型',
+          ui: {
+            showRequired: true,
+            widget: 'custom',
+          },
+          default: 1
+        },
+        mainTitle: {
+          type: 'string',
+          title: '主标题',
+          maxLength: 20,
+          ui: {
+            visibleIf: { style: [1, 2, 3, 4, 5] },
+            placeholder: '请输入主标题，不超过20个字',
+            change: (id: any) => {
+              this.validFalg = !this.sf?.valid;
+            }
+          }
+        },
+        withTitle: {
+          type: 'string',
+          title: '副标题',
+          maxLength: 20,
+          ui: {
+            visibleIf: { style: [1, 2, 3, 4, 5] },
+            placeholder: '请输入主标题，不超过20个字',
+          }
+        },
+        sortId: {
+          type: 'string',
+          title: '显示顺序',
+          ui: {
+            showRequired: true,
+            widget: 'select',
+            serverSearch: true,
+          } as SFSelectWidgetSchema,
+          enum: [
+            { label: 1, value: '1' },
+            { label: 2, value: '2' },
+            { label: 3, value: '3' },
+            { label: 4, value: '4' },
+            { label: 5, value: '5' },
+            { label: 6, value: '6' },
+            { label: 7, value: '7' },
+            { label: 8, value: '8' },
+            { label: 9, value: '9' },
+            { label: 10, value: '10' },
+          ]
+        },
+        cooperationHotline: {
+          type: 'string',
+          title: '合作热线',
+          maxLength: 13,
+          ui: {
+            showRequired: true,
+            placeholder: '请输入电话号码',
+            visibleIf: { style: [6] },
+            validator: val => {
+              const reg = /((\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$)/g;
+              let isValid: any;
+              isValid = reg.test(val);
+              if (!isValid) {
+              return [{ keyword: 'required', message: '格式不正确' }];
+              }
+              return [];
+            },
+          },
+        },
+        companyAddress: {
+          type: 'string',
+          title: '公司选址',
+          ui: {
+            widget: 'custom',
+            showRequired: true,
+            visibleIf: { style: [6] },
+          },
+        },
+        advertisementContentDTOList: {
+          type: 'string',
+          title: '内容设置',
+          ui: {
+            widget: 'custom',
+            showRequired: true,
+            visibleIf: { style: [1, 2, 3, 4, 5] },
+          },
+        }
+      },
+      required: ['name', 'navigationId', 'style', 'takeEffectType', 'cooperationHotline', 'companyAddress', 'advertisementContentDTOList'],
+    };
+    if (this.queryParams.type === 'add'){
+      setTimeout(() => {
+        this.sf.setValue('/takeEffectType', 1);
+        this.sf.setValue('/style', 1);
+      }, 500);  
+    }
+  }
+  get reqParams() {
+    return {};
+  }
+  disabledDate = (current: Date): boolean => {
+    // Can not select days before today and today
+    return differenceInCalendarDays(current, this.today) < 0;
+  }
+  changeTime(){
+    this.changeTimeFlag = true;
+  }
+
+
+  checkSort(){
+    const params: any = {
+      navigationId: this.sf?.value.navigationId,
+      sortId: this.sf?.value.sortId,
+      takeEffectType: this.sf?.value.takeEffectType,
+    };
+    if (this.queryParams.id !== '0'){
+      params.advertisementId = this.queryParams.id;
+    }
+    if (this.sf.value.takeEffectType === 2){
+      if (this.changeTimeFlag) {
+        params.takeEffectTime = format(this.detailData.takeEffectTime, 'yyyy-MM-dd HH:mm');
+      } else {
+        params.takeEffectTime = this.detailData.takeEffectTime;
+      }
+    }
+   
+  }
+  save() {
+    const params: any = {
+      ...this.sf?.value,
+      latitude: this.inputPoint.lat,
+      longitude: this.inputPoint.lng,
+      id: this.queryParams.id
+    };
+    this.detailData.advertisementContentDTOList.forEach((item: any) => {
+      delete item.addId;
+    });
+    if (this.queryParams.type === 'add') {
+      delete params.id;
+    }
+    if (this.sf.value.takeEffectType === 2){
+      if (this.changeTimeFlag) {
+        params.takeEffectTime = format(this.detailData.takeEffectTime, 'yyyy-MM-dd HH:mm');
+      } else {
+        params.takeEffectTime = this.detailData.takeEffectTime;
+      }
+    } else {
+      delete params.takeEffectTime;
+    }
+    this.service.request(this.service.$api_add_one, params).subscribe(res => {
+      if (res) {
+        this.service.msgSrv.success('保存成功');
+        this.router.navigate(['../list'], {relativeTo: this.route});
+      }
+    });
+  }
+
+  goBack() {
+    window.history.go(-1);
+  }
+  gotoMap() {
+    this.isVisible = true;
+  }
+
+  handleOk(): void {
+    this.isVisible = false;
+  }
+
+  handleCancel(): void {
+    this.isVisible = false;
+  }
+  outputPointAddress(data: any){
+    this.sf.setValue('/companyAddress', data.address);
+    this.inputPoint = data.inputPoint;
+  }
+}
diff --git a/src/app/routes/partner/ad/components/add/add.less b/src/app/routes/partner/ad/components/add/add.less
new file mode 100644
index 00000000..0a6adacb
--- /dev/null
+++ b/src/app/routes/partner/ad/components/add/add.less
@@ -0,0 +1,119 @@
+:host {
+    .styleBox {
+        display: flex;
+        align-items: flex-end;
+        margin: 10px 0 0 0;
+      }
+      .imgBox {
+        position: relative;
+        width: 200px;
+        padding: 6px 0;
+        text-align: center;
+        border: solid 1px #eee;
+        .leftBox,
+        .rightBox {
+          position: absolute;
+          top: 50%;
+          transform: translate(0, -50%);
+        }
+        img {
+          width: 170px;
+          height: 40px;
+        }
+        .leftBox {
+          left: 3px;
+        }
+        .rightBox {
+          right: 3px;
+        }
+      }
+      .imgBox_two {
+        width: 200px;
+        padding: 6px;
+        text-align: center;
+        border: solid 1px #eee;
+        img {
+          width: 100%;
+          height: 40px;
+        }
+      }
+      .imgBox_three {
+        width: 200px;
+        padding: 6px 0;
+        text-align: center;
+        border: solid 1px #eee;
+        img {
+          width: 25%;
+          height: 40px;
+          margin: 0 6% 0 0;
+          &:first-child {
+            margin: 0 6%;
+          }
+        }
+      }
+      .imgBox_four {
+        width: 200px;
+        padding: 6px 0;
+        text-align: center;
+        border: solid 1px #eee;
+        img {
+          width: 22%;
+          height: 40px;
+          margin: 0 2% 0 0;
+          &:first-child {
+            margin: 0 2%;
+          }
+        }
+      }
+      .imgBox_one {
+        width: 60px;
+        padding: 6px;
+        text-align: center;
+        border: solid 1px #eee;
+        img {
+          width: 100%;
+          height: 40px;
+        }
+      }
+      .imgBox_info {
+        width: 200px;
+        padding: 6px;
+        overflow: hidden;
+        border: solid 1px #eee;
+        .title {
+          width: 100%;
+          line-height: 30px;
+          text-align: center;
+        }
+        .infoBox {
+          .name {
+            line-height: 28px;
+          }
+          .map {
+            width: 100%;
+            text-align: center;
+            img {
+              width: 90%;
+            }
+          }
+        }
+      }
+      .hint {
+        margin: 0 0 0 10px;
+        color: #f00;
+      }
+      .addBtn {
+        margin: 0 0 10px 0;
+      }   
+  }
+  .overflowText {
+    display: -webkit-box;
+    max-width: 200px;
+    overflow: hidden;
+    text-align: left;
+    text-overflow: -o-ellipsis-lastline;
+    text-overflow: ellipsis;
+    -webkit-line-clamp: 1;
+    line-clamp: 1;
+    -webkit-box-orient: vertical;
+  }
\ No newline at end of file
diff --git a/src/app/routes/partner/ad/components/list/list.component.html b/src/app/routes/partner/ad/components/list/list.component.html
new file mode 100644
index 00000000..caedd311
--- /dev/null
+++ b/src/app/routes/partner/ad/components/list/list.component.html
@@ -0,0 +1,62 @@
+<!-- 页头 -->
+<page-header-wrapper [title]="''"></page-header-wrapper>
+<nz-card>
+    <!-- 搜索表单 -->
+    <div nz-row [nzGutter]="16">
+        <!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
+        <div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
+            <sf #sf [schema]="schema" [ui]="ui" [mode]="'search'" [disabled]="!sf?.valid" [loading]="service.http.loading"></sf>
+        </div>
+
+        <!-- 查询字段大于3个时，根据展开状态调整布局 -->
+        <ng-container *ngIf="queryFieldCount > 4">
+            <div nz-col [nzSpan]="_$expand ? 24 : 18">
+                <sf #sf [schema]="schema" [ui]="ui" [button]="'none'"></sf>
+            </div>
+            <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
+                <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading" (click)="st.load()">查询</button>
+                <button nz-button (click)="resetSF()">重置</button>
+                <button nz-button nzType="link" (click)="expandToggle()">
+                    {{ !_$expand ? '展开' : '收起' }}
+                    <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
+                </button>
+            </div>
+        </ng-container>
+    </div>
+
+    <!-- 工具栏 -->
+    <div nz-row>
+        <div nz-col nzSpan="24">
+            <button nz-button nzType="primary" (click)="add()">新增轮播图</button>
+        </div>
+    </div>
+
+    <!-- 提示栏 -->
+    <div nz-row>
+        <div nz-col nzSpan="24">
+            <nz-alert
+                    nzType="info"
+                    [nzMessage]="'当前共' + (st?.total || 0) + '行记录，选中' + selectedRows.length + '行'"
+                    nzShowIcon
+                    [ngStyle]="{ margin: '1rem 0' }"
+            >
+            </nz-alert>
+        </div>
+    </div>
+
+    <!-- 数据列表 -->
+    <st
+            #st
+            multiSort
+            size="small"
+            [bordered]="true"
+            [scroll]="{ x: '2000px' }"
+            [data]="service.$api_get_page"
+            [columns]="columns"
+            [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+            [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+            [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+            [loadingDelay]="500"
+            [loading]="service.http.loading"
+    ></st>
+</nz-card>
diff --git a/src/app/routes/partner/ad/components/list/list.component.less b/src/app/routes/partner/ad/components/list/list.component.less
new file mode 100644
index 00000000..0aae2779
--- /dev/null
+++ b/src/app/routes/partner/ad/components/list/list.component.less
@@ -0,0 +1 @@
+@import '~@delon/theme/index';
diff --git a/src/app/routes/partner/ad/components/list/list.component.spec.ts b/src/app/routes/partner/ad/components/list/list.component.spec.ts
new file mode 100644
index 00000000..c8ac7672
--- /dev/null
+++ b/src/app/routes/partner/ad/components/list/list.component.spec.ts
@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { AdComponentsListComponent } from './list.component';
+
+describe('AdComponentsListComponent', () => {
+  let component: AdComponentsListComponent;
+  let fixture: ComponentFixture<AdComponentsListComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ AdComponentsListComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AdComponentsListComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/routes/partner/ad/components/list/list.component.ts b/src/app/routes/partner/ad/components/list/list.component.ts
new file mode 100644
index 00000000..a1c34480
--- /dev/null
+++ b/src/app/routes/partner/ad/components/list/list.component.ts
@@ -0,0 +1,281 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { STColumn, STComponent, STData } from '@delon/abc/st';
+import { SFComponent, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
+import { ModalHelper } from '@delon/theme';
+import { NzMessageService } from 'ng-zorro-antd/message';
+import { NzModalService } from 'ng-zorro-antd/modal';
+import { ScrollImgService } from '../../services/scrollimg.service';
+
+@Component({
+  selector: 'app-scrollimg-components-list',
+  templateUrl: './list.component.html',
+  styleUrls: ['./list.component.less']
+})
+
+export class ScrollImgComponentsListComponent implements OnInit {
+  schema: SFSchema = {};
+  columns: STColumn[] = [];
+  ui: SFUISchema = {};
+  appList: any[] = [];
+  _$expand = false;
+  selectApp = {
+    appName: '',
+    appId: ''
+  };
+
+  @ViewChild('st', { static: false }) st!: STComponent;
+  @ViewChild('sf', { static: false }) sf!: SFComponent;
+  constructor(public service: ScrollImgService, private modal: ModalHelper, private msg: NzMessageService, private router: Router, private modalSrv: NzModalService,  private ar: ActivatedRoute) { }
+
+  /**
+   * 查询字段个数
+   */
+  get queryFieldCount(): number {
+    return Object.keys(this.schema?.properties || {}).length;
+  }
+
+  /**
+   * 查询参数
+   */
+  get reqParams() {
+    const params = Object.assign({}, this.sf?.value || {});
+    delete params._$expand;
+    if (params.status === '') {
+      delete params.status;
+    }
+    if (params.style === '') {
+      delete params.style;
+    }
+    if (params.navigationId === '') {
+      delete params.navigationId;
+    }
+    return { ...params};
+  }
+
+  /**
+   * 选中行
+   */
+  get selectedRows() {
+    return this.st?.list.filter((item) => item.checked) || [];
+  }
+  ngOnInit() {
+    this.initSF();
+    this.initST();
+  }
+  selectAppFun(item: any) {
+    this.selectApp = item;
+    this.st.load(1);
+  }
+  dataProcess(data: STData[]): STData[] {
+    return data.map((i, index) => {
+      i.showSortFlag = false;
+      return i;
+    });
+  }
+  initSF() {
+    this.schema = {
+      properties: {
+        _$expand: {
+          type: 'boolean',
+          ui: {
+            hidden: true,
+          },
+        },
+        name: {
+          type: 'string',
+          title: '轮播图名称',
+          maxLength: 10,
+          ui: {
+            widget: '',
+            placeholder: '请输入',
+          }
+        },
+        status1: {
+          type: 'string',
+          title: '可见范围',
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            allowClear: true,
+          } as SFSelectWidgetSchema,
+          enum: [
+            { label: '全部', value: 1 },
+            { label: '全部可见', value: 2 },
+            { label: '渠道销售可见', value: 3 },
+            { label: '合伙人可见', value: 4 },
+          ]
+        },
+        status: {
+          type: 'string',
+          title: '状态',
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            allowClear: true,
+          } as SFSelectWidgetSchema,
+          enum: [
+            { label: '全部', value: 1 },
+            { label: '正常', value: 2 },
+            { label: '禁用', value: 3 }
+          ]
+        },
+      },
+    };
+    this.ui = {
+      '*': {
+        spanLabelFixed: 110,
+        grid: { span: 8 },
+      },
+    };
+  }
+
+  initST() {
+    this.columns = [
+      {
+        title: '轮播图名称', // 位:px
+        index: 'name',
+        className: 'text-center'
+      },
+      {
+        title: '轮播图',
+        index: 'navigationName',
+        className: 'text-center'
+      },
+      {
+        title: '可见范围',
+        index: 'navigationName',
+        className: 'text-center'
+      },
+      {
+        title: '排序', // 位 px
+        index: 'sortId',
+        className: 'text-center'
+      },
+      {
+        title: '状态', // 位 px
+        index: 'style',
+        className: 'text-center',
+        type: 'enum',
+        enum: { 
+          1: '正常',
+          2: '禁用',
+        }
+      },
+      {
+        title: '最后修改时间', // 位 px
+        index: 'createTime',
+        className: 'text-center'
+      },
+      {
+        title: '操作',
+        fixed: 'right',
+        className: 'text-center',
+        width: 280,
+        buttons: [
+          {
+            text: '修改',
+            click: (item) => {
+              this.router.navigate(['../detail'], { queryParams: { id: item.id, type: 'edit' }, relativeTo: this.ar });
+            }
+          },
+          {
+            text: '禁用',
+            pop: {
+              title: `是否确认禁用？`,
+              okType: 'danger',
+              icon: 'alert',
+            },
+            click: (item) => {
+              this.changeStatus(item.id);
+            },
+            iif: (item) => item.status === 1
+          },
+          {
+            text: '启用',
+            pop: {
+              title: `是否确认启用？`,
+              okType: 'danger',
+              icon: 'alert',
+            },
+            click: (item) => {
+              this.changeStatus(item);
+            },
+            iif: (item) => item.status === 2
+          },
+          {
+            text: '查看',
+            click: (item) => {
+              this.router.navigate(['../view'], { queryParams: { id: item.id, type: 'view' }, relativeTo: this.ar });
+            }
+          },
+          {
+            text: '删除',
+            pop: {
+              title: `确定删除吗？`,
+              okType: 'danger',
+              icon: 'alert',
+            },
+            click: (item) => {
+              this.del(item);
+            },
+            iif: (item) => item.status === 2
+          },
+          {
+            text: '操作记录',
+            click: (item) => {
+              this.router.navigate(['../operatordata'], { queryParams: { id: item.id }, relativeTo: this.ar });
+            }
+          },
+        ],
+      },
+    ];
+  }
+  changeStatus(item: any) {
+    const params = {
+      status,
+      idList: [item.id]
+    };
+    // this.service.request(this.service.$api_openOrClose, params).subscribe(res => {
+    //   if (res) {
+    //     this.st.reload();
+    //   }
+    // });
+  }
+  /**
+   * 伸缩查询条件
+   */
+  expandToggle() {
+    this._$expand = !this._$expand;
+    this.sf?.setValue('/_$expand', this._$expand);
+  }
+
+  /**
+   * 重置表单
+   */
+  resetSF() {
+    this.sf.reset();
+    this._$expand = false;
+  }
+
+  /**
+   * 新增单个实例
+   */
+  add() {
+    this.router.navigate(['../detail'], { queryParams: { id: 0, type: 'add' }, relativeTo: this.ar });
+  }
+
+  /**
+   * 删除单个实例
+   */
+  del(item: any) {
+    const ids = [];
+    ids.push(item.id);
+    this.service.request(this.service.$api_del_many, ids).subscribe(res => {
+      if (res) {
+        this.service.msgSrv.success('删除成功');
+        this.st.reload();
+      }
+    });
+  }
+}
diff --git a/src/app/routes/partner/ad/components/list/list.less b/src/app/routes/partner/ad/components/list/list.less
new file mode 100644
index 00000000..d9b6c73f
--- /dev/null
+++ b/src/app/routes/partner/ad/components/list/list.less
@@ -0,0 +1,9 @@
+.selectApp {
+    display: flex;
+    .appTitle {
+      font-size: 14px;
+    }
+  }
+  .redfont{
+    color: #f00;
+  }
\ No newline at end of file
diff --git a/src/app/routes/partner/ad/services/scrollimg.service.ts b/src/app/routes/partner/ad/services/scrollimg.service.ts
new file mode 100644
index 00000000..0af4095c
--- /dev/null
+++ b/src/app/routes/partner/ad/services/scrollimg.service.ts
@@ -0,0 +1,12 @@
+import { Injectable, Injector } from '@angular/core';
+import { BaseService } from '@shared';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class ScrollImgService extends BaseService {
+
+  constructor(public injector: Injector) {
+    super(injector);
+  }
+}
diff --git a/src/app/routes/partner/partner-routing.module.ts b/src/app/routes/partner/partner-routing.module.ts
index 1e743f92..c4eca158 100644
--- a/src/app/routes/partner/partner-routing.module.ts
+++ b/src/app/routes/partner/partner-routing.module.ts
@@ -38,7 +38,7 @@ import { AddPersonalPartnerComponent } from './partner-list/components/add-perso
 import { PartnerDetailComponent } from './partner-list/components/partner-detail/partner-detail.component';
 import { PartnerListComponent } from './partner-list/components/index/partner-list.component';
 import { ParterRebateManageMentAddComponent } from './rebate-management/components/rebate-setting/add/add.component';
-import { PartnerScrollimglistComponent } from './scroll-img/scrollimglist/scrollimglist.component';
+import { ScrollImgComponentsListComponent } from './ad/components/list/list.component';
 
 const routes: Routes = [
   {
@@ -129,7 +129,16 @@ const routes: Routes = [
       { path: 'record/detail/:id', component: PartnerRecordedDetailComponent }
     ]
   },
-  { path: 'scrollimglist', component: PartnerScrollimglistComponent }];
+  {
+    path: 'scroll-img',
+    children: [
+      { path: '', component: ScrollImgComponentsListComponent },
+      { path: 'list', component: ScrollImgComponentsListComponent },
+      { path: 'channel-detail', component: ParterClaimAuditListChannelDetailComponent },
+      { path: 'partner-detail', component: ParterClaimAuditListPartnerDetailComponent }
+    ]
+  },
+];
 @NgModule({
   imports: [RouterModule.forChild(routes)],
   exports: [RouterModule]
diff --git a/src/app/routes/partner/partner.module.ts b/src/app/routes/partner/partner.module.ts
index 3adfcb58..e44dd6dd 100644
--- a/src/app/routes/partner/partner.module.ts
+++ b/src/app/routes/partner/partner.module.ts
@@ -50,7 +50,8 @@ import { ParterRebateManageMenAbnormalFeedbackComponent } from './rebate-managem
 import { PartnerRecordedDetailComponent } from './recorded/components/detail/detail.component';
 import { PartnerRecordedRecordComponent } from './recorded/components/record/record.component';
 import { ParterRebateManageMentAddComponent } from './rebate-management/components/rebate-setting/add/add.component';
-import { PartnerScrollimglistComponent } from './scroll-img/scrollimglist/scrollimglist.component';
+import { ScrollImgComponentsListComponent } from './ad/components/list/list.component';
+import { ScrollimgComponentsAddComponent } from './ad/components/add/add.component';
 
 const COMPONENTS: any[] = [
   PartnerBusinessStatisticsIndexComponent,
@@ -91,7 +92,8 @@ const COMPONENTS: any[] = [
   ParterRebateManageMentAddComponent,
   AddEtpPartnerComponent,
   AddPersonalPartnerComponent,
-  PartnerScrollimglistComponent
+  ScrollImgComponentsListComponent,
+  ScrollimgComponentsAddComponent
 ];
 
 @NgModule({
diff --git a/src/app/routes/partner/scroll-img/scrollimglist/scrollimglist.component.html b/src/app/routes/partner/scroll-img/scrollimglist/scrollimglist.component.html
deleted file mode 100644
index 482ccb06..00000000
--- a/src/app/routes/partner/scroll-img/scrollimglist/scrollimglist.component.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<page-header [action]="phActionTpl">
-  <ng-template #phActionTpl>
-    <button (click)="add()" nz-button nzType="primary">新建</button>
-  </ng-template>
-</page-header>
-<nz-card>
-  <sf mode="search" [schema]="searchSchema" (formSubmit)="st.reset($event)" (formReset)="st.reset($event)"></sf>
-  <st #st [data]="url" [columns]="columns"></st>
-</nz-card>
diff --git a/src/app/routes/partner/scroll-img/scrollimglist/scrollimglist.component.spec.ts b/src/app/routes/partner/scroll-img/scrollimglist/scrollimglist.component.spec.ts
deleted file mode 100644
index 78d0192b..00000000
--- a/src/app/routes/partner/scroll-img/scrollimglist/scrollimglist.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { PartnerScrollimglistComponent } from './scrollimglist.component';
-
-describe('PartnerScrollimglistComponent', () => {
-  let component: PartnerScrollimglistComponent;
-  let fixture: ComponentFixture<PartnerScrollimglistComponent>;
-
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [ PartnerScrollimglistComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(PartnerScrollimglistComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/routes/partner/scroll-img/scrollimglist/scrollimglist.component.ts b/src/app/routes/partner/scroll-img/scrollimglist/scrollimglist.component.ts
deleted file mode 100644
index 3cd34b22..00000000
--- a/src/app/routes/partner/scroll-img/scrollimglist/scrollimglist.component.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { Component, OnInit, ViewChild } from '@angular/core';
-import { STColumn, STComponent } from '@delon/abc/st';
-import { SFSchema } from '@delon/form';
-import { ModalHelper, _HttpClient } from '@delon/theme';
-
-@Component({
-  selector: 'app-partner-scrollimglist',
-  templateUrl: './scrollimglist.component.html',
-})
-export class PartnerScrollimglistComponent implements OnInit {
-  url = `/user`;
-  searchSchema: SFSchema = {
-    properties: {
-      no: {
-        type: 'string',
-        title: '编号'
-      }
-    }
-  };
-  @ViewChild('st') private readonly st!: STComponent;
-  columns: STColumn[] = [
-    { title: '编号', index: 'no' },
-    { title: '调用次数', type: 'number', index: 'callNo' },
-    { title: '头像', type: 'img', width: '50px', index: 'avatar' },
-    { title: '时间', type: 'date', index: 'updatedAt' },
-    {
-      title: '',
-      buttons: [
-        // { text: '查看', click: (item: any) => `/form/${item.id}` },
-        // { text: '编辑', type: 'static', component: FormEditComponent, click: 'reload' },
-      ]
-    }
-  ];
-
-  constructor(private http: _HttpClient, private modal: ModalHelper) { }
-
-  ngOnInit(): void { }
-
-  add(): void {
-    // this.modal
-    //   .createStatic(FormEditComponent, { i: { id: 0 } })
-    //   .subscribe(() => this.st.reload());
-  }
-
-}
diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json
index 2bcf0d4b..1bf2380e 100644
--- a/src/assets/mocks/menu-data.json
+++ b/src/assets/mocks/menu-data.json
@@ -596,8 +596,7 @@
             },
             {
               "text": "轮播图管理",
-              "link": "/partner/scroll-img/list",
-              "hide": true
+              "link": "/partner/scroll-img/list"
             },
             {
               "text": "知识库管理",

From 97a3aca60c3574665e61623c2b50e88e4fba55ac Mon Sep 17 00:00:00 2001
From: Lingzi <yinyan.quan@eascs.com>
Date: Mon, 14 Mar 2022 18:18:23 +0800
Subject: [PATCH 45/70] fix bug

---
 .../banner/components/add/add.component.html  |  24 ++
 .../components/add/add.component.spec.ts      |  24 ++
 .../banner}/components/add/add.component.ts   | 132 +++-------
 .../banner}/components/add/add.less           |   0
 .../components/list/list.component.html       |  62 +++++
 .../components/list/list.component.less       |   0
 .../components/list/list.component.spec.ts    |  24 ++
 .../banner/components/list/list.component.ts  | 237 +++++++++++++++++
 .../banner}/components/list/list.less         |   0
 .../banner/services/banner.service.ts         |  12 +
 .../routes/partner/partner-routing.module.ts  |  21 +-
 src/app/routes/partner/partner.module.ts      |  10 +-
 .../components/add/add.component.html         |   0
 .../components/add/add.component.spec.ts      |   0
 .../scrollimg/components/add/add.component.ts | 243 ++++++++++++++++++
 .../partner/scrollimg/components/add/add.less | 119 +++++++++
 .../components/list/list.component.html       |   4 +-
 .../components/list/list.component.less       |   1 +
 .../components/list/list.component.spec.ts    |   0
 .../components/list/list.component.ts         |   0
 .../scrollimg/components/list/list.less       |   9 +
 .../services/scrollimg.service.ts             |   0
 .../components/freight/list/list.component.ts |  66 ++++-
 src/assets/mocks/menu-data.json               |   6 +-
 24 files changed, 882 insertions(+), 112 deletions(-)
 create mode 100644 src/app/routes/partner/knowledge/banner/components/add/add.component.html
 create mode 100644 src/app/routes/partner/knowledge/banner/components/add/add.component.spec.ts
 rename src/app/routes/partner/{ad => knowledge/banner}/components/add/add.component.ts (63%)
 rename src/app/routes/partner/{ad => knowledge/banner}/components/add/add.less (100%)
 create mode 100644 src/app/routes/partner/knowledge/banner/components/list/list.component.html
 rename src/app/routes/partner/{ad => knowledge/banner}/components/list/list.component.less (100%)
 create mode 100644 src/app/routes/partner/knowledge/banner/components/list/list.component.spec.ts
 create mode 100644 src/app/routes/partner/knowledge/banner/components/list/list.component.ts
 rename src/app/routes/partner/{ad => knowledge/banner}/components/list/list.less (100%)
 create mode 100644 src/app/routes/partner/knowledge/banner/services/banner.service.ts
 rename src/app/routes/partner/{ad => scrollimg}/components/add/add.component.html (100%)
 rename src/app/routes/partner/{ad => scrollimg}/components/add/add.component.spec.ts (100%)
 create mode 100644 src/app/routes/partner/scrollimg/components/add/add.component.ts
 create mode 100644 src/app/routes/partner/scrollimg/components/add/add.less
 rename src/app/routes/partner/{ad => scrollimg}/components/list/list.component.html (94%)
 create mode 100644 src/app/routes/partner/scrollimg/components/list/list.component.less
 rename src/app/routes/partner/{ad => scrollimg}/components/list/list.component.spec.ts (100%)
 rename src/app/routes/partner/{ad => scrollimg}/components/list/list.component.ts (100%)
 create mode 100644 src/app/routes/partner/scrollimg/components/list/list.less
 rename src/app/routes/partner/{ad => scrollimg}/services/scrollimg.service.ts (100%)

diff --git a/src/app/routes/partner/knowledge/banner/components/add/add.component.html b/src/app/routes/partner/knowledge/banner/components/add/add.component.html
new file mode 100644
index 00000000..6760c1a0
--- /dev/null
+++ b/src/app/routes/partner/knowledge/banner/components/add/add.component.html
@@ -0,0 +1,24 @@
+<!-- 页头 -->
+<page-header-wrapper [title]="''" [logo]="logo">
+  <ng-template #logo>
+    <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
+      <i nz-icon nzType="left" nzTheme="outline"></i>
+    </button>
+  </ng-template>
+</page-header-wrapper>
+<nz-card>
+  <div class="modal-header">
+    <div class="modal-title" *ngIf="queryParams.type === 'add'">新增banner</div>
+    <div class="modal-title" *ngIf="queryParams.type === 'edit'">编辑banner</div>
+    <div class="modal-title" *ngIf="queryParams.type === 'view'">查看banner</div>
+  </div>
+    <sf #sf [schema]="schema" [ui]="ui" [button]="'none'" [formData]="detailData">
+    </sf>
+  <div class="modal-footer" *ngIf="queryParams.type !== 'view'">
+    <button nz-button type="button" (click)="checkSort()" nzType="primary" [disabled]="validFalg">保存</button>
+    <button nz-button type="button" (click)="goBack()">取消</button>
+  </div>
+</nz-card>
+<!-- <nz-modal [(nzVisible)]="isVisible" nzTitle="The first Modal" (nzOnCancel)="handleCancel()" (nzOnOk)="handleOk()">
+  <baidu-map [inputAddress]="detailData.companyAddress" [inputPoint]="inputPoint" (outputPointAddress)="outputPointAddress($event)"></baidu-map>
+</nz-modal> -->
\ No newline at end of file
diff --git a/src/app/routes/partner/knowledge/banner/components/add/add.component.spec.ts b/src/app/routes/partner/knowledge/banner/components/add/add.component.spec.ts
new file mode 100644
index 00000000..64562645
--- /dev/null
+++ b/src/app/routes/partner/knowledge/banner/components/add/add.component.spec.ts
@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { BannerComponentsAddComponent } from './add.component';
+
+describe('BannerComponentsAddComponent', () => {
+  let component: BannerComponentsAddComponent;
+  let fixture: ComponentFixture<BannerComponentsAddComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ BannerComponentsAddComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(BannerComponentsAddComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/routes/partner/ad/components/add/add.component.ts b/src/app/routes/partner/knowledge/banner/components/add/add.component.ts
similarity index 63%
rename from src/app/routes/partner/ad/components/add/add.component.ts
rename to src/app/routes/partner/knowledge/banner/components/add/add.component.ts
index f719a83a..132e6bb2 100644
--- a/src/app/routes/partner/ad/components/add/add.component.ts
+++ b/src/app/routes/partner/knowledge/banner/components/add/add.component.ts
@@ -1,6 +1,6 @@
 import { ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import { SFComponent, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
+import { SFComponent, SFRadioWidgetSchema, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
 import { ModalHelper, _HttpClient } from '@delon/theme';
 import { EAEnvironmentService } from '@shared';
 import differenceInCalendarDays from 'date-fns/differenceInCalendarDays';
@@ -9,7 +9,7 @@ import { NzMessageService } from 'ng-zorro-antd/message';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { NzUploadFile } from 'ng-zorro-antd/upload';
 import { Observable, Observer, of } from 'rxjs';
-import { ScrollImgService } from '../../services/scrollimg.service';
+import { BannerService } from '../../services/banner.service';
 import { apiConf } from '@conf/api.conf';
 
 @Component({
@@ -17,7 +17,7 @@ import { apiConf } from '@conf/api.conf';
   templateUrl: './add.component.html',
   styleUrls: ['./add.less']
 })
-export class ScrollimgComponentsAddComponent implements OnInit {
+export class BannerComponentsAddComponent implements OnInit {
   @ViewChild('sf', { static: false }) sf!: SFComponent;
   record: any = {};
   i: any;
@@ -51,11 +51,9 @@ export class ScrollimgComponentsAddComponent implements OnInit {
   constructor(
     public msgSrv: NzMessageService,
     public http: _HttpClient,
-    public service: ScrollImgService,
+    public service: BannerService,
     private route: ActivatedRoute,
     private router: Router,
-    private modal: ModalHelper,
-    private modalSrv: NzModalService,
     private cdr: ChangeDetectorRef,
     private envSrv: EAEnvironmentService,
   ) { }
@@ -76,25 +74,16 @@ export class ScrollimgComponentsAddComponent implements OnInit {
       properties: {
         name: {
           type: 'string',
-          title: '轮播图名称',
+          title: 'banner名称',
           maxLength: 10,
           ui: {
             showRequired: true,
             placeholder: '请不要超过10个字',
           }
         },
-        style: {
-          type: 'string',
-          title: '轮播图',
-          ui: {
-            showRequired: true,
-            widget: 'custom',
-            placeholder: '请选择轮播图',
-          }
-        },
         licensePhotoWatermark: {
           type: 'string',
-          title: '轮播图',
+          title: 'banner图',
           ui: {
             action: apiConf.fileUpload,
             accept: 'image/png,image/jpeg,image/jpg,image/gif',
@@ -103,7 +92,7 @@ export class ScrollimgComponentsAddComponent implements OnInit {
             resReName: 'data.fullFileWatermarkPath',
             urlReName: 'data.fullFileWatermarkPath',
             widget: 'upload',
-            descriptionI18n: '图片支持jpg、jpeg、png、gif格式，大小不超过4M',
+            descriptionI18n: '支持JPG、PNG格式，文件小于2M（建议尺寸  700px *  286px）。',
             data: {
               appId: this.envSrv.env.appId,
             },
@@ -117,9 +106,9 @@ export class ScrollimgComponentsAddComponent implements OnInit {
             },
             beforeUpload: (file: any, _fileList: any) => {
               return new Observable((observer: Observer<boolean>) => {
-                const isLt4M = file.size / 1024 / 1024 < 4;
+                const isLt4M = file.size / 1024 / 1024 < 2;
                 if (!isLt4M) {
-                  this.service.msgSrv.warning('图片大小超过4M!');
+                  this.service.msgSrv.warning('图片大小超过2M!');
                   observer.complete();
                   return;
                 }
@@ -130,96 +119,43 @@ export class ScrollimgComponentsAddComponent implements OnInit {
             previewFile: (file: NzUploadFile) => of(file.url),
           },
         },
-        takeEffectType: {
-          type: 'string',
-          title: '生效类型',
-          ui: {
-            showRequired: true,
-            widget: 'custom',
-          },
-          default: 1
-        },
-        mainTitle: {
-          type: 'string',
-          title: '主标题',
-          maxLength: 20,
-          ui: {
-            visibleIf: { style: [1, 2, 3, 4, 5] },
-            placeholder: '请输入主标题，不超过20个字',
-            change: (id: any) => {
-              this.validFalg = !this.sf?.valid;
-            }
-          }
-        },
-        withTitle: {
-          type: 'string',
-          title: '副标题',
-          maxLength: 20,
-          ui: {
-            visibleIf: { style: [1, 2, 3, 4, 5] },
-            placeholder: '请输入主标题，不超过20个字',
-          }
-        },
         sortId: {
           type: 'string',
-          title: '显示顺序',
+          title: '顺序',
           ui: {
             showRequired: true,
-            widget: 'select',
+            widget: '=',
+            placeholder: '请输入0~99，数字越大，排序越靠前',
             serverSearch: true,
           } as SFSelectWidgetSchema,
+        },
+        linkType: {
+          type: 'string',
+          title: '跳转路径',
+          ui: {
+            widget: 'radio',
+            showRequired: true,
+          } as SFRadioWidgetSchema,
           enum: [
-            { label: 1, value: '1' },
-            { label: 2, value: '2' },
-            { label: 3, value: '3' },
-            { label: 4, value: '4' },
-            { label: 5, value: '5' },
-            { label: 6, value: '6' },
-            { label: 7, value: '7' },
-            { label: 8, value: '8' },
-            { label: 9, value: '9' },
-            { label: 10, value: '10' },
-          ]
+            { label: '文章ID', value: 1 },
+            { label: '分类ID', value: 2 },
+            { label: '自编辑', value: 3 },
+          ],
         },
-        cooperationHotline: {
+        content: {
           type: 'string',
-          title: '合作热线',
-          maxLength: 13,
+          title: '内容',
           ui: {
-            showRequired: true,
-            placeholder: '请输入电话号码',
-            visibleIf: { style: [6] },
-            validator: val => {
-              const reg = /((\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$)/g;
-              let isValid: any;
-              isValid = reg.test(val);
-              if (!isValid) {
-              return [{ keyword: 'required', message: '格式不正确' }];
-              }
-              return [];
+            widget: 'tinymce',
+            loadingTip: 'loading...',
+            config: {
+              height: 450
             },
+            visibleIf: { name5: (value: string) => value === '1' }
           },
         },
-        companyAddress: {
-          type: 'string',
-          title: '公司选址',
-          ui: {
-            widget: 'custom',
-            showRequired: true,
-            visibleIf: { style: [6] },
-          },
-        },
-        advertisementContentDTOList: {
-          type: 'string',
-          title: '内容设置',
-          ui: {
-            widget: 'custom',
-            showRequired: true,
-            visibleIf: { style: [1, 2, 3, 4, 5] },
-          },
-        }
       },
-      required: ['name', 'navigationId', 'style', 'takeEffectType', 'cooperationHotline', 'companyAddress', 'advertisementContentDTOList'],
+      required: [],
     };
     if (this.queryParams.type === 'add'){
       setTimeout(() => {
@@ -302,8 +238,4 @@ export class ScrollimgComponentsAddComponent implements OnInit {
   handleCancel(): void {
     this.isVisible = false;
   }
-  outputPointAddress(data: any){
-    this.sf.setValue('/companyAddress', data.address);
-    this.inputPoint = data.inputPoint;
-  }
 }
diff --git a/src/app/routes/partner/ad/components/add/add.less b/src/app/routes/partner/knowledge/banner/components/add/add.less
similarity index 100%
rename from src/app/routes/partner/ad/components/add/add.less
rename to src/app/routes/partner/knowledge/banner/components/add/add.less
diff --git a/src/app/routes/partner/knowledge/banner/components/list/list.component.html b/src/app/routes/partner/knowledge/banner/components/list/list.component.html
new file mode 100644
index 00000000..c8ac5ec4
--- /dev/null
+++ b/src/app/routes/partner/knowledge/banner/components/list/list.component.html
@@ -0,0 +1,62 @@
+<!-- 页头 -->
+<page-header-wrapper [title]="''"></page-header-wrapper>
+<nz-card>
+    <!-- 搜索表单 -->
+    <div nz-row [nzGutter]="16">
+        <!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
+        <div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
+            <sf #sf [schema]="schema" [ui]="ui" [mode]="'search'" [disabled]="!sf?.valid" [loading]="false"></sf>
+        </div>
+
+        <!-- 查询字段大于3个时，根据展开状态调整布局 -->
+        <ng-container *ngIf="queryFieldCount > 4">
+            <div nz-col [nzSpan]="_$expand ? 24 : 18">
+                <sf #sf [schema]="schema" [ui]="ui" [button]="'none'"></sf>
+            </div>
+            <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
+                <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="false" (click)="st.load()">查询</button>
+                <button nz-button (click)="resetSF()">重置</button>
+                <button nz-button nzType="link" (click)="expandToggle()">
+                    {{ !_$expand ? '展开' : '收起' }}
+                    <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
+                </button>
+            </div>
+        </ng-container>
+    </div>
+
+    <!-- 工具栏 -->
+    <div nz-row>
+        <div nz-col nzSpan="24">
+            <button nz-button nzType="primary" (click)="add()">新增banner</button>
+        </div>
+    </div>
+
+    <!-- 提示栏 -->
+    <div nz-row>
+        <div nz-col nzSpan="24">
+            <nz-alert
+                    nzType="info"
+                    [nzMessage]="'当前共' + (st?.total || 0) + '行记录，选中' + selectedRows.length + '行'"
+                    nzShowIcon
+                    [ngStyle]="{ margin: '1rem 0' }"
+            >
+            </nz-alert>
+        </div>
+    </div>
+
+    <!-- 数据列表 -->
+    <st
+            #st
+            multiSort
+            size="small"
+            [bordered]="true"
+            [scroll]="{ x: '2000px' }"
+            [data]="service.$api_get_page"
+            [columns]="columns"
+            [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+            [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+            [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+            [loadingDelay]="500"
+            [loading]="service.http.loading"
+    ></st>
+</nz-card>
diff --git a/src/app/routes/partner/ad/components/list/list.component.less b/src/app/routes/partner/knowledge/banner/components/list/list.component.less
similarity index 100%
rename from src/app/routes/partner/ad/components/list/list.component.less
rename to src/app/routes/partner/knowledge/banner/components/list/list.component.less
diff --git a/src/app/routes/partner/knowledge/banner/components/list/list.component.spec.ts b/src/app/routes/partner/knowledge/banner/components/list/list.component.spec.ts
new file mode 100644
index 00000000..3bd8060c
--- /dev/null
+++ b/src/app/routes/partner/knowledge/banner/components/list/list.component.spec.ts
@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { BannerComponentsListComponent } from './list.component';
+
+describe('BannerComponentsListComponent', () => {
+  let component: BannerComponentsListComponent;
+  let fixture: ComponentFixture<BannerComponentsListComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ BannerComponentsListComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(BannerComponentsListComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/routes/partner/knowledge/banner/components/list/list.component.ts b/src/app/routes/partner/knowledge/banner/components/list/list.component.ts
new file mode 100644
index 00000000..e1b86f66
--- /dev/null
+++ b/src/app/routes/partner/knowledge/banner/components/list/list.component.ts
@@ -0,0 +1,237 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { STColumn, STComponent, STData } from '@delon/abc/st';
+import { SFComponent, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
+import { ModalHelper } from '@delon/theme';
+import { NzMessageService } from 'ng-zorro-antd/message';
+import { NzModalService } from 'ng-zorro-antd/modal';
+import { BannerService } from '../../services/banner.service';
+
+@Component({
+  selector: 'app-banner-components-list',
+  templateUrl: './list.component.html',
+  styleUrls: ['./list.component.less']
+})
+
+export class BannerComponentsListComponent implements OnInit {
+  schema: SFSchema = {};
+  columns: STColumn[] = [];
+  ui: SFUISchema = {};
+  appList: any[] = [];
+  _$expand = false;
+  selectApp = {
+    appName: '',
+    appId: ''
+  };
+
+  @ViewChild('st', { static: false }) st!: STComponent;
+  @ViewChild('sf', { static: false }) sf!: SFComponent;
+  constructor(public service: BannerService, private modal: ModalHelper, private msg: NzMessageService, private router: Router, private modalSrv: NzModalService,  private ar: ActivatedRoute) { }
+
+  /**
+   * 查询字段个数
+   */
+  get queryFieldCount(): number {
+    return Object.keys(this.schema?.properties || {}).length;
+  }
+
+  /**
+   * 查询参数
+   */
+  get reqParams() {
+    const params = Object.assign({}, this.sf?.value || {});
+    delete params._$expand;
+    if (params.status === '') {
+      delete params.status;
+    }
+    if (params.style === '') {
+      delete params.style;
+    }
+    if (params.navigationId === '') {
+      delete params.navigationId;
+    }
+    return { ...params};
+  }
+
+  /**
+   * 选中行
+   */
+  get selectedRows() {
+    return this.st?.list.filter((item) => item.checked) || [];
+  }
+  ngOnInit() {
+    this.initSF();
+    this.initST();
+  }
+  selectAppFun(item: any) {
+    this.selectApp = item;
+    this.st.load(1);
+  }
+  dataProcess(data: STData[]): STData[] {
+    return data.map((i, index) => {
+      i.showSortFlag = false;
+      return i;
+    });
+  }
+  initSF() {
+    this.schema = {
+      properties: {
+        _$expand: {
+          type: 'boolean',
+          ui: {
+            hidden: true,
+          },
+        },
+        name: {
+          type: 'string',
+          title: 'banner名称',
+          maxLength: 10,
+          ui: {
+            widget: '',
+            placeholder: '请输入',
+          }
+        },
+        status: {
+          type: 'string',
+          title: '状态',
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            allowClear: true,
+          } as SFSelectWidgetSchema,
+          enum: [
+            { label: '全部', value: 1 },
+            { label: '正常', value: 2 },
+            { label: '禁用', value: 3 }
+          ]
+        },
+      },
+    };
+    this.ui = {
+      '*': {
+        spanLabelFixed: 110,
+        grid: { span: 8 },
+      },
+    };
+  }
+
+  initST() {
+    this.columns = [
+      {
+        title: 'banner名称', // 位:px
+        index: 'name',
+        className: 'text-center'
+      },
+      {
+        title: 'banner',
+        index: 'navigationName',
+        className: 'text-center'
+      },
+      {
+        title: '排序', // 位 px
+        index: 'sortId',
+        className: 'text-center'
+      },
+      {
+        title: '状态', // 位 px
+        index: 'style',
+        className: 'text-center',
+        type: 'enum',
+        enum: { 
+          1: '正常',
+          2: '禁用',
+        }
+      },
+      {
+        title: '最后修改时间', // 位 px
+        index: 'createTime',
+        className: 'text-center'
+      },
+      {
+        title: '操作',
+        fixed: 'right',
+        className: 'text-center',
+        width: 280,
+        buttons: [
+          {
+            text: '修改',
+            click: (item) => {
+              this.router.navigate(['../detail'], { queryParams: { id: item.id, type: 'edit' }, relativeTo: this.ar });
+            }
+          },
+          {
+            text: '禁用',
+            pop: {
+              title: `确定禁用此banner图吗？？`,
+              okType: 'danger',
+              icon: 'alert',
+            },
+            click: (item) => {
+              this.changeStatus(item.id);
+            },
+            iif: (item) => item.status === 1
+          },
+          {
+            text: '启用',
+            pop: {
+              title: `确定启用此banner图吗？`,
+              okType: 'danger',
+              icon: 'success',
+            },
+            click: (item) => {
+              this.changeStatus(item);
+            },
+            iif: (item) => item.status === 2
+          },
+        ],
+      },
+    ];
+  }
+  changeStatus(item: any) {
+    const params = {
+      status,
+      idList: [item.id]
+    };
+    // this.service.request(this.service.$api_openOrClose, params).subscribe(res => {
+    //   if (res) {
+    //     this.st.reload();
+    //   }
+    // });
+  }
+  /**
+   * 伸缩查询条件
+   */
+  expandToggle() {
+    this._$expand = !this._$expand;
+    this.sf?.setValue('/_$expand', this._$expand);
+  }
+
+  /**
+   * 重置表单
+   */
+  resetSF() {
+    this.sf.reset();
+    this._$expand = false;
+  }
+
+  /**
+   * 新增单个实例
+   */
+  add() {
+    this.router.navigate(['../banner/detail'], { queryParams: { id: 0, type: 'add' }, relativeTo: this.ar });
+  }
+
+  /**
+   * 删除单个实例
+   */
+  del(item: any) {
+    const ids = [];
+    ids.push(item.id);
+    this.service.request(this.service.$api_del_many, ids).subscribe(res => {
+      if (res) {
+        this.service.msgSrv.success('删除成功');
+        this.st.reload();
+      }
+    });
+  }
+}
diff --git a/src/app/routes/partner/ad/components/list/list.less b/src/app/routes/partner/knowledge/banner/components/list/list.less
similarity index 100%
rename from src/app/routes/partner/ad/components/list/list.less
rename to src/app/routes/partner/knowledge/banner/components/list/list.less
diff --git a/src/app/routes/partner/knowledge/banner/services/banner.service.ts b/src/app/routes/partner/knowledge/banner/services/banner.service.ts
new file mode 100644
index 00000000..6710ef04
--- /dev/null
+++ b/src/app/routes/partner/knowledge/banner/services/banner.service.ts
@@ -0,0 +1,12 @@
+import { Injectable, Injector } from '@angular/core';
+import { BaseService } from '@shared';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class BannerService extends BaseService {
+
+  constructor(public injector: Injector) {
+    super(injector);
+  }
+}
diff --git a/src/app/routes/partner/partner-routing.module.ts b/src/app/routes/partner/partner-routing.module.ts
index 2c25d6d6..6f0e0cc6 100644
--- a/src/app/routes/partner/partner-routing.module.ts
+++ b/src/app/routes/partner/partner-routing.module.ts
@@ -38,10 +38,13 @@ import { AddPersonalPartnerComponent } from './partner-list/components/add-perso
 import { PartnerDetailComponent } from './partner-list/components/partner-detail/partner-detail.component';
 import { PartnerListComponent } from './partner-list/components/index/partner-list.component';
 import { ParterRebateManageMentAddComponent } from './rebate-management/components/rebate-setting/add/add.component';
-import { ScrollImgComponentsListComponent } from './ad/components/list/list.component';
 import { PartnerKnowledgeClassificationListComponent } from './knowledge/classification/components/list/list.component';
 import { ParterArticleManagementListComponent } from './article-management/components/list/list.component';
 import { ParterArticleManagementEditComponent } from './article-management/components/edit/edit.component';
+import { ScrollImgComponentsListComponent } from './scrollimg/components/list/list.component';
+import { BannerComponentsListComponent } from './knowledge/banner/components/list/list.component';
+import { ScrollimgComponentsAddComponent } from './scrollimg/components/add/add.component';
+import { BannerComponentsAddComponent } from './knowledge/banner/components/add/add.component';
 
 const routes: Routes = [
   {
@@ -122,6 +125,14 @@ const routes: Routes = [
       { path: 'partner-detail', component: ParterClaimAuditListPartnerDetailComponent }
     ]
   },
+  {
+    path: 'scroll-img',
+    children: [
+      { path: '', component: ScrollImgComponentsListComponent },
+      { path: 'list', component: ScrollImgComponentsListComponent },
+      { path: 'detail', component: ScrollimgComponentsAddComponent },
+    ]
+  },
   {
     path: 'recorded',
     children: [
@@ -133,9 +144,11 @@ const routes: Routes = [
     path: 'knowledge',
     children: [
       { path: 'classification', component: PartnerKnowledgeClassificationListComponent },
-      { path: 'article-management-list', component: ParterArticleManagementListComponent},
-      { path: 'article-management-add', component: ParterArticleManagementEditComponent},
-      { path: 'article-management-edit', component: ParterArticleManagementEditComponent},
+      { path: 'article-management-list', component: ParterArticleManagementListComponent },
+      { path: 'article-management-add', component: ParterArticleManagementEditComponent },
+      { path: 'article-management-edit', component: ParterArticleManagementEditComponent },
+      { path: 'banner', component: BannerComponentsListComponent},
+      { path: 'banner/detail', component: BannerComponentsAddComponent },
     ]
   },
 ];
diff --git a/src/app/routes/partner/partner.module.ts b/src/app/routes/partner/partner.module.ts
index aee0c691..3ce63eef 100644
--- a/src/app/routes/partner/partner.module.ts
+++ b/src/app/routes/partner/partner.module.ts
@@ -50,12 +50,14 @@ import { ParterRebateManageMenAbnormalFeedbackComponent } from './rebate-managem
 import { PartnerRecordedDetailComponent } from './recorded/components/detail/detail.component';
 import { PartnerRecordedRecordComponent } from './recorded/components/record/record.component';
 import { ParterRebateManageMentAddComponent } from './rebate-management/components/rebate-setting/add/add.component';
-import { ScrollImgComponentsListComponent } from './ad/components/list/list.component';
-import { ScrollimgComponentsAddComponent } from './ad/components/add/add.component';
 import { ParterArticleManagementEditComponent } from './article-management/components/edit/edit.component';
 import { ParterArticleManagementListComponent } from './article-management/components/list/list.component';
 import { PartnerKnowledgeClassificationListComponent } from './knowledge/classification/components/list/list.component';
 import { PartnerEditComponent } from './knowledge/classification/components/edit/edit.component';
+import { ScrollimgComponentsAddComponent } from './scrollimg/components/add/add.component';
+import { ScrollImgComponentsListComponent } from './scrollimg/components/list/list.component';
+import { BannerComponentsListComponent } from './knowledge/banner/components/list/list.component';
+import { BannerComponentsAddComponent } from './knowledge/banner/components/add/add.component';
 
 const COMPONENTS: any[] = [
   PartnerBusinessStatisticsIndexComponent,
@@ -101,7 +103,9 @@ const COMPONENTS: any[] = [
   ParterArticleManagementEditComponent,
   ParterArticleManagementListComponent,
   PartnerKnowledgeClassificationListComponent,
-  PartnerEditComponent
+  PartnerEditComponent,
+  BannerComponentsListComponent,
+  BannerComponentsAddComponent
 ];
 
 @NgModule({
diff --git a/src/app/routes/partner/ad/components/add/add.component.html b/src/app/routes/partner/scrollimg/components/add/add.component.html
similarity index 100%
rename from src/app/routes/partner/ad/components/add/add.component.html
rename to src/app/routes/partner/scrollimg/components/add/add.component.html
diff --git a/src/app/routes/partner/ad/components/add/add.component.spec.ts b/src/app/routes/partner/scrollimg/components/add/add.component.spec.ts
similarity index 100%
rename from src/app/routes/partner/ad/components/add/add.component.spec.ts
rename to src/app/routes/partner/scrollimg/components/add/add.component.spec.ts
diff --git a/src/app/routes/partner/scrollimg/components/add/add.component.ts b/src/app/routes/partner/scrollimg/components/add/add.component.ts
new file mode 100644
index 00000000..e8345d9e
--- /dev/null
+++ b/src/app/routes/partner/scrollimg/components/add/add.component.ts
@@ -0,0 +1,243 @@
+import { ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { SFComponent, SFRadioWidgetSchema, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
+import { _HttpClient } from '@delon/theme';
+import { EAEnvironmentService } from '@shared';
+import differenceInCalendarDays from 'date-fns/differenceInCalendarDays';
+import format from 'date-fns/format';
+import { NzMessageService } from 'ng-zorro-antd/message';
+import { NzUploadFile } from 'ng-zorro-antd/upload';
+import { Observable, Observer, of } from 'rxjs';
+import { apiConf } from '@conf/api.conf';
+import { ScrollImgService } from '../../services/scrollimg.service';
+
+@Component({
+  selector: 'app-ad-components-add',
+  templateUrl: './add.component.html',
+  styleUrls: ['./add.less']
+})
+export class ScrollimgComponentsAddComponent implements OnInit {
+  @ViewChild('sf', { static: false }) sf!: SFComponent;
+  record: any = {};
+  i: any;
+  schema: SFSchema = {};
+  contentListData = [];
+  queryParams: any = {};
+  oldTakeEffectTime = '';
+  maxSort = 0;
+  isVisible = false;
+  validFalg = true;
+  detailData: any = {
+    advertisementContentDTOList: []
+  };
+  changeTimeFlag = false;
+  currentIndex = 0;
+  addFlag = true;
+  addId = 1;
+  inputPoint: any = {
+    lng: 0,
+    lat: 0
+  };
+  today = new Date();
+  navData: any = [];
+  navigationName = '';
+  ui: SFUISchema = {
+    '*': {
+      spanLabelFixed: 200,
+      grid: { span: 24 },
+    },
+  };
+  constructor(
+    public msgSrv: NzMessageService,
+    public http: _HttpClient,
+    public service: ScrollImgService,
+    private route: ActivatedRoute,
+    private router: Router,
+    private envSrv: EAEnvironmentService,
+  ) { }
+
+
+  ngOnInit(): void {
+    this.queryParams = this.route.snapshot.queryParams;
+    if (this.queryParams.type !== 'add') {
+      this.initDetailData();
+    }
+    this.initSF();
+  }
+  initDetailData() {
+
+  }
+  initSF() {
+    this.schema = {
+      properties: {
+        name: {
+          type: 'string',
+          title: '轮播图名称',
+          maxLength: 10,
+          ui: {
+            showRequired: true,
+            placeholder: '请不要超过10个字',
+          }
+        },
+        licensePhotoWatermark: {
+          type: 'string',
+          title: '轮播图',
+          ui: {
+            action: apiConf.fileUpload,
+            accept: 'image/png,image/jpeg,image/jpg,image/gif',
+            limit: 1,
+            limitFileCount: 1,
+            resReName: 'data.fullFileWatermarkPath',
+            urlReName: 'data.fullFileWatermarkPath',
+            widget: 'upload',
+            descriptionI18n: '图片支持JPG、PNG格式，文件小于2M（建议尺寸 702px * 280px）',
+            data: {
+              appId: this.envSrv.env.appId,
+            },
+            name: 'multipartFile',
+            multiple: false,
+            listType: 'picture-card',
+            change: (args: any) => {
+              if (args.type === 'success') {
+                this.detailData.enterpriseBaseDTO.licensePhoto = args.file.response.data.fullFilePath
+              }
+            },
+            beforeUpload: (file: any, _fileList: any) => {
+              return new Observable((observer: Observer<boolean>) => {
+                const isLt4M = file.size / 1024 / 1024 < 2;
+                if (!isLt4M) {
+                  this.service.msgSrv.warning('图片大小超过2M!');
+                  observer.complete();
+                  return;
+                }
+                observer.next(isLt4M);
+                observer.complete();
+              });
+            },
+            previewFile: (file: NzUploadFile) => of(file.url),
+          },
+        },
+        linkType: {
+          type: 'string',
+          title: '可见范围',
+          ui: {
+            widget: 'radio',
+            showRequired: true,
+          } as SFRadioWidgetSchema,
+          enum: [
+            { label: '全部可见', value: 1 },
+            { label: '合伙人可见', value: 2 },
+            { label: '销售渠道可见', value: 3 },
+          ],
+        },
+        sortId: {
+          type: 'string',
+          title: '顺序',
+          ui: {
+            showRequired: true,
+            widget: '=',
+            placeholder: '请输入0~99，数字越大，排序越靠前',
+            serverSearch: true,
+          } as SFSelectWidgetSchema,
+        },
+        content: {
+          type: 'string',
+          title: '内容',
+          ui: {
+            widget: 'tinymce',
+            loadingTip: 'loading...',
+            config: {
+              height: 450
+            },
+            visibleIf: { name5: (value: string) => value === '1' }
+          },
+        },
+      },
+      required: [],
+    };
+    if (this.queryParams.type === 'add') {
+      setTimeout(() => {
+        this.sf.setValue('/takeEffectType', 1);
+        this.sf.setValue('/style', 1);
+      }, 500);
+    }
+  }
+  get reqParams() {
+    return {};
+  }
+  disabledDate = (current: Date): boolean => {
+    // Can not select days before today and today
+    return differenceInCalendarDays(current, this.today) < 0;
+  }
+  changeTime() {
+    this.changeTimeFlag = true;
+  }
+
+
+  checkSort() {
+    const params: any = {
+      navigationId: this.sf?.value.navigationId,
+      sortId: this.sf?.value.sortId,
+      takeEffectType: this.sf?.value.takeEffectType,
+    };
+    if (this.queryParams.id !== '0') {
+      params.advertisementId = this.queryParams.id;
+    }
+    if (this.sf.value.takeEffectType === 2) {
+      if (this.changeTimeFlag) {
+        params.takeEffectTime = format(this.detailData.takeEffectTime, 'yyyy-MM-dd HH:mm');
+      } else {
+        params.takeEffectTime = this.detailData.takeEffectTime;
+      }
+    }
+
+  }
+  save() {
+    const params: any = {
+      ...this.sf?.value,
+      latitude: this.inputPoint.lat,
+      longitude: this.inputPoint.lng,
+      id: this.queryParams.id
+    };
+    this.detailData.advertisementContentDTOList.forEach((item: any) => {
+      delete item.addId;
+    });
+    if (this.queryParams.type === 'add') {
+      delete params.id;
+    }
+    if (this.sf.value.takeEffectType === 2) {
+      if (this.changeTimeFlag) {
+        params.takeEffectTime = format(this.detailData.takeEffectTime, 'yyyy-MM-dd HH:mm');
+      } else {
+        params.takeEffectTime = this.detailData.takeEffectTime;
+      }
+    } else {
+      delete params.takeEffectTime;
+    }
+    this.service.request(this.service.$api_add_one, params).subscribe(res => {
+      if (res) {
+        this.service.msgSrv.success('保存成功');
+        this.router.navigate(['../list'], { relativeTo: this.route });
+      }
+    });
+  }
+
+  goBack() {
+    window.history.go(-1);
+  }
+  gotoMap() {
+    this.isVisible = true;
+  }
+
+  handleOk(): void {
+    this.isVisible = false;
+  }
+
+  handleCancel(): void {
+    this.isVisible = false;
+  }
+  outputPointAddress(data: any) {
+    this.sf.setValue('/companyAddress', data.address);
+    this.inputPoint = data.inputPoint;
+  }
+}
diff --git a/src/app/routes/partner/scrollimg/components/add/add.less b/src/app/routes/partner/scrollimg/components/add/add.less
new file mode 100644
index 00000000..0a6adacb
--- /dev/null
+++ b/src/app/routes/partner/scrollimg/components/add/add.less
@@ -0,0 +1,119 @@
+:host {
+    .styleBox {
+        display: flex;
+        align-items: flex-end;
+        margin: 10px 0 0 0;
+      }
+      .imgBox {
+        position: relative;
+        width: 200px;
+        padding: 6px 0;
+        text-align: center;
+        border: solid 1px #eee;
+        .leftBox,
+        .rightBox {
+          position: absolute;
+          top: 50%;
+          transform: translate(0, -50%);
+        }
+        img {
+          width: 170px;
+          height: 40px;
+        }
+        .leftBox {
+          left: 3px;
+        }
+        .rightBox {
+          right: 3px;
+        }
+      }
+      .imgBox_two {
+        width: 200px;
+        padding: 6px;
+        text-align: center;
+        border: solid 1px #eee;
+        img {
+          width: 100%;
+          height: 40px;
+        }
+      }
+      .imgBox_three {
+        width: 200px;
+        padding: 6px 0;
+        text-align: center;
+        border: solid 1px #eee;
+        img {
+          width: 25%;
+          height: 40px;
+          margin: 0 6% 0 0;
+          &:first-child {
+            margin: 0 6%;
+          }
+        }
+      }
+      .imgBox_four {
+        width: 200px;
+        padding: 6px 0;
+        text-align: center;
+        border: solid 1px #eee;
+        img {
+          width: 22%;
+          height: 40px;
+          margin: 0 2% 0 0;
+          &:first-child {
+            margin: 0 2%;
+          }
+        }
+      }
+      .imgBox_one {
+        width: 60px;
+        padding: 6px;
+        text-align: center;
+        border: solid 1px #eee;
+        img {
+          width: 100%;
+          height: 40px;
+        }
+      }
+      .imgBox_info {
+        width: 200px;
+        padding: 6px;
+        overflow: hidden;
+        border: solid 1px #eee;
+        .title {
+          width: 100%;
+          line-height: 30px;
+          text-align: center;
+        }
+        .infoBox {
+          .name {
+            line-height: 28px;
+          }
+          .map {
+            width: 100%;
+            text-align: center;
+            img {
+              width: 90%;
+            }
+          }
+        }
+      }
+      .hint {
+        margin: 0 0 0 10px;
+        color: #f00;
+      }
+      .addBtn {
+        margin: 0 0 10px 0;
+      }   
+  }
+  .overflowText {
+    display: -webkit-box;
+    max-width: 200px;
+    overflow: hidden;
+    text-align: left;
+    text-overflow: -o-ellipsis-lastline;
+    text-overflow: ellipsis;
+    -webkit-line-clamp: 1;
+    line-clamp: 1;
+    -webkit-box-orient: vertical;
+  }
\ No newline at end of file
diff --git a/src/app/routes/partner/ad/components/list/list.component.html b/src/app/routes/partner/scrollimg/components/list/list.component.html
similarity index 94%
rename from src/app/routes/partner/ad/components/list/list.component.html
rename to src/app/routes/partner/scrollimg/components/list/list.component.html
index caedd311..216788b4 100644
--- a/src/app/routes/partner/ad/components/list/list.component.html
+++ b/src/app/routes/partner/scrollimg/components/list/list.component.html
@@ -5,7 +5,7 @@
     <div nz-row [nzGutter]="16">
         <!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
         <div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
-            <sf #sf [schema]="schema" [ui]="ui" [mode]="'search'" [disabled]="!sf?.valid" [loading]="service.http.loading"></sf>
+            <sf #sf [schema]="schema" [ui]="ui" [mode]="'search'" [disabled]="!sf?.valid" [loading]="false"></sf>
         </div>
 
         <!-- 查询字段大于3个时，根据展开状态调整布局 -->
@@ -14,7 +14,7 @@
                 <sf #sf [schema]="schema" [ui]="ui" [button]="'none'"></sf>
             </div>
             <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
-                <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading" (click)="st.load()">查询</button>
+                <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="false" (click)="st.load()">查询</button>
                 <button nz-button (click)="resetSF()">重置</button>
                 <button nz-button nzType="link" (click)="expandToggle()">
                     {{ !_$expand ? '展开' : '收起' }}
diff --git a/src/app/routes/partner/scrollimg/components/list/list.component.less b/src/app/routes/partner/scrollimg/components/list/list.component.less
new file mode 100644
index 00000000..0aae2779
--- /dev/null
+++ b/src/app/routes/partner/scrollimg/components/list/list.component.less
@@ -0,0 +1 @@
+@import '~@delon/theme/index';
diff --git a/src/app/routes/partner/ad/components/list/list.component.spec.ts b/src/app/routes/partner/scrollimg/components/list/list.component.spec.ts
similarity index 100%
rename from src/app/routes/partner/ad/components/list/list.component.spec.ts
rename to src/app/routes/partner/scrollimg/components/list/list.component.spec.ts
diff --git a/src/app/routes/partner/ad/components/list/list.component.ts b/src/app/routes/partner/scrollimg/components/list/list.component.ts
similarity index 100%
rename from src/app/routes/partner/ad/components/list/list.component.ts
rename to src/app/routes/partner/scrollimg/components/list/list.component.ts
diff --git a/src/app/routes/partner/scrollimg/components/list/list.less b/src/app/routes/partner/scrollimg/components/list/list.less
new file mode 100644
index 00000000..d9b6c73f
--- /dev/null
+++ b/src/app/routes/partner/scrollimg/components/list/list.less
@@ -0,0 +1,9 @@
+.selectApp {
+    display: flex;
+    .appTitle {
+      font-size: 14px;
+    }
+  }
+  .redfont{
+    color: #f00;
+  }
\ No newline at end of file
diff --git a/src/app/routes/partner/ad/services/scrollimg.service.ts b/src/app/routes/partner/scrollimg/services/scrollimg.service.ts
similarity index 100%
rename from src/app/routes/partner/ad/services/scrollimg.service.ts
rename to src/app/routes/partner/scrollimg/services/scrollimg.service.ts
diff --git a/src/app/routes/usercenter/components/freight/list/list.component.ts b/src/app/routes/usercenter/components/freight/list/list.component.ts
index 8f071066..6f390a8c 100644
--- a/src/app/routes/usercenter/components/freight/list/list.component.ts
+++ b/src/app/routes/usercenter/components/freight/list/list.component.ts
@@ -90,7 +90,54 @@ export class FreightComponentsListComponent implements OnInit {
       nzFooter: null
     });
   }
-
+  showService(record: any) {
+    const modalRef = this.modal.create({
+      nzTitle: '分配客服人员',
+      //nzContent: PartnerEditComponent,
+      nzWidth: 600,
+      nzComponentParams: {
+        i: record
+      },
+      nzFooter: null
+    });
+    modalRef.afterClose.subscribe((res: any) => {
+      if (res) {
+        this.st.load(1);
+      }
+    });
+  }
+  editPartner(record: any) {
+    const modalRef = this.modal.create({
+      nzTitle: '修改合伙人',
+      //nzContent: PartnerEditComponent,
+      nzWidth: 600,
+      nzComponentParams: {
+        i: record
+      },
+      nzFooter: null
+    });
+    modalRef.afterClose.subscribe((res: any) => {
+      if (res) {
+        this.st.load(1);
+      }
+    });
+  }
+  editSale(record: any) {
+    const modalRef = this.modal.create({
+      nzTitle: '修改渠道销售',
+      //nzContent: PartnerEditComponent,
+      nzWidth: 600,
+      nzComponentParams: {
+        i: record
+      },
+      nzFooter: null
+    });
+    modalRef.afterClose.subscribe((res: any) => {
+      if (res) {
+        this.st.load(1);
+      }
+    });
+  }
   initSF() {
     this.schema = {
       properties: {
@@ -350,7 +397,7 @@ export class FreightComponentsListComponent implements OnInit {
         className: 'text-center',
         buttons: [
           {
-            text: '查看<br/>',
+            text: '查看',
             acl: { ability: ['USERCENTER-FREIGHT-LIST-view'] },
             click: item => {
               this.router.navigate(['./detail', item.id], { relativeTo: this.ar });
@@ -366,6 +413,21 @@ export class FreightComponentsListComponent implements OnInit {
             acl: { ability: ['USERCENTER-FREIGHT-LIST-balance'] },
             text: '资金账户',
             click: item => this.showAccountDetail(item)
+          },
+          {
+            acl: { ability: ['USERCENTER-FREIGHT-LIST-balance'] },
+            text: '分配客服人员',
+            click: item => this.showService(item)
+          },
+          {
+            acl: { ability: ['USERCENTER-FREIGHT-LIST-balance'] },
+            text: '修改合伙人',
+            click: item => this.editPartner(item)
+          },
+          {
+            acl: { ability: ['USERCENTER-FREIGHT-LIST-balance'] },
+            text: '修改渠道销售',
+            click: item => this.editSale(item)
           }
         ]
       }
diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json
index 057e03bd..82dcd221 100644
--- a/src/assets/mocks/menu-data.json
+++ b/src/assets/mocks/menu-data.json
@@ -602,7 +602,11 @@
               "group": true,
               "children": [{
                 "text": "banner管理",
-                "link": "/knowledge/banner"
+                "link": "/partner/knowledge/banner",
+                "children": [{
+                  "text": "新增banner",
+                  "link": "/partner/knowledge/banner/detail"
+                }]
               },
               {
                 "text": "文章管理",

From 87d1523c31fee6058b66204f290b2e1f31ca1658 Mon Sep 17 00:00:00 2001
From: Lingzi <yinyan.quan@eascs.com>
Date: Mon, 14 Mar 2022 18:23:35 +0800
Subject: [PATCH 46/70] fix bug

---
 .../list/carauth/carauth.component.html       |  34 +
 .../list/carauth/carauth.component.less       | 123 ++++
 .../list/carauth/carauth.component.spec.ts    |  24 +
 .../freight/list/carauth/carauth.component.ts | 654 ++++++++++++++++++
 4 files changed, 835 insertions(+)
 create mode 100644 src/app/routes/usercenter/components/freight/list/carauth/carauth.component.html
 create mode 100644 src/app/routes/usercenter/components/freight/list/carauth/carauth.component.less
 create mode 100644 src/app/routes/usercenter/components/freight/list/carauth/carauth.component.spec.ts
 create mode 100644 src/app/routes/usercenter/components/freight/list/carauth/carauth.component.ts

diff --git a/src/app/routes/usercenter/components/freight/list/carauth/carauth.component.html b/src/app/routes/usercenter/components/freight/list/carauth/carauth.component.html
new file mode 100644
index 00000000..1614cf91
--- /dev/null
+++ b/src/app/routes/usercenter/components/freight/list/carauth/carauth.component.html
@@ -0,0 +1,34 @@
+<div class="modal-header">
+    <div class="modal-title" *ngIf="i.flag === 'add'">车辆协助认证</div>
+    <div class="modal-title" *ngIf="i.flag !== 'add'">添加车辆</div>
+</div>
+<!-- <nz-spin *ngIf="!i" class="modal-spin"></nz-spin> -->
+<div class="sfBox">
+    <sf #sf [compact]="true" [ui]="ui" [schema]="schema" [button]="'none'" *ngIf="schema" [formData]="detailData">
+        <ng-template sf-template="tipsA" let-me let-ui="ui" let-schema="schema">
+            <div class="pr">
+                <dl class="tips">
+                    <dt>行驶证首页</dt>
+                    <dd>示例</dd>
+                </dl>
+                <div class="pa"><img width="190" src="/assets/images/driverfront.png" /></div>
+            </div>
+        </ng-template>
+        <ng-template sf-template="tipsB" let-me let-ui="ui" let-schema="schema">
+            <div class="pr">
+                <dl class="tips">
+                    <dt>行驶证副页</dt>
+                    <dd>示例</dd>
+                </dl>
+                <div class="pa"><img width="190" src="/assets/images/driverback.png" /></div>
+            </div>
+        </ng-template>
+    </sf>
+    <img class="drivercard" height="104" src="/assets/images/car.png" />
+    <img class="agreement" height="104" src="/assets/images/agreement.png" />
+    <img class="jopcard" height="104" src="/assets/images/road.png" />
+</div>
+<div class="modal-footer">
+    <button nz-button type="button" (click)="close()">关闭</button>
+    <button nz-button type="button" nzType="primary" (click)="submitForm()" [disabled]="!sf?.valid" [nzLoading]="checked">确定</button>
+</div>
\ No newline at end of file
diff --git a/src/app/routes/usercenter/components/freight/list/carauth/carauth.component.less b/src/app/routes/usercenter/components/freight/list/carauth/carauth.component.less
new file mode 100644
index 00000000..e3f1fc3f
--- /dev/null
+++ b/src/app/routes/usercenter/components/freight/list/carauth/carauth.component.less
@@ -0,0 +1,123 @@
+.sfBox {
+    position: relative;
+    .example {
+        position: absolute;
+        top: 215px;
+        right: 265px;
+        color: #1890ff;
+        cursor: pointer;
+        .popBox {
+            position: absolute;
+            top: -170px;
+            left: -125px;
+            width: 300px;
+            padding: 20px;
+            text-align: center;
+            background: #fff;
+            border: solid 1px #eee;
+            border-radius: 6px;
+            box-shadow: 0 1px 5px 1px #ececec;
+            &::before {
+                position: absolute;
+                bottom: -5px;
+                left: 50%;
+                width: 10px;
+                height: 10px;
+                margin-left: -5px;
+                background: #fff;
+                box-shadow: 0 1px 5px 1px #ececec;
+                transform: rotate(45deg);
+                content: '';
+            }
+            &::after {
+                position: absolute;
+                bottom: 0;
+                left: 0;
+                z-index: 10;
+                width: 100%;
+                height: 10px;
+                background: #fff;
+                content: '';
+            }
+            img {
+                max-width: 100%;
+                max-height: 200px;
+            }
+        }
+    }
+    .positionSet{
+        top: 356px;
+        right: 235px;
+    }
+    .positionSet01{
+        top: 500px;
+        right: 200px;
+    }
+    .positionSet02{
+        top: 664px;
+        right: 265px;
+    }
+    .positionSet03{
+        top: 808px;
+        right: 205px;
+    
+    }
+}
+.exaA{
+    position: absolute;
+    top: 0;
+    left: 300px
+}
+.pr {
+    position: relative;
+}
+
+.pa {
+    position: absolute;
+    top: 35px;
+    left: 150px;
+}
+
+.tips {
+    display: flex;
+    margin-bottom: 0;
+    color: #333;
+
+    dt {
+        width: 150px;
+    }
+
+    dd {
+        width: 190px;
+        margin-bottom: 0;
+        text-align: center;
+    }
+}
+.drivercard{
+    position: absolute;
+    top: 0;
+    left: 330px;
+    border: solid 1px #ebf0fb;
+}
+.jopcard{
+    position: absolute;
+    top: 1356px;
+    left: 330px;
+    border: solid 1px #ebf0fb;
+}
+.agreement{
+    position: absolute;
+    top: 425px;
+    left: 330px;
+    border: solid 1px #ebf0fb;
+}
+:host{
+    ::ng-deep {
+    .ant-input-borderless{
+        padding: 0;
+        padding-top: 4px;
+        color: black;
+        resize:none;
+      }
+    }
+  }
\ No newline at end of file
diff --git a/src/app/routes/usercenter/components/freight/list/carauth/carauth.component.spec.ts b/src/app/routes/usercenter/components/freight/list/carauth/carauth.component.spec.ts
new file mode 100644
index 00000000..8be64dc5
--- /dev/null
+++ b/src/app/routes/usercenter/components/freight/list/carauth/carauth.component.spec.ts
@@ -0,0 +1,24 @@
+import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import { CarCarauthComponent } from './carauth.component';
+
+describe('CarCarauthComponent', () => {
+  let component: CarCarauthComponent;
+  let fixture: ComponentFixture<CarCarauthComponent>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ CarCarauthComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CarCarauthComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/routes/usercenter/components/freight/list/carauth/carauth.component.ts b/src/app/routes/usercenter/components/freight/list/carauth/carauth.component.ts
new file mode 100644
index 00000000..a43173ea
--- /dev/null
+++ b/src/app/routes/usercenter/components/freight/list/carauth/carauth.component.ts
@@ -0,0 +1,654 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { apiConf } from '@conf/api.conf';
+import { cacheConf } from '@conf/cache.conf';
+import { SFUISchema, SFSchema, SFUploadWidgetSchema, SFComponent, SFSelectWidgetSchema } from '@delon/form';
+import { _HttpClient } from '@delon/theme';
+import { EACacheService, EAEnvironmentService } from '@shared';
+import { NzModalRef } from 'ng-zorro-antd/modal';
+import { NzUploadFile } from 'ng-zorro-antd/upload';
+import { Observable, Observer, of } from 'rxjs';
+import { ListService } from '../../services/list.service';
+
+@Component({
+  selector: 'app-car-carauth',
+  templateUrl: './carauth.component.html',
+  styleUrls: ['./carauth.component.less']
+})
+export class CarCarauthComponent implements OnInit {
+  @ViewChild('sf', { static: false }) sf!: SFComponent;
+  record: any = {};
+  i: any;
+  ui: SFUISchema = {};
+  schema: SFSchema = {};
+  showCardFlag = false;
+  showJopFlag = false;
+  companyData: any = {};
+  detailData: any = {};
+  carNo = ''
+  checked = false
+
+  constructor(
+    private modal: NzModalRef,
+    public service: ListService,
+    private envSrv: EAEnvironmentService,
+    private eaCacheSrv: EACacheService,
+  ) { }
+
+  ngOnInit(): void {
+    this.initData()
+    this.initSF()
+  }
+  initData() {
+    if(this.i.id){
+      this.companyData = this.eaCacheSrv.get(cacheConf.env)
+      const params = {
+        id: this.i.id
+      }
+      this.service.request(this.service.$api_getShipperCar, params).subscribe(res => {
+        this.detailData = res
+        this.detailData.isSelf = res.isSelf ? 1 : 0
+        this.detailData.isTrailer = res.isTrailer ? 1 : 0
+        this.detailData.carFrontPhotoWatermark = [
+          {
+            uid: -1,
+            name: 'LOGO',
+            status: 'done',
+            url: this.detailData.carFrontPhotoWatermark,
+            response:this.detailData.carFrontPhotoWatermark,
+          },
+        ];
+        this.detailData.carProtocalWatermark = [
+          {
+            uid: -1,
+            name: 'LOGO',
+            status: 'done',
+            url: this.detailData.carProtocalWatermark,
+            response: this.detailData.carProtocalWatermark,
+          },
+        ];
+        this.detailData.certificatePhotoFrontWatermark = [
+          {
+            uid: -1,
+            name: 'LOGO',
+            status: 'done',
+            url: this.detailData.certificatePhotoFrontWatermark,
+            response: this.detailData.certificatePhotoFrontWatermark,
+          },
+        ];
+        this.detailData.certificatePhotoBackWatermark = [
+          {
+            uid: -1,
+            name: 'LOGO',
+            status: 'done',
+            url: this.detailData.certificatePhotoBackWatermark,
+            response: this.detailData.certificatePhotoBackWatermark,
+          },
+        ];
+        if(this.detailData.roadTransportPhotoWatermark !== null) {
+          this.detailData.roadTransportPhotoWatermark = [
+            {
+              uid: -1,
+              name: 'LOGO',
+              status: 'done',
+              url: this.detailData.roadTransportPhotoWatermark,
+              response: this.detailData.roadTransportPhotoWatermark,
+            },
+          ];
+        }
+
+      })
+    }
+  }
+  initSF() {
+    this.schema = {
+      properties: {
+        carFrontPhotoWatermark: {
+          type: 'string',
+          title: '车头照照片',
+          ui: {
+            action: apiConf.fileUpload,
+            accept: 'image/png,image/jpeg,image/jpg,image/gif',
+            limit: 1,
+            limitFileCount: 1,
+            resReName: 'data.fullFileWatermarkPath',
+            urlReName: 'data.fullFileWatermarkPath',
+            widget: 'upload',
+            descriptionI18n: '请上传车头照照片，支持JPG、PNG格式，文件小于5M。',
+            data: {
+              appId: this.envSrv.env.appId,
+            },
+            name: 'multipartFile',
+            multiple: false,
+            listType: 'picture-card',
+            change: (args: any) => {
+              if (args.type === 'success') {
+                this.detailData.carFrontPhoto = args.file.response.data.fullFilePath
+              }
+            },
+            beforeUpload: (file: any, _fileList: any) => {
+              return new Observable((observer: Observer<boolean>) => {
+                const isLt2M = file.size / 1024 / 1024 < 5;
+                if (!isLt2M) {
+                  this.service.msgSrv.warning('图片大小超过5M!');
+                  observer.complete();
+                  return;
+                }
+                observer.next(isLt2M);
+                observer.complete();
+              });
+            },
+            previewFile: (file: NzUploadFile) => of(file.url),
+          },
+        },
+        carNo: {
+          title: '车牌号',
+          type: 'string',
+          maxLength: 9,
+          ui: {
+            placeholder: '请输入',
+          },
+        },
+        carNoColor: {
+          title: '车牌颜色',
+          type: 'string',
+          ui: {
+            widget: 'dict-select',
+            params: { dictKey: 'car:color' },
+            placeholder: '请选择车牌颜色',
+            containsAllLabel:false,
+          } as SFSelectWidgetSchema,
+        },
+        carModel: {
+          title: '车型',
+          type: 'string',
+          ui: {
+            widget: 'dict-select',
+            params: { dictKey: 'car:model' },
+            placeholder: '请选择车型',
+            containsAllLabel:false,
+          } as SFSelectWidgetSchema,
+        },
+        carLength: {
+          title: '车长',
+          type: 'string',
+          ui: {
+            widget: 'dict-select',
+            params: { dictKey: 'car:length' },
+            placeholder: '请选择车长',
+            containsAllLabel:false,
+          } as SFSelectWidgetSchema,
+        },
+        carLoad: {
+          title: '载重',
+          type: 'string',
+          ui: {
+            placeholder: '请输入',
+            change: (val: any) =>{
+              const value =  val.replace(/\D/g,'')
+              this.sf.setValue('/carLoad', value)
+            },
+          }
+        },
+        isSelf: {
+          title: '是否挂靠',
+          type: 'string',
+          enum: [
+            { label: '否', value: 0 },
+            { label: '是', value: 1 },
+          ],
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+          }
+        },
+        isTrailer: {
+          title: '是否为挂车',
+          type: 'string',
+          enum: [
+            { label: '否', value: 0 },
+            { label: '是', value: 1 },
+          ],
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+          }
+        },
+        carProtocalWatermark: {
+          type: 'string',
+          title: '挂靠协议',
+          ui: {
+            action: apiConf.fileUpload,
+            accept: 'image/png,image/jpeg,image/jpg,image/gif',
+            limit: 1,
+            limitFileCount: 1,
+            resReName: 'data.fullFileWatermarkPath',
+            urlReName: 'data.fullFileWatermarkPath',
+            widget: 'upload',
+            descriptionI18n: '请上传挂靠协议，支持JPG、PNG格式，文件小于5M。',
+            data: {
+              appId: this.envSrv.env.appId,
+            },
+            name: 'multipartFile',
+            multiple: false,
+            listType: 'picture-card',
+            change: (args: any) => {
+              if (args.type === 'success') {
+                this.detailData.certificatePhotoFront = args.file.response.data.fullFilePath
+              }
+            },
+            beforeUpload: (file: any, _fileList: any) => {
+              return new Observable((observer: Observer<boolean>) => {
+                const isLt2M = file.size / 1024 / 1024 < 5;
+                if (!isLt2M) {
+                  this.service.msgSrv.warning('图片大小超过5M!');
+                  observer.complete();
+                  return;
+                }
+                observer.next(isLt2M);
+                observer.complete();
+              });
+            },
+            previewFile: (file: NzUploadFile) => of(file.url),
+          },
+        },
+        titleA: {
+          title: '行驶证信息(必填）',
+          type: 'string',
+          ui: {
+            widget: 'textarea',
+            borderless:true,
+          },
+          default: '照片上传后会自动识别文字并填充下列内容栏',
+        },
+        tipsA: {
+          title: '',
+          type: 'string',
+          ui: {
+            widget: 'custom',
+            offsetControl: 6,
+          },
+        },
+        certificatePhotoFrontWatermark: {
+          type: 'string',
+          title: '行驶证首页照片',
+          ui: {
+            action: apiConf.fileUpload,
+            accept: 'image/png,image/jpeg,image/jpg,image/gif',
+            limit: 1,
+            limitFileCount: 1,
+            resReName: 'data.fullFileWatermarkPath',
+            urlReName: 'data.fullFileWatermarkPath',
+            widget: 'upload',
+            descriptionI18n: '请上传行驶证首页照片，支持JPG、PNG格式，文件小于5M。照片信息缺失、拼凑、过度PS、模糊不清，都不会通过审核。',
+            data: {
+              appId: this.envSrv.env.appId,
+            },
+            name: 'multipartFile',
+            multiple: false,
+            listType: 'picture-card',
+            change: (args: any) => {
+              if (args.type === 'success') {
+                this.detailData.certificatePhotoFront = args.file.response.data.fullFilePath
+                this.checkCarCard(args.file.response.data.fullFilePath, 'front');
+              }
+            },
+            beforeUpload: (file: any, _fileList: any) => {
+              return new Observable((observer: Observer<boolean>) => {
+                const isLt2M = file.size / 1024 / 1024 < 5;
+                if (!isLt2M) {
+                  this.service.msgSrv.warning('图片大小超过5M!');
+                  observer.complete();
+                  return;
+                }
+                observer.next(isLt2M);
+                observer.complete();
+              });
+            },
+          },
+        },
+        tipsB: {
+          title: '',
+          type: 'string',
+          ui: {
+            widget: 'custom',
+            offsetControl: 6,
+          },
+        },
+        certificatePhotoBackWatermark: {
+          type: 'string',
+          title: '行驶证副页照片',
+          ui: {
+            action: apiConf.fileUpload,
+            accept: 'image/png,image/jpeg,image/jpg,image/gif',
+            limit: 1,
+            limitFileCount: 1,
+            resReName: 'data.fullFileWatermarkPath',
+            urlReName: 'data.fullFileWatermarkPath',
+            widget: 'upload',
+            descriptionI18n: '请上传行驶证副业照片，支持JPG、PNG格式，文件小于5M。',
+            data: {
+              appId: this.envSrv.env.appId,
+            },
+            name: 'multipartFile',
+            multiple: false,
+            listType: 'picture-card',
+            change: (args: any) => {
+              if (args.type === 'success') {
+                this.detailData.certificatePhotoBack = args.file.response.data.fullFilePath
+                this.checkCarCard(args.file.response.data.fullFilePath, 'back');
+              }
+            },
+            beforeUpload: (file: any, _fileList: any) => {
+              return new Observable((observer: Observer<boolean>) => {
+                const isLt2M = file.size / 1024 / 1024 < 5;
+                if (!isLt2M) {
+                  this.service.msgSrv.warning('图片大小超过5M!');
+                  observer.complete();
+                  return;
+                }
+                observer.next(isLt2M);
+                observer.complete();
+              });
+            },
+            previewFile: (file: NzUploadFile) => of(file.url),
+          },
+        },
+        driverLicenseRegisterTime: {
+          title: '行驶证注册日期',
+          type: 'string',
+          format: 'date',
+          ui: {
+            placeholder: '请输入',
+          },
+        },
+        driverLicenseGetTime: {
+          title: '行驶证发证日期',
+          type: 'string',
+          format: 'date',
+          ui: {
+            placeholder: '请输入',
+          },
+        },
+        driverLicenseEndTime: {
+          title: '行驶证到期日期',
+          type: 'string',
+          format: 'date',
+          maxLength: 30,
+          ui: {
+            placeholder: '请输入',
+          },
+        },
+        driverLicenseSigningOrg: {
+          title: '行驶证签发机关',
+          type: 'string',
+          maxLength: 30,
+          ui: {
+            placeholder: '请输入',
+          },
+        },
+        carDistinguishCode: {
+          title: '车辆识别代码',
+          type: 'string',
+          maxLength: 30,
+          ui: {
+            placeholder: '请输入',
+          },
+        },
+        useNature: {
+          title: '使用性质',
+          type: 'string',
+          maxLength: 30,
+          enum: [
+            {label: '非营运', value: 0},
+            {label: '营运', value: 1},
+          ],
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+          },
+        },
+        curbWeight: {
+          title: '整备质量',
+          type: 'string',
+          ui: {
+            placeholder: '请输入',
+          },
+        },
+        carOwner: {
+          title: '所有人',
+          type: 'string',
+          maxLength: 30,
+          ui: {
+            placeholder: '请输入',
+          },
+        },
+        titleB: {
+          title: '道运证(选填）',
+          type: 'string',
+          ui: {
+            widget: 'text',
+          },
+          default: '照片上传后会自动识别文字并填充下列内容栏',
+        },
+        roadTransportPhotoWatermark: {
+          type: 'string',
+          title: '道运证照片',
+          ui: {
+            action: apiConf.fileUpload,
+            accept: 'image/png,image/jpeg,image/jpg,image/gif',
+            limit: 1,
+            limitFileCount: 1,
+            resReName: 'data.fullFileWatermarkPath',
+            urlReName: 'data.fullFileWatermarkPath',
+            widget: 'upload',
+            descriptionI18n: '请上传道运证照片，支持JPG、PNG格式，文件小于5M。蓝牌绿牌车辆，可不用传道运证',
+            data: {
+              appId: this.envSrv.env.appId,
+            },
+            name: 'multipartFile',
+            multiple: false,
+            listType: 'picture-card',
+            change: (args: any) => {
+              if (args.type === 'success') {
+                this.detailData.roadTransportPhoto = args.file.response.data.fullFilePath
+                this.checkTransCard(args.file.response.data.fullFilePath);
+              } else {
+                this.detailData.roadTransportPhoto = ''
+              }
+            },
+            beforeUpload: (file: any, _fileList: any) => {
+              return new Observable((observer: Observer<boolean>) => {
+                const isLt2M = file.size / 1024 / 1024 < 5;
+                if (!isLt2M) {
+                  this.service.msgSrv.warning('图片大小超过5M!');
+                  observer.complete();
+                  return;
+                }
+                observer.next(isLt2M);
+                observer.complete();
+              });
+            },
+            previewFile: (file: NzUploadFile) => of(file.url),
+          },
+        },
+        roadTransportNo: {
+          title: '道运证号码',
+          type: 'string',
+          maxLength: 30,
+          ui: {
+            // widget: this.detailData.commitFlag !== 0 ? 'text' : '',
+            placeholder: '请输入',
+          },
+        },
+        roadTransportLicenceNo: {
+          title: '经营许可证号',
+          type: 'string',
+          maxLength: 30,
+          ui: {
+            // widget: this.detailData.commitFlag !== 0 ? 'text' : '',
+            placeholder: '请输入',
+          },
+        },
+        roadTransportStartTime: {
+          title: '发证日期',
+          type: 'string',
+          format: 'date',
+          ui: {
+            placeholder: '请输入',
+          },
+        },
+        roadTransportEndTime: {
+          title: '有效期至',
+          type: 'string',
+          format: 'date',
+          ui: {
+            placeholder: '请输入',
+          },
+        },
+        remarks: {
+          title: '备注',
+          type: 'string',
+          ui: {
+            placeholder: '请输入',
+          },
+        },
+      },
+      required: [
+        'carFrontPhotoWatermark',
+        'carNo',
+        'carNoColor',
+        'carModel',
+        'carLength',
+        'carLoad',
+        'isSelf',
+        'isTrailer',
+        'certificatePhotoFrontWatermark',
+        'certificatePhotoBackWatermark',
+        'driverLicenseRegisterTime',
+        'driverLicenseGetTime',
+        'driverLicenseEndTime',
+        'driverLicenseSigningOrg',
+        'carDistinguishCode',
+        'useNature',
+        'carOwner'
+      ],
+    };
+
+    this.ui = {
+  '*': {
+    spanLabelFixed: 180,
+    grid: { span: 18 },
+    width: 600,
+  },
+  $title1: {
+    spanLabelFixed: 0,
+  },
+  $title2: {
+    spanLabelFixed: 0,
+  },
+  $title3: {
+    spanLabelFixed: 0,
+  },
+  $enterpriseRegistrationTime: {
+    width: 680,
+  },
+  $operatingEndTime: {
+    grid: { span: 9 },
+  },
+  $dateType: {
+    grid: { span: 4 },
+  },
+  $validEndTime: {
+    grid: { span: 9 },
+  },
+  $dateType01: {
+    grid: { span: 4 },
+  },
+  $registrationCapital: {
+    grid: { span: 12 },
+  },
+  $unit: {
+    spanLabelFixed: 20,
+    grid: { span: 3 },
+  },
+};
+  }
+// 道路运输证识别
+checkTransCard(imgurl: any) {
+  const params = {
+    transportationLicenseUrl: imgurl,
+  };
+  this.service.request(this.service.$api_recognizeTransportationLicense, params).subscribe((res) => {
+    if (res) {
+      this.sf.setValue('/roadTransportNo', res.number);
+      this.sf.setValue('/roadTransportLicenceNo', res.businessCertificate);
+      this.sf.setValue('/roadTransportStartTime', res.issueDate);
+      if(this.carNo === '') {
+        this.carNo = res.number
+      } else if(this.carNo && res.vehicleNumber.indexOf(this.carNo) === -1) {
+        this.service.msgSrv.warning('请上传同一认证车辆的相关证件')
+      }
+    }
+  });
+}
+// 行驶证识别
+checkCarCard(imgurl: any, side: any) {
+  const params = {
+    vehicleLicenseUrl: imgurl,
+    side,
+  };
+  this.service.request(this.service.$api_recognizeVehicleLicense, params).subscribe((res) => {
+    if (res) {
+      if (side === 'front') { // 正面
+        this.sf.setValue('/driverLicenseRegisterTime', res.registerDate);
+        this.sf.setValue('/carNo', res.number);
+        this.sf.setValue('/driverLicenseGetTime', res.issueDate);
+        this.sf.setValue('/driverLicenseSigningOrg', res.issuingAuthority);
+        this.sf.setValue('/carDistinguishCode', res.vin);
+        this.sf.setValue('/carOwner', res.name);
+        this.sf.setValue('/useNature', res.useCharacter === '非营运' ? 0 : 1 );
+      } else {
+        this.sf.setValue('/curbWeight', res.unladenMass);
+        this.sf.setValue('/remarks', res.remarks);
+      }
+      if(this.carNo === '') {
+        this.carNo = res.number
+      } else if(this.carNo && this.carNo !== res.number) {
+        this.service.msgSrv.warning('请上传同一认证车辆的相关证件')
+      }
+    }
+  });
+}
+
+close(): void {
+  this.modal.close(true)
+}
+showExample() {
+  this.showCardFlag = !this.showCardFlag
+}
+showJopExample() {
+  this.showJopFlag = !this.showJopFlag
+}
+submitForm(){
+  const params:any = {
+    appUserId: this.i.appUserId,
+    ...this.sf.value,
+    bindType: this.i.bindType
+  };
+  params.carFrontPhoto = this.detailData.carFrontPhoto
+  params.carProtocal = this.detailData.carProtocal
+  params.certificatePhotoFront = this.detailData.certificatePhotoFront
+  params.certificatePhotoBack = this.detailData.certificatePhotoBack
+  params.roadTransportPhoto = this.detailData.roadTransportPhoto
+  delete params.titleA
+  delete params.titleB
+  this.checked = true
+  this.service.request(this.service.$api_updateAssistCertification, params).subscribe(res => {
+    this.checked = false
+    if(res){
+      this.service.msgSrv.success('添加成功')
+      this.modal.close(true)
+    }
+  })
+}
+}

From 6ccb5ced18b477c9f2fe9df1a0fa92f1a30614ac Mon Sep 17 00:00:00 2001
From: TaricXin <583259872@qq.com>
Date: Tue, 15 Mar 2022 17:02:13 +0800
Subject: [PATCH 47/70] e

---
 src/app/core/startup/startup.service.ts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/app/core/startup/startup.service.ts b/src/app/core/startup/startup.service.ts
index 5c3efc42..04aef8a0 100644
--- a/src/app/core/startup/startup.service.ts
+++ b/src/app/core/startup/startup.service.ts
@@ -49,9 +49,9 @@ export class StartupService {
       let data;
       if (this.coreSrv.loginStatus) {
         // 本地菜单
-        data = this.loadMockData();
+        // data = this.loadMockData();
         // 远程菜单
-        // data = this.loadRemoteData();
+        data = this.loadRemoteData();
       } else {
         data = this.loadMockData();
       }
@@ -134,12 +134,12 @@ export class StartupService {
     const userData = this.httpClient.post(this.userSrv.$api_get_user_by_token, {}).pipe(map((res: any) => res.data));
 
     // 菜单数据
-    const menuData = this.httpClient
-      .post(this.coreSrv.$api_get_current_user_menus, {
-        appId: this.coreSrv.envSrv.getEnvironment().appId
-      })
-      .pipe(map((res: any) => res.data));
-    // const menuData = this.httpClient.get('assets/mocks/menu-data.json').pipe(map((res: any) => res.data.menu));
+    // const menuData = this.httpClient
+    //   .post(this.coreSrv.$api_get_current_user_menus, {
+    //     appId: this.coreSrv.envSrv.getEnvironment().appId
+    //   })
+    //   .pipe(map((res: any) => res.data));
+    const menuData = this.httpClient.get('assets/mocks/menu-data.json').pipe(map((res: any) => res.data.menu));
 
     return zip(appData, userData, menuData);
   }

From 3539bd2a079e47e14a792aec1af4f90673ba9b30 Mon Sep 17 00:00:00 2001
From: TaricXin <583259872@qq.com>
Date: Tue, 15 Mar 2022 17:32:24 +0800
Subject: [PATCH 48/70] edit

---
 src/app/global-config.module.ts               |  9 ++-
 .../dashboard/dashboard.component.html        | 13 ++++
 .../dashboard/dashboard.component.less        |  0
 .../dashboard/dashboard.component.ts          | 66 +++++++++++++++++++
 .../regulatory-data-routing.module.ts         | 12 ++++
 .../regulatory-data/regulatory-data.module.ts | 14 ++++
 .../services/regulatory-data.service.ts       |  9 +++
 src/app/routes/routes-routing.module.ts       |  4 +-
 src/app/shared/index.ts                       |  1 +
 src/app/shared/shared-g2.module.ts            |  6 ++
 src/assets/mocks/menu-data.json               | 10 +++
 11 files changed, 142 insertions(+), 2 deletions(-)
 create mode 100644 src/app/routes/regulatory-data/components/dashboard/dashboard.component.html
 create mode 100644 src/app/routes/regulatory-data/components/dashboard/dashboard.component.less
 create mode 100644 src/app/routes/regulatory-data/components/dashboard/dashboard.component.ts
 create mode 100644 src/app/routes/regulatory-data/regulatory-data-routing.module.ts
 create mode 100644 src/app/routes/regulatory-data/regulatory-data.module.ts
 create mode 100644 src/app/routes/regulatory-data/services/regulatory-data.service.ts
 create mode 100644 src/app/shared/shared-g2.module.ts

diff --git a/src/app/global-config.module.ts b/src/app/global-config.module.ts
index 163c16c9..d92a7840 100644
--- a/src/app/global-config.module.ts
+++ b/src/app/global-config.module.ts
@@ -20,7 +20,14 @@ const alainConfig: AlainConfig = {
   sf: { button: { search: '查询' }, ui: { placeholder: '请输入' } },
   pageHeader: { homeI18n: 'home', recursiveBreadcrumb: true },
   auth: { login_url: '/passport/login' },
-  acl: { guard_url: '/exception/403' }
+  acl: { guard_url: '/exception/403' },
+  chart: {
+    // 以下是默认配置，如果项目无法外网访问，可以根据 `angular.json` 配置将依赖包直接使用 `./assets***` 路径
+    libs: [
+      'https://gw.alipayobjects.com/os/lib/antv/g2/4.1.4/dist/g2.min.js',
+      'https://gw.alipayobjects.com/os/lib/antv/data-set/0.11.7/dist/data-set.js'
+    ]
+  }
 };
 
 const alainModules = [AlainThemeModule.forRoot(), DelonACLModule.forRoot()];
diff --git a/src/app/routes/regulatory-data/components/dashboard/dashboard.component.html b/src/app/routes/regulatory-data/components/dashboard/dashboard.component.html
new file mode 100644
index 00000000..06139f88
--- /dev/null
+++ b/src/app/routes/regulatory-data/components/dashboard/dashboard.component.html
@@ -0,0 +1,13 @@
+<button nz-button (click)="refresh()" nzType="primary">Refresh</button>
+<g2-pie
+  #pie
+  [hasLegend]="true"
+  title="销售额"
+  subTitle="销售额"
+  [total]="total"
+  [valueFormat]="format"
+  [data]="salesPieData"
+  height="294"
+  repaint="false"
+  (clickItem)="handleClick($event)"
+></g2-pie>
diff --git a/src/app/routes/regulatory-data/components/dashboard/dashboard.component.less b/src/app/routes/regulatory-data/components/dashboard/dashboard.component.less
new file mode 100644
index 00000000..e69de29b
diff --git a/src/app/routes/regulatory-data/components/dashboard/dashboard.component.ts b/src/app/routes/regulatory-data/components/dashboard/dashboard.component.ts
new file mode 100644
index 00000000..d895eedc
--- /dev/null
+++ b/src/app/routes/regulatory-data/components/dashboard/dashboard.component.ts
@@ -0,0 +1,66 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { G2PieClickItem, G2PieComponent, G2PieData } from '@delon/chart/pie';
+import { NzMessageService } from 'ng-zorro-antd/message';
+
+@Component({
+  selector: 'app-dashboard',
+  templateUrl: './dashboard.component.html',
+  styleUrls: ['./dashboard.component.less']
+})
+export class DashboardComponent implements OnInit {
+  @ViewChild('pie', { static: false }) readonly pie!: G2PieComponent;
+  salesPieData: G2PieData[] = [];
+  total = '';
+
+  constructor(private msg: NzMessageService) {
+    this.refresh();
+  }
+  ngOnInit(): void {
+    throw new Error('Method not implemented.');
+  }
+
+  refresh(): void {
+    const rv = (min: number = 0, max: number = 5000) => Math.floor(Math.random() * (max - min + 1) + min);
+    this.salesPieData = [
+      {
+        x: '家用电器',
+        y: rv()
+      },
+      {
+        x: '食用酒水',
+        y: rv()
+      },
+      {
+        x: '个护健康',
+        y: rv()
+      },
+      {
+        x: '服饰箱包',
+        y: rv()
+      },
+      {
+        x: '母婴产品',
+        y: rv()
+      }
+    ];
+    if (Math.random() > 0.5) {
+      this.salesPieData.push({
+        x: '其他',
+        y: rv()
+      });
+    }
+    this.total = `&yen ${this.salesPieData.reduce((pre, now) => now.y + pre, 0).toFixed(2)}`;
+    if (this.pie) {
+      // 等待组件渲染
+      setTimeout(() => this.pie.changeData());
+    }
+  }
+
+  format(val: number): string {
+    return `&yen ${val.toFixed(2)}`;
+  }
+
+  handleClick(data: G2PieClickItem): void {
+    this.msg.info(`${data.item.x} - ${data.item.y}`);
+  }
+}
diff --git a/src/app/routes/regulatory-data/regulatory-data-routing.module.ts b/src/app/routes/regulatory-data/regulatory-data-routing.module.ts
new file mode 100644
index 00000000..bb68bd97
--- /dev/null
+++ b/src/app/routes/regulatory-data/regulatory-data-routing.module.ts
@@ -0,0 +1,12 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+
+import { DashboardComponent } from './components/dashboard/dashboard.component';
+
+const routes: Routes = [{ path: 'dashboard', component: DashboardComponent }];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class RegulatoryDataRoutingModule {}
diff --git a/src/app/routes/regulatory-data/regulatory-data.module.ts b/src/app/routes/regulatory-data/regulatory-data.module.ts
new file mode 100644
index 00000000..c76d3521
--- /dev/null
+++ b/src/app/routes/regulatory-data/regulatory-data.module.ts
@@ -0,0 +1,14 @@
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { SharedModule, SHARED_G2_MODULES } from '@shared';
+
+import { DashboardComponent } from './components/dashboard/dashboard.component';
+import { RegulatoryDataRoutingModule } from './regulatory-data-routing.module';
+
+const COMPONENTS: any = [DashboardComponent];
+const NOTROUTECOMPONENTS: any = [];
+@NgModule({
+  declarations: [...COMPONENTS, ...NOTROUTECOMPONENTS],
+  imports: [CommonModule, RegulatoryDataRoutingModule, SharedModule, SHARED_G2_MODULES]
+})
+export class RegulatoryDataModule {}
diff --git a/src/app/routes/regulatory-data/services/regulatory-data.service.ts b/src/app/routes/regulatory-data/services/regulatory-data.service.ts
new file mode 100644
index 00000000..7206840f
--- /dev/null
+++ b/src/app/routes/regulatory-data/services/regulatory-data.service.ts
@@ -0,0 +1,9 @@
+import { Injectable } from '@angular/core';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class RegulatoryDataService {
+
+  constructor() { }
+}
diff --git a/src/app/routes/routes-routing.module.ts b/src/app/routes/routes-routing.module.ts
index 68b60fe7..712e39ec 100644
--- a/src/app/routes/routes-routing.module.ts
+++ b/src/app/routes/routes-routing.module.ts
@@ -15,6 +15,7 @@ import { RouterModule, Routes } from '@angular/router';
 import { LayoutProComponent } from '@brand';
 import { EATokenGuard } from '@core';
 import { environment } from '@env/environment';
+
 import { AuthGuard } from '../core/guards/auth.guard';
 
 // dashboard pages
@@ -68,6 +69,7 @@ const routes: Routes = [
       },
       { path: 'menu-management', loadChildren: () => import('./menu-manager/menu-manager.module').then(m => m.MenuManagerModule) },
       { path: 'partner', loadChildren: () => import('./partner/partner.module').then(m => m.PartnerModule) },
+      { path: 'regulatory-data', loadChildren: () => import('./regulatory-data/regulatory-data.module').then(m => m.RegulatoryDataModule) },
       {
         path: 'download',
         loadChildren: () => import('./download/download.module').then(m => m.DownloadModule)
@@ -92,4 +94,4 @@ const routes: Routes = [
   ],
   exports: [RouterModule]
 })
-export class RouteRoutingModule { }
+export class RouteRoutingModule {}
diff --git a/src/app/shared/index.ts b/src/app/shared/index.ts
index d8f2d2d9..7ea8c70d 100644
--- a/src/app/shared/index.ts
+++ b/src/app/shared/index.ts
@@ -33,4 +33,5 @@ export * from './shared.module';
 export * from './shared-delon.module';
 export * from './shared-zorro.module';
 export * from './shared-third.module';
+export * from './shared-g2.module';
 export * from './widget/st-widget.module';
diff --git a/src/app/shared/shared-g2.module.ts b/src/app/shared/shared-g2.module.ts
new file mode 100644
index 00000000..685f05bc
--- /dev/null
+++ b/src/app/shared/shared-g2.module.ts
@@ -0,0 +1,6 @@
+import { G2BarModule } from '@delon/chart/bar';
+import { G2MiniAreaModule } from '@delon/chart/mini-area';
+import { G2PieModule } from '@delon/chart/pie';
+import { G2TimelineModule } from '@delon/chart/timeline';
+
+export const SHARED_G2_MODULES = [G2BarModule, G2PieModule, G2TimelineModule, G2MiniAreaModule];
diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json
index 82dcd221..22c0317b 100644
--- a/src/assets/mocks/menu-data.json
+++ b/src/assets/mocks/menu-data.json
@@ -630,6 +630,16 @@
               
             }
           ]
+        },
+        {
+          "text": "数据监管",
+          "icon": "iconfont icon-hetong-copy",
+          "group": true,
+          "children": [{
+              "text": "数据报表",
+              "link": "/regulatory-data/dashboard"
+            }
+          ]
         }
       ]
     }]

From 259effd5b5f0a93cd02a960f73f4174e6a0bc4d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= <xiaoyun.pan@eascs.com>
Date: Thu, 17 Mar 2022 17:24:45 +0800
Subject: [PATCH 49/70] =?UTF-8?q?=E5=85=A5=E8=B4=A6=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/detail/detail.component.html   |  37 ++---
 .../components/detail/detail.component.ts     | 126 +++++++++---------
 .../components/record/record.component.html   |   5 +-
 .../components/record/record.component.ts     | 101 ++++++++------
 .../recorded/services/recorded.service.ts     |  17 +++
 5 files changed, 161 insertions(+), 125 deletions(-)
 create mode 100644 src/app/routes/partner/recorded/services/recorded.service.ts

diff --git a/src/app/routes/partner/recorded/components/detail/detail.component.html b/src/app/routes/partner/recorded/components/detail/detail.component.html
index f3d36121..714483bc 100644
--- a/src/app/routes/partner/recorded/components/detail/detail.component.html
+++ b/src/app/routes/partner/recorded/components/detail/detail.component.html
@@ -18,9 +18,9 @@
     <div class="mr-xl">
       <p class="text-lg mb-sm mt-xs">待审批</p>
       <div>
-        <button nz-button [nzType]="'primary'"
-          (click)="auditAction(formData,formData?.refundStatus)">{{formData?.refundStatusLabel ===
-          '1'?'审核':'复审'}}</button>
+        <button nz-button [nzType]="'primary'" (click)="auditAction(formData,formData?.refundStatus)">{{formData?.sts
+          ===
+          0 ?'审核':'复审'}}</button>
       </div>
     </div>
   </ng-template>
@@ -31,48 +31,49 @@
   <nz-alert nzType="info" nzMessage="入账信息" class="mb-md"></nz-alert>
   <div se-container [labelWidth]="130">
     <se label="账户名称">
-      {{formData?.ltdName}}
+      {{formData?.accountName}}
     </se>
     <se label="网络货运人">
       {{formData?.ltdName}}
     </se>
     <se label="入账单号">
-      {{formData?.refundApplyCode}}
+      {{formData?.entryNumber}}
     </se>
     <se label="银行类型">
-      {{formData?.bankType==='1'?'平安银行':'浦发银行'}}
+      {{formData?.bankName}}
     </se>
     <se label="虚拟账户">
-      {{formData?.virtualAccount}}
+      {{formData?.fictitiousAccount}}
     </se>
     <se label="提交时间">
-      {{formData?.createTime}}
+      {{formData?.submitTime}}
     </se>
     <se label="开票金额">
-      {{formData?.amount | currency}}
+      {{formData?.invoiceAmount | currency}}
     </se>
     <se label="代缴个税">
-      {{formData?.amount | currency}}
+      {{formData?.taxPersonal | currency}}
     </se>
     <se label="入账金额">
-      {{formData?.amount | currency}}
+      {{formData?.recordedAmount | currency}}
     </se>
     <se label="入账状态">
-      {{formData?.refundStatusLabel}}
+      {{formData?.stsLabel}}
     </se>
     <se label="发票图片">
-      <img nz-image width="200px" height="200px"
-        nzSrc="https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png" alt="" />
+      <img *ngIf="formData?.invoiceUrl" nz-image width="200px" height="200px" [nzSrc]="formData?.invoiceUrl" alt="" />
+      <span *ngIf="!formData?.invoiceUrl">-</span>
     </se>
     <se label="快递单号">
-      {{formData?.bankCardNumber}}
+      {{formData?.expressName}}
     </se>
     <se label="纳税凭证">
-      <img nz-image width="200px" height="200px"
-        nzSrc="https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png" alt="" />
+      <img *ngIf="formData?.taxVoucherUrl" nz-image width="200px" height="200px" [nzSrc]="formData?.taxVoucherUrl"
+        alt="" />
+      <span *ngIf="!formData?.taxVoucherUrl">-</span>
     </se>
     <se label="银行流水号">
-      {{formData?.bankSerialNumber}}
+      {{formData?.bankFlow}}
     </se>
   </div>
 
diff --git a/src/app/routes/partner/recorded/components/detail/detail.component.ts b/src/app/routes/partner/recorded/components/detail/detail.component.ts
index e1dc2eba..f2782ef5 100644
--- a/src/app/routes/partner/recorded/components/detail/detail.component.ts
+++ b/src/app/routes/partner/recorded/components/detail/detail.component.ts
@@ -2,6 +2,7 @@ import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { FreightAccountService } from 'src/app/routes/financial-management/services/freight-account.service';
+import { RecordedService } from '../../services/recorded.service';
 
 
 @Component({
@@ -16,7 +17,7 @@ export class PartnerRecordedDetailComponent implements OnInit {
   msg = '';
   id = '';
 
-  constructor(public service: FreightAccountService, private route: ActivatedRoute, private nzModalService: NzModalService) {
+  constructor(public service: RecordedService, private route: ActivatedRoute, private nzModalService: NzModalService) {
     this.id = route.snapshot.params.id;
     this.loadRefundDetail(this.id);
   }
@@ -24,49 +25,49 @@ export class PartnerRecordedDetailComponent implements OnInit {
   ngOnInit(): void { }
 
   loadRefundDetail(id: string) {
-    this.service.request(this.service.$api_get_refund_detail, { id }).subscribe(res => {
+    this.service.request(this.service.$api_get_recorded_record_detail, { id }).subscribe(res => {
       if (res) {
         this.formData = res;
         // 处理流程节点数据
         // 流程是否结束
-        let isEnd = false;
-        if (res.successTime) {
-          isEnd = true;
-          if (res.refundStatus === '3') {
-            this.timeLineData.push({ time: res.successTime, value: `到账成功`, color: 'green' });
-          } else {
-            this.timeLineData.push({ time: res.successTime, value: `提现失败`, color: 'red' });
-          }
-        }
-        if (res.agreeTime && res.refundStatus !== '4') {
-          this.timeLineData.push({ time: res.agreeTime, value: `银行处理中`, color: 'gray' });
-        }
-        if (res.agreeTime) {
-          if (res.refundStatus === '4') {
-            isEnd = true;
-            this.timeLineData.push({
-              time: res.agreeTime,
-              value: `拒绝提现<br/>操作人员：${res.handlerUserIdLabel}`,
-              color: 'red'
-            });
-          } else {
-            this.timeLineData.push({
-              time: res.agreeTime,
-              value: `审核通过<br/>操作人员：${res.handlerUserIdLabel}`,
-              color: 'gray'
-            });
-          }
-        }
-        if (res.createTime) {
-          this.timeLineData.push({
-            time: res.createTime,
-            value: `提交提现申请<br/>提现${res.amount}元至${res.bankName}(${res.bankCardNumber})<br/>操作人员：${res.userIdLabel}`,
-            color: 'gray'
-          });
-        }
-        if (this.timeLineData?.length > 0 && !isEnd) {
-          this.timeLineData[0].color = 'green';
-        }
+        // let isEnd = false;
+        // if (res.successTime) {
+        //   isEnd = true;
+        //   if (res.refundStatus === '3') {
+        //     this.timeLineData.push({ time: res.successTime, value: `到账成功`, color: 'green' });
+        //   } else {
+        //     this.timeLineData.push({ time: res.successTime, value: `提现失败`, color: 'red' });
+        //   }
+        // }
+        // if (res.agreeTime && res.refundStatus !== '4') {
+        //   this.timeLineData.push({ time: res.agreeTime, value: `银行处理中`, color: 'gray' });
+        // }
+        // if (res.agreeTime) {
+        //   if (res.refundStatus === '4') {
+        //     isEnd = true;
+        //     this.timeLineData.push({
+        //       time: res.agreeTime,
+        //       value: `拒绝提现<br/>操作人员：${res.handlerUserIdLabel}`,
+        //       color: 'red'
+        //     });
+        //   } else {
+        //     this.timeLineData.push({
+        //       time: res.agreeTime,
+        //       value: `审核通过<br/>操作人员：${res.handlerUserIdLabel}`,
+        //       color: 'gray'
+        //     });
+        //   }
+        // }
+        // if (res.createTime) {
+        //   this.timeLineData.push({
+        //     time: res.createTime,
+        //     value: `提交提现申请<br/>提现${res.amount}元至${res.bankName}(${res.bankCardNumber})<br/>操作人员：${res.userIdLabel}`,
+        //     color: 'gray'
+        //   });
+        // }
+        // if (this.timeLineData?.length > 0 && !isEnd) {
+        //   this.timeLineData[0].color = 'green';
+        // }
       }
     });
   }
@@ -85,37 +86,20 @@ export class PartnerRecordedDetailComponent implements OnInit {
           onClick: () => {
             if (!this.msg || this.msg.trim().length === 0) {
               this.service.msgSrv.warning('请填写拒绝原因 ');
-              return false;
+              return;
             }
-            this.service
-              .request(this.service.$api_disagree_refund, {
-                refundApplicationId: params,
-                msg: this.msg
-              })
-              .subscribe(res => {
-                if (res) {
-                  this.service.msgSrv.success('审核拒绝成功');
-                  modal.destroy(true);
-                }
-              });
-            return false;
+            this.audit({ id: params, rejectReason: this.msg, sts: '3' }, () => {
+              modal.destroy(true);
+            }, '审核拒绝成功');
           }
         },
         {
           label: '通过',
           type: 'primary',
           onClick: () => {
-            this.service
-              .request(this.service.$api_agree_refund, {
-                refundApplicationId: params,
-                msg: this.msg
-              })
-              .subscribe(res => {
-                if (res) {
-                  this.service.msgSrv.success('审核通过成功');
-                  modal.destroy(true);
-                }
-              });
+            this.audit({ id: params, rejectReason: this.msg, sts: this.formData?.sts === '0' ? 1 : 2 }, () => {
+              modal.destroy(true);
+            }, `${this.formData?.sts === '1' ? '审核' : '复审'}通过成功`);
           }
         }
       ]
@@ -129,4 +113,18 @@ export class PartnerRecordedDetailComponent implements OnInit {
   goBack() {
     history.go(-1);
   }
+
+  /**
+   * 审核
+   */
+  audit(params: any, callback: Function, msg = '成功') {
+    this.service
+      .request(this.service.$api_audit_recored, ...params)
+      .subscribe(res => {
+        if (res) {
+          this.service.msgSrv.success(msg);
+          callback();
+        }
+      });
+  }
 }
diff --git a/src/app/routes/partner/recorded/components/record/record.component.html b/src/app/routes/partner/recorded/components/record/record.component.html
index 60aa8d08..e6233910 100644
--- a/src/app/routes/partner/recorded/components/record/record.component.html
+++ b/src/app/routes/partner/recorded/components/record/record.component.html
@@ -41,8 +41,9 @@
   </ng-template>
 
   <div class="table-content">
-    <st #st [data]="service.$api_get_refund_page" [columns]="columns" [req]="{  process: beforeReq }"
-      [loading]="service.http.loading" [scroll]="{ x:'1200px' }" (change)="stChange($event)"
+    <st #st [data]="service.$api_get_recorded_page" [columns]="columns"
+      [req]="{  method: 'POST', allInBody: true,process: beforeReq}" [loading]="service.http.loading"
+      [scroll]="{ x:'1200px' }" (change)="stChange($event)"
       [res]="{ reName: { list: 'data.records', total: 'data.total' }, process: afterRes }"
       [page]="{ show: true,  pageSizes:  [10, 20, 50, 100, 200, 500] }">
       <ng-template st-row="bankCardNumber" let-item let-index="index" let-column="column">
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 4b97ba2c..7e154473 100644
--- a/src/app/routes/partner/recorded/components/record/record.component.ts
+++ b/src/app/routes/partner/recorded/components/record/record.component.ts
@@ -2,9 +2,11 @@ import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { STComponent, STColumn, STChange, STRequestOptions, STData } from '@delon/abc/st';
 import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form';
+import { ShipperBaseService } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { FreightAccountService } from 'src/app/routes/financial-management/services/freight-account.service';
 import Big from 'src/app/shared/utils/deal-precision';
+import { RecordedService } from '../../services/recorded.service';
 
 
 @Component({
@@ -39,7 +41,8 @@ export class PartnerRecordedRecordComponent implements OnInit {
   accountName = ''; // 账户名称
 
 
-  constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router, public ar: ActivatedRoute) {
+  constructor(public service: RecordedService, private nzModalService: NzModalService,
+    private router: Router, public ar: ActivatedRoute, public shipperSrv: ShipperBaseService) {
 
     this.accountName = this.ar.snapshot.queryParams?.userIdLabel || '';
     this.ltdId = this.ar.snapshot.queryParams?.ltdId || '';
@@ -139,39 +142,34 @@ export class PartnerRecordedRecordComponent implements OnInit {
           onClick: () => {
             if (!this.msg || this.msg.trim().length === 0) {
               this.service.msgSrv.warning('请填写拒绝原因 ');
-              return false;
+              return;
             }
-            this.service
-              .request(this.service.$api_disagree_refund, {
-                refundApplicationId: params,
-                msg: this.msg
-              })
-              .subscribe(res => {
-                if (res) {
-                  this.service.msgSrv.success('审核拒绝成功');
-                  modal.destroy();
-                  this.st.load(1);
-                }
-              });
-            return false;
+            this.audit({ id: params, rejectReason: this.msg, sts: '3' }, () => {
+              modal.destroy();
+              this.st.load(1);
+            }, '审核拒绝成功');
+            // this.service
+            //   .request(this.service.$api_disagree_recorded, {
+            //     id: params,
+            //     rejectReason: this.msg
+            //   })
+            //   .subscribe(res => {
+            //     if (res) {
+            //       this.service.msgSrv.success('审核拒绝成功');
+            //       modal.destroy();
+            //       this.st.load(1);
+            //     }
+            //   });
           }
         },
         {
           label: '通过',
           type: 'primary',
           onClick: () => {
-            this.service
-              .request(this.service.$api_agree_refund, {
-                refundApplicationId: params,
-                msg: this.msg
-              })
-              .subscribe(res => {
-                if (res) {
-                  this.service.msgSrv.success('审核通过成功');
-                  modal.destroy();
-                  this.st.load(1);
-                }
-              });
+            this.audit({ id: params, rejectReason: this.msg, sts: '1' }, () => {
+              modal.destroy();
+              this.st.load(1);
+            }, '审核通过成功');
           }
         }
       ]
@@ -230,12 +228,19 @@ export class PartnerRecordedRecordComponent implements OnInit {
             placeholder: '请输入'
           }
         },
-        refundStatus: {
+        sts: {
           type: 'string',
           title: '入账状态',
+          default: '',
+          enum: [
+            { label: '全部', value: '' },
+            { label: '待初审', value: 0 },
+            { label: '待复核', value: 1 },
+            { label: '已入账', value: 2 },
+            { label: '已拒绝', value: 3 },
+          ],
           ui: {
-            widget: 'dict-select',
-            params: { dictKey: 'refund:apply:status' },
+            widget: 'select',
             placeholder: '请选择'
           }
         },
@@ -247,10 +252,10 @@ export class PartnerRecordedRecordComponent implements OnInit {
             widget: 'select',
             placeholder: '请选择',
             allowClear: true,
-            asyncData: () => this.service.getNetworkFreightForwarder(),
+            asyncData: () => this.shipperSrv.getNetworkFreightForwarder(),
           }
         },
-        createTime: {
+        submitTime: {
           title: '提交时间',
           type: 'string',
           ui: {
@@ -270,9 +275,9 @@ export class PartnerRecordedRecordComponent implements OnInit {
   private initST(): STColumn[] {
     return [
       { title: '', index: 'key', type: 'checkbox', className: 'text-center' },
-      { title: '账户名称', index: 'createTime', width: 180, className: 'text-center' },
-      { title: '虚拟账户', index: 'virtualAccount', width: 180, className: 'text-center' },
-      { title: '入账单号', index: 'refundApplyCode', width: 190, className: 'text-center' },
+      { title: '账户名称', index: 'accountName', width: 180, className: 'text-center' },
+      { title: '虚拟账户', index: 'fictitiousAccount', width: 180, className: 'text-center' },
+      { title: '入账单号', index: 'entryNumber', width: 190, className: 'text-center' },
       { title: '网络货运人', index: 'ltdName', width: 220, className: 'text-center' },
       {
         title: '开票金额',
@@ -284,7 +289,7 @@ export class PartnerRecordedRecordComponent implements OnInit {
       },
       {
         title: '代缴个税',
-        index: 'amount',
+        index: 'taxPersonal',
         width: 150,
         type: 'widget',
         className: 'text-right',
@@ -292,15 +297,15 @@ export class PartnerRecordedRecordComponent implements OnInit {
       },
       {
         title: '入账金额',
-        index: 'amount',
+        index: 'entryAmount',
         width: 150,
         type: 'widget',
         className: 'text-right',
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.amount }) }
       },
 
-      { title: '提交时间', index: 'bankSerialNumber', width: 160, className: 'text-center' },
-      { title: '入账状态', index: 'refundStatusLabel', width: 100, className: 'text-center' },
+      { title: '提交时间', index: 'submitTime', width: 160, className: 'text-center' },
+      { title: '入账状态', index: 'stsLabel', width: 100, className: 'text-center' },
       {
         title: '操作',
         fixed: 'right',
@@ -308,12 +313,12 @@ export class PartnerRecordedRecordComponent implements OnInit {
         buttons: [
           {
             text: '审核',
-            iif: item => item.refundStatus === '1',
+            iif: item => item.refundStatus === '0',
             click: item => this.auditAction(item)
           },
           {
             text: '复审',
-            iif: item => item.refundStatus === '2',
+            iif: item => item.sts === '1',
             click: item => this.router.navigate(['./detail/' + item.id], { relativeTo: this.ar })
           },
           {
@@ -324,4 +329,18 @@ export class PartnerRecordedRecordComponent implements OnInit {
       }
     ];
   }
+
+  /**
+ * 审核
+ */
+  audit(params: any, callback: Function, msg = '成功') {
+    this.service
+      .request(this.service.$api_audit_recored, ...params)
+      .subscribe(res => {
+        if (res) {
+          this.service.msgSrv.success(msg);
+          callback();
+        }
+      });
+  }
 }
diff --git a/src/app/routes/partner/recorded/services/recorded.service.ts b/src/app/routes/partner/recorded/services/recorded.service.ts
new file mode 100644
index 00000000..bb27a3dc
--- /dev/null
+++ b/src/app/routes/partner/recorded/services/recorded.service.ts
@@ -0,0 +1,17 @@
+import { Injectable, Injector } from '@angular/core';
+import { BaseService } from '@shared';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class RecordedService extends BaseService {
+
+  $api_get_recorded_page = `/api/bpc/partnerInvoice/getDetail`; // 查询合伙人发票入账主表
+  $api_get_recorded_record_detail = `api/bpc/partnerInvoice/getDetailByOpration`; // 入账记录详情
+  $api_disagree_recorded = ``; // 拒绝审核
+  $api_agree_recorded = ``; // 同意审核
+  $api_audit_recored = `/api/bpc/partnerInvoiceEntry/oprationAudit`; // 审核单据
+  constructor(public injector: Injector) {
+    super(injector);
+  }
+}

From 9c5fdabab97caae22b60550881def7cd433484c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= <xiaoyun.pan@eascs.com>
Date: Thu, 17 Mar 2022 19:35:35 +0800
Subject: [PATCH 50/70] =?UTF-8?q?=E6=8F=90=E7=8E=B0=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E3=80=81=E8=B4=A6=E6=88=B7=E6=98=8E=E7=BB=86=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/list/list.component.html       | 17 +++++-----
 .../components/list/list.component.ts         | 19 ++++++------
 .../virtual-account-detail.component.html     | 15 +++++++--
 .../virtual-account-detail.component.ts       | 31 ++++++++++---------
 .../withdrawals-record.component.html         |  2 +-
 .../withdrawals-record.component.ts           |  3 +-
 .../services/account-managemant.service.ts    |  5 ++-
 7 files changed, 53 insertions(+), 39 deletions(-)

diff --git a/src/app/routes/partner/account-management/components/list/list.component.html b/src/app/routes/partner/account-management/components/list/list.component.html
index d071efc2..e4e84339 100644
--- a/src/app/routes/partner/account-management/components/list/list.component.html
+++ b/src/app/routes/partner/account-management/components/list/list.component.html
@@ -18,21 +18,18 @@
     [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
     [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
     [loading]="service.http.loading">
-    <ng-template st-row="approvalStatus" let-item>
-      <a [routerLink]="'/partner/account-management/am/recorded/detail/'+item?.id">{{item.yskmoney}}</a>
+    <ng-template st-row="allBalance" let-item>
+      <div class="text-right">{{item.allBalance | currency:' '}}</div>
     </ng-template>
-    <ng-template st-row="approvalStatus1" let-item>
-      <div class="text-right">{{item.approvalStatus1 | currency:' '}}</div>
-    </ng-template>
-    <ng-template st-row="approvalStatus2" let-item>
+    <ng-template st-row="unEntryAmount" let-item>
       <a class="text-right text-blue-dark"
-        [routerLink]="'/partner/account-management/am/recorded/detail/'+item?.id">{{item.yskmoney | currency:'
+        [routerLink]="'/partner/account-management/am/recorded/detail/'+item?.id">{{item.unEntryAmount | currency:'
         '}}</a>
     </ng-template>
-
-    <ng-template st-row="approvalStatus3" let-item>
-      <div class="text-right">{{item.yskmoney | currency:' '}}</div>
+    <ng-template st-row="availableBalance" let-item>
+      <div class="text-right">{{item.availableBalance | currency:' '}}</div>
     </ng-template>
 
+
   </st>
 </nz-card>
diff --git a/src/app/routes/partner/account-management/components/list/list.component.ts b/src/app/routes/partner/account-management/components/list/list.component.ts
index 84e281a5..7e58f5e1 100644
--- a/src/app/routes/partner/account-management/components/list/list.component.ts
+++ b/src/app/routes/partner/account-management/components/list/list.component.ts
@@ -36,14 +36,14 @@ export class PartnerAccountManagementListComponent implements OnInit {
   initSF() {
     this.schema = {
       properties: {
-        abnormalCause: {
+        userName: {
           title: '合伙人名称',
           type: 'string',
           ui: {
             placeholder: '请输入',
           },
         },
-        abnormalCause1: {
+        phone: {
           title: '手机号',
           type: 'string',
           ui: {
@@ -59,14 +59,15 @@ export class PartnerAccountManagementListComponent implements OnInit {
  */
   initST() {
     this.columns = [
-      { title: '合伙人名称', index: 'carNo', className: 'text-center', width: 300 },
-      { title: '手机号', render: 'carModelLabel', className: 'text-center', width: 200 },
-      { title: '账户总额（元）', render: 'approvalStatus1', className: 'text-right', sort: true, width: 200 },
-      { title: '待入账余额（元）', render: 'approvalStatus2', className: 'text-right', sort: true, width: 200 },
-      { title: '可用余额（元）', render: 'approvalStatus3', className: 'text-right', sort: true, width: 250 },
-      { title: '虚拟账户', index: 'approvalStatus4', className: 'text-center', width: 200 },
+      { title: '合伙人名称', index: 'userName', className: 'text-center', width: 250 },
+      { title: '手机号', index: 'phone', className: 'text-center', width: 200 },
+      { title: '账户总额（元）', render: 'allBalance', className: 'text-right', sort: true, width: 200 },
+      { title: '待入账余额（元）', render: 'unEntryAmount', className: 'text-right', sort: true, width: 200 },
+      { title: '可用余额（元）', render: 'availableBalance', className: 'text-right', sort: true, width: 250 },
+      { title: '虚拟账户', index: 'virtualAccount', className: 'text-center', width: 200 },
       {
         title: '操作',
+        width: 100,
         buttons: [
           {
             text: '虚拟账户明细',
@@ -94,7 +95,7 @@ export class PartnerAccountManagementListComponent implements OnInit {
       nzTitle: '虚拟账户明细',
       nzContent: PartnerAccountManagementVirtualAccountDetailComponent,
       nzComponentParams: {
-        id: _record?.id
+        roleId: _record?.roleId
       },
       nzWidth: '85%',
       nzFooter: null
diff --git a/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.html b/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.html
index 649ddc1c..ae98a690 100644
--- a/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.html
+++ b/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.html
@@ -14,12 +14,23 @@
     </div>
   </div>
   <div class="mt-sm">
-    <st #st [data]="amService.$api_get_account_management_page" [columns]="columns" [columns]="columns"
+    <st #st [data]="service. $api_get_virtual_detail_page" [columns]="columns" [columns]="columns"
       [scroll]="{ x: '1200px' }"
       [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
       [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
       [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
-      [loading]="amService.http.loading"></st>
+      [loading]="service.http.loading">
+      <ng-template st-row="allBalance" let-item>
+        <div class="text-right">
+          {{item.allBalance}}
+        </div>
+      </ng-template>
+      <ng-template st-row="availableBalance" let-item>
+        <div class="text-right">
+          {{item.availableBalance}}
+        </div>
+      </ng-template>
+    </st>
   </div>
 </nz-card>
 <div class="modal-footer text-center">
diff --git a/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.ts b/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.ts
index 9db2127b..5d77e7ba 100644
--- a/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.ts
+++ b/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.ts
@@ -17,13 +17,15 @@ export class PartnerAccountManagementVirtualAccountDetailComponent implements On
   @ViewChild('st') private readonly st!: STComponent;
   @ViewChild('sf') private readonly sf!: SFComponent;
   columns: STColumn[] = [];
-  id = '';
+  roleId = '';
   _$expand = false;
 
-  constructor(public shipperservice: ShipperBaseService, public amService: AccountManagemantService, private modalRef: NzModalRef) { }
+  constructor(public shipperservice: ShipperBaseService, public service: AccountManagemantService,
+    private modalRef: NzModalRef) {
+  }
 
   get reqParams() {
-    return { ...this.sf?.value };
+    return { ...this.sf?.value, roleId: this.roleId };
   }
   ngOnInit(): void {
     this.initSF();
@@ -36,14 +38,14 @@ export class PartnerAccountManagementVirtualAccountDetailComponent implements On
         _$expand: {
           type: 'boolean', ui: { hidden: true }
         },
-        abnormalCause: {
+        userName: {
           title: '合伙人名称',
           type: 'string',
           ui: {
             placeholder: '请输入',
           },
         },
-        abnormalCause1: {
+        phone: {
           title: '手机号',
           type: 'string',
           ui: {
@@ -112,16 +114,15 @@ export class PartnerAccountManagementVirtualAccountDetailComponent implements On
 */
   initST() {
     this.columns = [
-      { title: '合伙人', index: 'carNo', className: 'text-center', width: 200 },
-      { title: '手机号', render: 'carModelLabel', className: 'text-center', width: 150 },
-      { title: '网络货运人', render: 'carModelLabel', className: 'text-center', width: 200 },
-      { title: '银行类型', render: 'carModelLabel', className: 'text-center', width: 120 },
-      { title: '虚拟账户', render: 'carModelLabel', className: 'text-center', width: 180 },
-      { title: '可用余额', render: 'approvalStatus1', className: 'text-right', width: 180 },
-      { title: '账户总余额', render: 'approvalStatus2', className: 'text-right', width: 180 },
-      { title: '可用余额（元）', render: 'approvalStatus3', className: 'text-right', width: 180 },
-      { title: '创建时间', index: 'approvalStatus4', className: 'text-center', width: 200 },
-      { title: '状态', index: 'approvalStatus4', className: 'text-center', width: 120 },
+      { title: '合伙人', index: 'name', className: 'text-center', width: 200 },
+      { title: '手机号', index: 'phone', className: 'text-center', width: 150 },
+      { title: '网络货运人', index: 'ltdName', className: 'text-center', width: 200 },
+      { title: '银行类型', index: 'bankTypeLabel', className: 'text-center', width: 120 },
+      { title: '虚拟账户', index: 'virtualAccount', className: 'text-center', width: 180 },
+      { title: '可用余额', render: 'availableBalance', className: 'text-center', width: 180 },
+      { title: '账户总余额', render: 'allBalance', className: 'text-center', width: 180 },
+      { title: '创建时间', index: 'createTime', className: 'text-center', width: 200 },
+      { title: '状态', index: 'stateDeletedLabel', className: 'text-center', width: 120 },
       {
         title: '操作',
         width: 120,
diff --git a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.html b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.html
index 449d3e1b..92dc20a4 100644
--- a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.html
+++ b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.html
@@ -41,7 +41,7 @@
     </div>
   </ng-template>
 
-  <st #st [data]="service.$api_get_refund_page" [columns]="columns" [req]="{  process: beforeReq }"
+  <st #st [data]="amService.$api_get_withdraw_record_page" [columns]="columns" [req]="{  process: beforeReq }"
     [loading]="service.http.loading" [scroll]="{ x:'1200px' }" (change)="stChange($event)"
     [res]="{ reName: { list: 'data.records', total: 'data.total' }, process: afterRes }"
     [page]="{ show: true,  pageSizes:  [10, 20, 50, 100, 200, 500] }">
diff --git a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts
index 6a428518..8abf556f 100644
--- a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts
+++ b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts
@@ -5,6 +5,7 @@ import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { FreightAccountService } from 'src/app/routes/financial-management/services/freight-account.service';
 import Big from 'src/app/shared/utils/deal-precision';
+import { AccountManagemantService } from '../../services/account-managemant.service';
 
 
 @Component({
@@ -27,7 +28,7 @@ export class PartnerAccountManagementWithdrawalsRecordComponent implements OnIni
   refundStatus: any = '';
 
   msg = '';
-  constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router, public ar: ActivatedRoute) { }
+  constructor(public service: FreightAccountService, public amService: AccountManagemantService, private nzModalService: NzModalService, private router: Router, public ar: ActivatedRoute) { }
 
   ngOnInit(): void { }
 
diff --git a/src/app/routes/partner/account-management/services/account-managemant.service.ts b/src/app/routes/partner/account-management/services/account-managemant.service.ts
index d88522a1..8b9d9acb 100644
--- a/src/app/routes/partner/account-management/services/account-managemant.service.ts
+++ b/src/app/routes/partner/account-management/services/account-managemant.service.ts
@@ -6,7 +6,10 @@ import { BaseService } from '@shared';
 })
 export class AccountManagemantService extends BaseService {
 
-  $api_get_account_management_page = `/api/fcc/ficoBrmH/list/page`;
+  $api_get_account_management_page = `/api/bpc/accountBalancePartner/getPartnerAccountBalanceByOperator`; // 账户管理
+  $api_get_virtual_detail_page = `/api/bpc/accountBalancePartner/getPartnerAccountBalanceInfoByOperator`;//虚拟账户明细
+  $api_get_withdraw_record_page = `/api/fcc/refundApplicationOBC/list/partnerPage`;// 提现记录
+
   constructor(public injector: Injector) {
     super(injector)
   }

From a6193fbddc54d7926430271b3f8313b2fe22302d Mon Sep 17 00:00:00 2001
From: TaricXin <583259872@qq.com>
Date: Fri, 18 Mar 2022 14:56:14 +0800
Subject: [PATCH 51/70] edit

---
 .../add-etp-partner.component.ts              |  26 +-
 .../add-personal-partner.component.ts         |  39 +-
 .../index/partner-list.component.html         | 165 ++--
 .../index/partner-list.component.ts           | 143 +++-
 .../partner-detail.component.html             | 778 +++++++++++-------
 .../partner-detail.component.ts               |  70 +-
 .../personal-partner-detail.component.html    | 253 ++++++
 .../personal-partner-detail.component.less    |  30 +
 .../personal-partner-detail.component.ts      | 240 ++++++
 .../services/partner-list.service.ts          |  13 +
 .../routes/partner/partner-routing.module.ts  |  54 +-
 src/app/routes/partner/partner.module.ts      |   6 +-
 src/styles.less                               |  26 +-
 13 files changed, 1325 insertions(+), 518 deletions(-)
 create mode 100644 src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.html
 create mode 100644 src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.less
 create mode 100644 src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts

diff --git a/src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.ts b/src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.ts
index 00540e31..38f07c5a 100644
--- a/src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.ts
+++ b/src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, ViewChild } from '@angular/core';
+import { Component, ViewChild } from '@angular/core';
 import { Router } from '@angular/router';
 import { apiConf } from '@conf/api.conf';
 import {
@@ -14,6 +14,7 @@ import {
 } from '@delon/form';
 import { NzUploadFile } from 'ng-zorro-antd/upload';
 import { of } from 'rxjs';
+
 import { PartnerListService } from '../../services/partner-list.service';
 
 const IMAGECONFIG = {
@@ -43,7 +44,7 @@ const DATECONFIG = {
   templateUrl: './add-etp-partner.component.html',
   styleUrls: ['./add-etp-partner.component.less']
 })
-export class AddEtpPartnerComponent implements OnInit {
+export class AddEtpPartnerComponent {
   @ViewChild('sf', { static: false })
   sf!: SFComponent;
   schema: SFSchema = this.initBasicInfoSF();
@@ -65,10 +66,9 @@ export class AddEtpPartnerComponent implements OnInit {
   };
 
   constructor(private router: Router, public service: PartnerListService) {}
-  ngOnInit() {}
 
   submitForm() {
-    if (!this.sf.valid ) {
+    if (!this.sf.valid) {
       this.sf.validator({ emitError: true });
       this.service.msgSrv.warning('请修改填写错误信息');
       return;
@@ -118,7 +118,9 @@ export class AddEtpPartnerComponent implements OnInit {
         }
       }
     );
-    // this.service.request(this.service.$api_save_enterprise_admin, params).subscribe(res => {
+    console.log(params);
+
+    // this.service.request(this.service.$api_save_entp_partner, params).subscribe(res => {
     //   if (res) {
     //     this.service.msgSrv.success('企业新增成功');
     //     this.goBack();
@@ -549,7 +551,7 @@ export class AddEtpPartnerComponent implements OnInit {
               } as SFCheckboxWidgetSchema
             }
           },
-          required: ['_adminCertificatePhotoTipsA', 'adminMobile', 'name', 'certificateNumber','operatingStartTime']
+          required: ['_adminCertificatePhotoTipsA', 'adminMobile', 'name', 'certificateNumber', 'operatingStartTime']
         },
         // 所属城市
         _addressTitle: { title: '', type: 'string', ui: { widget: 'custom' } },
@@ -568,7 +570,7 @@ export class AddEtpPartnerComponent implements OnInit {
                 { title: '已支付', key: 'TRADE_SUCCESS' },
                 { title: '交易完成', key: 'TRADE_FINISHED' }
               ])
-          } as SFTreeSelectWidgetSchema,
+          } as SFTreeSelectWidgetSchema
         },
         // 渠道销售
         _channelTitle: { title: '', type: 'string', ui: { widget: 'custom' } },
@@ -586,7 +588,15 @@ export class AddEtpPartnerComponent implements OnInit {
           }
         }
       },
-      required: ['_licenseTips', 'licensePhotoWatermark', 'unifiedSocialCreditCode', 'enterpriseName', 'operatingStartTime', 'status3','channel']
+      required: [
+        '_licenseTips',
+        'licensePhotoWatermark',
+        'unifiedSocialCreditCode',
+        'enterpriseName',
+        'operatingStartTime',
+        'status3',
+        'channel'
+      ]
     };
   }
 }
diff --git a/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts b/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts
index ed2eac4f..4dffa7bf 100644
--- a/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts
+++ b/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts
@@ -1,9 +1,20 @@
-import { Component, OnInit, ViewChild } from '@angular/core';
+import { Component, ViewChild } from '@angular/core';
 import { Router } from '@angular/router';
 import { apiConf } from '@conf/api.conf';
-import { SFUploadWidgetSchema, SFComponent, SFSchema, SFUISchema, SFDateWidgetSchema, SFCheckboxWidgetSchema, SFTreeSelectWidgetSchema } from '@delon/form';
+import {
+  SFUploadWidgetSchema,
+  SFComponent,
+  SFSchema,
+  SFUISchema,
+  SFDateWidgetSchema,
+  SFCheckboxWidgetSchema,
+  SFTreeSelectWidgetSchema
+} from '@delon/form';
+import { NzTreeNode } from 'ng-zorro-antd/tree';
 import { NzUploadFile } from 'ng-zorro-antd/upload';
 import { of } from 'rxjs';
+import { map } from 'rxjs/operators';
+
 import { PartnerListService } from '../../services/partner-list.service';
 
 const IMAGECONFIG = {
@@ -33,7 +44,7 @@ const DATECONFIG = {
   templateUrl: './add-personal-partner.component.html',
   styleUrls: ['./add-personal-partner.component.less']
 })
-export class AddPersonalPartnerComponent implements OnInit {
+export class AddPersonalPartnerComponent {
   @ViewChild('sf', { static: false })
   sf!: SFComponent;
   schema: SFSchema = this.initBasicInfoSF();
@@ -55,7 +66,6 @@ export class AddPersonalPartnerComponent implements OnInit {
   };
 
   constructor(private router: Router, public service: PartnerListService) {}
-  ngOnInit() {}
 
   submitForm() {
     if (!this.sf.valid) {
@@ -305,18 +315,22 @@ export class AddPersonalPartnerComponent implements OnInit {
         status3: {
           type: 'string',
           title: '所属城市',
-          default: ['WAIT_BUYER_PAY', 'TRADE_FINISHED'],
           ui: {
             widget: 'tree-select',
             grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
             placeholder: '请选择城市(最多3个)',
             checkable: true,
+            class: 'city-tree-select',
             asyncData: () =>
-              of([
-                { title: '待支付', key: 'WAIT_BUYER_PAY' },
-                { title: '已支付', key: 'TRADE_SUCCESS' },
-                { title: '交易完成', key: 'TRADE_FINISHED' }
-              ])
+              this.getRegionDetailByCode('').pipe(
+                map((res: any) =>
+                  res.map((item: any) => ({ ...item, title: item.name, key: item.regionCode, disabled: true, isDisableCheckbox: true }))
+                )
+              ),
+            expandChange: ({ node }: { node: NzTreeNode }) =>
+              this.getRegionDetailByCode(node.key).pipe(
+                map((res: any) => res.map((item: any) => ({ ...item, title: item.name, key: item.regionCode, isLeaf: true })))
+              )
           } as SFTreeSelectWidgetSchema
         },
         // 渠道销售
@@ -335,10 +349,7 @@ export class AddPersonalPartnerComponent implements OnInit {
           }
         }
       },
-      required: [
-        'status3',
-        'channel'
-      ]
+      required: ['status3', 'channel']
     };
   }
 }
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 1e4aa340..b5652c72 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
@@ -1,95 +1,100 @@
-<page-header-wrapper [title]="'合伙人列表'">
-</page-header-wrapper>
+<page-header-wrapper [title]="'合伙人列表'"> </page-header-wrapper>
 
 <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 [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">
-            <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()">
-                {{ !_$expand ? '展开' : '收起' }}
-                <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
-            </button>
-        </div>
+  <div nz-row nzGutter="8">
+    <div nz-col [nzXl]="_$expand ? 24 : 17" [nzLg]="24" [nzSm]="24" [nzXs]="24">
+      <sf
+        #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">
+      <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()">
+        {{ !_$expand ? '展开' : '收起' }}
+        <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
+      </button>
+    </div>
+  </div>
 </nz-card>
 
 <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>
-    </div>
+  <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>
+  </div>
 
-    <st #st [data]="service.$mock_url" [columns]="columns" [req]="{  process: beforeReq }"
-        [loading]="service.http.loading" [scroll]="{ x:'1200px' }">
-    </st>
+  <st
+    #st
+    [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="返佣模板" required>
-                <nz-select ngModel="lucy" style="width: 100%;">
-                    <nz-option nzValue="jack" nzLabel="Jack"></nz-option>
-                    <nz-option nzValue="lucy" nzLabel="Lucy"></nz-option>
-                </nz-select>
-            </se>
-        </div>
+  <div nz-row nzGutter="8">
+    <div nz-col nzSpan="24" se-container [labelWidth]="120">
+      <se [col]="1" label="合伙人名称"> 深圳某某有限公司 </se>
+      <se [col]="1" label="返佣模板" required>
+        <nz-select ngModel="lucy" style="width: 100%">
+          <nz-option nzValue="jack" nzLabel="Jack"></nz-option>
+          <nz-option nzValue="lucy" nzLabel="Lucy"></nz-option>
+        </nz-select>
+      </se>
     </div>
-    <p class="text-center mt-md">说明：修改模板后，当月开始返佣收益将会按新模板计算</p>
+  </div>
+  <p class="text-center mt-md">说明：修改模板后，当月开始返佣收益将会按新模板计算</p>
 </ng-template>
 
 <ng-template #editCannel>
-    <div nz-row nzGutter="8">
-        <div nz-col nzSpan="24" se-container [labelWidth]="140" [col]="1">
-            <se label="合伙人名称">
-                深圳某某有限公司
-            </se>
-            <se label="当前渠道销售">
-                张三/13999999999
-            </se>
-            <se label="渠道销售修改为" required>
-                <nz-select ngModel="lucy" style="width: 100%;">
-                    <nz-option nzValue="jack" nzLabel="Jack"></nz-option>
-                    <nz-option nzValue="lucy" nzLabel="Lucy"></nz-option>
-                </nz-select>
-            </se>
-            <se label="备注" required>
-                <textarea rows="3" nz-input></textarea>
-            </se>
-            <se label="一并转移的客户">
-                <p style="margin-top: 8px;">已选（0）</p>
-                <nz-table #rowSelectionTable [nzData]="customers" nzSize="small" nzBordered>
-                    <thead>
-                        <tr>
-                            <th [nzChecked]="false"></th>
-                            <th>客户名称</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        <tr *ngFor="let data of rowSelectionTable.data">
-                            <td [nzChecked]="data.checked"></td>
-                            <td>{{ data.name }}</td>
-                        </tr>
-                    </tbody>
-                </nz-table>
-            </se>
-            <se label="生效节点" required>
-                <nz-radio-group>
-                    <label nz-radio nzValue="A">修改成功后立即生效</label>
-                    <label nz-radio nzValue="B">CRM流程审核通过后生</label>
-                </nz-radio-group>
-            </se>
-        </div>
+  <div nz-row nzGutter="8">
+    <div nz-col nzSpan="24" se-container [labelWidth]="140" [col]="1">
+      <se label="合伙人名称"> 深圳某某有限公司 </se>
+      <se label="当前渠道销售"> 张三/13999999999 </se>
+      <se label="渠道销售修改为" required>
+        <nz-select ngModel="lucy" style="width: 100%">
+          <nz-option nzValue="jack" nzLabel="Jack"></nz-option>
+          <nz-option nzValue="lucy" nzLabel="Lucy"></nz-option>
+        </nz-select>
+      </se>
+      <se label="备注" required>
+        <textarea rows="3" nz-input></textarea>
+      </se>
+      <se label="一并转移的客户">
+        <p style="margin-top: 8px">已选（0）</p>
+        <nz-table #rowSelectionTable [nzData]="customers" nzSize="small" nzBordered>
+          <thead>
+            <tr>
+              <th [nzChecked]="false"></th>
+              <th>客户名称</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr *ngFor="let data of rowSelectionTable.data">
+              <td [nzChecked]="data.checked"></td>
+              <td>{{ data.name }}</td>
+            </tr>
+          </tbody>
+        </nz-table>
+      </se>
+      <se label="生效节点" required>
+        <nz-radio-group>
+          <label nz-radio nzValue="A">修改成功后立即生效</label>
+          <label nz-radio nzValue="B">CRM流程审核通过后生</label>
+        </nz-radio-group>
+      </se>
     </div>
-    <p class="text-center mt-md">客户转移：客户跟着上级合伙人转移一并到新渠道销售下，会同步发起CRM《客户转移》流程；不转移的，客户会与上级合伙人解绑，成为渠道销售的直客</p>
-</ng-template>
\ No newline at end of file
+  </div>
+  <p class="text-center mt-md"
+    >客户转移：客户跟着上级合伙人转移一并到新渠道销售下，会同步发起CRM《客户转移》流程；不转移的，客户会与上级合伙人解绑，成为渠道销售的直客</p
+  >
+</ng-template>
diff --git a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts
index 219a9d6b..4f415651 100644
--- a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts
+++ b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts
@@ -1,9 +1,10 @@
-import { Component, OnInit, ViewChild } from '@angular/core';
+import { Component, ViewChild } from '@angular/core';
 import { Router } from '@angular/router';
 import { STComponent, STColumn, STRequestOptions, STChange } from '@delon/abc/st';
 import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { AddCollectionInvoiceModalComponent } from 'src/app/routes/ticket-management/components/input-invoice/add-collection-invoice-modal/add-collection-invoice-modal.component';
+
 import { PartnerListService } from '../../services/partner-list.service';
 import { PartnerAuditModalComponent } from '../partner-audit-modal/partner-audit-modal.component';
 
@@ -12,7 +13,7 @@ import { PartnerAuditModalComponent } from '../partner-audit-modal/partner-audit
   templateUrl: './partner-list.component.html',
   styleUrls: ['../../../../commom/less/box.less']
 })
-export class PartnerListComponent implements OnInit {
+export class PartnerListComponent {
   @ViewChild('st', { static: true })
   st!: STComponent;
   @ViewChild('sf', { static: false })
@@ -30,8 +31,6 @@ export class PartnerListComponent implements OnInit {
 
   constructor(public service: PartnerListService, private nzModalService: NzModalService, private router: Router) {}
 
-  ngOnInit(): void {}
-
   beforeReq = (requestOptions: STRequestOptions) => {
     if (this.sf) {
       let params = { ...this.sf.value };
@@ -122,19 +121,19 @@ export class PartnerListComponent implements OnInit {
             hidden: true
           }
         },
-        paycode: {
+        enterpriseName: {
           type: 'string',
           title: '合伙人名称'
         },
-        paycode2: {
+        contactName: {
           type: 'string',
           title: '企业管理员'
         },
-        paycod3e: {
+        contactMobile: {
           type: 'string',
           title: '手机号'
         },
-        paycod31e: {
+        channelId: {
           type: 'string',
           title: '渠道销售',
           ui: {
@@ -144,32 +143,37 @@ export class PartnerListComponent implements OnInit {
             }
           }
         },
-        orderS2n: {
+        partnerType: {
           type: 'string',
           title: '类型',
+          enum: [
+            { value: '', label: '全部' },
+            { value: 1, label: '企业' },
+            { value: 2, label: '个人' }
+          ],
           ui: {
-            widget: 'dict-select',
-            containsAllLabel: true,
-            params: { dictKey: 'refund:apply:status' },
+            widget: 'select',
             placeholder: '请选择',
             visibleIf: {
               expand: (value: boolean) => value
             }
-          }
+          },
+          default: ''
         },
-        paytype: {
+        approvalStatus: {
           type: 'string',
           title: '认证审核状态',
           ui: {
             widget: 'dict-select',
             containsAllLabel: true,
+            params: { dictKey: 'pay:mode' },
             placeholder: '请选择',
             visibleIf: {
               expand: (value: boolean) => value
             }
           }
         },
-        paymode: {
+        signStatus: {
           type: 'string',
           title: '签约状态',
           ui: {
@@ -182,7 +186,7 @@ export class PartnerListComponent implements OnInit {
             }
           }
         },
-        paymo1de: {
+        crmStatus: {
           type: 'string',
           title: 'CRM状态',
           ui: {
@@ -198,41 +202,47 @@ export class PartnerListComponent implements OnInit {
         paymo11de: {
           type: 'string',
           title: '注册渠道',
+          enum: [
+            { value: '', label: '全部' },
+            { value: 1, label: '合伙人注册' },
+            { value: 2, label: '平台添加' }
+          ],
           ui: {
-            widget: 'dict-select',
-            containsAllLabel: true,
-            params: { dictKey: 'pay:mode' },
+            widget: 'select',
             placeholder: '请选择',
             visibleIf: {
               expand: (value: boolean) => value
             }
-          }
+          },
+          default: ''
         },
-        paymo11d1e: {
+        templateId: {
           type: 'string',
           title: '返佣模板',
           ui: {
-            widget: 'dict-select',
-            containsAllLabel: true,
-            params: { dictKey: 'pay:mode' },
+            widget: 'select',
             placeholder: '请选择',
             visibleIf: {
               expand: (value: boolean) => value
             }
           }
         },
-        paymo11d11e: {
+        lockedStatus: {
           type: 'string',
           title: '合伙人状态',
+          enum: [
+            { value: '', label: '全部' },
+            { value: 0, label: '启用' },
+            { value: 1, label: '冻结' }
+          ],
           ui: {
-            widget: 'dict-select',
-            containsAllLabel: true,
-            params: { dictKey: 'pay:mode' },
+            widget: 'select',
             placeholder: '请选择',
             visibleIf: {
               expand: (value: boolean) => value
             }
-          }
+          },
+          default: ''
         },
         createTime: {
           title: '注册时间',
@@ -251,20 +261,63 @@ export class PartnerListComponent implements OnInit {
 
   private initST(): STColumn[] {
     return [
-      { title: '合伙人名称', index: 'payCode', width: 180 },
+      { title: '合伙人名称', index: 'enterpriseName', width: 180 },
       { title: '付款编码', index: 'ltdName', width: 160 },
-      { title: '邀请码', index: 'payDate', className: 'text-center', width: 130 },
-      { title: '企业管理员', index: 'payDate', width: 150 },
-      { title: '手机号', index: 'payDate', className: 'text-center', width: 150 },
-      { title: '类型', index: 'payDate', className: 'text-center', width: 130 },
+      { 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: 'payDate', className: 'text-center', width: 170 },
+      { title: '注册时间', index: 'createTime', className: 'text-center', width: 170 },
       { title: '渠道销售', index: 'payDate', width: 170 },
-      { title: '返佣模板', index: 'payDate', width: 150 },
-      { title: '认证审核状态', index: 'payDate', width: 150 },
-      { title: '签约状态', index: 'payDate', width: 150 },
-      { title: 'CRM状态', index: 'payDate', width: 150 },
-      { title: '合伙人状态', index: 'payDate', className: 'text-center', width: 140 },
+      { title: '返佣模板', index: 'templateName', width: 150 },
+      {
+        title: '认证审核状态',
+        index: 'approvalStatus',
+        width: 150,
+        type: 'badge',
+        badge: {
+          0: { text: '草稿', color: 'default' },
+          10: { text: '待审核', color: 'processing' },
+          20: { text: '审核通过', color: 'success' },
+          30: { text: '驳回', color: 'error' }
+        }
+      },
+      {
+        title: '签约状态',
+        index: 'signStatus',
+        width: 150,
+        type: 'badge',
+        badge: {
+          10: { text: '待合伙人签约', color: 'default' },
+          15: { text: '签约中', color: 'processing' },
+          20: { text: '平台签约完成', color: 'success' },
+          30: { text: '驳回', color: 'error' }
+        }
+      },
+      {
+        title: 'CRM状态',
+        index: 'crmStatus',
+        width: 150,
+        type: 'badge',
+        badge: {
+          0: { text: '未发起', color: 'default' },
+          10: { text: '待审核', color: 'processing' },
+          20: { text: '审核通过', color: 'success' },
+          30: { text: '驳回', color: 'error' }
+        }
+      },
+      {
+        title: '合伙人状态',
+        index: 'lockedStatus',
+        className: 'text-center',
+        width: 140,
+        type: 'badge',
+        badge: {
+          0: { text: '启用', color: 'success' },
+          1: { text: '冻结', color: 'error' }
+        }
+      },
       {
         title: '操作',
         fixed: 'right',
@@ -273,7 +326,13 @@ export class PartnerListComponent implements OnInit {
           { type: 'divider' },
           {
             text: '详情<br>',
-            click: item => this.router.navigate(['/partner/partner-list/detail/' + item.id])
+            click: item => {
+              if (item.partnerType === 1) {
+                this.router.navigate([`/partner/partner-list/etp-detail/${item.appUserId}`]);
+              } else {
+                this.router.navigate([`/partner/partner-list/personal-detail/${item.appUserId}`]);
+              }
+            }
           },
           {
             text: '修改返佣模板',
@@ -289,7 +348,7 @@ export class PartnerListComponent implements OnInit {
           },
           {
             text: '重发CRM流程',
-            click: item => this.router.navigate(['/partner/account-management/list/detail/' + item.id])
+            click: item => this.router.navigate([`/partner/account-management/list/detail/${item.id}`])
           }
         ]
       }
diff --git a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html
index f242099c..e00cd880 100644
--- a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html
+++ b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html
@@ -1,328 +1,492 @@
 <!-- 页头 -->
-<page-header-wrapper [logo]="logo" [content]="content" [title]="'合伙人详情'" [ngClass]="{'affix': scrollTop>210}">
-    <ng-template #logo>
-        <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
-            <i nz-icon nzType="left" nzTheme="outline"></i>
-        </button>
-    </ng-template>
-    <ng-template #content>
-        <nz-skeleton [nzLoading]="false">
-            <div class="user-info" nz-row>
-                <div nz-col [nzXl]="18" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="d-flex">
-                    <img [src]="detailData?.enterpriseLogo" />
-                    <div style="flex: 1;">
-                        <div nz-row>
-                            <div nz-col [nzLg]="12" [nzSm]="24" [nzXs]="24">
-                                <p style="margin-bottom: 0;">{{ detailData?.enterpriseName }}</p>
-                            </div>
-                            <div nz-col [nzLg]="12" [nzSm]="24" [nzXs]="24">
-                                <nz-badge nzStatus="success" nzText="正常" *ngIf="detailData?.stateLocked === 0">
-                                </nz-badge>
-                                <nz-badge nzStatus="error" nzText="冻结" *ngIf="detailData?.stateLocked === 1"></nz-badge>
-                            </div>
-                        </div>
-                        <div nz-row>
-                            <div nz-col [nzLg]="12" [nzSm]="24" [nzXs]="24">
-                                <p>{{ detailData?.unifiedSocialCreditCode }}</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?.createTime}}
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div nz-col [nzXl]="6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right mt-sm">
-                    <ng-container *ngIf="isEdit;else editButton">
-                        <button [disabled]="service.http.loading" nz-button (click)="reset()">
-                            取消
-                        </button>
-                        <button [disabled]="service.http.loading" nz-button nzDanger (click)="save()">
-                            保存
-                        </button>
-                    </ng-container>
-                    <ng-template #editButton>
-                        <ng-container>
-                            <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?.stateLocked" 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?.stateLocked" acl
-                                [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-lock']">
-                                冻结
-                            </button>
-                        </ng-container>
-                        <button [disabled]="service.http.loading" nz-button nzDanger (click)="ratify()">
-                            修改
-                        </button>
-                    </ng-template>
-                </div>
+<page-header-wrapper [logo]="logo" [content]="content" [title]="'合伙人详情'" [ngClass]="{ affix: scrollTop > 210 }">
+  <ng-template #logo>
+    <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
+      <i nz-icon nzType="left" nzTheme="outline"></i>
+    </button>
+  </ng-template>
+  <ng-template #content>
+    <nz-skeleton [nzLoading]="false">
+      <div class="user-info" nz-row>
+        <div nz-col [nzXl]="18" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="d-flex">
+          <img [src]="detailData?.enterpriseLogo" />
+          <div style="flex: 1">
+            <div nz-row>
+              <div nz-col [nzLg]="12" [nzSm]="24" [nzXs]="24">
+                <p style="margin-bottom: 0">{{ detailData?.enterpriseName }}</p>
+              </div>
+              <div nz-col [nzLg]="12" [nzSm]="24" [nzXs]="24">
+                <nz-badge nzStatus="success" nzText="正常" *ngIf="detailData?.stateLocked === 0"> </nz-badge>
+                <nz-badge nzStatus="error" nzText="冻结" *ngIf="detailData?.stateLocked === 1"></nz-badge>
+              </div>
             </div>
-        </nz-skeleton>
-    </ng-template>
+            <div nz-row>
+              <div nz-col [nzLg]="12" [nzSm]="24" [nzXs]="24">
+                <p>{{ detailData?.unifiedSocialCreditCode }}</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 }}
+              </div>
+            </div>
+          </div>
+        </div>
+        <div nz-col [nzXl]="6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right mt-sm">
+          <ng-container *ngIf="isEdit; else editButton">
+            <button [disabled]="service.http.loading" nz-button (click)="reset()"> 取消 </button>
+            <button [disabled]="service.http.loading" nz-button nzDanger (click)="save()"> 保存 </button>
+          </ng-container>
+          <ng-template #editButton>
+            <ng-container>
+              <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?.stateLocked"
+                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?.stateLocked"
+                acl
+                [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-lock']"
+              >
+                冻结
+              </button>
+            </ng-container>
+            <button [disabled]="service.http.loading" nz-button nzDanger (click)="ratify()"> 修改 </button>
+          </ng-template>
+        </div>
+      </div>
+    </nz-skeleton>
+  </ng-template>
 
-    <ng-template #frozen>
-        <ng-container
-            *ngTemplateOutlet="PopconfirmTempalte;context:{title:'确定冻结该企业吗？',content:'停用后，该企业将被限制使用，不限于访问受限、无法发布货源等，请谨慎操作'}">
-        </ng-container>
-    </ng-template>
-    <ng-template #enable>
-        <ng-container
-            *ngTemplateOutlet="PopconfirmTempalte;context:{title:'确定启用该企业吗？',content:'启用后，该企业将恢复正常使用功能，请再次确认'}">
-        </ng-container>
-    </ng-template>
-    <ng-template #Payenable>
-        <ng-container
-            *ngTemplateOutlet="PopconfirmTempalte;context:{title:'确定关闭该企业支付权限吗？',content:'停用后，该企业将被限制使用支付功能，请谨慎操作'}">
-        </ng-container>
-    </ng-template>
-    <ng-template #Payfrozen>
-        <ng-container
-            *ngTemplateOutlet="PopconfirmTempalte;context:{title:'确定开通该企业支付权限吗？',content:'启用后，该企业将恢复正常支付功能，请再次确认'}">
-        </ng-container>
-    </ng-template>
+  <ng-template #frozen>
+    <ng-container
+      *ngTemplateOutlet="
+        PopconfirmTempalte;
+        context: { title: '确定冻结该企业吗？', content: '停用后，该企业将被限制使用，不限于访问受限、无法发布货源等，请谨慎操作' }
+      "
+    >
+    </ng-container>
+  </ng-template>
+  <ng-template #enable>
+    <ng-container
+      *ngTemplateOutlet="
+        PopconfirmTempalte;
+        context: { title: '确定启用该企业吗？', content: '启用后，该企业将恢复正常使用功能，请再次确认' }
+      "
+    >
+    </ng-container>
+  </ng-template>
 </page-header-wrapper>
 
-<nz-card [class]="isEdit?'edit-box':'readOnly-box'">
-    <sv-container col="3">
-        <sv-title>企业管理员信息</sv-title>
-        <sv label="姓名">
-            <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.mobile" [readonly]="!isEdit"
-                [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
-        </sv>
-        <sv label="身份证号">
-            <input nz-input type="text" [(ngModel)]="detailData.adminUserInfo.certificateNumber" [readonly]="!isEdit"
-                [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
-        </sv>
-        <sv label="身份证照" col="2">
-            <div class="d-flex">
-                <ng-container
-                    *ngTemplateOutlet="uploadTemplate;context:{data:detailData?.adminUserInfo,status:isEdit,key:'certificatePhotoFrontWatermark',key2:'certificatePhotoFront',hover:'certificateBackFront'}">
-                </ng-container>
-                <ng-container
-                    *ngTemplateOutlet="uploadTemplate;context:{data:detailData?.adminUserInfo,status:isEdit,key:'certificatePhotoBackWatermark',key2:'certificatePhotoBack',hover:'certificateBack'}">
-                </ng-container>
-            </div>
-        </sv>
-        <sv label="身份证有效期" col="1">
-            <nz-date-picker [(ngModel)]="detailData.operatingStartTime" [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 [(ngModel)]="detailData.operatingEndTime" [nzDisabled]="!isEdit" nzPlaceHolder=" "
-                [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''" style="width: 100px;" class="calendar">
-            </nz-date-picker>
-            <ng-container *ngIf="isEdit">
-                <label nz-checkbox [ngModel]="!!!detailData.operatingEndTime"
-                    (ngModelChange)="$event?detailData.operatingEndTime='':''" class="ml-sm">长期</label>
-            </ng-container>
-        </sv>
-    </sv-container>
+<nz-card [class]="isEdit ? 'edit-box' : 'readOnly-box'">
+  <sv-container col="3">
+    <sv-title>企业管理员信息</sv-title>
+    <sv label="姓名">
+      <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.mobile"
+        [readonly]="!isEdit"
+        [nzBorderless]="!isEdit"
+        [placeholder]="isEdit ? '' : '-'"
+      />
+    </sv>
+    <sv label="身份证号">
+      <input
+        nz-input
+        type="text"
+        [(ngModel)]="detailData.adminUserInfo.certificateNumber"
+        [readonly]="!isEdit"
+        [nzBorderless]="!isEdit"
+        [placeholder]="isEdit ? '' : '-'"
+      />
+    </sv>
+    <sv label="身份证照" col="2">
+      <div class="d-flex">
+        <ng-container
+          *ngTemplateOutlet="
+            uploadTemplate;
+            context: {
+              data: detailData?.adminUserInfo,
+              status: isEdit,
+              key: 'certificatePhotoFrontWatermark',
+              key2: 'certificatePhotoFront',
+              hover: 'certificateBackFront'
+            }
+          "
+        >
+        </ng-container>
+        <ng-container
+          *ngTemplateOutlet="
+            uploadTemplate;
+            context: {
+              data: detailData?.adminUserInfo,
+              status: isEdit,
+              key: 'certificatePhotoBackWatermark',
+              key2: 'certificatePhotoBack',
+              hover: 'certificateBack'
+            }
+          "
+        >
+        </ng-container>
+      </div>
+    </sv>
+    <sv label="身份证有效期" col="1">
+      <nz-date-picker
+        [(ngModel)]="detailData.operatingStartTime"
+        [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
+        [(ngModel)]="detailData.operatingEndTime"
+        [nzDisabled]="!isEdit"
+        nzPlaceHolder=" "
+        [nzBorderless]="!isEdit"
+        [nzSuffixIcon]="isEdit ? 'calendar' : ''"
+        style="width: 100px"
+        class="calendar"
+      >
+      </nz-date-picker>
+      <ng-container *ngIf="isEdit">
+        <label
+          nz-checkbox
+          [ngModel]="!!!detailData.operatingEndTime"
+          (ngModelChange)="$event ? (detailData.operatingEndTime = '') : ''"
+          class="ml-sm"
+          >长期</label
+        >
+      </ng-container>
+    </sv>
+  </sv-container>
 
-    <nz-divider></nz-divider>
-    <sv-container col="3" class="mt16">
-        <sv-title>
-            <label class="mr-md">企业基本信息</label>
-            <label *ngIf="detailData?.approvalStatus===10" style="color: #1890ff;"><i nz-icon nzType="info-circle"
-                    nzTheme="fill" class="mr-xs"></i>待审核
-            </label>
-            <label *ngIf="detailData?.approvalStatus===20" style="color: #52c41a;"><i nz-icon nzType="check-circle"
-                    nzTheme="fill" class="mr-xs"></i>审核通过
-            </label>
-            <label *ngIf="detailData?.approvalStatus===30" style="color: #ff4d4f;"><i nz-icon nzType="close-circle"
-                    nzTheme="fill" class="mr-xs"></i>驳回&nbsp;驳回原因:{{detailData?.approvalOpinion}}
-            </label>
-            <p style="margin-bottom: 0;">
-                四要素验证：
-                <label *ngIf="detailData?.esignCheckStatus===0" style="color: #ff4d4f;"><i nz-icon nzType="info-circle"
-                        nzTheme="fill" class="mr-xs"></i>不通过&nbsp;&nbsp;驳回原因:{{detailData?.esignCheckMsg}}
-                </label>
-                <label *ngIf="detailData?.esignCheckStatus===1" style="color: #52c41a;"><i nz-icon nzType="check-circle"
-                        nzTheme="fill" class="mr-xs"></i>通过
-                </label>
-                <label *ngIf="detailData?.esignCheckStatus===2" style="color:  #1890ff;"><i nz-icon
-                        nzType="close-circle" nzTheme="fill" class="mr-xs"></i>未认证
-                </label>
-            </p>
-        </sv-title>
-        <sv label="公司名称">
-            <input nz-input type="text" [(ngModel)]="detailData.enterpriseName" [readonly]="!isEdit"
-                [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
-        </sv>
-        <sv label="统一社会信用代码">
-            <input nz-input type="text" [(ngModel)]="detailData.unifiedSocialCreditCode" [readonly]="!isEdit"
-                [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
-        </sv>
-        <sv label="营业执照" col="2">
-            <ng-container
-                *ngTemplateOutlet="uploadTemplate;context:{data:detailData,status:isEdit,key:'licensePhotoWatermark',key2:'licensePhoto',hover:'detailPhoto'}">
-            </ng-container>
-        </sv>
+  <nz-divider></nz-divider>
+  <sv-container col="3" class="mt16">
+    <sv-title>
+      <label class="mr-md">企业基本信息</label>
+      <label *ngIf="detailData?.approvalStatus === 10" style="color: #1890ff"
+        ><i nz-icon nzType="info-circle" nzTheme="fill" class="mr-xs"></i>待审核
+      </label>
+      <label *ngIf="detailData?.approvalStatus === 20" style="color: #52c41a"
+        ><i nz-icon nzType="check-circle" nzTheme="fill" class="mr-xs"></i>审核通过
+      </label>
+      <label *ngIf="detailData?.approvalStatus === 30" style="color: #ff4d4f"
+        ><i nz-icon nzType="close-circle" nzTheme="fill" class="mr-xs"></i>驳回&nbsp;驳回原因:{{ detailData?.approvalOpinion }}
+      </label>
+      <p style="margin-bottom: 0">
+        四要素验证：
+        <label *ngIf="detailData?.esignCheckStatus === 0" style="color: #ff4d4f"
+          ><i nz-icon nzType="info-circle" nzTheme="fill" class="mr-xs"></i>不通过&nbsp;&nbsp;驳回原因:{{ detailData?.esignCheckMsg }}
+        </label>
+        <label *ngIf="detailData?.esignCheckStatus === 1" style="color: #52c41a"
+          ><i nz-icon nzType="check-circle" nzTheme="fill" class="mr-xs"></i>通过
+        </label>
+        <label *ngIf="detailData?.esignCheckStatus === 2" style="color: #1890ff"
+          ><i nz-icon nzType="close-circle" nzTheme="fill" class="mr-xs"></i>未认证
+        </label>
+      </p>
+    </sv-title>
+    <sv label="公司名称">
+      <input
+        nz-input
+        type="text"
+        [(ngModel)]="detailData.enterpriseName"
+        [readonly]="!isEdit"
+        [nzBorderless]="!isEdit"
+        [placeholder]="isEdit ? '' : '-'"
+      />
+    </sv>
+    <sv label="统一社会信用代码">
+      <input
+        nz-input
+        type="text"
+        [(ngModel)]="detailData.unifiedSocialCreditCode"
+        [readonly]="!isEdit"
+        [nzBorderless]="!isEdit"
+        [placeholder]="isEdit ? '' : '-'"
+      />
+    </sv>
+    <sv label="营业执照" col="2">
+      <ng-container
+        *ngTemplateOutlet="
+          uploadTemplate;
+          context: { data: detailData, status: isEdit, key: 'licensePhotoWatermark', key2: 'licensePhoto', hover: 'detailPhoto' }
+        "
+      >
+      </ng-container>
+    </sv>
 
-        <sv label="营业期限" col="1">
-            <nz-date-picker [(ngModel)]="detailData.operatingStartTime" [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 [(ngModel)]="detailData.operatingEndTime" [nzDisabled]="!isEdit" nzPlaceHolder=" "
-                [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''" style="width: 100px;" class="calendar">
-            </nz-date-picker>
-            <ng-container *ngIf="isEdit">
-                <label nz-checkbox [ngModel]="!!!detailData.operatingEndTime"
-                    (ngModelChange)="$event?detailData.operatingEndTime='':''" class="ml-sm">长期</label>
-            </ng-container>
-        </sv>
-    </sv-container>
-    <nz-divider></nz-divider>
-    <sv-container col="3" class="mt16">
-        <sv-title>企业法人信息</sv-title>
-        <sv label="法定代表人">
-            <input nz-input type="text" [(ngModel)]="detailData.legalPersonIdentityVO.name" [readonly]="!isEdit"
-                [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
-        </sv>
-        <sv label="身份证号码">
-            <input nz-input type="text" [(ngModel)]="detailData.legalPersonIdentityVO.certificateNumber"
-                [readonly]="!isEdit" [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
-        </sv>
-        <sv label="身份证有效期" col="1">
-            <nz-date-picker [(ngModel)]="detailData.legalPersonIdentityVO.validStartTime" [nzDisabled]="!isEdit"
-                nzPlaceHolder=" " [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''" style="width: 100px;"
-                class="calendar"></nz-date-picker>
-            -
-            <ng-container
-                *ngIf="!isEdit && !detailData?.legalPersonIdentityVO?.validEndTime && detailData.legalPersonIdentityVO.validStartTime">
-                <label style="padding-left: 11px;">长期</label>
-            </ng-container>
-            <nz-date-picker [(ngModel)]="detailData.legalPersonIdentityVO.validEndTime" [nzDisabled]="!isEdit"
-                nzPlaceHolder=" " [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''" style="width: 100px;"
-                class="calendar"></nz-date-picker>
-            <ng-container *ngIf="isEdit">
-                <label nz-checkbox [ngModel]="!!!detailData.legalPersonIdentityVO.validEndTime"
-                    (ngModelChange)="$event?detailData.legalPersonIdentityVO.validEndTime='':''"
-                    class="ml-sm">长期</label>
-            </ng-container>
-        </sv>
-        <sv label="身份证照" col="1">
-            <div class="d-flex">
-                <ng-container
-                    *ngTemplateOutlet="uploadTemplate;context:{data:detailData?.legalPersonIdentityVO,status:isEdit,key:'certificatePhotoFrontWatermark',key2:'certificatePhotoFront',hover:'legalFront'}">
-                </ng-container>
-                <ng-container
-                    *ngTemplateOutlet="uploadTemplate;context:{data:detailData?.legalPersonIdentityVO,status:isEdit,key:'certificatePhotoBackWatermark',key2:'certificatePhotoBack',hover:'legalBack'}">
-                </ng-container>
-            </div>
-        </sv>
-        <sv label="所属城市">
-            <ng-container *ngIf="isEdit; else cascaderelseTemplate">
-                <nz-cascader [(ngModel)]="enterpriseAddressCode" [nzLoadData]="loadRegionData">
-                </nz-cascader>
-            </ng-container>
-            <ng-template #cascaderelseTemplate>
-                {{ detailData?.fullRegionVO?.provinceName }}{{ detailData?.fullRegionVO?.cityName }}{{
-                detailData?.fullRegionVO?.areaName }}
-            </ng-template>
-        </sv>
-    </sv-container>
-    <nz-divider></nz-divider>
-    <nz-divider></nz-divider>
-    <sv-container col="3" class="mt16">
-        <sv-title>渠道销售信息</sv-title>
-        <sv label="姓名">
-            张学友
-        </sv>
-        <sv label="手机号">
-            13999999999
-        </sv>
-        <sv label="绑定时间">
-            2021-09-23 14:43:31
-        </sv>
-    </sv-container>
+    <sv label="营业期限" col="1">
+      <nz-date-picker
+        [(ngModel)]="detailData.operatingStartTime"
+        [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
+        [(ngModel)]="detailData.operatingEndTime"
+        [nzDisabled]="!isEdit"
+        nzPlaceHolder=" "
+        [nzBorderless]="!isEdit"
+        [nzSuffixIcon]="isEdit ? 'calendar' : ''"
+        style="width: 100px"
+        class="calendar"
+      >
+      </nz-date-picker>
+      <ng-container *ngIf="isEdit">
+        <label
+          nz-checkbox
+          [ngModel]="!!!detailData.operatingEndTime"
+          (ngModelChange)="$event ? (detailData.operatingEndTime = '') : ''"
+          class="ml-sm"
+          >长期</label
+        >
+      </ng-container>
+    </sv>
+  </sv-container>
+  <nz-divider></nz-divider>
+  <sv-container col="3" class="mt16">
+    <sv-title>企业法人信息</sv-title>
+    <sv label="法定代表人">
+      <input
+        nz-input
+        type="text"
+        [(ngModel)]="detailData.legalPersonIdentity.name"
+        [readonly]="!isEdit"
+        [nzBorderless]="!isEdit"
+        [placeholder]="isEdit ? '' : '-'"
+      />
+    </sv>
+    <sv label="身份证号码">
+      <input
+        nz-input
+        type="text"
+        [(ngModel)]="detailData.legalPersonIdentity.certificateNumber"
+        [readonly]="!isEdit"
+        [nzBorderless]="!isEdit"
+        [placeholder]="isEdit ? '' : '-'"
+      />
+    </sv>
+    <sv label="身份证有效期" col="1">
+      <nz-date-picker
+        [(ngModel)]="detailData.legalPersonIdentity.validStartTime"
+        [nzDisabled]="!isEdit"
+        nzPlaceHolder=" "
+        [nzBorderless]="!isEdit"
+        [nzSuffixIcon]="isEdit ? 'calendar' : ''"
+        style="width: 100px"
+        class="calendar"
+      ></nz-date-picker>
+      -
+      <ng-container *ngIf="!isEdit && !detailData?.legalPersonIdentity?.validEndTime && detailData.legalPersonIdentity.validStartTime">
+        <label style="padding-left: 11px">长期</label>
+      </ng-container>
+      <nz-date-picker
+        [(ngModel)]="detailData.legalPersonIdentity.validEndTime"
+        [nzDisabled]="!isEdit"
+        nzPlaceHolder=" "
+        [nzBorderless]="!isEdit"
+        [nzSuffixIcon]="isEdit ? 'calendar' : ''"
+        style="width: 100px"
+        class="calendar"
+      ></nz-date-picker>
+      <ng-container *ngIf="isEdit">
+        <label
+          nz-checkbox
+          [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
+          *ngTemplateOutlet="
+            uploadTemplate;
+            context: {
+              data: detailData?.legalPersonIdentity,
+              status: isEdit,
+              key: 'certificatePhotoFrontWatermark',
+              key2: 'certificatePhotoFront',
+              hover: 'legalFront'
+            }
+          "
+        >
+        </ng-container>
+        <ng-container
+          *ngTemplateOutlet="
+            uploadTemplate;
+            context: {
+              data: detailData?.legalPersonIdentity,
+              status: isEdit,
+              key: 'certificatePhotoBackWatermark',
+              key2: 'certificatePhotoBack',
+              hover: 'legalBack'
+            }
+          "
+        >
+        </ng-container>
+      </div>
+    </sv>
+    <sv label="所属城市">
+      <ng-container *ngIf="isEdit; else cascaderelseTemplate">
+        <nz-cascader [(ngModel)]="enterpriseAddressCode" [nzLoadData]="loadRegionData"> </nz-cascader>
+      </ng-container>
+      <ng-template #cascaderelseTemplate>
+        {{ detailData?.fullRegionVO?.provinceName }}{{ detailData?.fullRegionVO?.cityName }}{{ detailData?.fullRegionVO?.areaName }}
+      </ng-template>
+    </sv>
+  </sv-container>
+  <nz-divider></nz-divider>
+  <nz-divider></nz-divider>
+  <sv-container col="3" class="mt16">
+    <sv-title>渠道销售信息</sv-title>
+    <sv label="姓名"> 张学友 </sv>
+    <sv label="手机号"> 13999999999 </sv>
+    <sv label="绑定时间"> 2021-09-23 14:43:31 </sv>
+  </sv-container>
 </nz-card>
 
 <nz-card>
-    <sv-container col="3" class="mt16">
-        <sv-title>修改渠道销售记录</sv-title>
-        <sv label="">
-            <st #st [data]="service.$mock_url" [columns]="columns.logsColumn" [loading]="service.http.loading" bordered
-                size="small" [page]="{show:false}" [scroll]="{ x:'1200px' }">
-            </st>
-        </sv>
-    </sv-container>
+  <sv-container col="3" class="mt16">
+    <sv-title>修改渠道销售记录</sv-title>
+    <sv label="">
+      <st
+        #st
+        [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>
 </nz-card>
 
 <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">
-            {{content}}
-        </div>
+  <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">
+      {{ content }}
     </div>
+  </div>
 </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)">
-        <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">
-            <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">
-                <i nz-icon nzType="close-circle" nzTheme="fill" class="delete-icon"
-                    (click)="deleteImg(data,key,key2)"></i>
-                <div style="display: flex;align-items: center;">
-                    <i nz-icon nzType="eye" nzTheme="fill" class="show-icon" (click)="service.showImg(data[key])"></i>
-                </div>
-            </div>
+  <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"
+    >
+      <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">
+        <i nz-icon nzType="close-circle" nzTheme="fill" class="delete-icon" (click)="deleteImg(data, key, key2)"></i>
+        <div style="display: flex; align-items: center">
+          <i nz-icon nzType="eye" nzTheme="fill" class="show-icon" (click)="service.showImg(data[key])"></i>
         </div>
-    </nz-upload>
+      </div>
+    </div>
+  </nz-upload>
 </ng-template>
 
 <ng-template #logModal>
-    <h2>转移客户数：10</h2>
-    <st #st [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 [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>
\ No newline at end of file
+  <h2>转移客户数：10</h2>
+  <st
+    #st
+    [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
+    [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>
diff --git a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts
index fdfd31a3..cd51553b 100644
--- a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts
+++ b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts
@@ -1,10 +1,11 @@
 import { DatePipe } from '@angular/common';
-import { Component, OnInit, ViewChild } from '@angular/core';
+import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
 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 { Subscription, fromEvent } from 'rxjs';
+
 import { PartnerListService } from '../../services/partner-list.service';
 import { PartnerAuditModalComponent } from '../partner-audit-modal/partner-audit-modal.component';
 
@@ -14,13 +15,13 @@ import { PartnerAuditModalComponent } from '../partner-audit-modal/partner-audit
   styleUrls: ['./partner-detail.component.less'],
   providers: [DatePipe]
 })
-export class PartnerDetailComponent implements OnInit {
+export class PartnerDetailComponent implements OnInit, OnDestroy {
   @ViewChild('logModal')
   logModal: any;
 
   columns: { logsColumn: STColumn[]; changeColumn: STColumn[]; beChangeColumn: STColumn[] } = this.initST();
 
-  detailData: any = { adminUserInfo: { name: '' }, legalPersonIdentityVO: { name: '' } };
+  detailData: any = { adminUserInfo: { name: '' }, legalPersonIdentity: { name: '' } };
   tempalateData = { ...this.detailData };
 
   isEdit = false;
@@ -64,21 +65,21 @@ export class PartnerDetailComponent implements OnInit {
   }
 
   initData() {
-    // this.service
-    //   .request(this.service.$api_get_freight_detail, {
-    //     id: this.route.snapshot.params.id
-    //   })
-    //   .subscribe(res => {
-    //     if (res) {
-    //       this.detailData = res;
-    //       this.tempalateData = { ...this.detailData };
-    //       this.enterpriseAddressCode = [
-    //         Number(this.detailData.fullRegionVO?.provinceCode),
-    //         Number(this.detailData.fullRegionVO?.cityCode),
-    //         Number(this.detailData.fullRegionVO?.areaCode)
-    //       ];
-    //     }
-    //   });
+    this.service
+      .request(this.service.$api_get_ent_partner_detail, {
+        id: this.route.snapshot.params.id
+      })
+      .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);
+          }
+        }
+      });
   }
 
   goBack() {
@@ -161,6 +162,7 @@ export class PartnerDetailComponent implements OnInit {
 
   /**
    * 级联获取地区数据
+   *
    * @param node 节点
    * @param index 层级
    * @returns
@@ -186,9 +188,9 @@ export class PartnerDetailComponent implements OnInit {
 
   save() {
     const dateil = { ...this.detailData };
-    Object.assign(dateil.legalPersonIdentityVO, {
-      validStartTime: this.datePipe.transform(dateil.legalPersonIdentityVO.validStartTime, 'yyyy-MM-dd'),
-      validEndTime: this.datePipe.transform(dateil.legalPersonIdentityVO.validEndTime, 'yyyy-MM-dd')
+    Object.assign(dateil.legalPersonIdentity, {
+      validStartTime: this.datePipe.transform(dateil.legalPersonIdentity.validStartTime, 'yyyy-MM-dd'),
+      validEndTime: this.datePipe.transform(dateil.legalPersonIdentity.validEndTime, 'yyyy-MM-dd')
     });
     const params = {};
     Object.assign(params, {
@@ -207,7 +209,7 @@ export class PartnerDetailComponent implements OnInit {
       enterpriseRegistrationTime: this.datePipe.transform(dateil.enterpriseRegistrationTime, 'yyyy-MM-dd'),
       enterpriseType: dateil.enterpriseType,
       id: dateil.id,
-      legalPersonIdentityDTO: { ...dateil.legalPersonIdentityVO },
+      legalPersonIdentityDTO: { ...dateil.legalPersonIdentity },
       licensePhoto: dateil.licensePhoto,
       licensePhotoWatermark: dateil.licensePhotoWatermark,
       networkTransporter: dateil.networkTransporter,
@@ -243,21 +245,21 @@ export class PartnerDetailComponent implements OnInit {
     //       if (isFront === 'front') {
     //         // 正面
     //         if (res.name) {
-    //           this.detailData.legalPersonIdentityVO.name = res.name;
+    //           this.detailData.legalPersonIdentity.name = res.name;
     //         }
     //         if (res.number) {
-    //           this.detailData.legalPersonIdentityVO.certificateNumber = res.number;
+    //           this.detailData.legalPersonIdentity.certificateNumber = res.number;
     //         }
     //       }
     //       if (isFront === 'back') {
     //         // 背面
     //         if (res.validFrom) {
-    //           this.detailData.legalPersonIdentityVO.validStartTime = res.validFrom;
+    //           this.detailData.legalPersonIdentity.validStartTime = res.validFrom;
     //         }
     //         if (res.validTo) {
-    //           this.detailData.legalPersonIdentityVO.validEndTime = res.validTo;
+    //           this.detailData.legalPersonIdentity.validEndTime = res.validTo;
     //         } else {
-    //           this.detailData.legalPersonIdentityVO.validEndTime = null;
+    //           this.detailData.legalPersonIdentity.validEndTime = null;
     //         }
     //       }
     //     }
@@ -320,13 +322,13 @@ export class PartnerDetailComponent implements OnInit {
   private initST(): { logsColumn: STColumn[]; changeColumn: STColumn[]; beChangeColumn: STColumn[] } {
     return {
       logsColumn: [
-        { title: '修改后渠道销售', index: 'payCode', width: 180 },
-        { title: '修改前渠道销售', index: 'ltdName', width: 160 },
-        { title: '转移客户数', index: 'payDate', className: 'text-center', width: 130 },
-        { title: '生效节点', index: 'payDate', width: 150 },
-        { title: '备注', index: 'payDate', className: 'text-center', width: 150 },
-        { title: '修改时间', index: 'payDate', className: 'text-center', width: 130 },
-        { title: '操作人', index: 'payDate', type: 'date', width: 130 },
+        { title: '修改后渠道销售', index: 'newChannelId', width: 180 },
+        { title: '修改前渠道销售', index: 'originalChannelId', 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: 'modifyUserId', type: 'date', width: 130 },
         {
           title: '操作',
           fixed: 'right',
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
new file mode 100644
index 00000000..893cf685
--- /dev/null
+++ b/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.html
@@ -0,0 +1,253 @@
+<!-- 页头 -->
+<page-header-wrapper [logo]="logo" [content]="content" [title]="'合伙人详情'">
+  <ng-template #logo>
+    <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
+      <i nz-icon nzType="left" nzTheme="outline"></i>
+    </button>
+  </ng-template>
+  <ng-template #content>
+    <nz-skeleton [nzLoading]="false">
+      <div class="user-info" nz-row>
+        <div nz-col [nzXl]="18" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="d-flex">
+          <img [src]="detailData?.enterpriseLogo" />
+          <div style="flex: 1">
+            <div nz-row>
+              <div nz-col [nzLg]="12" [nzSm]="24" [nzXs]="24">
+                <p style="margin-bottom: 0">{{ detailData?.enterpriseName }}</p>
+              </div>
+              <div nz-col [nzLg]="12" [nzSm]="24" [nzXs]="24">
+                <nz-badge nzStatus="success" nzText="正常" *ngIf="detailData?.stateLocked === 0"> </nz-badge>
+                <nz-badge nzStatus="error" nzText="冻结" *ngIf="detailData?.stateLocked === 1"></nz-badge>
+              </div>
+            </div>
+            <div nz-row>
+              <div nz-col [nzLg]="12" [nzSm]="24" [nzXs]="24">
+                <p>{{ detailData?.unifiedSocialCreditCode }}</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 }}
+              </div>
+            </div>
+          </div>
+        </div>
+        <div nz-col [nzXl]="6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right mt-sm">
+          <ng-container *ngIf="isEdit; else editButton">
+            <button [disabled]="service.http.loading" nz-button (click)="reset()"> 取消 </button>
+            <button [disabled]="service.http.loading" nz-button nzDanger (click)="save()"> 保存 </button>
+          </ng-container>
+          <ng-template #editButton>
+            <ng-container>
+              <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?.stateLocked"
+                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?.stateLocked"
+                acl
+                [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-lock']"
+              >
+                冻结
+              </button>
+            </ng-container>
+            <button [disabled]="service.http.loading" nz-button nzDanger (click)="ratify()"> 修改 </button>
+          </ng-template>
+        </div>
+      </div>
+    </nz-skeleton>
+  </ng-template>
+
+  <ng-template #frozen>
+    <ng-container
+      *ngTemplateOutlet="
+        PopconfirmTempalte;
+        context: { title: '确定冻结该企业吗？', content: '停用后，该企业将被限制使用，不限于访问受限、无法发布货源等，请谨慎操作' }
+      "
+    >
+    </ng-container>
+  </ng-template>
+  <ng-template #enable>
+    <ng-container
+      *ngTemplateOutlet="
+        PopconfirmTempalte;
+        context: { title: '确定启用该企业吗？', content: '启用后，该企业将恢复正常使用功能，请再次确认' }
+      "
+    >
+    </ng-container>
+  </ng-template>
+</page-header-wrapper>
+
+<nz-card [class]="isEdit ? 'edit-box' : 'readOnly-box'">
+  <sv-container col="3" class="mt16">
+    <sv-title>合伙人信息</sv-title>
+    <sv label="姓名">
+      <input
+        nz-input
+        type="text"
+        [(ngModel)]="detailData.legalPersonIdentity.name"
+        [readonly]="!isEdit"
+        [nzBorderless]="!isEdit"
+        [placeholder]="isEdit ? '' : '-'"
+      />
+    </sv>
+    <sv label="手机号">
+      <input
+        nz-input
+        type="text"
+        [(ngModel)]="detailData.legalPersonIdentity.certificateNumber"
+        [readonly]="!isEdit"
+        [nzBorderless]="!isEdit"
+        [placeholder]="isEdit ? '' : '-'"
+      />
+    </sv>
+    <sv label="身份证号">
+      <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.legalPersonIdentity.validStartTime"
+        [nzDisabled]="!isEdit"
+        nzPlaceHolder=" "
+        [nzBorderless]="!isEdit"
+        [nzSuffixIcon]="isEdit ? 'calendar' : ''"
+        style="width: 100px"
+        class="calendar"
+      ></nz-date-picker>
+      -
+      <ng-container *ngIf="!isEdit && !detailData?.legalPersonIdentity?.validEndTime && detailData.legalPersonIdentity.validStartTime">
+        <label style="padding-left: 11px">长期</label>
+      </ng-container>
+      <nz-date-picker
+        [(ngModel)]="detailData.legalPersonIdentity.validEndTime"
+        [nzDisabled]="!isEdit"
+        nzPlaceHolder=" "
+        [nzBorderless]="!isEdit"
+        [nzSuffixIcon]="isEdit ? 'calendar' : ''"
+        style="width: 100px"
+        class="calendar"
+      ></nz-date-picker>
+      <ng-container *ngIf="isEdit">
+        <label
+          nz-checkbox
+          [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
+          *ngTemplateOutlet="
+            uploadTemplate;
+            context: {
+              data: detailData?.legalPersonIdentity,
+              status: isEdit,
+              key: 'certificatePhotoFrontWatermark',
+              key2: 'certificatePhotoFront',
+              hover: 'legalFront'
+            }
+          "
+        >
+        </ng-container>
+        <ng-container
+          *ngTemplateOutlet="
+            uploadTemplate;
+            context: {
+              data: detailData?.legalPersonIdentity,
+              status: isEdit,
+              key: 'certificatePhotoBackWatermark',
+              key2: 'certificatePhotoBack',
+              hover: 'legalBack'
+            }
+          "
+        >
+        </ng-container>
+      </div>
+    </sv>
+    <sv label="所属城市">
+      <ng-container *ngIf="isEdit; else cascaderelseTemplate">
+        <nz-cascader [(ngModel)]="enterpriseAddressCode" [nzLoadData]="loadRegionData"> </nz-cascader>
+      </ng-container>
+      <ng-template #cascaderelseTemplate>
+        {{ detailData?.fullRegionVO?.provinceName }}{{ detailData?.fullRegionVO?.cityName }}{{ detailData?.fullRegionVO?.areaName }}
+      </ng-template>
+    </sv>
+  </sv-container>
+</nz-card>
+
+<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">
+      {{ content }}
+    </div>
+  </div>
+</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)"
+  >
+    <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"
+    >
+      <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">
+        <i nz-icon nzType="close-circle" nzTheme="fill" class="delete-icon" (click)="deleteImg(data, key, key2)"></i>
+        <div style="display: flex; align-items: center">
+          <i nz-icon nzType="eye" nzTheme="fill" class="show-icon" (click)="service.showImg(data[key])"></i>
+        </div>
+      </div>
+    </div>
+  </nz-upload>
+</ng-template>
diff --git a/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.less b/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.less
new file mode 100644
index 00000000..eadc3a6a
--- /dev/null
+++ b/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.less
@@ -0,0 +1,30 @@
+@import '../../../../usercenter/less/edit.less';
+
+
+.user-info {
+  font-size: 16px;
+
+  .enterprise-name {
+    margin-right: 15px;
+  }
+
+  img {
+    width        : 64px;
+    height       : 64px;
+    margin-right : 15px;
+    border-radius: 50%;
+  }
+
+  .user-info-des {
+    margin-bottom: 5px;
+  }
+}
+
+:host::ng-deep {
+  .affix {
+    position: fixed !important;
+    top     : 20px !important;
+    z-index : 999 !important;
+    width   : 100% !important;
+  }
+}
\ No newline at end of file
diff --git a/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts b/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts
new file mode 100644
index 00000000..a39fb28e
--- /dev/null
+++ b/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts
@@ -0,0 +1,240 @@
+import { DatePipe } from '@angular/common';
+import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
+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 { Subscription, fromEvent } from 'rxjs';
+
+import { PartnerListService } from '../../services/partner-list.service';
+import { PartnerAuditModalComponent } from '../partner-audit-modal/partner-audit-modal.component';
+
+@Component({
+  selector: 'app-personal-partner-detail',
+  templateUrl: './personal-partner-detail.component.html',
+  styleUrls: ['./personal-partner-detail.component.less'],
+  providers: [DatePipe]
+})
+export class PersonalPartnerDetailComponent implements OnInit {
+  detailData: any = { adminUserInfo: { name: '' }, legalPersonIdentity: { name: '' } };
+  tempalateData = { ...this.detailData };
+
+  isEdit = false;
+
+  uploadURl = apiConf.waterFileUpload;
+  disabledUpload = false;
+  enterpriseAddressCode: any = [];
+
+  constructor(
+    public service: PartnerListService,
+    private route: ActivatedRoute,
+    private nzModalService: NzModalService,
+    private datePipe: DatePipe
+  ) {}
+
+  ngOnInit() {
+    this.initData();
+  }
+
+  initData() {
+    this.service
+      .request(this.service.$api_get_personal_partner_detail, {
+        id: this.route.snapshot.params.id
+      })
+      .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);
+          }
+        }
+      });
+  }
+
+  goBack() {
+    window.history.go(-1);
+  }
+  /**
+   * 冻结
+   */
+  freezeOrResume(type: number) {
+    // this.service.http
+    //   .post(this.service.$api_lock_freight, {
+    //     id: this.route.snapshot.params.id,
+    //     statedLocked: !!type
+    //   })
+    //   .subscribe(res => {
+    //     if (res.data === true) {
+    //       if (type === 0) {
+    //         this.service.msgSrv.success(`启用成功！`);
+    //       } else {
+    //         this.service.msgSrv.success(`冻结成功！`);
+    //       }
+    //       this.initData();
+    //     } else {
+    //       this.service.msgSrv.error(res.msg || '操作失败！');
+    //     }
+    //   });
+  }
+
+  auditPartner(isPass: boolean) {
+    const modal = this.nzModalService.create({
+      nzTitle: '审核',
+      nzContent: PartnerAuditModalComponent,
+      nzComponentParams: { info: { ...this.detailData, isPass } },
+      nzFooter: null
+    });
+  }
+
+  ratify() {
+    this.isEdit = true;
+  }
+
+  deleteImg(data: any, key: string, key2: string) {
+    this.nzModalService.warning({
+      nzTitle: '是否确认删除该图片',
+      nzOnOk: () => {
+        this.disabledUpload = true;
+        data[key] = '';
+        data[key2] = '';
+        setTimeout(() => {
+          this.disabledUpload = false;
+        }, 100);
+      }
+    });
+  }
+  changeUpload({ file, fileList, type }: any, data: any, key: string, key2: string, id: string) {
+    if (type === 'success') {
+      data[key] = file.response.data?.fullFileWatermarkPath;
+      data[key2] = file.response.data?.fullFilePath;
+      if (id === 'legalFront' || id === 'legalBack') {
+        this.checkIdCard(file.response.data?.fullFilePath, id === 'legalFront' ? 'front' : 'back', 1);
+      }
+      if (id === 'certificateBackFront' || id === 'certificateBack') {
+        this.checkIdCard(file.response.data?.fullFilePath, id === 'certificateBackFront' ? 'front' : 'back', 0);
+      }
+    }
+  }
+
+  /**
+   * 级联获取地区数据
+   *
+   * @param node 节点
+   * @param index 层级
+   * @returns
+   */
+  loadRegionData = (node: any, index: number) => {
+    return new Promise(resolve => {
+      this.service.request(this.service.$api_get_region_by_code, { regionCode: node?.regionCode || '' }).subscribe(
+        res => {
+          node.children = res.map((item: any) => ({ ...item, isLeaf: index === 1, value: item.regionCode, label: item.name }));
+        },
+        _ => {},
+        () => {
+          resolve(node);
+        }
+      );
+    });
+  };
+
+  reset() {
+    this.detailData = { ...this.tempalateData };
+    this.isEdit = false;
+  }
+
+  save() {
+    const dateil = { ...this.detailData };
+    Object.assign(dateil.legalPersonIdentity, {
+      validStartTime: this.datePipe.transform(dateil.legalPersonIdentity.validStartTime, 'yyyy-MM-dd'),
+      validEndTime: this.datePipe.transform(dateil.legalPersonIdentity.validEndTime, 'yyyy-MM-dd')
+    });
+    const params = {};
+    Object.assign(params, {
+      adminMobile: dateil.adminMobile,
+      adminAppUserId: dateil.adminAppUserId,
+      adminUserInfo: { ...dateil.adminUserInfo },
+      bankAccount: dateil.bankAccount,
+      businessScope: dateil.businessScope,
+      createBank: dateil.createBank,
+      creditPhoto: dateil.creditPhoto,
+      creditPhotoWatermark: dateil.creditPhotoWatermark,
+      enterpriseAddress: dateil.enterpriseAddress,
+      enterpriseAddressCode: this.enterpriseAddressCode[2],
+      enterpriseLogo: dateil.enterpriseLogo,
+      enterpriseName: dateil.enterpriseName,
+      enterpriseRegistrationTime: this.datePipe.transform(dateil.enterpriseRegistrationTime, 'yyyy-MM-dd'),
+      enterpriseType: dateil.enterpriseType,
+      id: dateil.id,
+      legalPersonIdentityDTO: { ...dateil.legalPersonIdentity },
+      licensePhoto: dateil.licensePhoto,
+      licensePhotoWatermark: dateil.licensePhotoWatermark,
+      networkTransporter: dateil.networkTransporter,
+      oftenUsedServices: dateil.oftenUsedServices,
+      operatingEndTime: this.datePipe.transform(dateil.operatingEndTime, 'yyyy-MM-dd'),
+      operatingStartTime: this.datePipe.transform(dateil.operatingStartTime, 'yyyy-MM-dd'),
+      promotersTelephone: dateil.promotersTelephone,
+      registerAddress: dateil.registerAddress,
+      registerPhone: dateil.registerPhone,
+      registrationCapital: dateil.registrationCapital,
+      taxAuthority: dateil.taxAuthority,
+      unifiedSocialCreditCode: dateil.unifiedSocialCreditCode
+    });
+    // this.service.request(this.service.$api_save_enterprise_admin, params).subscribe(res => {
+    //   if (res) {
+    //     this.service.msgSrv.success('企业修改成功');
+    //     this.initData();
+    //     this.isEdit = false;
+    //   }
+    // });
+  }
+
+  // 识别身份证 参数isFront：front-正面、back-背面；type：0-申请人身份证，1-法定代表人身份证
+  checkIdCard(imgurl: any, isFront: string, type: number) {
+    const params = {
+      idCardUrl: imgurl,
+      side: isFront
+    };
+    // this.service.request(this.service.$api_ocr_recognize_id_card, params).subscribe(res => {
+    //   if (res) {
+    //     if (type === 1) {
+    //       // 法定代表人证件照
+    //       if (isFront === 'front') {
+    //         // 正面
+    //         if (res.name) {
+    //           this.detailData.legalPersonIdentity.name = res.name;
+    //         }
+    //         if (res.number) {
+    //           this.detailData.legalPersonIdentity.certificateNumber = res.number;
+    //         }
+    //       }
+    //       if (isFront === 'back') {
+    //         // 背面
+    //         if (res.validFrom) {
+    //           this.detailData.legalPersonIdentity.validStartTime = res.validFrom;
+    //         }
+    //         if (res.validTo) {
+    //           this.detailData.legalPersonIdentity.validEndTime = res.validTo;
+    //         } else {
+    //           this.detailData.legalPersonIdentity.validEndTime = null;
+    //         }
+    //       }
+    //     }
+    //     // 企业管理员证件照
+    //     if (type === 0) {
+    //       if (isFront === 'front') {
+    //         // 正面
+    //         if (res.name) {
+    //           this.detailData.adminUserInfo.name = res.name;
+    //         }
+    //         if (res.number) {
+    //           this.detailData.adminUserInfo.certificateNumber = res.number;
+    //         }
+    //       }
+    //     }
+    //   }
+    // });
+  }
+}
diff --git a/src/app/routes/partner/partner-list/services/partner-list.service.ts b/src/app/routes/partner/partner-list/services/partner-list.service.ts
index eecd75f5..a916f8b4 100644
--- a/src/app/routes/partner/partner-list/services/partner-list.service.ts
+++ b/src/app/routes/partner/partner-list/services/partner-list.service.ts
@@ -7,6 +7,19 @@ import { ImageViewComponent } from 'src/app/shared/components/imagelist';
 export class PartnerListService extends BaseService {
   $mock_url = '/rule?_allow_anonymous=true';
 
+  // 查询合伙人信息-分页
+  $api_get_partner_page = '/api/mdc/partner/list/page';
+  // 新增/更新保存企业合伙人信息
+  $api_save_entp_partner = '/api/mdc/partner/saveEnterprise';
+  // 新增/更新个人合伙人信息
+  $api_save_personal_partner = '/api/mdc/partner/savePersonally';
+  // 获取企业合伙人信息
+  $api_get_ent_partner_detail = '/api/mdc/partner/getEnterprise';
+  // 获取合伙人信息
+  $api_get_personal_partner_detail = '/api/mdc/partner/getPersonally';
+  // 查询合伙人修改渠道渠道销售记录
+  $api_get_personal_channel_list = '/api/mdc/partnerChannelRelLog/list/page';
+
   // 根据地区code查询列表
   $api_get_region_by_code = '/api/mdc/pbc/region/getRegionByCode';
   // 根据地区code查询地区详情
diff --git a/src/app/routes/partner/partner-routing.module.ts b/src/app/routes/partner/partner-routing.module.ts
index 6f0e0cc6..27c92fb7 100644
--- a/src/app/routes/partner/partner-routing.module.ts
+++ b/src/app/routes/partner/partner-routing.module.ts
@@ -10,41 +10,43 @@
  */
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
+
+import { PartnerAccountManagementAccountDetailComponent } from './account-management/components/account-detail/account-detail.component';
+import { PartnerAccountManagementListComponent } from './account-management/components/list/list.component';
+import { PartnerAccountManagementRecordedDetailComponent } from './account-management/components/recorded-detail/recorded-detail.component';
 import { PartnerBusinessStatisticsIndexComponent } from './business-statistics/components/index/index.component';
 import { PartnerPartnerCustomDetailComponent } from './business-statistics/components/partner-custom-detail/partner-custom-detail.component';
-import { PartnerSaleCustomDetailComponent } from './business-statistics/components/sale-custom-detail/sale-custom-detail.component';
-import { ParterChannelSalesEditComponent } from './channel-sales/components/edit/edit.component';
-import { ParterChannelSalesListComponent } from './channel-sales/components/list/list.component';
-import { ParterLevelConfigEditComponent } from './level-config/components/edit/edit.component';
-import { ParterLevelConfigListComponent } from './level-config/components/list/list.component';
-import { ParterRebateManageMentParticularsComponent } from './rebate-management/components/particulars/particulars.component';
-import { PartnerSalePartnerDetailComponent } from './business-statistics/components/sale-partner-detail/sale-partner-detail.component';
 import { PartnerPartnerCustomOrderDetailComponent } from './business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component';
 import { PartnerPartnerOrderDetailComponent } from './business-statistics/components/partner-order-detail/partner-order-detail.component';
-import { PartnerAccountManagementListComponent } from './account-management/components/list/list.component';
-import { ParterClaimAuditListComponent } from './claim-audit/components/list/list.component';
+import { PartnerSaleCustomDetailComponent } from './business-statistics/components/sale-custom-detail/sale-custom-detail.component';
+import { PartnerSalePartnerDetailComponent } from './business-statistics/components/sale-partner-detail/sale-partner-detail.component';
+import { ParterChannelSalesEditComponent } from './channel-sales/components/edit/edit.component';
+import { ParterChannelSalesListComponent } from './channel-sales/components/list/list.component';
 import { ParterClaimAuditListChannelDetailComponent } from './claim-audit/components/channel-detail/channel-detail.component';
+import { ParterClaimAuditListComponent } from './claim-audit/components/list/list.component';
 import { ParterClaimAuditListPartnerDetailComponent } from './claim-audit/components/partner-detail/partner-detail.component';
+import { ParterLevelConfigEditComponent } from './level-config/components/edit/edit.component';
+import { ParterLevelConfigListComponent } from './level-config/components/list/list.component';
+import { PartnerDetailComponent } from './partner-list/components/partner-detail/partner-detail.component';
+import { ParterRebateManageMentParticularsComponent } from './rebate-management/components/particulars/particulars.component';
 import { ParterRebateManageMentRecordComponent } from './rebate-management/components/rebate-record/rebate-record.component';
-import { PartnerAccountManagementAccountDetailComponent } from './account-management/components/account-detail/account-detail.component';
-import { PartnerAccountManagementRecordedDetailComponent } from './account-management/components/recorded-detail/recorded-detail.component';
 import { PartnerAccountManagementWithdrawalsRecordComponent } from './account-management/components/withdrawals-record/withdrawals-record.component';
 import { PartnerAccountManagementWithdralDetailComponent } from './account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component';
-import { PartnerRecordedRecordComponent } from './recorded/components/record/record.component';
-import { PartnerRecordedDetailComponent } from './recorded/components/detail/detail.component';
+import { ParterRebateManageMentAddComponent } from './rebate-management/components/rebate-setting/add/add.component';
 import { ParterRebateManageMentSettingComponent } from './rebate-management/components/rebate-setting/rebate-setting.component';
+import { PartnerRecordedDetailComponent } from './recorded/components/detail/detail.component';
+import { PartnerRecordedRecordComponent } from './recorded/components/record/record.component';
 import { AddEtpPartnerComponent } from './partner-list/components/add-etp-partner/add-etp-partner.component';
 import { AddPersonalPartnerComponent } from './partner-list/components/add-personal-partner/add-personal-partner.component';
-import { PartnerDetailComponent } from './partner-list/components/partner-detail/partner-detail.component';
 import { PartnerListComponent } from './partner-list/components/index/partner-list.component';
-import { ParterRebateManageMentAddComponent } from './rebate-management/components/rebate-setting/add/add.component';
 import { PartnerKnowledgeClassificationListComponent } from './knowledge/classification/components/list/list.component';
 import { ParterArticleManagementListComponent } from './article-management/components/list/list.component';
 import { ParterArticleManagementEditComponent } from './article-management/components/edit/edit.component';
+import { ScrollimgComponentsAddComponent } from './scrollimg/components/add/add.component';
 import { ScrollImgComponentsListComponent } from './scrollimg/components/list/list.component';
 import { BannerComponentsListComponent } from './knowledge/banner/components/list/list.component';
-import { ScrollimgComponentsAddComponent } from './scrollimg/components/add/add.component';
 import { BannerComponentsAddComponent } from './knowledge/banner/components/add/add.component';
+import { PersonalPartnerDetailComponent } from './partner-list/components/personal-partner-detail/personal-partner-detail.component';
 
 const routes: Routes = [
   {
@@ -81,7 +83,7 @@ const routes: Routes = [
       { path: 'particulars', component: ParterRebateManageMentParticularsComponent },
       { path: 'record', component: ParterRebateManageMentRecordComponent },
       { path: 'setting', component: ParterRebateManageMentSettingComponent },
-      { path: 'setting/add/:id', component: ParterRebateManageMentAddComponent },
+      { path: 'setting/add/:id', component: ParterRebateManageMentAddComponent }
     ]
   },
   {
@@ -93,7 +95,7 @@ const routes: Routes = [
           { path: '', redirectTo: 'list' },
           { path: 'list', component: PartnerAccountManagementListComponent },
           { path: 'detail/:id', component: PartnerAccountManagementAccountDetailComponent },
-          { path: 'recorded/detail/:id', component: PartnerAccountManagementRecordedDetailComponent },
+          { path: 'recorded/detail/:id', component: PartnerAccountManagementRecordedDetailComponent }
         ]
       },
       {
@@ -104,16 +106,16 @@ const routes: Routes = [
           { path: 'detail/:id', component: PartnerAccountManagementWithdralDetailComponent }
         ]
       }
-
     ]
   },
   {
     path: 'partner-list',
     children: [
       { path: '', component: PartnerListComponent },
-      { path: 'detail/:id', component: PartnerDetailComponent },
+      { path: 'etp-detail/:id', component: PartnerDetailComponent },
+      { path: 'personal-detail/:id', component: PersonalPartnerDetailComponent },
       { path: 'add-etp-partner', component: AddEtpPartnerComponent },
-      { path: 'add-personal-partner', component: AddPersonalPartnerComponent },
+      { path: 'add-personal-partner', component: AddPersonalPartnerComponent }
     ]
   },
   {
@@ -130,7 +132,7 @@ const routes: Routes = [
     children: [
       { path: '', component: ScrollImgComponentsListComponent },
       { path: 'list', component: ScrollImgComponentsListComponent },
-      { path: 'detail', component: ScrollimgComponentsAddComponent },
+      { path: 'detail', component: ScrollimgComponentsAddComponent }
     ]
   },
   {
@@ -147,13 +149,13 @@ const routes: Routes = [
       { path: 'article-management-list', component: ParterArticleManagementListComponent },
       { path: 'article-management-add', component: ParterArticleManagementEditComponent },
       { path: 'article-management-edit', component: ParterArticleManagementEditComponent },
-      { path: 'banner', component: BannerComponentsListComponent},
-      { path: 'banner/detail', component: BannerComponentsAddComponent },
+      { path: 'banner', component: BannerComponentsListComponent },
+      { path: 'banner/detail', component: BannerComponentsAddComponent }
     ]
-  },
+  }
 ];
 @NgModule({
   imports: [RouterModule.forChild(routes)],
   exports: [RouterModule]
 })
-export class PartnerRoutingModule { }
+export class PartnerRoutingModule {}
diff --git a/src/app/routes/partner/partner.module.ts b/src/app/routes/partner/partner.module.ts
index 3ce63eef..75c9c2a7 100644
--- a/src/app/routes/partner/partner.module.ts
+++ b/src/app/routes/partner/partner.module.ts
@@ -58,6 +58,7 @@ import { ScrollimgComponentsAddComponent } from './scrollimg/components/add/add.
 import { ScrollImgComponentsListComponent } from './scrollimg/components/list/list.component';
 import { BannerComponentsListComponent } from './knowledge/banner/components/list/list.component';
 import { BannerComponentsAddComponent } from './knowledge/banner/components/add/add.component';
+import { PersonalPartnerDetailComponent } from './partner-list/components/personal-partner-detail/personal-partner-detail.component';
 
 const COMPONENTS: any[] = [
   PartnerBusinessStatisticsIndexComponent,
@@ -105,7 +106,8 @@ const COMPONENTS: any[] = [
   PartnerKnowledgeClassificationListComponent,
   PartnerEditComponent,
   BannerComponentsListComponent,
-  BannerComponentsAddComponent
+  BannerComponentsAddComponent,
+  PersonalPartnerDetailComponent
 ];
 
 @NgModule({
@@ -113,4 +115,4 @@ const COMPONENTS: any[] = [
   imports: [CommonModule, PartnerRoutingModule, SharedModule],
   providers: [PartnerListService]
 })
-export class PartnerModule { }
+export class PartnerModule {}
diff --git a/src/styles.less b/src/styles.less
index a25a53de..8426983a 100644
--- a/src/styles.less
+++ b/src/styles.less
@@ -7,11 +7,11 @@
 @import './styles/theme';
 
 .icon {
-    width    : 18px;
-    fill     : currentColor;
-    overflow : hidden;
-    font-size: 18px !important;
-    color    : #ffffff;
+    width       : 18px;
+    fill        : currentColor;
+    overflow    : hidden;
+    font-size   : 18px !important;
+    color       : #ffffff;
     margin-right: 10px;
 }
 
@@ -47,4 +47,20 @@ input[type="number"] {
 .break-word-all {
     word-break: break-all;
     word-wrap : break-word;
+}
+
+.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;
+    }
 }
\ No newline at end of file

From 57e18b18b112b42f4ba9468a163d071a76a4922b Mon Sep 17 00:00:00 2001
From: TaricXin <583259872@qq.com>
Date: Fri, 18 Mar 2022 17:12:33 +0800
Subject: [PATCH 52/70] edit

---
 .../add-etp-partner.component.html            |  32 ++-
 .../add-etp-partner.component.ts              | 202 +++++++++---------
 .../add-personal-partner.component.html       |  76 ++++---
 .../add-personal-partner.component.ts         | 157 +++++---------
 .../personal-partner-detail.component.html    |  18 +-
 5 files changed, 215 insertions(+), 270 deletions(-)

diff --git a/src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.html b/src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.html
index 60e444bd..4df4ab9b 100644
--- a/src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.html
+++ b/src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.html
@@ -15,17 +15,17 @@
       <div class="pr">万元</div>
     </ng-template>
 
-     <!-- 企业法人信息 -->
-    <ng-template sf-template="legalPersonIdentityDTO/_legalPersontitle" let-me let-ui="ui" let-schema="schema">
-      <div class="form-title" style="margin-top: 40px;margin-left: -180px;">营业执照法人信息</div>
+    <!-- 企业法人信息 -->
+    <ng-template sf-template="legalPersonIdentity/_legalPersontitle" let-me let-ui="ui" let-schema="schema">
+      <div class="form-title" style="margin-top: 40px; margin-left: -180px">营业执照法人信息</div>
     </ng-template>
-    <ng-template sf-template="legalPersonIdentityDTO/_certificatePhototips" let-me let-ui="ui" let-schema="schema">
+    <ng-template sf-template="legalPersonIdentity/_certificatePhototips" let-me let-ui="ui" let-schema="schema">
       <div class="pr">
         <div>请上传身份证原件的高清照片，若上传复印件，则需申请人签字；</div>
         <div>上传后系统会自动识别并填写</div>
       </div>
     </ng-template>
-    <ng-template sf-template="legalPersonIdentityDTO/_certificatePhotoExmplateA" let-me let-ui="ui" let-schema="schema">
+    <ng-template sf-template="legalPersonIdentity/_certificatePhotoExmplateA" let-me let-ui="ui" let-schema="schema">
       <div class="pr">
         <dl class="tips">
           <dt>正面照（人像面）</dt>
@@ -34,7 +34,7 @@
         <div class="pa"><img width="190" src="./assets/images/usercenter/certificate-demo-front.png" /></div>
       </div>
     </ng-template>
-    <ng-template sf-template="legalPersonIdentityDTO/_certificatePhotoExmplateB" let-me let-ui="ui" let-schema="schema">
+    <ng-template sf-template="legalPersonIdentity/_certificatePhotoExmplateB" let-me let-ui="ui" let-schema="schema">
       <div class="pr">
         <dl class="tips">
           <dt>背面照（国徽面）</dt>
@@ -45,8 +45,8 @@
     </ng-template>
 
     <!-- 企业管理员信息 -->
-    <ng-template sf-template="adminUserInfo/_adminTitle" let-me let-ui="ui" let-schema="schema">
-      <div class="form-title" style="margin-top: 40px;margin-left: -180px;">企业管理员信息</div>
+    <ng-template sf-template="_adminTitle" let-me let-ui="ui" let-schema="schema">
+      <div class="form-title" style="margin-top: 40px; margin-left: -180px">企业管理员信息</div>
     </ng-template>
     <ng-template sf-template="adminUserInfo/_adminCertificatePhotoTipsA" let-me let-ui="ui" let-schema="schema">
       <div class="pr">
@@ -69,19 +69,17 @@
 
     <!-- 所属城市 -->
     <ng-template sf-template="_addressTitle" let-me let-ui="ui" let-schema="schema">
-      <div class="form-title" style="margin-top: 40px;margin-left: -180px;">所属城市</div>
+      <div class="form-title" style="margin-top: 40px; margin-left: -180px">所属城市</div>
     </ng-template>
 
-     <!-- 渠道销售 -->
-     <ng-template sf-template="_channelTitle" let-me let-ui="ui" let-schema="schema">
-      <div class="form-title" style="margin-top: 40px;margin-left: -180px;">渠道销售</div>
+    <!-- 渠道销售 -->
+    <ng-template sf-template="_channelTitle" let-me let-ui="ui" let-schema="schema">
+      <div class="form-title" style="margin-top: 40px; margin-left: -180px">渠道销售</div>
     </ng-template>
   </sf>
 
-
-  <div style="display: flex;justify-content: center;">
-    <button nz-button type="button" nzType="primary" (click)="submitForm()"
-      [nzLoading]="service.http.loading">确认新增</button>
+  <div style="display: flex; justify-content: center">
+    <button nz-button type="button" nzType="primary" (click)="submitForm()" [nzLoading]="service.http.loading">确认新增</button>
     <button nz-button (click)="goBack()">返回</button>
   </div>
-</nz-card>
\ No newline at end of file
+</nz-card>
diff --git a/src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.ts b/src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.ts
index 38f07c5a..8ad008d2 100644
--- a/src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.ts
+++ b/src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.ts
@@ -1,19 +1,18 @@
 import { Component, ViewChild } from '@angular/core';
-import { Router } from '@angular/router';
 import { apiConf } from '@conf/api.conf';
 import {
   SFUploadWidgetSchema,
   SFComponent,
   SFSchema,
   SFUISchema,
-  SFCascaderWidgetSchema,
-  SFTextareaWidgetSchema,
   SFDateWidgetSchema,
   SFCheckboxWidgetSchema,
   SFTreeSelectWidgetSchema
 } from '@delon/form';
+import { NzTreeNode } from 'ng-zorro-antd/tree';
 import { NzUploadFile } from 'ng-zorro-antd/upload';
 import { of } from 'rxjs';
+import { map } from 'rxjs/operators';
 
 import { PartnerListService } from '../../services/partner-list.service';
 
@@ -65,7 +64,7 @@ export class AddEtpPartnerComponent {
     }
   };
 
-  constructor(private router: Router, public service: PartnerListService) {}
+  constructor(public service: PartnerListService) {}
 
   submitForm() {
     if (!this.sf.valid) {
@@ -73,59 +72,46 @@ export class AddEtpPartnerComponent {
       this.service.msgSrv.warning('请修改填写错误信息');
       return;
     }
-    const enterpriseRegistrationTime = new Date(this.sf.value.enterpriseRegistrationTime);
-    const operatingStartTime = new Date(this.sf.value.operatingStartTime);
-    if (enterpriseRegistrationTime.getTime() > operatingStartTime.getTime()) {
-      this.service.msgSrv.warning('营业期限不能小于成立日期');
+    if (this.sf.value.cityCodesList?.length > 3) {
+      this.sf.validator({ emitError: true });
+      this.service.msgSrv.warning('所属城市不能超过3个');
       return;
     }
-    if (this.sf.value.operatingEndTime) {
-      const operatingEndTime = new Date(this.sf.value.operatingEndTime);
-      if (operatingStartTime.getTime() > operatingEndTime.getTime()) {
-        this.service.msgSrv.warning('营业期限不能小于期限开始日期');
-        return;
-      }
+    // 校验企业营业期限
+    const operatingStartTime = new Date(this.sf.value.operatingStartTime);
+    const operatingEndTime = new Date(this.sf.value.operatingEndTime);
+    if (operatingStartTime.getTime() > operatingEndTime.getTime()) {
+      this.service.msgSrv.warning('营业截止日期不能小于开始日期');
+      return;
     }
-    const validStartTime = new Date(this.sf.value.legalPersonIdentityDTO.validStartTime);
-    if (this.sf.value.legalPersonIdentityDTO.validEndTime) {
-      const validEndTime = new Date(this.sf.value.legalPersonIdentityDTO.validEndTime);
+    // 校验法人证件有效期限
+    if (this.sf.value.legalPersonIdentity.validEndTime) {
+      const validStartTime = new Date(this.sf.value.legalPersonIdentity.validStartTime);
+      const validEndTime = new Date(this.sf.value.legalPersonIdentity.validEndTime);
       if (validStartTime.getTime() > validEndTime.getTime()) {
-        this.service.msgSrv.warning('法人证件有效截止日期小于开始日期');
+        this.service.msgSrv.warning('法人证件有效截止日期不能小于开始日期');
         return;
       }
     }
-    const sfVlaue = this.sf.value;
-    const params = {};
-    Object.assign(
-      params,
-      { ...this.sf.value },
-      {
-        enterpriseAddressCode: this.sf.value.enterpriseAddressCode[2],
-        oftenUsedServices: sfVlaue.oftenUsedServices,
-        registerAddress: sfVlaue.registerAddress,
-        registerPhone: sfVlaue.registerPhone,
-        creditPhoto: sfVlaue.creditPhoto,
-        creditPhotoWatermark: sfVlaue.creditPhotoWatermark,
-        promotersTelephone: sfVlaue.promotersTelephone,
-        networkTransporter: sfVlaue.networkTransporter,
-        adminUserInfo: {
-          certificateNumber: sfVlaue.certificateNumber,
-          certificatePhotoBack: sfVlaue.certificatePhotoBack,
-          certificatePhotoBackWatermark: sfVlaue.certificatePhotoBackWatermark,
-          certificatePhotoFront: sfVlaue.certificatePhotoFront,
-          certificatePhotoFrontWatermark: sfVlaue.certificatePhotoFrontWatermark,
-          name: sfVlaue.name
-        }
+    // 校验管理员证件有效期限
+    if (this.sf.value.adminUserInfo.validEndTime) {
+      const validStartTime = new Date(this.sf.value.adminUserInfo.validStartTime);
+      const validEndTime = new Date(this.sf.value.adminUserInfo.validEndTime);
+      if (validStartTime.getTime() > validEndTime.getTime()) {
+        this.service.msgSrv.warning('管理员证件有效截止日期小于开始日期');
+        return;
       }
-    );
-    console.log(params);
+    }
+    const params = {};
+    Object.assign(params, { ...this.sf.value, source: 2 });
+    // console.log(params);
 
-    // this.service.request(this.service.$api_save_entp_partner, params).subscribe(res => {
-    //   if (res) {
-    //     this.service.msgSrv.success('企业新增成功');
-    //     this.goBack();
-    //   }
-    // });
+    this.service.request(this.service.$api_save_entp_partner, params).subscribe(res => {
+      if (res) {
+        this.service.msgSrv.success('新增企业合伙人成功');
+        this.goBack();
+      }
+    });
   }
 
   /*
@@ -148,23 +134,23 @@ export class AddEtpPartnerComponent {
           if (isFront === 'front') {
             // 正面
             if (res.name) {
-              this.sf.setValue('/legalPersonIdentityDTO/name', res.name);
+              this.sf.setValue('/legalPersonIdentity/name', res.name);
             }
             if (res.number) {
-              this.sf.setValue('/legalPersonIdentityDTO/certificateType', 0);
-              this.sf.setValue('/legalPersonIdentityDTO/certificateNumber', res.number);
+              this.sf.setValue('/legalPersonIdentity/certificateType', 0);
+              this.sf.setValue('/legalPersonIdentity/certificateNumber', res.number);
             }
           }
           if (isFront === 'back') {
             // 背面
             if (res.validFrom) {
-              this.sf.setValue('/legalPersonIdentityDTO/validStartTime', res.validFrom);
+              this.sf.setValue('/legalPersonIdentity/validStartTime', res.validFrom);
             }
             if (res.validTo) {
-              this.sf.setValue('/legalPersonIdentityDTO/validEndTime', res.validTo);
-              this.sf.setValue('/legalPersonIdentityDTO/_isLoingDate', false);
+              this.sf.setValue('/legalPersonIdentity/validEndTime', res.validTo);
+              this.sf.setValue('/legalPersonIdentity/_isLoingDate', false);
             } else {
-              this.sf.setValue('/legalPersonIdentityDTO/_isLoingDate', true);
+              this.sf.setValue('/legalPersonIdentity/_isLoingDate', true);
             }
           }
         }
@@ -173,10 +159,22 @@ export class AddEtpPartnerComponent {
           if (isFront === 'front') {
             // 正面
             if (res.name) {
-              this.sf.setValue('/name', res.name);
+              this.sf.setValue('/adminUserInfo/name', res.name);
             }
             if (res.number) {
-              this.sf.setValue('/certificateNumber', res.number);
+              this.sf.setValue('/adminUserInfo/certificateNumber', res.number);
+            }
+          }
+          if (isFront === 'back') {
+            // 背面
+            if (res.validFrom) {
+              this.sf.setValue('/adminUserInfo/validStartTime', res.validFrom);
+            }
+            if (res.validTo) {
+              this.sf.setValue('/adminUserInfo/validEndTime', res.validTo);
+              this.sf.setValue('/adminUserInfo/_isLoingDate', false);
+            } else {
+              this.sf.setValue('/adminUserInfo/_isLoingDate', true);
             }
           }
         }
@@ -194,29 +192,15 @@ export class AddEtpPartnerComponent {
         if (res.name) {
           this.sf.setValue('/enterpriseName', res.name);
         }
-        if (res.type) {
-          this.sf.setValue('/enterpriseType', res.type);
-        }
-        if (res.addressRegionCodes) {
-          this.sf.setValue('/enterpriseAddressCode', res.addressRegionCodes);
-        }
-        if (res.address) {
-          this.sf.setValue('/enterpriseAddress', res.address);
-        }
-        if (res.foundDate) {
-          this.sf.setValue('/enterpriseRegistrationTime', res.foundDate);
-        }
         if (res.businessTermStartDate) {
           this.sf.setValue('/operatingStartTime', res.businessTermStartDate);
         }
         if (res.businessTermEndDate) {
           this.sf.setValue('/operatingEndTime', res.businessTermEndDate);
+          this.sf.setValue('/_isLoingDate', false);
         } else {
           this.sf.setValue('/_isLoingDate', true);
         }
-        if (res.businessScope) {
-          this.sf.setValue('/businessScope', res.businessScope);
-        }
       }
     });
   }
@@ -310,7 +294,7 @@ export class AddEtpPartnerComponent {
         },
 
         // 法人信息
-        legalPersonIdentityDTO: {
+        legalPersonIdentity: {
           type: 'object',
           properties: {
             _legalPersontitle: { title: '', type: 'string', ui: { widget: 'custom' } },
@@ -324,7 +308,7 @@ export class AddEtpPartnerComponent {
                 descriptionI18n: '图片支持jpg、jpeg、png、gif格式，大小不超过5M',
                 change: args => {
                   if (args.type === 'success') {
-                    this.sf.setValue('/legalPersonIdentityDTO/certificatePhotoFront', args.fileList[0].response.data.fullFilePath);
+                    this.sf.setValue('/legalPersonIdentity/certificatePhotoFront', args.fileList[0].response.data.fullFilePath);
                     this.checkIdCard(args.fileList[0].response.data.fullFilePath, 'front', 1);
                   }
                 }
@@ -341,7 +325,7 @@ export class AddEtpPartnerComponent {
                 descriptionI18n: '图片支持jpg、jpeg、png、gif格式，大小不超过5M',
                 change: args => {
                   if (args.type === 'success') {
-                    this.sf.setValue('/legalPersonIdentityDTO/certificatePhotoBack', args.fileList[0].response.data.fullFilePath);
+                    this.sf.setValue('/legalPersonIdentity/certificatePhotoBack', args.fileList[0].response.data.fullFilePath);
                     this.checkIdCard(args.fileList[0].response.data.fullFilePath, 'back', 1);
                   }
                 }
@@ -406,7 +390,7 @@ export class AddEtpPartnerComponent {
                   required: '请选择截止日期'
                 },
                 change: i => {
-                  this.sf?.setValue('/legalPersonIdentityDTO/_isLoingDate', false);
+                  this.sf?.setValue('/legalPersonIdentity/_isLoingDate', false);
                 }
               } as SFDateWidgetSchema
             },
@@ -418,7 +402,7 @@ export class AddEtpPartnerComponent {
                 grid: { span: 6 },
                 class: 'input-back',
                 widget: 'checkbox',
-                change: i => this.sf?.setValue('/legalPersonIdentityDTO/validEndTime', null)
+                change: i => this.sf?.setValue('/legalPersonIdentity/validEndTime', null)
               } as SFCheckboxWidgetSchema
             }
           },
@@ -432,23 +416,23 @@ export class AddEtpPartnerComponent {
             'validStartTime'
           ]
         },
+        _adminTitle: { title: '', type: 'string', ui: { widget: 'custom' } },
+        adminMobile: {
+          title: ' 企业管理员手机号',
+          type: 'string',
+          minLength: 1,
+          format: 'mobile',
+          maxLength: 11,
+          ui: {
+            grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
+            placeholder: '请输入企业管理员手机号',
+            errors: { required: '请输入企业管理员手机号', format: '手机号格式错误' }
+          }
+        },
         // 企业管理员信息
         adminUserInfo: {
           type: 'object',
           properties: {
-            _adminTitle: { title: '', type: 'string', ui: { widget: 'custom' } },
-            adminMobile: {
-              title: ' 企业管理员手机号',
-              type: 'string',
-              minLength: 1,
-              format: 'mobile',
-              maxLength: 11,
-              ui: {
-                grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
-                placeholder: '请输入企业管理员手机号',
-                errors: { required: '请输入企业管理员手机号', format: '手机号格式错误' }
-              }
-            },
             _adminCertificatePhotoTipsA: {
               title: '企业管理员证件照',
               type: 'string',
@@ -467,7 +451,7 @@ export class AddEtpPartnerComponent {
                 descriptionI18n: '图片支持jpg、jpeg、png、gif格式，大小不超过5M',
                 change: args => {
                   if (args.type === 'success') {
-                    this.sf.setValue('/certificatePhotoFront', args.fileList[0].response.data.fullFilePath);
+                    this.sf.setValue('/adminUserInfo/certificatePhotoFront', args.fileList[0].response.data.fullFilePath);
                     this.checkIdCard(args.fileList[0].response.data.fullFilePath, 'front', 0);
                   }
                 }
@@ -489,7 +473,8 @@ export class AddEtpPartnerComponent {
                 descriptionI18n: '图片支持jpg、jpeg、png、gif格式，大小不超过5M',
                 change: args => {
                   if (args.type === 'success') {
-                    this.sf.setValue('/certificatePhotoBack', args.fileList[0].response.data.fullFilePath);
+                    this.sf.setValue('/adminUserInfo/certificatePhotoBack', args.fileList[0].response.data.fullFilePath);
+                    this.checkIdCard(args.fileList[0].response.data.fullFilePath, 'back', 0);
                   }
                 }
               } as SFUploadWidgetSchema
@@ -514,7 +499,7 @@ export class AddEtpPartnerComponent {
                 placeholder: '请输入企业管理员身份证号'
               }
             },
-            operatingStartTime: {
+            validStartTime: {
               title: '身份证有效开始日期',
               type: 'string',
               ui: {
@@ -525,7 +510,7 @@ export class AddEtpPartnerComponent {
                 }
               } as SFDateWidgetSchema
             },
-            operatingEndTime: {
+            validEndTime: {
               title: '身份证有效截止日期',
               type: 'string',
               ui: {
@@ -547,34 +532,38 @@ export class AddEtpPartnerComponent {
                 grid: { span: 6 },
                 class: 'input-back',
                 widget: 'checkbox',
-                change: i => this.sf?.setValue('/adminUserInfo/operatingEndTime', null)
+                change: i => this.sf?.setValue('/adminUserInfo/validEndTime', null)
               } as SFCheckboxWidgetSchema
             }
           },
-          required: ['_adminCertificatePhotoTipsA', 'adminMobile', 'name', 'certificateNumber', 'operatingStartTime']
+          required: ['_adminCertificatePhotoTipsA', 'name', 'certificateNumber', 'operatingStartTime']
         },
         // 所属城市
         _addressTitle: { title: '', type: 'string', ui: { widget: 'custom' } },
-        status3: {
+        cityCodesList: {
           type: 'string',
           title: '所属城市',
-          default: ['WAIT_BUYER_PAY', 'TRADE_FINISHED'],
           ui: {
             widget: 'tree-select',
             grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
             placeholder: '请选择城市(最多3个)',
             checkable: true,
+            class: 'city-tree-select',
             asyncData: () =>
-              of([
-                { title: '待支付', key: 'WAIT_BUYER_PAY' },
-                { title: '已支付', key: 'TRADE_SUCCESS' },
-                { title: '交易完成', key: 'TRADE_FINISHED' }
-              ])
+              this.getRegionDetailByCode('').pipe(
+                map((res: any) =>
+                  res.map((item: any) => ({ ...item, title: item.name, key: item.regionCode, disabled: true, isDisableCheckbox: true }))
+                )
+              ),
+            expandChange: ({ node }: { node: NzTreeNode }) =>
+              this.getRegionDetailByCode(node.key).pipe(
+                map((res: any) => res.map((item: any) => ({ ...item, title: item.name, key: item.regionCode, isLeaf: true })))
+              )
           } as SFTreeSelectWidgetSchema
         },
         // 渠道销售
         _channelTitle: { title: '', type: 'string', ui: { widget: 'custom' } },
-        channel: {
+        invitationCode: {
           title: '渠道销售邀请码',
           type: 'string',
           minLength: 1,
@@ -594,8 +583,9 @@ export class AddEtpPartnerComponent {
         'unifiedSocialCreditCode',
         'enterpriseName',
         'operatingStartTime',
-        'status3',
-        'channel'
+        'cityCodesList',
+        'adminMobile',
+        'invitationCode'
       ]
     };
   }
diff --git a/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.html b/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.html
index e476071d..cb94b51b 100644
--- a/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.html
+++ b/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.html
@@ -1,44 +1,42 @@
 <page-header-wrapper [title]="'新增个人合伙人'"></page-header-wrapper>
 <nz-card>
-    <sf #sf [ui]="ui" [schema]="schema" [button]="'none'">
-        <!-- 合伙人信息 -->
-        <ng-template sf-template="adminUserInfo/_adminTitle" let-me let-ui="ui" let-schema="schema">
-            <div class="form-title" style="margin-top: 40px;margin-left: -180px;">合伙人信息</div>
-        </ng-template>
-        <ng-template sf-template="adminUserInfo/_adminCertificatePhotoTipsA" let-me let-ui="ui" let-schema="schema">
-            <div class="pr">
-                <dl class="tips">
-                    <dt>正面照（人像面）</dt>
-                    <dd>示例</dd>
-                </dl>
-                <div class="pa"><img width="190" src="./assets/images/usercenter/certificate-demo-front.png" /></div>
-            </div>
-        </ng-template>
-        <ng-template sf-template="adminUserInfo/_adminCertificatePhotoTipsB" let-me let-ui="ui" let-schema="schema">
-            <div class="pr">
-                <dl class="tips">
-                    <dt>背面照（国徽面）</dt>
-                    <dd>示例</dd>
-                </dl>
-                <div class="pa"><img width="190" src="./assets/images/usercenter/certificate-demo-back.png" /></div>
-            </div>
-        </ng-template>
+  <sf #sf [ui]="ui" [schema]="schema" [button]="'none'">
+    <!-- 合伙人信息 -->
+    <ng-template sf-template="adminUserInfo/_adminTitle" let-me let-ui="ui" let-schema="schema">
+      <div class="form-title" style="margin-top: 40px; margin-left: -180px">合伙人信息</div>
+    </ng-template>
+    <ng-template sf-template="adminUserInfo/_adminCertificatePhotoTipsA" let-me let-ui="ui" let-schema="schema">
+      <div class="pr">
+        <dl class="tips">
+          <dt>正面照（人像面）</dt>
+          <dd>示例</dd>
+        </dl>
+        <div class="pa"><img width="190" src="./assets/images/usercenter/certificate-demo-front.png" /></div>
+      </div>
+    </ng-template>
+    <ng-template sf-template="adminUserInfo/_adminCertificatePhotoTipsB" let-me let-ui="ui" let-schema="schema">
+      <div class="pr">
+        <dl class="tips">
+          <dt>背面照（国徽面）</dt>
+          <dd>示例</dd>
+        </dl>
+        <div class="pa"><img width="190" src="./assets/images/usercenter/certificate-demo-back.png" /></div>
+      </div>
+    </ng-template>
 
-        <!-- 所属城市 -->
-        <ng-template sf-template="_addressTitle" let-me let-ui="ui" let-schema="schema">
-            <div class="form-title" style="margin-top: 40px;margin-left: -180px;">所属城市</div>
-        </ng-template>
+    <!-- 所属城市 -->
+    <ng-template sf-template="_addressTitle" let-me let-ui="ui" let-schema="schema">
+      <div class="form-title" style="margin-top: 40px; margin-left: -180px">所属城市</div>
+    </ng-template>
 
-        <!-- 渠道销售 -->
-        <ng-template sf-template="_channelTitle" let-me let-ui="ui" let-schema="schema">
-            <div class="form-title" style="margin-top: 40px;margin-left: -180px;">渠道销售</div>
-        </ng-template>
-    </sf>
+    <!-- 渠道销售 -->
+    <ng-template sf-template="_channelTitle" let-me let-ui="ui" let-schema="schema">
+      <div class="form-title" style="margin-top: 40px; margin-left: -180px">渠道销售</div>
+    </ng-template>
+  </sf>
 
-
-    <div style="display: flex;justify-content: center;">
-        <button nz-button type="button" nzType="primary" (click)="submitForm()"
-            [nzLoading]="service.http.loading">确认新增</button>
-        <button nz-button (click)="goBack()">返回</button>
-    </div>
-</nz-card>
\ No newline at end of file
+  <div style="display: flex; justify-content: center">
+    <button nz-button type="button" nzType="primary" (click)="submitForm()" [nzLoading]="service.http.loading">确认新增</button>
+    <button nz-button (click)="goBack()">返回</button>
+  </div>
+</nz-card>
diff --git a/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts b/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts
index 4dffa7bf..eca02366 100644
--- a/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts
+++ b/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts
@@ -73,57 +73,28 @@ export class AddPersonalPartnerComponent {
       this.service.msgSrv.warning('请修改填写错误信息');
       return;
     }
-    const enterpriseRegistrationTime = new Date(this.sf.value.enterpriseRegistrationTime);
-    const operatingStartTime = new Date(this.sf.value.operatingStartTime);
-    if (enterpriseRegistrationTime.getTime() > operatingStartTime.getTime()) {
-      this.service.msgSrv.warning('营业期限不能小于成立日期');
+    if (this.sf.value.cityCodesList?.length > 3) {
+      this.sf.validator({ emitError: true });
+      this.service.msgSrv.warning('所属城市不能超过3个');
       return;
     }
-    if (this.sf.value.operatingEndTime) {
-      const operatingEndTime = new Date(this.sf.value.operatingEndTime);
-      if (operatingStartTime.getTime() > operatingEndTime.getTime()) {
-        this.service.msgSrv.warning('营业期限不能小于期限开始日期');
-        return;
-      }
-    }
-    const validStartTime = new Date(this.sf.value.legalPersonIdentityDTO.validStartTime);
-    if (this.sf.value.legalPersonIdentityDTO.validEndTime) {
-      const validEndTime = new Date(this.sf.value.legalPersonIdentityDTO.validEndTime);
+    if (this.sf.value.validEndTime) {
+      const validStartTime = new Date(this.sf.value.validStartTime);
+      const validEndTime = new Date(this.sf.value.validEndTime);
       if (validStartTime.getTime() > validEndTime.getTime()) {
-        this.service.msgSrv.warning('法人证件有效截止日期小于开始日期');
+        this.service.msgSrv.warning('身份证有效截止日期不能小于开始日期');
         return;
       }
     }
-    const sfVlaue = this.sf.value;
     const params = {};
-    Object.assign(
-      params,
-      { ...this.sf.value },
-      {
-        enterpriseAddressCode: this.sf.value.enterpriseAddressCode[2],
-        oftenUsedServices: sfVlaue.oftenUsedServices,
-        registerAddress: sfVlaue.registerAddress,
-        registerPhone: sfVlaue.registerPhone,
-        creditPhoto: sfVlaue.creditPhoto,
-        creditPhotoWatermark: sfVlaue.creditPhotoWatermark,
-        promotersTelephone: sfVlaue.promotersTelephone,
-        networkTransporter: sfVlaue.networkTransporter,
-        adminUserInfo: {
-          certificateNumber: sfVlaue.certificateNumber,
-          certificatePhotoBack: sfVlaue.certificatePhotoBack,
-          certificatePhotoBackWatermark: sfVlaue.certificatePhotoBackWatermark,
-          certificatePhotoFront: sfVlaue.certificatePhotoFront,
-          certificatePhotoFrontWatermark: sfVlaue.certificatePhotoFrontWatermark,
-          name: sfVlaue.name
-        }
+    Object.assign(params, { ...this.sf.value, source: 2 });
+
+    this.service.request(this.service.$api_save_personal_partner, params).subscribe(res => {
+      if (res) {
+        this.service.msgSrv.success('新增个人合伙人成功');
+        this.goBack();
       }
-    );
-    // this.service.request(this.service.$api_save_enterprise_admin, params).subscribe(res => {
-    //   if (res) {
-    //     this.service.msgSrv.success('企业新增成功');
-    //     this.goBack();
-    //   }
-    // });
+    });
   }
 
   /*
@@ -134,48 +105,34 @@ export class AddPersonalPartnerComponent {
   }
 
   // 识别身份证 参数isFront：front-正面、back-背面；type：0-申请人身份证，1-法定代表人身份证
-  checkIdCard(imgurl: any, isFront: string, type: number) {
+  checkIdCard(imgurl: any, isFront: string) {
     const params = {
       idCardUrl: imgurl,
       side: isFront
     };
     this.service.request(this.service.$api_ocr_recognize_id_card, params).subscribe(res => {
       if (res) {
-        if (type === 1) {
-          // 法定代表人证件照
-          if (isFront === 'front') {
-            // 正面
-            if (res.name) {
-              this.sf.setValue('/legalPersonIdentityDTO/name', res.name);
-            }
-            if (res.number) {
-              this.sf.setValue('/legalPersonIdentityDTO/certificateType', 0);
-              this.sf.setValue('/legalPersonIdentityDTO/certificateNumber', res.number);
-            }
+        // 法定代表人证件照
+        if (isFront === 'front') {
+          // 正面
+          if (res.name) {
+            this.sf.setValue('/adminUserInfo/name', res.name);
           }
-          if (isFront === 'back') {
-            // 背面
-            if (res.validFrom) {
-              this.sf.setValue('/legalPersonIdentityDTO/validStartTime', res.validFrom);
-            }
-            if (res.validTo) {
-              this.sf.setValue('/legalPersonIdentityDTO/validEndTime', res.validTo);
-              this.sf.setValue('/legalPersonIdentityDTO/_isLoingDate', false);
-            } else {
-              this.sf.setValue('/legalPersonIdentityDTO/_isLoingDate', true);
-            }
+          if (res.number) {
+            this.sf.setValue('/adminUserInfo/certificateType', 0);
+            this.sf.setValue('/adminUserInfo/certificateNumber', res.number);
           }
         }
-        // 企业管理员证件照
-        if (type === 0) {
-          if (isFront === 'front') {
-            // 正面
-            if (res.name) {
-              this.sf.setValue('/name', res.name);
-            }
-            if (res.number) {
-              this.sf.setValue('/certificateNumber', res.number);
-            }
+        if (isFront === 'back') {
+          // 背面
+          if (res.validFrom) {
+            this.sf.setValue('/adminUserInfo/validStartTime', res.validFrom);
+          }
+          if (res.validTo) {
+            this.sf.setValue('/adminUserInfo/validEndTime', res.validTo);
+            this.sf.setValue('/adminUserInfo/_isLoingDate', false);
+          } else {
+            this.sf.setValue('/adminUserInfo/_isLoingDate', true);
           }
         }
       }
@@ -189,23 +146,23 @@ export class AddPersonalPartnerComponent {
   private initBasicInfoSF(): SFSchema {
     return {
       properties: {
+        _adminTitle: { title: '', type: 'string', ui: { widget: 'custom' } },
+        mobile: {
+          title: ' 手机号',
+          type: 'string',
+          minLength: 1,
+          format: 'mobile',
+          maxLength: 11,
+          ui: {
+            grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
+            placeholder: '请输入手机号',
+            errors: { required: '请输入手机号', format: '手机号格式错误' }
+          }
+        },
         // 合伙人信息
         adminUserInfo: {
           type: 'object',
           properties: {
-            _adminTitle: { title: '', type: 'string', ui: { widget: 'custom' } },
-            adminMobile: {
-              title: ' 手机号',
-              type: 'string',
-              minLength: 1,
-              format: 'mobile',
-              maxLength: 11,
-              ui: {
-                grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
-                placeholder: '请输入手机号',
-                errors: { required: '请输入手机号', format: '手机号格式错误' }
-              }
-            },
             _adminCertificatePhotoTipsA: {
               title: '证件照',
               type: 'string',
@@ -216,6 +173,7 @@ export class AddPersonalPartnerComponent {
             },
             certificatePhotoFront: { title: '', type: 'string', ui: { hidden: true } },
             certificatePhotoBack: { title: '', type: 'string', ui: { hidden: true } },
+            certificateType: { title: '', type: 'string', ui: { hidden: true }, default: 0 },
             certificatePhotoFrontWatermark: {
               type: 'string',
               title: '',
@@ -224,8 +182,8 @@ export class AddPersonalPartnerComponent {
                 descriptionI18n: '图片支持jpg、jpeg、png、gif格式，大小不超过5M',
                 change: args => {
                   if (args.type === 'success') {
-                    this.sf.setValue('/certificatePhotoFront', args.fileList[0].response.data.fullFilePath);
-                    this.checkIdCard(args.fileList[0].response.data.fullFilePath, 'front', 0);
+                    this.sf.setValue('/adminUserInfo/certificatePhotoFront', args.fileList[0].response.data.fullFilePath);
+                    this.checkIdCard(args.fileList[0].response.data.fullFilePath, 'front');
                   }
                 }
               } as SFUploadWidgetSchema
@@ -246,7 +204,8 @@ export class AddPersonalPartnerComponent {
                 descriptionI18n: '图片支持jpg、jpeg、png、gif格式，大小不超过5M',
                 change: args => {
                   if (args.type === 'success') {
-                    this.sf.setValue('/certificatePhotoBack', args.fileList[0].response.data.fullFilePath);
+                    this.sf.setValue('/adminUserInfo/certificatePhotoBack', args.fileList[0].response.data.fullFilePath);
+                    this.checkIdCard(args.fileList[0].response.data.fullFilePath, 'back');
                   }
                 }
               } as SFUploadWidgetSchema
@@ -271,7 +230,7 @@ export class AddPersonalPartnerComponent {
                 placeholder: '请输入身份证号'
               }
             },
-            operatingStartTime: {
+            validStartTime: {
               title: '身份证有效开始日期',
               type: 'string',
               ui: {
@@ -282,7 +241,7 @@ export class AddPersonalPartnerComponent {
                 }
               } as SFDateWidgetSchema
             },
-            operatingEndTime: {
+            validEndTime: {
               title: '身份证有效截止日期',
               type: 'string',
               ui: {
@@ -304,15 +263,15 @@ export class AddPersonalPartnerComponent {
                 grid: { span: 6 },
                 class: 'input-back',
                 widget: 'checkbox',
-                change: i => this.sf?.setValue('/adminUserInfo/operatingEndTime', null)
+                change: i => this.sf?.setValue('/adminUserInfo/validEndTime', null)
               } as SFCheckboxWidgetSchema
             }
           },
-          required: ['_adminCertificatePhotoTipsA', 'adminMobile', 'name', 'certificateNumber', 'operatingStartTime']
+          required: ['_adminCertificatePhotoTipsA', 'adminMobile', 'name', 'certificateNumber', 'validStartTime']
         },
         // 所属城市
         _addressTitle: { title: '', type: 'string', ui: { widget: 'custom' } },
-        status3: {
+        cityCodesList: {
           type: 'string',
           title: '所属城市',
           ui: {
@@ -335,7 +294,7 @@ export class AddPersonalPartnerComponent {
         },
         // 渠道销售
         _channelTitle: { title: '', type: 'string', ui: { widget: 'custom' } },
-        channel: {
+        invitationCode: {
           title: '渠道销售邀请码',
           type: 'string',
           minLength: 1,
@@ -349,7 +308,7 @@ export class AddPersonalPartnerComponent {
           }
         }
       },
-      required: ['status3', 'channel']
+      required: ['cityCodesList', 'invitationCode']
     };
   }
 }
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 893cf685..d78dc5fd 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
@@ -108,7 +108,7 @@
       <input
         nz-input
         type="text"
-        [(ngModel)]="detailData.legalPersonIdentity.name"
+        [(ngModel)]="detailData.adminUserInfo.name"
         [readonly]="!isEdit"
         [nzBorderless]="!isEdit"
         [placeholder]="isEdit ? '' : '-'"
@@ -118,7 +118,7 @@
       <input
         nz-input
         type="text"
-        [(ngModel)]="detailData.legalPersonIdentity.certificateNumber"
+        [(ngModel)]="detailData.adminUserInfo.certificateNumber"
         [readonly]="!isEdit"
         [nzBorderless]="!isEdit"
         [placeholder]="isEdit ? '' : '-'"
@@ -136,7 +136,7 @@
     </sv>
     <sv label="身份证有效期" col="1">
       <nz-date-picker
-        [(ngModel)]="detailData.legalPersonIdentity.validStartTime"
+        [(ngModel)]="detailData.adminUserInfo.validStartTime"
         [nzDisabled]="!isEdit"
         nzPlaceHolder=" "
         [nzBorderless]="!isEdit"
@@ -145,11 +145,11 @@
         class="calendar"
       ></nz-date-picker>
       -
-      <ng-container *ngIf="!isEdit && !detailData?.legalPersonIdentity?.validEndTime && detailData.legalPersonIdentity.validStartTime">
+      <ng-container *ngIf="!isEdit && !detailData?.adminUserInfo?.validEndTime && detailData.adminUserInfo.validStartTime">
         <label style="padding-left: 11px">长期</label>
       </ng-container>
       <nz-date-picker
-        [(ngModel)]="detailData.legalPersonIdentity.validEndTime"
+        [(ngModel)]="detailData.adminUserInfo.validEndTime"
         [nzDisabled]="!isEdit"
         nzPlaceHolder=" "
         [nzBorderless]="!isEdit"
@@ -160,8 +160,8 @@
       <ng-container *ngIf="isEdit">
         <label
           nz-checkbox
-          [ngModel]="!!!detailData.legalPersonIdentity.validEndTime"
-          (ngModelChange)="$event ? (detailData.legalPersonIdentity.validEndTime = '') : ''"
+          [ngModel]="!!!detailData.adminUserInfo.validEndTime"
+          (ngModelChange)="$event ? (detailData.adminUserInfo.validEndTime = '') : ''"
           class="ml-sm"
           >长期</label
         >
@@ -173,7 +173,7 @@
           *ngTemplateOutlet="
             uploadTemplate;
             context: {
-              data: detailData?.legalPersonIdentity,
+              data: detailData?.adminUserInfo,
               status: isEdit,
               key: 'certificatePhotoFrontWatermark',
               key2: 'certificatePhotoFront',
@@ -186,7 +186,7 @@
           *ngTemplateOutlet="
             uploadTemplate;
             context: {
-              data: detailData?.legalPersonIdentity,
+              data: detailData?.adminUserInfo,
               status: isEdit,
               key: 'certificatePhotoBackWatermark',
               key2: 'certificatePhotoBack',

From 3590e8c7d1caa7bd361b69a17785fcb372a3f477 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= <xiaoyun.pan@eascs.com>
Date: Fri, 18 Mar 2022 20:56:42 +0800
Subject: [PATCH 53/70] =?UTF-8?q?=E8=B4=A6=E6=88=B7=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../account-detail.component.html             | 26 ++---
 .../account-detail.component.ts               | 99 ++++++++++++++-----
 .../components/list/list.component.ts         | 12 +--
 .../virtual-account-detail.component.ts       | 24 ++++-
 .../services/account-managemant.service.ts    |  3 +
 .../components/detail/detail.component.ts     |  6 +-
 .../components/record/record.component.html   |  4 +-
 .../components/record/record.component.ts     | 14 ++-
 .../recorded/services/recorded.service.ts     |  4 +-
 9 files changed, 133 insertions(+), 59 deletions(-)

diff --git a/src/app/routes/partner/account-management/components/account-detail/account-detail.component.html b/src/app/routes/partner/account-management/components/account-detail/account-detail.component.html
index 8669a08f..2b3372de 100644
--- a/src/app/routes/partner/account-management/components/account-detail/account-detail.component.html
+++ b/src/app/routes/partner/account-management/components/account-detail/account-detail.component.html
@@ -1,27 +1,27 @@
 <page-header-wrapper [title]="'合伙人账户明细'" [logo]="logo">
   <ng-template #logo>
-    <button nz-button (click)="goBack()">
+    <!-- <button nz-button (click)="goBack()">
       <i nz-icon nzType="left" nzTheme="outline"></i>
-    </button>
+    </button> -->
   </ng-template>
 </page-header-wrapper>
 <nz-card>
   <sv-container layout="vertical" [noColon]="true" col="4">
     <sv [label]="labelTpl">
-      <b class="text-md ">{{accountInfo?.company}}</b>
+      <b class="text-md ">{{headerTotalInfo?.ltdName}}</b>
     </sv>
     <sv label="可用余额">
-      {{totalInfo?.balance |currency}}
+      {{headerTotalInfo?.balance |currency}}
     </sv>
     <sv label="收入金额">
-      {{totalInfo?.income |currency}}
+      {{headerTotalInfo?.income |currency}}
     </sv>
     <sv label="支出金额">
-      {{totalInfo?.spending |currency}}
+      {{headerTotalInfo?.spending |currency}}
     </sv>
   </sv-container>
   <ng-template #labelTpl>
-    <b class="text-md" style="color: black;">{{accountInfo?.name}} {{accountInfo?.phone}}</b>
+    <b class="text-md" style="color: black;">{{headerTotalInfo?.name}} {{headerTotalInfo?.phone}}</b>
   </ng-template>
 </nz-card>
 <nz-card>
@@ -40,7 +40,7 @@
     </div>
   </div>
   <div class="table-content">
-    <st #st [data]="service.$api_get_account_management_page " [columns]="columns"
+    <st #st [data]="service.$api_get_account_detail_page " [columns]="columns"
       [req]="{ method: 'POST', allInBody: true, reName: {pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
       [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
       [page]="{ show: true, showSize: true, pageSizes:  [5,10, 20, 50, 100, 200, 500] }"
@@ -49,13 +49,17 @@
         <div *ngIf="item.incomeType === '1'"> - {{item.amount | currency }}</div>
         <div *ngIf="item.incomeType === '2'"> + {{item.amount | currency }}</div>
       </ng-template>
+      <ng-template st-row="accountBalance" let-item>
+        <div class="text-right">{{item?.accountBalance |currency}}</div>
+      </ng-template>
+
     </st>
     <div class="total-footer text-md" *ngIf="st?.list?.length !== 0 ">
-      合计 <label class="text-red-dark">{{ totalInfo?.total }}</label> 项，收入 <label
+      合计 <label class="text-red-dark">{{ footerTotalInfo?.total }}</label> 项，收入 <label
         class="text-red-dark font-weight-bold">{{
-        totalInfo?.income | currency
+        footerTotalInfo?.income | currency
         }}</label>，支出 <label class="text-red-dark font-weight-bold">{{
-        totalInfo?.spending | currency }}</label>
+        footerTotalInfo?.spending | currency }}</label>
     </div>
   </div>
 </nz-card>
diff --git a/src/app/routes/partner/account-management/components/account-detail/account-detail.component.ts b/src/app/routes/partner/account-management/components/account-detail/account-detail.component.ts
index 860ea7c4..c93b8aab 100644
--- a/src/app/routes/partner/account-management/components/account-detail/account-detail.component.ts
+++ b/src/app/routes/partner/account-management/components/account-detail/account-detail.component.ts
@@ -1,4 +1,5 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
 import { STColumn, STComponent } from '@delon/abc/st';
 import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
 import { ModalHelper, _HttpClient } from '@delon/theme';
@@ -10,17 +11,20 @@ import { AccountManagemantService } from '../../services/account-managemant.serv
   styleUrls: ['./account-detail.component.less']
 })
 export class PartnerAccountManagementAccountDetailComponent implements OnInit {
-  totalInfo: any = {
-    balance: 0,
-    income: 1500,
-    spending: 2400,
-    total: 186
+  headerTotalInfo: any = {
+    allAmount: 0,
+    incomeAmount: 0,
+    payAmount: 0,
+    name: '',
+    ltdName: '',
+    phone: ''
   };
-  accountInfo = {
-    name: '张三',
-    phone: '13812345678',
-    company: '天津怡亚通物流科技有限公司（平安）'
-  }
+  footerTotalInfo: any = {
+    incomeAmount: 0,
+    payAmount: 0,
+    total: 0
+  };
+
 
   url = `/user`;
   schema: SFSchema = {};
@@ -31,14 +35,27 @@ export class PartnerAccountManagementAccountDetailComponent implements OnInit {
 
 
   columns: STColumn[] = [];
+  roleId = '';
+  bankType = '';
+  channelSource = '';
+  ltdId = '';
+  constructor(public service: AccountManagemantService, public ar: ActivatedRoute) {
 
-  constructor(public service: AccountManagemantService) { }
+    this.roleId = this.ar.snapshot.params.id;
+    this.ar.queryParamMap.subscribe((res: any) => {
+      this.ltdId = res?.params?.ltdId;
+      this.channelSource = res?.params?.channelSource;
+      this.bankType = res?.params?.bankType;
+    })
+  }
 
 
   get reqParams() {
-    return { ...this.sf?.value };
+    return { ...this.sf?.value, roleId: this.roleId, ltdId: this.ltdId, channelSource: this.channelSource, bankType: this.bankType };
   }
   ngOnInit(): void {
+    this.getHeaderSummary();
+    this.getFooterSummary();
     this.initSF();
     this.initST();
   }
@@ -59,21 +76,21 @@ export class PartnerAccountManagementAccountDetailComponent implements OnInit {
             format: 'yyyy-MM-dd',
           } as SFDateWidgetSchema,
         },
-        abnormalCause: {
+        transactionNumber: {
           title: '流水号',
           type: 'string',
           ui: {
             placeholder: '请输入',
           },
         },
-        abnormalCause1: {
+        businessNumber: {
           title: '交易单号',
           type: 'string',
           ui: {
             placeholder: '请输入',
           },
         },
-        bankType: {
+        tradeType: {
           type: 'string',
           title: '交易类型',
           default: '',
@@ -90,7 +107,7 @@ export class PartnerAccountManagementAccountDetailComponent implements OnInit {
             },
           },
         },
-        bankType1: {
+        incomeType: {
           type: 'string',
           title: '收支类型',
           default: '',
@@ -118,16 +135,16 @@ export class PartnerAccountManagementAccountDetailComponent implements OnInit {
 */
   initST() {
     this.columns = [
-      { title: '交易时间', index: 'carNo', className: 'text-center', width: 200 },
-      { title: '流水号', render: 'carModelLabel', className: 'text-center', width: 150 },
-      { title: '交易类型', render: 'carModelLabel', className: 'text-center', width: 200 },
-      { title: '交易单号', render: 'carModelLabel', className: 'text-center', width: 120 },
-      { title: '备注', index: 'remark', className: 'text-center', width: 180 },
-      { title: '收支类型', render: 'approvalStatus1', className: 'text-center', width: 180 },
-      { title: '交易金额', render: 'amount', className: 'text-right', width: 180 },
-      { title: '账户余额', render: 'approvalStatus3', className: 'text-right', width: 180 },
-      { title: '付款方', index: 'approvalStatus4', className: 'text-center', width: 200 },
-      { title: '收款方', index: 'approvalStatus4', className: 'text-center', width: 120 },
+      { title: '交易时间', index: 'createTime', className: 'text-center', width: 200 },
+      { title: '流水号', index: 'transactionNumber', className: 'text-center', width: 150 },
+      { title: '交易类型', index: 'tradeTypeLabel', className: 'text-center', width: 200 },
+      { title: '交易单号', index: 'businessNumber', className: 'text-center', width: 120 },
+      { title: '备注', index: 'tradeContent', className: 'text-center', width: 180 },
+      { title: '收支类型', index: 'incomeTypeLabel', className: 'text-center', width: 180 },
+      { title: '交易金额', render: 'amount', className: 'text-center', width: 180 },
+      { title: '账户余额', render: 'accountBalance', className: 'text-center', width: 180 },
+      { title: '付款方', index: 'payName', className: 'text-center', width: 200 },
+      { title: '收款方', index: 'payeeName', className: 'text-center', width: 120 },
     ];
   }
   resetSF() {
@@ -145,6 +162,34 @@ export class PartnerAccountManagementAccountDetailComponent implements OnInit {
     this._$expand = !this._$expand;
     this.sf?.setValue('/_$expand', this._$expand);
   }
+  /**
+ * 头部汇总
+ */
+  getHeaderSummary() {
+    const params = {
+      roleId: this.roleId,
+      ltdId: this.ltdId,
+      channelSource: this.channelSource,
+      bankType: this.bankType
+    };
+    this.service.request(this.service.$api_get_account_detail_header_summary, { ...params }).subscribe(res => {
+      if (res) {
+        this.headerTotalInfo = res;
+        console.log(res);
+      }
+    })
+  }
+  /**
+   * 脚部汇总
+   */
+  getFooterSummary() {
+    this.service.request(this.service.$api_get_account_detail_footer_summary, this.reqParams).subscribe(res => {
+      if (res) {
+        this.footerTotalInfo = res;
+      }
+    })
+  }
+
 
   search() {
     this.st.load(1);
@@ -154,4 +199,6 @@ export class PartnerAccountManagementAccountDetailComponent implements OnInit {
   goBack() {
     window.history.go(-1);
   }
+
+
 }
diff --git a/src/app/routes/partner/account-management/components/list/list.component.ts b/src/app/routes/partner/account-management/components/list/list.component.ts
index 7e58f5e1..1f2e53b8 100644
--- a/src/app/routes/partner/account-management/components/list/list.component.ts
+++ b/src/app/routes/partner/account-management/components/list/list.component.ts
@@ -61,13 +61,13 @@ export class PartnerAccountManagementListComponent implements OnInit {
     this.columns = [
       { title: '合伙人名称', index: 'userName', className: 'text-center', width: 250 },
       { title: '手机号', index: 'phone', className: 'text-center', width: 200 },
-      { title: '账户总额（元）', render: 'allBalance', className: 'text-right', sort: true, width: 200 },
-      { title: '待入账余额（元）', render: 'unEntryAmount', className: 'text-right', sort: true, width: 200 },
-      { title: '可用余额（元）', render: 'availableBalance', className: 'text-right', sort: true, width: 250 },
+      { title: '账户总额（元）', render: 'allBalance', className: 'text-right', sort: true, width: 150 },
+      { title: '待入账余额（元）', render: 'unEntryAmount', className: 'text-right', sort: true, width: 150 },
+      { title: '可用余额（元）', render: 'availableBalance', className: 'text-right', sort: true, width: 150 },
       { title: '虚拟账户', index: 'virtualAccount', className: 'text-center', width: 200 },
       {
         title: '操作',
-        width: 100,
+        width: 150,
         buttons: [
           {
             text: '虚拟账户明细',
@@ -90,12 +90,12 @@ export class PartnerAccountManagementListComponent implements OnInit {
    * @param _record 当前行信息
    */
   viewVirtual(_record: any) {
-
+    console.log()
     const modalRef = this.modal.create({
       nzTitle: '虚拟账户明细',
       nzContent: PartnerAccountManagementVirtualAccountDetailComponent,
       nzComponentParams: {
-        roleId: _record?.roleId
+        roleId: _record?.roleId,
       },
       nzWidth: '85%',
       nzFooter: null
diff --git a/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.ts b/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.ts
index 5d77e7ba..8095df64 100644
--- a/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.ts
+++ b/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.ts
@@ -1,4 +1,5 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
+import { Router } from '@angular/router';
 import { STColumn, STComponent } from '@delon/abc/st';
 import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
 import { _HttpClient } from '@delon/theme';
@@ -19,9 +20,10 @@ export class PartnerAccountManagementVirtualAccountDetailComponent implements On
   columns: STColumn[] = [];
   roleId = '';
   _$expand = false;
+  record = {};
 
   constructor(public shipperservice: ShipperBaseService, public service: AccountManagemantService,
-    private modalRef: NzModalRef) {
+    private modalRef: NzModalRef, public router: Router) {
   }
 
   get reqParams() {
@@ -52,7 +54,7 @@ export class PartnerAccountManagementVirtualAccountDetailComponent implements On
             placeholder: '请输入',
           },
         },
-        abnormalCause2: {
+        ltdId: {
           title: '网络货运人',
           type: 'string',
           default: '',
@@ -81,7 +83,7 @@ export class PartnerAccountManagementVirtualAccountDetailComponent implements On
             },
           },
         },
-        abnormalCause3: {
+        virtualAccount: {
           title: '虚拟账户',
           type: 'string',
           ui: {
@@ -165,7 +167,21 @@ export class PartnerAccountManagementVirtualAccountDetailComponent implements On
    * @param _record 当前行信息
    */
   viewDetail(_record: any) {
-    window.open(location.origin + `/#/partner/account-management/am/detail/${_record?.id}`);
+    // record: {
+    //   channelSource: _record?.accountType,
+    //   roleId: _record?.roleId,
+    //   bankType: _record?.bankType,
+    //   ltdId: _record?.ltdId
+    // }
+    this.router.navigate([`/partner/account-management/am/detail/${_record?.roleId}`], {
+      queryParams: {
+        channelSource: _record?.accountType,
+        bankType: _record?.bankType,
+        ltdId: _record?.ltdId
+      }
+    });
+    return;
+    window.open(location.origin + `/#/partner/account-management/am/detail/${_record?.roleId}?ltdId=${_record?.ltdId}&channelSource=${_record?.accountType}&bankType=${_record?.bankType}`);
   }
 
   close() {
diff --git a/src/app/routes/partner/account-management/services/account-managemant.service.ts b/src/app/routes/partner/account-management/services/account-managemant.service.ts
index 8b9d9acb..0c3359a3 100644
--- a/src/app/routes/partner/account-management/services/account-managemant.service.ts
+++ b/src/app/routes/partner/account-management/services/account-managemant.service.ts
@@ -9,6 +9,9 @@ export class AccountManagemantService extends BaseService {
   $api_get_account_management_page = `/api/bpc/accountBalancePartner/getPartnerAccountBalanceByOperator`; // 账户管理
   $api_get_virtual_detail_page = `/api/bpc/accountBalancePartner/getPartnerAccountBalanceInfoByOperator`;//虚拟账户明细
   $api_get_withdraw_record_page = `/api/fcc/refundApplicationOBC/list/partnerPage`;// 提现记录
+  $api_get_account_detail_page = `/api/bpc/accountBalancePartner/getAccountBalancePartnerByOperatorPage`;// 账户明细
+  $api_get_account_detail_footer_summary = `/api/bpc/accountBalancePartner/getAccountBalancePartnerIncomeDetailByOperator`;// 账户明细脚部汇总
+  $api_get_account_detail_header_summary = `/api/bpc/accountBalancePartner/getAccountBalancePartnerAmountByOperator`;// 账户明细头部汇总
 
   constructor(public injector: Injector) {
     super(injector)
diff --git a/src/app/routes/partner/recorded/components/detail/detail.component.ts b/src/app/routes/partner/recorded/components/detail/detail.component.ts
index f2782ef5..6e9a5b99 100644
--- a/src/app/routes/partner/recorded/components/detail/detail.component.ts
+++ b/src/app/routes/partner/recorded/components/detail/detail.component.ts
@@ -19,12 +19,12 @@ export class PartnerRecordedDetailComponent implements OnInit {
 
   constructor(public service: RecordedService, private route: ActivatedRoute, private nzModalService: NzModalService) {
     this.id = route.snapshot.params.id;
-    this.loadRefundDetail(this.id);
+    this.getRecordedDetail(this.id);
   }
 
   ngOnInit(): void { }
 
-  loadRefundDetail(id: string) {
+  getRecordedDetail(id: string) {
     this.service.request(this.service.$api_get_recorded_record_detail, { id }).subscribe(res => {
       if (res) {
         this.formData = res;
@@ -106,7 +106,7 @@ export class PartnerRecordedDetailComponent implements OnInit {
     });
     modal.afterClose.subscribe((res: any) => {
       if (res) {
-        this.loadRefundDetail(this.id);
+        this.getRecordedDetail(this.id);
       }
     });
   }
diff --git a/src/app/routes/partner/recorded/components/record/record.component.html b/src/app/routes/partner/recorded/components/record/record.component.html
index e6233910..ce514695 100644
--- a/src/app/routes/partner/recorded/components/record/record.component.html
+++ b/src/app/routes/partner/recorded/components/record/record.component.html
@@ -32,7 +32,7 @@
     <div class="d-flex align-items-center ">
       <div class="mr-md">
         已选择
-        <strong class="text-red">{{ selectedRows.length }}</strong> 条数据&nbsp;&nbsp; 累计提现 <strong class="text-red">{{
+        <strong class="text-red">{{ selectedRows.length }}</strong> 条数据，累计入账 <strong class="text-red">{{
           totalCallNo }}</strong>
         <!-- <a *ngIf="totalCallNo > 0" (click)="st.clearCheck()" class="ml-lg">清空</a> -->
       </div>
@@ -44,7 +44,7 @@
     <st #st [data]="service.$api_get_recorded_page" [columns]="columns"
       [req]="{  method: 'POST', allInBody: true,process: beforeReq}" [loading]="service.http.loading"
       [scroll]="{ x:'1200px' }" (change)="stChange($event)"
-      [res]="{ reName: { list: 'data.records', total: 'data.total' }, process: afterRes }"
+      [res]="{ reName: { list: 'data', total: 'data.total' }, process: afterRes }"
       [page]="{ show: true,  pageSizes:  [10, 20, 50, 100, 200, 500] }">
       <ng-template st-row="bankCardNumber" let-item let-index="index" let-column="column">
         {{ item.bankName }} <br> {{ item.bankCardNumber }}
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 7e154473..9751a9cb 100644
--- a/src/app/routes/partner/recorded/components/record/record.component.ts
+++ b/src/app/routes/partner/recorded/components/record/record.component.ts
@@ -70,7 +70,7 @@ export class PartnerRecordedRecordComponent implements OnInit {
   };
 
   afterRes = (data: any[], rawData?: any) => {
-    data = data.map(node => ({ ...node, disabled: node.refundStatus !== '1' }));
+    data = data.map(node => ({ ...node, disabled: node.sts !== '0' }));
     return data;
   };
 
@@ -104,7 +104,7 @@ export class PartnerRecordedRecordComponent implements OnInit {
       }
       let totalCallNo = 0;
       this.selectedRows.forEach((item => {
-        totalCallNo = new Big(this.totalCallNo).plus(item?.amount).parse();
+        totalCallNo = new Big(this.totalCallNo).plus(item?.entryAmount).parse();
       }));
       this.totalCallNo = totalCallNo;
     } else if (e.type === 'loaded') {
@@ -125,6 +125,10 @@ export class PartnerRecordedRecordComponent implements OnInit {
   }
 
   auditAction(item?: any, type: string = '1') {
+    if (!item && this.selectedRows.length === 0) {
+      this.service.msgSrv.warning('请选择需要审核的记录');
+      return;
+    }
     this.msg = '';
     let params: Array<string> = [];
     if (item) {
@@ -252,7 +256,7 @@ export class PartnerRecordedRecordComponent implements OnInit {
             widget: 'select',
             placeholder: '请选择',
             allowClear: true,
-            asyncData: () => this.shipperSrv.getNetworkFreightForwarder(),
+            asyncData: () => this.shipperSrv.getNetworkFreightForwarder({}, true),
           }
         },
         submitTime: {
@@ -313,7 +317,7 @@ export class PartnerRecordedRecordComponent implements OnInit {
         buttons: [
           {
             text: '审核',
-            iif: item => item.refundStatus === '0',
+            iif: item => item.sts === '0',
             click: item => this.auditAction(item)
           },
           {
@@ -335,7 +339,7 @@ export class PartnerRecordedRecordComponent implements OnInit {
  */
   audit(params: any, callback: Function, msg = '成功') {
     this.service
-      .request(this.service.$api_audit_recored, ...params)
+      .request(this.service.$api_audit_recored, { ...params })
       .subscribe(res => {
         if (res) {
           this.service.msgSrv.success(msg);
diff --git a/src/app/routes/partner/recorded/services/recorded.service.ts b/src/app/routes/partner/recorded/services/recorded.service.ts
index bb27a3dc..dcf5393f 100644
--- a/src/app/routes/partner/recorded/services/recorded.service.ts
+++ b/src/app/routes/partner/recorded/services/recorded.service.ts
@@ -6,8 +6,8 @@ import { BaseService } from '@shared';
 })
 export class RecordedService extends BaseService {
 
-  $api_get_recorded_page = `/api/bpc/partnerInvoice/getDetail`; // 查询合伙人发票入账主表
-  $api_get_recorded_record_detail = `api/bpc/partnerInvoice/getDetailByOpration`; // 入账记录详情
+  $api_get_recorded_page = `/api/bpc/partnerInvoiceEntry/queryInvoiceEntrylist`; // 查询合伙人发票入账主表
+  $api_get_recorded_record_detail = `/api/bpc/partnerInvoice/getDetailByOpration`; // 入账记录详情
   $api_disagree_recorded = ``; // 拒绝审核
   $api_agree_recorded = ``; // 同意审核
   $api_audit_recored = `/api/bpc/partnerInvoiceEntry/oprationAudit`; // 审核单据

From 504078a7ec49eb96ab52ef39de5695ad5c78e3a3 Mon Sep 17 00:00:00 2001
From: 1107302052 <1107302052@qq.com>
Date: Mon, 21 Mar 2022 00:57:42 +0800
Subject: [PATCH 54/70] '1'

---
 package-lock.json                             |  41 ----
 .../feedback-detail.component.html            |  46 ++++
 .../feedback-detail.component.less            |  27 +++
 .../feedback-detail.component.ts              |  71 ++++++
 .../components/list/list.component.html       |  47 ++++
 .../components/list/list.component.ts         | 228 ++++++++++++++++++
 .../services/advice-feedback.service.ts       |  12 +
 .../routes/partner/partner-routing.module.ts  |  10 +
 src/app/routes/partner/partner.module.ts      |   6 +-
 src/assets/mocks/menu-data.json               |   9 +
 10 files changed, 455 insertions(+), 42 deletions(-)
 create mode 100644 src/app/routes/partner/advice-feedback/components/feedback-detail/feedback-detail.component.html
 create mode 100644 src/app/routes/partner/advice-feedback/components/feedback-detail/feedback-detail.component.less
 create mode 100644 src/app/routes/partner/advice-feedback/components/feedback-detail/feedback-detail.component.ts
 create mode 100644 src/app/routes/partner/advice-feedback/components/list/list.component.html
 create mode 100644 src/app/routes/partner/advice-feedback/components/list/list.component.ts
 create mode 100644 src/app/routes/partner/advice-feedback/services/advice-feedback.service.ts

diff --git a/package-lock.json b/package-lock.json
index 64c94964..ddf3948b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2879,35 +2879,6 @@
       "integrity": "sha1-vShOV8hPEyXacCur/IKlMoGQwMU=",
       "dev": true
     },
-    "@types/quill": {
-      "version": "2.0.9",
-      "resolved": "https://registry.npmmirror.com/@types/quill/-/quill-2.0.9.tgz",
-      "integrity": "sha512-/n40Ypp+jF3GDLqB/5z1P+Odq1K98txXbBgRDkG6Z90LGC1AwQPtZWNeOdDg0yUlgBSUASmpeDn3eBPUuPXtuw==",
-      "dev": true,
-      "requires": {
-        "parchment": "^1.1.2",
-        "quill-delta": "^4.0.1"
-      },
-      "dependencies": {
-        "fast-diff": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmmirror.com/fast-diff/-/fast-diff-1.2.0.tgz",
-          "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==",
-          "dev": true
-        },
-        "quill-delta": {
-          "version": "4.2.2",
-          "resolved": "https://registry.npmmirror.com/quill-delta/-/quill-delta-4.2.2.tgz",
-          "integrity": "sha512-qjbn82b/yJzOjstBgkhtBjN2TNK+ZHP/BgUQO+j6bRhWQQdmj2lH6hXG7+nwwLF41Xgn//7/83lxs9n2BkTtTg==",
-          "dev": true,
-          "requires": {
-            "fast-diff": "1.2.0",
-            "lodash.clonedeep": "^4.5.0",
-            "lodash.isequal": "^4.5.0"
-          }
-        }
-      }
-    },
     "@types/selenium-webdriver": {
       "version": "3.0.19",
       "resolved": "https://registry.npmmirror.com/@types/selenium-webdriver/download/@types/selenium-webdriver-3.0.19.tgz",
@@ -10165,24 +10136,12 @@
       "resolved": "https://registry.nlark.com/lodash/download/lodash-4.17.21.tgz",
       "integrity": "sha1-Z5WRxWTDv/quhFTPCz3zcMPWkRw="
     },
-    "lodash.clonedeep": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmmirror.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-      "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==",
-      "dev": true
-    },
     "lodash.debounce": {
       "version": "4.0.8",
       "resolved": "https://registry.npm.taobao.org/lodash.debounce/download/lodash.debounce-4.0.8.tgz",
       "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
       "dev": true
     },
-    "lodash.isequal": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmmirror.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
-      "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==",
-      "dev": true
-    },
     "lodash.memoize": {
       "version": "4.1.2",
       "resolved": "https://registry.nlark.com/lodash.memoize/download/lodash.memoize-4.1.2.tgz",
diff --git a/src/app/routes/partner/advice-feedback/components/feedback-detail/feedback-detail.component.html b/src/app/routes/partner/advice-feedback/components/feedback-detail/feedback-detail.component.html
new file mode 100644
index 00000000..a0469712
--- /dev/null
+++ b/src/app/routes/partner/advice-feedback/components/feedback-detail/feedback-detail.component.html
@@ -0,0 +1,46 @@
+
+<page-header-wrapper [title]="''" [logo]="logo" [content]="headerContent">
+    <ng-template #logo>
+      <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
+        <i nz-icon nzType="left" nzTheme="outline"></i>
+      </button>
+    </ng-template>
+    <ng-template #headerContent>
+      <div nz-row class="head-box">
+        <div nz-col nzSpan="1">
+          <img src="./assets/images/usercenter/拉货车.png" alt="" />
+        </div>
+        <div nz-col nzSpan="11" class="pl-lg">
+          <div class="right-h">深圳市XXXXXXX有限公司</div>
+          <div class="right-s">91440300357887492H</div>
+          <sv-container col="2" >
+            <sv label="联系人">  </sv>
+            <sv label="注册时间">  </sv>
+            <sv label="合同有效期">  </sv>
+            <sv label="运营主体"> </sv>
+          </sv-container>
+        </div>
+        <div nz-col nzSpan="10">
+          <div class="left-rt">待审核</div>
+          <div class="left-rb">
+            <button nz-button (click) ="reject()">拒绝</button>
+            <button nz-button nzType="primary" (click) ="approve()">通过</button>
+          </div>
+        </div>
+      </div>
+    </ng-template>
+  </page-header-wrapper>
+  <nz-card nzTitle="建议反馈">
+    <div nz-row>
+      <div nz-col nzSpan="12">
+        <sv-container col="1" labelWidth="120">
+          <sv label="问题类型">  </sv>
+          <sv label="描述或内容建议">  </sv>
+          <sv label="图片">  </sv>
+          <sv label="提交时间">  </sv>
+        </sv-container>
+      </div>
+    </div>
+  </nz-card>
+
+  
\ No newline at end of file
diff --git a/src/app/routes/partner/advice-feedback/components/feedback-detail/feedback-detail.component.less b/src/app/routes/partner/advice-feedback/components/feedback-detail/feedback-detail.component.less
new file mode 100644
index 00000000..e62642d0
--- /dev/null
+++ b/src/app/routes/partner/advice-feedback/components/feedback-detail/feedback-detail.component.less
@@ -0,0 +1,27 @@
+:host {
+  .head-box {
+    img {
+      width: 80px;
+      height: 80px;
+      padding: 8px;
+    }
+    .right-h{
+      font-size: 16px;
+    }
+    .right-s{
+      color: #7f7f7f;
+    }
+
+    .left-rt {
+      font-weight: bold;
+      font-size: 16px;
+      text-align: right;
+    }
+
+    .left-rb {
+      display: flex;
+      justify-content: end;
+      padding-top: 16px;
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/app/routes/partner/advice-feedback/components/feedback-detail/feedback-detail.component.ts b/src/app/routes/partner/advice-feedback/components/feedback-detail/feedback-detail.component.ts
new file mode 100644
index 00000000..d7aa10db
--- /dev/null
+++ b/src/app/routes/partner/advice-feedback/components/feedback-detail/feedback-detail.component.ts
@@ -0,0 +1,71 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { STColumn } from '@delon/abc/st';
+import { _HttpClient } from '@delon/theme';
+import { NzMessageService } from 'ng-zorro-antd/message';
+import { NzModalService } from 'ng-zorro-antd/modal';
+import { ParterClaimAuditListChannelApproveComponent } from '../../../claim-audit/components/channel-approve/channel-approve.component';
+import { ParterClaimAuditListChannelRejectComponent } from '../../../claim-audit/components/channel-reject/channel-reject.component';
+import { AdviceFeedbackService } from '../../services/advice-feedback.service';
+
+// import { ParterClaimAuditListChannelApproveComponent } from '../channel-approve/channel-approve.component';
+// import { ParterClaimAuditListChannelRejectComponent } from '../channel-reject/channel-reject.component';
+
+@Component({
+  selector: 'app-parter-feedback-detail-detail',
+  templateUrl: './feedback-detail.component.html',
+  styleUrls: ['./feedback-detail.component.less']
+})
+export class ParterAdviceFeedbackDetailComponent implements OnInit {
+  id = this.route.snapshot.queryParams.id;
+  i: any;
+  imges: any;
+  isVisible = false;
+
+  constructor(
+    private route: ActivatedRoute,
+    private msgSrv: NzMessageService,
+    public service: AdviceFeedbackService,
+    private modalService: NzModalService,
+    private router: Router
+  ) {}
+
+  ngOnInit(): void {
+    this.initData();
+  }
+
+  initData() {
+    // this.service.request(this.service.$api_getBulkBillDetail, { id: this.id }).subscribe(res => {
+    //   if (res) {
+    //     this.i = res;
+    //
+    //   }
+    // });
+  }
+
+  approve() {
+    const modalRef = this.modalService.create({
+      nzTitle: '同意',
+      nzWidth: 700,
+      nzContent: ParterClaimAuditListChannelApproveComponent,
+      nzComponentParams: {
+        i: this.i
+      },
+      nzFooter: null
+    });
+  }
+  reject() {
+    const modalRef = this.modalService.create({
+      nzTitle: '拒绝',
+      nzWidth: 700,
+      nzContent: ParterClaimAuditListChannelRejectComponent,
+      nzComponentParams: {
+        i: this.i
+      },
+      nzFooter: null
+    });
+  }
+  goBack() {
+    window.history.go(-1);
+  }
+}
diff --git a/src/app/routes/partner/advice-feedback/components/list/list.component.html b/src/app/routes/partner/advice-feedback/components/list/list.component.html
new file mode 100644
index 00000000..ca389dea
--- /dev/null
+++ b/src/app/routes/partner/advice-feedback/components/list/list.component.html
@@ -0,0 +1,47 @@
+<page-header-wrapper [title]="''"></page-header-wrapper>
+<!-- 搜索表单 -->
+<nz-card>
+  <div nz-row nzGutter="8">
+    <!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
+    <div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
+      <sf
+        #sf
+        [schema]="schema"
+        [ui]="ui"
+        [mode]="'search'"
+        [loading]="service.http.loading"
+        (formSubmit)="search()"
+        (formReset)="resetSF()"
+      ></sf>
+    </div>
+
+    <!-- 查询字段大于3个时，根据展开状态调整布局 -->
+    <ng-container *ngIf="queryFieldCount > 4">
+      <div nz-col [nzSpan]="_$expand ? 24 : 18">
+        <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
+      </div>
+      <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
+        <button nz-button nzType="primary" [disabled]="!sf.valid"  (click)="search()" >查询</button>
+        <button nz-button (click)="resetSF()" >重置</button>
+        <button nz-button nzType="link" (click)="expandToggle()">
+          {{ !_$expand ? '展开' : '收起' }}
+          <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
+        </button>
+      </div>
+    </ng-container>
+  </div>
+</nz-card>
+
+<nz-card>
+      <st
+        #st1
+        [data]="data"
+        [columns]="columns1"
+        [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+        [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+        [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+        [loadingDelay]="500"
+        [loading]="service.http.loading"
+      >
+      </st>
+</nz-card>
diff --git a/src/app/routes/partner/advice-feedback/components/list/list.component.ts b/src/app/routes/partner/advice-feedback/components/list/list.component.ts
new file mode 100644
index 00000000..80260b01
--- /dev/null
+++ b/src/app/routes/partner/advice-feedback/components/list/list.component.ts
@@ -0,0 +1,228 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st';
+import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
+import { processSingleSort } from '@shared';
+import { NzModalService } from 'ng-zorro-antd/modal';
+import { AdviceFeedbackService } from '../../services/advice-feedback.service';
+
+@Component({
+  selector: 'app-parter-advice-feedback',
+  templateUrl: './list.component.html'
+})
+export class ParterAdviceFeedbackListComponent implements OnInit {
+  schema: SFSchema = {};
+  columns1!: STColumn[];
+  columns2!: STColumn[];
+  @ViewChild('st1', { static: false })
+  st1!: STComponent;
+  ui!: SFUISchema;
+  @ViewChild('sf', { static: false })
+  sf!: SFComponent;
+  _$expand = false;
+  selectedIndex =  0;
+
+  data=[{name1:1111}]
+  constructor(
+    public router: Router,
+    public ar: ActivatedRoute,
+    public service: AdviceFeedbackService,
+    private modalService: NzModalService
+  ) {}
+
+  /**
+   * 查询参数
+   */
+  get reqParams() {
+    return { ...this.sf?.value };
+  }
+    /**
+   * 查询字段个数
+   */
+     get queryFieldCount(): number {
+      return Object.keys(this.schema?.properties || {}).length;
+    }
+    /**
+     * 伸缩查询条件
+     */
+    expandToggle(): void {
+      this._$expand = !this._$expand;
+      this.sf?.setValue('/_$expand', this._$expand);
+    }
+
+  ngOnInit() {
+    this.initSF();
+    this.initST1();
+    this.initST2();
+  }
+
+  initSF() {
+    this.schema = {
+      properties: {
+        _$expand: { type: 'boolean', ui: { hidden: true } },
+        name: {
+          type: 'string',
+          title: '提交人'
+        },
+        name1: {
+          type: 'string',
+          title: '企业管理员'
+        },
+        name2: {
+          type: 'string',
+          title: '角色'
+        },
+        name3: {
+          type: 'string',
+          title: '问题类型',
+          ui: {
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            }
+          }
+        },
+        name4: {
+          type: 'string',
+          title: '状态',
+          ui: {
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            }
+          }
+        },
+      }
+    };
+    this.ui = {
+      '*': {
+        grid: { span: 8, gutter: 4 }
+      }
+    };
+  }
+
+  initST1() {
+    this.columns1 = [
+      {
+        title: '提交人',
+        index: 'name1'
+      },
+      {
+        title: '企业管理员',
+        index: 'name1'
+      },
+      {
+        title: '手机号',
+        index: 'name1'
+      },
+      {
+        title: '角色',
+        index: 'name1'
+      },
+      {
+        title: '问题类型',
+        index: 'name1'
+      },
+      {
+        title: '描述或建议',
+        index: 'name1'
+      },
+      {
+        title: '状态',
+        index: 'name1'
+      },
+      {
+        title: '提交时间',
+        index: 'name1'
+      },
+      {
+        title: '操作',
+        className: 'text-center',
+        buttons: [
+          {
+            text: '详情',
+            click: (_record, _modal, _instance) => this.partnerView(_record),
+          },
+          {
+            text: '处理',
+            click: (_record, _modal, _instance) => this.partnerView(_record),
+          },
+        ]
+      }
+    ];
+  }
+
+  initST2() {
+    this.columns2 = [
+      {
+        title: '提交人',
+        index: 'name1'
+      },
+      {
+        title: '客户名称',
+        index: 'name1'
+      },
+      {
+        title: '认领备注',
+        index: 'name1'
+      },
+      {
+        title: 'CRM状态',
+        index: 'name1'
+      },
+      {
+        title: '平台审核状态',
+        index: 'name1'
+      },
+      {
+        title: '提交时间',
+        index: 'name1'
+      },
+      {
+        title: '操作',
+        className: 'text-center',
+        buttons: [
+          {
+            text: '详情',
+            click: (_record, _modal, _instance) => this.channelView(_record),
+          },
+          {
+            text: '审核',
+            click: (_record, _modal, _instance) => this.channelView(_record),
+          },
+
+        ]
+      }
+    ];
+  }
+
+  partnerView(record: STData) {
+    this.router.navigate(['/partner/advice-feedback/detail'], { queryParams: {} });
+  }
+  
+  channelView(record: STData) {
+    this.router.navigate(['/partner/advice-feedback/detail'], { queryParams: {} });
+  }
+  /**
+   * 重置表单
+   */
+  resetSF() {
+    this.sf.reset();
+  }
+  search() {
+    // this.st1?.load(1);
+  }
+
+  tabChange(index:any){
+    console.log(index)
+    switch (index) {
+      case 0:
+        this.initST1();
+        break;
+      case 1:
+        this.initST2();
+        break;
+      default:
+        break;
+    }
+  }
+
+}
diff --git a/src/app/routes/partner/advice-feedback/services/advice-feedback.service.ts b/src/app/routes/partner/advice-feedback/services/advice-feedback.service.ts
new file mode 100644
index 00000000..1e94e786
--- /dev/null
+++ b/src/app/routes/partner/advice-feedback/services/advice-feedback.service.ts
@@ -0,0 +1,12 @@
+import { Injectable, Injector } from '@angular/core';
+import { BaseService } from '@shared';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class AdviceFeedbackService extends BaseService {
+
+  constructor(public injector: Injector) {
+    super(injector);
+  }
+}
diff --git a/src/app/routes/partner/partner-routing.module.ts b/src/app/routes/partner/partner-routing.module.ts
index 27c92fb7..afcd8d41 100644
--- a/src/app/routes/partner/partner-routing.module.ts
+++ b/src/app/routes/partner/partner-routing.module.ts
@@ -47,6 +47,8 @@ import { ScrollImgComponentsListComponent } from './scrollimg/components/list/li
 import { BannerComponentsListComponent } from './knowledge/banner/components/list/list.component';
 import { BannerComponentsAddComponent } from './knowledge/banner/components/add/add.component';
 import { PersonalPartnerDetailComponent } from './partner-list/components/personal-partner-detail/personal-partner-detail.component';
+import { ParterAdviceFeedbackListComponent } from './advice-feedback/components/list/list.component';
+import { ParterAdviceFeedbackDetailComponent } from './advice-feedback/components/feedback-detail/feedback-detail.component';
 
 const routes: Routes = [
   {
@@ -135,6 +137,14 @@ const routes: Routes = [
       { path: 'detail', component: ScrollimgComponentsAddComponent }
     ]
   },
+  {
+    path: 'advice-feedback',
+    children: [
+      { path: '', component: ParterAdviceFeedbackListComponent },
+      { path: 'list', component: ParterAdviceFeedbackListComponent },
+      { path: 'detail', component: ParterAdviceFeedbackDetailComponent }
+    ]
+  },
   {
     path: 'recorded',
     children: [
diff --git a/src/app/routes/partner/partner.module.ts b/src/app/routes/partner/partner.module.ts
index 75c9c2a7..986d5e59 100644
--- a/src/app/routes/partner/partner.module.ts
+++ b/src/app/routes/partner/partner.module.ts
@@ -59,6 +59,8 @@ import { ScrollImgComponentsListComponent } from './scrollimg/components/list/li
 import { BannerComponentsListComponent } from './knowledge/banner/components/list/list.component';
 import { BannerComponentsAddComponent } from './knowledge/banner/components/add/add.component';
 import { PersonalPartnerDetailComponent } from './partner-list/components/personal-partner-detail/personal-partner-detail.component';
+import { ParterAdviceFeedbackListComponent } from './advice-feedback/components/list/list.component';
+import { ParterAdviceFeedbackDetailComponent } from './advice-feedback/components/feedback-detail/feedback-detail.component';
 
 const COMPONENTS: any[] = [
   PartnerBusinessStatisticsIndexComponent,
@@ -107,7 +109,9 @@ const COMPONENTS: any[] = [
   PartnerEditComponent,
   BannerComponentsListComponent,
   BannerComponentsAddComponent,
-  PersonalPartnerDetailComponent
+  PersonalPartnerDetailComponent,
+  ParterAdviceFeedbackListComponent,
+  ParterAdviceFeedbackDetailComponent
 ];
 
 @NgModule({
diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json
index 22c0317b..df702349 100644
--- a/src/assets/mocks/menu-data.json
+++ b/src/assets/mocks/menu-data.json
@@ -596,6 +596,15 @@
               "text": "轮播图管理",
               "link": "/partner/scroll-img/list"
             },
+            {
+              "text": "建议反馈管理",
+              "link": "/partner/advice-feedback/list"
+            },
+            {
+              "text": "建议反馈管理详情",
+              "link": "/partner/advice-feedback/detail",
+              "hide": true
+            },
             {
               "text": "知识库管理",
               "icon": "iconfont icon-yundan-copy",

From 3284eeea245b2dd7b216b5101b302ec3e2f855e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= <xiaoyun.pan@eascs.com>
Date: Mon, 21 Mar 2022 10:02:29 +0800
Subject: [PATCH 55/70] -

---
 .../account-management/components/list/list.component.ts      | 2 +-
 .../withdrawals-record/withdrawals-record.component.ts        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/routes/partner/account-management/components/list/list.component.ts b/src/app/routes/partner/account-management/components/list/list.component.ts
index 1f2e53b8..56881170 100644
--- a/src/app/routes/partner/account-management/components/list/list.component.ts
+++ b/src/app/routes/partner/account-management/components/list/list.component.ts
@@ -64,7 +64,7 @@ export class PartnerAccountManagementListComponent implements OnInit {
       { title: '账户总额（元）', render: 'allBalance', className: 'text-right', sort: true, width: 150 },
       { title: '待入账余额（元）', render: 'unEntryAmount', className: 'text-right', sort: true, width: 150 },
       { title: '可用余额（元）', render: 'availableBalance', className: 'text-right', sort: true, width: 150 },
-      { title: '虚拟账户', index: 'virtualAccount', className: 'text-center', width: 200 },
+      { title: '虚拟账户', index: 'virtualAccount', className: 'text-center', width: 220 },
       {
         title: '操作',
         width: 150,
diff --git a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts
index 8abf556f..4bb0a0d9 100644
--- a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts
+++ b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts
@@ -281,13 +281,13 @@ export class PartnerAccountManagementWithdrawalsRecordComponent implements OnIni
       { title: '提现单号', index: 'refundApplyCode', width: 180, className: 'text-center' },
       { title: '网络货运人', index: 'ltdName', width: 220, className: 'text-center' },
       { title: '银行类型', index: 'bankTypeLabel', width: 100, className: 'text-center' },
-      { title: '账户类型', index: 'bankTypeLabel', width: 100, className: 'text-center' },
+      { title: '账户类型', index: 'accountTypeLabel', width: 100, className: 'text-center' },
       { title: '账户名称', index: 'bankAccountName', width: 220, className: 'text-center' },
       { title: '虚拟账户', index: 'virtualAccount', width: 180, className: 'text-center' },
       {
         title: '提现金额',
         index: 'amount',
-        width: 150,
+        width: 200,
         type: 'widget',
         className: 'text-right',
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.amount }) }

From ba4310e079bbe164b35d7236b8ed216c90811a40 Mon Sep 17 00:00:00 2001
From: heqinghang <qinghang.he@eascs.com>
Date: Mon, 21 Mar 2022 10:15:29 +0800
Subject: [PATCH 56/70] 666

---
 .../components/edit/edit.component.ts         | 68 ++++++++++++-------
 .../components/list/list.component.html       |  2 +-
 .../components/list/list.component.ts         |  4 +-
 .../services/channel-sales.service.ts         | 10 +++
 4 files changed, 57 insertions(+), 27 deletions(-)

diff --git a/src/app/routes/partner/channel-sales/components/edit/edit.component.ts b/src/app/routes/partner/channel-sales/components/edit/edit.component.ts
index 5e5d6e85..143c8f4f 100644
--- a/src/app/routes/partner/channel-sales/components/edit/edit.component.ts
+++ b/src/app/routes/partner/channel-sales/components/edit/edit.component.ts
@@ -1,6 +1,6 @@
 import { AfterViewInit, ChangeDetectorRef, Component, OnChanges, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { SFComponent, SFRadioWidgetSchema, SFSchema, SFSchemaEnumType, SFSelectWidgetSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form';
+import { SFAutoCompleteWidgetSchema, SFComponent, SFRadioWidgetSchema, SFSchema, SFSchemaEnumType, SFSelectWidgetSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form';
 import { _HttpClient } from '@delon/theme';
 import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
 import { map } from 'rxjs/operators';
@@ -38,18 +38,37 @@ export class ParterChannelSalesEditComponent implements OnInit {
           title: '',
           ui: { hidden: true }
         },
-        name1: {
-          title: '业务员选择',
+        name: {
+          title: '渠道销售姓名',
           type: 'string',
-          enum: [
-            { label: '王武', value: '1'},
-          ],
+          maxLength: 12,
           ui: {
-            widget: 'select',
-            placeholder:'请选择'
-          } as SFSelectWidgetSchema,
+            placeholder:'请输入'
+          } 
         },
-        name2: {
+        phoneNumber: {
+          title: '手机号',
+          type: 'string',
+          maxLength: 11,
+          ui: {
+            placeholder:'请输入'
+          } 
+        },
+        employeeVO: {
+          title: '关联OA员工',
+          type: 'string',
+          ui: {
+            widget: 'autocomplete',
+            placeholder:'请选择',
+            asyncData: () => this.service.request(this.service.$api_fuzzyQuery).pipe(
+              map((res: any) => {
+                console.log('111',res)
+                return [];
+              })
+            )
+          } as SFAutoCompleteWidgetSchema,
+        },
+        isAuthorization: {
           type: 'string',
           title: '授权登录运营后台',
           enum: [
@@ -59,9 +78,9 @@ export class ParterChannelSalesEditComponent implements OnInit {
           ui: {
             widget: 'radio',
           } as SFRadioWidgetSchema,
-          default: 'A',
+          default: '0',
         },
-        name: {
+        roleIds: {
           title: '',
           type: 'string',
           enum: [
@@ -70,10 +89,10 @@ export class ParterChannelSalesEditComponent implements OnInit {
           ui: {
             widget: 'select',
             placeholder:'授权角色',
-            visibleIf: { name2: (value: string) => value === '1' }
+            visibleIf: { isAuthorization: (value: string) => value === '1' }
           } as SFSelectWidgetSchema,
         },
-        name3: {
+        remark: {
           type: 'string',
           title: '备注',
           maxLength: 50,
@@ -84,15 +103,16 @@ export class ParterChannelSalesEditComponent implements OnInit {
           } as SFTextareaWidgetSchema,
         },
       },
-      required: ['name1', 'name2']
+      required: ['name', 'phoneNumber', 'employeeVO', 'roleIds', 'remark']
     };
     this.ui = {
       '*': {
         spanLabelFixed: 150,
         grid: { span: 24 }
       },
-      $name:{ spanLabelFixed: 10, grid: { span: 12 }},
-      $name2:{  grid: { span: 12 }},
+      $isAuthorization:{  grid: { span: 12 }},
+      $roleIds:{ spanLabelFixed: 10, grid: { span: 12 }},
+      
 
     };
   }
@@ -103,12 +123,12 @@ export class ParterChannelSalesEditComponent implements OnInit {
   save() {
     this.sf.validator({ emitError: true });
     if(!this.sf.valid) return;
-    // this.service.request('', { ...this.sf.value }).subscribe(res => {
-    //   if (res) {
-    //     this.modalRef.destroy(true);
-    //   } else {
-    //     this.service.msgSrv.error(res.msg);
-    //   }
-    // });
+    this.service.request(this.service.$api_save, { ...this.sf.value }).subscribe(res => {
+      if (res) {
+        this.modalRef.destroy(true);
+      } else {
+        this.service.msgSrv.error(res.msg);
+      }
+    });
   }
 }
diff --git a/src/app/routes/partner/channel-sales/components/list/list.component.html b/src/app/routes/partner/channel-sales/components/list/list.component.html
index fd0078d8..589c32e9 100644
--- a/src/app/routes/partner/channel-sales/components/list/list.component.html
+++ b/src/app/routes/partner/channel-sales/components/list/list.component.html
@@ -15,7 +15,7 @@
   <!-- 数据列表 -->
   <st
     #st
-    [data]="data"
+    [data]="service.$api_getPage"
     [columns]="columns"
     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
     [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
diff --git a/src/app/routes/partner/channel-sales/components/list/list.component.ts b/src/app/routes/partner/channel-sales/components/list/list.component.ts
index 2debda3f..635495a2 100644
--- a/src/app/routes/partner/channel-sales/components/list/list.component.ts
+++ b/src/app/routes/partner/channel-sales/components/list/list.component.ts
@@ -47,7 +47,7 @@ export class ParterChannelSalesListComponent implements OnInit {
           type: 'string',
           title: '销售渠道姓名'
         },
-        phone: {
+        telephone: {
           type: 'string',
           title: '手机号'
         },
@@ -88,7 +88,7 @@ export class ParterChannelSalesListComponent implements OnInit {
       },
       {
         title: '邀请码',
-        index: 'name1'
+        index: 'inviteCode'
       },
       {
         title: '操作',
diff --git a/src/app/routes/partner/channel-sales/services/channel-sales.service.ts b/src/app/routes/partner/channel-sales/services/channel-sales.service.ts
index 6e7cb18c..28a32b02 100644
--- a/src/app/routes/partner/channel-sales/services/channel-sales.service.ts
+++ b/src/app/routes/partner/channel-sales/services/channel-sales.service.ts
@@ -5,6 +5,16 @@ import { BaseService } from '@shared';
   providedIn: 'root',
 })
 export class ChannelSalesService extends BaseService {
+  
+  // 保存渠道销售管理
+  $api_save = '/api/mdc/channelSalesManagement/save';
+  
+  // 查询渠道销售管理表
+  $api_getPage = '/api/mdc/channelSalesManagement/list/page';
+  // OA员工模糊查询
+  $api_fuzzyQuery = '/api/mdc/channelSalesManagement/fuzzyQuery';
+
+  
 
   constructor(public injector: Injector) {
     super(injector);

From 74968d658c6fa16ad219ea23dfbe0e69244cb893 Mon Sep 17 00:00:00 2001
From: heqinghang <qinghang.he@eascs.com>
Date: Mon, 21 Mar 2022 10:31:06 +0800
Subject: [PATCH 57/70] 666

---
 .../components/edit/edit.component.ts         | 34 ++++++++-----------
 .../components/list/list.component.html       |  2 +-
 .../components/list/list.component.ts         | 16 +++++----
 .../services/level-config.service.ts          |  8 +++++
 4 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/src/app/routes/partner/level-config/components/edit/edit.component.ts b/src/app/routes/partner/level-config/components/edit/edit.component.ts
index 35bc59a3..c21bb292 100644
--- a/src/app/routes/partner/level-config/components/edit/edit.component.ts
+++ b/src/app/routes/partner/level-config/components/edit/edit.component.ts
@@ -38,19 +38,15 @@ export class ParterLevelConfigEditComponent implements OnInit {
           title: '',
           ui: { hidden: true }
         },
-        name: {
-          title: '合伙人等级',
+        gradeName: {
+          title: '等级名称',
           type: 'string',
-          enum: [
-            { label: '管理员', value: '1'},
-          ],
-          ui: {
-            widget: 'select',
-            placeholder:'请选择',
-            visibleIf: { name2: (value: string) => value === '1' }
-          } as SFSelectWidgetSchema,
         },
-        name3: {
+        sortId: {
+          title: '排序',
+          type: 'string',
+        },
+        remark: {
           type: 'string',
           title: '备注',
           maxLength: 50,
@@ -61,7 +57,7 @@ export class ParterLevelConfigEditComponent implements OnInit {
           } as SFTextareaWidgetSchema,
         },
       },
-      required: ['name1', 'name2']
+      required: ['gradeName', 'sortId', 'remark']
     };
     this.ui = {
       '*': {
@@ -77,12 +73,12 @@ export class ParterLevelConfigEditComponent implements OnInit {
   save() {
     this.sf.validator({ emitError: true });
     if(!this.sf.valid) return;
-    // this.service.request('', { ...this.sf.value }).subscribe(res => {
-    //   if (res) {
-    //     this.modalRef.destroy(true);
-    //   } else {
-    //     this.service.msgSrv.error(res.msg);
-    //   }
-    // });
+    this.service.request(this.service.$api_save, { ...this.sf.value }).subscribe(res => {
+      if (res) {
+        this.modalRef.destroy(true);
+      } else {
+        this.service.msgSrv.error(res.msg);
+      }
+    });
   }
 }
diff --git a/src/app/routes/partner/level-config/components/list/list.component.html b/src/app/routes/partner/level-config/components/list/list.component.html
index fd0078d8..e6f50f99 100644
--- a/src/app/routes/partner/level-config/components/list/list.component.html
+++ b/src/app/routes/partner/level-config/components/list/list.component.html
@@ -15,7 +15,7 @@
   <!-- 数据列表 -->
   <st
     #st
-    [data]="data"
+    [data]="service.$api_getList"
     [columns]="columns"
     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
     [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
diff --git a/src/app/routes/partner/level-config/components/list/list.component.ts b/src/app/routes/partner/level-config/components/list/list.component.ts
index 25e56d43..5b79e7fd 100644
--- a/src/app/routes/partner/level-config/components/list/list.component.ts
+++ b/src/app/routes/partner/level-config/components/list/list.component.ts
@@ -43,13 +43,17 @@ export class ParterLevelConfigListComponent implements OnInit {
   initSF() {
     this.schema = {
       properties: {
-        name: {
+        gradeName: {
           type: 'string',
           title: '等级姓名'
         },
-        phone: {
+        stateLocked: {
           type: 'string',
-          title: '状态'
+          title: '状态',
+          enum:[{label:'是',value:'1'},{label:'否',value:'2'}],
+          ui:{
+            widget:'select'
+          }
         },
       }
     };
@@ -64,11 +68,11 @@ export class ParterLevelConfigListComponent implements OnInit {
     this.columns = [
       {
         title: '等级姓名',
-        index: 'name1'
+        index: 'gradeName'
       },
       {
         title: '备注',
-        index: 'name1'
+        index: 'remark'
       },
       {
         title: '创建时间',
@@ -76,7 +80,7 @@ export class ParterLevelConfigListComponent implements OnInit {
       },
       {
         title: '启用时间',
-        index: 'name1'
+        index: 'enableTime'
       },
       {
         title: '状态',
diff --git a/src/app/routes/partner/level-config/services/level-config.service.ts b/src/app/routes/partner/level-config/services/level-config.service.ts
index 6e7cb18c..3a78fd6c 100644
--- a/src/app/routes/partner/level-config/services/level-config.service.ts
+++ b/src/app/routes/partner/level-config/services/level-config.service.ts
@@ -5,6 +5,14 @@ import { BaseService } from '@shared';
   providedIn: 'root',
 })
 export class ChannelSalesService extends BaseService {
+  // 查询合伙人等级配置表
+  $api_getList = '/api/mdc/partnerGradeConfig/list/page';
+  // 获取合伙人等级配置表
+  $api_getPartnerGradeConfig = '/api/mdc/partnerGradeConfig/get';
+  // 保存合伙人等级配置表
+  $api_save = '/api/mdc/partnerGradeConfig/save';
+  // 删除合伙人等级配置表
+  $api_del = '/api/mdc/partnerGradeConfig/deletebatch';
 
   constructor(public injector: Injector) {
     super(injector);

From 5fa519fdbd7e18b10fe7fb8c8447008e4edd3bab Mon Sep 17 00:00:00 2001
From: heqinghang <qinghang.he@eascs.com>
Date: Mon, 21 Mar 2022 10:34:18 +0800
Subject: [PATCH 58/70] 666

---
 .../components/edit/edit.component.ts         | 22 ++++++++++++++-----
 .../services/channel-sales.service.ts         |  3 ++-
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/app/routes/partner/channel-sales/components/edit/edit.component.ts b/src/app/routes/partner/channel-sales/components/edit/edit.component.ts
index 143c8f4f..3ba33a79 100644
--- a/src/app/routes/partner/channel-sales/components/edit/edit.component.ts
+++ b/src/app/routes/partner/channel-sales/components/edit/edit.component.ts
@@ -81,16 +81,26 @@ export class ParterChannelSalesEditComponent implements OnInit {
           default: '0',
         },
         roleIds: {
-          title: '',
+          title: '角色',
           type: 'string',
-          enum: [
-            { label: '管理员', value: '1'},
-          ],
           ui: {
             widget: 'select',
-            placeholder:'授权角色',
+            placeholder: '授权角色',
+            mode: 'multiple',
+            maxMultipleCount: 5,
+            asyncData: () => {
+              return this.service.request(this.service.$api_getAppRoleList).pipe(
+                map((res: any) => {
+                  return res
+                    .filter((role: any) => role.roleCode !== 'Administrator')
+                    .map((item: any) => {
+                      return { label: item.roleName, value: item.id };
+                    });
+                })
+              );
+            },
             visibleIf: { isAuthorization: (value: string) => value === '1' }
-          } as SFSelectWidgetSchema,
+          },
         },
         remark: {
           type: 'string',
diff --git a/src/app/routes/partner/channel-sales/services/channel-sales.service.ts b/src/app/routes/partner/channel-sales/services/channel-sales.service.ts
index 28a32b02..358ef4f2 100644
--- a/src/app/routes/partner/channel-sales/services/channel-sales.service.ts
+++ b/src/app/routes/partner/channel-sales/services/channel-sales.service.ts
@@ -13,7 +13,8 @@ export class ChannelSalesService extends BaseService {
   $api_getPage = '/api/mdc/channelSalesManagement/list/page';
   // OA员工模糊查询
   $api_fuzzyQuery = '/api/mdc/channelSalesManagement/fuzzyQuery';
-
+  // 获取角色列表
+  $api_getAppRoleList = '/api/mdc/cuc/roleInfo/getRoleList';
   
 
   constructor(public injector: Injector) {

From b3831e88d818c7a0f989ea29474a629b94285822 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Mon, 21 Mar 2022 13:54:57 +0800
Subject: [PATCH 59/70] =?UTF-8?q?=E8=BF=94=E4=BD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rebate-setting/add/add.component.html     | 46 +++++++++++++++++--
 .../rebate-setting/add/add.component.less     | 10 ++++
 .../rebate-setting/add/add.component.ts       | 39 +++++++++++++++-
 3 files changed, 89 insertions(+), 6 deletions(-)
 create mode 100644 src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.less

diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html
index b3c8f933..9dc5b6f9 100644
--- a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html
+++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html
@@ -4,13 +4,51 @@
  * @Author       : Shiming
  * @Date         : 2022-02-24 20:09:49
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-11 15:25:00
+ * @LastEditTime : 2022-03-21 13:53:31
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
-<page-header-wrapper [title]="''"> </page-header-wrapper>
+<page-header-wrapper [title]="'新增'"> </page-header-wrapper>
 <nz-card>
+  <div nz-row>
+ 
   <!-- 数据列表 -->
- 12121212
- <app-rebate-table></app-rebate-table>
+ <sv-container col="1">
+  &nbsp;&nbsp;<sv label="配置名称">  <input style="max-width: 400px;" nz-input placeholder="请输入" [(ngModel)]="setValue" /></sv>
+   <sv-title>固定结算费率配置</sv-title>
+   &nbsp;&nbsp;<sv label="固定结算费率"> <nz-input-number [(ngModel)]="toFixedValue" [nzPrecision]="precision" nzPlaceHolder="请输入"></nz-input-number>&nbsp;%</sv>
+   <sv-title>业务量和管理费比例配置</sv-title>
+   &nbsp;&nbsp;<sv label="选择配置类型">
+    <nz-radio-group [(ngModel)]="radioValue">
+      <label nz-radio nzValue="A">按全部等级配置</label>
+      <label nz-radio nzValue="B">按不同等级配置</label>
+    </nz-radio-group>
+    </sv>
+    <sv col="1">
+      &nbsp;&nbsp;<app-rebate-table></app-rebate-table>
+    </sv>
+   <sv-title>关联合伙人配置</sv-title>
+   &nbsp;&nbsp;<sv label="合伙人选择">
+    <nz-select ngModel="lucy" style="max-width: 400px; min-width: 200px;">
+      <nz-option nzValue="jack" nzLabel="Jack"></nz-option>
+      <nz-option nzValue="lucy" nzLabel="Lucy"></nz-option>
+    </nz-select>
+    &nbsp;&nbsp;<span >添加</span>
+  </sv>
+   &nbsp;&nbsp;<sv label="优先级" col="1">
+    <nz-select ngModel="lucy" style="max-width: 400px; min-width: 200px;">
+      <nz-option nzValue="jack" nzLabel="Jack"></nz-option>
+      <nz-option nzValue="lucy" nzLabel="Lucy"></nz-option>
+    </nz-select>
+  </sv>
+   &nbsp;&nbsp;<sv label="规则说明" col="1">
+    <sf #sf mode="edit" [schema]="schema1" [ui]="{ '*': { spanLabelFixed: 10, grid: { span: 16 }} }"
+    button="none"> </sf>
+  </sv>
+   &nbsp;&nbsp;<sv label="规则说明" col="1">
+    <textarea style="max-width: 400px; min-width: 200px;" rows="4" nz-input [(ngModel)]="inputValue"></textarea>
+  </sv>
+ </sv-container>
+
+ </div>
 </nz-card>
diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.less b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.less
new file mode 100644
index 00000000..0c812cac
--- /dev/null
+++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.less
@@ -0,0 +1,10 @@
+:host {
+  ::ng-deep {
+    .sv__label {
+      color: #000;
+    }
+    .sv__title {
+        font-weight: 700;
+    }
+  }
+}
diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts
index ebfe0bce..3edd7ef2 100644
--- a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts
+++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts
@@ -1,3 +1,13 @@
+/*
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-03-21 09:26:45
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-03-21 13:44:34
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.ts
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+ */
 import { ModalHelper } from '@delon/theme';
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
@@ -8,10 +18,17 @@ import { NzModalService } from 'ng-zorro-antd/modal';
 import { RebateManagementService } from '../../../services/rebate-management.service';
 @Component({
   selector: 'app-parter-channel-rebate-management-add',
+  styleUrls: ['./add.component.less'],
   templateUrl: './add.component.html'
 })
 export class ParterRebateManageMentAddComponent implements OnInit {
-  
+  setValue: string = '';
+  toFixedValue: Number = 2;
+  radioValue = 'A';
+  precision = 2;
+  inputValue= '';
+  @ViewChild('sf', { static: false }) sf!: SFComponent;
+  schema1!: SFSchema;
   constructor(
     public router: Router,
     public ar: ActivatedRoute,
@@ -19,7 +36,25 @@ export class ParterRebateManageMentAddComponent implements OnInit {
     private modal: NzModalService,
     public shipperservice: ShipperBaseService,
   ) {}
-
+  initSF(data?: any) {
+    this.schema1 = {
+      properties: {
+        content: {
+          type: 'string',
+          title: '',
+          ui: {
+            widget: 'tinymce',
+            loadingTip: 'loading...',
+            config: {
+              height: 650
+            }
+          },
+          default: data?.agreementContent || ''
+        }
+      }
+    };
+  }
   ngOnInit() {
+    this.initSF()
   }
 }

From c6e3be24f1c115b6b9a7ae0d983bbefedb89d57a Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Mon, 21 Mar 2022 14:18:43 +0800
Subject: [PATCH 60/70] edit

---
 .../feedback-detail.component.less            |  20 +-
 .../channel-detail.component.less             |   2 +-
 .../partner-detail.component.less             |  23 +-
 .../index/partner-list.component.html         |  36 +-
 .../index/partner-list.component.ts           |  87 +++--
 .../partner-audit-modal.component.html        |   2 +-
 .../partner-audit-modal.component.ts          |  70 ++--
 .../partner-detail.component.html             | 347 +++++-------------
 .../partner-detail.component.ts               | 144 ++++++--
 .../personal-partner-detail.component.html    | 169 +++------
 .../personal-partner-detail.component.ts      | 121 ++++--
 .../services/partner-list.service.ts          |  10 +
 src/app/shared/shared-zorro.module.ts         |   4 +-
 src/styles.less                               |  18 +
 14 files changed, 511 insertions(+), 542 deletions(-)

diff --git a/src/app/routes/partner/advice-feedback/components/feedback-detail/feedback-detail.component.less b/src/app/routes/partner/advice-feedback/components/feedback-detail/feedback-detail.component.less
index e62642d0..403e7692 100644
--- a/src/app/routes/partner/advice-feedback/components/feedback-detail/feedback-detail.component.less
+++ b/src/app/routes/partner/advice-feedback/components/feedback-detail/feedback-detail.component.less
@@ -1,27 +1,29 @@
 :host {
   .head-box {
     img {
-      width: 80px;
-      height: 80px;
+      width  : 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;
-      text-align: right;
+      font-size  : 16px;
+      text-align : right;
     }
 
     .left-rb {
-      display: flex;
-      justify-content: end;
-      padding-top: 16px;
+      display        : flex;
+      justify-content: flex-end;
+      padding-top    : 16px;
     }
   }
 }
\ No newline at end of file
diff --git a/src/app/routes/partner/claim-audit/components/channel-detail/channel-detail.component.less b/src/app/routes/partner/claim-audit/components/channel-detail/channel-detail.component.less
index e62642d0..7d4ae911 100644
--- a/src/app/routes/partner/claim-audit/components/channel-detail/channel-detail.component.less
+++ b/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;
     }
   }
diff --git a/src/app/routes/partner/claim-audit/components/partner-detail/partner-detail.component.less b/src/app/routes/partner/claim-audit/components/partner-detail/partner-detail.component.less
index 06d8b068..403e7692 100644
--- a/src/app/routes/partner/claim-audit/components/partner-detail/partner-detail.component.less
+++ b/src/app/routes/partner/claim-audit/components/partner-detail/partner-detail.component.less
@@ -1,26 +1,29 @@
 :host {
   .head-box {
     img {
-      width: 80px;
-      height: 80px;
+      width  : 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;
-      text-align: right;
+      font-size  : 16px;
+      text-align : right;
     }
 
     .left-rb {
-      display: flex;
-      justify-content: end;
-      padding-top: 16px;
+      display        : flex;
+      justify-content: flex-end;
+      padding-top    : 16px;
     }
   }
-}
+}
\ No newline at end of file
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 b5652c72..5d4e7feb 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
@@ -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
-        [schema]="searchSchema"
-        [ui]="{ '*': { spanLabelFixed: 110, grid: { lg: 8, md: 12, sm: 12, xs: 24 } } }"
-        [compact]="true"
-        [button]="'none'"
-      ></sf>
+      <sf #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
-    [data]="service.$api_get_partner_page"
-    [columns]="columns"
-    [req]="{ process: beforeReq }"
-    [loading]="service.http.loading"
-    [scroll]="{ x: '1200px' }"
-    [page]="{}"
-  >
+  <st #st [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"
-    >客户转移：客户跟着上级合伙人转移一并到新渠道销售下，会同步发起CRM《客户转移》流程；不转移的，客户会与上级合伙人解绑，成为渠道销售的直客</p
-  >
-</ng-template>
+  <p class="text-center mt-md">客户转移：客户跟着上级合伙人转移一并到新渠道销售下，会同步发起CRM《客户转移》流程；不转移的，客户会与上级合伙人解绑，成为渠道销售的直客</p>
+</ng-template>
\ No newline at end of file
diff --git a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts
index 4f415651..64b10e7a 100644
--- a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts
+++ b/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();
-      }
-    });
-  }
-
-  editCannelAction(item: any) {
-    const modal = this.nzModalService.create({
-      nzTitle: '修改返佣模板',
-      nzWidth: 650,
-      nzContent: this.editCannel,
-      nzOnOk: () => {
-        this.confirmEditCannel();
+        this.service
+          .request(this.service.$api_update_partner_template, {
+            id: this.selectItem.id,
+            templateId: this.templateId
+          })
+          .subscribe(res => {
+            if (res) {
+              this.service.msgSrv.success('修改成功');
+              this.nzModalService.closeAll();
+            }
+          });
         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: 'ltdName', width: 160 },
+      { title: '合伙人名称', index: 'enterpriseName', width: 180, format: item => `${item.enterpriseName || item.contactName}` },
+      { 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)
           }
         ]
       }
diff --git a/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.html b/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.html
index 8ea7c9f8..fc8043d6 100644
--- a/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.html
+++ b/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>
\ No newline at end of file
diff --git a/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts b/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts
index ab86de05..8c2586a8 100644
--- a/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts
+++ b/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({
-      nzTitle: `确定以“${this.info.userName}/${this.info.mobile}”的名义重新发起CRM《付款对象合同管理》吗？`,
-      nzOnOk: () => {
-        this.close();
-      }
-    });
-    // if (!this.sf.value.roleId || this.sf.value.roleId.length === 0) {
-    //   this.service.msgSrv.error('员工角色不能为空！');
-    //   return;
-    // }
-    // if (this.i.userId === 0) {
-    //   const params: any = {
-    //     ...this.sf.value
-    //   };
-    //   this.service.request(this.service.$api_add_staff, params).subscribe(res => {
-    //     if (res) {
-    //       this.service.msgSrv.success('保存成功！');
-    //       this.modal.close(true);
-    //     }
-    //   });
-    // } else {
-    //   const params: any = {
-    //     appUserId: this.i.appUserId,
-    //     ...this.sf.value
-    //   };
-    //   this.service.request(this.service.$api_edit_staff, params).subscribe(res => {
-    //     if (res) {
-    //       this.service.msgSrv.success('编辑成功！');
-    //       this.modal.close(true);
-    //     }
-    //   });
-    // }
+    if (this.info.isPass || this.sf.value.status) {
+      this.nzModalService.confirm({
+        nzTitle: `确定以“${this.info.channelIdLabel}”的名义重新发起CRM《付款对象合同管理》吗？`,
+        nzOnOk: () => {
+          this.audit();
+        }
+      });
+    } else {
+      this.audit();
+    }
+  }
+
+  audit() {
+    const params: any = {
+      ...this.sf.value,
+      id: this.info.id,
+      auditStatusEnum: this.info.isPass || this.sf.value.status ? '20' : '30'
+    };
+    this.service
+      .request(this.service.$api_audit_partner, {
+        auditStatusEnum: params.auditStatusEnum,
+        id: params.id,
+        approvalOpinion: params.approvalOpinion
+      })
+      .subscribe(res => {
+        if (res) {
+          this.service.msgSrv.success('审核成功！');
+          this.close();
+        }
+      });
   }
 
   close() {
diff --git a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html
index e00cd880..759de850 100644
--- a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html
+++ b/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
-                [disabled]="service.http.loading"
-                nz-button
-                nzDanger
-                nz-popconfirm
-                [nzPopconfirmTitle]="enable"
-                (nzOnConfirm)="freezeOrResume(0)"
-                nzPopconfirmPlacement="bottomRight"
-                *ngIf="detailData?.stateLocked"
-                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?.stateLocked"
+                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?.stateLocked"
-                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?.stateLocked"
+                acl [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-lock']">
                 冻结
               </button>
             </ng-container>
@@ -82,21 +64,17 @@
   </ng-template>
 
   <ng-template #frozen>
-    <ng-container
-      *ngTemplateOutlet="
+    <ng-container *ngTemplateOutlet="
         PopconfirmTempalte;
-        context: { title: '确定冻结该企业吗？', content: '停用后，该企业将被限制使用，不限于访问受限、无法发布货源等，请谨慎操作' }
-      "
-    >
+        context: { title: '确定冻结该合伙人吗？', content: '停用后，该合伙人将被限制使用，不限于访问受限、邀请客户、佣金收益等，请谨慎操作' }
+      ">
     </ng-container>
   </ng-template>
   <ng-template #enable>
-    <ng-container
-      *ngTemplateOutlet="
+    <ng-container *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
-        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.mobile"
-        [readonly]="!isEdit"
-        [nzBorderless]="!isEdit"
-        [placeholder]="isEdit ? '' : '-'"
-      />
+      <input nz-input type="text" [(ngModel)]="detailData.adminUserInfo.mobile" [readonly]="!isEdit"
+        [nzBorderless]="!isEdit" [placeholder]="isEdit ? '' : '-'" />
     </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="2">
       <div class="d-flex">
-        <ng-container
-          *ngTemplateOutlet="
+        <ng-container *ngTemplateOutlet="
             uploadTemplate;
             context: {
               data: detailData?.adminUserInfo,
@@ -146,11 +105,9 @@
               key2: 'certificatePhotoFront',
               hover: 'certificateBackFront'
             }
-          "
-        >
+          ">
         </ng-container>
-        <ng-container
-          *ngTemplateOutlet="
+        <ng-container *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
-        [(ngModel)]="detailData.operatingStartTime"
-        [nzDisabled]="!isEdit"
-        nzPlaceHolder=" "
-        [nzBorderless]="!isEdit"
-        [nzSuffixIcon]="isEdit ? 'calendar' : ''"
-        style="width: 100px"
-        class="calendar"
-      >
+      <nz-date-picker [(ngModel)]="detailData.operatingStartTime" [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
-        [(ngModel)]="detailData.operatingEndTime"
-        [nzDisabled]="!isEdit"
-        nzPlaceHolder=" "
-        [nzBorderless]="!isEdit"
-        [nzSuffixIcon]="isEdit ? 'calendar' : ''"
-        style="width: 100px"
-        class="calendar"
-      >
+      <nz-date-picker [(ngModel)]="detailData.operatingEndTime" [nzDisabled]="!isEdit" nzPlaceHolder=" "
+        [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''" style="width: 100px" class="calendar">
       </nz-date-picker>
       <ng-container *ngIf="isEdit">
-        <label
-          nz-checkbox
-          [ngModel]="!!!detailData.operatingEndTime"
-          (ngModelChange)="$event ? (detailData.operatingEndTime = '') : ''"
-          class="ml-sm"
-          >长期</label
-        >
+        <label nz-checkbox [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"
-        ><i nz-icon nzType="info-circle" nzTheme="fill" class="mr-xs"></i>待审核
+      <label *ngIf="detailData?.approvalStatus === 10" style="color: #1890ff"><i nz-icon nzType="info-circle"
+          nzTheme="fill" class="mr-xs"></i>待审核
       </label>
-      <label *ngIf="detailData?.approvalStatus === 20" style="color: #52c41a"
-        ><i nz-icon nzType="check-circle" nzTheme="fill" class="mr-xs"></i>审核通过
+      <label *ngIf="detailData?.approvalStatus === 20" style="color: #52c41a"><i nz-icon nzType="check-circle"
+          nzTheme="fill" class="mr-xs"></i>审核通过
       </label>
-      <label *ngIf="detailData?.approvalStatus === 30" style="color: #ff4d4f"
-        ><i nz-icon nzType="close-circle" nzTheme="fill" class="mr-xs"></i>驳回&nbsp;驳回原因:{{ detailData?.approvalOpinion }}
+      <label *ngIf="detailData?.approvalStatus === 30" style="color: #ff4d4f"><i nz-icon nzType="close-circle"
+          nzTheme="fill" class="mr-xs"></i>驳回&nbsp;驳回原因:{{ detailData?.approvalOpinion }}
       </label>
       <p style="margin-bottom: 0">
         四要素验证：
-        <label *ngIf="detailData?.esignCheckStatus === 0" style="color: #ff4d4f"
-          ><i nz-icon nzType="info-circle" nzTheme="fill" class="mr-xs"></i>不通过&nbsp;&nbsp;驳回原因:{{ detailData?.esignCheckMsg }}
+        <label *ngIf="detailData?.esignCheckStatus === 0" style="color: #ff4d4f"><i nz-icon nzType="info-circle"
+            nzTheme="fill" class="mr-xs"></i>不通过&nbsp;&nbsp;驳回原因:{{ detailData?.esignCheckMsg }}
         </label>
-        <label *ngIf="detailData?.esignCheckStatus === 1" style="color: #52c41a"
-          ><i nz-icon nzType="check-circle" nzTheme="fill" class="mr-xs"></i>通过
+        <label *ngIf="detailData?.esignCheckStatus === 1" style="color: #52c41a"><i nz-icon nzType="check-circle"
+            nzTheme="fill" class="mr-xs"></i>通过
         </label>
-        <label *ngIf="detailData?.esignCheckStatus === 2" style="color: #1890ff"
-          ><i nz-icon nzType="close-circle" nzTheme="fill" class="mr-xs"></i>未认证
+        <label *ngIf="detailData?.esignCheckStatus === 2" style="color: #1890ff"><i nz-icon nzType="close-circle"
+            nzTheme="fill" class="mr-xs"></i>未认证
         </label>
       </p>
     </sv-title>
     <sv label="公司名称">
-      <input
-        nz-input
-        type="text"
-        [(ngModel)]="detailData.enterpriseName"
-        [readonly]="!isEdit"
-        [nzBorderless]="!isEdit"
-        [placeholder]="isEdit ? '' : '-'"
-      />
+      <input nz-input type="text" [(ngModel)]="detailData.enterpriseName" [readonly]="!isEdit" [nzBorderless]="!isEdit"
+        [placeholder]="isEdit ? '' : '-'" />
     </sv>
     <sv label="统一社会信用代码">
-      <input
-        nz-input
-        type="text"
-        [(ngModel)]="detailData.unifiedSocialCreditCode"
-        [readonly]="!isEdit"
-        [nzBorderless]="!isEdit"
-        [placeholder]="isEdit ? '' : '-'"
-      />
+      <input nz-input type="text" [(ngModel)]="detailData.unifiedSocialCreditCode" [readonly]="!isEdit"
+        [nzBorderless]="!isEdit" [placeholder]="isEdit ? '' : '-'" />
     </sv>
     <sv label="营业执照" col="2">
-      <ng-container
-        *ngTemplateOutlet="
+      <ng-container *ngTemplateOutlet="
           uploadTemplate;
           context: { data: detailData, status: isEdit, key: 'licensePhotoWatermark', key2: 'licensePhoto', hover: 'detailPhoto' }
-        "
-      >
+        ">
       </ng-container>
     </sv>
 
     <sv label="营业期限" col="1">
-      <nz-date-picker
-        [(ngModel)]="detailData.operatingStartTime"
-        [nzDisabled]="!isEdit"
-        nzPlaceHolder=" "
-        [nzBorderless]="!isEdit"
-        [nzSuffixIcon]="isEdit ? 'calendar' : ''"
-        style="width: 100px"
-        class="calendar"
-      >
+      <nz-date-picker [(ngModel)]="detailData.operatingStartTime" [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
-        [(ngModel)]="detailData.operatingEndTime"
-        [nzDisabled]="!isEdit"
-        nzPlaceHolder=" "
-        [nzBorderless]="!isEdit"
-        [nzSuffixIcon]="isEdit ? 'calendar' : ''"
-        style="width: 100px"
-        class="calendar"
-      >
+      <nz-date-picker [(ngModel)]="detailData.operatingEndTime" [nzDisabled]="!isEdit" nzPlaceHolder=" "
+        [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''" style="width: 100px" class="calendar">
       </nz-date-picker>
       <ng-container *ngIf="isEdit">
-        <label
-          nz-checkbox
-          [ngModel]="!!!detailData.operatingEndTime"
-          (ngModelChange)="$event ? (detailData.operatingEndTime = '') : ''"
-          class="ml-sm"
-          >长期</label
-        >
+        <label nz-checkbox [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
-        nz-input
-        type="text"
-        [(ngModel)]="detailData.legalPersonIdentity.name"
-        [readonly]="!isEdit"
-        [nzBorderless]="!isEdit"
-        [placeholder]="isEdit ? '' : '-'"
-      />
+      <input nz-input type="text" [(ngModel)]="detailData.legalPersonIdentity.name" [readonly]="!isEdit"
+        [nzBorderless]="!isEdit" [placeholder]="isEdit ? '' : '-'" />
     </sv>
     <sv label="身份证号码">
-      <input
-        nz-input
-        type="text"
-        [(ngModel)]="detailData.legalPersonIdentity.certificateNumber"
-        [readonly]="!isEdit"
-        [nzBorderless]="!isEdit"
-        [placeholder]="isEdit ? '' : '-'"
-      />
+      <input nz-input type="text" [(ngModel)]="detailData.legalPersonIdentity.certificateNumber" [readonly]="!isEdit"
+        [nzBorderless]="!isEdit" [placeholder]="isEdit ? '' : '-'" />
     </sv>
     <sv label="身份证有效期" col="1">
-      <nz-date-picker
-        [(ngModel)]="detailData.legalPersonIdentity.validStartTime"
-        [nzDisabled]="!isEdit"
-        nzPlaceHolder=" "
-        [nzBorderless]="!isEdit"
-        [nzSuffixIcon]="isEdit ? 'calendar' : ''"
-        style="width: 100px"
-        class="calendar"
-      ></nz-date-picker>
+      <nz-date-picker [(ngModel)]="detailData.legalPersonIdentity.validStartTime" [nzDisabled]="!isEdit"
+        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
-        [(ngModel)]="detailData.legalPersonIdentity.validEndTime"
-        [nzDisabled]="!isEdit"
-        nzPlaceHolder=" "
-        [nzBorderless]="!isEdit"
-        [nzSuffixIcon]="isEdit ? 'calendar' : ''"
-        style="width: 100px"
-        class="calendar"
-      ></nz-date-picker>
+      <nz-date-picker [(ngModel)]="detailData.legalPersonIdentity.validEndTime" [nzDisabled]="!isEdit" nzPlaceHolder=" "
+        [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''" style="width: 100px" class="calendar">
+      </nz-date-picker>
       <ng-container *ngIf="isEdit">
-        <label
-          nz-checkbox
-          [ngModel]="!!!detailData.legalPersonIdentity.validEndTime"
-          (ngModelChange)="$event ? (detailData.legalPersonIdentity.validEndTime = '') : ''"
-          class="ml-sm"
-          >长期</label
-        >
+        <label nz-checkbox [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
-          *ngTemplateOutlet="
+        <ng-container *ngTemplateOutlet="
             uploadTemplate;
             context: {
               data: detailData?.legalPersonIdentity,
@@ -361,11 +236,9 @@
               key2: 'certificatePhotoFront',
               hover: 'legalFront'
             }
-          "
-        >
+          ">
         </ng-container>
-        <ng-container
-          *ngTemplateOutlet="
+        <ng-container *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="手机号"> 13999999999 </sv>
-    <sv label="绑定时间"> 2021-09-23 14:43:31 </sv>
+    <sv label="姓名"> {{ detailData?.channelName }} </sv>
+    <sv label="手机号"> {{ detailData?.channelMobile }} </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
-        [data]="service.$api_get_personal_channel_list"
-        [columns]="columns.logsColumn"
-        [loading]="service.http.loading"
-        bordered
-        size="small"
-        [page]="{ show: false }"
-        [scroll]="{ x: '1200px' }"
-      >
+      <st #st [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
-    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 [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
-    [data]="service.$mock_url"
-    [columns]="columns.changeColumn"
-    [loading]="service.http.loading"
-    bordered
-    size="small"
-    [page]="{ show: false }"
-    [scroll]="{ x: '750px' }"
-  >
+  <st #st [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
-    [data]="service.$mock_url"
-    [columns]="columns.beChangeColumn"
-    [loading]="service.http.loading"
-    bordered
-    size="small"
-    [page]="{ show: false }"
-    [scroll]="{ x: '750px' }"
-  >
+  <st #st [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>
\ No newline at end of file
diff --git a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts
index cd51553b..eefd57bc 100644
--- a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts
+++ b/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 = [];
-  ltdId: any = [];
+  enterpriseAddressCode: string[] = [];
+  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 => {
-    //   if (res) {
-    //     this.ltdId = res;
-    //   }
-    // });
+
+  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() {
@@ -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
-    //   .post(this.service.$api_lock_freight, {
-    //     id: this.route.snapshot.params.id,
-    //     statedLocked: !!type
-    //   })
-    //   .subscribe(res => {
-    //     if (res.data === true) {
-    //       if (type === 0) {
-    //         this.service.msgSrv.success(`启用成功！`);
-    //       } else {
-    //         this.service.msgSrv.success(`冻结成功！`);
-    //       }
-    //       this.initData();
-    //     } else {
-    //       this.service.msgSrv.error(res.msg || '操作失败！');
-    //     }
-    //   });
+    this.service.http
+      .post(this.service.$api_lock_freight, {
+        id: this.route.snapshot.params.id,
+        statedLocked: !!type
+      })
+      .subscribe(res => {
+        if (res.data === true) {
+          if (type === 0) {
+            this.service.msgSrv.success(`启用成功！`);
+          } else {
+            this.service.msgSrv.success(`冻结成功！`);
+          }
+          this.initData();
+        } else {
+          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: 'originalChannelId', width: 160 },
+        { title: '修改后渠道销售', index: 'newChannelName', width: 180 },
+        { 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: 'modifyUserId', type: 'date', width: 130 },
+        { title: '修改时间', index: 'effectiveTime', className: 'text-center', width: 130, type: 'date' },
+        { title: '操作人', index: 'modifyUserId', width: 130 },
         {
           title: '操作',
           fixed: 'right',
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 d78dc5fd..143b4be1 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
@@ -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
-                [disabled]="service.http.loading"
-                nz-button
-                nzDanger
-                nz-popconfirm
-                [nzPopconfirmTitle]="enable"
-                (nzOnConfirm)="freezeOrResume(0)"
-                nzPopconfirmPlacement="bottomRight"
-                *ngIf="detailData?.stateLocked"
-                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?.stateLocked"
+                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?.stateLocked"
-                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?.stateLocked"
+                acl [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-lock']">
                 冻结
               </button>
             </ng-container>
@@ -82,21 +64,17 @@
   </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>
@@ -105,72 +83,37 @@
   <sv-container col="3" class="mt16">
     <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 ? '' : '-'"
-      />
+      <input nz-input type="text" [(ngModel)]="detailData.adminUserInfo.certificateNumber" [readonly]="!isEdit"
+        [nzBorderless]="!isEdit" [placeholder]="isEdit ? '' : '-'" />
     </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: 100px"
-        class="calendar"
-      ></nz-date-picker>
+      <nz-date-picker [(ngModel)]="detailData.adminUserInfo.validStartTime" [nzDisabled]="!isEdit" 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
-        [(ngModel)]="detailData.adminUserInfo.validEndTime"
-        [nzDisabled]="!isEdit"
-        nzPlaceHolder=" "
-        [nzBorderless]="!isEdit"
-        [nzSuffixIcon]="isEdit ? 'calendar' : ''"
-        style="width: 100px"
-        class="calendar"
-      ></nz-date-picker>
+      <nz-date-picker [(ngModel)]="detailData.adminUserInfo.validEndTime" [nzDisabled]="!isEdit" nzPlaceHolder=" "
+        [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''" style="width: 100px" 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,
@@ -179,11 +122,9 @@
               key2: 'certificatePhotoFront',
               hover: 'legalFront'
             }
-          "
-        >
+          ">
         </ng-container>
-        <ng-container
-          *ngTemplateOutlet="
+        <ng-container *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
-    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 [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>
\ No newline at end of file
diff --git a/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts b/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts
index a39fb28e..218439d0 100644
--- a/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts
+++ b/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
-    //   .post(this.service.$api_lock_freight, {
-    //     id: this.route.snapshot.params.id,
-    //     statedLocked: !!type
-    //   })
-    //   .subscribe(res => {
-    //     if (res.data === true) {
-    //       if (type === 0) {
-    //         this.service.msgSrv.success(`启用成功！`);
-    //       } else {
-    //         this.service.msgSrv.success(`冻结成功！`);
-    //       }
-    //       this.initData();
-    //     } else {
-    //       this.service.msgSrv.error(res.msg || '操作失败！');
-    //     }
-    //   });
+    this.service.http
+      .post(this.service.$api_lock_freight, {
+        id: this.route.snapshot.params.id,
+        statedLocked: !!type
+      })
+      .subscribe(res => {
+        if (res.data === true) {
+          if (type === 0) {
+            this.service.msgSrv.success(`启用成功！`);
+          } else {
+            this.service.msgSrv.success(`冻结成功！`);
+          }
+          this.initData();
+        } else {
+          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 };
diff --git a/src/app/routes/partner/partner-list/services/partner-list.service.ts b/src/app/routes/partner/partner-list/services/partner-list.service.ts
index a916f8b4..9756c19f 100644
--- a/src/app/routes/partner/partner-list/services/partner-list.service.ts
+++ b/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';
diff --git a/src/app/shared/shared-zorro.module.ts b/src/app/shared/shared-zorro.module.ts
index bb75f8c0..ed9a1985 100644
--- a/src/app/shared/shared-zorro.module.ts
+++ b/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 
 ];
diff --git a/src/styles.less b/src/styles.less
index 8426983a..cf7ad9c6 100644
--- a/src/styles.less
+++ b/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;
+        }
+    }
 }
\ No newline at end of file

From f14441f420f3425ecb46a02d50d1217d8168257b Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Mon, 21 Mar 2022 14:19:10 +0800
Subject: [PATCH 61/70] =?UTF-8?q?=E8=BF=94=E4=BD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rebate-table/rebate-table.component.html  | 79 +++++++++----------
 .../rebate-table/rebate-table.component.ts    | 44 +----------
 .../rebate-table/rebate-table.module.ts       |  5 +-
 3 files changed, 45 insertions(+), 83 deletions(-)

diff --git a/src/app/shared/components/rebate-table/rebate-table.component.html b/src/app/shared/components/rebate-table/rebate-table.component.html
index a7ab6f02..d8912be8 100644
--- a/src/app/shared/components/rebate-table/rebate-table.component.html
+++ b/src/app/shared/components/rebate-table/rebate-table.component.html
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-25 20:18:52
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-11 15:12:01
+ * @LastEditTime : 2022-03-21 14:14:06
  * @FilePath     : \\tms-obc-web\\src\\app\\shared\\components\\rebate-table\\rebate-table.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -14,48 +14,52 @@
             <button nz-button nzType="primary" (click)="add()">新增公里数</button>
             <button class="ml-md" nz-button nzType="primary" (click)="save()">保存</button>
         </div> -->
-        <div>
-            <sf #sf [schema]="schema" [formData]="sfdata" [button]="'none'" [ui]="ui">
-                <ng-template sf-template="freightPrice" let-i let-ui="ui">
-                    <nz-input-group [nzAddOnAfter]="addOnAfterTemplate">
-                        <nz-input-number [(ngModel)]="minrebatePrice"  [nzMin]="0" ></nz-input-number>
-                      </nz-input-group>
-                      <ng-template #addOnAfterTemplate>
-                          <span >元</span>
-                      </ng-template>
-                </ng-template>
-              </sf>
-           
-        </div>
         <nz-table #groupingTable [nzData]="data" nzBordered nzSize="small" [nzFrontPagination]="false"
             [nzScroll]="{ x: '900px' }" [nzShowPagination]="false" class="ml-xl" style="max-width: 1200px;">
             <thead>
                 <tr>
-                    <th rowspan="2" nzWidth="250px" nzAlign="center" nzLeft>险种</th>
-                    <th nzWidth="220px" nzAlign="center" >普货-基本险</th>
-                    <th nzWidth="220px" nzAlign="center" >普货-综合险</th>
+                    <th rowspan="2" nzWidth="250px" nzAlign="center" nzLeft>序号</th>
+                    <th nzWidth="220px" nzAlign="center" >合伙人等级</th>
+                    <th nzWidth="220px" nzAlign="center" >初始业务量（万/月）</th>
+                    <th nzWidth="220px" nzAlign="center" >到达业务量（万/月）</th>
+                    <th nzWidth="220px" nzAlign="center" >管理费比例%</th>
                     <th rowspan="2" nzWidth="60px" nzAlign="center" nzRight>操作</th>
                 </tr>
             </thead>
             <tbody>
                 <tr *ngFor="let item of groupingTable.data;let i = index">
                     <td nzWidth="250px" nzAlign="center" nzLeft>
-                        <div style="display: flex;align-items: center;justify-content: space-between;">
-                            <div  >
-                                公里数（km）
-                            </div>
-                            <div style="color:#f0f0f0;">|</div>
-                            <div >
-                                    <label style="width: 65px;text-align: right;"> {{item.startKm}}</label>
-                                    <label>-</label>
-                                 
-                                    <nz-input-number [ngModel]="item.endKm" (ngModelChange)="changeEndKm($event,i)" [nzMin]="0"
-                                        [nzFormatter]="formatterDollar" nzSize="small">
-                                    </nz-input-number>（含）
-                               
+                        <div style="text-align: center;">
+                            <div>
+                                {{i + 1}}
                             </div>
                         </div>
-                  
+                    </td>
+                    <td nzWidth="220px" nzAlign="center" >
+                        <div >
+                            <nz-select ngModel="lucy">
+                                <nz-option nzValue="jack" nzLabel="Jack154654564654"></nz-option>
+                                <nz-option nzValue="lucy" nzLabel="Lucy"></nz-option>
+                              </nz-select>
+                        </div>
+                    </td>
+                    <td nzWidth="220px" nzAlign="center" >
+                        <div style="    margin-left: 26%">
+                            <nz-input-group  nzPrefix="=">
+                            <nz-input-number [(ngModel)]="item.baserebateRate" [nzMin]="0" nzSize="small" 
+                               >
+                            </nz-input-number>
+                        </nz-input-group>
+                     
+                        </div>
+                    </td>
+                    <td nzWidth="220px" nzAlign="center" >
+                        <div style="    margin-left: 26%">
+                            <nz-input-group  nzPrefix="＜">
+                            <nz-input-number [(ngModel)]="item.blanketrebateRate" [nzMin]="0" nzSize="small" >
+                            </nz-input-number>
+                        </nz-input-group>
+                        </div>
                     </td>
                     <td nzWidth="220px" nzAlign="center" >
                         <div style="    margin-left: 26%">
@@ -69,19 +73,14 @@
                         </ng-template>
                         </div>
                     </td>
-                    <td nzWidth="220px" nzAlign="center" >
-                        <div style="    margin-left: 26%">
-                            <nz-input-group [nzAddOnAfter]="addOnAfterTemplate2">
-                            <nz-input-number [(ngModel)]="item.blanketrebateRate" [nzMin]="0" nzSize="small" >
-                            </nz-input-number>
-                        </nz-input-group>
-                        </div>
-                    </td>
                     <td nzWidth="60px" nzAlign="center" nzRight>
+                        <a  nz-popconfirm
+                            nzPopconfirmTitle="是否新增?" (nzOnConfirm)="add()"
+                            >+</a>
                         <a *ngIf="i === groupingTable.data.length-1 && groupingTable.data.length>1"
                              nz-popconfirm
                             nzPopconfirmTitle="是否确认删除?" (nzOnConfirm)="deleteRow(i)"
-                            >删除</a>
+                            >-</a>
                     </td>
                 </tr>
             </tbody>
diff --git a/src/app/shared/components/rebate-table/rebate-table.component.ts b/src/app/shared/components/rebate-table/rebate-table.component.ts
index 75b3768a..e8699d14 100644
--- a/src/app/shared/components/rebate-table/rebate-table.component.ts
+++ b/src/app/shared/components/rebate-table/rebate-table.component.ts
@@ -12,26 +12,17 @@ import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
 export class RebateTableComponent implements OnInit {
   data: any[] = [];
   headers: any[] = [];
-  sfdata: any; // 货源单设置回显
-
-  @ViewChild('sf', { static: false }) sf!: SFComponent;
-  schema: SFSchema = {};
-  ui!: SFUISchema;
-
   formatterDollar = (value: number): string => `${value}`;
-  minrebatePrice: number = 0;
   changeSub = new Subject<string>();
   constructor(public service: BaseService, private cdr: ChangeDetectorRef) {}
 
   ngOnInit(): void {
     this.loadData();
-    this.initSF()
     this.changeEndKmAction();
-    this.minrebatePrice = 1000
   }
 
   loadData() {
-    this.service.request('/api/mdc/cuc/rebateConfig/list').subscribe(res => {
+    this.service.request('/api/mdc/cuc/insuranceConfig/list').subscribe(res => {
       if (res) {
         console.log(res);
         this.data = res;
@@ -43,35 +34,10 @@ export class RebateTableComponent implements OnInit {
      ]).subscribe(res => {
       if (res) {
         console.log(res);
-        this.minrebatePrice = Number(res[0].itemValue)
       }
     });
   }
-  initSF() {
-    this.schema = {
-      properties: {
-        freightPrice: {
-          type: 'string',
-          title: '单票投保最低保费',
-          ui: {
-            widget: 'custom',
-            placeholder: '请输入',
-            errors: { required: '请填写' }
-          }
-        },
-      },
-      required: ['freightPrice']
-    };
-    this.ui = {
-      '*': {
-        spanLabelFixed: 160,
-        grid: { span: 24 }
-      },
-      $freightPrice: {
-        grid: { span: 8 }
-      },
-    };
-  }
+
   /**
    * 修改结束车长
    * @param event 车长
@@ -145,12 +111,8 @@ export class RebateTableComponent implements OnInit {
   }
 
   save() {
-    if(!this.minrebatePrice) {
-        this.service.msgSrv.error('必填项为空！')
-        return
-    }
+    console.log(this.data)
     let params= {
-      minrebatePrice: this.minrebatePrice,
       rebateConfigDTOS: this.data
     }
     console.log(params);
diff --git a/src/app/shared/components/rebate-table/rebate-table.module.ts b/src/app/shared/components/rebate-table/rebate-table.module.ts
index 6e65e35b..4f48a645 100644
--- a/src/app/shared/components/rebate-table/rebate-table.module.ts
+++ b/src/app/shared/components/rebate-table/rebate-table.module.ts
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-25 20:23:54
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-11 17:20:49
+ * @LastEditTime : 2022-03-21 14:11:56
  * @FilePath     : \\tms-obc-web\\src\\app\\shared\\components\\rebate-table\\rebate-table.module.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -18,8 +18,9 @@ import { NzPopconfirmModule } from 'ng-zorro-antd/popconfirm';
 import { NzInputModule } from 'ng-zorro-antd/input';
 import { DelonFormModule } from '@delon/form';
 import { NzButtonModule } from 'ng-zorro-antd/button';
+import { NzSelectModule } from 'ng-zorro-antd/select';
 const COMPONENTS = [RebateTableComponent];
-const MODULES = [NzTableModule, NzInputNumberModule, NzPopconfirmModule, NzInputModule, NzButtonModule, DelonFormModule];
+const MODULES = [NzTableModule, NzInputNumberModule, NzPopconfirmModule, NzInputModule, NzButtonModule, DelonFormModule,NzSelectModule];
 
 @NgModule({
   declarations: COMPONENTS,

From 957a3b1adb98e16f19f2c5046fb4f90160838394 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= <xiaoyun.pan@eascs.com>
Date: Mon, 21 Mar 2022 17:24:05 +0800
Subject: [PATCH 62/70] =?UTF-8?q?=E8=B4=A6=E6=88=B7=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../account-detail.component.html             | 18 +++++-----
 .../account-detail.component.ts               | 12 +++----
 .../components/list/list.component.html       |  4 +--
 .../components/list/list.component.ts         | 17 ++++++----
 .../recorded-detail.component.html            | 14 +++++---
 .../recorded-detail.component.ts              | 34 +++++++++++++++----
 .../virtual-account-detail.component.html     |  2 +-
 .../virtual-account-detail.component.ts       | 21 ++++--------
 .../services/account-managemant.service.ts    |  1 +
 .../components/detail/detail.component.html   | 10 +++---
 .../components/detail/detail.component.ts     |  4 +--
 .../components/record/record.component.html   |  2 +-
 .../components/record/record.component.ts     | 16 ++++-----
 13 files changed, 91 insertions(+), 64 deletions(-)

diff --git a/src/app/routes/partner/account-management/components/account-detail/account-detail.component.html b/src/app/routes/partner/account-management/components/account-detail/account-detail.component.html
index 2b3372de..47e81e17 100644
--- a/src/app/routes/partner/account-management/components/account-detail/account-detail.component.html
+++ b/src/app/routes/partner/account-management/components/account-detail/account-detail.component.html
@@ -11,17 +11,17 @@
       <b class="text-md ">{{headerTotalInfo?.ltdName}}</b>
     </sv>
     <sv label="可用余额">
-      {{headerTotalInfo?.balance |currency}}
+      {{headerTotalInfo?.allAmount |currency}}
     </sv>
     <sv label="收入金额">
-      {{headerTotalInfo?.income |currency}}
+      {{headerTotalInfo?.incomeAmount |currency}}
     </sv>
     <sv label="支出金额">
-      {{headerTotalInfo?.spending |currency}}
+      {{headerTotalInfo?.payAmount |currency}}
     </sv>
   </sv-container>
   <ng-template #labelTpl>
-    <b class="text-md" style="color: black;">{{headerTotalInfo?.name}} {{headerTotalInfo?.phone}}</b>
+    <b class="text-md" style="color: black;">{{headerTotalInfo?.name}} &nbsp;&nbsp;{{headerTotalInfo?.phone}}</b>
   </ng-template>
 </nz-card>
 <nz-card>
@@ -46,20 +46,20 @@
       [page]="{ show: true, showSize: true, pageSizes:  [5,10, 20, 50, 100, 200, 500] }"
       [loading]="service.http.loading" [scroll]="{x:'1200px'}">
       <ng-template st-row="amount" let-item>
-        <div *ngIf="item.incomeType === '1'"> - {{item.amount | currency }}</div>
-        <div *ngIf="item.incomeType === '2'"> + {{item.amount | currency }}</div>
+        <div *ngIf="item.incomeType === '1'" class="text-right"> - {{item.amount | currency:' ' }}</div>
+        <div *ngIf="item.incomeType === '2'" class="text-right"> + {{item.amount | currency:' ' }}</div>
       </ng-template>
       <ng-template st-row="accountBalance" let-item>
-        <div class="text-right">{{item?.accountBalance |currency}}</div>
+        <div class="text-right">{{item?.accountBalance |currency:' '}}</div>
       </ng-template>
 
     </st>
     <div class="total-footer text-md" *ngIf="st?.list?.length !== 0 ">
       合计 <label class="text-red-dark">{{ footerTotalInfo?.total }}</label> 项，收入 <label
         class="text-red-dark font-weight-bold">{{
-        footerTotalInfo?.income | currency
+        footerTotalInfo?.incomeAmount | currency
         }}</label>，支出 <label class="text-red-dark font-weight-bold">{{
-        footerTotalInfo?.spending | currency }}</label>
+        footerTotalInfo?.payAmount | currency }}</label>
     </div>
   </div>
 </nz-card>
diff --git a/src/app/routes/partner/account-management/components/account-detail/account-detail.component.ts b/src/app/routes/partner/account-management/components/account-detail/account-detail.component.ts
index c93b8aab..4e595c8b 100644
--- a/src/app/routes/partner/account-management/components/account-detail/account-detail.component.ts
+++ b/src/app/routes/partner/account-management/components/account-detail/account-detail.component.ts
@@ -136,15 +136,15 @@ export class PartnerAccountManagementAccountDetailComponent implements OnInit {
   initST() {
     this.columns = [
       { title: '交易时间', index: 'createTime', className: 'text-center', width: 200 },
-      { title: '流水号', index: 'transactionNumber', className: 'text-center', width: 150 },
-      { title: '交易类型', index: 'tradeTypeLabel', className: 'text-center', width: 200 },
-      { title: '交易单号', index: 'businessNumber', className: 'text-center', width: 120 },
+      { title: '流水号', index: 'transactionNumber', className: 'text-center', width: 180 },
+      { title: '交易类型', index: 'tradeTypeLabel', className: 'text-center', width: 150 },
+      { title: '交易单号', index: 'businessNumber', className: 'text-center', width: 180 },
       { title: '备注', index: 'tradeContent', className: 'text-center', width: 180 },
       { title: '收支类型', index: 'incomeTypeLabel', className: 'text-center', width: 180 },
-      { title: '交易金额', render: 'amount', className: 'text-center', width: 180 },
-      { title: '账户余额', render: 'accountBalance', className: 'text-center', width: 180 },
+      { title: '交易金额', render: 'amount', className: 'text-center', width: 150 },
+      { title: '账户余额', render: 'accountBalance', className: 'text-center', width: 150 },
       { title: '付款方', index: 'payName', className: 'text-center', width: 200 },
-      { title: '收款方', index: 'payeeName', className: 'text-center', width: 120 },
+      { title: '收款方', index: 'payeeName', className: 'text-center', width: 200 },
     ];
   }
   resetSF() {
diff --git a/src/app/routes/partner/account-management/components/list/list.component.html b/src/app/routes/partner/account-management/components/list/list.component.html
index e4e84339..b811832d 100644
--- a/src/app/routes/partner/account-management/components/list/list.component.html
+++ b/src/app/routes/partner/account-management/components/list/list.component.html
@@ -17,13 +17,13 @@
     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
     [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
     [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
-    [loading]="service.http.loading">
+    [loading]="service.http.loading" multiSort>
     <ng-template st-row="allBalance" let-item>
       <div class="text-right">{{item.allBalance | currency:' '}}</div>
     </ng-template>
     <ng-template st-row="unEntryAmount" let-item>
       <a class="text-right text-blue-dark"
-        [routerLink]="'/partner/account-management/am/recorded/detail/'+item?.id">{{item.unEntryAmount | currency:'
+        [routerLink]="'/partner/account-management/am/recorded/detail/'+item?.roleId">{{item.unEntryAmount | currency:'
         '}}</a>
     </ng-template>
     <ng-template st-row="availableBalance" let-item>
diff --git a/src/app/routes/partner/account-management/components/list/list.component.ts b/src/app/routes/partner/account-management/components/list/list.component.ts
index 56881170..1a12dd8c 100644
--- a/src/app/routes/partner/account-management/components/list/list.component.ts
+++ b/src/app/routes/partner/account-management/components/list/list.component.ts
@@ -61,9 +61,15 @@ export class PartnerAccountManagementListComponent implements OnInit {
     this.columns = [
       { title: '合伙人名称', index: 'userName', className: 'text-center', width: 250 },
       { title: '手机号', index: 'phone', className: 'text-center', width: 200 },
-      { title: '账户总额（元）', render: 'allBalance', className: 'text-right', sort: true, width: 150 },
-      { title: '待入账余额（元）', render: 'unEntryAmount', className: 'text-right', sort: true, width: 150 },
-      { title: '可用余额（元）', render: 'availableBalance', className: 'text-right', sort: true, width: 150 },
+      {
+        title: '账户总额（元）', index: 'allBalance', className: 'text-right', sort: true, width: 150, type: 'currency',
+      },
+      {
+        title: '待入账余额（元）', render: 'unEntryAmount', className: 'text-right', width: 150,
+      },
+      {
+        title: '可用余额（元）', index: 'availableBalance', className: 'text-right', sort: true, width: 150, type: 'currency'
+      },
       { title: '虚拟账户', index: 'virtualAccount', className: 'text-center', width: 220 },
       {
         title: '操作',
@@ -90,7 +96,6 @@ export class PartnerAccountManagementListComponent implements OnInit {
    * @param _record 当前行信息
    */
   viewVirtual(_record: any) {
-    console.log()
     const modalRef = this.modal.create({
       nzTitle: '虚拟账户明细',
       nzContent: PartnerAccountManagementVirtualAccountDetailComponent,
@@ -100,8 +105,8 @@ export class PartnerAccountManagementListComponent implements OnInit {
       nzWidth: '85%',
       nzFooter: null
     });
-    modalRef.afterClose.subscribe(result => {
-    });
+    // modalRef.afterClose.subscribe(result => {
+    // });
   }
 
   /**
diff --git a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.html b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.html
index 5fbc2ce6..feab2ad6 100644
--- a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.html
+++ b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.html
@@ -55,10 +55,16 @@
       <span class="mr-xxl text-md font-weight-bold"><label>网络货运人：</label>{{accountInfo?.name}}</span>
       <span class="text-md font-weight-bold"><label>返佣总额（元）：</label>{{totalInfo?.spending |currency: ' '}}</span>
     </div>
-    <st #st [data]="service.$api_get_account_management_page " [columns]="billDetailColumns"
-      [res]="{ reName: { list: 'data' } }" [req]="{ method: 'POST', allInBody: true, params:{}}" [page]="{show:false}">
-      <ng-template st-row="amount" let-item>
-        <div *ngIf="item.paAccount">{{item?.amount |currency :' '}}</div>
+    <st #st [data]="billDetailList " [columns]="billDetailColumns" [res]="{ reName: { list: 'data' } }"
+      [req]="{ method: 'POST', allInBody: true, params:billDetailReqParams}" [page]="{show:false}">
+      <ng-template st-row="month" let-item>
+        <div>
+          <span>{{item?.year }}年</span>
+          <span>{{item?.month }}月</span>
+        </div>
+      </ng-template>
+      <ng-template st-row="profitAmountSum" let-item>
+        <div>{{item?.profitAmountSum |currency :' '}}</div>
       </ng-template>
 
     </st>
diff --git a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts
index a3dc1911..3b7611af 100644
--- a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts
+++ b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
-import { Router } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { STColumn, STComponent } from '@delon/abc/st';
 import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema, Widget } from '@delon/form';
 import { ModalHelper, _HttpClient } from '@delon/theme';
@@ -32,12 +32,16 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit {
   columns: STColumn[] = [];
   billDetailColumns: STColumn[] = [];
   showBillDetail = false;
+  billDetailList = [];
+  roleId = '';
 
-  constructor(public service: AccountManagemantService, public router: Router) { }
+  constructor(public service: AccountManagemantService, public router: Router, public ar: ActivatedRoute) {
+    this.roleId = this.ar.snapshot.params.id;
+  }
 
 
   get reqParams() {
-    return { ...this.sf?.value };
+    return { ...this.sf?.value, roleId: this.roleId };
   }
 
   get billDetailReqParams() {
@@ -46,7 +50,6 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit {
   ngOnInit(): void {
     this.initSF();
     this.initST();
-    this.initBillDetailST();
   }
 
   initSF() {
@@ -96,8 +99,8 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit {
 
   initBillDetailST() {
     this.billDetailColumns = [
-      { title: '账单月份', index: 'carNo', className: 'text-center', width: '40%' },
-      { title: '返佣金额（元）', render: 'amount', className: 'text-center', width: '40%' },
+      { title: '账单月份', render: 'month', className: 'text-center', width: '40%' },
+      { title: '返佣金额（元）', render: 'profitAmountSum', className: 'text-center', width: '40%' },
       {
         title: '操作', className: 'text-center', width: '20%', buttons: [
           {
@@ -122,6 +125,19 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit {
   search() {
     this.st.load(1);
   }
+
+  /**
+   * 获取账单明细
+   */
+  getBillDetail(ltdId: string) {
+    this.service.request(this.service.$api_get_bill_detail, { ltdId }).subscribe(res => {
+      if (res) {
+        this.billDetailList = res;
+      }
+    })
+  }
+
+
   export() { }
 
   /**
@@ -137,10 +153,16 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit {
    * @param record 当前行
    */
   viewAccountDetail(record: any) {
+    this.billDetailColumns = [];
     this.showBillDetail = true;
+    this.initBillDetailST();
+    this.getBillDetail(record?.ltdId);
+
+
   }
   handleCancel() {
     this.showBillDetail = false;
+
   }
   goBack() {
     window.history.go(-1);
diff --git a/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.html b/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.html
index ae98a690..21bfeea2 100644
--- a/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.html
+++ b/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.html
@@ -34,5 +34,5 @@
   </div>
 </nz-card>
 <div class="modal-footer text-center">
-  <button nz-button type="button" nzType="primary" (click)="close()">确定</button>
+  <button nz-button type="button" nzType="primary" (click)="close()">确 定</button>
 </div>
diff --git a/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.ts b/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.ts
index 8095df64..6840cddd 100644
--- a/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.ts
+++ b/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.ts
@@ -167,20 +167,13 @@ export class PartnerAccountManagementVirtualAccountDetailComponent implements On
    * @param _record 当前行信息
    */
   viewDetail(_record: any) {
-    // record: {
-    //   channelSource: _record?.accountType,
-    //   roleId: _record?.roleId,
-    //   bankType: _record?.bankType,
-    //   ltdId: _record?.ltdId
-    // }
-    this.router.navigate([`/partner/account-management/am/detail/${_record?.roleId}`], {
-      queryParams: {
-        channelSource: _record?.accountType,
-        bankType: _record?.bankType,
-        ltdId: _record?.ltdId
-      }
-    });
-    return;
+    // this.router.navigate([`/partner/account-management/am/detail/${_record?.roleId}`], {
+    //   queryParams: {
+    //     channelSource: _record?.accountType,
+    //     bankType: _record?.bankType,
+    //     ltdId: _record?.ltdId
+    //   }
+    // });
     window.open(location.origin + `/#/partner/account-management/am/detail/${_record?.roleId}?ltdId=${_record?.ltdId}&channelSource=${_record?.accountType}&bankType=${_record?.bankType}`);
   }
 
diff --git a/src/app/routes/partner/account-management/services/account-managemant.service.ts b/src/app/routes/partner/account-management/services/account-managemant.service.ts
index 0c3359a3..f85ee094 100644
--- a/src/app/routes/partner/account-management/services/account-managemant.service.ts
+++ b/src/app/routes/partner/account-management/services/account-managemant.service.ts
@@ -12,6 +12,7 @@ export class AccountManagemantService extends BaseService {
   $api_get_account_detail_page = `/api/bpc/accountBalancePartner/getAccountBalancePartnerByOperatorPage`;// 账户明细
   $api_get_account_detail_footer_summary = `/api/bpc/accountBalancePartner/getAccountBalancePartnerIncomeDetailByOperator`;// 账户明细脚部汇总
   $api_get_account_detail_header_summary = `/api/bpc/accountBalancePartner/getAccountBalancePartnerAmountByOperator`;// 账户明细头部汇总
+  $api_get_bill_detail = `/api/bpc/partnerIncomeDetail/findPartnerWaitIncomeByOperator`; // 查看账单明细
 
   constructor(public injector: Injector) {
     super(injector)
diff --git a/src/app/routes/partner/recorded/components/detail/detail.component.html b/src/app/routes/partner/recorded/components/detail/detail.component.html
index 714483bc..8bfafd61 100644
--- a/src/app/routes/partner/recorded/components/detail/detail.component.html
+++ b/src/app/routes/partner/recorded/components/detail/detail.component.html
@@ -16,11 +16,11 @@
   </ng-template>
   <ng-template #action>
     <div class="mr-xl">
-      <p class="text-lg mb-sm mt-xs">待审批</p>
-      <div>
+      <p class="text-lg mb-sm mt-xs">{{formData?.stsLabel}}</p>
+      <div *ngIf="formData?.sts === '0' || formData?.sts ==='1'">
         <button nz-button [nzType]="'primary'" (click)="auditAction(formData,formData?.refundStatus)">{{formData?.sts
           ===
-          0 ?'审核':'复审'}}</button>
+          '0' ?'审核':'复审'}}</button>
       </div>
     </div>
   </ng-template>
@@ -61,14 +61,14 @@
       {{formData?.stsLabel}}
     </se>
     <se label="发票图片">
-      <img *ngIf="formData?.invoiceUrl" nz-image width="200px" height="200px" [nzSrc]="formData?.invoiceUrl" alt="" />
+      <img *ngIf="formData?.invoiceUrl" nz-image width="100px" height="100px" [nzSrc]="formData?.invoiceUrl" alt="" />
       <span *ngIf="!formData?.invoiceUrl">-</span>
     </se>
     <se label="快递单号">
       {{formData?.expressName}}
     </se>
     <se label="纳税凭证">
-      <img *ngIf="formData?.taxVoucherUrl" nz-image width="200px" height="200px" [nzSrc]="formData?.taxVoucherUrl"
+      <img *ngIf="formData?.taxVoucherUrl" nz-image width="100px" height="100px" [nzSrc]="formData?.taxVoucherUrl"
         alt="" />
       <span *ngIf="!formData?.taxVoucherUrl">-</span>
     </se>
diff --git a/src/app/routes/partner/recorded/components/detail/detail.component.ts b/src/app/routes/partner/recorded/components/detail/detail.component.ts
index 6e9a5b99..bbfad88e 100644
--- a/src/app/routes/partner/recorded/components/detail/detail.component.ts
+++ b/src/app/routes/partner/recorded/components/detail/detail.component.ts
@@ -88,7 +88,7 @@ export class PartnerRecordedDetailComponent implements OnInit {
               this.service.msgSrv.warning('请填写拒绝原因 ');
               return;
             }
-            this.audit({ id: params, rejectReason: this.msg, sts: '3' }, () => {
+            this.audit({ ids: params, rejectReason: this.msg, sts: '3' }, () => {
               modal.destroy(true);
             }, '审核拒绝成功');
           }
@@ -97,7 +97,7 @@ export class PartnerRecordedDetailComponent implements OnInit {
           label: '通过',
           type: 'primary',
           onClick: () => {
-            this.audit({ id: params, rejectReason: this.msg, sts: this.formData?.sts === '0' ? 1 : 2 }, () => {
+            this.audit({ ids: params, rejectReason: this.msg, sts: this.formData?.sts === '0' ? 1 : 2 }, () => {
               modal.destroy(true);
             }, `${this.formData?.sts === '1' ? '审核' : '复审'}通过成功`);
           }
diff --git a/src/app/routes/partner/recorded/components/record/record.component.html b/src/app/routes/partner/recorded/components/record/record.component.html
index ce514695..2de32d76 100644
--- a/src/app/routes/partner/recorded/components/record/record.component.html
+++ b/src/app/routes/partner/recorded/components/record/record.component.html
@@ -44,7 +44,7 @@
     <st #st [data]="service.$api_get_recorded_page" [columns]="columns"
       [req]="{  method: 'POST', allInBody: true,process: beforeReq}" [loading]="service.http.loading"
       [scroll]="{ x:'1200px' }" (change)="stChange($event)"
-      [res]="{ reName: { list: 'data', total: 'data.total' }, process: afterRes }"
+      [res]="{ reName: { list: 'data.records', total: 'data.total' }, process: afterRes }"
       [page]="{ show: true,  pageSizes:  [10, 20, 50, 100, 200, 500] }">
       <ng-template st-row="bankCardNumber" let-item let-index="index" let-column="column">
         {{ item.bankName }} <br> {{ item.bankCardNumber }}
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 9751a9cb..d4e0d8de 100644
--- a/src/app/routes/partner/recorded/components/record/record.component.ts
+++ b/src/app/routes/partner/recorded/components/record/record.component.ts
@@ -70,7 +70,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;
   };
 
@@ -148,7 +148,7 @@ export class PartnerRecordedRecordComponent implements OnInit {
               this.service.msgSrv.warning('请填写拒绝原因 ');
               return;
             }
-            this.audit({ id: params, rejectReason: this.msg, sts: '3' }, () => {
+            this.audit({ ids: params, rejectReason: this.msg, sts: '3' }, () => {
               modal.destroy();
               this.st.load(1);
             }, '审核拒绝成功');
@@ -170,7 +170,7 @@ export class PartnerRecordedRecordComponent implements OnInit {
           label: '通过',
           type: 'primary',
           onClick: () => {
-            this.audit({ id: params, rejectReason: this.msg, sts: '1' }, () => {
+            this.audit({ ids: params, rejectReason: this.msg, sts: '1' }, () => {
               modal.destroy();
               this.st.load(1);
             }, '审核通过成功');
@@ -238,10 +238,10 @@ export class PartnerRecordedRecordComponent implements OnInit {
           default: '',
           enum: [
             { label: '全部', value: '' },
-            { label: '待初审', value: 0 },
-            { label: '待复核', value: 1 },
-            { label: '已入账', value: 2 },
-            { label: '已拒绝', value: 3 },
+            { label: '待初审', value: '0' },
+            { label: '待复核', value: '1' },
+            { label: '已入账', value: '2' },
+            { label: '已拒绝', value: '3' },
           ],
           ui: {
             widget: 'select',
@@ -309,7 +309,7 @@ export class PartnerRecordedRecordComponent implements OnInit {
       },
 
       { title: '提交时间', index: 'submitTime', width: 160, className: 'text-center' },
-      { title: '入账状态', index: 'stsLabel', width: 100, className: 'text-center' },
+      { title: '入账状态', index: 'stsLabel', width: 120, className: 'text-center' },
       {
         title: '操作',
         fixed: 'right',

From 873ff7f61b3ee956170827a3aee612aef48bb48a Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Tue, 22 Mar 2022 15:05:03 +0800
Subject: [PATCH 63/70] fix bug

---
 .../rebate-setting/rebate-setting.component.html |  4 ++--
 .../rebate-setting/rebate-setting.component.ts   | 16 ++++++++--------
 .../services/rebate-management.service.ts        |  2 ++
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html
index a4864e4d..efa2e94f 100644
--- a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html
+++ b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-02-24 20:09:49
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-11 14:45:48
+ * @LastEditTime : 2022-03-22 14:42:27
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\rebate-setting.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -39,7 +39,7 @@
 </div>
   <st
     #st
-    [data]="data"
+    [data]="service.$api_get_rebateConfig"
     [columns]="columns"
     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
     [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts
index 09f35ff9..3c4cd8df 100644
--- a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts
+++ b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts
@@ -72,7 +72,7 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
           title: '时间月份',
           format: 'month',
         },
-        phone: {
+        partnerId: {
           type: 'string',
           title: '合伙人名称'
         },
@@ -94,31 +94,31 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
       },
       {
         title: '配置类型',
-        index: 'name1'
+        index: 'configType'
       },
       {
         title: '备注',
-        index: 'name1'
+        index: 'remark'
       },
       {
         title: '关联合伙人范围',
-        index: 'name1'
+        index: 'partnerType'
       },
       {
         title: '创建时间',
-        index: 'name1'
+        index: 'enableTime'
       },
       {
         title: '启用时间',
-        index: 'name1'
+        index: 'enableTime'
       },
       {
         title: '优先级',
-        index: 'name44'
+        index: 'priority'
       },
       {
         title: '状态',
-        index: 'name44'
+        index: 'stateLocked'
       },
       {
         title: '操作',
diff --git a/src/app/routes/partner/rebate-management/services/rebate-management.service.ts b/src/app/routes/partner/rebate-management/services/rebate-management.service.ts
index d3a7a412..c7dd9b2e 100644
--- a/src/app/routes/partner/rebate-management/services/rebate-management.service.ts
+++ b/src/app/routes/partner/rebate-management/services/rebate-management.service.ts
@@ -17,6 +17,8 @@ import { BaseService } from '@shared';
 export class RebateManagementService extends BaseService {
   // 查询规则抽查列表
   public $api_get_listCompliancePage = '/api/sdc/billRiskOperate/listRiskPage';
+  // 查询返佣配置表
+  public $api_get_rebateConfig = '/api/mdc/rebateConfig/list/page';
   constructor(public injector: Injector) {
     super(injector);
   }

From 9c3a9ec3a34f3730a2b67c235444a0112f882b48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= <xiaoyun.pan@eascs.com>
Date: Tue, 22 Mar 2022 17:13:53 +0800
Subject: [PATCH 64/70] -

---
 src/app/shared/widget/dict-select/dict-select.widget.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/app/shared/widget/dict-select/dict-select.widget.ts b/src/app/shared/widget/dict-select/dict-select.widget.ts
index 57b64ba5..d8906295 100644
--- a/src/app/shared/widget/dict-select/dict-select.widget.ts
+++ b/src/app/shared/widget/dict-select/dict-select.widget.ts
@@ -1,5 +1,5 @@
 /*
- * @Description  : 
+ * @Description  :
  * @Version      : 1.0
  * @Author       : Shiming
  * @Date         : 2021-12-13 10:36:49
@@ -37,4 +37,8 @@ export class DictSelectWidget extends ControlWidget implements OnInit {
     if (this.ui.change) this.ui.change(value);
     this.setValue(value);
   }
+
+  reset(value: any) {
+    this.setValue(value);
+  }
 }

From e3a14bb57fbe97116d7f5630edd07c93ce622c58 Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Tue, 22 Mar 2022 17:41:58 +0800
Subject: [PATCH 65/70] edit

---
 .../services/freight-account.service.ts       |   4 +-
 .../services/insurance-management.service.ts  |   4 +-
 .../services/order-management.service.ts      |   4 +-
 .../index/partner-list.component.html         |   3 +-
 .../index/partner-list.component.ts           |  17 +-
 .../partner-detail.component.html             |  31 ++-
 .../partner-detail.component.less             |   7 +
 .../partner-detail.component.ts               | 194 ++++++++----------
 .../personal-partner-detail.component.html    |  16 +-
 .../personal-partner-detail.component.less    |   7 +
 .../personal-partner-detail.component.ts      | 125 ++++-------
 .../services/partner-list.service.ts          |  12 +-
 .../services/ticket.service.ts                |   4 +-
 .../usercenter/services/usercenter.service.ts |   4 +-
 .../services/business/shipper-base.service.ts |  35 +++-
 15 files changed, 218 insertions(+), 249 deletions(-)

diff --git a/src/app/routes/financial-management/services/freight-account.service.ts b/src/app/routes/financial-management/services/freight-account.service.ts
index c347df62..a50288cd 100644
--- a/src/app/routes/financial-management/services/freight-account.service.ts
+++ b/src/app/routes/financial-management/services/freight-account.service.ts
@@ -124,8 +124,8 @@ export class FreightAccountService extends ShipperBaseService {
   // 根据预收款ID获取收款单明细
   $api_get_advance_collection_detail = '/api/fcc/ficoBrmYsk/getBrmYskByYskblaId';
 
-  constructor(public injector: Injector, public eaCacheSrv: EACacheService) {
-    super(injector, eaCacheSrv);
+  constructor(public injector: Injector) {
+    super(injector);
   }
 
   getReceiptUrl(url: string, params: any) {
diff --git a/src/app/routes/insurance-management/services/insurance-management.service.ts b/src/app/routes/insurance-management/services/insurance-management.service.ts
index deaea9a6..82020e8d 100644
--- a/src/app/routes/insurance-management/services/insurance-management.service.ts
+++ b/src/app/routes/insurance-management/services/insurance-management.service.ts
@@ -28,7 +28,7 @@ export class InsuranceManagementService extends ShipperBaseService {
   //  保险费公司认证
   $api_get_submitAuthInfo = `/api/sdc/premiumInfo/submitAuthInfo`;
 
-  constructor(public injector: Injector, public eaCacheSrv: EACacheService) {
-    super(injector, eaCacheSrv);
+  constructor(public injector: Injector) {
+    super(injector);
   }
 }
diff --git a/src/app/routes/order-management/services/order-management.service.ts b/src/app/routes/order-management/services/order-management.service.ts
index ddb29aea..ddee0a7d 100644
--- a/src/app/routes/order-management/services/order-management.service.ts
+++ b/src/app/routes/order-management/services/order-management.service.ts
@@ -190,7 +190,7 @@ export class OrderManagementService extends ShipperBaseService {
       })
     );
   }
-  constructor(public injector: Injector, public eaCacheSrv: EACacheService) {
-    super(injector, eaCacheSrv);
+  constructor(public injector: Injector) {
+    super(injector);
   }
 }
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 5d4e7feb..f2f058ee 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
@@ -36,8 +36,7 @@
       <se [col]="1" label="合伙人名称"> {{selectItem?.enterpriseName}} </se>
       <se [col]="1" label="返佣模板" required>
         <nz-select [(ngModel)]="templateId" style="width: 100%">
-          <nz-option nzValue="jack" nzLabel="Jack"></nz-option>
-          <nz-option nzValue="lucy" nzLabel="Lucy"></nz-option>
+          <nz-option [nzValue]="item.value" [nzLabel]="item.label" *ngFor="let item of customers"></nz-option>
         </nz-select>
       </se>
     </div>
diff --git a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts
index 64b10e7a..eaa21889 100644
--- a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts
+++ b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts
@@ -25,6 +25,7 @@ export class PartnerListComponent {
   @ViewChild('editTemplate', { static: true })
   editTemplate: any;
   templateId: any;
+  templates: any[] = [];
 
   @ViewChild('editCannel', { static: true })
   editCannel: any;
@@ -32,7 +33,13 @@ export class PartnerListComponent {
 
   selectItem: any = {};
 
-  constructor(public service: PartnerListService, private nzModalService: NzModalService, private router: Router) {}
+  constructor(public service: PartnerListService, private nzModalService: NzModalService, private router: Router) {
+    this.service.getRebateConfig().subscribe(res => {
+      if (res) {
+        this.customers = res;
+      }
+    });
+  }
 
   beforeReq = (requestOptions: STRequestOptions) => {
     if (this.sf) {
@@ -60,6 +67,10 @@ export class PartnerListComponent {
       nzTitle: '修改返佣模板',
       nzContent: this.editTemplate,
       nzOnOk: () => {
+        if (!this.templateId) {
+          this.service.msgSrv.warning('请选择返佣模板');
+          return false;
+        }
         this.confirmEditTemplate();
         return false;
       }
@@ -367,9 +378,9 @@ export class PartnerListComponent {
             text: '详情',
             click: item => {
               if (item.partnerType === 1) {
-                this.router.navigate([`/partner/partner-list/etp-detail/${item.appUserId}`]);
+                this.router.navigate([`/partner/partner-list/etp-detail/${item.id}`]);
               } else {
-                this.router.navigate([`/partner/partner-list/personal-detail/${item.appUserId}`]);
+                this.router.navigate([`/partner/partner-list/personal-detail/${item.id}`]);
               }
             }
           },
diff --git a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html
index 759de850..777d019f 100644
--- a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html
+++ b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html
@@ -121,19 +121,19 @@
       </div>
     </sv>
     <sv label="身份证有效期" col="1">
-      <nz-date-picker [(ngModel)]="detailData.operatingStartTime" [nzDisabled]="!isEdit" nzPlaceHolder=" "
+      <nz-date-picker [(ngModel)]="detailData.adminUserInfo.validStartTime" [nzDisabled]="!isEdit" nzPlaceHolder=" "
         [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''" style="width: 100px" class="calendar">
       </nz-date-picker>
       -
-      <ng-container *ngIf="!isEdit && !detailData?.operatingEndTime && detailData?.operatingStartTime">
+      <ng-container *ngIf="!isEdit && !detailData?.adminUserInfo.validEndTime && detailData?.adminUserInfo.validStartTime">
         <label style="padding-left: 11px">长期</label>
       </ng-container>
-      <nz-date-picker [(ngModel)]="detailData.operatingEndTime" [nzDisabled]="!isEdit" nzPlaceHolder=" "
+      <nz-date-picker [(ngModel)]="detailData.adminUserInfo.validEndTime" [nzDisabled]="!isEdit" nzPlaceHolder=" "
         [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''" style="width: 100px" class="calendar">
       </nz-date-picker>
       <ng-container *ngIf="isEdit">
-        <label nz-checkbox [ngModel]="!!!detailData.operatingEndTime"
-          (ngModelChange)="$event ? (detailData.operatingEndTime = '') : ''" class="ml-sm">长期</label>
+        <label nz-checkbox [ngModel]="!!!detailData.adminUserInfo.validEndTime"
+          (ngModelChange)="$event ? (detailData.adminUserInfo.validEndTime = '') : ''" class="ml-sm">长期</label>
       </ng-container>
     </sv>
   </sv-container>
@@ -165,12 +165,14 @@
       </p>
     </sv-title>
     <sv label="公司名称">
-      <input nz-input type="text" [(ngModel)]="detailData.enterpriseName" [readonly]="!isEdit" [nzBorderless]="!isEdit"
-        [placeholder]="isEdit ? '' : '-'" />
+      <!-- <input nz-input type="text" [(ngModel)]="" [readonly]="!isEdit" [nzBorderless]="!isEdit"
+        [placeholder]="isEdit ? '' : '-'" /> -->
+      {{detailData.enterpriseName}}
     </sv>
     <sv label="统一社会信用代码">
-      <input nz-input type="text" [(ngModel)]="detailData.unifiedSocialCreditCode" [readonly]="!isEdit"
-        [nzBorderless]="!isEdit" [placeholder]="isEdit ? '' : '-'" />
+      <!-- <input nz-input type="text" [(ngModel)]="detailData.unifiedSocialCreditCode" [readonly]="!isEdit"
+        [nzBorderless]="!isEdit" [placeholder]="isEdit ? '' : '-'" /> -->
+      {{detailData.unifiedSocialCreditCode}}
     </sv>
     <sv label="营业执照" col="2">
       <ng-container *ngTemplateOutlet="
@@ -306,14 +308,9 @@
     </ng-container>
     <div *ngIf="data[key]" (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">
-        <i nz-icon nzType="close-circle" nzTheme="fill" class="delete-icon" (click)="deleteImg(data, key, key2)"></i>
-        <div style="display: flex; align-items: center">
-          <i nz-icon nzType="eye" nzTheme="fill" class="show-icon" (click)="service.showImg(data[key])"></i>
-        </div>
-      </div>
+      <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>
     </div>
   </nz-upload>
 </ng-template>
diff --git a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.less b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.less
index eadc3a6a..be442cbc 100644
--- a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.less
+++ b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.less
@@ -27,4 +27,11 @@
     z-index : 999 !important;
     width   : 100% !important;
   }
+
+  .image-hover .delete-icon {
+    top        : unset !important;
+    right      : unset !important;
+    margin-top : -15px;
+    margin-left: -15px;
+  }
 }
\ No newline at end of file
diff --git a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts
index eefd57bc..94b4c869 100644
--- a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts
+++ b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts
@@ -253,49 +253,35 @@ export class PartnerDetailComponent implements OnInit, OnDestroy {
   }
 
   save() {
+    if (this.enterpriseAddressCode?.length > 3) {
+      this.service.msgSrv.warning('所属城市不能超过3个');
+      return;
+    }
     const dateil = { ...this.detailData };
     Object.assign(dateil.legalPersonIdentity, {
       validStartTime: this.datePipe.transform(dateil.legalPersonIdentity.validStartTime, 'yyyy-MM-dd'),
       validEndTime: this.datePipe.transform(dateil.legalPersonIdentity.validEndTime, 'yyyy-MM-dd')
     });
+    Object.assign(dateil.adminUserInfo, {
+      validStartTime: this.datePipe.transform(dateil.adminUserInfo.validStartTime, 'yyyy-MM-dd'),
+      validEndTime: this.datePipe.transform(dateil.adminUserInfo.validEndTime, 'yyyy-MM-dd')
+    });
     const params = {};
     Object.assign(params, {
-      adminMobile: dateil.adminMobile,
-      adminAppUserId: dateil.adminAppUserId,
-      adminUserInfo: { ...dateil.adminUserInfo },
-      bankAccount: dateil.bankAccount,
-      businessScope: dateil.businessScope,
-      createBank: dateil.createBank,
-      creditPhoto: dateil.creditPhoto,
-      creditPhotoWatermark: dateil.creditPhotoWatermark,
-      enterpriseAddress: dateil.enterpriseAddress,
-      enterpriseAddressCode: this.enterpriseAddressCode[2],
-      enterpriseLogo: dateil.enterpriseLogo,
-      enterpriseName: dateil.enterpriseName,
+      ...dateil,
+      cityCodesList: this.enterpriseAddressCode,
       enterpriseRegistrationTime: this.datePipe.transform(dateil.enterpriseRegistrationTime, 'yyyy-MM-dd'),
-      enterpriseType: dateil.enterpriseType,
-      id: dateil.id,
-      legalPersonIdentityDTO: { ...dateil.legalPersonIdentity },
-      licensePhoto: dateil.licensePhoto,
-      licensePhotoWatermark: dateil.licensePhotoWatermark,
-      networkTransporter: dateil.networkTransporter,
-      oftenUsedServices: dateil.oftenUsedServices,
       operatingEndTime: this.datePipe.transform(dateil.operatingEndTime, 'yyyy-MM-dd'),
-      operatingStartTime: this.datePipe.transform(dateil.operatingStartTime, 'yyyy-MM-dd'),
-      promotersTelephone: dateil.promotersTelephone,
-      registerAddress: dateil.registerAddress,
-      registerPhone: dateil.registerPhone,
-      registrationCapital: dateil.registrationCapital,
-      taxAuthority: dateil.taxAuthority,
-      unifiedSocialCreditCode: dateil.unifiedSocialCreditCode
+      operatingStartTime: this.datePipe.transform(dateil.operatingStartTime, 'yyyy-MM-dd')
+    });
+    
+    this.service.request(this.service.$api_save_entp_partner, params).subscribe(res => {
+      if (res) {
+        this.service.msgSrv.success('企业合伙人修改成功');
+        this.initData();
+        this.isEdit = false;
+      }
     });
-    // this.service.request(this.service.$api_save_enterprise_admin, params).subscribe(res => {
-    //   if (res) {
-    //     this.service.msgSrv.success('企业修改成功');
-    //     this.initData();
-    //     this.isEdit = false;
-    //   }
-    // });
   }
 
   // 识别身份证 参数isFront：front-正面、back-背面；type：0-申请人身份证，1-法定代表人身份证
@@ -304,85 +290,77 @@ export class PartnerDetailComponent implements OnInit, OnDestroy {
       idCardUrl: imgurl,
       side: isFront
     };
-    // this.service.request(this.service.$api_ocr_recognize_id_card, params).subscribe(res => {
-    //   if (res) {
-    //     if (type === 1) {
-    //       // 法定代表人证件照
-    //       if (isFront === 'front') {
-    //         // 正面
-    //         if (res.name) {
-    //           this.detailData.legalPersonIdentity.name = res.name;
-    //         }
-    //         if (res.number) {
-    //           this.detailData.legalPersonIdentity.certificateNumber = res.number;
-    //         }
-    //       }
-    //       if (isFront === 'back') {
-    //         // 背面
-    //         if (res.validFrom) {
-    //           this.detailData.legalPersonIdentity.validStartTime = res.validFrom;
-    //         }
-    //         if (res.validTo) {
-    //           this.detailData.legalPersonIdentity.validEndTime = res.validTo;
-    //         } else {
-    //           this.detailData.legalPersonIdentity.validEndTime = null;
-    //         }
-    //       }
-    //     }
-    //     // 企业管理员证件照
-    //     if (type === 0) {
-    //       if (isFront === 'front') {
-    //         // 正面
-    //         if (res.name) {
-    //           this.detailData.adminUserInfo.name = res.name;
-    //         }
-    //         if (res.number) {
-    //           this.detailData.adminUserInfo.certificateNumber = res.number;
-    //         }
-    //       }
-    //     }
-    //   }
-    // });
+    this.service.request(this.service.$api_ocr_recognize_id_card, params).subscribe(res => {
+      if (res) {
+        if (type === 1) {
+          // 法定代表人证件照
+          if (isFront === 'front') {
+            // 正面
+            if (res.name) {
+              this.detailData.legalPersonIdentity.name = res.name;
+            }
+            if (res.number) {
+              this.detailData.legalPersonIdentity.certificateType = 0;
+              this.detailData.legalPersonIdentity.certificateNumber = res.number;
+            }
+          }
+          if (isFront === 'back') {
+            // 背面
+            if (res.validFrom) {
+              this.detailData.legalPersonIdentity.validStartTime = res.validFrom;
+            }
+            if (res.validTo) {
+              this.detailData.legalPersonIdentity.validEndTime = res.validTo;
+            } else {
+              this.detailData.legalPersonIdentity.validEndTime = null;
+            }
+          }
+        }
+        // 企业管理员证件照
+        if (type === 0) {
+          if (isFront === 'front') {
+            // 正面
+            if (res.name) {
+              this.detailData.adminUserInfo.name = res.name;
+            }
+            if (res.number) {
+              this.detailData.adminUserInfo.certificateNumber = res.number;
+            }
+          }
+          if (isFront === 'back') {
+            // 背面
+            if (res.validFrom) {
+              this.detailData.adminUserInfo.validStartTime = res.validFrom;
+            }
+            if (res.validTo) {
+              this.detailData.adminUserInfo.validEndTime = res.validTo;
+            }
+          }
+        }
+      }
+    });
   }
 
   // 识别营业执照
   checkBusinessLicense(imgurl: any) {
-    // this.service.request(this.service.$api_ocr_recognize_business_license, { businessLicenseUrl: imgurl }).subscribe(res => {
-    //   if (res) {
-    //     if (res.registrationNumber) {
-    //       this.detailData.unifiedSocialCreditCode = res.registrationNumber;
-    //     }
-    //     if (res.name) {
-    //       this.detailData.enterpriseName = res.name;
-    //     }
-    //     if (res.type) {
-    //       this.detailData.enterpriseType = res.type;
-    //     }
-    //     if (res.addressRegionCodes) {
-    //       this.detailData.enterpriseAddressCode = res.addressRegionCodes;
-    //     }
-    //     if (res.address) {
-    //       this.detailData.enterpriseAddress = res.address;
-    //     }
-    //     if (res.registeredCapital) {
-    //       this.detailData.registrationCapital = res.registeredCapital;
-    //     }
-    //     if (res.foundDate) {
-    //       this.detailData.enterpriseRegistrationTime = res.foundDate;
-    //     }
-    //     if (res.businessTermStartDate) {
-    //       this.detailData.operatingStartTime = res.businessTermStartDate;
-    //     }
-    //     if (res.businessTermEndDate) {
-    //       this.detailData.operatingEndTime = res.businessTermEndDate;
-    //     } else {
-    //       this.detailData.operatingEndTime = null;
-    //     }
-    //     if (res.businessScope) {
-    //       this.detailData.businessScope = res.businessScope;
-    //     }
-    //   }
-    // });
+    this.service.request(this.service.$api_ocr_recognize_business_license, { businessLicenseUrl: imgurl }).subscribe(res => {
+      if (res) {
+        // if (res.registrationNumber) {
+        //   this.detailData.unifiedSocialCreditCode = res.registrationNumber;
+        // }
+        // if (res.name) {
+        //   this.detailData.enterpriseName = res.name;
+        // }
+        if (res.businessTermStartDate) {
+          this.detailData.operatingStartTime = res.businessTermStartDate;
+        }
+        if (res.businessTermEndDate) {
+          this.detailData.operatingEndTime = res.businessTermEndDate;
+        } else {
+          this.detailData.operatingEndTime = null;
+        }
+      }
+    });
   }
 
   private initST(): { logsColumn: STColumn[]; changeColumn: STColumn[]; beChangeColumn: STColumn[] } {
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 143b4be1..aa2b1e32 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
@@ -87,8 +87,9 @@
         [nzBorderless]="!isEdit" [placeholder]="isEdit ? '' : '-'" />
     </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 ? '' : '-'" /> -->
+        {{detailData.adminUserInfo.mobile}}
     </sv>
     <sv label="身份证号">
       <input nz-input type="text" [(ngModel)]="detailData.adminUserInfo.certificateNumber" [readonly]="!isEdit"
@@ -173,14 +174,9 @@
     </ng-container>
     <div *ngIf="data[key]" (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">
-        <i nz-icon nzType="close-circle" nzTheme="fill" class="delete-icon" (click)="deleteImg(data, key, key2)"></i>
-        <div style="display: flex; align-items: center">
-          <i nz-icon nzType="eye" nzTheme="fill" class="show-icon" (click)="service.showImg(data[key])"></i>
-        </div>
-      </div>
+      <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>
     </div>
   </nz-upload>
 </ng-template>
\ No newline at end of file
diff --git a/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.less b/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.less
index eadc3a6a..be442cbc 100644
--- a/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.less
+++ b/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.less
@@ -27,4 +27,11 @@
     z-index : 999 !important;
     width   : 100% !important;
   }
+
+  .image-hover .delete-icon {
+    top        : unset !important;
+    right      : unset !important;
+    margin-top : -15px;
+    margin-left: -15px;
+  }
 }
\ No newline at end of file
diff --git a/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts b/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts
index 218439d0..c6da1adc 100644
--- a/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts
+++ b/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts
@@ -152,10 +152,7 @@ export class PersonalPartnerDetailComponent implements OnInit {
       data[key] = file.response.data?.fullFileWatermarkPath;
       data[key2] = file.response.data?.fullFilePath;
       if (id === 'legalFront' || id === 'legalBack') {
-        this.checkIdCard(file.response.data?.fullFilePath, id === 'legalFront' ? 'front' : 'back', 1);
-      }
-      if (id === 'certificateBackFront' || id === 'certificateBack') {
-        this.checkIdCard(file.response.data?.fullFilePath, id === 'certificateBackFront' ? 'front' : 'back', 0);
+        this.checkIdCard(file.response.data?.fullFilePath, id === 'legalFront' ? 'front' : 'back');
       }
     }
   }
@@ -215,95 +212,53 @@ export class PersonalPartnerDetailComponent implements OnInit {
   }
 
   save() {
-    const dateil = { ...this.detailData };
-    Object.assign(dateil.legalPersonIdentity, {
-      validStartTime: this.datePipe.transform(dateil.legalPersonIdentity.validStartTime, 'yyyy-MM-dd'),
-      validEndTime: this.datePipe.transform(dateil.legalPersonIdentity.validEndTime, 'yyyy-MM-dd')
+    if (this.enterpriseAddressCode?.length > 3) {
+      this.service.msgSrv.warning('所属城市不能超过3个');
+      return;
+    }
+    const dateil = { ...this.detailData, cityCodesList: this.enterpriseAddressCode };
+    Object.assign(dateil.adminUserInfo, {
+      validStartTime: this.datePipe.transform(dateil.adminUserInfo.validStartTime, 'yyyy-MM-dd'),
+      validEndTime: this.datePipe.transform(dateil.adminUserInfo.validEndTime, 'yyyy-MM-dd')
     });
-    const params = {};
-    Object.assign(params, {
-      adminMobile: dateil.adminMobile,
-      adminAppUserId: dateil.adminAppUserId,
-      adminUserInfo: { ...dateil.adminUserInfo },
-      bankAccount: dateil.bankAccount,
-      businessScope: dateil.businessScope,
-      createBank: dateil.createBank,
-      creditPhoto: dateil.creditPhoto,
-      creditPhotoWatermark: dateil.creditPhotoWatermark,
-      enterpriseAddress: dateil.enterpriseAddress,
-      enterpriseAddressCode: this.enterpriseAddressCode[2],
-      enterpriseLogo: dateil.enterpriseLogo,
-      enterpriseName: dateil.enterpriseName,
-      enterpriseRegistrationTime: this.datePipe.transform(dateil.enterpriseRegistrationTime, 'yyyy-MM-dd'),
-      enterpriseType: dateil.enterpriseType,
-      id: dateil.id,
-      legalPersonIdentityDTO: { ...dateil.legalPersonIdentity },
-      licensePhoto: dateil.licensePhoto,
-      licensePhotoWatermark: dateil.licensePhotoWatermark,
-      networkTransporter: dateil.networkTransporter,
-      oftenUsedServices: dateil.oftenUsedServices,
-      operatingEndTime: this.datePipe.transform(dateil.operatingEndTime, 'yyyy-MM-dd'),
-      operatingStartTime: this.datePipe.transform(dateil.operatingStartTime, 'yyyy-MM-dd'),
-      promotersTelephone: dateil.promotersTelephone,
-      registerAddress: dateil.registerAddress,
-      registerPhone: dateil.registerPhone,
-      registrationCapital: dateil.registrationCapital,
-      taxAuthority: dateil.taxAuthority,
-      unifiedSocialCreditCode: dateil.unifiedSocialCreditCode
+
+    this.service.request(this.service.$api_save_personal_partner, dateil).subscribe(res => {
+      if (res) {
+        this.service.msgSrv.success('个人合伙人修改成功');
+        this.initData();
+        this.isEdit = false;
+      }
     });
-    // this.service.request(this.service.$api_save_enterprise_admin, params).subscribe(res => {
-    //   if (res) {
-    //     this.service.msgSrv.success('企业修改成功');
-    //     this.initData();
-    //     this.isEdit = false;
-    //   }
-    // });
   }
 
   // 识别身份证 参数isFront：front-正面、back-背面；type：0-申请人身份证，1-法定代表人身份证
-  checkIdCard(imgurl: any, isFront: string, type: number) {
+  checkIdCard(imgurl: any, isFront: string) {
     const params = {
       idCardUrl: imgurl,
       side: isFront
     };
-    // this.service.request(this.service.$api_ocr_recognize_id_card, params).subscribe(res => {
-    //   if (res) {
-    //     if (type === 1) {
-    //       // 法定代表人证件照
-    //       if (isFront === 'front') {
-    //         // 正面
-    //         if (res.name) {
-    //           this.detailData.legalPersonIdentity.name = res.name;
-    //         }
-    //         if (res.number) {
-    //           this.detailData.legalPersonIdentity.certificateNumber = res.number;
-    //         }
-    //       }
-    //       if (isFront === 'back') {
-    //         // 背面
-    //         if (res.validFrom) {
-    //           this.detailData.legalPersonIdentity.validStartTime = res.validFrom;
-    //         }
-    //         if (res.validTo) {
-    //           this.detailData.legalPersonIdentity.validEndTime = res.validTo;
-    //         } else {
-    //           this.detailData.legalPersonIdentity.validEndTime = null;
-    //         }
-    //       }
-    //     }
-    //     // 企业管理员证件照
-    //     if (type === 0) {
-    //       if (isFront === 'front') {
-    //         // 正面
-    //         if (res.name) {
-    //           this.detailData.adminUserInfo.name = res.name;
-    //         }
-    //         if (res.number) {
-    //           this.detailData.adminUserInfo.certificateNumber = res.number;
-    //         }
-    //       }
-    //     }
-    //   }
-    // });
+    this.service.request(this.service.$api_ocr_recognize_id_card, params).subscribe(res => {
+      if (res) {
+        // 企业管理员证件照
+        if (isFront === 'front') {
+          // 正面
+          if (res.name) {
+            this.detailData.adminUserInfo.name = res.name;
+          }
+          if (res.number) {
+            this.detailData.adminUserInfo.certificateNumber = res.number;
+          }
+        }
+        if (isFront === 'back') {
+          // 背面
+          if (res.validFrom) {
+            this.detailData.adminUserInfo.validStartTime = res.validFrom;
+          }
+          if (res.validTo) {
+            this.detailData.adminUserInfo.validEndTime = res.validTo;
+          }
+        }
+      }
+    });
   }
 }
diff --git a/src/app/routes/partner/partner-list/services/partner-list.service.ts b/src/app/routes/partner/partner-list/services/partner-list.service.ts
index 9756c19f..b8d83d54 100644
--- a/src/app/routes/partner/partner-list/services/partner-list.service.ts
+++ b/src/app/routes/partner/partner-list/services/partner-list.service.ts
@@ -1,10 +1,10 @@
 import { Injectable, Injector } from '@angular/core';
-import { BaseService, EACacheService } from '@shared';
+import { BaseService, EACacheService, ShipperBaseService } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { ImageViewComponent } from 'src/app/shared/components/imagelist';
 
 @Injectable()
-export class PartnerListService extends BaseService {
+export class PartnerListService extends ShipperBaseService {
   $mock_url = '/rule?_allow_anonymous=true';
 
   // 查询合伙人信息-分页
@@ -18,13 +18,13 @@ export class PartnerListService extends BaseService {
   // 获取合伙人信息
   $api_get_personal_partner_detail = '/api/mdc/partner/getPersonally';
   // 审核合伙人
-  $api_audit_partner= '/api/mdc/partner/audit';
+  $api_audit_partner = '/api/mdc/partner/audit';
   // 修改返佣模板
-  $api_update_partner_template= '/api/mdc/partner/updateTemplate';
+  $api_update_partner_template = '/api/mdc/partner/updateTemplate';
   // 更新渠道销售
-  $api_update_partner_channel= '/api/mdc/partner/updateChannelSale';
+  $api_update_partner_channel = '/api/mdc/partner/updateChannelSale';
   // 重新发起CRM
-  $api_resend_crm= '/api/mdc/partner/reSendCrm';
+  $api_resend_crm = '/api/mdc/partner/reSendCrm';
   // 查询合伙人修改渠道渠道销售记录
   $api_get_personal_channel_list = '/api/mdc/partnerChannelRelLog/list/page';
   // 冻结/启用企业业
diff --git a/src/app/routes/ticket-management/services/ticket.service.ts b/src/app/routes/ticket-management/services/ticket.service.ts
index 14778143..52eaf537 100644
--- a/src/app/routes/ticket-management/services/ticket.service.ts
+++ b/src/app/routes/ticket-management/services/ticket.service.ts
@@ -99,8 +99,8 @@ export class TicketService extends ShipperBaseService {
   // 查询快递轨迹
   $api_get_express_routes = '/api/fcc/ficoExpressH/searchRoutes';
 
-  constructor(public injector: Injector, public eaCacheSrv: EACacheService) {
-    super(injector, eaCacheSrv);
+  constructor(public injector: Injector) {
+    super(injector);
   }
 
   reviewPDF(url: string) {
diff --git a/src/app/routes/usercenter/services/usercenter.service.ts b/src/app/routes/usercenter/services/usercenter.service.ts
index c42a9b3d..295e45f0 100644
--- a/src/app/routes/usercenter/services/usercenter.service.ts
+++ b/src/app/routes/usercenter/services/usercenter.service.ts
@@ -136,8 +136,8 @@ export class UsermanageService extends ShipperBaseService {
   // 查询司机配置列表
   $api_configPage = '/api/mdc/cuc/driver/list/configPage';
 
-  constructor(public injector: Injector, private nzModalService: NzModalService, public eaCacheSrv: EACacheService) {
-    super(injector, eaCacheSrv);
+  constructor(public injector: Injector, private nzModalService: NzModalService) {
+    super(injector);
   }
 
   showImg(url: any) {
diff --git a/src/app/shared/services/business/shipper-base.service.ts b/src/app/shared/services/business/shipper-base.service.ts
index 41c9fbf8..d3a4b2d1 100644
--- a/src/app/shared/services/business/shipper-base.service.ts
+++ b/src/app/shared/services/business/shipper-base.service.ts
@@ -17,10 +17,10 @@ export class ShipperBaseService extends BaseService {
   $api_get_network_freight_forwarder_one = `/api/mdc/cuc/networkTransporter/get`; // 获取网络货运人
   // 根据FullKey获取系统子配置(树)
   $api_getSysConfigTreeByParentFullKey = `/api/mdc/pbc/sysConfig/getSysConfigTreeByParentFullKey`;
-  envCache: any;
-  constructor(public injector: Injector, public eaCacheSrv: EACacheService) {
+  // 获取全部返佣配置
+  $api_get_rebate_config = `/api/mdc/rebateConfig/list/listRebateConfig`;
+  constructor(public injector: Injector) {
     super(injector);
-    this.envCache = this.eaCacheSrv.get(cacheConf.env);
   }
 
   /**
@@ -44,22 +44,22 @@ export class ShipperBaseService extends BaseService {
    * 获取所属项目
    * @returns
    */
-   getEnterpriseProject(params?: any) {
+  getEnterpriseProject(params?: any) {
     return this.request(this.$api_get_enterprise_project, params).pipe(
       map((res: any) => {
         if (!res) {
           return [];
         }
-        const list = res.map(((item: any) => {
+        const list = res.map((item: any) => {
           return {
             label: item.projectName,
             value: item.id
-          }
-        }))
+          };
+        });
         const obj = [{ value: '', label: '全部' }];
         return [...obj, ...list];
       })
-    )
+    );
   }
 
   /**
@@ -204,4 +204,23 @@ export class ShipperBaseService extends BaseService {
       })
     );
   }
+
+  /**
+   * 获取全部返佣配置
+   * @returns
+   */
+  getRebateConfig() {
+    const params = {};
+    return this.request(this.$api_get_rebate_config, params, 'POST').pipe(
+      map(res => {
+        if (res) {
+          return res.map((m: any) => {
+            return { label: m.configName, value: m.id };
+          });
+        } else {
+          return [];
+        }
+      })
+    );
+  }
 }

From 95dc8075eb871f428be597efd0dc59e917b56d97 Mon Sep 17 00:00:00 2001
From: heqinghang <qinghang.he@eascs.com>
Date: Tue, 22 Mar 2022 17:50:56 +0800
Subject: [PATCH 66/70] 666

---
 .../components/edit/edit.component.ts         |  5 +-
 .../components/list/list.component.ts         | 12 ++---
 .../components/edit/edit.component.ts         |  1 +
 .../components/list/list.component.ts         | 50 +++++++++++--------
 .../services/level-config.service.ts          |  2 +
 5 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/src/app/routes/partner/channel-sales/components/edit/edit.component.ts b/src/app/routes/partner/channel-sales/components/edit/edit.component.ts
index 3ba33a79..891e45e3 100644
--- a/src/app/routes/partner/channel-sales/components/edit/edit.component.ts
+++ b/src/app/routes/partner/channel-sales/components/edit/edit.component.ts
@@ -60,7 +60,7 @@ export class ParterChannelSalesEditComponent implements OnInit {
           ui: {
             widget: 'autocomplete',
             placeholder:'请选择',
-            asyncData: () => this.service.request(this.service.$api_fuzzyQuery).pipe(
+            asyncData: (input:string) => this.service.request(this.service.$api_fuzzyQuery,{name:input}).pipe(
               map((res: any) => {
                 console.log('111',res)
                 return [];
@@ -81,7 +81,7 @@ export class ParterChannelSalesEditComponent implements OnInit {
           default: '0',
         },
         roleIds: {
-          title: '角色',
+          title: '',
           type: 'string',
           ui: {
             widget: 'select',
@@ -89,6 +89,7 @@ export class ParterChannelSalesEditComponent implements OnInit {
             mode: 'multiple',
             maxMultipleCount: 5,
             asyncData: () => {
+        
               return this.service.request(this.service.$api_getAppRoleList).pipe(
                 map((res: any) => {
                   return res
diff --git a/src/app/routes/partner/channel-sales/components/list/list.component.ts b/src/app/routes/partner/channel-sales/components/list/list.component.ts
index 635495a2..25cb97c5 100644
--- a/src/app/routes/partner/channel-sales/components/list/list.component.ts
+++ b/src/app/routes/partner/channel-sales/components/list/list.component.ts
@@ -64,27 +64,27 @@ export class ParterChannelSalesListComponent implements OnInit {
     this.columns = [
       {
         title: '销售渠道姓名',
-        index: 'name1'
+        index: 'name'
       },
       {
         title: '手机号',
-        index: 'name1'
+        index: 'telephone'
       },
       {
         title: '所属组织',
-        index: 'name1'
+        index: 'organLable'
       },
       {
         title: '职级',
-        index: 'name1'
+        index: 'station'
       },
       {
         title: '等级',
-        index: 'name1'
+        index: 'postLevel'
       },
       {
         title: '省市',
-        index: 'name1'
+        index: 'residencePlace'
       },
       {
         title: '邀请码',
diff --git a/src/app/routes/partner/level-config/components/edit/edit.component.ts b/src/app/routes/partner/level-config/components/edit/edit.component.ts
index c21bb292..029381d5 100644
--- a/src/app/routes/partner/level-config/components/edit/edit.component.ts
+++ b/src/app/routes/partner/level-config/components/edit/edit.component.ts
@@ -75,6 +75,7 @@ export class ParterLevelConfigEditComponent implements OnInit {
     if(!this.sf.valid) return;
     this.service.request(this.service.$api_save, { ...this.sf.value }).subscribe(res => {
       if (res) {
+        this.service.msgSrv.success('保存成功！')
         this.modalRef.destroy(true);
       } else {
         this.service.msgSrv.error(res.msg);
diff --git a/src/app/routes/partner/level-config/components/list/list.component.ts b/src/app/routes/partner/level-config/components/list/list.component.ts
index 5b79e7fd..59d8f88f 100644
--- a/src/app/routes/partner/level-config/components/list/list.component.ts
+++ b/src/app/routes/partner/level-config/components/list/list.component.ts
@@ -45,21 +45,22 @@ export class ParterLevelConfigListComponent implements OnInit {
       properties: {
         gradeName: {
           type: 'string',
-          title: '等级姓名'
+          title: '等级姓名',
         },
         stateLocked: {
           type: 'string',
           title: '状态',
-          enum:[{label:'是',value:'1'},{label:'否',value:'2'}],
+          enum:[{label:'启用',value:'1'},{label:'禁用',value:'0'}],
           ui:{
-            widget:'select'
+            widget:'select',
           }
         },
       }
     };
     this.ui = {
       '*': {
-        grid: { span: 8, gutter: 4 }
+        width:300,
+        grid: { span: 12, gutter: 4 }
       }
     };
   }
@@ -76,7 +77,7 @@ export class ParterLevelConfigListComponent implements OnInit {
       },
       {
         title: '创建时间',
-        index: 'name1'
+        index: 'createTime'
       },
       {
         title: '启用时间',
@@ -84,7 +85,10 @@ export class ParterLevelConfigListComponent implements OnInit {
       },
       {
         title: '状态',
-        index: 'name1'
+        index: 'stateLocked',
+        format: (item: any) => {
+          return item.stateLocked ? '禁用':'启用'
+        }
       },
       {
         title: '操作',
@@ -97,10 +101,12 @@ export class ParterLevelConfigListComponent implements OnInit {
           {
             text: '禁用',
             click: (_record, _modal, _instance) => this.stop(_record),
+            iif:(item)=>!item.stateLocked
           },
           {
             text: '启用',
             click: (_record, _modal, _instance) => this.restart(_record),
+            iif:(item)=>item.stateLocked
           }
         ]
       }
@@ -145,30 +151,30 @@ export class ParterLevelConfigListComponent implements OnInit {
     });
   }
 
-  restart(id: any) {
+  restart(item: any) {
     this.modalService.confirm({
       nzTitle: '<i>冻结确认</i>',
       nzContent: `<b>确定启用该账号吗？</br>`,
-      // nzOnOk: () =>
-      //   this.service.request('', '').subscribe(res => {
-      //     if (res) {
-      //       this.service.msgSrv.success('冻结成功！');
-      //       this.st.reload();
-      //     }
-      //   })
+      nzOnOk: () =>
+        this.service.request(this.service.$api_updatePartnerGradeConfig, {id:item.id}).subscribe(res => {
+          if (res) {
+            this.service.msgSrv.success('启用成功！');
+            this.st.reload();
+          }
+        })
     });
   }
-  stop(id: any) {
+  stop(item: any) {
     this.modalService.confirm({
       nzTitle: '<i>冻结确认</i>',
       nzContent: `<b>确定禁用该账号吗？</br>`,
-      // nzOnOk: () =>
-      //   this.service.request('', '').subscribe(res => {
-      //     if (res) {
-      //       this.service.msgSrv.success('冻结成功！');
-      //       this.st.reload();
-      //     }
-      //   })
+      nzOnOk: () =>
+        this.service.request(this.service.$api_updatePartnerGradeConfig, {id:item.id}).subscribe(res => {
+          if (res) {
+            this.service.msgSrv.success('冻结成功！');
+            this.st.reload();
+          }
+        })
     });
   }
 
diff --git a/src/app/routes/partner/level-config/services/level-config.service.ts b/src/app/routes/partner/level-config/services/level-config.service.ts
index 3a78fd6c..df8e18b3 100644
--- a/src/app/routes/partner/level-config/services/level-config.service.ts
+++ b/src/app/routes/partner/level-config/services/level-config.service.ts
@@ -13,6 +13,8 @@ export class ChannelSalesService extends BaseService {
   $api_save = '/api/mdc/partnerGradeConfig/save';
   // 删除合伙人等级配置表
   $api_del = '/api/mdc/partnerGradeConfig/deletebatch';
+  // 启用/禁用等级配置
+  $api_updatePartnerGradeConfig = '/api/mdc/partnerGradeConfig/updatePartnerGradeConfig';
 
   constructor(public injector: Injector) {
     super(injector);

From 6fb554bd5f676810eeb279dbf5cc6734a8aaac54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= <xiaoyun.pan@eascs.com>
Date: Tue, 22 Mar 2022 18:03:01 +0800
Subject: [PATCH 67/70] =?UTF-8?q?=E5=BE=85=E5=85=A5=E8=B4=A6=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../recorded-detail.component.html            | 33 +++++++------
 .../recorded-detail.component.ts              | 48 +++++++++++--------
 .../services/account-managemant.service.ts    |  2 +
 3 files changed, 48 insertions(+), 35 deletions(-)

diff --git a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.html b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.html
index feab2ad6..0dc738c1 100644
--- a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.html
+++ b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.html
@@ -6,22 +6,25 @@
   </ng-template>
 </page-header-wrapper>
 <nz-card>
-  <sv-container layout="vertical" [noColon]="true" col="4">
+  <sv-container layout="vertical" [noColon]="true" col="5">
     <sv [label]="labelTpl">
-      <b class="text-md ">{{accountInfo?.company}}</b>
+      <b class="text-md ">{{summaryObj?.company}}</b>
     </sv>
-    <sv label="可用余额">
-      {{totalInfo?.balance |currency}}
+    <sv label="返佣总额">
+      {{summaryObj?.totalRebate |currency}}
     </sv>
-    <sv label="收入金额">
-      {{totalInfo?.income |currency}}
+    <sv label="已入账金额">
+      {{summaryObj?.totalRebate |currency}}
     </sv>
-    <sv label="支出金额">
-      {{totalInfo?.spending |currency}}
+    <sv label="代缴个税">
+      {{summaryObj?.taxPersonalSum |currency}}
+    </sv>
+    <sv label="待入账金额">
+      {{summaryObj?.waitRecordedAmount |currency}}
     </sv>
   </sv-container>
   <ng-template #labelTpl>
-    <b class="text-md" style="color: black;">{{accountInfo?.name}} {{accountInfo?.phone}}</b>
+    <b class="text-md" style="color: black;">{{summaryObj?.name}}</b>
   </ng-template>
 </nz-card>
 <nz-card>
@@ -29,7 +32,7 @@
     <sf mode="search" #sf [schema]="schema" [ui]="ui" (formSubmit)="search()" (formReset)="resetSF()"></sf>
   </div>
   <div class="table-content">
-    <st #st [data]="service.$api_get_account_management_page " [columns]="columns"
+    <st #st [data]="service.$api_get_invoice_detail_page " [columns]="columns"
       [req]="{ method: 'POST', allInBody: true, reName: {pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
       [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
       [page]="{ show: true, showSize: true, pageSizes:  [5,10, 20, 50, 100, 200, 500] }"
@@ -40,11 +43,11 @@
       </ng-template>
     </st>
     <div class="total-footer text-md" *ngIf="st?.list?.length !== 0 ">
-      合计 <label class="text-red-dark">{{ totalInfo?.total }}</label> 项，收入 <label
+      合计 <label class="text-red-dark">{{ summaryObj?.total }}</label> 项，收入 <label
         class="text-red-dark font-weight-bold">{{
-        totalInfo?.income | currency
+        summaryObj?.income | currency
         }}</label>，支出 <label class="text-red-dark font-weight-bold">{{
-        totalInfo?.spending | currency }}</label>
+        summaryObj?.spending | currency }}</label>
     </div>
   </div>
 </nz-card>
@@ -52,8 +55,8 @@
 <nz-modal [(nzVisible)]="showBillDetail" nzTitle="账户明细" [nzFooter]="null" (nzOnCancel)="handleCancel()" nzWidth="700px">
   <div *nzModalContent>
     <div class="mb-sm">
-      <span class="mr-xxl text-md font-weight-bold"><label>网络货运人：</label>{{accountInfo?.name}}</span>
-      <span class="text-md font-weight-bold"><label>返佣总额（元）：</label>{{totalInfo?.spending |currency: ' '}}</span>
+      <span class="mr-xxl text-md font-weight-bold"><label>网络货运人：</label>{{detailRecord?.ltdName}}</span>
+      <span class="text-md font-weight-bold"><label>返佣总额（元）：</label>{{detailRecord?.totalRebate |currency: ' '}}</span>
     </div>
     <st #st [data]="billDetailList " [columns]="billDetailColumns" [res]="{ reName: { list: 'data' } }"
       [req]="{ method: 'POST', allInBody: true, params:billDetailReqParams}" [page]="{show:false}">
diff --git a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts
index 3b7611af..f6bc1b47 100644
--- a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts
+++ b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts
@@ -10,17 +10,16 @@ import { AccountManagemantService } from '../../services/account-managemant.serv
   templateUrl: './recorded-detail.component.html',
 })
 export class PartnerAccountManagementRecordedDetailComponent implements OnInit {
-  totalInfo: any = {
-    balance: 0,
-    income: 1500,
-    spending: 2400,
-    total: 186
+  summaryObj: any = {
+    waitRecordedAmount: 0,
+    totalRebate: 0,
+    taxPersonalSum: 0,
+    recordedAmount: 0,
+    ltdName: '',
+    taxno: ''
   };
-  accountInfo = {
-    name: '张三',
-    phone: '13812345678',
-    company: '天津怡亚通物流科技有限公司（平安）'
-  }
+
+  detailRecord: any = {};
 
   url = `/user`;
   schema: SFSchema = {};
@@ -37,11 +36,12 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit {
 
   constructor(public service: AccountManagemantService, public router: Router, public ar: ActivatedRoute) {
     this.roleId = this.ar.snapshot.params.id;
+
   }
 
 
   get reqParams() {
-    return { ...this.sf?.value, roleId: this.roleId };
+    return { ...this.sf?.value, partnerId: this.roleId };
   }
 
   get billDetailReqParams() {
@@ -50,6 +50,7 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit {
   ngOnInit(): void {
     this.initSF();
     this.initST();
+    this.getInvoiceSummary();
   }
 
   initSF() {
@@ -74,13 +75,13 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit {
 */
   initST() {
     this.columns = [
-      { title: '网络货运人', index: 'carNo', className: 'text-center', width: 200 },
-      { title: '银行类型', render: 'carModelLabel', className: 'text-center', width: 150 },
-      { title: '虚拟账户', render: 'carModelLabel', className: 'text-center', width: 200 },
-      { title: '返佣总额（元）', render: 'carModelLabel', className: 'text-center', width: 120 },
-      { title: '已入账金额（元）', index: 'remark', className: 'text-center', width: 180 },
-      { title: '代缴个税（元）', render: 'approvalStatus1', className: 'text-center', width: 180 },
-      { title: '待入账金额（元）', render: 'amount', className: 'text-right', width: 180 },
+      { title: '网络货运人', index: 'ltdName', className: 'text-center', width: 200 },
+      { title: '银行类型', render: 'bankTypeLabel', className: 'text-center', width: 150 },
+      { title: '虚拟账户', render: 'fictitiousAccount', className: 'text-center', width: 200 },
+      { title: '返佣总额（元）', index: 'totalRebate', className: 'text-center', width: 120, type: 'currency' },
+      { title: '已入账金额（元）', index: 'recordedAmount', className: 'text-center', width: 180, type: 'currency' },
+      { title: '代缴个税（元）', index: 'taxPersonalSum', className: 'text-center', width: 180, type: 'currency' },
+      { title: '待入账金额（元）', index: 'waitRecordedAmount', className: 'text-right', width: 180, type: 'currency' },
       {
         title: '操作', className: 'text-center', width: 300,
         buttons: [
@@ -157,9 +158,16 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit {
     this.showBillDetail = true;
     this.initBillDetailST();
     this.getBillDetail(record?.ltdId);
-
-
   }
+
+  getInvoiceSummary() {
+    this.service.request(this.service.$api_get_invoice_summary, { partnerId: this.roleId }).subscribe(res => {
+      if (res) {
+        this.summaryObj = res;
+      }
+    })
+  }
+
   handleCancel() {
     this.showBillDetail = false;
 
diff --git a/src/app/routes/partner/account-management/services/account-managemant.service.ts b/src/app/routes/partner/account-management/services/account-managemant.service.ts
index f85ee094..f7fa89b0 100644
--- a/src/app/routes/partner/account-management/services/account-managemant.service.ts
+++ b/src/app/routes/partner/account-management/services/account-managemant.service.ts
@@ -13,6 +13,8 @@ export class AccountManagemantService extends BaseService {
   $api_get_account_detail_footer_summary = `/api/bpc/accountBalancePartner/getAccountBalancePartnerIncomeDetailByOperator`;// 账户明细脚部汇总
   $api_get_account_detail_header_summary = `/api/bpc/accountBalancePartner/getAccountBalancePartnerAmountByOperator`;// 账户明细头部汇总
   $api_get_bill_detail = `/api/bpc/partnerIncomeDetail/findPartnerWaitIncomeByOperator`; // 查看账单明细
+  $api_get_invoice_summary = `/api/bpc/partnerInvoiceEntry/oprationEntrySummary`; // 入账明细汇总
+  $api_get_invoice_detail_page = `/api/bpc/partnerInvoiceEntry/oprationEntryDetail`; // 待入账明细列表
 
   constructor(public injector: Injector) {
     super(injector)

From 8e32119abb1098721cdf7007bdbc143af2ed960c Mon Sep 17 00:00:00 2001
From: Lingzi <yinyan.quan@eascs.com>
Date: Wed, 23 Mar 2022 13:39:25 +0800
Subject: [PATCH 68/70] fix bug

---
 .../list/carauth/carauth.component.html       |  34 -
 .../freight/list/carauth/carauth.component.ts | 654 ------------------
 .../editPartner/editPartner.component.html    |   9 +
 .../editPartner/editPartner.component.less    |   7 +
 .../editPartner/editPartner.component.spec.ts |  24 +
 .../list/editPartner/editPartner.component.ts | 122 ++++
 .../list/editSale/editSale.component.html     |   8 +
 .../list/editSale/editSale.component.less     |   7 +
 .../list/editSale/editSale.component.spec.ts  |  24 +
 .../list/editSale/editSale.component.ts       | 130 ++++
 .../freight/list/list.component.less          |  19 +
 .../components/freight/list/list.component.ts | 106 +--
 .../showService/showService.component.html    |  16 +
 .../showService.component.less}               |   8 +-
 .../showservice.component.spec.ts}            |   0
 .../list/showService/showservice.component.ts |  61 ++
 .../usercenter/services/usercenter.service.ts |   9 +-
 .../usercenter/usercenter-routing.module.ts   |   3 +-
 .../routes/usercenter/usercenter.module.ts    |   6 +-
 src/styles/theme.less                         |   5 +-
 20 files changed, 513 insertions(+), 739 deletions(-)
 delete mode 100644 src/app/routes/usercenter/components/freight/list/carauth/carauth.component.html
 delete mode 100644 src/app/routes/usercenter/components/freight/list/carauth/carauth.component.ts
 create mode 100644 src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.html
 create mode 100644 src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.less
 create mode 100644 src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.spec.ts
 create mode 100644 src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts
 create mode 100644 src/app/routes/usercenter/components/freight/list/editSale/editSale.component.html
 create mode 100644 src/app/routes/usercenter/components/freight/list/editSale/editSale.component.less
 create mode 100644 src/app/routes/usercenter/components/freight/list/editSale/editSale.component.spec.ts
 create mode 100644 src/app/routes/usercenter/components/freight/list/editSale/editSale.component.ts
 create mode 100644 src/app/routes/usercenter/components/freight/list/showService/showService.component.html
 rename src/app/routes/usercenter/components/freight/list/{carauth/carauth.component.less => showService/showService.component.less} (95%)
 rename src/app/routes/usercenter/components/freight/list/{carauth/carauth.component.spec.ts => showService/showservice.component.spec.ts} (100%)
 create mode 100644 src/app/routes/usercenter/components/freight/list/showService/showservice.component.ts

diff --git a/src/app/routes/usercenter/components/freight/list/carauth/carauth.component.html b/src/app/routes/usercenter/components/freight/list/carauth/carauth.component.html
deleted file mode 100644
index 1614cf91..00000000
--- a/src/app/routes/usercenter/components/freight/list/carauth/carauth.component.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<div class="modal-header">
-    <div class="modal-title" *ngIf="i.flag === 'add'">车辆协助认证</div>
-    <div class="modal-title" *ngIf="i.flag !== 'add'">添加车辆</div>
-</div>
-<!-- <nz-spin *ngIf="!i" class="modal-spin"></nz-spin> -->
-<div class="sfBox">
-    <sf #sf [compact]="true" [ui]="ui" [schema]="schema" [button]="'none'" *ngIf="schema" [formData]="detailData">
-        <ng-template sf-template="tipsA" let-me let-ui="ui" let-schema="schema">
-            <div class="pr">
-                <dl class="tips">
-                    <dt>行驶证首页</dt>
-                    <dd>示例</dd>
-                </dl>
-                <div class="pa"><img width="190" src="/assets/images/driverfront.png" /></div>
-            </div>
-        </ng-template>
-        <ng-template sf-template="tipsB" let-me let-ui="ui" let-schema="schema">
-            <div class="pr">
-                <dl class="tips">
-                    <dt>行驶证副页</dt>
-                    <dd>示例</dd>
-                </dl>
-                <div class="pa"><img width="190" src="/assets/images/driverback.png" /></div>
-            </div>
-        </ng-template>
-    </sf>
-    <img class="drivercard" height="104" src="/assets/images/car.png" />
-    <img class="agreement" height="104" src="/assets/images/agreement.png" />
-    <img class="jopcard" height="104" src="/assets/images/road.png" />
-</div>
-<div class="modal-footer">
-    <button nz-button type="button" (click)="close()">关闭</button>
-    <button nz-button type="button" nzType="primary" (click)="submitForm()" [disabled]="!sf?.valid" [nzLoading]="checked">确定</button>
-</div>
\ No newline at end of file
diff --git a/src/app/routes/usercenter/components/freight/list/carauth/carauth.component.ts b/src/app/routes/usercenter/components/freight/list/carauth/carauth.component.ts
deleted file mode 100644
index a43173ea..00000000
--- a/src/app/routes/usercenter/components/freight/list/carauth/carauth.component.ts
+++ /dev/null
@@ -1,654 +0,0 @@
-import { Component, OnInit, ViewChild } from '@angular/core';
-import { apiConf } from '@conf/api.conf';
-import { cacheConf } from '@conf/cache.conf';
-import { SFUISchema, SFSchema, SFUploadWidgetSchema, SFComponent, SFSelectWidgetSchema } from '@delon/form';
-import { _HttpClient } from '@delon/theme';
-import { EACacheService, EAEnvironmentService } from '@shared';
-import { NzModalRef } from 'ng-zorro-antd/modal';
-import { NzUploadFile } from 'ng-zorro-antd/upload';
-import { Observable, Observer, of } from 'rxjs';
-import { ListService } from '../../services/list.service';
-
-@Component({
-  selector: 'app-car-carauth',
-  templateUrl: './carauth.component.html',
-  styleUrls: ['./carauth.component.less']
-})
-export class CarCarauthComponent implements OnInit {
-  @ViewChild('sf', { static: false }) sf!: SFComponent;
-  record: any = {};
-  i: any;
-  ui: SFUISchema = {};
-  schema: SFSchema = {};
-  showCardFlag = false;
-  showJopFlag = false;
-  companyData: any = {};
-  detailData: any = {};
-  carNo = ''
-  checked = false
-
-  constructor(
-    private modal: NzModalRef,
-    public service: ListService,
-    private envSrv: EAEnvironmentService,
-    private eaCacheSrv: EACacheService,
-  ) { }
-
-  ngOnInit(): void {
-    this.initData()
-    this.initSF()
-  }
-  initData() {
-    if(this.i.id){
-      this.companyData = this.eaCacheSrv.get(cacheConf.env)
-      const params = {
-        id: this.i.id
-      }
-      this.service.request(this.service.$api_getShipperCar, params).subscribe(res => {
-        this.detailData = res
-        this.detailData.isSelf = res.isSelf ? 1 : 0
-        this.detailData.isTrailer = res.isTrailer ? 1 : 0
-        this.detailData.carFrontPhotoWatermark = [
-          {
-            uid: -1,
-            name: 'LOGO',
-            status: 'done',
-            url: this.detailData.carFrontPhotoWatermark,
-            response:this.detailData.carFrontPhotoWatermark,
-          },
-        ];
-        this.detailData.carProtocalWatermark = [
-          {
-            uid: -1,
-            name: 'LOGO',
-            status: 'done',
-            url: this.detailData.carProtocalWatermark,
-            response: this.detailData.carProtocalWatermark,
-          },
-        ];
-        this.detailData.certificatePhotoFrontWatermark = [
-          {
-            uid: -1,
-            name: 'LOGO',
-            status: 'done',
-            url: this.detailData.certificatePhotoFrontWatermark,
-            response: this.detailData.certificatePhotoFrontWatermark,
-          },
-        ];
-        this.detailData.certificatePhotoBackWatermark = [
-          {
-            uid: -1,
-            name: 'LOGO',
-            status: 'done',
-            url: this.detailData.certificatePhotoBackWatermark,
-            response: this.detailData.certificatePhotoBackWatermark,
-          },
-        ];
-        if(this.detailData.roadTransportPhotoWatermark !== null) {
-          this.detailData.roadTransportPhotoWatermark = [
-            {
-              uid: -1,
-              name: 'LOGO',
-              status: 'done',
-              url: this.detailData.roadTransportPhotoWatermark,
-              response: this.detailData.roadTransportPhotoWatermark,
-            },
-          ];
-        }
-
-      })
-    }
-  }
-  initSF() {
-    this.schema = {
-      properties: {
-        carFrontPhotoWatermark: {
-          type: 'string',
-          title: '车头照照片',
-          ui: {
-            action: apiConf.fileUpload,
-            accept: 'image/png,image/jpeg,image/jpg,image/gif',
-            limit: 1,
-            limitFileCount: 1,
-            resReName: 'data.fullFileWatermarkPath',
-            urlReName: 'data.fullFileWatermarkPath',
-            widget: 'upload',
-            descriptionI18n: '请上传车头照照片，支持JPG、PNG格式，文件小于5M。',
-            data: {
-              appId: this.envSrv.env.appId,
-            },
-            name: 'multipartFile',
-            multiple: false,
-            listType: 'picture-card',
-            change: (args: any) => {
-              if (args.type === 'success') {
-                this.detailData.carFrontPhoto = args.file.response.data.fullFilePath
-              }
-            },
-            beforeUpload: (file: any, _fileList: any) => {
-              return new Observable((observer: Observer<boolean>) => {
-                const isLt2M = file.size / 1024 / 1024 < 5;
-                if (!isLt2M) {
-                  this.service.msgSrv.warning('图片大小超过5M!');
-                  observer.complete();
-                  return;
-                }
-                observer.next(isLt2M);
-                observer.complete();
-              });
-            },
-            previewFile: (file: NzUploadFile) => of(file.url),
-          },
-        },
-        carNo: {
-          title: '车牌号',
-          type: 'string',
-          maxLength: 9,
-          ui: {
-            placeholder: '请输入',
-          },
-        },
-        carNoColor: {
-          title: '车牌颜色',
-          type: 'string',
-          ui: {
-            widget: 'dict-select',
-            params: { dictKey: 'car:color' },
-            placeholder: '请选择车牌颜色',
-            containsAllLabel:false,
-          } as SFSelectWidgetSchema,
-        },
-        carModel: {
-          title: '车型',
-          type: 'string',
-          ui: {
-            widget: 'dict-select',
-            params: { dictKey: 'car:model' },
-            placeholder: '请选择车型',
-            containsAllLabel:false,
-          } as SFSelectWidgetSchema,
-        },
-        carLength: {
-          title: '车长',
-          type: 'string',
-          ui: {
-            widget: 'dict-select',
-            params: { dictKey: 'car:length' },
-            placeholder: '请选择车长',
-            containsAllLabel:false,
-          } as SFSelectWidgetSchema,
-        },
-        carLoad: {
-          title: '载重',
-          type: 'string',
-          ui: {
-            placeholder: '请输入',
-            change: (val: any) =>{
-              const value =  val.replace(/\D/g,'')
-              this.sf.setValue('/carLoad', value)
-            },
-          }
-        },
-        isSelf: {
-          title: '是否挂靠',
-          type: 'string',
-          enum: [
-            { label: '否', value: 0 },
-            { label: '是', value: 1 },
-          ],
-          ui: {
-            widget: 'select',
-            placeholder: '请选择',
-          }
-        },
-        isTrailer: {
-          title: '是否为挂车',
-          type: 'string',
-          enum: [
-            { label: '否', value: 0 },
-            { label: '是', value: 1 },
-          ],
-          ui: {
-            widget: 'select',
-            placeholder: '请选择',
-          }
-        },
-        carProtocalWatermark: {
-          type: 'string',
-          title: '挂靠协议',
-          ui: {
-            action: apiConf.fileUpload,
-            accept: 'image/png,image/jpeg,image/jpg,image/gif',
-            limit: 1,
-            limitFileCount: 1,
-            resReName: 'data.fullFileWatermarkPath',
-            urlReName: 'data.fullFileWatermarkPath',
-            widget: 'upload',
-            descriptionI18n: '请上传挂靠协议，支持JPG、PNG格式，文件小于5M。',
-            data: {
-              appId: this.envSrv.env.appId,
-            },
-            name: 'multipartFile',
-            multiple: false,
-            listType: 'picture-card',
-            change: (args: any) => {
-              if (args.type === 'success') {
-                this.detailData.certificatePhotoFront = args.file.response.data.fullFilePath
-              }
-            },
-            beforeUpload: (file: any, _fileList: any) => {
-              return new Observable((observer: Observer<boolean>) => {
-                const isLt2M = file.size / 1024 / 1024 < 5;
-                if (!isLt2M) {
-                  this.service.msgSrv.warning('图片大小超过5M!');
-                  observer.complete();
-                  return;
-                }
-                observer.next(isLt2M);
-                observer.complete();
-              });
-            },
-            previewFile: (file: NzUploadFile) => of(file.url),
-          },
-        },
-        titleA: {
-          title: '行驶证信息(必填）',
-          type: 'string',
-          ui: {
-            widget: 'textarea',
-            borderless:true,
-          },
-          default: '照片上传后会自动识别文字并填充下列内容栏',
-        },
-        tipsA: {
-          title: '',
-          type: 'string',
-          ui: {
-            widget: 'custom',
-            offsetControl: 6,
-          },
-        },
-        certificatePhotoFrontWatermark: {
-          type: 'string',
-          title: '行驶证首页照片',
-          ui: {
-            action: apiConf.fileUpload,
-            accept: 'image/png,image/jpeg,image/jpg,image/gif',
-            limit: 1,
-            limitFileCount: 1,
-            resReName: 'data.fullFileWatermarkPath',
-            urlReName: 'data.fullFileWatermarkPath',
-            widget: 'upload',
-            descriptionI18n: '请上传行驶证首页照片，支持JPG、PNG格式，文件小于5M。照片信息缺失、拼凑、过度PS、模糊不清，都不会通过审核。',
-            data: {
-              appId: this.envSrv.env.appId,
-            },
-            name: 'multipartFile',
-            multiple: false,
-            listType: 'picture-card',
-            change: (args: any) => {
-              if (args.type === 'success') {
-                this.detailData.certificatePhotoFront = args.file.response.data.fullFilePath
-                this.checkCarCard(args.file.response.data.fullFilePath, 'front');
-              }
-            },
-            beforeUpload: (file: any, _fileList: any) => {
-              return new Observable((observer: Observer<boolean>) => {
-                const isLt2M = file.size / 1024 / 1024 < 5;
-                if (!isLt2M) {
-                  this.service.msgSrv.warning('图片大小超过5M!');
-                  observer.complete();
-                  return;
-                }
-                observer.next(isLt2M);
-                observer.complete();
-              });
-            },
-          },
-        },
-        tipsB: {
-          title: '',
-          type: 'string',
-          ui: {
-            widget: 'custom',
-            offsetControl: 6,
-          },
-        },
-        certificatePhotoBackWatermark: {
-          type: 'string',
-          title: '行驶证副页照片',
-          ui: {
-            action: apiConf.fileUpload,
-            accept: 'image/png,image/jpeg,image/jpg,image/gif',
-            limit: 1,
-            limitFileCount: 1,
-            resReName: 'data.fullFileWatermarkPath',
-            urlReName: 'data.fullFileWatermarkPath',
-            widget: 'upload',
-            descriptionI18n: '请上传行驶证副业照片，支持JPG、PNG格式，文件小于5M。',
-            data: {
-              appId: this.envSrv.env.appId,
-            },
-            name: 'multipartFile',
-            multiple: false,
-            listType: 'picture-card',
-            change: (args: any) => {
-              if (args.type === 'success') {
-                this.detailData.certificatePhotoBack = args.file.response.data.fullFilePath
-                this.checkCarCard(args.file.response.data.fullFilePath, 'back');
-              }
-            },
-            beforeUpload: (file: any, _fileList: any) => {
-              return new Observable((observer: Observer<boolean>) => {
-                const isLt2M = file.size / 1024 / 1024 < 5;
-                if (!isLt2M) {
-                  this.service.msgSrv.warning('图片大小超过5M!');
-                  observer.complete();
-                  return;
-                }
-                observer.next(isLt2M);
-                observer.complete();
-              });
-            },
-            previewFile: (file: NzUploadFile) => of(file.url),
-          },
-        },
-        driverLicenseRegisterTime: {
-          title: '行驶证注册日期',
-          type: 'string',
-          format: 'date',
-          ui: {
-            placeholder: '请输入',
-          },
-        },
-        driverLicenseGetTime: {
-          title: '行驶证发证日期',
-          type: 'string',
-          format: 'date',
-          ui: {
-            placeholder: '请输入',
-          },
-        },
-        driverLicenseEndTime: {
-          title: '行驶证到期日期',
-          type: 'string',
-          format: 'date',
-          maxLength: 30,
-          ui: {
-            placeholder: '请输入',
-          },
-        },
-        driverLicenseSigningOrg: {
-          title: '行驶证签发机关',
-          type: 'string',
-          maxLength: 30,
-          ui: {
-            placeholder: '请输入',
-          },
-        },
-        carDistinguishCode: {
-          title: '车辆识别代码',
-          type: 'string',
-          maxLength: 30,
-          ui: {
-            placeholder: '请输入',
-          },
-        },
-        useNature: {
-          title: '使用性质',
-          type: 'string',
-          maxLength: 30,
-          enum: [
-            {label: '非营运', value: 0},
-            {label: '营运', value: 1},
-          ],
-          ui: {
-            widget: 'select',
-            placeholder: '请选择',
-          },
-        },
-        curbWeight: {
-          title: '整备质量',
-          type: 'string',
-          ui: {
-            placeholder: '请输入',
-          },
-        },
-        carOwner: {
-          title: '所有人',
-          type: 'string',
-          maxLength: 30,
-          ui: {
-            placeholder: '请输入',
-          },
-        },
-        titleB: {
-          title: '道运证(选填）',
-          type: 'string',
-          ui: {
-            widget: 'text',
-          },
-          default: '照片上传后会自动识别文字并填充下列内容栏',
-        },
-        roadTransportPhotoWatermark: {
-          type: 'string',
-          title: '道运证照片',
-          ui: {
-            action: apiConf.fileUpload,
-            accept: 'image/png,image/jpeg,image/jpg,image/gif',
-            limit: 1,
-            limitFileCount: 1,
-            resReName: 'data.fullFileWatermarkPath',
-            urlReName: 'data.fullFileWatermarkPath',
-            widget: 'upload',
-            descriptionI18n: '请上传道运证照片，支持JPG、PNG格式，文件小于5M。蓝牌绿牌车辆，可不用传道运证',
-            data: {
-              appId: this.envSrv.env.appId,
-            },
-            name: 'multipartFile',
-            multiple: false,
-            listType: 'picture-card',
-            change: (args: any) => {
-              if (args.type === 'success') {
-                this.detailData.roadTransportPhoto = args.file.response.data.fullFilePath
-                this.checkTransCard(args.file.response.data.fullFilePath);
-              } else {
-                this.detailData.roadTransportPhoto = ''
-              }
-            },
-            beforeUpload: (file: any, _fileList: any) => {
-              return new Observable((observer: Observer<boolean>) => {
-                const isLt2M = file.size / 1024 / 1024 < 5;
-                if (!isLt2M) {
-                  this.service.msgSrv.warning('图片大小超过5M!');
-                  observer.complete();
-                  return;
-                }
-                observer.next(isLt2M);
-                observer.complete();
-              });
-            },
-            previewFile: (file: NzUploadFile) => of(file.url),
-          },
-        },
-        roadTransportNo: {
-          title: '道运证号码',
-          type: 'string',
-          maxLength: 30,
-          ui: {
-            // widget: this.detailData.commitFlag !== 0 ? 'text' : '',
-            placeholder: '请输入',
-          },
-        },
-        roadTransportLicenceNo: {
-          title: '经营许可证号',
-          type: 'string',
-          maxLength: 30,
-          ui: {
-            // widget: this.detailData.commitFlag !== 0 ? 'text' : '',
-            placeholder: '请输入',
-          },
-        },
-        roadTransportStartTime: {
-          title: '发证日期',
-          type: 'string',
-          format: 'date',
-          ui: {
-            placeholder: '请输入',
-          },
-        },
-        roadTransportEndTime: {
-          title: '有效期至',
-          type: 'string',
-          format: 'date',
-          ui: {
-            placeholder: '请输入',
-          },
-        },
-        remarks: {
-          title: '备注',
-          type: 'string',
-          ui: {
-            placeholder: '请输入',
-          },
-        },
-      },
-      required: [
-        'carFrontPhotoWatermark',
-        'carNo',
-        'carNoColor',
-        'carModel',
-        'carLength',
-        'carLoad',
-        'isSelf',
-        'isTrailer',
-        'certificatePhotoFrontWatermark',
-        'certificatePhotoBackWatermark',
-        'driverLicenseRegisterTime',
-        'driverLicenseGetTime',
-        'driverLicenseEndTime',
-        'driverLicenseSigningOrg',
-        'carDistinguishCode',
-        'useNature',
-        'carOwner'
-      ],
-    };
-
-    this.ui = {
-  '*': {
-    spanLabelFixed: 180,
-    grid: { span: 18 },
-    width: 600,
-  },
-  $title1: {
-    spanLabelFixed: 0,
-  },
-  $title2: {
-    spanLabelFixed: 0,
-  },
-  $title3: {
-    spanLabelFixed: 0,
-  },
-  $enterpriseRegistrationTime: {
-    width: 680,
-  },
-  $operatingEndTime: {
-    grid: { span: 9 },
-  },
-  $dateType: {
-    grid: { span: 4 },
-  },
-  $validEndTime: {
-    grid: { span: 9 },
-  },
-  $dateType01: {
-    grid: { span: 4 },
-  },
-  $registrationCapital: {
-    grid: { span: 12 },
-  },
-  $unit: {
-    spanLabelFixed: 20,
-    grid: { span: 3 },
-  },
-};
-  }
-// 道路运输证识别
-checkTransCard(imgurl: any) {
-  const params = {
-    transportationLicenseUrl: imgurl,
-  };
-  this.service.request(this.service.$api_recognizeTransportationLicense, params).subscribe((res) => {
-    if (res) {
-      this.sf.setValue('/roadTransportNo', res.number);
-      this.sf.setValue('/roadTransportLicenceNo', res.businessCertificate);
-      this.sf.setValue('/roadTransportStartTime', res.issueDate);
-      if(this.carNo === '') {
-        this.carNo = res.number
-      } else if(this.carNo && res.vehicleNumber.indexOf(this.carNo) === -1) {
-        this.service.msgSrv.warning('请上传同一认证车辆的相关证件')
-      }
-    }
-  });
-}
-// 行驶证识别
-checkCarCard(imgurl: any, side: any) {
-  const params = {
-    vehicleLicenseUrl: imgurl,
-    side,
-  };
-  this.service.request(this.service.$api_recognizeVehicleLicense, params).subscribe((res) => {
-    if (res) {
-      if (side === 'front') { // 正面
-        this.sf.setValue('/driverLicenseRegisterTime', res.registerDate);
-        this.sf.setValue('/carNo', res.number);
-        this.sf.setValue('/driverLicenseGetTime', res.issueDate);
-        this.sf.setValue('/driverLicenseSigningOrg', res.issuingAuthority);
-        this.sf.setValue('/carDistinguishCode', res.vin);
-        this.sf.setValue('/carOwner', res.name);
-        this.sf.setValue('/useNature', res.useCharacter === '非营运' ? 0 : 1 );
-      } else {
-        this.sf.setValue('/curbWeight', res.unladenMass);
-        this.sf.setValue('/remarks', res.remarks);
-      }
-      if(this.carNo === '') {
-        this.carNo = res.number
-      } else if(this.carNo && this.carNo !== res.number) {
-        this.service.msgSrv.warning('请上传同一认证车辆的相关证件')
-      }
-    }
-  });
-}
-
-close(): void {
-  this.modal.close(true)
-}
-showExample() {
-  this.showCardFlag = !this.showCardFlag
-}
-showJopExample() {
-  this.showJopFlag = !this.showJopFlag
-}
-submitForm(){
-  const params:any = {
-    appUserId: this.i.appUserId,
-    ...this.sf.value,
-    bindType: this.i.bindType
-  };
-  params.carFrontPhoto = this.detailData.carFrontPhoto
-  params.carProtocal = this.detailData.carProtocal
-  params.certificatePhotoFront = this.detailData.certificatePhotoFront
-  params.certificatePhotoBack = this.detailData.certificatePhotoBack
-  params.roadTransportPhoto = this.detailData.roadTransportPhoto
-  delete params.titleA
-  delete params.titleB
-  this.checked = true
-  this.service.request(this.service.$api_updateAssistCertification, params).subscribe(res => {
-    this.checked = false
-    if(res){
-      this.service.msgSrv.success('添加成功')
-      this.modal.close(true)
-    }
-  })
-}
-}
diff --git a/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.html b/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.html
new file mode 100644
index 00000000..8953e1f8
--- /dev/null
+++ b/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.html
@@ -0,0 +1,9 @@
+<sf #sf [schema]="schema" [ui]="ui" [button]="'none'" [formData]="detailData"></sf>
+<div class="info">
+  1.如果修改前后的合伙人不是在同一个渠道销售下，修改后客户的渠道销售会随着修改后的合伙人绑定到新的渠道销售下，系统也会同步发起CRM《客户转移》流程；<br>
+2.结算起算日：指给合伙人结算佣金的起算时间，如果是修改合伙人，该日期是当前合伙人的结算起算日，同时也是上一个合伙人的结算结束时间。
+</div>
+<div class="modal-footer">
+  <button nz-button type="button" (click)="close()">关闭</button>
+  <button nz-button type="button" nzType="primary" (click)="save()" [disabled]="!sf?.valid">确定</button>
+</div>
\ No newline at end of file
diff --git a/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.less b/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.less
new file mode 100644
index 00000000..b9186e57
--- /dev/null
+++ b/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.less
@@ -0,0 +1,7 @@
+.info{
+  width: 80%;
+  margin:0 auto;
+  color: #333;
+  font-size: 12px;
+  line-height: 24px;;
+}
\ No newline at end of file
diff --git a/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.spec.ts b/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.spec.ts
new file mode 100644
index 00000000..a77b2be7
--- /dev/null
+++ b/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.spec.ts
@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { EditPartnerComponentsAddComponent } from './editPartner.component';
+
+describe('EditPartnerComponentsAddComponent', () => {
+  let component: EditPartnerComponentsAddComponent;
+  let fixture: ComponentFixture<EditPartnerComponentsAddComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ EditPartnerComponentsAddComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(EditPartnerComponentsAddComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts b/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts
new file mode 100644
index 00000000..a55f960b
--- /dev/null
+++ b/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts
@@ -0,0 +1,122 @@
+import { ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { SFComponent, SFRadioWidgetSchema, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
+import { _HttpClient } from '@delon/theme';
+import { EAEnvironmentService } from '@shared';
+import differenceInCalendarDays from 'date-fns/differenceInCalendarDays';
+import format from 'date-fns/format';
+import { NzMessageService } from 'ng-zorro-antd/message';
+import { NzUploadFile } from 'ng-zorro-antd/upload';
+import { Observable, Observer, of } from 'rxjs';
+import { apiConf } from '@conf/api.conf';
+import { UsermanageService } from 'src/app/routes/usercenter/services/usercenter.service';
+import { NzModalRef } from 'ng-zorro-antd/modal';
+
+@Component({
+  selector: 'app-ad-components-partner',
+  templateUrl: './editPartner.component.html',
+  styleUrls: ['./editPartner.component.less']
+})
+export class EditPartnerComponentsAddComponent implements OnInit {
+  @ViewChild('sf', { static: false }) sf!: SFComponent;
+  record: any = {};
+  i: any;
+  schema: SFSchema = {};
+  detailData: any = {}
+  ui: SFUISchema = {};
+ 
+  constructor(
+    public msgSrv: NzMessageService,
+    public http: _HttpClient,
+    private route: ActivatedRoute,
+    private router: Router,
+    public service: UsermanageService,
+    private envSrv: EAEnvironmentService,
+    private modal: NzModalRef,
+  ) { }
+
+
+  ngOnInit(): void {
+    this.initDetailData()
+    this.initSF();
+  }
+  initDetailData() {
+    const params = {
+      id: this.i.id
+    }
+    this.service.request(this.service.$api_partnerChannelUpdateDetaiList, params).subscribe(res => {
+      if(res) {
+        this.detailData = res
+      } else {
+        this.service.msgSrv.error(res.msg)
+      }
+    })
+  }
+  initSF() {
+    this.schema = {
+      properties: {
+        channelId: {
+          type: 'string',
+          title: '合伙人修改为',
+          ui: {
+            widget: 'radio',
+            showRequired: true,
+          } as SFRadioWidgetSchema,
+          enum: [
+            { label: '全部可见', value: 1 },
+            { label: '合伙人可见', value: 2 },
+            { label: '销售渠道可见', value: 3 },
+          ],
+        },
+        remark: {
+          type: 'string',
+          title: '备注',
+          ui: {
+            widget: 'textarea',
+            placeholder: '请不要超过50个字',
+            maxLength: 50,
+            autosize: { minRows: 2, maxRows: 6 },
+          },
+        },
+        effectiveNode: {
+          type: 'string',
+          title: '生效节点',
+          ui: {
+            widget: 'radio',
+            showRequired: true,
+          } as SFRadioWidgetSchema,
+          enum: [
+            { label: '修改成功后立即生效', value: 1 },
+            { label: 'CRM流程审核通过后生效', value: 2 }
+          ],
+        },
+      },
+      required: ['channelId', 'remark', 'effectiveNode'],
+    };
+    this.ui = {
+      '*': {
+        spanLabelFixed: 180,
+        grid: { span: 18 },
+        width: 600,
+      }
+    };
+  }
+  get reqParams() {
+    return {};
+  }
+  close(): void {
+    this.modal.close(true)
+  }
+  save() {
+    const params = {
+      ...this.sf.value
+    }
+    this.service.request(this.service.$api_batchUpdateEnterpricePartner, params).subscribe(res => {
+      if(res) {
+        this.service.msgSrv.success('修改成功')
+      } else {
+        this.service.msgSrv.error(res.msg)
+      }
+    })
+  }
+}
diff --git a/src/app/routes/usercenter/components/freight/list/editSale/editSale.component.html b/src/app/routes/usercenter/components/freight/list/editSale/editSale.component.html
new file mode 100644
index 00000000..5e45b66a
--- /dev/null
+++ b/src/app/routes/usercenter/components/freight/list/editSale/editSale.component.html
@@ -0,0 +1,8 @@
+<sf #sf [schema]="schema" [ui]="ui" [button]="'none'" [formData]="detailData"></sf>
+<div class="info">
+  修改渠道销售：客户修改渠道销售后，会跟原合伙人解绑，成为新渠道销售的直客。同时系统会同步发起CRM《客户转移》流程。
+</div>
+<div class="modal-footer">
+  <button nz-button type="button" (click)="close()">关闭</button>
+  <button nz-button type="button" nzType="primary" (click)="save()" [disabled]="!sf?.valid">确定</button>
+</div>
\ No newline at end of file
diff --git a/src/app/routes/usercenter/components/freight/list/editSale/editSale.component.less b/src/app/routes/usercenter/components/freight/list/editSale/editSale.component.less
new file mode 100644
index 00000000..0a08567b
--- /dev/null
+++ b/src/app/routes/usercenter/components/freight/list/editSale/editSale.component.less
@@ -0,0 +1,7 @@
+  .info{
+    width: 80%;
+    margin:0 auto;
+    color: #333;
+    font-size: 12px;
+    line-height: 24px;;
+  }
\ No newline at end of file
diff --git a/src/app/routes/usercenter/components/freight/list/editSale/editSale.component.spec.ts b/src/app/routes/usercenter/components/freight/list/editSale/editSale.component.spec.ts
new file mode 100644
index 00000000..1661b321
--- /dev/null
+++ b/src/app/routes/usercenter/components/freight/list/editSale/editSale.component.spec.ts
@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { EditSaleComponentsAddComponent } from './editSale.component';
+
+describe('EditSaleComponentsAddComponent', () => {
+  let component: EditSaleComponentsAddComponent;
+  let fixture: ComponentFixture<EditSaleComponentsAddComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ EditSaleComponentsAddComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(EditSaleComponentsAddComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/routes/usercenter/components/freight/list/editSale/editSale.component.ts b/src/app/routes/usercenter/components/freight/list/editSale/editSale.component.ts
new file mode 100644
index 00000000..d1bab1b8
--- /dev/null
+++ b/src/app/routes/usercenter/components/freight/list/editSale/editSale.component.ts
@@ -0,0 +1,130 @@
+import { ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { SFComponent, SFRadioWidgetSchema, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
+import { _HttpClient } from '@delon/theme';
+import { EAEnvironmentService } from '@shared';
+import differenceInCalendarDays from 'date-fns/differenceInCalendarDays';
+import format from 'date-fns/format';
+import { NzMessageService } from 'ng-zorro-antd/message';
+import { NzUploadFile } from 'ng-zorro-antd/upload';
+import { Observable, Observer, of } from 'rxjs';
+import { apiConf } from '@conf/api.conf';
+import { UsermanageService } from 'src/app/routes/usercenter/services/usercenter.service';
+import { NzModalRef } from 'ng-zorro-antd/modal';
+
+@Component({
+  selector: 'app-ad-components-Sale',
+  templateUrl: './editSale.component.html',
+  styleUrls: ['./editSale.component.less']
+})
+export class EditSaleComponentsAddComponent implements OnInit {
+  @ViewChild('sf', { static: false }) sf!: SFComponent;
+  record: any = {};
+  i: any;
+  schema: SFSchema = {};
+  detailData: any = {}
+  ui: SFUISchema = {};
+
+  constructor(
+    public msgSrv: NzMessageService,
+    public http: _HttpClient,
+    private route: ActivatedRoute,
+    private router: Router,
+    public service: UsermanageService,
+    private envSrv: EAEnvironmentService,
+    private modal: NzModalRef,
+    
+  ) { }
+
+
+  ngOnInit(): void {
+    this.initDetailData()
+    this.initSF();
+  }
+  initDetailData() {
+    const params = {
+      id: this.i.id
+    }
+    this.service.request(this.service.$api_partnerChannelUpdateDetaiList, params).subscribe(res => {
+      if(res) {
+        this.detailData = res
+      } else {
+        this.service.msgSrv.error(res.msg)
+      }
+    })
+  }
+  initSF() {
+    this.schema = {
+      properties: {
+        channelId: {
+          type: 'string',
+          title: '渠道销售修改为',
+          ui: {
+            widget: 'radio',
+            showRequired: true,
+          } as SFRadioWidgetSchema,
+          enum: [
+            { label: '全部可见', value: 1 },
+            { label: '合伙人可见', value: 2 },
+            { label: '销售渠道可见', value: 3 },
+          ],
+        },
+        remark: {
+          type: 'string',
+          title: '备注',
+          ui: {
+            widget: 'textarea',
+            placeholder: '请不要超过50个字',
+            maxLength: 50,
+            autosize: { minRows: 2, maxRows: 6 },
+          },
+        },
+        effectiveNode: {
+          type: 'string',
+          title: '生效节点',
+          ui: {
+            widget: 'radio',
+            showRequired: true,
+          } as SFRadioWidgetSchema,
+          enum: [
+            { label: '修改成功后立即生效', value: 1 },
+            { label: 'CRM流程审核通过后生效', value: 2 }
+          ],
+        },
+      },
+      required: ['channelId', 'remark', 'effectiveNode'],
+    };
+    this.ui = {
+      '*': {
+        spanLabelFixed: 180,
+        grid: { span: 18 },
+        width: 600,
+      }
+    };
+  }
+  get reqParams() {
+    return {};
+  }
+  save() {
+    this.service.nzModalService.create({
+      nzTitle: '确定提交吗？',
+      nzClosable: false,
+      nzOnOk: () => {
+        const params = {
+          ...this.sf.value
+        }
+        this.service.request(this.service.$api_batchUpdateEnterpriceChannel, params).subscribe(res => {
+          if(res) {
+            this.service.msgSrv.success('修改成功')
+          } else {
+            this.service.msgSrv.error(res.msg)
+          }
+        })
+      }
+    });
+  }
+
+  close(): void {
+    this.modal.close(true)
+  }
+}
diff --git a/src/app/routes/usercenter/components/freight/list/list.component.less b/src/app/routes/usercenter/components/freight/list/list.component.less
index e69de29b..07d74cbd 100644
--- a/src/app/routes/usercenter/components/freight/list/list.component.less
+++ b/src/app/routes/usercenter/components/freight/list/list.component.less
@@ -0,0 +1,19 @@
+:host{
+    ::ng-deep{
+        .btnBox {
+            st-td{
+                // display: flex;
+                // align-items: center;
+                st-td>span{
+                    display: inline-block;
+                    width: 95px;
+                    text-align: center;
+                    margin: 0 10px;
+                }
+            }
+            .st__btn-text span{
+                white-space: nowrap;
+            }
+        }
+    }
+}
diff --git a/src/app/routes/usercenter/components/freight/list/list.component.ts b/src/app/routes/usercenter/components/freight/list/list.component.ts
index 6f390a8c..e3834162 100644
--- a/src/app/routes/usercenter/components/freight/list/list.component.ts
+++ b/src/app/routes/usercenter/components/freight/list/list.component.ts
@@ -6,6 +6,9 @@ import { DynamicSettingModalComponent, ShipperBaseService } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { AccountDetailComponent } from 'src/app/shared/components/account-detail/account-detail.component';
 import { UsermanageService } from '../../../services/usercenter.service';
+import { EditPartnerComponentsAddComponent } from './editPartner/editPartner.component';
+import { EditSaleComponentsAddComponent } from './editSale/editSale.component';
+import { ShowServiceComponent } from './showService/showservice.component';
 @Component({
   selector: 'app-Freight-components-list',
   templateUrl: './list.component.html',
@@ -93,7 +96,7 @@ export class FreightComponentsListComponent implements OnInit {
   showService(record: any) {
     const modalRef = this.modal.create({
       nzTitle: '分配客服人员',
-      //nzContent: PartnerEditComponent,
+      nzContent: ShowServiceComponent,
       nzWidth: 600,
       nzComponentParams: {
         i: record
@@ -109,8 +112,8 @@ export class FreightComponentsListComponent implements OnInit {
   editPartner(record: any) {
     const modalRef = this.modal.create({
       nzTitle: '修改合伙人',
-      //nzContent: PartnerEditComponent,
-      nzWidth: 600,
+      nzContent: EditPartnerComponentsAddComponent,
+      nzWidth: 800,
       nzComponentParams: {
         i: record
       },
@@ -125,8 +128,8 @@ export class FreightComponentsListComponent implements OnInit {
   editSale(record: any) {
     const modalRef = this.modal.create({
       nzTitle: '修改渠道销售',
-      //nzContent: PartnerEditComponent,
-      nzWidth: 600,
+      nzContent: EditSaleComponentsAddComponent,
+      nzWidth: 800,
       nzComponentParams: {
         i: record
       },
@@ -193,7 +196,7 @@ export class FreightComponentsListComponent implements OnInit {
             }
           }
         },
-        lockedStatus7: {
+        oftenUsedServices: {
           type: 'string',
           title: '常用服务',
           enum: [
@@ -209,13 +212,13 @@ export class FreightComponentsListComponent implements OnInit {
             }
           }
         },
-        lockedStatus6: {
+        customerType: {
           type: 'string',
           title: '客户类型',
           enum: [
             { label: '全部', value: '' },
-            { label: '直客', value: 0 },
-            { label: '渠道客户', value: 1 }
+            { label: '直客', value: 1 },
+            { label: '渠道客户', value: 20 }
           ],
           default: '',
           ui: {
@@ -230,15 +233,21 @@ export class FreightComponentsListComponent implements OnInit {
           type: 'string',
           ui: {
             placeholder: '请输入',
-            showRequired: false
+            showRequired: false,
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
           }
         },
-        contactName4: {
+        partnerName: {
           title: '合伙人',
           type: 'string',
           ui: {
             placeholder: '请输入',
-            showRequired: false
+            showRequired: false,
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
           }
         },
         contactName3: {
@@ -246,7 +255,10 @@ export class FreightComponentsListComponent implements OnInit {
           type: 'string',
           ui: {
             placeholder: '请输入',
-            showRequired: false
+            showRequired: false,
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
           }
         },
         contactName2: {
@@ -254,7 +266,10 @@ export class FreightComponentsListComponent implements OnInit {
           type: 'string',
           ui: {
             placeholder: '请输入',
-            showRequired: false
+            showRequired: false,
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
           }
         },
         applyDate: {
@@ -265,8 +280,8 @@ export class FreightComponentsListComponent implements OnInit {
             type: 'date',
             format: 'yyyy-MM-dd',
             visibleIf: {
-              _$expand: (value: boolean) => value,
-            },
+              expand: (value: boolean) => value
+            }
           } as SFDateWidgetSchema,
         },
         applyDate1: {
@@ -276,31 +291,10 @@ export class FreightComponentsListComponent implements OnInit {
             widget: 'sl-from-to',
             type: 'date',
             format: 'yyyy-MM-dd',
-            visibleIf: {
-              _$expand: (value: boolean) => value,
-            },
-          } as SFDateWidgetSchema,
-        },
-        networkTransporter: {
-          type: 'string',
-          title: '网络货运人',
-          ui: {
-            widget: 'select',
-            placeholder: '请选择',
-            allowClear: true,
-            asyncData: () => this.shipperservice.getNetworkFreightForwarder()
-          }
-        },
-        promotersTelephone: {
-          title: '业务员',
-          type: 'string',
-          ui: {
-            placeholder: '请输入',
-            showRequired: false,
             visibleIf: {
               expand: (value: boolean) => value
             }
-          }
+          } as SFDateWidgetSchema,
         },
         lockedStatus3: {
           type: 'string',
@@ -318,14 +312,37 @@ export class FreightComponentsListComponent implements OnInit {
             }
           }
         },
+        networkTransporter: {
+          type: 'string',
+          title: '网络货运人',
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            allowClear: true,
+            asyncData: () => this.shipperservice.getNetworkFreightForwarder(),
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        promotersTelephone: {
+          title: '业务员',
+          type: 'string',
+          ui: {
+            placeholder: '请输入',
+            showRequired: false,
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
         source: {
           type: 'string',
           title: '注册渠道',
           enum: [
             { label: '全部', value: '' },
-            { label: '用户注册', value: 1 },
-            { label: '货主添加', value: 2 },
-            { label: '运营添加', value: 3 }
+            { label: '货主注册', value: 1 },
+            { label: '平台添加', value: 2 }
           ],
           default: '',
           ui: {
@@ -393,8 +410,8 @@ export class FreightComponentsListComponent implements OnInit {
       },
       {
         title: '操作',
-        width: '110px',
-        className: 'text-center',
+        width: '250px',
+        className: 'text-center btnBox',
         buttons: [
           {
             text: '查看',
@@ -415,17 +432,14 @@ export class FreightComponentsListComponent implements OnInit {
             click: item => this.showAccountDetail(item)
           },
           {
-            acl: { ability: ['USERCENTER-FREIGHT-LIST-balance'] },
             text: '分配客服人员',
             click: item => this.showService(item)
           },
           {
-            acl: { ability: ['USERCENTER-FREIGHT-LIST-balance'] },
             text: '修改合伙人',
             click: item => this.editPartner(item)
           },
           {
-            acl: { ability: ['USERCENTER-FREIGHT-LIST-balance'] },
             text: '修改渠道销售',
             click: item => this.editSale(item)
           }
diff --git a/src/app/routes/usercenter/components/freight/list/showService/showService.component.html b/src/app/routes/usercenter/components/freight/list/showService/showService.component.html
new file mode 100644
index 00000000..83ae084c
--- /dev/null
+++ b/src/app/routes/usercenter/components/freight/list/showService/showService.component.html
@@ -0,0 +1,16 @@
+
+<!-- <nz-spin *ngIf="!i" class="modal-spin"></nz-spin> -->
+<div class="serviceBox">
+    <div class="left">客服人员</div>
+    <div class="right">
+        <nz-select ngModel="lucy" style="width: 250px;">
+            <nz-option nzValue="jack" nzLabel="Jack"></nz-option>
+            <nz-option nzValue="lucy" nzLabel="Lucy"></nz-option>
+            <nz-option nzValue="disabled" nzLabel="Disabled" nzDisabled></nz-option>
+          </nz-select>
+    </div>
+</div>
+<div class="modal-footer">
+    <button nz-button type="button" (click)="close()">关闭</button>
+    <button nz-button type="button" nzType="primary" (click)="submitForm()" [disabled]="!sf?.valid">确定</button>
+</div>
\ No newline at end of file
diff --git a/src/app/routes/usercenter/components/freight/list/carauth/carauth.component.less b/src/app/routes/usercenter/components/freight/list/showService/showService.component.less
similarity index 95%
rename from src/app/routes/usercenter/components/freight/list/carauth/carauth.component.less
rename to src/app/routes/usercenter/components/freight/list/showService/showService.component.less
index e3f1fc3f..6b46d577 100644
--- a/src/app/routes/usercenter/components/freight/list/carauth/carauth.component.less
+++ b/src/app/routes/usercenter/components/freight/list/showService/showService.component.less
@@ -120,4 +120,10 @@
         resize:none;
       }
     }
-  }
\ No newline at end of file
+  }
+.serviceBox{
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    width: 350px;
+}
\ No newline at end of file
diff --git a/src/app/routes/usercenter/components/freight/list/carauth/carauth.component.spec.ts b/src/app/routes/usercenter/components/freight/list/showService/showservice.component.spec.ts
similarity index 100%
rename from src/app/routes/usercenter/components/freight/list/carauth/carauth.component.spec.ts
rename to src/app/routes/usercenter/components/freight/list/showService/showservice.component.spec.ts
diff --git a/src/app/routes/usercenter/components/freight/list/showService/showservice.component.ts b/src/app/routes/usercenter/components/freight/list/showService/showservice.component.ts
new file mode 100644
index 00000000..f3e0ad5c
--- /dev/null
+++ b/src/app/routes/usercenter/components/freight/list/showService/showservice.component.ts
@@ -0,0 +1,61 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { apiConf } from '@conf/api.conf';
+import { cacheConf } from '@conf/cache.conf';
+import { SFUISchema, SFSchema, SFUploadWidgetSchema, SFComponent, SFSelectWidgetSchema } from '@delon/form';
+import { _HttpClient } from '@delon/theme';
+import { EACacheService, EAEnvironmentService } from '@shared';
+import { NzModalRef } from 'ng-zorro-antd/modal';
+import { NzUploadFile } from 'ng-zorro-antd/upload';
+import { Observable, Observer, of } from 'rxjs';
+import { UsermanageService } from 'src/app/routes/usercenter/services/usercenter.service';
+
+@Component({
+  selector: 'app-car-showService',
+  templateUrl: './showService.component.html',
+  styleUrls: ['./showService.component.less']
+})
+export class ShowServiceComponent implements OnInit {
+  @ViewChild('sf', { static: false }) sf!: SFComponent;
+  record: any = {};
+  i: any;
+
+
+  constructor(
+    private modal: NzModalRef,
+    public service: UsermanageService,
+    private envSrv: EAEnvironmentService,
+    private eaCacheSrv: EACacheService,
+  ) { }
+
+  ngOnInit(): void {
+
+  }
+
+
+close(): void {
+  this.modal.close(true)
+}
+
+submitForm(){
+  // const params:any = {
+  //   appUserId: this.i.appUserId,
+  //   ...this.sf.value,
+  //   bindType: this.i.bindType
+  // };
+  // params.carFrontPhoto = this.detailData.carFrontPhoto
+  // params.carProtocal = this.detailData.carProtocal
+  // params.certificatePhotoFront = this.detailData.certificatePhotoFront
+  // params.certificatePhotoBack = this.detailData.certificatePhotoBack
+  // params.roadTransportPhoto = this.detailData.roadTransportPhoto
+  // delete params.titleA
+  // delete params.titleB
+  // this.checked = true
+  // this.service.request(this.service.$api_updateAssistCertification, params).subscribe(res => {
+  //   this.checked = false
+  //   if(res){
+  //     this.service.msgSrv.success('添加成功')
+  //     this.modal.close(true)
+  //   }
+  // })
+}
+}
diff --git a/src/app/routes/usercenter/services/usercenter.service.ts b/src/app/routes/usercenter/services/usercenter.service.ts
index c42a9b3d..0357304d 100644
--- a/src/app/routes/usercenter/services/usercenter.service.ts
+++ b/src/app/routes/usercenter/services/usercenter.service.ts
@@ -136,7 +136,14 @@ export class UsermanageService extends ShipperBaseService {
   // 查询司机配置列表
   $api_configPage = '/api/mdc/cuc/driver/list/configPage';
 
-  constructor(public injector: Injector, private nzModalService: NzModalService, public eaCacheSrv: EACacheService) {
+  // 批量修改企业渠道
+  $api_batchUpdateEnterpriceChannel = '/api/mdc/enterpriceRelLog/batchUpdateEnterpriceChannel';
+  // 批量修改企业合伙人
+  $api_batchUpdateEnterpricePartner = '/api/mdc/enterpriceRelLog/batchUpdateEnterpricePartner';
+  // 渠道销售修改详情
+  $api_partnerChannelUpdateDetaiList = '/api/mdc/enterpriceRelLog/partnerChannelUpdateDetaiList';
+
+  constructor(public injector: Injector, public nzModalService: NzModalService, public eaCacheSrv: EACacheService) {
     super(injector, eaCacheSrv);
   }
 
diff --git a/src/app/routes/usercenter/usercenter-routing.module.ts b/src/app/routes/usercenter/usercenter-routing.module.ts
index 3f11ed47..56c05024 100644
--- a/src/app/routes/usercenter/usercenter-routing.module.ts
+++ b/src/app/routes/usercenter/usercenter-routing.module.ts
@@ -25,7 +25,8 @@ import { FreightComponentsUserDetailComponent } from './components/freight/user/
 import { FreightComponentsUserComponent } from './components/freight/user/user.component';
 
 const routes: Routes = [
-  { path: 'freight/list', component: FreightComponentsListComponent, data: { guard: { ability: ['USERCENTER-FREIGHT-LIST-list'] } } },
+  { path: 'freight/list', component: FreightComponentsListComponent, },
+  //  data: { guard: { ability: ['USERCENTER-FREIGHT-LIST-list'] } }
   { path: 'freight/list/view/:id', component: FreightComponentsListViewComponent },
   { path: 'freight/list/new', component: FreightComponentsListNewComponent, data: { guard: { ability: ['USERCENTER-FREIGHT-NEW-save'] } } },
   {
diff --git a/src/app/routes/usercenter/usercenter.module.ts b/src/app/routes/usercenter/usercenter.module.ts
index 3a0ea35c..a4750d77 100644
--- a/src/app/routes/usercenter/usercenter.module.ts
+++ b/src/app/routes/usercenter/usercenter.module.ts
@@ -26,6 +26,9 @@ import { CarSettleAddDriverComponent } from './components/driver/add-driver/add-
 import { CtcCaptatinAddComponent } from './components/driver/captain/add/add.component';
 import { FreightConfigComponent } from './components/freight/freight-config/freight-config.component';
 import { UserCenterComponentsDriverConfigComponent } from './components/driver/driver-config/driver-config.component';
+import { ShowServiceComponent } from './components/freight/list/showService/showservice.component';
+import { EditPartnerComponentsAddComponent } from './components/freight/list/editPartner/editPartner.component';
+import { EditSaleComponentsAddComponent } from './components/freight/list/editSale/editSale.component';
 
 const COMPONENTS = [
   FreightComponentsListComponent,
@@ -46,9 +49,10 @@ const COMPONENTS = [
   FreightConfigComponent,
   UserCenterComponentsDriverConfigComponent
 ];
+const COMPONENTS_NOROUNT = [ShowServiceComponent, EditPartnerComponentsAddComponent, EditSaleComponentsAddComponent];
 
 @NgModule({
   imports: [SharedModule, UsercenterRoutingModule, DynamicSettingModule],
-  declarations: [...COMPONENTS]
+  declarations: [...COMPONENTS, ...COMPONENTS_NOROUNT]
 })
 export class UsercenterModule {}
diff --git a/src/styles/theme.less b/src/styles/theme.less
index c5ab157a..e15b55fe 100644
--- a/src/styles/theme.less
+++ b/src/styles/theme.less
@@ -13,4 +13,7 @@
     color: #ff4d4f;
 }
 
-@primary-color: #F5222D;
\ No newline at end of file
+@primary-color: #F5222D;
+.page-header__title{
+    display: none;
+}
\ No newline at end of file

From ecbaeed77e790166f799be3c9b8e6cbc6eb1f30d Mon Sep 17 00:00:00 2001
From: Lingzi <yinyan.quan@eascs.com>
Date: Wed, 23 Mar 2022 13:41:32 +0800
Subject: [PATCH 69/70] fix bug

---
 src/app/routes/usercenter/services/usercenter.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/routes/usercenter/services/usercenter.service.ts b/src/app/routes/usercenter/services/usercenter.service.ts
index 8af58a55..b906ef73 100644
--- a/src/app/routes/usercenter/services/usercenter.service.ts
+++ b/src/app/routes/usercenter/services/usercenter.service.ts
@@ -141,7 +141,7 @@ export class UsermanageService extends ShipperBaseService {
   $api_batchUpdateEnterpricePartner = '/api/mdc/enterpriceRelLog/batchUpdateEnterpricePartner';
   // 渠道销售修改详情
   $api_partnerChannelUpdateDetaiList = '/api/mdc/enterpriceRelLog/partnerChannelUpdateDetaiList';
-  constructor(public injector: Injector, private nzModalService: NzModalService) {
+  constructor(public injector: Injector, public nzModalService: NzModalService) {
     super(injector);
   }
 

From e01abcd905f14521651052768568ed0eb9f5bdcc Mon Sep 17 00:00:00 2001
From: heqinghang <qinghang.he@eascs.com>
Date: Wed, 23 Mar 2022 13:48:39 +0800
Subject: [PATCH 70/70] 666

---
 .../partner/level-config/components/list/list.component.ts  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/routes/partner/level-config/components/list/list.component.ts b/src/app/routes/partner/level-config/components/list/list.component.ts
index 59d8f88f..e079f0e7 100644
--- a/src/app/routes/partner/level-config/components/list/list.component.ts
+++ b/src/app/routes/partner/level-config/components/list/list.component.ts
@@ -153,7 +153,7 @@ export class ParterLevelConfigListComponent implements OnInit {
 
   restart(item: any) {
     this.modalService.confirm({
-      nzTitle: '<i>冻结确认</i>',
+      nzTitle: '<i>启用确认</i>',
       nzContent: `<b>确定启用该账号吗？</br>`,
       nzOnOk: () =>
         this.service.request(this.service.$api_updatePartnerGradeConfig, {id:item.id}).subscribe(res => {
@@ -166,12 +166,12 @@ export class ParterLevelConfigListComponent implements OnInit {
   }
   stop(item: any) {
     this.modalService.confirm({
-      nzTitle: '<i>冻结确认</i>',
+      nzTitle: '<i>禁用确认</i>',
       nzContent: `<b>确定禁用该账号吗？</br>`,
       nzOnOk: () =>
         this.service.request(this.service.$api_updatePartnerGradeConfig, {id:item.id}).subscribe(res => {
           if (res) {
-            this.service.msgSrv.success('冻结成功！');
+            this.service.msgSrv.success('禁用成功！');
             this.st.reload();
           }
         })