edit

src/app/layout/pro/components/header/header.component.html

@@ -1,7 +1,7 @@
 <div *ngIf="pro.isTopMenu" class="alain-pro__top-nav">
   <div class="alain-pro__top-nav-main" [ngClass]="{ 'alain-pro__top-nav-main-wide': pro.isFixed }">
     <div class="alain-pro__top-nav-main-left">
-      <layout-pro-logo class="alain-pro__top-nav-logo"></layout-pro-logo>
+      <layout-pro-logo class="alain-pro__top-nav-logo" style="width: 195px;"></layout-pro-logo>
       <div class="alain-pro__menu-wrap">
         <div layout-pro-menu mode="horizontal"></div>
       </div>

src/app/routes/financial-management/components/payable-order/payable-order.component.html

@@ -0,0 +1,32 @@
+<page-header-wrapper [title]="'应付核销'">
+</page-header-wrapper>
+
+<nz-card class="search-box" nzBordered>
+    <div nz-row nzGutter="8">
+        <div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
+            <sf #sf [schema]="searchSchema"
+                [ui]="{ '*': { spanLabelFixed: 110,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}" [compact]="true"
+                [button]="'none'"></sf>
+        </div>
+        <div nz-col [nzXl]="_$expand ? 24 : 6" [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 [disabled]="service.http.loading" (click)="resetSF()">重置</button>
+            <button nz-button [disabled]="service.http.loading"> 导出</button>
+            <button nz-button [disabled]="service.http.loading"> 导出核销</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>
+    <st #st [data]="service.$api_get_fico_page" [columns]="columns"
+        [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
+        [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" [scroll]="{ x:'1200px',y: '370px' }" (change)="stChange($event)">
+    </st>
+</nz-card>

src/app/routes/financial-management/components/payable-order/payable-order.component.ts

@@ -0,0 +1,285 @@
+import { CurrencyPipe } from '@angular/common';
+import { Component, OnInit, 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 { TicketService } from 'src/app/routes/ticket-management/services/ticket.service';
+import { FreightAccountService } from '../../services/freight-account.service';
+
+@Component({
+  selector: 'app-payable-order',
+  templateUrl: './payable-order.component.html',
+  styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less']
+})
+export class PayableOrderComponent implements OnInit {
+  @ViewChild('st', { static: true })
+  st!: STComponent;
+  @ViewChild('sf', { static: false })
+  sf!: SFComponent;
+  columns: STColumn[] = this.initST();
+  searchSchema: SFSchema = this.initSF();
+
+  _$expand = false;
+
+  selectedRows: any[] = [];
+  constructor(
+    public service: FreightAccountService,
+    private nzModalService: NzModalService,
+    private router: Router,
+    private currencyPipe: CurrencyPipe
+  ) {}
+
+  ngOnInit(): void {}
+
+  beforeReq = (requestOptions: STRequestOptions) => {
+    if (this.sf) {
+      Object.assign(requestOptions.body, {
+        ...this.sf.value
+      });
+      if (this.sf.value?.createTime) {
+        Object.assign(requestOptions.body, {
+          createTime: {
+            start: this.sf.value.createTime?.[0] || null,
+            end: this.sf.value.createTime?.[1] || null
+          }
+        });
+      }
+      if (this.sf.value?.ahxdate) {
+        Object.assign(requestOptions.body, {
+          ahxdate: {
+            start: this.sf.value.ahxdate?.[0] || null,
+            end: this.sf.value.ahxdate?.[1] || null
+          }
+        });
+      }
+    }
+    return requestOptions;
+  };
+
+  stChange(e: STChange): void {
+    switch (e.type) {
+      case 'checkbox':
+        this.selectedRows = e.checkbox!;
+        break;
+    }
+  }
+
+  /**
+   * 重置表单
+   */
+  resetSF() {
+    this.sf.reset();
+    this._$expand = false;
+  }
+
+  /**
+   * 伸缩查询条件
+   */
+  expandToggle() {
+    this._$expand = !this._$expand;
+    this.sf?.setValue('/expand', this._$expand);
+  }
+
+  private initSF(): SFSchema {
+    return {
+      properties: {
+        expand: {
+          type: 'boolean',
+          ui: {
+            hidden: true
+          }
+        },
+        ahxcode: {
+          type: 'string',
+          title: '核销单号',
+          ui: {
+            placeholder: '请输入'
+          }
+        },
+        ltdid: {
+          type: 'string',
+          title: '网络货运人',
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            allowClear: true,
+            asyncData: () => this.service.getNetworkFreightForwarder()
+          },
+          default: ''
+        },
+        bankreceipt: {
+          type: 'string',
+          title: '银行水单',
+          ui: {
+            placeholder: '请输入'
+          }
+        },
+        brmtype: {
+          type: 'string',
+          title: '收款类型',
+          enum: [{ value: '1', label: '费用款项' }],
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        arvattype: {
+          type: 'string',
+          title: '付款类型',
+          enum: [{ value: '1', label: '费用款项' }],
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        cno: {
+          type: 'string',
+          title: '结算客户',
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        arto: {
+          type: 'string',
+          title: '付款人',
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        sts: {
+          type: 'string',
+          title: '核销状态',
+          enum: [
+            { value: 1, label: '已核销' },
+            { value: 0, label: '待核销' }
+          ],
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        ahxdate: {
+          title: '核销日期',
+          type: 'string',
+          ui: {
+            widget: 'sl-from-to-search',
+            format: 'yyyy-MM-dd',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          } as SFDateWidgetSchema
+        },
+        createTime: {
+          title: '创建时间',
+          type: 'string',
+          ui: {
+            widget: 'sl-from-to-search',
+            format: 'yyyy-MM-dd',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          } as SFDateWidgetSchema
+        },
+        billHCode: {
+          type: 'string',
+          title: '订单号',
+          ui: {
+            placeholder: '请输入',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        orderS3: {
+          type: 'string',
+          title: '费用号',
+          ui: {
+            placeholder: '请输入',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        remarks: {
+          type: 'string',
+          title: '核销备注',
+          ui: {
+            autocomplete: 'off',
+            placeholder: '请选择',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        }
+      }
+    };
+  }
+
+  private initST(): STColumn[] {
+    return [
+      { title: '', index: 'key', type: 'checkbox' },
+      { title: '核销单号', index: 'ahxcode', type: 'link', width: 140 },
+      { title: '网络货运人', index: 'ltdId', width: 140 },
+      { title: '核销日期', index: 'ahxdate', type: 'date', width: 160 },
+      { title: '付款账户', index: 'shipperaccount', width: 120 },
+      { title: '收款账户', index: 'ltdaccount', width: 120 },
+      { title: '核销类型', index: 'ahxType', type: 'enum', enum: { '1': '预收款' }, width: 120 },
+      {
+        title: '核销金额',
+        index: 'ahxmoney',
+        width: 120,
+        className: 'text-right',
+        format: item => `${this.currencyPipe.transform(item.ahxmoney)}`
+      },
+      {
+        title: '应收金额',
+        index: 'armoney',
+        width: 120,
+        className: 'text-right',
+        format: item => `${this.currencyPipe.transform(item.armoney)}`
+      },
+      { title: '银行类型', index: 'banktype', type: 'enum', enum: { '1': '平安', '2': '浦发' }, width: 120 },
+      { title: '收款类型', index: 'arvattype', type: 'enum', enum: { '1': '费用款项' }, width: 120 },
+      { title: '付款人', index: 'artoname', width: 120 },
+      { title: '结算客户', index: 'cno', width: 120 },
+      { title: '银行水单', index: 'bankreceipt', width: 120 },
+      { title: '创建时间', index: 'createTime', width: 160 },
+      { title: '创建人', index: 'createUserId', width: 120 },
+      { title: '核销状态', index: 'sts', type: 'enum', enum: { 0: '待核销', 1: '已核销' }, width: 120 },
+      { title: '核销备注', index: 'remarks', width: 120 },
+      {
+        title: '操作',
+        fixed: 'right',
+        width: 120,
+        buttons: [
+          {
+            text: '浏览',
+            click: item => this.router.navigate(['/financial-management/receivable-order/detail/' + item.id])
+          },
+          {
+            text: '核销'
+          }
+        ]
+      }
+    ];
+  }
+}

src/app/routes/financial-management/components/receivable-order/receivable-order-detail/receivable-order-detail.component.html

@@ -0,0 +1,85 @@
+<page-header-wrapper [title]="'收票信息'" [logo]="logo">
+    <ng-template #logo>
+        <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
+            <i nz-icon nzType="left" nzTheme="outline"></i>
+        </button>
+    </ng-template>
+</page-header-wrapper>
+
+<nz-card class="statistics-box">
+    <div nz-row nzGutter="8">
+        <div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="150" col="1">
+            <se label="网络货运人" required>
+                {{headerInfo?.ltdId}}
+            </se>
+            <se label="结算客户">
+                {{headerInfo?.cno}}
+            </se>
+            <se label="收款账户" required>
+                {{headerInfo?.ltdaccount}}
+            </se>
+            <se label="核销金额" required>
+                {{headerInfo?.ahxmoney | currency}}
+            </se>
+        </div>
+        <div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="100" col="1">
+            <se label="核销日期" required>
+                {{headerInfo?.ahxdate}}
+            </se>
+            <se label="付款人" required>
+                {{headerInfo?.arto}}
+            </se>
+            <se label="付款账户" required>
+                {{headerInfo?.shipperaccount}}
+            </se>
+            <se label="应收金额">
+                {{headerInfo?.armoney | currency}}
+            </se>
+        </div>
+        <div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="100" col="1">
+            <se label="银行类型">
+                {{headerInfo?.banktype==='1'?'平安':'浦发'}}
+            </se>
+            <se label="收款类型" required>
+                {{headerInfo?.arvattype==='1'?'费用款项':''}}
+            </se>
+            <se label="银行水单">
+                {{headerInfo?.bankreceipt}}
+            </se>
+            <se label="收款备注">
+                {{headerInfo?.remarks}}
+            </se>
+        </div>
+    </div>
+</nz-card>
+
+<nz-card class="search-box" nzBordered>
+    <div nz-row nzGutter="8">
+        <div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
+            <sf #sf [schema]="searchSchema"
+                [ui]="{ '*': { spanLabelFixed: 90,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}" [compact]="true"
+                [button]="'none'"></sf>
+        </div>
+        <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand"
+            class="text-right">
+            <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>
+    <st #st [data]="service.$api_get_fico_detail_header" [columns]="columns" size="small"
+        [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
+        [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" [scroll]="{ x:'1200px',y: '200px' }">
+        <ng-template st-row="no" let-item let-index="index" let-column="column">
+            {{index+1}}
+        </ng-template>
+    </st>
+</nz-card>

src/app/routes/financial-management/components/receivable-order/receivable-order-detail/receivable-order-detail.component.less

@@ -0,0 +1,13 @@
+:host::ng-deep {
+
+    .statistics-box {
+        .ant-form-item {
+            margin-bottom: 0;
+
+            .ant-form-item-control-input-content {
+                color: #f5222d;
+            }
+        }
+    }
+
+}

src/app/routes/financial-management/components/receivable-order/receivable-order-detail/receivable-order-detail.component.ts

@@ -0,0 +1,177 @@
+import { CurrencyPipe } from '@angular/common';
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { STComponent, STColumn, STRequestOptions } from '@delon/abc/st';
+import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form';
+import { TicketService } from 'src/app/routes/ticket-management/services/ticket.service';
+import { FreightAccountService } from '../../../services/freight-account.service';
+
+@Component({
+  selector: 'app-receivable-order-detail',
+  templateUrl: './receivable-order-detail.component.html',
+  styleUrls: ['./receivable-order-detail.component.less', '../../../../commom/less/expend-but.less', '../../../../commom/less/box.less'],
+  providers: [CurrencyPipe]
+})
+export class ReceivableOrderDetailComponent implements OnInit {
+  @ViewChild('st', { static: true })
+  st!: STComponent;
+  @ViewChild('sf', { static: false })
+  sf!: SFComponent;
+  columns: STColumn[] = this.initST();
+  searchSchema: SFSchema = this.initSF();
+
+  _$expand = false;
+
+  id = null;
+  billHId = null;
+  headerInfo: any = {};
+  constructor(public service: FreightAccountService, private route: ActivatedRoute, private currencyPipe: CurrencyPipe) {
+    this.id = route.snapshot.params.id;
+    this.billHId = route.snapshot.queryParams.billHId;
+    this.loadHeadInfo();
+  }
+
+  ngOnInit(): void {}
+
+  loadHeadInfo() {
+    this.service.request(this.service.$api_get_fico_header, { id: this.id }).subscribe(res => {
+      console.log(res);
+      if (res) {
+        this.headerInfo = res;
+      }
+    });
+  }
+
+  beforeReq = (requestOptions: STRequestOptions) => {
+    Object.assign(requestOptions.body, { billHId: this.billHId });
+    if (this.sf) {
+      Object.assign(requestOptions.body, {
+        ...this.sf.value,
+        billTime: {
+          start: this.sf.value.billTime?.[0] || null,
+          end: this.sf.value.billTime?.[1] || null
+        },
+        feedate: {
+          start: this.sf.value.feedate?.[0] || null,
+          end: this.sf.value.feedate?.[1] || null
+        }
+      });
+      if (this.sf.value.billTime) {
+        Object.assign(requestOptions.body, {
+          billTime: {
+            start: this.sf.value.billTime?.[0] || null,
+            end: this.sf.value.billTime?.[1] || null
+          }
+        });
+      }
+      if (this.sf.value.feedate) {
+        Object.assign(requestOptions.body, {
+          feedate: {
+            start: this.sf.value.feedate?.[0] || null,
+            end: this.sf.value.feedate?.[1] || null
+          }
+        });
+      }
+    }
+    return requestOptions;
+  };
+
+  goBack() {
+    history.go(-1);
+  }
+
+  /**
+   * 重置表单
+   */
+  resetSF() {
+    this.sf.reset();
+  }
+
+  /**
+   * 伸缩查询条件
+   */
+  expandToggle() {
+    this._$expand = !this._$expand;
+    this.sf?.setValue('/expand', this._$expand);
+  }
+
+  private initSF(): SFSchema {
+    return {
+      properties: {
+        expand: {
+          type: 'boolean',
+          ui: {
+            hidden: true
+          }
+        },
+        feeHCode: {
+          type: 'string',
+          title: '费用单',
+          ui: {
+            placeholder: '请输入'
+          }
+        },
+        billHCode: {
+          type: 'string',
+          title: '订单号',
+          ui: {
+            placeholder: '请输入'
+          }
+        },
+        cno: {
+          type: 'string',
+          title: '结算客户',
+          enum: [{ label: '全部', value: '' }],
+          ui: {
+            widget: 'select',
+            placeholder: '请选择'
+          },
+          default: ''
+        },
+        feedate: {
+          title: '费用日期',
+          type: 'string',
+          ui: {
+            widget: 'sl-from-to-search',
+            format: 'yyyy-MM-dd',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          } as SFDateWidgetSchema
+        },
+        billTime: {
+          title: '订单日期',
+          type: 'string',
+          ui: {
+            widget: 'sl-from-to-search',
+            format: 'yyyy-MM-dd',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          } as SFDateWidgetSchema
+        }
+      }
+    };
+  }
+
+  private initST(): STColumn[] {
+    return [
+      { title: '序号', render: 'no', width: 80 },
+      { title: '费用号', index: 'feeHCode', width: 100 },
+      { title: '费用日期', index: 'feedate', type: 'date', width: 150 },
+      { title: '订单号', index: 'billHCode', width: 100 },
+      { title: '订单日期', index: 'billTime', width: 150 },
+      { title: '费用类型', index: 'cnoName', width: 90 },
+      { title: '订单费用科目', index: 'feeSubId', width: 100 },
+      { title: '费用科目', index: 'feeSubId', width: 140 },
+      { title: '结算客户', index: 'cno', width: 100 },
+      {
+        title: '已收金额',
+        index: 'ahxmoney',
+        width: 100,
+        className: 'text-right',
+        format: item => `${this.currencyPipe.transform(item.armoney)}`
+      }
+    ];
+  }
+}

src/app/routes/financial-management/components/receivable-order/receivable-order.component.html

@@ -0,0 +1,32 @@
+<page-header-wrapper [title]="'应收核销'">
+</page-header-wrapper>
+
+<nz-card class="search-box" nzBordered>
+    <div nz-row nzGutter="8">
+        <div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
+            <sf #sf [schema]="searchSchema"
+                [ui]="{ '*': { spanLabelFixed: 110,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}" [compact]="true"
+                [button]="'none'"></sf>
+        </div>
+        <div nz-col [nzXl]="_$expand ? 24 : 6" [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 [disabled]="service.http.loading" (click)="resetSF()">重置</button>
+            <button nz-button [disabled]="service.http.loading"> 导出</button>
+            <button nz-button [disabled]="service.http.loading"> 导出核销</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>
+    <st #st [data]="service.$api_get_fico_page" [columns]="columns"
+        [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
+        [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" [scroll]="{ x:'1200px',y: '370px' }" (change)="stChange($event)">
+    </st>
+</nz-card>

src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts

@@ -0,0 +1,286 @@
+import { CurrencyPipe } from '@angular/common';
+import { Component, OnInit, 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 { TicketService } from 'src/app/routes/ticket-management/services/ticket.service';
+import { FreightAccountService } from '../../services/freight-account.service';
+
+@Component({
+  selector: 'app-receivable-order',
+  templateUrl: './receivable-order.component.html',
+  styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less'],
+  providers: [CurrencyPipe]
+})
+export class ReceivableOrderComponent implements OnInit {
+  @ViewChild('st', { static: true })
+  st!: STComponent;
+  @ViewChild('sf', { static: false })
+  sf!: SFComponent;
+  columns: STColumn[] = this.initST();
+  searchSchema: SFSchema = this.initSF();
+
+  _$expand = false;
+
+  selectedRows: any[] = [];
+  constructor(
+    public service: FreightAccountService,
+    private nzModalService: NzModalService,
+    private router: Router,
+    private currencyPipe: CurrencyPipe
+  ) {}
+
+  ngOnInit(): void {}
+
+  beforeReq = (requestOptions: STRequestOptions) => {
+    if (this.sf) {
+      Object.assign(requestOptions.body, {
+        ...this.sf.value
+      });
+      if (this.sf.value?.createTime) {
+        Object.assign(requestOptions.body, {
+          createTime: {
+            start: this.sf.value.createTime?.[0] || null,
+            end: this.sf.value.createTime?.[1] || null
+          }
+        });
+      }
+      if (this.sf.value?.ahxdate) {
+        Object.assign(requestOptions.body, {
+          ahxdate: {
+            start: this.sf.value.ahxdate?.[0] || null,
+            end: this.sf.value.ahxdate?.[1] || null
+          }
+        });
+      }
+    }
+    return requestOptions;
+  };
+
+  stChange(e: STChange): void {
+    switch (e.type) {
+      case 'checkbox':
+        this.selectedRows = e.checkbox!;
+        break;
+    }
+  }
+
+  /**
+   * 重置表单
+   */
+  resetSF() {
+    this.sf.reset();
+    this._$expand = false;
+  }
+
+  /**
+   * 伸缩查询条件
+   */
+  expandToggle() {
+    this._$expand = !this._$expand;
+    this.sf?.setValue('/expand', this._$expand);
+  }
+
+  private initSF(): SFSchema {
+    return {
+      properties: {
+        expand: {
+          type: 'boolean',
+          ui: {
+            hidden: true
+          }
+        },
+        ahxcode: {
+          type: 'string',
+          title: '核销单号',
+          ui: {
+            placeholder: '请输入'
+          }
+        },
+        ltdid: {
+          type: 'string',
+          title: '网络货运人',
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            allowClear: true,
+            asyncData: () => this.service.getNetworkFreightForwarder()
+          },
+          default: ''
+        },
+        bankreceipt: {
+          type: 'string',
+          title: '银行水单',
+          ui: {
+            placeholder: '请输入'
+          }
+        },
+        brmtype: {
+          type: 'string',
+          title: '收款类型',
+          enum: [{ value: '1', label: '费用款项' }],
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        arvattype: {
+          type: 'string',
+          title: '付款类型',
+          enum: [{ value: '1', label: '费用款项' }],
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        cno: {
+          type: 'string',
+          title: '结算客户',
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        arto: {
+          type: 'string',
+          title: '付款人',
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        sts: {
+          type: 'string',
+          title: '核销状态',
+          enum: [
+            { value: 1, label: '已核销' },
+            { value: 0, label: '待核销' }
+          ],
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        ahxdate: {
+          title: '核销日期',
+          type: 'string',
+          ui: {
+            widget: 'sl-from-to-search',
+            format: 'yyyy-MM-dd',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          } as SFDateWidgetSchema
+        },
+        createTime: {
+          title: '创建时间',
+          type: 'string',
+          ui: {
+            widget: 'sl-from-to-search',
+            format: 'yyyy-MM-dd',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          } as SFDateWidgetSchema
+        },
+        billHCode: {
+          type: 'string',
+          title: '订单号',
+          ui: {
+            placeholder: '请输入',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        orderS3: {
+          type: 'string',
+          title: '费用号',
+          ui: {
+            placeholder: '请输入',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        remarks: {
+          type: 'string',
+          title: '核销备注',
+          ui: {
+            autocomplete: 'off',
+            placeholder: '请选择',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        }
+      }
+    };
+  }
+
+  private initST(): STColumn[] {
+    return [
+      { title: '', index: 'key', type: 'checkbox' },
+      { title: '核销单号', index: 'ahxcode', type: 'link', width: 140 },
+      { title: '网络货运人', index: 'ltdId', width: 140 },
+      { title: '核销日期', index: 'ahxdate', type: 'date', width: 160 },
+      { title: '付款账户', index: 'shipperaccount', width: 120 },
+      { title: '收款账户', index: 'ltdaccount', width: 120 },
+      { title: '核销类型', index: 'ahxType', type: 'enum', enum: { '1': '预收款' }, width: 120 },
+      {
+        title: '核销金额',
+        index: 'ahxmoney',
+        width: 120,
+        className: 'text-right',
+        format: item => `${this.currencyPipe.transform(item.ahxmoney)}`
+      },
+      {
+        title: '应收金额',
+        index: 'armoney',
+        width: 120,
+        className: 'text-right',
+        format: item => `${this.currencyPipe.transform(item.armoney)}`
+      },
+      { title: '银行类型', index: 'banktype', type: 'enum', enum: { '1': '平安', '2': '浦发' }, width: 120 },
+      { title: '收款类型', index: 'arvattype', type: 'enum', enum: { '1': '费用款项' }, width: 120 },
+      { title: '付款人', index: 'artoname', width: 120 },
+      { title: '结算客户', index: 'cno', width: 120 },
+      { title: '银行水单', index: 'bankreceipt', width: 120 },
+      { title: '创建时间', index: 'createTime', width: 160 },
+      { title: '创建人', index: 'createUserId', width: 120 },
+      { title: '核销状态', index: 'sts', type: 'enum', enum: { 0: '待核销', 1: '已核销' }, width: 120 },
+      { title: '核销备注', index: 'remarks', width: 120 },
+      {
+        title: '操作',
+        fixed: 'right',
+        width: 120,
+        buttons: [
+          {
+            text: '浏览',
+            click: item =>
+              this.router.navigate(['/financial-management/receivable-order/detail/' + item.id], { queryParams: { billHId: item.billHId } })
+          },
+          {
+            text: '核销'
+          }
+        ]
+      }
+    ];
+  }
+}

src/app/routes/financial-management/financial-managemen-routing.module.ts

@@ -18,6 +18,9 @@ import { PaymentOrderComponent } from './components/payment-order/payment-order.
 import { ReceiptOrderComponent } from './components/receipt-order/receipt-order.component';
 import { VoucherManagementComponent } from './components/voucher-management/voucher-management.component';
 import { VoucherSummaryComponent } from './components/voucher-summary/voucher-summary.component';
+import { ReceivableOrderComponent } from './components/receivable-order/receivable-order.component';
+import { PayableOrderComponent } from './components/payable-order/payable-order.component';
+import { ReceivableOrderDetailComponent } from './components/receivable-order/receivable-order-detail/receivable-order-detail.component';
 
 const routes: Routes = [
   { path: 'freight-account', component: FreightAccountComponent },
@@ -37,7 +40,10 @@ const routes: Routes = [
   { path: 'payment-record', component: PaymentRecordComponent },
   { path: 'transaction-flow', component: TransactionFlowComponent },
   { path: 'payment-order', component: PaymentOrderComponent },
-  { path: 'receipt-order', component: ReceiptOrderComponent }
+  { path: 'receipt-order', component: ReceiptOrderComponent },
+  { path: 'receivable-order', component: ReceivableOrderComponent },
+  { path: 'receivable-order/detail/:id', component: ReceivableOrderDetailComponent },
+  { path: 'payable-order', component: PayableOrderComponent },
 ];
 
 @NgModule({

src/app/routes/financial-management/financial-management.module.ts

@@ -22,6 +22,9 @@ import { PaymentOrderComponent } from './components/payment-order/payment-order.
 import { ReceiptOrderComponent } from './components/receipt-order/receipt-order.component';
 import { VoucherManagementComponent } from './components/voucher-management/voucher-management.component';
 import { VoucherSummaryComponent } from './components/voucher-summary/voucher-summary.component';
+import { ReceivableOrderComponent } from './components/receivable-order/receivable-order.component';
+import { PayableOrderComponent } from './components/payable-order/payable-order.component';
+import { ReceivableOrderDetailComponent } from './components/receivable-order/receivable-order-detail/receivable-order-detail.component';
 
 const ROUTESCOMPONENTS = [
   FreightAccountComponent,
@@ -39,7 +42,10 @@ const ROUTESCOMPONENTS = [
   PaymentOrderComponent,
   ReceiptOrderComponent,
   VoucherManagementComponent,
-  VoucherSummaryComponent
+  VoucherSummaryComponent,
+  ReceivableOrderComponent,
+  PayableOrderComponent,
+  ReceivableOrderDetailComponent
 ];
 
 const NOTROUTECOMPONENTS = [DriverAccountDetailComponent, FreightAccountDetailComponent, SettingFinancialComponent, ClearingModalComponent];

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

@@ -57,6 +57,14 @@ export class FreightAccountService extends ShipperBaseService {
   // 根据费用头ID查询费用单及开票明细
   $api_get_cost_detail = '/api/fcc/ficoFeeL/detail';
 
+  // 查询应收核销抬头
+  $api_get_fico_page = '/api/fcc/ficoAhxH/list/page';
+  // 获取应收核销抬头
+  $api_get_fico_header = '/api/fcc/ficoAhxH/get';
+  // 查询应收核销明细
+  $api_get_fico_detail_header = '/api/fcc/ficoAhxL/list/page';
+
+
   constructor(public injector: Injector,public eaCacheSrv: EACacheService) {
     super(injector, eaCacheSrv);
   }

src/app/routes/usercenter/components/driver/driver.component.ts

@@ -112,7 +112,7 @@ export class UserCenterComponentsDriverComponent implements OnInit {
       nzComponentParams: {
         isCanCreate: true,
         url: '/api/fcc/accountBalance/getDriverAccountDetailByOperator',
-        params: { accountType: 2, roleId: item.appUserId }
+        params: { accountType: 2, roleId: item.appUserId, ctfId: item.identityNo }
       },
       nzFooter: null
     });

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

@@ -77,7 +77,7 @@ export class FreightComponentsListComponent implements OnInit {
       nzComponentParams: {
         isCanCreate: true,
         url: '/api/fcc/accountBalance/getShipperAccountBalanceDetailByOperator',
-        params: { accountType: 1, roleId: item.appUserId }
+        params: { accountType: 1, roleId: item.adminAppUserId, ctfId: item.unifiedSocialCreditCode }
       },
       nzFooter: null
     });

src/app/shared/components/account-detail/account-detail.component.html

@@ -3,20 +3,10 @@
     [res]="{ reName: { list: 'data'} }"
     [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
     [loading]="service.http.loading" [scroll]="{ y: '370px' }">
-    <ng-template st-row="ltdName" let-item let-index="index">
+    <ng-template st-row="paAccount" let-item let-index="index">
-        <ng-container *ngIf="isCanCreate; else elsePATemplate">
+        <a (click)="createAccount(item,'1')">{{ item.paAccount || '添加' }}</a>
-            <a (click)="createAccount(item,'1')">{{ item.promotersTelephone || '添加' }}</a>
-        </ng-container>
-        <ng-template #elsePATemplate>
-            {{ item.promotersTelephone }}
-        </ng-template>
-    </ng-template>
-    <ng-template st-row="bankTypeLabel" let-item let-index="index">
-        <ng-container *ngIf="isCanCreate; else elsePFTemplate">
-            <a (click)="createAccount(item,'2')">{{ item.promotersTelephone || '添加' }}</a>
-        </ng-container>
-        <ng-template #elsePFTemplate>
-            {{ item.promotersTelephone }}
     </ng-template>
+    <ng-template st-row="pfAccount" let-item let-index="index">
+        <a (click)="createAccount(item,'2')">{{ item.pfAccount || '添加' }}</a>
     </ng-template>
 </st>

src/app/shared/components/account-detail/account-detail.component.ts

@@ -18,7 +18,7 @@ export class AccountDetailComponent implements OnInit {
 
   isCanCreate = false;
   params: any = {};
-  constructor(public service: BaseService, private currencyPipe: CurrencyPipe, private modalHelp: NzModalRef) {
+  constructor(public service: BaseService, public currencyPipe: CurrencyPipe, private modalHelp: NzModalRef) {
     this.initST();
   }
 
@@ -71,17 +71,31 @@ export class AccountDetailComponent implements OnInit {
   initST() {
     this.columns = [
       { title: '网络货运人', index: 'ltdName', className: 'text-center' },
+      {
+        title: '平安资金账户',
+        render: 'paAccount',
+        className: 'text-center',
+        iif: _ => this.isCanCreate
+      },
+      {
+        title: '浦发资金账户',
+        render: 'pfAccount',
+        className: 'text-center',
+        iif: _ => this.isCanCreate
+      },
       {
         title: '平安账户余额',
         render: 'paBalance',
-        type: 'currency',
+        className: 'text-right',
-        format: item => `${this.currencyPipe.transform(item.paBalance)}`
+        format: item => `${this.currencyPipe.transform(item.paBalance)}`,
+        iif: _ => !this.isCanCreate
       },
       {
         title: '浦发账户余额',
         render: 'pfBalance',
-        type: 'currency',
+        className: 'text-right',
-        format: item => `${this.currencyPipe.transform(item.pfBalance)}`
+        format: item => `${this.currencyPipe.transform(item.pfBalance)}`,
+        iif: _ => !this.isCanCreate
       }
     ];
   }

src/assets/mocks/menu-data.json

@@ -301,6 +301,19 @@
               {
                 "text": "交易流水",
                 "link": "/financial-management/transaction-flow"
+              },
+              {
+                "text": "应收核销",
+                "link": "/financial-management/receivable-order"
+              },
+              {
+                "text": "应收核销详情",
+                "hide": true,
+                "link": "/financial-management/receivable-order/detail/:id"
+              },
+              {
+                "text": "应付核销",
+                "link": "/financial-management/payable-order"
               }
             ]
           },