edit

src/app/routes/financial-management/components/advance-collection/advance-collection-detail/advance-collection-detail.component.html

@@ -60,8 +60,8 @@
                 </ng-template>
             </st>
         </nz-tab>
-        <!-- <nz-tab nzTitle="核销信息">
-            <div nz-row nzGutter="8">
+        <nz-tab nzTitle="核销信息">
+            <!-- <div nz-row nzGutter="8">
                 <div nz-col [nzXl]="16" [nzLg]="18" [nzSm]="24" [nzXs]="24">
                     <sf #sf [schema]="infoSearchSchema"
                         [ui]="{ '*': { spanLabelFixed: 90,grid: { lg: 12, md: 12, sm: 12, xs: 24 } }}" [compact]="true"
@@ -72,13 +72,15 @@
                         (click)="infoST?.load(1)">查询</button>
                     <button nz-button (click)="resetInfoSF()">重置</button>
                 </div>
-            </div>
-            <st #infoST [scroll]="{ x: '2000px' }" [data]="[]" [columns]="columns.info" [req]="{ process: beforeReq }"
-                [loading]="service.http.loading" [scroll]="{ x: '1200px', y: '370px' }" class="mt-md">
+            </div> -->
+            <st #infoST [scroll]="{ x: '2000px' }" [data]="service.$api_get_advance_collection_hrxiao"
+                [columns]="columns.info" [page]="{ show: false }" [req]="{  process: beforeReq }"
+                [res]="{ reName: { list: 'data' } }" [loading]="service.http.loading"
+                [scroll]="{ x: '1200px', y: '370px' }" class="mt-md">
                 <ng-template st-row="no" let-item let-index="index" let-column="column">
                     {{index+1}}
                 </ng-template>
             </st>
-        </nz-tab> -->
+        </nz-tab>
     </nz-tabset>
 </nz-card>

src/app/routes/financial-management/components/advance-collection/advance-collection-detail/advance-collection-detail.component.ts

@@ -133,17 +133,17 @@ export class AdvanceCollectionDetailComponent implements OnInit {
       ],
       info: [
         { title: '序号', render: 'no', width: 70, className: 'text-left' },
-        { title: '核销单号', index: 'cnoName', className: 'text-left', width: 200 },
-        { title: '核销日期', index: 'billHId', className: 'text-center', width: 150 },
+        { title: '核销单号', index: 'ahxcode', className: 'text-left', width: 200 },
+        { title: '核销日期', index: 'ahxdate', className: 'text-center', width: 150 },
         {
           title: '核销金额',
-          index: 'yskmoney',
+          index: 'ahxmoney',
           type: 'widget',
           className: 'text-right',
-          widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yskmoney }) },
+          widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ahxmoney }) },
           width: 200
         },
-        { title: '核销备注', index: 'vatapptype', className: 'text-left', width: 200 }
+        { title: '核销备注', index: 'remarks', className: 'text-left', width: 200 }
       ]
     };
   }

src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts

@@ -214,11 +214,11 @@ export class TransactionFlowComponent implements OnInit {
   private initST(): STColumn[] {
     return [
       { title: '交易时间', index: 'createTime', width: 180 },
-      { title: '流水号', index: 'transactionNumber', width: 150 },
+      { title: '流水号', index: 'transactionNumber', width: 170 },
       { title: '交易类型', index: 'tradeTypeLabel', width: 120 },
       { title: '关联单号', index: 'businessNumber', width: 150 },
       { title: '账户类型', index: 'accountTypeLabel', width: 130 },
-      { title: '账户名称', index: 'roleName', width: 100 },
+      { title: '账户名称', index: 'roleName', width: 180 },
       { title: '所属项目', index: 'projectName', width: 140 },
       { title: '收支类型', index: 'incomeTypeLabel', width: 100, className: 'text-center' },
       {
@@ -236,9 +236,9 @@ export class TransactionFlowComponent implements OnInit {
         className: 'text-right',
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.accountBalance }) }
       },
-      { title: '网络货运人', index: 'ltdName', width: 140 },
+      { title: '网络货运人', index: 'ltdName', width: 180 },
       { title: '银行类型', index: 'bankTypeLabel', width: 100 },
-      { title: '银行流水号', index: 'channelPaySn', width: 120 },
+      { title: '银行流水号', index: 'channelPaySn', width: 170 },
       {
         title: '操作',
         fixed: 'right',

src/app/routes/financial-management/services/freight-account.service.ts

@@ -123,6 +123,8 @@ export class FreightAccountService extends ShipperBaseService {
   $api_get_advance_collection_header = '/api/fcc/ficoBrmH/getByYskblaId';
   // 根据预收款ID获取收款单明细
   $api_get_advance_collection_detail = '/api/fcc/ficoBrmYsk/getBrmYskByYskblaId';
+  // 根据预收款ID获取核销信息明细
+  $api_get_advance_collection_hrxiao = '/api/fcc/ficoAhxH/getAhxHByYskblaId';
 
   constructor(public injector: Injector, public eaCacheSrv: EACacheService) {
     super(injector, eaCacheSrv);