edit

proxy.conf.js

@@ -30,7 +30,7 @@ module.exports = {
   // },
   '//api': {
     target: {
-      host: 'tms-api-dev.eascs.com',
+      host: 'tms-api-test.eascs.com',
       protocol: 'https:',
       port: 443
     },

src/app/routes/commom/less/commom-table.less

@@ -112,6 +112,10 @@
     .ant-select-single .ant-select-selector .ant-select-selection-placeholder {
       line-height: 21px;
     }
+
+    .text-truncate {
+      white-space: normal;
+  }
   }
 }
 

src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.html

@@ -1,14 +1,4 @@
-<!--
+<!-- <page-header-wrapper [title]="'异常入金'"> </page-header-wrapper>
- * @Description  : 
- * @Version      : 1.0
- * @Author       : Shiming
- * @Date         : 2022-04-06 10:57:56
- * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-14 10:39:57
- * @FilePath     : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\abnormal-gold\\abnormal-gold.component.html
- * Copyright (C) 2022 huzhenhong. All rights reserved.
--->
-<page-header-wrapper [title]="'异常入金'"> </page-header-wrapper>
 
 <nz-card class="search-box" nzBordered>
   <div nz-row nzGutter="8">
@@ -31,22 +21,25 @@
       </button>
     </div>
   </div>
-</nz-card>
+</nz-card> -->
 
-<nz-card class="content-box" nzBordered>
+<nz-card class="table-box">
-  <nz-tabset>
+  <div class="tab_header">
-    <nz-tab nzTitle="处理中"(nzClick)="changePaymentStatus('1')"></nz-tab>
+    <label class="page_title"><label class="driver">|</label>异常入金</label>
-    <nz-tab nzTitle="已退款"(nzClick)="changePaymentStatus('5')"></nz-tab>
+    <nz-tabset [nzTabBarExtraContent]="extraTemplate">
-    <nz-tab nzTitle="全部"(nzClick)="changePaymentStatus('')"></nz-tab>
+      <nz-tab nzTitle="处理中" (nzClick)="changePaymentStatus('1')"></nz-tab>
-  </nz-tabset>
+      <nz-tab nzTitle="已退款" (nzClick)="changePaymentStatus('5')"></nz-tab>
+      <nz-tab nzTitle="全部" (nzClick)="changePaymentStatus('')"></nz-tab>
+    </nz-tabset>
+  </div>
 
-  <st
+  <ng-template #extraTemplate>
-    #st
+    <div class="mr-sm">
-    [data]="service.$api_get_getAbnormalAmountPage"
+      <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()">筛选</button>
-    [columns]="columns"
+      <button nz-button nzDanger (click)="exprot()"> 导出</button>
-    [req]="{ process: beforeReq }"
+    </div>
-    [page]="{}"
+  </ng-template>
-    [loading]="false"
+
-    [scroll]="{ x: '1200px' }"
+  <st #st [data]="service.$api_get_getAbnormalAmountPage" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}"
-  ></st>
+    [loading]="false" [scroll]="{ x: '1200px',y:scrollY }"></st>
-</nz-card>
+</nz-card>

src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.ts

@@ -2,30 +2,39 @@ 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 { SearchDrawerService } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
+import { BasicTableComponent } from 'src/app/routes/commom';
 import { FreightAccountService } from '../../services/freight-account.service';
 import { ClearingModalComponent } from './clearing-modal/clearing-modal.component';
 
 @Component({
   selector: 'app-abnormal-gold',
   templateUrl: './abnormal-gold.component.html',
-  styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less']
+  styleUrls: ['../../../commom/less/commom-table.less']
 })
