fix bug

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)