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

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",

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>

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 = {
+  headerTotalInfo: any = {
-    balance: 0,
+    allAmount: 0,
-    income: 1500,
+    incomeAmount: 0,
-    spending: 2400,
+    payAmount: 0,
-    total: 186
+    name: '',
+    ltdName: '',
+    phone: ''
   };
-  accountInfo = {
+  footerTotalInfo: any = {
-    name: '张三',
+    incomeAmount: 0,
-    phone: '13812345678',
+    payAmount: 0,
-    company: '天津怡亚通物流科技有限公司（平安）'
+    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: '交易时间', index: 'createTime', className: 'text-center', width: 200 },
-      { title: '流水号', render: 'carModelLabel', className: 'text-center', width: 150 },
+      { title: '流水号', index: 'transactionNumber', className: 'text-center', width: 150 },
-      { title: '交易类型', render: 'carModelLabel', className: 'text-center', width: 200 },
+      { title: '交易类型', index: 'tradeTypeLabel', className: 'text-center', width: 200 },
-      { title: '交易单号', render: 'carModelLabel', className: 'text-center', width: 120 },
+      { title: '交易单号', index: 'businessNumber', className: 'text-center', width: 120 },
-      { title: '备注', index: 'remark', className: 'text-center', width: 180 },
+      { title: '备注', index: 'tradeContent', className: 'text-center', width: 180 },
-      { title: '收支类型', render: 'approvalStatus1', className: 'text-center', width: 180 },
+      { title: '收支类型', index: 'incomeTypeLabel', className: 'text-center', width: 180 },
-      { title: '交易金额', render: 'amount', className: 'text-right', width: 180 },
+      { title: '交易金额', render: 'amount', className: 'text-center', width: 180 },
-      { title: '账户余额', render: 'approvalStatus3', className: 'text-right', width: 180 },
+      { title: '账户余额', render: 'accountBalance', className: 'text-center', width: 180 },
-      { title: '付款方', index: 'approvalStatus4', className: 'text-center', width: 200 },
+      { title: '付款方', index: 'payName', className: 'text-center', width: 200 },
-      { title: '收款方', index: 'approvalStatus4', className: 'text-center', width: 120 },
+      { 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);
   }
+
+
 }

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>
+    <ng-template st-row="allBalance" let-item>
-      <a [routerLink]="'/partner/account-management/am/recorded/detail/'+item?.id">{{item.yskmoney}}</a>
+      <div class="text-right">{{item.allBalance | currency:' '}}</div>
     </ng-template>
-    <ng-template st-row="approvalStatus1" let-item>
+    <ng-template st-row="unEntryAmount" 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/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="availableBalance" let-item>
-    <ng-template st-row="approvalStatus3" let-item>
+      <div class="text-right">{{item.availableBalance | currency:' '}}</div>
-      <div class="text-right">{{item.yskmoney | currency:' '}}</div>
     </ng-template>
 
