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

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/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 15:42:27
  * @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' } }"
@@ -44,5 +44,8 @@
   <ng-template st-row='abnormalFeedback' let-item let-index='index'>
     <div style="color: #f59a23;" (click)="feedback()">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

@@ -72,7 +72,7 @@ export class ParterRebateManageMentRecordComponent implements OnInit {
       },
       {
         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: '异常反馈',

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

@@ -1,10 +1,10 @@
 /*
- * @Description  : 
+ * @Description  :
  * @Version      : 1.0
  * @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: '企业类型',