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

proxy.conf.js

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-18 09:51:21
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-05-11 19:19:55
+ * @LastEditTime : 2022-05-12 17:15:50
  * @FilePath     : \\tms-obc-web\\proxy.conf.js
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */

src/app/routes/commom/components/basic-table/basic-table.component.ts

@@ -1,5 +1,5 @@
 import { AfterViewInit, Component, OnDestroy, OnInit } from '@angular/core';
-import { OnReuseDestroy } from '@delon/abc/reuse-tab';
+import { OnReuseDestroy, OnReuseInit, ReuseHookOnReuseInitType } from '@delon/abc/reuse-tab';
 import { SFComponent, SFSchema } from '@delon/form';
 import { SearchDrawerService } from '@shared';
 import { fromEvent, Subscription } from 'rxjs';
@@ -25,7 +25,7 @@ import { debounceTime } from 'rxjs/operators';
 @Component({
   template: ''
 })
-export class BasicTableComponent implements AfterViewInit, OnDestroy, OnReuseDestroy {
+export class BasicTableComponent implements AfterViewInit, OnDestroy, OnReuseDestroy, OnReuseInit {
   scrollY = '400px';
 
   sf!: SFComponent;
@@ -35,6 +35,9 @@ export class BasicTableComponent implements AfterViewInit, OnDestroy, OnReuseDes
   deviationHeight = 0;
 
   constructor(public searchDrawerService: SearchDrawerService) {}
+  _onReuseInit(type?: ReuseHookOnReuseInitType): void {
+    this.search();
+  }
 
   ngAfterViewInit(): void {
     setTimeout(() => {
@@ -48,8 +51,6 @@ export class BasicTableComponent implements AfterViewInit, OnDestroy, OnReuseDes
   }
 
   _onReuseDestroy(): void {
-    console.log(1);
-
     // this.drawer.forEach(sub => sub.unsubscribe());
   }
 

src/app/routes/datatable/components/dataindex/dataindex.component.ts

@@ -53,7 +53,9 @@ export class DatatableDataindexComponent implements OnInit, AfterViewInit {
     this.service.request(this.service.$api_total_advance_deposit).subscribe((res: DataTotalVO) => {
       if (res) {
         this.totalAdvanceDeposit = this.formatMiniAreaData(res);
+        setTimeout(() => {
           this.initAreaMap(this.AdvanceDeposit['el'].nativeElement as any, []);
+        }, 400);
       }
     });
     // 业绩量总额
@@ -82,8 +84,9 @@ export class DatatableDataindexComponent implements OnInit, AfterViewInit {
       if (res) {
         const billTypeDatas2 = this.formatCoordinateData(res);
         console.log(billTypeDatas2);
-
+        setTimeout(() => {
           this.initBillChart(this.g2custom['el'].nativeElement as any, billTypeDatas2);
+        }, 100);
       }
     });
     // 大区业绩完成情况
@@ -92,30 +95,35 @@ export class DatatableDataindexComponent implements OnInit, AfterViewInit {
         // this.regionalPerformanceCompletion = res.map(item => ({ ...item, time: new Date(item.time)?.getTime() }));
         // this.initRegionalPerformanceChart(this.RegionalPerforman['el'].nativeElement as any, this.regionalPerformanceCompletion);
         this.regionalPerformanceCompletion = this.formatBarData(res);
+        setTimeout(() => {
           this.initBiaxialChart(this.RegionalPerforman['el'].nativeElement as any, this.regionalPerformanceCompletion, {
             y1Title: '业绩量(万)',
             y2Title: '业绩完成率',
             y3Title: '同期业绩完成率'
           });
+        }, 100);
       }
     });
     // 订单类型比例
     this.service.request(this.service.$api_getWayBillDirectProportion).subscribe(res => {
       if (res) {
         const billTypeDatas = this.formatCoordinateData(res.map((item: any) => ({ ...item, billType: item.wayBillType })));
-        console.log(billTypeDatas);
+        setTimeout(() => {
           this.initBillChart(this.BillDirectProportion['el'].nativeElement as any, billTypeDatas);
+        }, 100);
       }
     });
     // 统计订单结算金额-趋势
     this.service.request(this.service.$api_get_bill_payment_amount).subscribe(res => {
       if (res) {
         this.salesData = this.formatBarData(res);
+        setTimeout(() => {
           this.initBiaxialChart(this.SaleProportion['el'].nativeElement as any, this.salesData, {
             y1Title: '业绩量(万)',
             y2Title: '业绩完成率',
             y3Title: '同期业绩完成率'
           });
+        }, 100);
       }
     });
   }

src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-04-28 20:27:07
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-05-12 13:59:31
+ * @LastEditTime : 2022-05-12 14:57:21
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\account-management\\components\\recorded-detail\\recorded-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -85,7 +85,7 @@
         <div>{{ item.waitRecordedTaxPersonal | currency }}</div>
       </ng-template>
       <ng-template st-row="changeAmount" let-item>
-        <div>{{ item.changeAmount | currency }}</div>
+        <div (click)="changeB(item)" style="color: #1890ff;">{{ item.changeAmount | currency }}</div>
       </ng-template>
       <ng-template st-row="waitRecordedAmount" let-item>
         <div>{{ item.waitRecordedAmount | currency }}</div>
@@ -123,6 +123,30 @@
     </st>
   </div>
 </nz-modal>
+<nz-modal [(nzVisible)]="showBillDetailB" nzTitle="调整待入账金额记录" [nzFooter]="null" (nzOnCancel)="handleCancelB()" nzWidth="900px">
+  <div *nzModalContent>
+    <div class="mb-sm">
+      <span class="mr-xxl text-sm font-weight-bold"><label>网络货运人：</label>{{ changeRecordB?.ltdName }}</span>
+      <span class="text-sm font-weight-bold"><label>调整金额（元）：</label>{{ changeRecordB?.changeAmount | currency: ' ' }}</span>
+    </div>
+    <st
+      #stB
+      [scroll]="{x: '700px'}"
+      [data]="billDetailListB"
+      [columns]="billDetailColumnsB"
+      [res]="{ reName: { list: 'data' } }"
+      [req]="{ method: 'POST', allInBody: true, params: billDetailReqParams }"
+      [page]="{ show: false }"
+    >
+      <ng-template st-row="changeAmount" let-item>
+        <div> {{item.changeAmount | currency}}</div>
+      </ng-template>
+      <ng-template st-row="createUserName" let-item>
+        <div>{{ item?.createUserName ?  item?.createUserName : '--'}}/{{item?.createUserPhone ? item?.createUserPhone : '--'}}</div>
+      </ng-template>
+    </st>
+  </div>
+</nz-modal>
 <nz-modal [(nzVisible)]="changeAccount" nzTitle="账户明细" [nzFooter]="nzModalFooter" (nzOnCancel)="handleCancelA()" nzWidth="600px">
   <div *nzModalContent>
       <div style="display: flex; justify-content: center; align-items: center;font-weight: 700; font-size: 16px; padding: 10px 0;"><label>网络货运人：</label>{{ changeRecord?.ltdName }}</div>

src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts

@@ -32,19 +32,24 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit {
 
   detailRecord: any = {};
   changeRecord: any = {};
+  changeRecordB: any = {};
 
   url = `/user`;
   schema: SFSchema = {};
   ui!: SFUISchema;
   @ViewChild('st') private readonly st!: STComponent;
+  @ViewChild('stB') private readonly stB!: STComponent;
   @ViewChild('sf') private readonly sf!: SFComponent;
 
   columns: STColumn[] = [];
   billDetailColumns: STColumn[] = [];
+  billDetailColumnsB: STColumn[] = [];
   showBillDetail = false;
   changeAccount = false;
+  showBillDetailB = false;
   addd = false;
   billDetailList = [];
+  billDetailListB = [];
   roleId = '';
   changeAmount: number = 0;
   constructor(public service: AccountManagemantService, public router: Router, public ar: ActivatedRoute, private nzModalService: NzModalService,) {
@@ -142,6 +147,14 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit {
       }
     ];
   }
+  initBillDetailSTB() {
+    this.billDetailColumnsB = [
+      { title: '调整金额（元）', render: 'changeAmount', className: 'text-center', width: '150px' },
+      { title: '备注', index: 'remark', className: 'text-center', width: '200px' },
+      { title: '操作时间', index: 'modifyTime', className: 'text-center', width: '200px' },
+      { title: '操作人', index: 'createUserName', className: 'text-center', width: '150px' },
+    ];
+  }
   initSFNew() {
     this.schemaView = {
       properties: {
@@ -200,6 +213,21 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit {
     });
   }
 
+  /**
+   * 获取入账金额记录
+   */
+  getBillDetailB(ltdId: string) {
+    let params = {
+      ltdId: ltdId,
+      partnerId: this.roleId ,
+    }
+    this.service.request(this.service.$api_get_getIncomeChangePage, params).subscribe(res => {
+      if (res) {
+        this.billDetailListB = res.records;
+      }
+    });
+  }
+
   export() {}
 
   /**
@@ -221,6 +249,17 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit {
     this.detailRecord = record;
     this.getBillDetail(record?.ltdId);
   }
+  /**
+   * 查看调整金额
+   * @param record 当前行
+   */
+   changeB(record: any) {
+    // this.billDetailColumns = [];
+    this.showBillDetailB = true;
+    this.initBillDetailSTB();
+    this.changeRecordB = record;
+    this.getBillDetailB(record?.ltdId);
+  }
   /**
    * 调整待入账金额
    * @param record 当前行
@@ -230,7 +269,8 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit {
     this.changeRecord = record;
     let params:any = {
       partnerId: this.roleId ,
-      ltdId: record.ltdId
+      ltdId: record.ltdId,
+      ltdName: record.ltdName,
     }
     this.service.request(this.service.$api_get_getPartnerLitAmountSummary, params).subscribe(res => {
       if (res) {
@@ -263,6 +303,10 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit {
     this.changeAccount = false;
     this.changeRecord = {};
   }
+  handleCancelB() {
+    this.showBillDetailB = false;
+    this.changeRecordB = {};
+  }
   goBack() {
     window.history.go(-1);
   }

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

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-04-21 13:49:22
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-05-11 19:56:49
+ * @LastEditTime : 2022-05-12 14:44:17
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\account-management\\services\\account-managemant.service.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -27,6 +27,7 @@ export class AccountManagemantService extends ShipperBaseService  {
   $api_get_invoice_detail_page = `/api/bpc/partnerInvoiceEntry/oprationEntryDetail`; // 待入账明细列表
   $api_get_getPartnerLitAmountSummary = `/api/bpc/partnerInvoiceEntry/getPartnerLitAmountSummary`; // 查询合伙货运人相关金额
   $api_get_saveIncomeChange = `/api/bpc/partnerIncomeChange/saveIncomeChange`; // 调整金额
+  $api_get_getIncomeChangePage = `/api/bpc/partnerIncomeChange/getIncomeChangePage`; // 调整金额
 
   constructor(public injector: Injector) {
     super(injector)

src/app/routes/partner/level-config/components/list/list.component.html

@@ -4,10 +4,11 @@
  * @Author       : Shiming
  * @Date         : 2022-04-29 17:28:23
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-05-11 11:28:35
+ * @LastEditTime : 2022-05-12 16:55:43
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\level-config\\components\\list\\list.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
+<page-header-wrapper [title]="'等级配置'"> </page-header-wrapper>
 <nz-card>
   <!-- 搜索区 -->
   <sf

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

@@ -569,12 +569,14 @@ export class AddEtpPartnerComponent {
         cityCodesList: {
           type: 'string',
           title: '所属城市',
+          maxMultipleCount: 3,
           ui: {
             widget: 'tree-select',
             grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
             placeholder: '请选择城市(最多3个)',
             checkable: true,
             class: 'city-tree-select',
+            maxMultipleCount: 3,
             asyncData: () =>
               this.getRegionDetailByCode('').pipe(
                 map((res: any) =>

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

@@ -299,9 +299,12 @@ export class AddPersonalPartnerComponent {
         _addressTitle: { title: '', type: 'string', ui: { widget: 'custom' } },
         cityCodesList: {
           type: 'string',
-          title: '所属城市',
+          title: '所属城市7',
+          maxMultipleCount: 3,
           ui: {
             widget: 'tree-select',
+            maxMultipleCount: 3,
+            maxTagCount: 3,
             grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
             placeholder: '请选择城市(最多3个)',
             checkable: true,
@@ -363,7 +366,7 @@ export class AddPersonalPartnerComponent {
     ]);
     this.sf.setValue('/adminUserInfo/certificateNumber', info?.certificateNumber);
     this.sf.setValue('/adminUserInfo/validStartTime', info?.validStartTime);
-      this.sf.setValue('/adminUserInfo/validEndTime', info?.validEndTime ? info?.validEndTime: null);
+    this.sf.setValue('/adminUserInfo/validEndTime', info?.validEndTime ? info?.validEndTime : null);
-      this.sf.setValue('/adminUserInfo/_isLoingDate', info?.validEndTime ? false: true);
+    this.sf.setValue('/adminUserInfo/_isLoingDate', info?.validEndTime ? false : true);
   }
 }

src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-02-24 20:09:49
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-29 13:40:16
+ * @LastEditTime : 2022-05-12 16:43:10
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-record\\rebate-record.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -33,7 +33,7 @@
   <!-- 数据列表 -->
   <st
     #st
-    [data]="service.$api_get_getIncomeByBillpage"
+    [data]="service.$api_get_partnerIncomeHead"
     [columns]="columns"
     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
     [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
@@ -42,7 +42,10 @@
     [loading]="service.http.loading"
   >
   <ng-template st-row='abnormalFeedback' let-item let-index='index'>
-    <div style="color: #f59a23;" (click)="feedback()">123212{{item?.abnormalFeedback}}</div>
+    <div style="color: #f59a23;" (click)="feedback(item)">123212{{item?.abnormalFeedback}}</div>
+  </ng-template>
+  <ng-template st-row='profitAmountSum' let-item let-index='index'>
+    <div >{{item?.profitAmountSum | currency}}</div>
   </ng-template>
   </st>
 </nz-card>

src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.ts

@@ -68,11 +68,11 @@ export class ParterRebateManageMentRecordComponent implements OnInit {
       {
         title: '月份',
         index: 'month',
-        format: (item: any) => {return item?.month ? item?.month + '月' : ''}
+        format: (item: any) => {return ((item?.year ? item?.year + '-' : '') + (item?.month ? item.month  : ''))}
       },
       {
         title: '返佣金额（元）',
-        index: 'name1'
+        render: 'profitAmountSum'
       },
       {
         title: '合伙人名称',
@@ -80,15 +80,16 @@ export class ParterRebateManageMentRecordComponent implements OnInit {
       },
       {
         title: '实际等级',
-        index: 'name1'
+        index: 'partnerGrade'
       },
       {
         title: '管理费比例',
-        index: 'rebateRatio'
+        index: 'manageFeeRatio',
+        format: (item) => {return item.manageFeeRatio + '%' }
       },
       {
         title: '返佣时间',
-        index: 'name1'
+        index: 'returnCommissionTime'
       },
       {
         title: '异常反馈',
@@ -117,7 +118,7 @@ export class ParterRebateManageMentRecordComponent implements OnInit {
       nzTitle: '明细',
       nzWidth: 1200,
       nzContent: ParterRebateManageMenRecordDetailComponent,
-      nzComponentParams: { },
+      nzComponentParams: { record: item },
       nzFooter: null
     });
     modal.afterClose.subscribe((res: any) => {

src/app/routes/partner/rebate-management/model/abnormal-feedback/abnormal-feedback.component.html

@@ -4,23 +4,22 @@
  * @Author       : Shiming
  * @Date         : 2022-02-24 20:09:49
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-10 15:10:47
+ * @LastEditTime : 2022-05-12 17:43:46
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\model\\abnormal-feedback\\abnormal-feedback.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
 <sv-container col="1">
-  <sv label="异常反馈">
+  <sv *ngFor="let item of mybidDetailInfo"  label="异常反馈" >
-    <div>有订单有异常请查看 </div>
+    <div>{{item.feedbackInfo}} </div>
-    <div>2022-09-08  00:00:00 </div>
+    <div>{{item.createTime}}  </div>
+    <sv label="回复" *ngIf="item.replyVOList">
+      <div>{{item.replyVOList}} </div>
+      <div>{{item.feedbackInfo}}  </div>
+    </sv>
+  </sv>
+  <sv *ngIf="mybidDetailInfo.length == 0"label="异常反馈" >
+    <div>暂无反馈信息 </div>
   </sv>
-  <!-- <sv label="异常反馈">
-    <p *ngFor="let data of i?.mybidDetailInfo; let index = index">
-      <label *ngIf="data?.paymentStatusLabel == '已支付'">
-        <span>{{data?.expenseName}}</span>
-        <span>{{ data.price | number: '0.2-2' }}</span>
-      </label>
-    </p>
-  </sv> -->
 </sv-container>
 <div>
   <sf

src/app/routes/partner/rebate-management/model/abnormal-feedback/abnormal-feedback.component.ts

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-03-10 14:50:45
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-10 15:09:51
+ * @LastEditTime : 2022-05-12 17:54:15
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\model\\abnormal-feedback\\abnormal-feedback.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -24,17 +24,30 @@ export class ParterRebateManageMenAbnormalFeedbackComponent implements OnInit {
   @ViewChild('sf', { static: false })
   sf!: SFComponent;
   i!: any;
+  mybidDetailInfo: any = [];
   data = [{ name1: 1111 }];
   constructor(public service: RebateManagementService, public shipperservice: ShipperBaseService, public modalRef: NzModalRef) {}
 
   ngOnInit() {
     this.initSF();
+    this.initData();
   }
+  initData() {
+    if (this.i) {
+      console.log(this.i);
 
+      this.service
+        .request(this.service.$api_get_getExceptionMessage, { partnerId: this.i?.partnerId, month: this.i.month, year: this.i.year })
+        .subscribe(res => {
+          console.log(res);
+          this.mybidDetailInfo = res;
+        });
+    }
+  }
   initSF() {
     this.schema = {
       properties: {
-        name3: {
+        feedbackInfo: {
           type: 'string',
           title: '回复',
           maxLength: 50,
@@ -54,6 +67,21 @@ export class ParterRebateManageMenAbnormalFeedbackComponent implements OnInit {
     };
   }
   close() {
+    if (!this.sf.valid) {
+      this.service.msgSrv.error('请填写必填项！');
+      return;
+    }
+    let params = {
+      partnerId: this.i?.partnerId,
+      month: this.i.month,
+      year: this.i.year,
+      ...this.sf.value
+    };
+    this.service.request(this.service.$api_get_partnerIncomeExceptionAdd,params).subscribe((res) => {
+      if(res) {
+      this.service.msgSrv.success('保存成功！');
         this.modalRef.destroy();
       }
+    })
+  }
 }

src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.html

@@ -23,7 +23,7 @@
   <st
     #st
     [bordered]="true"
-    [data]="service.$api_get_listCompliancePage"
+    [data]="service.$api_get_partnerIncomeDetail"
     [columns]="columns"
     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
     [res]="{ reName: { list: 'data.records', total: 'data.total' } }"

src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.ts

@@ -21,6 +21,7 @@ export class ParterRebateManageMenRecordDetailComponent implements OnInit {
   spuStatus = '1';
   size: NzButtonSize = 'large';
   _$expand = false;
+  record: any;
   data = [{ name1: 1111 }];
   constructor(public service: RebateManagementService, public shipperservice: ShipperBaseService, public modalRef: NzModalRef) {}
   /**
@@ -43,10 +44,13 @@ export class ParterRebateManageMenRecordDetailComponent implements OnInit {
     const params: any = Object.assign({}, this.sf?.value || {});
     delete params._$expand;
     return {
+      partnerId: this.record.partnerId,
       ...params
     };
   }
   ngOnInit() {
+    console.log(this.record);
+
     this.initSF();
     this.initST();
   }
@@ -54,7 +58,7 @@ export class ParterRebateManageMenRecordDetailComponent implements OnInit {
   initSF() {
     this.schema = {
       properties: {
-        enterpriseInfoId: {
+        ltdId: {
           type: 'string',
           title: '网络货运人',
           ui: {
@@ -68,18 +72,27 @@ export class ParterRebateManageMenRecordDetailComponent implements OnInit {
             }
           }
         },
-        paymentStatus: {
+        bankType: {
           title: '银行类型',
           type: 'string',
-          ui: {
+          enum: [
-            widget: 'dict-select',
+            {
-            params: { dictKey: 'overall:payment:status' },
+              label: '全部',
-            containsAllLabel: true,
+              value: ''
-            change: (value: any) => {
+            },
-              console.log(value);
+            {
-              this.st.reload();
+              label: '平安银行',
+              value: '1'
+            },
+            {
+              label: '浦发银行',
+              value: '2'
+            }
+          ],
+          ui: {
+            widget: 'select',
+            containsAllLabel: true
           }
-          } as SFSelectWidgetSchema
         }
       }
     };
@@ -93,6 +106,10 @@ export class ParterRebateManageMenRecordDetailComponent implements OnInit {
 
   initST() {
     this.columns = [
+      {
+        title: '网络货运人',
+        index: 'billCode'
+      },
       {
         title: '订单号',
         index: 'billCode'
@@ -106,7 +123,7 @@ export class ParterRebateManageMenRecordDetailComponent implements OnInit {
         index: 'name1'
       },
       {
-        title: '预估返佣金额（元）',
+        title: '返佣金额（元）',
         index: 'name1'
       },
       {
@@ -118,27 +135,11 @@ export class ParterRebateManageMenRecordDetailComponent implements OnInit {
         index: 'name1'
       },
       {
-        title: '网络货运人',
+        title: '银行类型',
         index: 'name1'
       },
       {
-        title: '销售渠道',
+        title: '虚拟账户',
-        index: 'name1'
-      },
-      {
-        title: '合伙人名称',
-        index: 'name1'
-      },
-      {
-        title: '合伙人等级',
-        index: 'name1'
-      },
-      {
-        title: '管理费比例',
-        index: 'name1'
-      },
-      {
-        title: '固定结算费率',
         index: 'name1'
       },
       {

src/app/routes/partner/rebate-management/services/rebate-management.service.ts

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-03-10 11:19:00
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-25 19:23:25
+ * @LastEditTime : 2022-05-12 15:36:23
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\services\\rebate-management.service.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -12,7 +12,7 @@ import { Injectable, Injector } from '@angular/core';
 import { BaseService } from '@shared';
 
 @Injectable({
-  providedIn: 'root',
+  providedIn: 'root'
 })
 export class RebateManagementService extends BaseService {
   // 查询规则抽查列表
@@ -24,17 +24,26 @@ export class RebateManagementService extends BaseService {
   // 启用/禁用返佣配置
   public $api_set_updateRebateConfig = '/api/mdc/rebateConfig/updateRebateConfig';
 
-
   // 运营端查询合伙人返佣
   public $api_get_getIncomeByBillpage = '/api/bpc/partnerIncomeHead/getIncomeByBillpage';
   // 获取返佣模板信息
   public $api_get_getPartnerRebateConfigInfo = '/api/mdc/rebateConfig/getPartnerRebateConfigInfo';
   // 合伙人管理/返佣管理/返佣明细
-  public $api_get_searchPageList= '/api/fcc/billPaymentApplicationOBC/list/searchPageList';
+  public $api_get_searchPageList = '/api/fcc/billPaymentApplicationOBC/list/searchPageList';
   // 合伙人管理/返佣管理/退款返佣明细
-  public $api_get_searchRefundPageList= '/api/fcc/billPaymentApplicationOBC/list/searchRefundPageList';
+  public $api_get_searchRefundPageList = '/api/fcc/billPaymentApplicationOBC/list/searchRefundPageList'; // 查询合伙人信息-分页
-    // 查询合伙人信息-分页
+  public $api_get_partner_page = '/api/mdc/partner/list/page'; 
-  public $api_get_partner_page = '/api/mdc/partner/list/page';
+  
+  // 查询查询返佣记录列表-分页
+  public $api_get_partnerIncomeHead = '/api/fcc/partnerIncomeHead/list/rebate'; 
+  // 查询返佣记录明细
+  public $api_get_partnerIncomeDetail = '/api/fcc/partnerIncomeDetail/rebate/detail';
+  // 导出返佣记录明细
+  public $api_get_partnerIncomeHead_export = '/api/fcc/partnerIncomeDetail/rebate/detail/export';
+  // 根据合伙人id、年、月 查询异常反馈信息(反馈异常查下)
+  public $api_get_getExceptionMessage = '/api/fcc/partnerIncomeDetailException/getExceptionMessage';
+  // 保存合伙人收益账单详情-异常反馈表(反馈异常提交)
+  public $api_get_partnerIncomeExceptionAdd = '/api/fcc/partnerIncomeDetailException/partnerIncomeExceptionAdd';
   constructor(public injector: Injector) {
     super(injector);
   }

src/app/routes/partner/recorded/components/detail/detail.component.ts

@@ -26,12 +26,19 @@ export class PartnerRecordedDetailComponent implements OnInit {
     this.service.request(this.service.$api_get_recorded_record_detail, { id }).subscribe(res => {
       if (res) {
         this.formData = res;
+       
+      }
+    });
+    this.service.request(this.service.$api_get_getPartnerInvoiceEntryDetail, { id }).subscribe(res => {
+      if (res) {
         // 处理流程节点数据
         // 流程是否结束
+        console.log(res);
+        // submitTime creattime
         let isEnd = false;
-        if (res.successTime) {
+        if (res.reAuditTime) {
           isEnd = true;
-          if (res.refundStatus === '3') {
+          if (res.sts === '3') {
             this.timeLineData.push({ time: res.successTime, value: `到账成功`, color: 'green' });
           } else {
             this.timeLineData.push({ time: res.successTime, value: `提现失败`, color: 'red' });
@@ -40,6 +47,22 @@ export class PartnerRecordedDetailComponent implements OnInit {
         if (res.agreeTime && res.refundStatus !== '4') {
           this.timeLineData.push({ time: res.agreeTime, value: `银行处理中`, color: 'gray' });
         }
+        if (res.reAuditTime) {
+          if (res.refundStatus === '4') {
+            isEnd = true;
+            this.timeLineData.push({
+              time: res.reAuditTime,
+              value: `拒绝提现<br/>操作人员：${res.handlerUserIdLabel}`,
+              color: 'red'
+            });
+          } else {
+            this.timeLineData.push({
+              time: res.reAuditTime,
+              value: `审核通过<br/>操作人员：${res.handlerUserIdLabel}`,
+              color: 'gray'
+            });
+          }
+        }
         if (res.agreeTime) {
           if (res.refundStatus === '4') {
             isEnd = true;

src/app/routes/partner/recorded/services/recorded.service.ts

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-04-21 13:49:22
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-25 11:11:58
+ * @LastEditTime : 2022-05-12 15:02:19
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\recorded\\services\\recorded.service.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -22,6 +22,7 @@ export class RecordedService extends BaseService {
   $api_agree_recorded = ``; // 同意审核
   $api_audit_recored = `/api/bpc/partnerInvoiceEntry/oprationAudit`; // 审核单据
   $api_get_list_summary = `/api/bpc/partnerInvoiceEntry/invoiceEntrySummary`; // 每页统计
+  $api_get_getPartnerInvoiceEntryDetail = `/api/bpc/partnerInvoiceEntry/getPartnerInvoiceEntryDetail`; // 获取合伙人发票入账明细
   constructor(public injector: Injector) {
     super(injector);
   }

src/app/routes/ticket-management/components/express-info/express-detail-modal/express-detail-modal.component.ts

@@ -66,7 +66,7 @@ export class ExpressDetailModalComponent implements OnInit {
           placeholder: '发票号码'
         }
       },
-      expressno: {
+      vatinvcode: {
         title: '',
         type: 'string',
         ui: {

src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts

@@ -148,6 +148,7 @@ export class FreightComponentsEnterpriseAuditComponent extends BasicTableCompone
             {
               label: '通过',
               type: 'primary',
+              loading: this.service.http.loading,
               onClick: () => {
                 this.adminAuditUser(
                   {
@@ -258,7 +259,7 @@ export class FreightComponentsEnterpriseAuditComponent extends BasicTableCompone
         className: 'text-center',
         index: 'province',
         width: 200,
-        format: item => `${item.provinceName}${item.cityName}${item.areaName}`
+        format: item => `${item.provinceName ? item.provinceName: ''}${item.cityName ? item.cityName: ''}${item.areaName ? item.areaName: ''}`
       },
       {
         title: '企业类型',

src/app/routes/usercenter/components/freight/list/detail/detail.component.ts

@@ -505,9 +505,9 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy {
         if (res.name) {
           this.detailData.enterpriseName = res.name;
         }
-        if (res.type) {
+        // if (res.type) {
-          this.detailData.enterpriseType = res.type;
+        //   this.detailData.enterpriseType = res.type;
-        }
+        // }
         if (res.addressRegionCodes) {
           this.detailData.enterpriseAddressCode = res.addressRegionCodes;
         }

src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts

@@ -3,7 +3,7 @@ import { SFComponent, SFRadioWidgetSchema, SFSchema, SFUISchema } from '@delon/f
 import { ShipperBaseService } from '@shared';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { UsermanageService } from 'src/app/routes/usercenter/services/usercenter.service';
-import { NzModalRef } from 'ng-zorro-antd/modal';
+import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
 
 @Component({
   selector: 'app-ad-components-partner',
@@ -23,7 +23,8 @@ export class EditPartnerComponentsAddComponent implements OnInit {
     public msgSrv: NzMessageService,
     public service: UsermanageService,
     private modal: NzModalRef,
-    public shipperservice: ShipperBaseService
+    public shipperservice: ShipperBaseService,
+    public nzModalService: NzModalService
   ) {}
 
   ngOnInit(): void {
@@ -139,7 +140,9 @@ export class EditPartnerComponentsAddComponent implements OnInit {
       enterpriceIds: enterId,
       settStartTime: this.sf?.value?.settStartTime + ' 00:00:00'
     };
-
+    this.nzModalService.warning({
+      nzTitle: '确定提交吗？',
+      nzOnOk: () => {
         this.service.request(this.service.$api_batchUpdateEnterpricePartner, params).subscribe(res => {
           if (res) {
             this.service.msgSrv.success('修改成功');
@@ -147,4 +150,7 @@ export class EditPartnerComponentsAddComponent implements OnInit {
           }
         });
       }
+    });
+   
+  }
 }

src/app/routes/usercenter/components/freight/list/list.component.ts

@@ -382,7 +382,7 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen
         title: '公司所在地',
         index: 'province',
         width: 200,
-        format: item => `${item.provinceName}${item.cityName}${item.areaName}`
+        format: item => `${item.provinceName ? item.provinceName: ''}${item.cityName ? item.cityName: ''}${item.areaName ? item.areaName: ''}`
       },
       { title: '管理员', render: 'contacter', width: 150 },
       { title: '统一社会信用代码', className: 'text-center', render: 'unifiedSocialCreditCode', width: 200 },