-export class AbnormalGoldComponent implements OnInit {
+export class AbnormalGoldComponent extends BasicTableComponent implements OnInit {
   @ViewChild('st', { static: true })
   st!: STComponent;
-  @ViewChild('sf', { static: false })
-  sf!: SFComponent;
   columns: STColumn[] = this.initST();
-  searchSchema: SFSchema = this.initSF();
+  schema: SFSchema = this.initSF();
-
-  _$expand = false;
 
   rechargeStatus = '1';
-  constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) {}
+  constructor(
+    public service: FreightAccountService,
+    private nzModalService: NzModalService,
+    private router: Router,
+    public searchDrawerService: SearchDrawerService
+  ) {
+    super(searchDrawerService);
+  }
 
   ngOnInit(): void {}
 
+  search() {
+    this.st?.load(1);
+  }
+
   beforeReq = (requestOptions: STRequestOptions) => {
     Object.assign(requestOptions.body, { rechargeStatus: this.rechargeStatus });
     if (this.sf) {
@@ -56,22 +65,6 @@ export class AbnormalGoldComponent implements OnInit {
     });
   }
 
-  /**
-   * 重置表单
-   */
-  resetSF() {
-    this.sf.reset();
-    this._$expand = false;
-  }
-
-  /**
-   * 伸缩查询条件
-   */
-  expandToggle() {
-    this._$expand = !this._$expand;
-    this.sf?.setValue('/expand', this._$expand);
-  }
-
   private initSF(): SFSchema {
     return {
       properties: {
@@ -116,30 +109,21 @@ export class AbnormalGoldComponent implements OnInit {
           type: 'string',
           title: '付款账户',
           ui: {
-            placeholder: '请输入',
+            placeholder: '请输入'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         },
         transferBankCardNumber: {
           type: 'string',
           title: '付款账号',
           ui: {
-            placeholder: '请输入',
+            placeholder: '请输入'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         },
         transferBankOpenName: {
           type: 'string',
           title: '付款银行',
           ui: {
-            placeholder: '请输入',
+            placeholder: '请输入'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         },
         transferDate: {
@@ -149,10 +133,7 @@ export class AbnormalGoldComponent implements OnInit {
             widget: 'sl-from-to-search',
             format: 'yyyy-MM-dd',
             placeholder: '请选择',
-            nzShowTime: true,
+            nzShowTime: true
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           } as SFDateWidgetSchema
         }
       }

src/app/routes/financial-management/components/cost-management/cost-management.component.html

@@ -8,7 +8,7 @@
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\cost-management\\cost-management.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
-<page-header-wrapper title="费用管理"> </page-header-wrapper>
+<!-- <page-header-wrapper title="费用管理"> </page-header-wrapper>
 
 <nz-card class="search-box">
   <div nz-row nzGutter="8">
@@ -20,28 +20,36 @@
       <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)" acl
         [acl-ability]="['FINANCIAL-COST-list']">查询</button>
       <button nz-button (click)="resetSF()">重置</button>
-      <!-- <button nz-button (click)="exportList()"> 导出</button>
+      <button nz-button (click)="exportList()"> 导出</button>
-      <button nz-button (click)="exportList()"> 导出明细</button> -->
+      <button nz-button (click)="exportList()"> 导出明细</button>
       <button nz-button nzType="link" (click)="expandToggle()">
         {{ !_$expand ? '展开' : '收起' }}
         <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
       </button>
     </div>
   </div>
-</nz-card>
+</nz-card> -->
 
-<nz-card class="content-box">
+<nz-card class="table-box">
-  <div nz-row class="mb-sm">
+  <div class="header_box">
+    <label class="page_title"> <label class="driver">|</label> 费用管理</label>
+    <div class="mr-sm">
+      <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()" acl
+        [acl-ability]="['FINANCIAL-COST-list']">筛选</button>
+      <button nz-button nzDanger (click)="exportList()"> 导出</button>
+    </div>
+  </div>
+  <!-- <div nz-row class="mb-sm">
     <div nz-col nzSpan="24">
-      <!-- <button nz-button nzType="primary" [nzLoading]="service.http.loading"
+      <button nz-button nzType="primary" [nzLoading]="service.http.loading"
         (click)="routeTo('/financial-management/cost-management/expenses-receivable/1')">添加应收费用</button>
       <button nz-button nzType="primary" [nzLoading]="service.http.loading"
         (click)="routeTo('/financial-management/cost-management/expenses-payable/1')">添加应付费用</button>
-      <button nz-button nzType="primary" [nzLoading]="service.http.loading">导入费用</button> -->
+      <button nz-button nzType="primary" [nzLoading]="service.http.loading">导入费用</button>
     </div>
-  </div>
+  </div> -->
   <st #st [data]="service.$api_get_cost_page" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}"
-    [loading]="false" [scroll]="{ x: '2000px' }">
+    [loading]="false" [scroll]="{ x: '2000px',y:scrollY }">
     <ng-template st-row="armoeny" let-item let-index="index">
       {{ item.armoeny | currency }}
     </ng-template>

src/app/routes/financial-management/components/cost-management/cost-management.component.ts

@@ -2,34 +2,43 @@ import { Component, OnInit, ViewChild } from '@angular/core';
 import { Router } from '@angular/router';
 import { STComponent, STColumn, STRequestOptions } from '@delon/abc/st';
 import { SFComponent, SFSchema, SFDateWidgetSchema, SFSelectWidgetSchema, SFSchemaEnum } from '@delon/form';
+import { SearchDrawerService } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { of } from 'rxjs';
 import { map } from 'rxjs/operators';
+import { BasicTableComponent } from 'src/app/routes/commom';
 import { FreightAccountService } from '../../services/freight-account.service';
 
 @Component({
   selector: 'app-cost-management',
   templateUrl: './cost-management.component.html',
-  styleUrls: ['../../../commom/less/box.less']
+  styleUrls: ['../../../commom/less/commom-table.less']
 })
-export class CostManagementComponent implements OnInit {
+export class CostManagementComponent extends BasicTableComponent implements OnInit {
   @ViewChild('st', { static: true })
   st!: STComponent;
-  @ViewChild('sf', { static: false })
-  sf!: SFComponent;
   @ViewChild('auditModal', { static: false })
   auditModal!: any;
-  searchSchema: SFSchema = this.initSF();
+  schema: SFSchema = this.initSF();
   columns: STColumn[] = this.initST();
 
   selectedRows: any[] = [];
 
-  _$expand = false;
+  constructor(
-
+    public service: FreightAccountService,
-  constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) {}
+    private nzModalService: NzModalService,
+    private router: Router,
+    public searchDrawerService: SearchDrawerService
+  ) {
+    super(searchDrawerService);
+  }
 
   ngOnInit(): void {}
 
+  search() {
+    this.st?.load(1);
+  }
+
   beforeReq = (requestOptions: STRequestOptions) => {
     if (this.sf) {
       Object.assign(requestOptions.body, {
@@ -73,24 +82,9 @@ export class CostManagementComponent implements OnInit {
     });
   }
 
-  /**
-   * 重置表单
-   */
-  resetSF() {
-    this.sf.reset();
-    this._$expand = false;
-  }
-
-  /**
-   * 伸缩查询条件
-   */
-  expandToggle() {
-    this._$expand = !this._$expand;
-    this.sf?.setValue('/expand', this._$expand);
-  }
 
   exportList() {
-    this.service.exportStart( { ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportPlatformAccountBalanceByOperator,);
+    this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportPlatformAccountBalanceByOperator);
   }
 
   routeTo(url: string, params?: any, status?: any) {
@@ -100,12 +94,6 @@ export class CostManagementComponent implements OnInit {
   private initSF(): SFSchema {
     return {
       properties: {
-        expand: {
-          type: 'boolean',
-          ui: {
-            hidden: true
-          }
-        },
         feecode: {
           type: 'string',
           title: '费用单号',
@@ -131,9 +119,6 @@ export class CostManagementComponent implements OnInit {
             format: 'yyyy-MM-dd',
             placeholder: '请选择',
             nzShowTime: true,
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           } as SFDateWidgetSchema
         },
         feetype: {
@@ -147,9 +132,6 @@ export class CostManagementComponent implements OnInit {
           ui: {
             widget: 'select',
             placeholder: '请选择',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           },
           default: ''
         },
@@ -159,14 +141,11 @@ export class CostManagementComponent implements OnInit {
           enum: [
             { label: '全部', value: '全部' },
             { label: '运输费', value: '1475197820443299842' },
-            { label: '附加费', value: '1476197820443299842 ' },
+            { label: '附加费', value: '1476197820443299842 ' }
           ],
           ui: {
             widget: 'select',
             placeholder: '请选择',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         },
         ltdId: {
@@ -177,9 +156,6 @@ export class CostManagementComponent implements OnInit {
             placeholder: '请选择',
             allowClear: true,
             asyncData: () => this.service.getNetworkFreightForwarder(),
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         },
         hrto: {
@@ -202,9 +178,6 @@ export class CostManagementComponent implements OnInit {
                 return of([]);
               }
             },
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           } as SFSelectWidgetSchema
         },
         arto: {
@@ -227,9 +200,6 @@ export class CostManagementComponent implements OnInit {
                 return of([]);
               }
             },
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           } as SFSelectWidgetSchema
         },
         createTime: {
@@ -240,9 +210,6 @@ export class CostManagementComponent implements OnInit {
             format: 'yyyy-MM-dd',
             placeholder: '请选择',
             nzShowTime: true,
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           } as SFDateWidgetSchema
         },
         ishrhx: {
@@ -256,9 +223,6 @@ export class CostManagementComponent implements OnInit {
           ui: {
             widget: 'select',
             placeholder: '请选择',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           },
           default: ''
         },
@@ -270,9 +234,6 @@ export class CostManagementComponent implements OnInit {
             placeholder: '请选择',
             allowClear: true,
             asyncData: () => this.service.getCloseAccount(),
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         }
       }

src/app/routes/financial-management/components/driver-account/driver-account.component.html

@@ -1,4 +1,4 @@
-<page-header-wrapper title="司机账户"> </page-header-wrapper>
+<!-- <page-header-wrapper title="司机账户"> </page-header-wrapper>
 
 <nz-card class="search-box">
   <div nz-row nzGutter="8">
@@ -21,23 +21,22 @@
       </button>
     </div>
   </div>
-</nz-card>
+</nz-card> -->
 
-<nz-card class="content-box">
+<nz-card class="table-box">
-  <st
+  <div class="header_box">
-    #st
+    <label class="page_title"> <label class="driver">|</label> 司机账户</label>
-    [data]="service.$api_get_driver_account_page"
+    <div class="mr-sm">
-    [columns]="columns"
+      <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()">筛选</button>
-    [req]="{ process: beforeReq }"
+      <button nz-button nzDanger (click)="exportList()"> 导出</button>
-    [res]="{ reName: { list: 'data.records', total: 'data.total' } , process: afterRes}"
+    </div>
-    [page]="{}"
+  </div>
-    [loading]="false"
+  <st #st [data]="service.$api_get_driver_account_page" [columns]="columns" [req]="{ process: beforeReq }"
-    [scroll]="{ x: '1200px' }"
+    [res]="{ process: afterRes}" [page]="{}" [loading]="false" [scroll]="{ x: '1200px',y:scrollY }">
-  >
     <ng-template st-row="availableBalance" let-item let-index="index">
       <a (click)="showAccountDetail(item)">{{
         (parseFloat(item.availableBalance) + parseFloat(item.freezeBalance)).toFixed(2) | currency
-      }}</a>
+        }}</a>
     </ng-template>
   </st>
-</nz-card>
+</nz-card>

src/app/routes/financial-management/components/driver-account/driver-account.component.ts

@@ -3,30 +3,38 @@ import { Component, OnInit, ViewChild } from '@angular/core';
 import { Router } from '@angular/router';
 import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st';
 import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form';
-import { ShipperBaseService } from '@shared';
+import { SearchDrawerService, ShipperBaseService } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
+import { BasicTableComponent } from 'src/app/routes/commom';
 import { AccountDetailComponent } from 'src/app/shared/components/account-detail/account-detail.component';
 import { FreightAccountService } from '../../services/freight-account.service';
 
 @Component({
   selector: 'app-driver-account',
   templateUrl: './driver-account.component.html',
-  styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less']
+  styleUrls: ['../../../commom/less/commom-table.less']
 })
-export class DriverAccountComponent implements OnInit {
+export class DriverAccountComponent extends BasicTableComponent implements OnInit {
   @ViewChild('st', { static: true })
   st!: STComponent;
-  @ViewChild('sf', { static: false })
-  sf!: SFComponent;
   loading: boolean = true;
-  searchSchema: SFSchema = this.initSF();
+  schema: SFSchema = this.initSF();
   columns: STColumn[] = this.initST();
-  _$expand = false;
 
-  constructor(public service: FreightAccountService, private router: Router, private modal: NzModalService) {}
+  constructor(
+    public service: FreightAccountService,
+    private router: Router,
+    private modal: NzModalService,
+    public searchDrawerService: SearchDrawerService
+  ) {
+    super(searchDrawerService);
+  }
 
   ngOnInit(): void {}
 
+  search() {
+    this.st?.load(1);
+  }
   beforeReq = (requestOptions: STRequestOptions) => {
     Object.assign(requestOptions.body, { accountType: 2 });
     if (this.sf) {
@@ -44,11 +52,8 @@ export class DriverAccountComponent implements OnInit {
     return requestOptions;
   };
   afterRes = (data: any[], rawData?: any) => {
-    console.log(data)
+    this.loading = false;
-    this.loading = false
+    return data;
-    return data.map(item => ({
-      ...item,
-    }));
   };
   showAccountDetail(item: any) {
     this.modal.create({
@@ -64,25 +69,7 @@ export class DriverAccountComponent implements OnInit {
     });
   }
 
-  /**
-   * 重置表单
-   */
-  resetSF() {
-    this.sf.reset();
-    this._$expand = false;
-  }
-
-  /**
-   * 伸缩查询条件
-   */
-  expandToggle() {
-    this._$expand = !this._$expand;
-    this.sf?.setValue('/expand', this._$expand);
-  }
-
   exportList() {
-    console.log(this.sf.value);
-    
     this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_export_driver_account_page);
   }
 
@@ -118,9 +105,6 @@ export class DriverAccountComponent implements OnInit {
           ui: {
             widget: 'select',
             placeholder: '请选择',
-            visibleIf: {
-              expand: (value: boolean) => value
-            },
             allowClear: true,
             asyncData: () => this.service.getNetworkFreightForwarder()
           }
@@ -135,10 +119,7 @@ export class DriverAccountComponent implements OnInit {
           ],
           ui: {
             widget: 'select',
-            placeholder: '请选择',
+            placeholder: '请选择'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           },
           default: null
         },
@@ -146,10 +127,7 @@ export class DriverAccountComponent implements OnInit {
           type: 'string',
           title: '虚拟账户',
           ui: {
-            placeholder: '请输入',
+            placeholder: '请输入'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         },
         createTime: {
@@ -158,10 +136,7 @@ export class DriverAccountComponent implements OnInit {
           ui: {
             widget: 'sl-from-to-search',
             format: 'yyyy-MM-dd',
-            placeholder: '请选择',
+            placeholder: '请选择'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           } as SFDateWidgetSchema
         }
       }

src/app/routes/financial-management/components/freight-account/freight-account.component.html

@@ -1,4 +1,4 @@
-<page-header-wrapper title="货主账户">
+<!-- <page-header-wrapper title="货主账户">
 </page-header-wrapper>
 
 <nz-card class="search-box">
@@ -19,11 +19,18 @@
             </button>
         </div>
     </div>
-</nz-card>
+</nz-card> -->
 
-<nz-card class="content-box">
+<nz-card class="table-box">
-    <st #st [data]="service.$api_get_shipper_account_page" [columns]="columns" [req]="{   process: beforeReq }" [page]="{}"
+    <div class="header_box">
-        [loading]="false" [scroll]="{ x: '1200px' }">
+        <label class="page_title"> <label class="driver">|</label> 货主账户</label>
+        <div class="mr-sm">
+            <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()">筛选</button>
+            <button nz-button nzDanger (click)="exportList()"> 导出</button>
+        </div>
+    </div>
+    <st #st [data]="service.$api_get_shipper_account_page" [columns]="columns" [req]="{   process: beforeReq }"
+        [page]="{}" [loading]="false" [scroll]="{ x: '1200px',y:scrollY }">
         <ng-template st-row="description" let-item let-index="index">
             <a (click)="showAccountDetail(item)">{{ (parseFloat(item.availableBalance) +
                 parseFloat(item.freezeBalance)).toFixed(2) | currency}}</a>

src/app/routes/financial-management/components/freight-account/freight-account.component.ts

@@ -5,9 +5,10 @@ import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st
 import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form';
 import { CurrencyService } from '@delon/util';
 import { CurrencyCNYPipe } from '@delon/util/pipes/currency/cny.pipe';
-import { ShipperBaseService } from '@shared';
+import { SearchDrawerService, ShipperBaseService } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { parse } from 'path';
+import { BasicTableComponent } from 'src/app/routes/commom';
 import { SystemService } from 'src/app/routes/sys-setting/services/system.service';
 import { AccountDetailComponent } from 'src/app/shared/components/account-detail/account-detail.component';
 import { FreightAccountService } from '../../services/freight-account.service';
@@ -15,24 +16,31 @@ import { FreightAccountService } from '../../services/freight-account.service';
 @Component({
   selector: 'app-freight-account',
   templateUrl: './freight-account.component.html',
-  styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less']
+  styleUrls: ['../../../commom/less/commom-table.less']
 })
-export class FreightAccountComponent implements OnInit {
+export class FreightAccountComponent extends BasicTableComponent implements OnInit {
   @ViewChild('st', { static: true })
   st!: STComponent;
-  @ViewChild('sf', { static: false })
+  schema: SFSchema = this.initSF();
-  sf!: SFComponent;
-  searchSchema: SFSchema = this.initSF();
   columns: STColumn[] = this.initST();
 
   selectedRows: any[] = [];
 
-  _$expand = false;
+  constructor(
-
+    public service: FreightAccountService,
-  constructor(public service: FreightAccountService, private router: Router, private modal: NzModalService) {}
+    private router: Router,
+    private modal: NzModalService,
+    public searchDrawerService: SearchDrawerService
+  ) {
+    super(searchDrawerService);
+  }
 
   ngOnInit(): void {}
 
+  search() {
+    this.st?.load(1);
+  }
+
   beforeReq = (requestOptions: STRequestOptions) => {
     Object.assign(requestOptions.body, { accountType: 1 });
     if (this.sf) {
@@ -63,22 +71,6 @@ export class FreightAccountComponent implements OnInit {
     });
   }
 
-  /**
-   * 重置表单
-   */
-  resetSF() {
-    this.sf.reset();
-    this._$expand = false;
-  }
-
-  /**
-   * 伸缩查询条件
-   */
-  expandToggle() {
-    this._$expand = !this._$expand;
-    this.sf?.setValue('/expand', this._$expand);
-  }
-
   exportList() {
     this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportShipperAccountBalanceByOperator);
   }
@@ -86,12 +78,6 @@ export class FreightAccountComponent implements OnInit {
   private initSF(): SFSchema {
     return {
       properties: {
-        expand: {
-          type: 'boolean',
-          ui: {
-            hidden: true
-          }
-        },
         tenantName: {
           type: 'string',
           title: '企业名称',
@@ -115,9 +101,6 @@ export class FreightAccountComponent implements OnInit {
           ui: {
             widget: 'select',
             placeholder: '请选择',
-            visibleIf: {
-              expand: (value: boolean) => value
-            },
             allowClear: true,
             asyncData: () => this.service.getNetworkFreightForwarder()
           }
@@ -133,9 +116,6 @@ export class FreightAccountComponent implements OnInit {
           ui: {
             widget: 'select',
             placeholder: '请选择',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           },
           default: null
         },
@@ -144,9 +124,6 @@ export class FreightAccountComponent implements OnInit {
           title: '虚拟账户',
           ui: {
             placeholder: '请输入',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         },
         createTime: {
@@ -156,9 +133,6 @@ export class FreightAccountComponent implements OnInit {
             widget: 'sl-from-to-search',
             format: 'yyyy-MM-dd',
             placeholder: '请选择',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           } as SFDateWidgetSchema
         }
       }
@@ -172,7 +146,7 @@ export class FreightAccountComponent implements OnInit {
       { title: '联系人电话', width: 140, index: 'phone' },
       { title: '网络货运人', width: 170, index: 'ltdName' },
       { title: '银行类型', width: 120, index: 'bankTypeLabel' },
-      { title: '虚拟账户', width: 140, index: 'virtualAccount' },
+      { title: '虚拟账户', width: 160, index: 'virtualAccount' },
       {
         title: '可用余额',
         index: 'availableBalance',

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

@@ -1,4 +1,4 @@
-<page-header-wrapper [title]="'付款单'">
+<!-- <page-header-wrapper [title]="'付款单'">
 </page-header-wrapper>
 
 <nz-card class="search-box" nzBordered>
@@ -11,29 +11,42 @@
         <div nz-col [nzXl]="_$expand ? 24 : 7" [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 (click)="resetSF()">重置</button>
-            <!-- <button nz-button nzType="primary" > 导出</button>
+            <button nz-button nzType="primary" > 导出</button>
-            <button nz-button nzType="primary" > 导出明细</button> -->
+            <button nz-button nzType="primary" > 导出明细</button>
             <button nz-button nzType="link" (click)="expandToggle()">
                 {{ !_$expand ? '展开' : '收起' }}
                 <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
             </button>
         </div>
     </div>
-</nz-card>
+</nz-card> -->
 
-<nz-card class="content-box" nzBordered>
+<nz-card class="table-box">
+    <div class="header_box">
+        <div>
+            <label class="page_title"> <label class="driver">|</label> 付款单</label>
+            <label class="ml-md">
+                已选择
+                <strong class="text-primary">{{ selectedRows.length }}</strong> 张单
+                <a *ngIf="selectedRows.length > 0" (click)="st.clearCheck()" class="ml-lg">清空</a>
+            </label>
+        </div>
+        <div class="mr-sm">
+            <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()">筛选</button>
+        </div>
+    </div>
 
-    <div class="d-flex align-items-center mb-md mt-md">
+    <!-- <div class="d-flex align-items-center mb-md mt-md">
-        <!-- <button nz-button (click)="this.addInvoice()" nzType="primary">添加付款</button>
+        <button nz-button (click)="this.addInvoice()" nzType="primary">添加付款</button>
-        <button nz-button (click)="this.addInvoice()" nzType="primary">导入付款</button> -->
+        <button nz-button (click)="this.addInvoice()" nzType="primary">导入付款</button>
         <div class="ml-md">
             已选择
             <strong class="text-primary">{{ selectedRows.length }}</strong> 张单
             <a *ngIf="selectedRows.length > 0" (click)="st.clearCheck()" class="ml-lg">清空</a>
         </div>
-    </div>
+    </div> -->
 
     <st #st [data]="service.$api_get_payment_page" [columns]="columns" [req]="{  process: beforeReq }" [page]="{}"
-        [loading]="false" [scroll]="{ x:'1200px' }" (change)="stChange($event)">
+        [loading]="false" [scroll]="{ x:'1200px',y:scrollY }" (change)="stChange($event)">
     </st>
 </nz-card>

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

@@ -2,7 +2,9 @@ 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 { SearchDrawerService } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
+import { BasicTableComponent } from 'src/app/routes/commom';
 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';
@@ -10,23 +12,30 @@ import { FreightAccountService } from '../../services/freight-account.service';
 @Component({
   selector: 'app-payment-order',
   templateUrl: './payment-order.component.html',
-  styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less']
+  styleUrls: ['../../../commom/less/commom-table.less']
 })
-export class PaymentOrderComponent implements OnInit {
+export class PaymentOrderComponent extends BasicTableComponent implements OnInit {
   @ViewChild('st', { static: true })
   st!: STComponent;
-  @ViewChild('sf', { static: false })
-  sf!: SFComponent;
   columns: STColumn[] = this.initST();
-  searchSchema: SFSchema = this.initSF();
+  schema: SFSchema = this.initSF();
-
-  _$expand = false;
 
   selectedRows: any[] = [];
-  constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) {}
+  constructor(
+    public service: FreightAccountService,
+    private nzModalService: NzModalService,
+    private router: Router,
+    public searchDrawerService: SearchDrawerService
+  ) {
+    super(searchDrawerService);
+  }
 
   ngOnInit(): void {}
 
+  search() {
+    this.st?.load(1);
+  }
+
   beforeReq = (requestOptions: STRequestOptions) => {
     if (this.sf) {
       let params = { ...this.sf.value };
@@ -68,31 +77,9 @@ export class PaymentOrderComponent implements OnInit {
     });
   }
 
-  /**
-   * 重置表单
-   */
-  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
-          }
-        },
         paycode: {
           type: 'string',
           title: '付款单号'
@@ -135,10 +122,7 @@ export class PaymentOrderComponent implements OnInit {
             widget: 'dict-select',
             containsAllLabel: true,
             params: { dictKey: 'pay:mode' },
-            placeholder: '请选择',
+            placeholder: '请选择'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         },
         arto: {
@@ -147,10 +131,7 @@ export class PaymentOrderComponent implements OnInit {
           ui: {
             widget: 'select',
             placeholder: '请选择',
-            allowClear: true,
+            allowClear: true
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         },
         billCode: {
@@ -159,10 +140,7 @@ export class PaymentOrderComponent implements OnInit {
           ui: {
             widget: 'select',
             placeholder: '请选择',
-            allowClear: true,
+            allowClear: true
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         },
         payDate: {
@@ -170,10 +148,7 @@ export class PaymentOrderComponent implements OnInit {
           type: 'string',
           ui: {
             widget: 'sl-from-to-search',
-            format: 'yyyy-MM-dd',
+            format: 'yyyy-MM-dd'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           } as SFDateWidgetSchema
         },
         payDate2: {
@@ -181,20 +156,12 @@ export class PaymentOrderComponent implements OnInit {
           type: 'string',
           ui: {
             widget: 'sl-from-to-search',
-            format: 'yyyy-MM-dd',
+            format: 'yyyy-MM-dd'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           } as SFDateWidgetSchema
         },
         waybillCode: {
           type: 'string',
-          title: '运单号',
+          title: '运单号'
-          ui: {
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
-          }
         },
         // feeCode: {
         //   type: 'string',
@@ -210,20 +177,14 @@ export class PaymentOrderComponent implements OnInit {
           type: 'string',
           ui: {
             widget: 'sl-from-to-search',
-            format: 'yyyy-MM-dd',
+            format: 'yyyy-MM-dd'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           } as SFDateWidgetSchema
         },
         payRemarks: {
           type: 'string',
           title: '付款备注',
           ui: {
-            placeholder: '请选择',
+            placeholder: '请选择'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         }
       }
@@ -233,9 +194,9 @@ export class PaymentOrderComponent implements OnInit {
   private initST(): STColumn[] {
     return [
       { title: '', index: 'key', type: 'checkbox', fixed: 'left', className: 'text-center' },
-      { title: '付款单号', index: 'payCode', type: 'link', width: 180 },
+      { title: '付款单号', index: 'payCode', className: 'text-left', type: 'link', width: 180 },
-      { title: '网络货运人', index: 'ltdName', width: 180 },
+      { title: '网络货运人', index: 'ltdName', className: 'text-left', width: 180 },
-      { title: '运单号', index: 'waybillCode', width: 180 },
+      { title: '运单号', index: 'waybillCode', className: 'text-left', width: 180 },
       // { title: '费用号', index: 'feeCode', width: 180 },
       { title: '要求付款日期', index: 'payDate', type: 'date', className: 'text-center', width: 150 },
       {

src/app/routes/financial-management/components/payment-record/payment-record.component.html

@@ -1,14 +1,4 @@
-<!--
+<!-- <page-header-wrapper [title]="'支付记录'">
- * @Description  : 
- * @Version      : 1.0
- * @Author       : Shiming
- * @Date         : 2022-03-21 14:19:21
- * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-21 15:03:40
- * @FilePath     : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\payment-record\\payment-record.component.html
- * Copyright (C) 2022 huzhenhong. All rights reserved.
--->
-<page-header-wrapper [title]="'支付记录'">
 </page-header-wrapper>
 
 <nz-card class="search-box" nzBordered>
@@ -29,19 +19,28 @@
             </button>
         </div>
     </div>
-</nz-card>
+</nz-card> -->
 
-<nz-card class="content-box" nzBordered>
+<nz-card class="table-box">
+    <div class="tab_header">
+        <label class="page_title"><label class="driver">|</label>支付记录</label>
+        <nz-tabset [nzTabBarExtraContent]="extraTemplate">
+            <nz-tab nzTitle="全部" (nzClick)="changePaymentStatus()"></nz-tab>
+            <nz-tab nzTitle="支付中" (nzClick)="changePaymentStatus('4')"></nz-tab>
+            <nz-tab nzTitle="已支付" (nzClick)="changePaymentStatus('2')"></nz-tab>
+            <nz-tab nzTitle="支付失败" (nzClick)="changePaymentStatus('5')"></nz-tab>
+        </nz-tabset>
+    </div>
 
-    <nz-tabset>
+    <ng-template #extraTemplate>
-        <nz-tab nzTitle="全部" (nzClick)="changePaymentStatus()"></nz-tab>
+        <div class="mr-sm">
-        <nz-tab nzTitle="支付中" (nzClick)="changePaymentStatus('4')"></nz-tab>
+            <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()">筛选</button>
-        <nz-tab nzTitle="已支付" (nzClick)="changePaymentStatus('2')"></nz-tab>
+            <button nz-button nzDanger (click)="exprot()"> 导出</button>
-        <nz-tab nzTitle="支付失败" (nzClick)="changePaymentStatus('5')"></nz-tab>
+        </div>
-    </nz-tabset>
+    </ng-template>
 
-    <st #st [data]="service.$api_get_order_payment_page" [columns]="columns" [req]="{   process: beforeReq }" [page]="{}"
+    <st #st [data]="service.$api_get_order_payment_page" [columns]="columns" [req]="{   process: beforeReq }"
-        [loading]="false" [scroll]="{ x:'1200px' }">
+        [page]="{}" [loading]="false" [scroll]="{ x:'1200px',y:scrollY }">
         <ng-template st-row="orderPaymentCode" let-item let-index="index" let-column="column">
             {{ item?.orderPaymentCode }} <br> <a>{{ item?.paymentStatusLabel }}</a>
         </ng-template>

src/app/routes/financial-management/components/payment-record/payment-record.component.less

@@ -1,41 +0,0 @@
-:host::ng-deep {
-    .search-box {
-        .ant-card-body {
-            padding-bottom: 18px;
-        }
-    }
-
-    .content-box {
-        .ant-card-body {
-            padding-top: 0;
-        }
-    }
-
-    nz-range-picker {
-        width: 100%;
-    }
-
-    .ant-tabs-tab-btn {
-        padding-left : 16px;
-        padding-right: 16px;
-    }
-
-    .text-truncate {
-        white-space: normal;
-    }
-}
-
-.expend-options {
-    margin-top: 0px;
-}
-
-
-@media (min-width: 1200px) {
-    .expend-options {
-        max-width: 400px;
-        position : absolute;
-        right    : 0;
-        bottom   : 25px;
-    }
-
-}

src/app/routes/financial-management/components/payment-record/payment-record.component.ts

@@ -2,31 +2,39 @@ import { Component, OnInit, ViewChild } from '@angular/core';
 import { Router } from '@angular/router';
 import { STComponent, STColumn, STRequestOptions } from '@delon/abc/st';
 import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form';
+import { SearchDrawerService } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
+import { BasicTableComponent } from 'src/app/routes/commom';
 import { FreightAccountService } from '../../services/freight-account.service';
 import { ClearingModalComponent } from '../abnormal-gold/clearing-modal/clearing-modal.component';
 
 @Component({
   selector: 'app-payment-record',
   templateUrl: './payment-record.component.html',
-  styleUrls: ['./payment-record.component.less']
+  styleUrls: ['../../../commom/less/commom-table.less']
 })
-export class PaymentRecordComponent implements OnInit {
+export class PaymentRecordComponent extends BasicTableComponent implements OnInit {
   @ViewChild('st', { static: true })
   st!: STComponent;
-  @ViewChild('sf', { static: false })
-  sf!: SFComponent;
   columns: STColumn[] = this.initST();
-  searchSchema: SFSchema = this.initSF();
+  schema: SFSchema = this.initSF();
-
-  _$expand = false;
 
   paymentStatus: any = '';
 
-  constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) {}
+  constructor(
+    public service: FreightAccountService,
+    private nzModalService: NzModalService,
+    public searchDrawerService: SearchDrawerService
+  ) {
+    super(searchDrawerService);
+  }
 
   ngOnInit(): void {}
 
+  search() {
+    this.st?.load(1);
+  }
+
   beforeReq = (requestOptions: STRequestOptions) => {
     if (this.sf) {
       Object.assign(requestOptions.body, {
@@ -38,10 +46,10 @@ export class PaymentRecordComponent implements OnInit {
         handlerDate: {
           start: this.sf.value.handlerDate?.[0] || '',
           end: this.sf.value.handlerDate?.[1] || ''
-        },
+        }
-        paymentStatus: this.paymentStatus || null
       });
     }
+    Object.assign(requestOptions.body, { paymentStatus: this.paymentStatus || null });
     return requestOptions;
   };
 
@@ -57,22 +65,6 @@ export class PaymentRecordComponent implements OnInit {
     });
   }
 
-  /**
-   * 重置表单
-   */
-  resetSF() {
-    this.sf.reset();
-    this._$expand = false;
-  }
-
-  /**
-   * 伸缩查询条件
-   */
-  expandToggle() {
-    this._$expand = !this._$expand;
-    this.sf?.setValue('/expand', this._$expand);
-  }
-
   private initSF(): SFSchema {
     return {
       properties: {
@@ -109,10 +101,7 @@ export class PaymentRecordComponent implements OnInit {
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'service:type' },
-            placeholder: '请选择',
+            placeholder: '请选择'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           },
           default: ''
         },
@@ -120,46 +109,34 @@ export class PaymentRecordComponent implements OnInit {
           type: 'string',
           title: '承运司机',
           ui: {
-            placeholder: '请输入',
+            placeholder: '请输入'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         },
         driverLicensePlate: {
           type: 'string',
           title: '车牌号',
           ui: {
-            placeholder: '请输入',
+            placeholder: '请输入'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         },
         captain: {
           type: 'string',
           title: '收款人',
           ui: {
-            placeholder: '请输入收款人姓名/手机号',
+            placeholder: '请输入收款人姓名/手机号'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         },
         isCaptain: {
           type: 'string',
           title: '车队长收款',
           enum: [
-            {label: '全部', value: ''},
+            { label: '全部', value: '' },
-            {label: '是', value: '1'},
+            { label: '是', value: '1' },
-            {label: '否', value: '2'}
+            { label: '否', value: '2' }
           ],
           ui: {
             widget: 'select',
-            placeholder: '请选择',
+            placeholder: '请选择'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           },
           default: ''
         },
@@ -169,10 +146,7 @@ export class PaymentRecordComponent implements OnInit {
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'paybill:type' },
-            placeholder: '请选择',
+            placeholder: '请选择'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           },
           default: ''
         },
@@ -183,10 +157,7 @@ export class PaymentRecordComponent implements OnInit {
             widget: 'sl-from-to-search',
             format: 'yyyy-MM-dd',
             placeholder: '请选择',
-            nzShowTime: true,
+            nzShowTime: true
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           } as SFDateWidgetSchema
         },
         handlerDate: {
@@ -196,10 +167,7 @@ export class PaymentRecordComponent implements OnInit {
             widget: 'sl-from-to-search',
             format: 'yyyy-MM-dd',
             placeholder: '请选择',
-            nzShowTime: true,
+            nzShowTime: true
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           } as SFDateWidgetSchema
         },
         bankType: {
@@ -212,10 +180,7 @@ export class PaymentRecordComponent implements OnInit {
           ],
           ui: {
             widget: 'select',
-            placeholder: '请选择',
+            placeholder: '请选择'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           },
           default: ''
         },
@@ -226,10 +191,7 @@ export class PaymentRecordComponent implements OnInit {
             widget: 'select',
             placeholder: '请选择',
             allowClear: true,
-            asyncData: () => this.service.getNetworkFreightForwarder(),
+            asyncData: () => this.service.getNetworkFreightForwarder()
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         }
       }

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

@@ -1,14 +1,4 @@
-<!--
+<!-- <page-header-wrapper [title]="'收款单'"> </page-header-wrapper>
- * @Description  : 
- * @Version      : 1.0
- * @Author       : Shiming
- * @Date         : 2022-01-18 18:43:42
- * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-25 15:38:21
- * @FilePath     : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\receipt-order\\receipt-order.component.html
- * Copyright (C) 2022 huzhenhong. All rights reserved.
--->
-<page-header-wrapper [title]="'收款单'"> </page-header-wrapper>
 
 <nz-card class="search-box" nzBordered>
   <div nz-row nzGutter="8">
@@ -19,28 +9,41 @@
     <div nz-col [nzXl]="_$expand ? 24 : 7" [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 (click)="resetSF()">重置</button>
-      <!-- <button nz-button nzType="primary"> 导出</button>
+      <button nz-button nzType="primary"> 导出</button>
-      <button nz-button nzType="primary"> 导出核销</button> -->
+      <button nz-button nzType="primary"> 导出核销</button>
       <button nz-button nzType="link" (click)="expandToggle()">
         {{ !_$expand ? '展开' : '收起' }}
         <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
       </button>
     </div>
   </div>
-</nz-card>
+</nz-card> -->
 
-<nz-card class="content-box" nzBordered>
+<nz-card class="table-box">
-  <div class="d-flex align-items-center mb-md mt-md">
+  <div class="header_box">
-    <!-- <button nz-button (click)="this.addInvoice()" nzType="primary">添加收款</button>
+      <div>
-    <button nz-button (click)="this.addInvoice()" nzType="primary">导入收款</button> -->
+          <label class="page_title"> <label class="driver">|</label> 收款单</label>
+          <label class="ml-md">
+              已选择
+              <strong class="text-primary">{{ selectedRows.length }}</strong> 张单
+              <a *ngIf="selectedRows.length > 0" (click)="st.clearCheck()" class="ml-lg">清空</a>
+          </label>
+      </div>
+      <div class="mr-sm">
+          <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()">筛选</button>
+      </div>
+  </div>
+  <!-- <div class="d-flex align-items-center mb-md mt-md">
+    <button nz-button (click)="this.addInvoice()" nzType="primary">添加收款</button>
+    <button nz-button (click)="this.addInvoice()" nzType="primary">导入收款</button>
     <div class="ml-md">
       已选择
       <strong class="text-primary">{{ selectedRows.length }}</strong> 张单
       <a *ngIf="selectedRows.length > 0" (click)="st.clearCheck()" class="ml-lg">清空</a>
     </div>
-  </div>
+  </div> -->
 
   <st #st [data]="service.$api_get_receipt_page" [columns]="columns" [req]="{  process: beforeReq }" [page]="{}"
-    [loading]="false" [scroll]="{ x: '1200px' }" (change)="stChange($event)">
+    [loading]="false" [scroll]="{ x: '1200px',y:scrollY  }" (change)="stChange($event)">
   </st>
 </nz-card>

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

@@ -2,30 +2,38 @@ 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 { SearchDrawerService } from '@shared';
 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 { BasicTableComponent } from 'src/app/routes/commom';
 import { FreightAccountService } from '../../services/freight-account.service';
 
 @Component({
   selector: 'app-receipt-order',
   templateUrl: './receipt-order.component.html',
-  styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less']
+  styleUrls: ['../../../commom/less/commom-table.less']
 })
-export class ReceiptOrderComponent implements OnInit {
+export class ReceiptOrderComponent extends BasicTableComponent implements OnInit {
   @ViewChild('st', { static: true })
   st!: STComponent;
-  @ViewChild('sf', { static: false })
-  sf!: SFComponent;
   columns: STColumn[] = this.initST();
-  searchSchema: SFSchema = this.initSF();
+  schema: SFSchema = this.initSF();
-
-  _$expand = false;
 
   selectedRows: any[] = [];
-  constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) {}
+  constructor(
+    public service: FreightAccountService,
+    private nzModalService: NzModalService,
+    private router: Router,
+    public searchDrawerService: SearchDrawerService
+  ) {
+    super(searchDrawerService);
+  }
 
   ngOnInit(): void {}
 
+  search() {
+    this.st?.load(1);
+  }
+
   beforeReq = (requestOptions: STRequestOptions) => {
     if (this.sf) {
       Object.assign(requestOptions.body, {
@@ -48,6 +56,7 @@ export class ReceiptOrderComponent implements OnInit {
         });
       }
     }
+    this.selectedRows = [];
     return requestOptions;
   };
 
@@ -72,22 +81,6 @@ export class ReceiptOrderComponent implements OnInit {
     // });
   }
 
-  /**
-   * 重置表单
-   */
-  resetSF() {
-    this.sf.reset();
-    this._$expand = false;
-  }
-
-  /**
-   * 伸缩查询条件
-   */
-  expandToggle() {
-    this._$expand = !this._$expand;
-    this.sf?.setValue('/expand', this._$expand);
-  }
-
   private initSF(): SFSchema {
     return {
       properties: {
@@ -128,10 +121,7 @@ export class ReceiptOrderComponent implements OnInit {
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'driverrecord:receive:type' },
-            placeholder: '请选择',
+            placeholder: '请选择'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         },
         brmmode: {
@@ -140,10 +130,7 @@ export class ReceiptOrderComponent implements OnInit {
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'receive:mode' },
-            placeholder: '请选择',
+            placeholder: '请选择'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         },
         arto: {
@@ -155,10 +142,7 @@ export class ReceiptOrderComponent implements OnInit {
             searchDebounceTime: 300,
             searchLoadingText: '搜索中...',
             allowClear: true,
-            onSearch: (q: any) => this.service.getEnterpriceList({ enterpriseName: q }),
+            onSearch: (q: any) => this.service.getEnterpriceList({ enterpriseName: q })
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         },
         sts: {
@@ -167,10 +151,7 @@ export class ReceiptOrderComponent implements OnInit {
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'write:off:status' },
-            placeholder: '请选择',
+            placeholder: '请选择'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         },
         brmdate: {
@@ -178,10 +159,7 @@ export class ReceiptOrderComponent implements OnInit {
           type: 'string',
           ui: {
             widget: 'sl-from-to-search',
-            format: 'yyyy-MM-dd',
+            format: 'yyyy-MM-dd'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           } as SFDateWidgetSchema
         },
         createTime: {
@@ -189,10 +167,7 @@ export class ReceiptOrderComponent implements OnInit {
           type: 'string',
           ui: {
             widget: 'sl-from-to-search',
-            format: 'yyyy-MM-dd',
+            format: 'yyyy-MM-dd'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           } as SFDateWidgetSchema
         },
         // billHCode: {
@@ -219,10 +194,7 @@ export class ReceiptOrderComponent implements OnInit {
           type: 'string',
           title: '收款备注',
           ui: {
-            placeholder: '请输入',
+            placeholder: '请输入'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         }
       }

src/app/routes/financial-management/components/recharge-record/recharge-record.component.html

@@ -1,5 +1,5 @@
-<page-header-wrapper [title]="'充值记录'">
+<!-- <page-header-wrapper [title]="'充值记录'">
-</page-header-wrapper>
+</page-header-wrapper> -->
 
 <!-- <nz-card>
     <nz-row [nzGutter]="16">
@@ -15,7 +15,7 @@
     </nz-row>
 </nz-card> -->
 
-<nz-card class="search-box" nzBordered>
+<!-- <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"
@@ -33,11 +33,18 @@
             </button>
         </div>
     </div>
-</nz-card>
+</nz-card> -->
 
-<nz-card class="content-box" nzBordered>
+<nz-card class="table-box">
+    <div class="header_box">
+        <label class="page_title"> <label class="driver">|</label> 充值记录</label>
+        <div class="mr-sm">
+            <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()">筛选</button>
+            <button nz-button nzDanger (click)="exportList()"> 导出</button>
+        </div>
+    </div>
     <st #st [data]="service.$api_get_recharge_page" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}"
-        [loading]="false" [scroll]="{ x:'1200px' }">
+        [loading]="false" [scroll]="{ x:'1200px',y:scrollY }">
         <ng-template st-row="transferBankAccount" let-item let-index="index" let-column="column">
             {{ item.transferBankOpenName }} <br> {{ item.transferBankCardNumber }}
         </ng-template>

src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts

@@ -1,31 +1,36 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st';
 import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form';
+import { SearchDrawerService } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
+import { BasicTableComponent } from 'src/app/routes/commom';
 import { FreightAccountService } from '../../services/freight-account.service';
 
 @Component({
   selector: 'app-recharge-record',
   templateUrl: './recharge-record.component.html',
-  styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less']
+  styleUrls: ['../../../commom/less/commom-table.less']
 })
-export class RechargeRecordComponent implements OnInit {
+export class RechargeRecordComponent extends BasicTableComponent implements OnInit {
   @ViewChild('st', { static: true })
   st!: STComponent;
-  @ViewChild('sf', { static: false })
-  sf!: SFComponent;
   columns: STColumn[] = this.initST();
-  searchSchema: SFSchema = this.initSF();
+  schema: SFSchema = this.initSF();
 
   @ViewChild('remarkodal', { static: true })
   remarkodal!: any;
   rechargeRemark = '';
 
-  _$expand = false;
+  constructor(public service: FreightAccountService, private modal: NzModalService, public searchDrawerService: SearchDrawerService) {
-  constructor(public service: FreightAccountService, private modal: NzModalService) {}
+    super(searchDrawerService);
+  }
 
   ngOnInit(): void {}
 
+  search() {
+    this.st?.load(1);
+  }
+
   beforeReq = (requestOptions: STRequestOptions) => {
     if (this.sf) {
       Object.assign(requestOptions.body, { ...this.sf.value });
@@ -70,22 +75,6 @@ export class RechargeRecordComponent implements OnInit {
     history.go(-1);
   }
 
-  /**
-   * 重置表单
-   */
-  resetSF() {
-    this.sf.reset();
-    this._$expand = false;
-  }
-
-  /**
-   * 伸缩查询条件
-   */
-  expandToggle() {
-    this._$expand = !this._$expand;
-    this.sf?.setValue('/expand', this._$expand);
-  }
-
   exportList() {
     this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportPageByOperator);
   }
@@ -93,12 +82,6 @@ export class RechargeRecordComponent implements OnInit {
   private initSF(): SFSchema {
     return {
       properties: {
-        expand: {
-          type: 'boolean',
-          ui: {
-            hidden: true
-          }
-        },
         rechargeNo: {
           type: 'string',
           title: '充值单号',
@@ -137,9 +120,6 @@ export class RechargeRecordComponent implements OnInit {
           ui: {
             placeholder: '请输入',
             autocomplete: 'off',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         },
         accountType: {
@@ -154,9 +134,6 @@ export class RechargeRecordComponent implements OnInit {
           ui: {
             widget: 'select',
             placeholder: '请选择',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           },
           default: ''
         },
@@ -166,9 +143,6 @@ export class RechargeRecordComponent implements OnInit {
           ui: {
             widget: 'select',
             placeholder: '请选择',
-            visibleIf: {
-              expand: (value: boolean) => value
-            },
             allowClear: true,
             asyncData: () => this.service.getNetworkFreightForwarder()
           }
@@ -184,9 +158,6 @@ export class RechargeRecordComponent implements OnInit {
           ui: {
             widget: 'select',
             placeholder: '请选择',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           },
           default: ''
         }

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

@@ -1,4 +1,4 @@
-<page-header-wrapper [title]="'交易流水'"> </page-header-wrapper>
+<!-- <page-header-wrapper [title]="'交易流水'"> </page-header-wrapper>
 
 <nz-card class="search-box" nzBordered>
   <div nz-row nzGutter="8">
@@ -18,13 +18,17 @@
       </button>
     </div>
   </div>
-</nz-card>
+</nz-card> -->
 
-<nz-card class="content-box pt-xl" nzBordered>
+<nz-card class="table-box">
+  <div class="header_box">
+    <label class="page_title"> <label class="driver">|</label> 交易流水</label>
+    <div class="mr-sm">
+      <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()">筛选</button>
+      <button nz-button nzDanger (click)="exportList()"> 导出</button>
+    </div>
+  </div>
   <st #st [data]="service.$api_get_account_blance" [columns]="columns" [req]="{  process: beforeReq }" [page]="{}"
-    [loading]="false" [scroll]="{ x: '1200px' }">
+    [loading]="false" [scroll]="{ x: '1200px',y:scrollY }">
-    <ng-template st-row="amount">
-
-    </ng-template>
   </st>
 </nz-card>

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

@@ -3,32 +3,29 @@ import { Component, ViewChild } from '@angular/core';
 import { Router } from '@angular/router';
 import { STComponent, STColumn, STRequestOptions } from '@delon/abc/st';
 import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form';
+import { SearchDrawerService } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
+import { BasicTableComponent } from 'src/app/routes/commom';
 
 import { FreightAccountService } from '../../services/freight-account.service';
 
 @Component({
   selector: 'app-transaction-flow',
   templateUrl: './transaction-flow.component.html',
-  styleUrls: ['./transaction-flow.component.less'],
+  styleUrls: ['../../../commom/less/commom-table.less']
-  providers: [CurrencyPipe]
 })
-export class TransactionFlowComponent {
+export class TransactionFlowComponent extends BasicTableComponent {
   @ViewChild('st', { static: true })
   st!: STComponent;
-  @ViewChild('sf', { static: false })
-  sf!: SFComponent;
   columns: STColumn[] = this.initST();
-  searchSchema: SFSchema = this.initSF();
+  schema: SFSchema = this.initSF();
 
-  _$expand = false;
+  constructor(public service: FreightAccountService, public searchDrawerService: SearchDrawerService) {
-
+    super(searchDrawerService);
-  constructor(
+  }
-    public service: FreightAccountService,
+  search() {
-    private nzModalService: NzModalService,
+    this.st?.load(1);
-    private router: Router,
+  }
-    private currencyPipe: CurrencyPipe
-  ) {}
 
   beforeReq = (requestOptions: STRequestOptions) => {
     if (this.sf) {
@@ -43,31 +40,10 @@ export class TransactionFlowComponent {
     return requestOptions;
   };
 
-  /**
-   * 重置表单
-   */
-  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
-          }
-        },
         createTime: {
           title: '交易时间',
           type: 'string',
@@ -96,9 +72,6 @@ export class TransactionFlowComponent {
           title: '订单号',
           ui: {
             placeholder: '请输入',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         },
         tradeType: {
@@ -120,9 +93,6 @@ export class TransactionFlowComponent {
           ui: {
             widget: 'select',
             placeholder: '请选择',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           },
           default: ''
         },
@@ -137,9 +107,6 @@ export class TransactionFlowComponent {
           ui: {
             widget: 'select',
             placeholder: '请选择',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           },
           default: ''
         },
@@ -155,9 +122,6 @@ export class TransactionFlowComponent {
           ui: {
             widget: 'select',
             placeholder: '请选择',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           },
           default: ''
         },
@@ -166,9 +130,6 @@ export class TransactionFlowComponent {
           title: '账户名称',
           ui: {
             placeholder: '请输入',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         },
         projectId: {
@@ -178,9 +139,6 @@ export class TransactionFlowComponent {
             widget: 'select',
             placeholder: '请选择',
             allowClear: true,
-            visibleIf: {
-              expand: (value: boolean) => value
-            },
             asyncData: () => this.service.getEnterpriseProject()
           },
           default: ''
@@ -196,9 +154,6 @@ export class TransactionFlowComponent {
           ui: {
             widget: 'select',
             placeholder: '请选择',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           },
           default: ''
         },
@@ -209,9 +164,6 @@ export class TransactionFlowComponent {
             widget: 'select',
             placeholder: '请选择',
             allowClear: true,
-            visibleIf: {
-              expand: (value: boolean) => value
-            },
             asyncData: () => this.service.getNetworkFreightForwarder()
           },
           default: ''
@@ -225,8 +177,8 @@ export class TransactionFlowComponent {
       { title: '交易时间', index: 'createTime', width: 180 },
       { title: '流水号', index: 'transactionNumber', width: 180 },
       { title: '交易类型', index: 'tradeTypeLabel', width: 120 },
-      { title: '关联单号', index: 'businessNumber', width: 150 },
+      { title: '关联单号', index: 'businessNumber', width: 170 },
-      { title: '订单号', index: 'orderSn', width: 150 },
+      { title: '订单号', index: 'orderSn', width: 170 },
       { title: '账户类型', index: 'accountTypeLabel', width: 130 },
       { title: '账户名称', index: 'roleName', width: 180 },
       { title: '所属项目', index: 'projectName', width: 140 },

src/app/routes/financial-management/components/voucher-management/voucher-management.component.html

@@ -1,4 +1,4 @@
-<page-header-wrapper [title]="'凭证管理'">
+<!-- <page-header-wrapper [title]="'凭证管理'">
 </page-header-wrapper>
 
 <nz-card class="search-box" nzBordered>
@@ -11,29 +11,38 @@
         <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
             <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)" acl  [acl-ability]="['FINANCIAL-VOUCHER-list']">查询</button>
             <button nz-button [disabled]="false" (click)="resetSF()">重置</button>
-            <!-- <button nz-button [disabled]="false"> 导出</button>
+             <button nz-button [disabled]="false"> 导出</button>
-            <button nz-button [disabled]="false"> 导出明细</button> -->
+            <button nz-button [disabled]="false"> 导出明细</button> 
             <button nz-button nzType="link" (click)="expandToggle()">
                 {{ !_$expand ? '展开' : '收起' }}
                 <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
             </button>
         </div>
     </div>
-</nz-card>
+</nz-card> -->
 
-<nz-card class="content-box" nzBordered>
+<nz-card class="table-box">
+    <div class="header_box">
+        <label class="page_title"> <label class="driver">|</label> 凭证管理</label>
+        <div class="mr-sm">
+            <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()" acl
+                [acl-ability]="['FINANCIAL-VOUCHER-list']">筛选</button>
+        </div>
+    </div>
 
-    <div class="d-flex align-items-center mb-md mt-md">
+    <!-- <div class="d-flex align-items-center mb-md mt-md">
-        <!-- <button nz-button nzType="primary">新建凭证</button>
+        <button nz-button [disabled]="false"> 导出</button>
+        <button nz-button [disabled]="false"> 导出明细</button>
+        <button nz-button nzType="primary">新建凭证</button>
         <button nz-button nzType="primary">凭证导入</button>
         <div class="ml-md">
             已选择
             <strong class="text-primary">{{ selectedRows.length }}</strong> 张发票
             <a *ngIf="selectedRows.length > 0" (click)="st.clearCheck()" class="ml-lg">清空</a>
-        </div> -->
+        </div>
-    </div>
+    </div> -->
 
     <st #st [data]="service.$api_get_fico_vch_page" [columns]="columns" [req]="{  process: beforeReq }" [page]="{}"
-        [loading]="false" [scroll]="{ x:'1200px' }" (change)="stChange($event)">
+        [loading]="false" [scroll]="{ x:'1200px',y:scrollY }" (change)="stChange($event)">
     </st>
 </nz-card>

src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts

@@ -1,43 +1,36 @@
-/*
- * @Description  :
- * @Version      : 1.0
- * @Author       : Shiming
- * @Date         : 2022-01-18 15:57:44
- * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-09 16:36:42
- * @FilePath     : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\voucher-management\\voucher-management.component.ts
- * Copyright (C) 2022 huzhenhong. All rights reserved.
- */
-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 { SearchDrawerService } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
+import { BasicTableComponent } from 'src/app/routes/commom';
 import { FreightAccountService } from '../../services/freight-account.service';
 
 @Component({
   selector: 'app-voucher-management',
   templateUrl: './voucher-management.component.html',
-  styleUrls: ['../../../commom/less/box.less']
+  styleUrls: ['../../../commom/less/commom-table.less']
 })
-export class VoucherManagementComponent implements OnInit {
+export class VoucherManagementComponent extends BasicTableComponent implements OnInit {
   @ViewChild('st', { static: true })
   st!: STComponent;
-  @ViewChild('sf', { static: false })
-  sf!: SFComponent;
   @ViewChild('auditModal', { static: false })
   auditModal!: any;
   columns: STColumn[] = this.initST();
-  searchSchema: SFSchema = this.initSF();
+  schema: SFSchema = this.initSF();
-
-  _$expand = false;
 
   selectedRows: any[] = [];
-  constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) {}
+  constructor(public service: FreightAccountService, private router: Router, public searchDrawerService: SearchDrawerService) {
+    super(searchDrawerService);
+  }
 
   ngOnInit(): void {}
 
+  search() {
+    this.st?.load(1);
+  }
+
   beforeReq = (requestOptions: STRequestOptions) => {
     if (this.sf) {
       Object.assign(requestOptions.body, {
@@ -71,22 +64,6 @@ export class VoucherManagementComponent implements OnInit {
     }
   }
 
-  /**
-   * 重置表单
-   */
-  resetSF() {
-    this.sf.reset();
-    this._$expand = false;
-  }
-
-  /**
-   * 伸缩查询条件
-   */
-  expandToggle() {
-    this._$expand = !this._$expand;
-    this.sf?.setValue('/expand', this._$expand);
-  }
-
   private initSF(): SFSchema {
     return {
       properties: {
@@ -128,10 +105,7 @@ export class VoucherManagementComponent implements OnInit {
           title: '原始单号',
           ui: {
             autocomplete: 'off',
-            placeholder: '请输入',
+            placeholder: '请输入'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         },
         sourceType: {
@@ -155,10 +129,7 @@ export class VoucherManagementComponent implements OnInit {
           ],
           ui: {
             widget: 'select',
-            placeholder: '请选择',
+            placeholder: '请选择'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         },
         createTime: {
@@ -166,20 +137,14 @@ export class VoucherManagementComponent implements OnInit {
           type: 'string',
           ui: {
             widget: 'sl-from-to-search',
-            format: 'yyyy-MM-dd',
+            format: 'yyyy-MM-dd'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           } as SFDateWidgetSchema
         },
         remarks: {
           type: 'string',
           title: '凭证摘要',
           ui: {
-            placeholder: '请输入',
+            placeholder: '请输入'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         },
         vctype: {
@@ -188,10 +153,7 @@ export class VoucherManagementComponent implements OnInit {
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'credential:type' },
-            placeholder: '请选择',
+            placeholder: '请选择'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           },
           default: ''
         },
@@ -211,20 +173,14 @@ export class VoucherManagementComponent implements OnInit {
           type: 'string',
           title: '借方金额',
           ui: {
-            placeholder: '请输入',
+            placeholder: '请输入'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         },
         crmoney: {
           type: 'string',
           title: '贷方金额',
           ui: {
-            placeholder: '请输入',
+            placeholder: '请输入'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         },
         vcltdid: {
@@ -233,10 +189,7 @@ export class VoucherManagementComponent implements OnInit {
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'refund:apply:status' },
-            placeholder: '请选择',
+            placeholder: '请选择'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         },
         sts: {
@@ -245,10 +198,7 @@ export class VoucherManagementComponent implements OnInit {
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'credential:status' },
-            placeholder: '请选择',
+            placeholder: '请选择'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           },
           default: ''
         },
@@ -256,20 +206,14 @@ export class VoucherManagementComponent implements OnInit {
           type: 'string',
           title: 'NC凭证',
           ui: {
-            placeholder: '请输入',
+            placeholder: '请输入'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         },
         vc2code: {
           type: 'string',
           title: '汇总凭证号',
           ui: {
-            placeholder: '请输入',
+            placeholder: '请输入'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         },
         importnc: {
@@ -278,10 +222,7 @@ export class VoucherManagementComponent implements OnInit {
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'refund:apply:status' },
-            placeholder: '请选择',
+            placeholder: '请选择'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         },
         isvc2: {
@@ -294,10 +235,7 @@ export class VoucherManagementComponent implements OnInit {
           ],
           ui: {
             widget: 'select',
-            placeholder: '请选择',
+            placeholder: '请选择'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         }
       }

src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html

@@ -1,14 +1,4 @@
-<!--
+<!-- <page-header-wrapper [title]="'凭证汇总'">
- * @Description  : 
- * @Version      : 1.0
- * @Author       : Shiming
- * @Date         : 2022-01-18 15:57:44
- * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-20 15:23:44
- * @FilePath     : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\voucher-summary\\voucher-summary.component.html
- * Copyright (C) 2022 huzhenhong. All rights reserved.
--->
-<page-header-wrapper [title]="'凭证汇总'">
 </page-header-wrapper>
 
 <nz-card class="search-box" nzBordered>
@@ -23,18 +13,26 @@
             <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
             <button nz-button [disabled]="false" (click)="resetSF()">重置</button>
             <button nz-button nzType="primary" [disabled]="false" (click)='exportList()'> 导出</button>
-            <!-- <button nz-button nzType="primary" [disabled]="false"> 导出明细</button>
+            <button nz-button nzType="primary" [disabled]="false"> 导出明细</button>
-            <button nz-button nzType="primary" [disabled]="false"> 导出凭证</button> -->
+            <button nz-button nzType="primary" [disabled]="false"> 导出凭证</button>
             <button nz-button nzType="link" (click)="expandToggle()">
                 {{ !_$expand ? '展开' : '收起' }}
                 <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
             </button>
         </div>
     </div>
-</nz-card>
+</nz-card> -->
 
-<nz-card nzBordered>
+<nz-card class="table-box">
+    <div class="header_box">
+        <label class="page_title"> <label class="driver">|</label> 凭证汇总</label>
+        <div class="mr-sm">
+            <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()" acl
+                [acl-ability]="['FINANCIAL-VOUCHER-list']">筛选</button>
+            <button nz-button nzDanger (click)='exportList()'> 导出</button>
+        </div>
+    </div>
     <st #st [data]="service.$api_get_fico_vch_page" [columns]="columns" [req]="{  process: beforeReq }" [page]="{}"
-        [loading]="false" [scroll]="{ x:'1200px' }" (change)="stChange($event)">
+        [loading]="false" [scroll]="{ x:'1200px',y:scrollY  }" (change)="stChange($event)">
     </st>
 </nz-card>

src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.ts

@@ -3,36 +3,41 @@ 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 { SearchDrawerService } from '@shared';
 import { DateHelperByDatePipe } from 'ng-zorro-antd/i18n';
 import { NzModalService } from 'ng-zorro-antd/modal';
+import { BasicTableComponent } from 'src/app/routes/commom';
 import { AddCollectionInvoiceModalComponent } from 'src/app/routes/ticket-management/components/input-invoice/add-collection-invoice-modal/add-collection-invoice-modal.component';
 import { FreightAccountService } from '../../services/freight-account.service';
 
 @Component({
   selector: 'app-voucher-summary',
   templateUrl: './voucher-summary.component.html',
-  styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less']
+  styleUrls: ['../../../commom/less/commom-table.less']
 })
-export class VoucherSummaryComponent implements OnInit {
+export class VoucherSummaryComponent extends BasicTableComponent implements OnInit {
   @ViewChild('st', { static: true })
   st!: STComponent;
-  @ViewChild('sf', { static: false })
-  sf!: SFComponent;
   columns: STColumn[] = this.initST();
-  searchSchema: SFSchema = this.initSF();
+  schema: SFSchema = this.initSF();
-
-  _$expand = false;
 
   selectedRows: any[] = [];
   constructor(
     public service: FreightAccountService,
     private nzModalService: NzModalService,
     private router: Router,
-    private dateHelperByDatePipe: DateHelperByDatePipe
+    private dateHelperByDatePipe: DateHelperByDatePipe,
-  ) {}
+    public searchDrawerService: SearchDrawerService
+  ) {
+    super(searchDrawerService);
+  }
 
   ngOnInit(): void {}
 
+  search() {
+    this.st?.load(1);
+  }
+
   beforeReq = (requestOptions: STRequestOptions) => {
     Object.assign(requestOptions.body, { isvc2: 1 });
     if (this.sf) {
@@ -72,22 +77,6 @@ export class VoucherSummaryComponent implements OnInit {
     });
   }
 
-  /**
-   * 重置表单
-   */
-  resetSF() {
-    this.sf.reset();
-    this._$expand = false;
-  }
-
-  /**
-   * 伸缩查询条件
-   */
-  expandToggle() {
-    this._$expand = !this._$expand;
-    this.sf?.setValue('/expand', this._$expand);
-  }
-
   exportList() {
     this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_export_fico_vch_page);
   }
@@ -133,10 +122,7 @@ export class VoucherSummaryComponent implements OnInit {
           title: '原始单号',
           ui: {
             autocomplete: 'off',
-            placeholder: '请输入',
+            placeholder: '请输入'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         },
         sourceType: {
@@ -144,10 +130,7 @@ export class VoucherSummaryComponent implements OnInit {
           title: '原始单类型',
           ui: {
             widget: 'select',
-            placeholder: '请选择',
+            placeholder: '请选择'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         },
         createTime: {
@@ -155,20 +138,14 @@ export class VoucherSummaryComponent implements OnInit {
           type: 'string',
           ui: {
             widget: 'sl-from-to-search',
-            format: 'yyyy-MM-dd',
+            format: 'yyyy-MM-dd'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           } as SFDateWidgetSchema
         },
         remarks: {
           type: 'string',
           title: '凭证摘要',
           ui: {
-            placeholder: '请输入',
+            placeholder: '请输入'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         },
         vctype: {
@@ -177,10 +154,7 @@ export class VoucherSummaryComponent implements OnInit {
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'credential:type' },
-            placeholder: '请选择',
+            placeholder: '请选择'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           },
           default: ''
         },
@@ -190,30 +164,21 @@ export class VoucherSummaryComponent implements OnInit {
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'refund:apply:status' },
-            placeholder: '请选择',
+            placeholder: '请选择'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         },
         drmoney: {
           type: 'string',
           title: '借方金额',
           ui: {
-            placeholder: '请输入',
+            placeholder: '请输入'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         },
         crmoney: {
           type: 'string',
           title: '贷方金额',
           ui: {
-            placeholder: '请输入',
+            placeholder: '请输入'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         },
         vcltdid: {
@@ -222,10 +187,7 @@ export class VoucherSummaryComponent implements OnInit {
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'refund:apply:status' },
-            placeholder: '请选择',
+            placeholder: '请选择'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         },
         sts: {
@@ -234,30 +196,21 @@ export class VoucherSummaryComponent implements OnInit {
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'credential:status' },
-            placeholder: '请选择',
+            placeholder: '请选择'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         },
         feecode: {
           type: 'string',
           title: 'NC凭证',
           ui: {
-            placeholder: '请输入',
+            placeholder: '请输入'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         },
         vccode: {
           type: 'string',
           title: '凭证号',
           ui: {
-            placeholder: '请输入',
+            placeholder: '请输入'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         },
         s22t2ss: {
@@ -266,10 +219,7 @@ export class VoucherSummaryComponent implements OnInit {
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'refund:apply:status' },
-            placeholder: '请选择',
+            placeholder: '请选择'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         },
         createt1im2e: {
@@ -277,10 +227,7 @@ export class VoucherSummaryComponent implements OnInit {
           type: 'string',
           ui: {
             widget: 'sl-from-to-search',
-            format: 'yyyy-MM-dd',
+            format: 'yyyy-MM-dd'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           } as SFDateWidgetSchema
         }
       }

src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.html

@@ -1,5 +1,5 @@
-<page-header-wrapper [title]="'提现记录'">
+<!-- <page-header-wrapper [title]="'提现记录'">
-</page-header-wrapper>
+</page-header-wrapper> -->
 
 <!-- <nz-card>
     <nz-row [nzGutter]="16">
@@ -22,7 +22,7 @@
     </nz-row>
 </nz-card> -->
 
-<nz-card class="search-box" nzBordered>
+<!-- <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"
@@ -39,17 +39,22 @@
             </button>
         </div>
     </div>
-</nz-card>
+</nz-card> -->
 
-<nz-card class="content-box" nzBordered>
+<nz-card class="table-box">
-    <nz-tabset [nzTabBarExtraContent]="extraTemplate">
+    <div class="tab_header">
-        <nz-tab nzTitle="全部" (nzClick)="changeRefundStatus()"></nz-tab>
+        <label class="page_title">
-        <nz-tab nzTitle="待审核" (nzClick)="changeRefundStatus('1')"></nz-tab>
+            <label class="driver">|</label>
-        <nz-tab nzTitle="处理中" (nzClick)="changeRefundStatus('2')"></nz-tab>
+            提现记录</label>
-        <nz-tab nzTitle="提现成功" (nzClick)="changeRefundStatus('3')"></nz-tab>
+        <nz-tabset [nzTabBarExtraContent]="extraTemplate">
-        <nz-tab nzTitle="提现失败" (nzClick)="changeRefundStatus('5')"></nz-tab>
+            <nz-tab nzTitle="全部" (nzClick)="changeRefundStatus()"></nz-tab>
-        <nz-tab nzTitle="已拒绝" (nzClick)="changeRefundStatus('4')"></nz-tab>
+            <nz-tab nzTitle="待审核" (nzClick)="changeRefundStatus('1')"></nz-tab>
-    </nz-tabset>
+            <nz-tab nzTitle="处理中" (nzClick)="changeRefundStatus('2')"></nz-tab>
+            <nz-tab nzTitle="提现成功" (nzClick)="changeRefundStatus('3')"></nz-tab>
+            <nz-tab nzTitle="提现失败" (nzClick)="changeRefundStatus('5')"></nz-tab>
+            <nz-tab nzTitle="已拒绝" (nzClick)="changeRefundStatus('4')"></nz-tab>
+        </nz-tabset>
+    </div>
 
     <ng-template #extraTemplate>
         <div class="d-flex align-items-center ">
@@ -60,12 +65,14 @@
                     totalCallNo }}</strong>
                 <a *ngIf="totalCallNo > 0" (click)="st.clearCheck();totalCallNo=0" class="ml-lg">清空</a>
             </div>
+            <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()">筛选</button>
+            <button nz-button nzDanger (click)="exprot()"> 导出</button>
             <button nz-button (click)="this.auditAction(null)">审核</button>
         </div>
     </ng-template>
 
     <st #st [data]="service.$api_get_refund_page" [columns]="columns" [req]="{  process: beforeReq }" [page]="{}"
-        [loading]="false" [scroll]="{ x:'1200px' }" (change)="stChange($event)">
+        [loading]="false" [scroll]="{ x:'1200px',y:scrollY }" (change)="stChange($event)">
         <ng-template st-row="bankCardNumber" let-item let-index="index" let-column="column">
             {{ item.bankName }} <br> {{ item.bankCardNumber }}
         </ng-template>

src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts

@@ -2,36 +2,45 @@ import { Component, ViewChild } from '@angular/core';
 import { Router } from '@angular/router';
 import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st';
 import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form';
+import { SearchDrawerService } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
+import { BasicTableComponent } from 'src/app/routes/commom';
 
 import { FreightAccountService } from '../../services/freight-account.service';
 
 @Component({
   selector: 'app-withdrawals-record',
   templateUrl: './withdrawals-record.component.html',
-  styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less']
+  styleUrls: ['../../../commom/less/commom-table.less']
 })
-export class WithdrawalsRecordComponent {
+export class WithdrawalsRecordComponent extends BasicTableComponent {
   @ViewChild('st', { static: true })
   st!: STComponent;
-  @ViewChild('sf', { static: false })
-  sf!: SFComponent;
   @ViewChild('auditModal', { static: false })
   auditModal!: any;
   columns: STColumn[] = this.initST();
-  searchSchema: SFSchema = this.initSF();
+  schema: SFSchema = this.initSF();
-
-  _$expand = false;
 
   selectedRows: any[] = [];
   totalCallNo = 0;
   refundStatus: any = '';
 
   msg = '';
-  constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) {}
+  constructor(
+    public service: FreightAccountService,
+    private nzModalService: NzModalService,
+    private router: Router,
+    public searchDrawerService: SearchDrawerService
+  ) {
+    super(searchDrawerService);
+  }
 
   ngOnInit(): void {}
 
+  search() {
+    this.st?.load(1);
+  }
+
   beforeReq = (requestOptions: STRequestOptions) => {
     if (this.sf) {
       Object.assign(requestOptions.body, {
@@ -40,10 +49,12 @@ export class WithdrawalsRecordComponent {
           start: this.sf.value.createTime?.[0] || '',
           end: this.sf.value.createTime?.[1] || ''
         },
-        refundStatus: this.refundStatus || null
       });
     }
     delete requestOptions?.body?.expand;
+    this.selectedRows = [];
+    this.totalCallNo = 0;
+    Object.assign(requestOptions.body, { refundStatus: this.refundStatus || null });
     return requestOptions;
   };
 
@@ -145,31 +156,9 @@ export class WithdrawalsRecordComponent {
     });
   }
 
-  /**
-   * 重置表单
-   */
-  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
-          }
-        },
         refundApplyCode: {
           type: 'string',
           title: '提现单号',
@@ -209,10 +198,7 @@ export class WithdrawalsRecordComponent {
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'bank:type' },
-            placeholder: '请选择',
+            placeholder: '请选择'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         },
         ltdId: {
@@ -222,10 +208,7 @@ export class WithdrawalsRecordComponent {
             widget: 'select',
             placeholder: '请选择',
             allowClear: true,
-            asyncData: () => this.service.getNetworkFreightForwarder(),
+            asyncData: () => this.service.getNetworkFreightForwarder()
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         },
         bankType: {
@@ -234,10 +217,7 @@ export class WithdrawalsRecordComponent {
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'bankname:type' },
-            placeholder: '请输入',
+            placeholder: '请输入'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         }
       }
@@ -246,7 +226,7 @@ export class WithdrawalsRecordComponent {
 
   private initST(): STColumn[] {
     return [
-      { title: '', index: 'key', type: 'checkbox' },
+      { title: '', index: 'key', type: 'checkbox', className: 'text-center' },
       { title: '提现时间', index: 'createTime', width: 180 },
       { title: '提现单号', index: 'refundApplyCode', width: 120 },
       { title: '网络货运人', index: 'ltdName', width: 140 },

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

@@ -2,7 +2,6 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FreightAccountComponent } from './components/freight-account/freight-account.component';
 import { DriverAccountComponent } from './components/driver-account/driver-account.component';
-import { RechargeRecordComponent } from './components/recharge-record/recharge-record.component';
 import { WithdrawalsRecordComponent } from './components/withdrawals-record/withdrawals-record.component';
 import { SharedModule } from '@shared';
 import { FinancialManagementRoutingModule } from './financial-managemen-routing.module';
@@ -40,6 +39,7 @@ import { CwcBankCardManagementIndexComponent } from './components/bank-card-mana
 import { CwcBankCardManagementBindComponent } from './components/bank-card-management/bind/bind.component';
 import { CwcBankCardManagementAddComponent } from './components/bank-card-management/add/add.component';
 import { CwcAccountManagementWithdrawDepositComponent } from './components/platform-account/withdraw-deposit/withdraw-deposit.component';
+import { RechargeRecordComponent } from './components/recharge-record/recharge-record.component';
 
 const ROUTESCOMPONENTS = [
   FreightAccountComponent,

src/app/shared/components/search-drawer/search-drawer.component.html

@@ -8,7 +8,7 @@
         <div style="float: right">
             <button nz-button (click)="destroy()">关闭</button>
             <button nz-button (click)="resetSF()">重置</button>
-            <button nz-button nzType="primary" (click)="search();;">搜索</button>
+            <button nz-button nzType="primary" (click)="search();;">查询</button>
         </div>
     </ng-template>
 </nz-drawer>