+
   </st>
 </nz-card>

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: '合伙人名称', index: 'userName', className: 'text-center', width: 250 },
-      { title: '手机号', render: 'carModelLabel', className: 'text-center', width: 200 },
+      { title: '手机号', index: 'phone', className: 'text-center', width: 200 },
-      { title: '账户总额（元）', render: 'approvalStatus1', className: 'text-right', sort: true, width: 200 },
+      { title: '账户总额（元）', render: 'allBalance', className: 'text-right', sort: true, width: 150 },
-      { title: '待入账余额（元）', render: 'approvalStatus2', className: 'text-right', sort: true, width: 200 },
+      { title: '待入账余额（元）', render: 'unEntryAmount', className: 'text-right', sort: true, width: 150 },
-      { title: '可用余额（元）', render: 'approvalStatus3', className: 'text-right', sort: true, width: 250 },
+      { title: '可用余额（元）', render: 'availableBalance', className: 'text-right', sort: true, width: 150 },
-      { title: '虚拟账户', index: 'approvalStatus4', className: 'text-center', width: 200 },
+      { title: '虚拟账户', index: 'virtualAccount', className: 'text-center', width: 200 },
       {
         title: '操作',
+        width: 150,
         buttons: [
           {
             text: '虚拟账户明细',
@@ -89,12 +90,12 @@ export class PartnerAccountManagementListComponent implements OnInit {
    * @param _record 当前行信息
    */
   viewVirtual(_record: any) {
-
+    console.log()
     const modalRef = this.modal.create({
       nzTitle: '虚拟账户明细',
       nzContent: PartnerAccountManagementVirtualAccountDetailComponent,
       nzComponentParams: {
-        id: _record?.id
+        roleId: _record?.roleId,
       },
       nzWidth: '85%',
       nzFooter: null

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">

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';
@@ -17,13 +18,16 @@ export class PartnerAccountManagementVirtualAccountDetailComponent implements On
   @ViewChild('st') private readonly st!: STComponent;
   @ViewChild('sf') private readonly sf!: SFComponent;
   columns: STColumn[] = [];
-  id = '';
+  roleId = '';
   _$expand = false;
+  record = {};
 
-  constructor(public shipperservice: ShipperBaseService, public amService: AccountManagemantService, private modalRef: NzModalRef) { }
+  constructor(public shipperservice: ShipperBaseService, public service: AccountManagemantService,
+    private modalRef: NzModalRef, public router: Router) {
+  }
 
   get reqParams() {
-    return { ...this.sf?.value };
+    return { ...this.sf?.value, roleId: this.roleId };
   }
   ngOnInit(): void {
     this.initSF();
@@ -36,21 +40,21 @@ export class PartnerAccountManagementVirtualAccountDetailComponent implements On
         _$expand: {
           type: 'boolean', ui: { hidden: true }
         },
-        abnormalCause: {
+        userName: {
           title: '合伙人名称',
           type: 'string',
           ui: {
             placeholder: '请输入',
           },
         },
-        abnormalCause1: {
+        phone: {
           title: '手机号',
           type: 'string',
           ui: {
             placeholder: '请输入',
           },
         },
-        abnormalCause2: {
+        ltdId: {
           title: '网络货运人',
           type: 'string',
           default: '',
@@ -79,7 +83,7 @@ export class PartnerAccountManagementVirtualAccountDetailComponent implements On
             },
           },
         },
-        abnormalCause3: {
+        virtualAccount: {
           title: '虚拟账户',
           type: 'string',
           ui: {
@@ -112,16 +116,15 @@ export class PartnerAccountManagementVirtualAccountDetailComponent implements On
 */
   initST() {
     this.columns = [
-      { title: '合伙人', index: 'carNo', className: 'text-center', width: 200 },
+      { title: '合伙人', index: 'name', className: 'text-center', width: 200 },
-      { title: '手机号', render: 'carModelLabel', className: 'text-center', width: 150 },
+      { title: '手机号', index: 'phone', className: 'text-center', width: 150 },
-      { title: '网络货运人', render: 'carModelLabel', className: 'text-center', width: 200 },
+      { title: '网络货运人', index: 'ltdName', className: 'text-center', width: 200 },
-      { title: '银行类型', render: 'carModelLabel', className: 'text-center', width: 120 },
+      { title: '银行类型', index: 'bankTypeLabel', className: 'text-center', width: 120 },
-      { title: '虚拟账户', render: 'carModelLabel', className: 'text-center', width: 180 },
+      { title: '虚拟账户', index: 'virtualAccount', className: 'text-center', width: 180 },
-      { title: '可用余额', render: 'approvalStatus1', className: 'text-right', width: 180 },
+      { title: '可用余额', render: 'availableBalance', className: 'text-center', width: 180 },
-      { title: '账户总余额', render: 'approvalStatus2', className: 'text-right', width: 180 },
+      { title: '账户总余额', render: 'allBalance', className: 'text-center', width: 180 },
-      { title: '可用余额（元）', render: 'approvalStatus3', className: 'text-right', width: 180 },
+      { title: '创建时间', index: 'createTime', className: 'text-center', width: 200 },
-      { title: '创建时间', index: 'approvalStatus4', className: 'text-center', width: 200 },
+      { title: '状态', index: 'stateDeletedLabel', className: 'text-center', width: 120 },
-      { title: '状态', index: 'approvalStatus4', className: 'text-center', width: 120 },
       {
         title: '操作',
         width: 120,
@@ -164,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() {

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] }">

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 { }
 

src/app/routes/partner/account-management/services/account-managemant.service.ts

@@ -6,7 +6,13 @@ 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`;// 提现记录
+  $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)
   }

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>
+
+  

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;
+    }
+  }
+}

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);
+  }
+}

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>

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;
+    }
+  }
+
+}

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);
+  }
+}

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">
+    <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>
+      <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">
+    <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>
+      <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">
+    <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>
+      <div class="form-title" style="margin-top: 40px; margin-left: -180px">渠道销售</div>
     </ng-template>
   </sf>
 
-
+  <div style="display: flex; justify-content: center">
-  <div style="display: flex;justify-content: center;">
+    <button nz-button type="button" nzType="primary" (click)="submitForm()" [nzLoading]="service.http.loading">确认新增</button>
-    <button nz-button type="button" nzType="primary" (click)="submitForm()"
-      [nzLoading]="service.http.loading">确认新增</button>
     <button nz-button (click)="goBack()">返回</button>
   </div>
-</nz-card>
+</nz-card>

src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.ts

@@ -1,19 +1,19 @@
-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,
-  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';
 
 const IMAGECONFIG = {
@@ -43,7 +43,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();
@@ -64,66 +64,54 @@ export class AddEtpPartnerComponent implements OnInit {
     }
   };
 
-  constructor(private router: Router, public service: PartnerListService) {}
+  constructor(public service: PartnerListService) {}
-  ngOnInit() {}
 
   submitForm() {
-    if (!this.sf.valid ) {
+    if (!this.sf.valid) {
       this.sf.validator({ emitError: true });
       this.service.msgSrv.warning('请修改填写错误信息');
       return;
     }
-    const enterpriseRegistrationTime = new Date(this.sf.value.enterpriseRegistrationTime);
+    if (this.sf.value.cityCodesList?.length > 3) {
-    const operatingStartTime = new Date(this.sf.value.operatingStartTime);
+      this.sf.validator({ emitError: true });
-    if (enterpriseRegistrationTime.getTime() > operatingStartTime.getTime()) {
+      this.service.msgSrv.warning('所属城市不能超过3个');
-      this.service.msgSrv.warning('营业期限不能小于成立日期');
       return;
     }
-    if (this.sf.value.operatingEndTime) {
+    // 校验企业营业期限
-      const operatingEndTime = new Date(this.sf.value.operatingEndTime);
+    const operatingStartTime = new Date(this.sf.value.operatingStartTime);
-      if (operatingStartTime.getTime() > operatingEndTime.getTime()) {
+    const operatingEndTime = new Date(this.sf.value.operatingEndTime);
-        this.service.msgSrv.warning('营业期限不能小于期限开始日期');
+    if (operatingStartTime.getTime() > operatingEndTime.getTime()) {
-        return;
+      this.service.msgSrv.warning('营业截止日期不能小于开始日期');
-      }
+      return;
     }
-    const validStartTime = new Date(this.sf.value.legalPersonIdentityDTO.validStartTime);
+    // 校验法人证件有效期限
-    if (this.sf.value.legalPersonIdentityDTO.validEndTime) {
+    if (this.sf.value.legalPersonIdentity.validEndTime) {
-      const validEndTime = new Date(this.sf.value.legalPersonIdentityDTO.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 = {};
+    if (this.sf.value.adminUserInfo.validEndTime) {
-    Object.assign(
+      const validStartTime = new Date(this.sf.value.adminUserInfo.validStartTime);
-      params,
+      const validEndTime = new Date(this.sf.value.adminUserInfo.validEndTime);
-      { ...this.sf.value },
+      if (validStartTime.getTime() > validEndTime.getTime()) {
-      {
+        this.service.msgSrv.warning('管理员证件有效截止日期小于开始日期');
-        enterpriseAddressCode: this.sf.value.enterpriseAddressCode[2],
+        return;
-        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 => {
+    const params = {};
-    //   if (res) {
+    Object.assign(params, { ...this.sf.value, source: 2 });
-    //     this.service.msgSrv.success('企业新增成功');
+    // console.log(params);
-    //     this.goBack();
+
-    //   }
+    this.service.request(this.service.$api_save_entp_partner, params).subscribe(res => {
-    // });
+      if (res) {
+        this.service.msgSrv.success('新增企业合伙人成功');
+        this.goBack();
+      }
+    });
   }
 
   /*
@@ -146,23 +134,23 @@ export class AddEtpPartnerComponent implements OnInit {
           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('/legalPersonIdentity/certificateType', 0);
-              this.sf.setValue('/legalPersonIdentityDTO/certificateNumber', res.number);
+              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('/legalPersonIdentity/validEndTime', res.validTo);
-              this.sf.setValue('/legalPersonIdentityDTO/_isLoingDate', false);
+              this.sf.setValue('/legalPersonIdentity/_isLoingDate', false);
             } else {
-              this.sf.setValue('/legalPersonIdentityDTO/_isLoingDate', true);
+              this.sf.setValue('/legalPersonIdentity/_isLoingDate', true);
             }
           }
         }
@@ -171,10 +159,22 @@ export class AddEtpPartnerComponent implements OnInit {
           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);
             }
           }
         }
@@ -192,29 +192,15 @@ export class AddEtpPartnerComponent implements OnInit {
         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);
-        }
       }
     });
   }
@@ -308,7 +294,7 @@ export class AddEtpPartnerComponent implements OnInit {
         },
 
         // 法人信息
-        legalPersonIdentityDTO: {
+        legalPersonIdentity: {
           type: 'object',
           properties: {
             _legalPersontitle: { title: '', type: 'string', ui: { widget: 'custom' } },
@@ -322,7 +308,7 @@ export class AddEtpPartnerComponent implements OnInit {
                 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);
                   }
                 }
@@ -339,7 +325,7 @@ export class AddEtpPartnerComponent implements OnInit {
                 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);
                   }
                 }
@@ -404,7 +390,7 @@ export class AddEtpPartnerComponent implements OnInit {
                   required: '请选择截止日期'
                 },
                 change: i => {
-                  this.sf?.setValue('/legalPersonIdentityDTO/_isLoingDate', false);
+                  this.sf?.setValue('/legalPersonIdentity/_isLoingDate', false);
                 }
               } as SFDateWidgetSchema
             },
@@ -416,7 +402,7 @@ export class AddEtpPartnerComponent implements OnInit {
                 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
             }
           },
@@ -430,23 +416,23 @@ export class AddEtpPartnerComponent implements OnInit {
             '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',
@@ -465,7 +451,7 @@ export class AddEtpPartnerComponent implements OnInit {
                 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);
                   }
                 }
@@ -487,7 +473,8 @@ export class AddEtpPartnerComponent implements OnInit {
                 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
@@ -512,7 +499,7 @@ export class AddEtpPartnerComponent implements OnInit {
                 placeholder: '请输入企业管理员身份证号'
               }
             },
-            operatingStartTime: {
+            validStartTime: {
               title: '身份证有效开始日期',
               type: 'string',
               ui: {
@@ -523,7 +510,7 @@ export class AddEtpPartnerComponent implements OnInit {
                 }
               } as SFDateWidgetSchema
             },
-            operatingEndTime: {
+            validEndTime: {
               title: '身份证有效截止日期',
               type: 'string',
               ui: {
@@ -545,34 +532,38 @@ export class AddEtpPartnerComponent implements OnInit {
                 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([
+              this.getRegionDetailByCode('').pipe(
-                { title: '待支付', key: 'WAIT_BUYER_PAY' },
+                map((res: any) =>
-                { title: '已支付', key: 'TRADE_SUCCESS' },
+                  res.map((item: any) => ({ ...item, title: item.name, key: item.regionCode, disabled: true, isDisableCheckbox: true }))
-                { title: '交易完成', key: 'TRADE_FINISHED' }
+                )
-              ])
+              ),
-          } as SFTreeSelectWidgetSchema,
+            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,
@@ -586,7 +577,16 @@ export class AddEtpPartnerComponent implements OnInit {
           }
         }
       },
-      required: ['_licenseTips', 'licensePhotoWatermark', 'unifiedSocialCreditCode', 'enterpriseName', 'operatingStartTime', 'status3','channel']
+      required: [
+        '_licenseTips',
+        'licensePhotoWatermark',
+        'unifiedSocialCreditCode',
+        'enterpriseName',
+        'operatingStartTime',
+        'cityCodesList',
+        'adminMobile',
+        'invitationCode'
+      ]
     };
   }
 }

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'">
+  <sf #sf [ui]="ui" [schema]="schema" [button]="'none'">
-        <!-- 合伙人信息 -->
+    <!-- 合伙人信息 -->
-        <ng-template sf-template="adminUserInfo/_adminTitle" let-me let-ui="ui" let-schema="schema">
+    <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>
+      <div class="form-title" style="margin-top: 40px; margin-left: -180px">合伙人信息</div>
-        </ng-template>
+    </ng-template>
-        <ng-template sf-template="adminUserInfo/_adminCertificatePhotoTipsA" 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">
+      <div class="pr">
-                <dl class="tips">
+        <dl class="tips">
-                    <dt>正面照（人像面）</dt>
+          <dt>正面照（人像面）</dt>
-                    <dd>示例</dd>
+          <dd>示例</dd>
-                </dl>
+        </dl>
-                <div class="pa"><img width="190" src="./assets/images/usercenter/certificate-demo-front.png" /></div>
+        <div class="pa"><img width="190" src="./assets/images/usercenter/certificate-demo-front.png" /></div>
-            </div>
+      </div>
-        </ng-template>
+    </ng-template>
-        <ng-template sf-template="adminUserInfo/_adminCertificatePhotoTipsB" 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">
+      <div class="pr">
-                <dl class="tips">
+        <dl class="tips">
-                    <dt>背面照（国徽面）</dt>
+          <dt>背面照（国徽面）</dt>
-                    <dd>示例</dd>
+          <dd>示例</dd>
-                </dl>
+        </dl>
-                <div class="pa"><img width="190" src="./assets/images/usercenter/certificate-demo-back.png" /></div>
+        <div class="pa"><img width="190" src="./assets/images/usercenter/certificate-demo-back.png" /></div>
-            </div>
+      </div>
-        </ng-template>
+    </ng-template>
 
-        <!-- 所属城市 -->
+    <!-- 所属城市 -->
-        <ng-template sf-template="_addressTitle" let-me let-ui="ui" let-schema="schema">
+    <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>
 
-        <!-- 渠道销售 -->
+    <!-- 渠道销售 -->
-        <ng-template sf-template="_channelTitle" let-me let-ui="ui" let-schema="schema">
+    <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>
+      <div class="form-title" style="margin-top: 40px; margin-left: -180px">渠道销售</div>
-        </ng-template>
+    </ng-template>
-    </sf>
+  </sf>
 
-
+  <div style="display: flex; justify-content: center">
-    <div style="display: flex;justify-content: center;">
+    <button nz-button type="button" nzType="primary" (click)="submitForm()" [nzLoading]="service.http.loading">确认新增</button>
-        <button nz-button type="button" nzType="primary" (click)="submitForm()"
+    <button nz-button (click)="goBack()">返回</button>
-            [nzLoading]="service.http.loading">确认新增</button>
+  </div>
-        <button nz-button (click)="goBack()">返回</button>
+</nz-card>
-    </div>
-</nz-card>

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) {
@@ -63,57 +73,28 @@ export class AddPersonalPartnerComponent implements OnInit {
       this.service.msgSrv.warning('请修改填写错误信息');
       return;
     }
-    const enterpriseRegistrationTime = new Date(this.sf.value.enterpriseRegistrationTime);
+    if (this.sf.value.cityCodesList?.length > 3) {
-    const operatingStartTime = new Date(this.sf.value.operatingStartTime);
+      this.sf.validator({ emitError: true });
-    if (enterpriseRegistrationTime.getTime() > operatingStartTime.getTime()) {
+      this.service.msgSrv.warning('所属城市不能超过3个');
-      this.service.msgSrv.warning('营业期限不能小于成立日期');
       return;
     }
-    if (this.sf.value.operatingEndTime) {
+    if (this.sf.value.validEndTime) {
-      const operatingEndTime = new Date(this.sf.value.operatingEndTime);
+      const validStartTime = new Date(this.sf.value.validStartTime);
-      if (operatingStartTime.getTime() > operatingEndTime.getTime()) {
+      const validEndTime = new Date(this.sf.value.validEndTime);
-        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('法人证件有效截止日期小于开始日期');
+        this.service.msgSrv.warning('身份证有效截止日期不能小于开始日期');
         return;
       }
     }
-    const sfVlaue = this.sf.value;
     const params = {};
-    Object.assign(
+    Object.assign(params, { ...this.sf.value, source: 2 });
-      params,
+
-      { ...this.sf.value },
+    this.service.request(this.service.$api_save_personal_partner, params).subscribe(res => {
-      {
+      if (res) {
-        enterpriseAddressCode: this.sf.value.enterpriseAddressCode[2],
+        this.service.msgSrv.success('新增个人合伙人成功');
-        oftenUsedServices: sfVlaue.oftenUsedServices,
+        this.goBack();
-        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();
-    //   }
-    // });
   }
 
   /*
@@ -124,48 +105,34 @@ export class AddPersonalPartnerComponent implements OnInit {
   }
 
   // 识别身份证 参数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 (isFront === 'front') {
+          // 正面
-            // 正面
+          if (res.name) {
-            if (res.name) {
+            this.sf.setValue('/adminUserInfo/name', 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.number) {
-            // 背面
+            this.sf.setValue('/adminUserInfo/certificateType', 0);
-            if (res.validFrom) {
+            this.sf.setValue('/adminUserInfo/certificateNumber', res.number);
-              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 (isFront === 'back') {
-        if (type === 0) {
+          // 背面
-          if (isFront === 'front') {
+          if (res.validFrom) {
-            // 正面
+            this.sf.setValue('/adminUserInfo/validStartTime', res.validFrom);
-            if (res.name) {
+          }
-              this.sf.setValue('/name', res.name);
+          if (res.validTo) {
-            }
+            this.sf.setValue('/adminUserInfo/validEndTime', res.validTo);
-            if (res.number) {
+            this.sf.setValue('/adminUserInfo/_isLoingDate', false);
-              this.sf.setValue('/certificateNumber', res.number);
+          } else {
-            }
+            this.sf.setValue('/adminUserInfo/_isLoingDate', true);
           }
         }
       }
@@ -179,23 +146,23 @@ export class AddPersonalPartnerComponent implements OnInit {
   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',
@@ -206,6 +173,7 @@ export class AddPersonalPartnerComponent implements OnInit {
             },
             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: '',
@@ -214,8 +182,8 @@ export class AddPersonalPartnerComponent implements OnInit {
                 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);
+                    this.checkIdCard(args.fileList[0].response.data.fullFilePath, 'front');
                   }
                 }
               } as SFUploadWidgetSchema
@@ -236,7 +204,8 @@ export class AddPersonalPartnerComponent implements OnInit {
                 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
@@ -261,7 +230,7 @@ export class AddPersonalPartnerComponent implements OnInit {
                 placeholder: '请输入身份证号'
               }
             },
-            operatingStartTime: {
+            validStartTime: {
               title: '身份证有效开始日期',
               type: 'string',
               ui: {
@@ -272,7 +241,7 @@ export class AddPersonalPartnerComponent implements OnInit {
                 }
               } as SFDateWidgetSchema
             },
-            operatingEndTime: {
+            validEndTime: {
               title: '身份证有效截止日期',
               type: 'string',
               ui: {
@@ -294,34 +263,38 @@ export class AddPersonalPartnerComponent implements OnInit {
                 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: '所属城市',
-          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([
+              this.getRegionDetailByCode('').pipe(
-                { title: '待支付', key: 'WAIT_BUYER_PAY' },
+                map((res: any) =>
-                { title: '已支付', key: 'TRADE_SUCCESS' },
+                  res.map((item: any) => ({ ...item, title: item.name, key: item.regionCode, disabled: true, isDisableCheckbox: true }))
-                { title: '交易完成', key: 'TRADE_FINISHED' }
+                )
-              ])
+              ),
+            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,
@@ -335,10 +308,7 @@ export class AddPersonalPartnerComponent implements OnInit {
           }
         }
       },
-      required: [
+      required: ['cityCodesList', 'invitationCode']
-        'status3',
-        'channel'
-      ]
     };
   }
 }

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

@@ -1,95 +1,100 @@
-<page-header-wrapper [title]="'合伙人列表'">
+<page-header-wrapper [title]="'合伙人列表'"> </page-header-wrapper>
-</page-header-wrapper>
 
 <nz-card class="search-box" nzBordered>
-    <div nz-row nzGutter="8">
+  <div nz-row nzGutter="8">
-        <div nz-col [nzXl]="_$expand ? 24 : 17" [nzLg]="24" [nzSm]="24" [nzXs]="24">
+    <div nz-col [nzXl]="_$expand ? 24 : 17" [nzLg]="24" [nzSm]="24" [nzXs]="24">
-            <sf #sf [schema]="searchSchema"
+      <sf
-                [ui]="{ '*': { spanLabelFixed: 110,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}" [compact]="true"
+        #sf
-                [button]="'none'"></sf>
+        [schema]="searchSchema"
-        </div>
+        [ui]="{ '*': { spanLabelFixed: 110, grid: { lg: 8, md: 12, sm: 12, xs: 24 } } }"
-        <div nz-col [nzXl]="_$expand ? 24 : 7" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right"
+        [compact]="true"
-            [class.expend-options]="_$expand">
+        [button]="'none'"
-            <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
+      ></sf>
-            <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>
+    <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">
+  <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-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>
+  </div>
 
-    <st #st [data]="service.$mock_url" [columns]="columns" [req]="{  process: beforeReq }"
+  <st
-        [loading]="service.http.loading" [scroll]="{ x:'1200px' }">
+    #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-row nzGutter="8">
-        <div nz-col nzSpan="24" se-container [labelWidth]="120">
+    <div nz-col nzSpan="24" se-container [labelWidth]="120">
-            <se [col]="1" label="合伙人名称">
+      <se [col]="1" label="合伙人名称"> 深圳某某有限公司 </se>
-                深圳某某有限公司
+      <se [col]="1" label="返佣模板" required>
-            </se>
+        <nz-select ngModel="lucy" style="width: 100%">
-            <se [col]="1" label="返佣模板" required>
+          <nz-option nzValue="jack" nzLabel="Jack"></nz-option>
-                <nz-select ngModel="lucy" style="width: 100%;">
+          <nz-option nzValue="lucy" nzLabel="Lucy"></nz-option>
-                    <nz-option nzValue="jack" nzLabel="Jack"></nz-option>
+        </nz-select>
-                    <nz-option nzValue="lucy" nzLabel="Lucy"></nz-option>
+      </se>
-                </nz-select>
-            </se>
-        </div>
     </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-row nzGutter="8">
-        <div nz-col nzSpan="24" se-container [labelWidth]="140" [col]="1">
+    <div nz-col nzSpan="24" se-container [labelWidth]="140" [col]="1">
-            <se label="合伙人名称">
+      <se label="合伙人名称"> 深圳某某有限公司 </se>
-                深圳某某有限公司
+      <se label="当前渠道销售"> 张三/13999999999 </se>
-            </se>
+      <se label="渠道销售修改为" required>
-            <se label="当前渠道销售">
+        <nz-select ngModel="lucy" style="width: 100%">
-                张三/13999999999
+          <nz-option nzValue="jack" nzLabel="Jack"></nz-option>
-            </se>
+          <nz-option nzValue="lucy" nzLabel="Lucy"></nz-option>
-            <se label="渠道销售修改为" required>
+        </nz-select>
-                <nz-select ngModel="lucy" style="width: 100%;">
+      </se>
-                    <nz-option nzValue="jack" nzLabel="Jack"></nz-option>
+      <se label="备注" required>
-                    <nz-option nzValue="lucy" nzLabel="Lucy"></nz-option>
+        <textarea rows="3" nz-input></textarea>
-                </nz-select>
+      </se>
-            </se>
+      <se label="一并转移的客户">
-            <se label="备注" required>
+        <p style="margin-top: 8px">已选（0）</p>
-                <textarea rows="3" nz-input></textarea>
+        <nz-table #rowSelectionTable [nzData]="customers" nzSize="small" nzBordered>
-            </se>
+          <thead>
-            <se label="一并转移的客户">
+            <tr>
-                <p style="margin-top: 8px;">已选（0）</p>
+              <th [nzChecked]="false"></th>
-                <nz-table #rowSelectionTable [nzData]="customers" nzSize="small" nzBordered>
+              <th>客户名称</th>
-                    <thead>
+            </tr>
-                        <tr>
+          </thead>
-                            <th [nzChecked]="false"></th>
+          <tbody>
-                            <th>客户名称</th>
+            <tr *ngFor="let data of rowSelectionTable.data">
-                        </tr>
+              <td [nzChecked]="data.checked"></td>
-                    </thead>
+              <td>{{ data.name }}</td>
-                    <tbody>
+            </tr>
-                        <tr *ngFor="let data of rowSelectionTable.data">
+          </tbody>
-                            <td [nzChecked]="data.checked"></td>
+        </nz-table>
-                            <td>{{ data.name }}</td>
+      </se>
-                        </tr>
+      <se label="生效节点" required>
-                    </tbody>
+        <nz-radio-group>
-                </nz-table>
+          <label nz-radio nzValue="A">修改成功后立即生效</label>
-            </se>
+          <label nz-radio nzValue="B">CRM流程审核通过后生</label>
-            <se label="生效节点" required>
+        </nz-radio-group>
-                <nz-radio-group>
+      </se>
-                    <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>
+  </div>
-</ng-template>
+  <p class="text-center mt-md"
+    >客户转移：客户跟着上级合伙人转移一并到新渠道销售下，会同步发起CRM《客户转移》流程；不转移的，客户会与上级合伙人解绑，成为渠道销售的直客</p
+  >
+</ng-template>

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',
+            widget: 'select',
-            containsAllLabel: true,
-            params: { dictKey: 'refund:apply:status' },
             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',
+            widget: 'select',
-            containsAllLabel: true,
-            params: { dictKey: 'pay:mode' },
             placeholder: '请选择',
             visibleIf: {
               expand: (value: boolean) => value
             }
-          }
+          },
+          default: ''
         },
-        paymo11d1e: {
+        templateId: {
           type: 'string',
           title: '返佣模板',
           ui: {
-            widget: 'dict-select',
+            widget: 'select',
-            containsAllLabel: true,
-            params: { dictKey: 'pay:mode' },
             placeholder: '请选择',
             visibleIf: {
               expand: (value: boolean) => value
             }
           }
         },
-        paymo11d11e: {
+        lockedStatus: {
           type: 'string',
           title: '合伙人状态',
+          enum: [
+            { value: '', label: '全部' },
+            { value: 0, label: '启用' },
+            { value: 1, label: '冻结' }
+          ],
           ui: {
-            widget: 'dict-select',
+            widget: 'select',
-            containsAllLabel: true,
-            params: { dictKey: 'pay:mode' },
             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: 'invitationCode', className: 'text-center', width: 130 },
-      { title: '企业管理员', index: 'payDate', width: 150 },
+      { title: '企业管理员', index: 'contactName', width: 150 },
-      { title: '手机号', index: 'payDate', className: 'text-center', width: 150 },
+      { title: '手机号', index: 'contactMobile', className: 'text-center', width: 150 },
-      { title: '类型', index: 'payDate', className: 'text-center', width: 130 },
+      { 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: 'templateName', width: 150 },
-      { title: '认证审核状态', index: 'payDate', width: 150 },
+      {
-      { title: '签约状态', index: 'payDate', width: 150 },
+        title: '认证审核状态',
-      { title: 'CRM状态', index: 'payDate', width: 150 },
+        index: 'approvalStatus',
-      { title: '合伙人状态', index: 'payDate', className: 'text-center', width: 140 },
+        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}`])
           }
         ]
       }

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}">
+<page-header-wrapper [logo]="logo" [content]="content" [title]="'合伙人详情'" [ngClass]="{ affix: scrollTop > 210 }">
-    <ng-template #logo>
+  <ng-template #logo>
-        <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
+    <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
-            <i nz-icon nzType="left" nzTheme="outline"></i>
+      <i nz-icon nzType="left" nzTheme="outline"></i>
-        </button>
+    </button>
-    </ng-template>
+  </ng-template>
-    <ng-template #content>
+  <ng-template #content>
-        <nz-skeleton [nzLoading]="false">
+    <nz-skeleton [nzLoading]="false">
-            <div class="user-info" nz-row>
+      <div class="user-info" nz-row>
-                <div nz-col [nzXl]="18" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="d-flex">
+        <div nz-col [nzXl]="18" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="d-flex">
-                    <img [src]="detailData?.enterpriseLogo" />
+          <img [src]="detailData?.enterpriseLogo" />
-                    <div style="flex: 1;">
+          <div style="flex: 1">
-                        <div nz-row>
+            <div nz-row>
-                            <div nz-col [nzLg]="12" [nzSm]="24" [nzXs]="24">
+              <div nz-col [nzLg]="12" [nzSm]="24" [nzXs]="24">
-                                <p style="margin-bottom: 0;">{{ detailData?.enterpriseName }}</p>
+                <p style="margin-bottom: 0">{{ detailData?.enterpriseName }}</p>
-                            </div>
+              </div>
-                            <div nz-col [nzLg]="12" [nzSm]="24" [nzXs]="24">
+              <div nz-col [nzLg]="12" [nzSm]="24" [nzXs]="24">
-                                <nz-badge nzStatus="success" nzText="正常" *ngIf="detailData?.stateLocked === 0">
+                <nz-badge nzStatus="success" nzText="正常" *ngIf="detailData?.stateLocked === 0"> </nz-badge>
-                                </nz-badge>
+                <nz-badge nzStatus="error" nzText="冻结" *ngIf="detailData?.stateLocked === 1"></nz-badge>
-                                <nz-badge nzStatus="error" nzText="冻结" *ngIf="detailData?.stateLocked === 1"></nz-badge>
+              </div>
-                            </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>
             </div>
-        </nz-skeleton>
+            <div nz-row>
-    </ng-template>
+              <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-template #frozen>
-        <ng-container
+    <ng-container
-            *ngTemplateOutlet="PopconfirmTempalte;context:{title:'确定冻结该企业吗？',content:'停用后，该企业将被限制使用，不限于访问受限、无法发布货源等，请谨慎操作'}">
+      *ngTemplateOutlet="
-        </ng-container>
+        PopconfirmTempalte;
-    </ng-template>
+        context: { title: '确定冻结该企业吗？', content: '停用后，该企业将被限制使用，不限于访问受限、无法发布货源等，请谨慎操作' }
-    <ng-template #enable>
+      "
-        <ng-container
+    >
-            *ngTemplateOutlet="PopconfirmTempalte;context:{title:'确定启用该企业吗？',content:'启用后，该企业将恢复正常使用功能，请再次确认'}">
+    </ng-container>
-        </ng-container>
+  </ng-template>
-    </ng-template>
+  <ng-template #enable>
-    <ng-template #Payenable>
+    <ng-container
-        <ng-container
+      *ngTemplateOutlet="
-            *ngTemplateOutlet="PopconfirmTempalte;context:{title:'确定关闭该企业支付权限吗？',content:'停用后，该企业将被限制使用支付功能，请谨慎操作'}">
+        PopconfirmTempalte;
-        </ng-container>
+        context: { title: '确定启用该企业吗？', content: '启用后，该企业将恢复正常使用功能，请再次确认' }
-    </ng-template>
+      "
-    <ng-template #Payfrozen>
+    >
-        <ng-container
+    </ng-container>
-            *ngTemplateOutlet="PopconfirmTempalte;context:{title:'确定开通该企业支付权限吗？',content:'启用后，该企业将恢复正常支付功能，请再次确认'}">
+  </ng-template>
-        </ng-container>
-    </ng-template>
 </page-header-wrapper>
 
-<nz-card [class]="isEdit?'edit-box':'readOnly-box'">
+<nz-card [class]="isEdit ? 'edit-box' : 'readOnly-box'">
-    <sv-container col="3">
+  <sv-container col="3">
-        <sv-title>企业管理员信息</sv-title>
+    <sv-title>企业管理员信息</sv-title>
-        <sv label="姓名">
+    <sv label="姓名">
-            <input nz-input type="text" [(ngModel)]="detailData.adminUserInfo.name" [readonly]="!isEdit"
+      <input
-                [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
+        nz-input
-        </sv>
+        type="text"
-        <sv label="手机号">
+        [(ngModel)]="detailData.adminUserInfo.name"
-            <input nz-input type="text" [(ngModel)]="detailData.adminUserInfo.mobile" [readonly]="!isEdit"
+        [readonly]="!isEdit"
-                [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
+        [nzBorderless]="!isEdit"
-        </sv>
+        [placeholder]="isEdit ? '' : '-'"
-        <sv label="身份证号">
+      />
-            <input nz-input type="text" [(ngModel)]="detailData.adminUserInfo.certificateNumber" [readonly]="!isEdit"
+    </sv>
-                [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
+    <sv label="手机号">
-        </sv>
+      <input
-        <sv label="身份证照" col="2">
+        nz-input
-            <div class="d-flex">
+        type="text"
-                <ng-container
+        [(ngModel)]="detailData.adminUserInfo.mobile"
-                    *ngTemplateOutlet="uploadTemplate;context:{data:detailData?.adminUserInfo,status:isEdit,key:'certificatePhotoFrontWatermark',key2:'certificatePhotoFront',hover:'certificateBackFront'}">
+        [readonly]="!isEdit"
-                </ng-container>
+        [nzBorderless]="!isEdit"
-                <ng-container
+        [placeholder]="isEdit ? '' : '-'"
-                    *ngTemplateOutlet="uploadTemplate;context:{data:detailData?.adminUserInfo,status:isEdit,key:'certificatePhotoBackWatermark',key2:'certificatePhotoBack',hover:'certificateBack'}">
+      />
-                </ng-container>
+    </sv>
-            </div>
+    <sv label="身份证号">
-        </sv>
+      <input
-        <sv label="身份证有效期" col="1">
+        nz-input
-            <nz-date-picker [(ngModel)]="detailData.operatingStartTime" [nzDisabled]="!isEdit" nzPlaceHolder=" "
+        type="text"
-                [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''" style="width: 100px;" class="calendar">
+        [(ngModel)]="detailData.adminUserInfo.certificateNumber"
-            </nz-date-picker>
+        [readonly]="!isEdit"
-            -
+        [nzBorderless]="!isEdit"
-            <ng-container *ngIf="!isEdit && !detailData?.operatingEndTime && detailData?.operatingStartTime">
+        [placeholder]="isEdit ? '' : '-'"
-                <label style="padding-left: 11px;">长期</label>
+      />
-            </ng-container>
+    </sv>
-            <nz-date-picker [(ngModel)]="detailData.operatingEndTime" [nzDisabled]="!isEdit" nzPlaceHolder=" "
+    <sv label="身份证照" col="2">
-                [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''" style="width: 100px;" class="calendar">
+      <div class="d-flex">
-            </nz-date-picker>
+        <ng-container
-            <ng-container *ngIf="isEdit">
+          *ngTemplateOutlet="
-                <label nz-checkbox [ngModel]="!!!detailData.operatingEndTime"
+            uploadTemplate;
-                    (ngModelChange)="$event?detailData.operatingEndTime='':''" class="ml-sm">长期</label>
+            context: {
-            </ng-container>
+              data: detailData?.adminUserInfo,
-        </sv>
+              status: isEdit,
-    </sv-container>
+              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>
+  <nz-divider></nz-divider>
-    <sv-container col="3" class="mt16">
+  <sv-container col="3" class="mt16">
-        <sv-title>
+    <sv-title>
-            <label class="mr-md">企业基本信息</label>
+      <label class="mr-md">企业基本信息</label>
-            <label *ngIf="detailData?.approvalStatus===10" style="color: #1890ff;"><i nz-icon nzType="info-circle"
+      <label *ngIf="detailData?.approvalStatus === 10" style="color: #1890ff"
-                    nzTheme="fill" class="mr-xs"></i>待审核
+        ><i nz-icon nzType="info-circle" nzTheme="fill" class="mr-xs"></i>待审核
-            </label>
+      </label>
-            <label *ngIf="detailData?.approvalStatus===20" style="color: #52c41a;"><i nz-icon nzType="check-circle"
+      <label *ngIf="detailData?.approvalStatus === 20" style="color: #52c41a"
-                    nzTheme="fill" class="mr-xs"></i>审核通过
+        ><i nz-icon nzType="check-circle" nzTheme="fill" class="mr-xs"></i>审核通过
-            </label>
+      </label>
-            <label *ngIf="detailData?.approvalStatus===30" style="color: #ff4d4f;"><i nz-icon nzType="close-circle"
+      <label *ngIf="detailData?.approvalStatus === 30" style="color: #ff4d4f"
-                    nzTheme="fill" class="mr-xs"></i>驳回&nbsp;驳回原因:{{detailData?.approvalOpinion}}
+        ><i nz-icon nzType="close-circle" nzTheme="fill" class="mr-xs"></i>驳回&nbsp;驳回原因:{{ detailData?.approvalOpinion }}
-            </label>
+      </label>
-            <p style="margin-bottom: 0;">
+      <p style="margin-bottom: 0">
-                四要素验证：
+        四要素验证：
-                <label *ngIf="detailData?.esignCheckStatus===0" style="color: #ff4d4f;"><i nz-icon nzType="info-circle"
+        <label *ngIf="detailData?.esignCheckStatus === 0" style="color: #ff4d4f"
-                        nzTheme="fill" class="mr-xs"></i>不通过&nbsp;&nbsp;驳回原因:{{detailData?.esignCheckMsg}}
+          ><i nz-icon nzType="info-circle" nzTheme="fill" class="mr-xs"></i>不通过&nbsp;&nbsp;驳回原因:{{ detailData?.esignCheckMsg }}
-                </label>
+        </label>
-                <label *ngIf="detailData?.esignCheckStatus===1" style="color: #52c41a;"><i nz-icon nzType="check-circle"
+        <label *ngIf="detailData?.esignCheckStatus === 1" style="color: #52c41a"
-                        nzTheme="fill" class="mr-xs"></i>通过
+          ><i nz-icon nzType="check-circle" nzTheme="fill" class="mr-xs"></i>通过
-                </label>
+        </label>
-                <label *ngIf="detailData?.esignCheckStatus===2" style="color:  #1890ff;"><i nz-icon
+        <label *ngIf="detailData?.esignCheckStatus === 2" style="color: #1890ff"
-                        nzType="close-circle" nzTheme="fill" class="mr-xs"></i>未认证
+          ><i nz-icon nzType="close-circle" nzTheme="fill" class="mr-xs"></i>未认证
-                </label>
+        </label>
-            </p>
+      </p>
-        </sv-title>
+    </sv-title>
-        <sv label="公司名称">
+    <sv label="公司名称">
-            <input nz-input type="text" [(ngModel)]="detailData.enterpriseName" [readonly]="!isEdit"
+      <input
-                [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
+        nz-input
-        </sv>
+        type="text"
-        <sv label="统一社会信用代码">
+        [(ngModel)]="detailData.enterpriseName"
-            <input nz-input type="text" [(ngModel)]="detailData.unifiedSocialCreditCode" [readonly]="!isEdit"
+        [readonly]="!isEdit"
-                [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
+        [nzBorderless]="!isEdit"
-        </sv>
+        [placeholder]="isEdit ? '' : '-'"
-        <sv label="营业执照" col="2">
+      />
-            <ng-container
+    </sv>
-                *ngTemplateOutlet="uploadTemplate;context:{data:detailData,status:isEdit,key:'licensePhotoWatermark',key2:'licensePhoto',hover:'detailPhoto'}">
+    <sv label="统一社会信用代码">
-            </ng-container>
+      <input
-        </sv>
+        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">
+    <sv label="营业期限" col="1">
-            <nz-date-picker [(ngModel)]="detailData.operatingStartTime" [nzDisabled]="!isEdit" nzPlaceHolder=" "
+      <nz-date-picker
-                [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''" style="width: 100px;" class="calendar">
+        [(ngModel)]="detailData.operatingStartTime"
-            </nz-date-picker>
+        [nzDisabled]="!isEdit"
-            -
+        nzPlaceHolder=" "
-            <ng-container *ngIf="!isEdit && !detailData?.operatingEndTime && detailData?.operatingStartTime">
+        [nzBorderless]="!isEdit"
-                <label style="padding-left: 11px;">长期</label>
+        [nzSuffixIcon]="isEdit ? 'calendar' : ''"
-            </ng-container>
+        style="width: 100px"
-            <nz-date-picker [(ngModel)]="detailData.operatingEndTime" [nzDisabled]="!isEdit" nzPlaceHolder=" "
+        class="calendar"
-                [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''" style="width: 100px;" class="calendar">
+      >
-            </nz-date-picker>
+      </nz-date-picker>
-            <ng-container *ngIf="isEdit">
+      -
-                <label nz-checkbox [ngModel]="!!!detailData.operatingEndTime"
+      <ng-container *ngIf="!isEdit && !detailData?.operatingEndTime && detailData?.operatingStartTime">
-                    (ngModelChange)="$event?detailData.operatingEndTime='':''" class="ml-sm">长期</label>
+        <label style="padding-left: 11px">长期</label>
-            </ng-container>
+      </ng-container>
-        </sv>
+      <nz-date-picker
-    </sv-container>
+        [(ngModel)]="detailData.operatingEndTime"
-    <nz-divider></nz-divider>
+        [nzDisabled]="!isEdit"
-    <sv-container col="3" class="mt16">
+        nzPlaceHolder=" "
-        <sv-title>企业法人信息</sv-title>
+        [nzBorderless]="!isEdit"
-        <sv label="法定代表人">
+        [nzSuffixIcon]="isEdit ? 'calendar' : ''"
-            <input nz-input type="text" [(ngModel)]="detailData.legalPersonIdentityVO.name" [readonly]="!isEdit"
+        style="width: 100px"
-                [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
+        class="calendar"
-        </sv>
+      >
-        <sv label="身份证号码">
+      </nz-date-picker>
-            <input nz-input type="text" [(ngModel)]="detailData.legalPersonIdentityVO.certificateNumber"
+      <ng-container *ngIf="isEdit">
-                [readonly]="!isEdit" [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
+        <label
-        </sv>
+          nz-checkbox
-        <sv label="身份证有效期" col="1">
+          [ngModel]="!!!detailData.operatingEndTime"
-            <nz-date-picker [(ngModel)]="detailData.legalPersonIdentityVO.validStartTime" [nzDisabled]="!isEdit"
+          (ngModelChange)="$event ? (detailData.operatingEndTime = '') : ''"
-                nzPlaceHolder=" " [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''" style="width: 100px;"
+          class="ml-sm"
-                class="calendar"></nz-date-picker>
+          >长期</label
-            -
+        >
-            <ng-container
+      </ng-container>
-                *ngIf="!isEdit && !detailData?.legalPersonIdentityVO?.validEndTime && detailData.legalPersonIdentityVO.validStartTime">
+    </sv>
-                <label style="padding-left: 11px;">长期</label>
+  </sv-container>
-            </ng-container>
+  <nz-divider></nz-divider>
-            <nz-date-picker [(ngModel)]="detailData.legalPersonIdentityVO.validEndTime" [nzDisabled]="!isEdit"
+  <sv-container col="3" class="mt16">
-                nzPlaceHolder=" " [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''" style="width: 100px;"
+    <sv-title>企业法人信息</sv-title>
-                class="calendar"></nz-date-picker>
+    <sv label="法定代表人">
-            <ng-container *ngIf="isEdit">
+      <input
-                <label nz-checkbox [ngModel]="!!!detailData.legalPersonIdentityVO.validEndTime"
+        nz-input
-                    (ngModelChange)="$event?detailData.legalPersonIdentityVO.validEndTime='':''"
+        type="text"
-                    class="ml-sm">长期</label>
+        [(ngModel)]="detailData.legalPersonIdentity.name"
-            </ng-container>
+        [readonly]="!isEdit"
-        </sv>
+        [nzBorderless]="!isEdit"
-        <sv label="身份证照" col="1">
+        [placeholder]="isEdit ? '' : '-'"
-            <div class="d-flex">
+      />
-                <ng-container
+    </sv>
-                    *ngTemplateOutlet="uploadTemplate;context:{data:detailData?.legalPersonIdentityVO,status:isEdit,key:'certificatePhotoFrontWatermark',key2:'certificatePhotoFront',hover:'legalFront'}">
+    <sv label="身份证号码">
-                </ng-container>
+      <input
-                <ng-container
+        nz-input
-                    *ngTemplateOutlet="uploadTemplate;context:{data:detailData?.legalPersonIdentityVO,status:isEdit,key:'certificatePhotoBackWatermark',key2:'certificatePhotoBack',hover:'legalBack'}">
+        type="text"
-                </ng-container>
+        [(ngModel)]="detailData.legalPersonIdentity.certificateNumber"
-            </div>
+        [readonly]="!isEdit"
-        </sv>
+        [nzBorderless]="!isEdit"
-        <sv label="所属城市">
+        [placeholder]="isEdit ? '' : '-'"
-            <ng-container *ngIf="isEdit; else cascaderelseTemplate">
+      />
-                <nz-cascader [(ngModel)]="enterpriseAddressCode" [nzLoadData]="loadRegionData">
+    </sv>
-                </nz-cascader>
+    <sv label="身份证有效期" col="1">
-            </ng-container>
+      <nz-date-picker
-            <ng-template #cascaderelseTemplate>
+        [(ngModel)]="detailData.legalPersonIdentity.validStartTime"
-                {{ detailData?.fullRegionVO?.provinceName }}{{ detailData?.fullRegionVO?.cityName }}{{
+        [nzDisabled]="!isEdit"
-                detailData?.fullRegionVO?.areaName }}
+        nzPlaceHolder=" "
-            </ng-template>
+        [nzBorderless]="!isEdit"
-        </sv>
+        [nzSuffixIcon]="isEdit ? 'calendar' : ''"
-    </sv-container>
+        style="width: 100px"
-    <nz-divider></nz-divider>
+        class="calendar"
-    <nz-divider></nz-divider>
+      ></nz-date-picker>
-    <sv-container col="3" class="mt16">
+      -
-        <sv-title>渠道销售信息</sv-title>
+      <ng-container *ngIf="!isEdit && !detailData?.legalPersonIdentity?.validEndTime && detailData.legalPersonIdentity.validStartTime">
-        <sv label="姓名">
+        <label style="padding-left: 11px">长期</label>
-            张学友
+      </ng-container>
-        </sv>
+      <nz-date-picker
-        <sv label="手机号">
+        [(ngModel)]="detailData.legalPersonIdentity.validEndTime"
-            13999999999
+        [nzDisabled]="!isEdit"
-        </sv>
+        nzPlaceHolder=" "
-        <sv label="绑定时间">
+        [nzBorderless]="!isEdit"
-            2021-09-23 14:43:31
+        [nzSuffixIcon]="isEdit ? 'calendar' : ''"
-        </sv>
+        style="width: 100px"
-    </sv-container>
+        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-container col="3" class="mt16">
-        <sv-title>修改渠道销售记录</sv-title>
+    <sv-title>修改渠道销售记录</sv-title>
-        <sv label="">
+    <sv label="">
-            <st #st [data]="service.$mock_url" [columns]="columns.logsColumn" [loading]="service.http.loading" bordered
+      <st
-                size="small" [page]="{show:false}" [scroll]="{ x:'1200px' }">
+        #st
-            </st>
+        [data]="service.$api_get_personal_channel_list"
-        </sv>
+        [columns]="columns.logsColumn"
-    </sv-container>
+        [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">
+  <div class="ant-popover-message">
-        <i nz-icon nzType="info-circle" nzTheme="fill"></i>
+    <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 class="ant-popover-message-title ng-star-inserted self-ant-popover-title" style="font-size: 16px">{{ title }} </div>
-        </div>
+    <div class="ant-popover-message-title ng-star-inserted">
-        <div class="ant-popover-message-title ng-star-inserted">
+      {{ content }}
-            {{content}}
-        </div>
     </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"
+  <nz-upload
-        [nzShowUploadList]="false" nzFileType="image/png,image/jpeg,image/jpg,image/gif"
+    class="avatar-uploader"
-        [nzDisabled]="!isEdit || disabledUpload" (nzChange)="changeUpload($event,data,key,key2,hover)">
+    [nzAction]="uploadURl"
-        <ng-container *ngIf="!data[key] && isEdit">
+    nzName="multipartFile"
-            <i class="upload-icon" nz-icon [nzType]="service.http.loading ? 'loading' : 'plus'"></i>
+    nzListType="picture-card"
-            <div class="ant-upload-text">上传</div>
+    [nzShowUploadList]="false"
-        </ng-container>
+    nzFileType="image/png,image/jpeg,image/jpg,image/gif"
-        <div *ngIf="data[key]" (mouseover)="detailData[hover]=true" (mouseleave)="detailData[hover]=false"
+    [nzDisabled]="!isEdit || disabledUpload"
-            (click)="$event.cancelBubble=true" class="image-hover">
+    (nzChange)="changeUpload($event, data, key, key2, hover)"
-            <img [src]="data[key]" style="width: 200px;height: 160px;" (click)="service.showImg(data[key])" />
+  >
-            <div class="mask" *ngIf="detailData[hover] && isEdit"></div>
+    <ng-container *ngIf="!data[key] && isEdit">
-            <div class="mask-over" *ngIf="detailData[hover] && isEdit">
+      <i class="upload-icon" nz-icon [nzType]="service.http.loading ? 'loading' : 'plus'"></i>
-                <i nz-icon nzType="close-circle" nzTheme="fill" class="delete-icon"
+      <div class="ant-upload-text">上传</div>
-                    (click)="deleteImg(data,key,key2)"></i>
+    </ng-container>
-                <div style="display: flex;align-items: center;">
+    <div
-                    <i nz-icon nzType="eye" nzTheme="fill" class="show-icon" (click)="service.showImg(data[key])"></i>
+      *ngIf="data[key]"
-                </div>
+      (mouseover)="detailData[hover] = true"
-            </div>
+      (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>
+  <h2>转移客户数：10</h2>
-    <st #st [data]="service.$mock_url" [columns]="columns.changeColumn" [loading]="service.http.loading" bordered
+  <st
-        size="small" [page]="{show:false}" [scroll]="{ x:'750px' }">
+    #st
-    </st>
+    [data]="service.$mock_url"
-    <h2>不转移客户数：10</h2>
+    [columns]="columns.changeColumn"
-    <st #st [data]="service.$mock_url" [columns]="columns.beChangeColumn" [loading]="service.http.loading" bordered
+    [loading]="service.http.loading"
-        size="small" [page]="{show:false}" [scroll]="{ x:'750px' }">
+    bordered
-    </st>
+    size="small"
-    <p>
+    [page]="{ show: false }"
-        客户转移：客户跟着上级合伙人转移一并到新渠道销售下，会同步发起CRM《客户转移》流程；不转移的，客户会与上级合伙人解绑，修改成功后，修改时间也是合伙人与客户的结算结束时间，成为原来渠道销售的直客。
+    [scroll]="{ x: '750px' }"
-    </p>
+  >
-</ng-template>
+  </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>

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
+    this.service
-    //   .request(this.service.$api_get_freight_detail, {
+      .request(this.service.$api_get_ent_partner_detail, {
-    //     id: this.route.snapshot.params.id
+        id: this.route.snapshot.params.id
-    //   })
+      })
-    //   .subscribe(res => {
+      .subscribe(res => {
-    //     if (res) {
+        if (res) {
-    //       this.detailData = res;
+          this.detailData = res;
-    //       this.tempalateData = { ...this.detailData };
+          console.log(this.detailData);
-    //       this.enterpriseAddressCode = [
+
-    //         Number(this.detailData.fullRegionVO?.provinceCode),
+          this.tempalateData = { ...this.detailData };
-    //         Number(this.detailData.fullRegionVO?.cityCode),
+          if (this.detailData?.cityCodes) {
-    //         Number(this.detailData.fullRegionVO?.areaCode)
+            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, {
+    Object.assign(dateil.legalPersonIdentity, {
-      validStartTime: this.datePipe.transform(dateil.legalPersonIdentityVO.validStartTime, 'yyyy-MM-dd'),
+      validStartTime: this.datePipe.transform(dateil.legalPersonIdentity.validStartTime, 'yyyy-MM-dd'),
-      validEndTime: this.datePipe.transform(dateil.legalPersonIdentityVO.validEndTime, '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: 'newChannelId', width: 180 },
-        { title: '修改前渠道销售', index: 'ltdName', width: 160 },
+        { title: '修改前渠道销售', index: 'originalChannelId', width: 160 },
-        { title: '转移客户数', index: 'payDate', className: 'text-center', width: 130 },
+        { title: '转移客户数', index: 'quantity', className: 'text-center', width: 130 },
-        { title: '生效节点', index: 'payDate', width: 150 },
+        { title: '生效节点', index: 'effectiveNode', width: 150, type: 'enum', enum: { 1: '立即生效', 2: 'CRM审核后生效' } },
-        { title: '备注', index: 'payDate', className: 'text-center', width: 150 },
+        { title: '备注', index: 'remark', className: 'text-center', width: 150 },
-        { title: '修改时间', index: 'payDate', className: 'text-center', width: 130 },
+        { title: '修改时间', index: 'modifyTime', className: 'text-center', width: 130 },
-        { title: '操作人', index: 'payDate', type: 'date', width: 130 },
+        { title: '操作人', index: 'modifyUserId', type: 'date', width: 130 },
         {
           title: '操作',
           fixed: 'right',

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.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 ? '' : '-'"
+      />
+    </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.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">
+        <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>
+      <ng-container *ngIf="isEdit">
+        <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="
+            uploadTemplate;
+            context: {
+              data: detailData?.adminUserInfo,
+              status: isEdit,
+              key: 'certificatePhotoFrontWatermark',
+              key2: 'certificatePhotoFront',
+              hover: 'legalFront'
+            }
+          "
+        >
+        </ng-container>
+        <ng-container
+          *ngTemplateOutlet="
+            uploadTemplate;
+            context: {
+              data: detailData?.adminUserInfo,
+              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>

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;
+  }
+}

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;
+    //         }
+    //       }
+    //     }
+    //   }
+    // });
+  }
+}

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查询地区详情

src/app/routes/partner/partner-routing.module.ts

@@ -10,41 +10,45 @@
  */
 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 { PartnerSaleCustomDetailComponent } from './business-statistics/components/sale-custom-detail/sale-custom-detail.component';
-import { ParterClaimAuditListComponent } from './claim-audit/components/list/list.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 { ParterRebateManageMentAddComponent } from './rebate-management/components/rebate-setting/add/add.component';
-import { PartnerRecordedDetailComponent } from './recorded/components/detail/detail.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';
+import { ParterAdviceFeedbackListComponent } from './advice-feedback/components/list/list.component';
+import { ParterAdviceFeedbackDetailComponent } from './advice-feedback/components/feedback-detail/feedback-detail.component';
 
 const routes: Routes = [
   {
@@ -81,7 +85,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 +97,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 +108,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 +134,15 @@ const routes: Routes = [
     children: [
       { path: '', component: ScrollImgComponentsListComponent },
       { path: 'list', component: ScrollImgComponentsListComponent },
-      { path: 'detail', component: ScrollimgComponentsAddComponent },
+      { path: 'detail', component: ScrollimgComponentsAddComponent }
+    ]
+  },
+  {
+    path: 'advice-feedback',
+    children: [
+      { path: '', component: ParterAdviceFeedbackListComponent },
+      { path: 'list', component: ParterAdviceFeedbackListComponent },
+      { path: 'detail', component: ParterAdviceFeedbackDetailComponent }
     ]
   },
   {
@@ -147,13 +159,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', component: BannerComponentsListComponent },
-      { path: 'banner/detail', component: BannerComponentsAddComponent },
+      { path: 'banner/detail', component: BannerComponentsAddComponent }
     ]
-  },
+  }
 ];
 @NgModule({
   imports: [RouterModule.forChild(routes)],
   exports: [RouterModule]
 })
-export class PartnerRoutingModule { }
+export class PartnerRoutingModule {}

src/app/routes/partner/partner.module.ts

@@ -58,6 +58,9 @@ 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';
+import { ParterAdviceFeedbackListComponent } from './advice-feedback/components/list/list.component';
+import { ParterAdviceFeedbackDetailComponent } from './advice-feedback/components/feedback-detail/feedback-detail.component';
 
 const COMPONENTS: any[] = [
   PartnerBusinessStatisticsIndexComponent,
@@ -105,7 +108,10 @@ const COMPONENTS: any[] = [
   PartnerKnowledgeClassificationListComponent,
   PartnerEditComponent,
   BannerComponentsListComponent,
-  BannerComponentsAddComponent
+  BannerComponentsAddComponent,
+  PersonalPartnerDetailComponent,
+  ParterAdviceFeedbackListComponent,
+  ParterAdviceFeedbackDetailComponent
 ];
 
 @NgModule({
@@ -113,4 +119,4 @@ const COMPONENTS: any[] = [
   imports: [CommonModule, PartnerRoutingModule, SharedModule],
   providers: [PartnerListService]
 })
-export class PartnerModule { }
+export class PartnerModule {}

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);
       }
     });
   }

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 }}

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);

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_page = `/api/bpc/partnerInvoiceEntry/queryInvoiceEntrylist`; // 查询合伙人发票入账主表
-  $api_get_recorded_record_detail = `api/bpc/partnerInvoice/getDetailByOpration`; // 入账记录详情
+  $api_get_recorded_record_detail = `/api/bpc/partnerInvoice/getDetailByOpration`; // 入账记录详情
   $api_disagree_recorded = ``; // 拒绝审核
   $api_agree_recorded = ``; // 同意审核
   $api_audit_recored = `/api/bpc/partnerInvoiceEntry/oprationAudit`; // 审核单据

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",

src/styles.less

@@ -7,11 +7,11 @@
 @import './styles/theme';
 
 .icon {
-    width    : 18px;
+    width       : 18px;
-    fill     : currentColor;
+    fill        : currentColor;
-    overflow : hidden;
+    overflow    : hidden;
-    font-size: 18px !important;
+    font-size   : 18px !important;
-    color    : #ffffff;
+    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;
+    }
 }