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

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">
+    <label class="page_title"><label class="driver">|</label>异常入金</label>
+    <nz-tabset [nzTabBarExtraContent]="extraTemplate">
       <nz-tab nzTitle="处理中" (nzClick)="changePaymentStatus('1')"></nz-tab>
       <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>

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/advance-collection/advance-collection.component.html

@@ -1,4 +1,4 @@
-<page-header-wrapper title="预收款余额">
+<!-- <page-header-wrapper title="预收款余额">
 </page-header-wrapper>
 
 <nz-card class="search-box">
@@ -19,10 +19,17 @@
             </button>
         </div>
     </div>
-</nz-card>
+</nz-card> -->
 
-<nz-card class="content-box">
+<nz-card class="table-box">
-    <st #st [data]="service.$api_get_advance_collection_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_advance_collection_page" [columns]="columns" [req]="{  process: beforeReq }"
+        [page]="{}" [loading]="false" [scroll]="{ x: '1200px',y:scrollY  }">
     </st>
 </nz-card>

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

@@ -2,26 +2,37 @@ 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-advance-collection',
   templateUrl: './advance-collection.component.html',
-  styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less']
+  styleUrls: ['../../../commom/less/commom-table.less']
 })
-export class AdvanceCollectionComponent {
+export class AdvanceCollectionComponent extends BasicTableComponent {
   @ViewChild('st', { static: true })
   st!: STComponent;
-  @ViewChild('sf', { static: false })
-  sf!: SFComponent;
 
-  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,
+    public searchDrawerService: SearchDrawerService
+  ) {
+    super(searchDrawerService);
+  }
+
+  ngOnInit(): void {}
+
+  search() {
+    this.st?.load(1);
+  }
 
   beforeReq = (requestOptions: STRequestOptions) => {
     if (this.sf) {
@@ -30,24 +41,8 @@ export class AdvanceCollectionComponent {
     return requestOptions;
   };
 
-  /**
-   * 重置表单
-   */
-  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_reportYskBla,);
+    this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_reportYskBla);
   }
 
   private initSF(): SFSchema {
@@ -97,10 +92,7 @@ export class AdvanceCollectionComponent {
           enum: [{ label: '全部', value: null }],
           ui: {
             widget: 'select',
-            placeholder: '请选择',
+            placeholder: '请选择'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           },
           default: null
         },
@@ -114,10 +106,7 @@ export class AdvanceCollectionComponent {
           ],
           ui: {
             widget: 'select',
-            placeholder: '请选择',
+            placeholder: '请选择'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           },
           default: null
         }

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,19 +21,18 @@
       </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

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">
-    <nz-tabset>
+        <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>
 
-    <st #st [data]="service.$api_get_order_payment_page" [columns]="columns" [req]="{   process: beforeReq }" [page]="{}"
+    <ng-template #extraTemplate>
-        [loading]="false" [scroll]="{ x:'1200px' }">
+        <div class="mr-sm">
+            <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()">筛选</button>
+            <button nz-button nzDanger (click)="exprot()"> 导出</button>
+        </div>
+    </ng-template>
+
+    <st #st [data]="service.$api_get_order_payment_page" [columns]="columns" [req]="{   process: beforeReq }"
+        [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,30 +109,21 @@ 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: {
@@ -156,10 +136,7 @@ export class PaymentRecordComponent implements OnInit {
           ],
           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/platform-account/platform-account-detail/platform-account-detail.component.ts

@@ -119,7 +119,7 @@ export class PlatformAccountDetailComponent implements OnInit {
             nzShowTime: true
           } as SFDateWidgetSchema
         },
-        businessNumber: {
+        channelPaySn: {
           type: 'string',
           title: '流水号',
           ui: {

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/refund-record/refund-record.component.html

@@ -1,4 +1,4 @@
-<page-header-wrapper [title]="'退款记录'">
+<!-- <page-header-wrapper [title]="'退款记录'">
 </page-header-wrapper>
 
 <nz-card class="search-box" nzBordered>
@@ -19,19 +19,24 @@
             </button>
         </div>
     </div>
-</nz-card>
+</nz-card> -->
 
-<nz-card class="content-box" nzBordered>
+<nz-card class="table-box">
-    <nz-tabset>
+    <div class="tab_header">
+        <label class="page_title">
+            <label class="driver">|</label>
+            退款记录</label>
+        <nz-tabset [nzTabBarExtraContent]="extraTemplate">
             <nz-tab nzTitle="全部" (nzClick)="changeRefundStatus()"> </nz-tab>
             <nz-tab nzTitle="待审核" (nzClick)="changeRefundStatus('1')"></nz-tab>
             <nz-tab nzTitle="退款中" (nzClick)="changeRefundStatus('4')"></nz-tab>
             <nz-tab nzTitle="退款成功" (nzClick)="changeRefundStatus('2')"></nz-tab>
             <nz-tab nzTitle="退款失败" (nzClick)="changeRefundStatus('5')"></nz-tab>
         </nz-tabset>
+    </div>
 
     <st #st [data]="service.$api_get_refund_record_page" [columns]="columns" [req]="{  process: beforeReq }" [page]="{}"
-        [loading]="false" [scroll]="{ x:'1200px' }">
+        [loading]="false" [scroll]="{ x:'1200px',y:scrollY  }">
         <ng-template st-row="orderRefundCode" let-item let-index="index" let-column="column">
             {{ item.orderRefundCode }} <br> {{ item.refundStatusLabel }}
         </ng-template>
@@ -54,6 +59,13 @@
     </st>
 </nz-card>
 
+<ng-template #extraTemplate>
+    <div class="mr-sm">
+        <button nz-button nzDanger (click)="openDrawer()" class="mr-sm">筛选</button>
+        <button nz-button nzDanger [disabled]="service.http.loading" (click)="exprot()">导出</button>
+    </div>
+</ng-template>
+
 <ng-template #auditModal>
     <div nz-row nzGutter="8">
         <div nz-col nzSpan="24" se-container [labelWidth]="80">

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

@@ -2,32 +2,40 @@ 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-refund-record',
   templateUrl: './refund-record.component.html',
-  styleUrls: ['../../../commom/less/box.less']
+  styleUrls: ['../../../commom/less/commom-table.less']
 })
-export class RefundRecordComponent implements OnInit {
+export class RefundRecordComponent 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;
   refundStatus: any = '';
 
   msg = '';
 
-  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) => {
     Object.assign(requestOptions.body, { refundStatus: this.refundStatus || null });
@@ -120,22 +128,6 @@ export class RefundRecordComponent 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: {
@@ -177,9 +169,6 @@ export class RefundRecordComponent implements OnInit {
           type: 'string',
           title: '订单号',
           ui: {
-            visibleIf: {
-              expand: (value: boolean) => value
-            },
             placeholder: '请输入'
           }
         },
@@ -187,19 +176,13 @@ export class RefundRecordComponent implements OnInit {
           type: 'string',
           title: '所属项目',
           ui: {
-            placeholder: '请输入',
+            placeholder: '请输入'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         },
         resourceCode: {
           type: 'string',
           title: '货源号',
           ui: {
-            visibleIf: {
-              expand: (value: boolean) => value
-            },
             placeholder: '请输入'
           }
         },
@@ -210,9 +193,6 @@ export class RefundRecordComponent implements OnInit {
             widget: 'sl-from-to-search',
             format: 'yyyy-MM-dd',
             placeholder: '请选择',
-            visibleIf: {
-              expand: (value: boolean) => value
-            },
             nzShowTime: true
           } as SFDateWidgetSchema
         },
@@ -223,10 +203,7 @@ export class RefundRecordComponent implements OnInit {
             widget: 'select',
             placeholder: '请选择',
             allowClear: true,
-            asyncData: () => this.service.getNetworkFreightForwarder(),
+            asyncData: () => this.service.getNetworkFreightForwarder()
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         },
         bankType: {
@@ -235,10 +212,7 @@ export class RefundRecordComponent implements OnInit {
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'bankname:type' },
-            placeholder: '请输入',
+            placeholder: '请输入'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         }
       }

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> -->
 
     <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,9 +39,13 @@
             </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)="changeRefundStatus()"></nz-tab>
             <nz-tab nzTitle="待审核" (nzClick)="changeRefundStatus('1')"></nz-tab>
@@ -50,6 +54,7 @@
             <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: '提现单号',
@@ -177,15 +166,6 @@ export class WithdrawalsRecordComponent {
             placeholder: '请输入'
           }
         },
-        // refundStatus: {
-        //   type: 'string',
-        //   title: '提现状态',
-        //   ui: {
-        //     widget: 'dict-select',
-        //     params: { dictKey: 'refund:apply:status' },
-        //     placeholder: '请选择'
-        //   }
-        // },
         createTime: {
           title: '提现时间',
           type: 'string',
@@ -206,13 +186,14 @@ export class WithdrawalsRecordComponent {
         accountType: {
           type: 'string',
           title: '账户类型',
+          enum: [
+            {label: '全部', value: ''},
+            {label: '个人合伙人', value: '4'},
+            {label: '企业合伙人', value: '5'}
+          ],
           ui: {
-            widget: 'dict-select',
+            widget: 'select',
-            params: { dictKey: 'bank:type' },
             placeholder: '请选择',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         },
         ltdId: {
@@ -222,10 +203,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 +212,7 @@ export class WithdrawalsRecordComponent {
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'bankname:type' },
-            placeholder: '请输入',
+            placeholder: '请输入'
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         }
       }
@@ -246,7 +221,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/routes/order-management/components/complaint-detail/complaint-detail.component.ts

@@ -195,7 +195,7 @@ export class OrderManagementComplaintDetailComponent implements OnInit {
     }
     this.service.request(this.service.$api_get_dealWithComplaint, paramsa).subscribe((res: any) =>{
       if(res) {
-        this.service.msgSrv.success('已拒绝！')
+        this.service.msgSrv.success('已取消！')
         this.isVisibleRE = false
         this.getDetail(this.id);
         this.complaintStatus = true;
@@ -214,9 +214,10 @@ export class OrderManagementComplaintDetailComponent implements OnInit {
       return
     }
     const paramsa = {
+      ...this.sfView.value,
       id: this.channelId
     }
-    this.service.request(this.service.$api_get_canelComplaint, paramsa).subscribe((res: any) =>{
+    this.service.request(this.service.$api_get_dealWithComplaint, paramsa).subscribe((res: any) =>{
       if(res) {
         this.service.msgSrv.success('已拒绝！')
         this.isVisibleRE = false

src/app/routes/order-management/components/complaint/complaint.component.ts

@@ -48,7 +48,11 @@ export class OrderManagementComplaintComponent extends BasicTableComponent imple
     {
       name: '已撤销',
       type: 3
-    }
+    },
+    {
+      name: '已取消',
+      type: 4
+    },
   ];
   constructor(
     public service: OrderManagementService,

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

@@ -236,9 +236,13 @@ export class PartnerAccountManagementWithdrawalsRecordComponent implements OnIni
         accountType: {
           type: 'string',
           title: '账户类型',
+          enum: [
+            {label: '全部', value: ''},
+            {label: '个人合伙人', value: '4'},
+            {label: '企业合伙人', value: '5'}
+          ],
           ui: {
-            widget: 'dict-select',
+            widget: 'select',
-            params: { dictKey: 'bank:type' },
             placeholder: '请选择',
             visibleIf: {
               expand: (value: boolean) => value

src/app/routes/partner/channel-sales/components/edit/edit.component.ts

@@ -1,8 +1,19 @@
 import { AfterViewInit, ChangeDetectorRef, Component, OnChanges, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { SFAutoCompleteWidgetSchema, SFComponent, SFRadioWidgetSchema, SFSchema, SFSchemaEnumType, SFSelectWidgetSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form';
+import {
+  SFAutoCompleteWidgetSchema,
+  SFComponent,
+  SFRadioWidgetSchema,
+  SFSchema,
+  SFSchemaEnum,
+  SFSchemaEnumType,
+  SFSelectWidgetSchema,
+  SFTextareaWidgetSchema,
+  SFUISchema
+} from '@delon/form';
 import { _HttpClient } from '@delon/theme';
 import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
+import { of } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { AmapPoiPickerComponent } from 'src/app/shared/components/amap';
 import { ChannelSalesService } from '../../services/channel-sales.service';
@@ -30,16 +41,32 @@ export class ParterChannelSalesEditComponent implements OnInit {
   ) {}
 
   ngOnInit(): void {
+    this.initSF();
     if (!this.sts) {
       this.service.request(this.service.$api_getChannelSalesInfo, { id: this.i?.id }).subscribe(res => {
+        const List: any = [];
         if (res) {
-          this.record = res;
+          let value1 = Object.assign({}, res);
-           this.initSF();
+          delete value1.employeeVO;
+          let value = res.employeeVO;
+          List.push({ label: value.empName + '/' + value.empNo, value: value.empNo });
+         setTimeout(() => {
+          if (this.sf) {
+            console.log(this.sf.getProperty('/employeeVO')!.schema);
+
+            this.sf.getProperty('/employeeVO')!.schema.enum = List;
+            this.sf.getProperty('/employeeVO')!.widget.reset(List);
+          }
+          if (value.empNo) {
+            this.sf.setValue('/employeeVO', value.empNo);
+            this.currentOAItem  = value;
+            this.sf.setValue('/phoneNumber', res.telephone);
+          }
+         })
+          this.record = value1;
         }
       });
     }
-    this.initSF();
-    
   }
   initSF() {
     this.schema = {
@@ -65,23 +92,56 @@ export class ParterChannelSalesEditComponent implements OnInit {
             placeholder: '请输入'
           }
         },
+        // employeeVO: {
+        //   title: '关联OA员工',
+        //   type: 'string',
+        //   ui: {
+        //     widget: 'select',
+        //     placeholder:'请选择',
+        //     asyncData: (input:string) => this.service.request(this.service.$api_fuzzyQuery,{name:input}).pipe(
+        //       map((res: any) => {
+        //         return res.map((item:any)=>{
+        //           return {label: item.empName+"/"+item.empNo, value: item.empNo, obj: item}
+        //         })
+        //       })
+        //     ),
+        //     change:(item:any, org:any)=>{
+        //       this.currentOAItem = org.obj;
+        //     }
+        //   } as SFAutoCompleteWidgetSchema,
+        // },
         employeeVO: {
           title: '关联OA员工',
           type: 'string',
+          maxLength: 30,
           ui: {
-            widget: 'autocomplete',
+            widget: 'select',
-            placeholder:'请选择',
+            // serverSearch: true,
-            asyncData: (input:string) => this.service.request(this.service.$api_fuzzyQuery,{name:input}).pipe(
+            allowClear: true,
-              map((res: any) => {
+            searchDebounceTime: 300,
-                return res.map((item:any)=>{
+            searchLoadingText: '搜索中...',
-                  return {label: item.empName+"/"+item.empNo, value: item.empNo, obj: item}
+            onSearch: (q: any) => {
-                })
+              let str = q?.replace(/^\s+|\s+$/g, '');
-              })
+              if (str) {
-            ),
+                return this.service
+                  .request(this.service.$api_fuzzyQuery, { name: str })
+                  .pipe(map(res => (res as any[]).map(i => ({ label: i.empName + '/' + i.empNo, value: i.empNo, obj: i } as SFSchemaEnum))))
+                  .toPromise();
+              } else {
+                return of([]);
+              }
+            },
+            // asyncData: (input:string) => this.service.request(this.service.$api_fuzzyQuery,{name:input}).pipe(
+            //   map((res: any) => {
+            //     return res.map((item:any)=>{
+            //       return {label: item.empName+"/"+item.empNo, value: item.empNo, obj: item}
+            //     })
+            //   })
+            // ),
             change: (item: any, org: any) => {
               this.currentOAItem = org.obj;
             }
-          } as SFAutoCompleteWidgetSchema,
+          } as SFSelectWidgetSchema
         },
         isAuthorization: {
           type: 'string',
@@ -91,9 +151,9 @@ export class ParterChannelSalesEditComponent implements OnInit {
             { label: '是', value: '1' }
           ],
           ui: {
-            widget: 'radio',
+            widget: 'radio'
           } as SFRadioWidgetSchema,
-          default: '0',
+          default: '0'
         },
         roleIds: {
           title: '',
@@ -115,7 +175,7 @@ export class ParterChannelSalesEditComponent implements OnInit {
               );
             },
             visibleIf: { isAuthorization: (value: string) => value === '1' }
-          },
+          }
         },
         remark: {
           type: 'string',
@@ -125,8 +185,8 @@ export class ParterChannelSalesEditComponent implements OnInit {
             widget: 'textarea',
             autosize: { minRows: 3, maxRows: 6 },
             placeholder: '请输入50字符'
-          } as SFTextareaWidgetSchema,
+          } as SFTextareaWidgetSchema
-        },
+        }
       },
       required: ['name', 'phoneNumber', 'employeeVO', 'roleIds', 'remark']
     };
@@ -136,9 +196,7 @@ export class ParterChannelSalesEditComponent implements OnInit {
         grid: { span: 24 }
       },
       $isAuthorization: { grid: { span: 12 } },
-      $roleIds:{ spanLabelFixed: 10, grid: { span: 12 }},
+      $roleIds: { spanLabelFixed: 10, grid: { span: 12 } }
-      
-
     };
   }
 
@@ -147,12 +205,16 @@ export class ParterChannelSalesEditComponent implements OnInit {
   }
   save() { 
     this.sf.validator({ emitError: true });
+    
     if (!this.sf.valid) return;
-    this.service.request(this.service.$api_save, { ...this.sf.value, employeeVO: this.currentOAItem}).subscribe(res => {
+    let params: any= {
+      ...this.sf.value,
+    }
+    delete params.telephone
+    this.service.request(this.service.$api_save, { ...params, employeeVO: this.currentOAItem }).subscribe(res => {
       if (res) {
+        this.service.msgSrv.success(res.msg);
         this.modalRef.destroy(true);
-      } else {
-        this.service.msgSrv.error(res.msg);
       }
     });
   }

src/app/routes/partner/channel-sales/components/list/list.component.html

@@ -1,3 +1,13 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-04-21 13:49:22
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-04-26 09:47:43
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\channel-sales\\components\\list\\list.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
 <nz-card>
   <!-- 搜索区 -->
   <sf
@@ -16,6 +26,7 @@
   <st
     #st
     [data]="service.$api_getPage"
+    [scroll]="{x: '1200px'}"
     [columns]="columns"
     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
     [res]="{ reName: { list: 'data.records', total: 'data.total' } }"

src/app/routes/partner/channel-sales/components/list/list.component.ts

@@ -64,46 +64,65 @@ export class ParterChannelSalesListComponent implements OnInit {
     this.columns = [
       {
         title: '销售渠道姓名',
-        index: 'name'
+        index: 'name',
+        width: '180px'
       },
       {
         title: '手机号',
-        index: 'telephone'
+        index: 'telephone',
+        width: '150px'
+      },
+      {
+        title: '关联OA员工姓名',
+        index: 'empName',
+        width: '150px'
+      },
+      {
+        title: '关联OA员工手机号',
+        index: 'mobile',
+        width: '180px'
       },
       {
         title: '所属组织',
-        index: 'organLable'
+        index: 'organLable',
+        width: '300px'
       },
       {
         title: '职级',
-        index: 'station'
+        index: 'station',
+        width: '150px'
       },
       {
         title: '等级',
-        index: 'postLevel'
+        index: 'postLevel',
+        width: '150px'
       },
       {
         title: '省市',
-        index: 'residencePlace'
+        index: 'residencePlace',
+        width: '150px'
       },
       {
         title: '邀请码',
-        index: 'inviteCode'
+        index: 'inviteCode',
+        width: '150px'
       },
       {
         title: '状态',
         className: 'text-center',
         index: 'stateLocked',
         type: 'badge',
+        width: '150px',
         badge: {
           true: { text: '冻结', color: 'error' },
           false: { text: '正常', color: 'success' }
         },
-        width: 130
       },
       {
         title: '操作',
         className: 'text-center',
+        width: '120px',
+        fixed: 'right',
         buttons: [
           {
             text: '编辑',

src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.ts

@@ -617,15 +617,8 @@ export class AddEtpPartnerComponent {
   }
 
   private setInfo(info: any) {
-    if (info.name) {
       this.sf.setValue('/adminUserInfo/name', info.name);
-    }
-    if (info.certificatePhotoFront) {
       this.sf.setValue('/adminUserInfo/certificatePhotoFront', info.certificatePhotoFront);
-    }
-    if (info.certificatePhotoFrontWatermark) {
-      console.log(this.sf.getProperty('/adminUserInfo/certificatePhotoFrontWatermark'));
-
       this.sf.setValue('/adminUserInfo/certificatePhotoFrontWatermark', [
         {
           uid: -1,
@@ -635,11 +628,7 @@ export class AddEtpPartnerComponent {
           response: info.certificatePhotoFrontWatermark
         }
       ]);
-    }
-    if (info.certificatePhotoBack) {
       this.sf.setValue('/adminUserInfo/certificatePhotoBack', info.certificatePhotoBack);
-    }
-    if (info.certificatePhotoBackWatermark) {
       this.sf.setValue('/adminUserInfo/certificatePhotoBackWatermark', [
         {
           uid: -1,
@@ -649,18 +638,9 @@ export class AddEtpPartnerComponent {
           response: info.certificatePhotoBackWatermark
         }
       ]);
-    }
-    if (info.certificateNumber) {
       this.sf.setValue('/adminUserInfo/certificateNumber', info.certificateNumber);
-    }
-    if (info.validStartTime) {
       this.sf.setValue('/adminUserInfo/validStartTime', info.validStartTime);
-    }
+      this.sf.setValue('/adminUserInfo/validEndTime', info?.validEndTime ? info?.validEndTime: null);
-    if (info.validEndTime) {
+      this.sf.setValue('/adminUserInfo/_isLoingDate', info?.validEndTime ? false: true);
-      this.sf.setValue('/adminUserInfo/validEndTime', info.validEndTime);
-      this.sf.setValue('/adminUserInfo/_isLoingDate', false);
-    } else {
-      this.sf.setValue('/adminUserInfo/_isLoingDate', true);
-    }
   }
 }

src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts

@@ -339,50 +339,30 @@ export class AddPersonalPartnerComponent {
   }
 
   private setInfo(info: any) {
-    if (info.name) {
+      this.sf.setValue('/adminUserInfo/name', info?.name);
-      this.sf.setValue('/adminUserInfo/name', info.name);
+      this.sf.setValue('/adminUserInfo/certificatePhotoFront', info?.certificatePhotoFront);
-    }
-    if (info.certificatePhotoFront) {
-      this.sf.setValue('/adminUserInfo/certificatePhotoFront', info.certificatePhotoFront);
-    }
-    if (info.certificatePhotoFrontWatermark) {
-      console.log(this.sf.getProperty('/adminUserInfo/certificatePhotoFrontWatermark'));
-
       this.sf.setValue('/adminUserInfo/certificatePhotoFrontWatermark', [
         {
           uid: -1,
           name: '文件',
           status: 'done',
-          url: info.certificatePhotoFrontWatermark,
+          url: info?.certificatePhotoFrontWatermark,
-          response: info.certificatePhotoFrontWatermark
+          response: info?.certificatePhotoFrontWatermark
         }
       ]);
-    }
+      this.sf.setValue('/adminUserInfo/certificatePhotoBack', info?.certificatePhotoBack);
-    if (info.certificatePhotoBack) {
-      this.sf.setValue('/adminUserInfo/certificatePhotoBack', info.certificatePhotoBack);
-    }
-    if (info.certificatePhotoBackWatermark) {
       this.sf.setValue('/adminUserInfo/certificatePhotoBackWatermark', [
         {
           uid: -1,
           name: '文件',
           status: 'done',
-          url: info.certificatePhotoBackWatermark,
+          url: info?.certificatePhotoBackWatermark,
-          response: info.certificatePhotoBackWatermark
+          response: info?.certificatePhotoBackWatermark
         }
       ]);
-    }
+      this.sf.setValue('/adminUserInfo/certificateNumber', info?.certificateNumber);
-    if (info.certificateNumber) {
+      this.sf.setValue('/adminUserInfo/validStartTime', info?.validStartTime);
-      this.sf.setValue('/adminUserInfo/certificateNumber', info.certificateNumber);
+      this.sf.setValue('/adminUserInfo/validEndTime', info?.validEndTime ? info?.validEndTime: null);
-    }
+      this.sf.setValue('/adminUserInfo/_isLoingDate', info?.validEndTime ? false: true);
-    if (info.validStartTime) {
-      this.sf.setValue('/adminUserInfo/validStartTime', info.validStartTime);
-    }
-    if (info.validEndTime) {
-      this.sf.setValue('/adminUserInfo/validEndTime', info.validEndTime);
-      this.sf.setValue('/adminUserInfo/_isLoingDate', false);
-    } else {
-      this.sf.setValue('/adminUserInfo/_isLoingDate', true);
-    }
   }
 }

src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html

@@ -4,24 +4,24 @@
  * @Author       : Shiming
  * @Date         : 2022-02-24 20:09:49
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-24 13:42:10
+ * @LastEditTime : 2022-04-26 14:04:41
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
-<page-header-wrapper [title]="'新增'"> </page-header-wrapper>
+<page-header-wrapper [title]="titleText"> </page-header-wrapper>
 <nz-card>
   <!-- 数据列表 -->
  <sv-container col="1">
-    <sv label="配置名称">  <input style="max-width: 400px;" nz-input placeholder="请输入" [(ngModel)]="configName" /></sv>
+    <sv label="配置名称">  <input style="max-width: 400px;" nz-input placeholder="请输入" [disabled]="hiden"  [(ngModel)]="configName" /></sv>
 
    <sv-title>固定结算费率配置</sv-title>
 
-   <sv label="固定结算费率"> <nz-input-number [(ngModel)]="accountingRate" [nzPrecision]="precision" nzPlaceHolder="请输入"></nz-input-number>&nbsp;%</sv>
+   <sv label="固定结算费率"> <nz-input-number [disabled]="hiden"  [(ngModel)]="accountingRate" [nzPrecision]="precision" nzPlaceHolder="请输入"></nz-input-number>&nbsp;%</sv>
 
    <sv-title>业务量和管理费比例配置</sv-title>
 
    <sv label="选择配置类型">
-    <nz-radio-group [(ngModel)]="configType">
+    <nz-radio-group [(ngModel)]="configType" [disabled]="hiden" >
       <label nz-radio nzValue="1">按全部等级配置</label>
       <label nz-radio nzValue="2">按不同等级配置</label>
     </nz-radio-group>
@@ -36,7 +36,7 @@
    <sv-title>关联合伙人配置</sv-title>
 
    <sv label="合伙人选择">
-    <nz-select [(ngModel)]="partnerType" (ngModelChange)="changePartner(partnerType)" style="max-width: 400px; min-width: 200px;">
+    <nz-select [(ngModel)]="partnerType" [disabled]="hiden" (ngModelChange)="changePartner(partnerType)" style="max-width: 400px; min-width: 200px;">
       <nz-option nzValue="1" nzLabel="全部合伙人"></nz-option>
       <nz-option nzValue="2" nzLabel="新注册合伙人"></nz-option>
       <nz-option nzValue="3" nzLabel="自定义合伙人"></nz-option>
@@ -51,7 +51,7 @@
   </sv>
 
    <sv label="优先级" col="1">
-    <nz-select [(ngModel)]="priority" style="max-width: 400px; min-width: 200px;">
+    <nz-select [(ngModel)]="priority" [disabled]="hiden"  style="max-width: 400px; min-width: 200px;margin-left: 28px;">
       <nz-option nzValue=1 nzLabel="1">1</nz-option>
       <nz-option nzValue=2 nzLabel="2">2</nz-option>
       <nz-option nzValue=3 nzLabel="3">3</nz-option>
@@ -61,17 +61,17 @@
   </sv>
 
    <sv label="规则说明" col="1" >
-    <sf #sf mode="edit" [schema]="schema1" [ui]="{ '*': { spanLabelFixed: 10, grid: { span: 12 }} }"
+    <sf #sf mode="edit" [disabled]="hiden"  [formData]="formData" [schema]="schema1" [ui]="{ '*': { spanLabelFixed: 10, grid: { span: 16 }} }"
     button="none"> </sf>
   </sv>
 
    <sv label="备注" col="1" style="margin-top: 16px;">
-    <textarea style="max-width: 400px; min-width: 200px;" rows="4" nz-input [(ngModel)]="remarke"></textarea>
+    <textarea [disabled]="hiden"  style="max-width: 400px; min-width: 200px;margin-left: 40px;" rows="4" nz-input [(ngModel)]="remarke"></textarea>
   </sv>
 
  </sv-container>
 
- <div class="align-center" style="margin-top: 15px;">
+ <div class="align-center" style="margin-top: 15px;" *ngIf="!hiden">
   <button nz-button nzType="primary" (click)="goBack()">取消</button>
   <button  nz-button nzType="primary" style="margin-left: 48px" (click)="save()"
   acl  [acl-ability]="['SUPPLY-VEHICLE-AMEND-submitChange']">提交</button

src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-03-21 09:26:45
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-22 15:01:43
+ * @LastEditTime : 2022-04-26 11:04:46
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -23,8 +23,11 @@ import { ParterRebateManageMentAddPartnerListComponent } from '../add-partnerlis
 })
 export class ParterRebateManageMentAddComponent implements OnInit {
   @ViewChild('table') table!: any;
+  titleText :string=  '新增';
   tabelData: any;
+  formData: any;
   addStatus: boolean = false;
+  hiden: boolean = false;
   configName: string = '';
   partnerType: string = '';
   remarke: string = '';
@@ -46,7 +49,27 @@ export class ParterRebateManageMentAddComponent implements OnInit {
     private modal: NzModalService,
     public shipperservice: ShipperBaseService
   ) {}
-  columns: STColumn[] = [
+  columns: STColumn[] =[]
+  initSF(data?: any) {
+    this.schema1 = {
+      properties: {
+        ruleDescription: {
+          type: 'string',
+          title: '',
+          disabled: this.hiden,
+          ui: {
+            
+            widget: 'tinymce',
+            loadingTip: 'loading...',
+            config: {
+              height: 500
+            }
+          }
+          // default: data?.agreementContent || ''
+        }
+      }
+    };
+    this.columns= [
       {
         title: '合伙人名称',
         index: 'enterpriseName',
@@ -64,30 +87,24 @@ export class ParterRebateManageMentAddComponent implements OnInit {
           {
             text: '移除',
             click: _record => this.delete(_record),
+            iif: ()=> {  
+              console.log(this.hiden);
+              return !this.hiden
+            },
             acl: { ability: ['AbnormalAppear-reply'] }
           }
         ]
       }
     ];
-  initSF(data?: any) {
-    this.schema1 = {
-      properties: {
-        ruleDescription: {
-          type: 'string',
-          title: '',
-          ui: {
-            widget: 'tinymce',
-            loadingTip: 'loading...',
-            config: {
-              height: 500
-            }
-          }
-          // default: data?.agreementContent || ''
-        }
-      }
-    };
   }
   ngOnInit() {
+    console.log(this.ar.snapshot.queryParams.id);
+    if(this.ar.snapshot?.queryParams?.id) {
+      this.titleText= '查看'
+      this.hiden= true
+      this.initSF();
+      this.initData(this.ar.snapshot?.queryParams?.id);
+    }
     this.addStatus = false;
     this.initSF();
   }
@@ -131,13 +148,16 @@ export class ParterRebateManageMentAddComponent implements OnInit {
     });
   }
   save() {
+    console.log(this.partnerId);
+    console.log(this.partnerId.join(','));
+    
     const params = {
       accountingRate: this.accountingRate,
       configName: this.configName,
       configType: this.configType,
       rebateConfigLineDTO: this.table.data,
       priority: this.priority, // 优先级
-      partnerId: this.partnerId.join(','),
+      partnerIds: this.partnerId,
       ruleDescription: this.sf.value.ruleDescription,
       remarke: this.remarke,
       partnerType: this.partnerType
@@ -151,10 +171,29 @@ export class ParterRebateManageMentAddComponent implements OnInit {
       }
     });
   }
+  initData(id:string) {
+    this.service.request(this.service.$api_get_getPartnerRebateConfigInfo, {id: id}).subscribe((res: any) => {
+      console.log(res);
+      if(res) {
+        this.configName = res?.configName;
+        this.accountingRate = res?.accountingRate;
+        this.accountingRate = res?.accountingRate;
+        this.configType = res?.configType + '';
+        this.tabelData = res?.partnerRebateConfigLineVOList;
+        this.partnerType = res?.partnerType + '';
+        this.partnerPeopleList = res?.partnerListVOs;
+        this.priority = res?.priority + '';
+        this.formData = {ruleDescription: res?.ruleDescription};
+        this.remarke = res.remark;
+      }
+    })
+  }
   changePartner(value: any) {
     console.log(value);
-    if (value) {
+    if (value == '3') {
       this.addStatus = true;
+    } else {
+      this.addStatus = false;
     }
   }
 }

src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts

@@ -120,12 +120,12 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
       {
         title: '操作',
         fixed: 'right',
-        width: '90px',
+        width: '120px',
         className: 'text-left',
         buttons: [
           {
             text: '查看',
-            click: _record => this.viewEvaluate(_record),
+            click: _record => this.configAction(_record),
           },
           {
             text: '禁用',
@@ -187,8 +187,8 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
           }
         });
   }
-  configAction() {
+  configAction(value?: any) {
-    this.router.navigate(['/partner/rebate/setting/add/', 1])
+    this.router.navigate(['/partner/rebate/setting/add/', '0'], {queryParams: value})
   } 
   /**
    * 重置表单

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

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-03-10 11:19:00
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-29 11:26:38
+ * @LastEditTime : 2022-04-25 19:23:25
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\services\\rebate-management.service.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -27,6 +27,8 @@ export class RebateManagementService extends BaseService {
 
   // 运营端查询合伙人返佣
   public $api_get_getIncomeByBillpage = '/api/bpc/partnerIncomeHead/getIncomeByBillpage';
+  // 获取返佣模板信息
+  public $api_get_getPartnerRebateConfigInfo = '/api/mdc/rebateConfig/getPartnerRebateConfigInfo';
     // 查询合伙人信息-分页
   public $api_get_partner_page = '/api/mdc/partner/list/page';
   constructor(public injector: Injector) {

src/app/routes/partner/system-config/components/config/config.component.html

@@ -11,41 +11,43 @@
 
         <div nz-col nzSpan="20" style="overflow: scroll">
             <nz-card class="card-height" [nzBordered]="null" nzSize="small" *ngIf="selectedTab===0 ">
-                <h2 style="font-weight: 800;">货主端配置</h2>
+                <h3 style="font-weight: 600;">提现手续费配置</h3>
-                <h3 style="font-weight: 600;margin-left: 120px;">图片配置</h3>
-                <sf style="margin-left: 30px" #sf mode="default" [formData]="i" [schema]="schema2"
-                    [ui]="{ '*': { spanLabelFixed: 200,grid: { span: 24 }} }" button="none">
-                    <ng-template sf-template="start" let-me let-ui="ui" let-schema="schema">
-                    </ng-template>
-                    <template id="tpl">
-                        <span>so good </span>
-                    </template>
-                    <ng-template sf-template="time2" let-me let-ui="ui" let-schema="schema">
-                        <div class="text-left">可输入字符</div>
-                        <nz-range-picker extend nzFormat="HH:mm:ss"></nz-range-picker>
-                    </ng-template>
-                </sf>
-                <h3 style="font-weight: 600;margin-left: 140px;" class="mb-md">短信配置</h3>
                 <div nz-row nzGutter="8">
                     <div nz-col nzSpan="24" se-container [labelWidth]="230" [se-container]="1">
-                        <se label="短信内容设置" style="margin-bottom: 0;">
+                        <se label="个人提现手续费" style="margin-bottom: 0;">
-                            <p style="margin-top: 6px;">配置用户端登陆页注册帐号、修改密码、修改手机号时的短信内容</p>
+                          <div>
-                            <textarea nz-input rows="4"
+                            按照提现金额收取
-                                placeholder="【运多星】您的验证码：XXXXXX。有效期10分钟，请及时输入，请勿向他人泄露您的验证码。如非本人操作，请忽略。"
+                            <nz-input-number [(ngModel)]="personValue" [nzMin]="0" [nzMax]="100" [nzPrecision]='2' [nzStep]="0.01"></nz-input-number> 
-                                style="width: 400px;"></textarea>
+                            <span>
+                                %手续费
+                            </span>
+                          </div>
+                        </se>
+                        <se label="企业提现手续费" style="margin-bottom: 0;">
+                          <div>
+                            按照提现金额收取
+                            <nz-input-number [(ngModel)]="enterpriseValue" [nzMin]="0" [nzMax]="100" [nzPrecision]='2' [nzStep]="0.01"></nz-input-number> 
+                            <span>
+                                %手续费
+                            </span>
+                          </div>
                         </se>
                     </div>
                 </div>
-                <h3 style="font-weight: 600;margin-left: 140px;" class="mb-md">通知配置</h3>
+                <h3 style="font-weight: 600;" class="mb-md">合伙人提现配置</h3>
                 <div nz-row nzGutter="8">
-                    <div nz-col nzSpan="24">
+                    <div nz-col nzSpan="24" se-container>
-                        <ng-container *ngTemplateOutlet="textMessage;context:{$implicit: 'World', title:'用户实名认证审核'}">
+                        <se label="提现审核" style="margin-bottom: 0;">
-                        </ng-container>
+                            <nz-radio-group [(ngModel)]="auditValue">
-                        <ng-container *ngTemplateOutlet="textMessage;context:{$implicit: 'World', title: '企业认证审核'}">
+                                <label nz-radio [nzValue]="false" class="mt-sm">关闭</label>
+                                <label nz-radio [nzValue]="true" class="mt-sm">开启</label>
+                            </nz-radio-group>
+                        </se>
+                        <ng-container *ngTemplateOutlet="auditTimes;context:{$implicit: 'auto', title:'审核时间'}">
                         </ng-container>
                     </div>
                 </div>
-                <h3 style="font-weight: 600;margin-left: 140px;" class="mb-md">客服电话配置</h3>
+                <h3 style="font-weight: 600;" class="mb-md">客服电话配置</h3>
                 <div nz-row nzGutter="8">
                     <div nz-col nzSpan="24" se-container [labelWidth]="230">
                         <se label="客服电话" style="margin-bottom: 0;">
@@ -84,10 +86,6 @@
                 <h3 style="font-weight: 600;margin-left: 140px;" class="mb-md">通知配置</h3>
                 <div nz-row nzGutter="8">
                     <div nz-col nzSpan="24">
-                        <ng-container *ngTemplateOutlet="textMessage;context:{$implicit: 'World', title:'司机实名认证审核'}">
-                        </ng-container>
-                        <ng-container *ngTemplateOutlet="textMessage;context:{$implicit: 'World', title: '司机驾驶证证审核'}">
-                        </ng-container>
                         <div se-container [labelWidth]="230" [se-container]="1">
                             <se class="mb-sm">
                                 <nz-radio-group [(ngModel)]="formDate.isAudit">
@@ -146,14 +144,15 @@
     </div>
 </nz-card>
 
-<ng-template #textMessage let-data="data" let-title="title">
+<ng-template #auditTimes let-data="data" let-title="title">
     <div se-container [labelWidth]="230" [se-container]="1">
         <se [label]="title" style="margin-bottom: 0;">
-            <nz-radio-group [(ngModel)]="formDate.isAudit">
+            <nz-radio-group [(ngModel)]="auditTime">
-                <label nz-radio [nzValue]="false" class="mt-sm">审核通过系统通知</label>
+                <label nz-radio [nzValue]="false" class="mt-sm">全天</label>
-                <label nz-radio [nzValue]="true" class="mt-sm">短信通知</label>
+                <label nz-radio [nzValue]="true" class="mt-sm">自定义</label>
             </nz-radio-group>
         </se>
+        <div *ngIf="">
             <se class="mb-sm">
                 <label for="">通知标题 : </label>
                 <input nz-input placeholder="请不要超过20个汉字" style="width: 325px;" maxlength="20" />
@@ -162,26 +161,7 @@
                 <label for="">通知内容 : </label>
                 <input nz-input placeholder="请不要超过50个汉字" style="width: 325px;" maxlength="50" />
             </se>
-        <se class="mb-sm">
+         
-            <nz-radio-group [(ngModel)]="formDate.isAudit">
-                <label nz-radio [nzValue]="false" class="mt-sm">审核驳回系统通知</label>
-                <label nz-radio [nzValue]="true" class="mt-sm">短信通知</label>
-            </nz-radio-group>
-        </se>
-        <se class="mb-sm">
-            <label for="">通知标题 : </label>
-            <input nz-input placeholder="请不要超过20个汉字" style="width: 325px;" maxlength="20" />
-        </se>
-        <se class="mb-sm">
-            <label for="">通知内容 : </label>
-            <input nz-input placeholder="请不要超过50个汉字" style="width: 325px;" maxlength="50" />
-        </se>
-        <se class="mb-sm">
-            <div class=" d-flex">
-                <label for="">短信内容 : </label>
-                <textarea nz-input rows="3" placeholder="【运多星】您的账号：XXXXXX。实名认证审核已被驳回，请重新上传"
-                    style="width: 325px;margin-left: 14px;"></textarea>
         </div>
-        </se>
     </div>
 </ng-template>

src/app/routes/partner/system-config/components/config/config.component.ts

@@ -4,7 +4,7 @@ import { Observable, Observer } from 'rxjs';
 import { ConfigService } from '../../services/config.service';
 
 @Component({
-  selector: 'app-config',
+  selector: 'app-parterl-config',
   templateUrl: './config.component.html',
   styleUrls: ['./config.component.less']
 })
@@ -15,12 +15,17 @@ export class PartnerSystemConfigComponent implements OnInit {
     isEveryDay: false,
     isEveryWeek: false
   };
+  personValue!: number;
+  enterpriseValue!: number;
+  auditValue!: number;
+  auditTime!: any;
+  auditTimeStatus: boolean = false
   tabs = [
     {
-      name: '货主端配置'
+      name: '基础配置'
     },
     {
-      name: '司机端配置'
+      name: '分享配置'
     }
   ];
   selectedTab = 0;
@@ -37,7 +42,6 @@ export class PartnerSystemConfigComponent implements OnInit {
 
   i: any;
   schema!: SFSchema;
-  schema2!: SFSchema;
 
   imageConfig = {
     widget: 'upload',
@@ -64,61 +68,8 @@ export class PartnerSystemConfigComponent implements OnInit {
   }
 
   initSF() {
+  
     this.schema = {
-      properties: {
-        sysMinLogo: {
-          type: 'string',
-          title: '系统LOGO（大）',
-          // enum: [],
-          ui: {
-            ...this.imageConfig,
-            descriptionI18n: '大尺寸logo，支持JPG、PNG格式，文件小于2M（建议尺寸300*170px）。',
-            change: args => {
-              if (args.type === 'success') {
-                const avatar = this.getImageModel(args, 'sysMinLogo');
-                this.sf?.setValue('/sysMinLogo', avatar);
-                this.i.sysMinLogo = avatar;
-              }
-            },
-            beforeUpload: this.uploadBefore
-          } as SFUploadWidgetSchema
-        },
-        sysMaxLogo: {
-          type: 'string',
-          title: '用户默认头像',
-          ui: {
-            ...this.imageConfig,
-            descriptionI18n: '支持JPG、PNG格式，文件小于2M（建议尺寸60*60px）。',
-            change: args => {
-              if (args.type === 'success') {
-                const avatar = this.getImageModel(args, -1);
-                this.sf?.setValue('/sysMaxLogo', avatar);
-                this.i.sysMaxLogo = avatar;
-              }
-            },
-            beforeUpload: this.uploadBefore
-          } as SFUploadWidgetSchema
-        },
-        sysMaxLogo1: {
-          type: 'string',
-          title: '用户默认头像',
-          ui: {
-            ...this.imageConfig,
-            descriptionI18n: '支持JPG、PNG格式，文件小于5M（建议尺寸375*773px）。',
-            change: args => {
-              if (args.type === 'success') {
-                const avatar = this.getImageModel(args, -1);
-                this.sf?.setValue('/sysMaxLogo1', avatar);
-                this.i.sysMaxLogo1 = avatar;
-              }
-            },
-            beforeUpload: this.uploadBefore
-          } as SFUploadWidgetSchema
-        },
-      },
-      required: ['sysMinLogo', 'sysMaxLogo', 'sysMaxLogo1']
-    };
-    this.schema2 = {
       properties: {
         sysMinLogo: {
           type: 'string',
@@ -221,7 +172,11 @@ export class PartnerSystemConfigComponent implements OnInit {
       required: ['sysMinLogo', 'sysMaxLogo', 'sysMaxLogo1', 'sysMaxLogo2', 'sysMaxLogo3', 'sysMaxLogo4']
     };
   }
+  auditTimeChange(ss: any,value: any) {
+    console.log(value);
+    this.auditTimeStatus = true
 
+  }
   private uploadBefore = (file: any, fileList: any) => {
     return new Observable((observer: Observer<boolean>) => {
       const isLt1M = file.size / 1024 / 1024 < 2;

src/app/routes/sys-setting/components/role-management/edit/edit.component.html

@@ -1,3 +1,13 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-04-21 13:49:22
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-04-25 14:32:43
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\role-management\\edit\\edit.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
 <div class="modal-header">
   <div class="modal-title">{{ params.id === 0 ? '新增角色' : '编辑角色' }}</div>
 </div>
@@ -11,7 +21,7 @@
     <se label="角色权限" required [labelWidth]="120">
       <app-cuc-menu #menu (changeData)="getData($event)" [type]="params.id === 0 ? 'add' : 'edit'" [roleId]="params.id" [appId]="params.appId"
         [isAuthorityIdDTOList]="roleInfoData.authority || []"
-        [authorityAssistId]="roleInfoData.authorityAssistId || []">
+        [authorityAssistId]="roleInfoData.authorityAssistId || []"  (changeIF)="changeIF($event)">
       </app-cuc-menu>
     </se>
   </se-container>

src/app/routes/sys-setting/components/role-management/edit/edit.component.ts

@@ -21,6 +21,7 @@ export class SettingRoleEditComponent implements OnInit {
   roleInfoData: any = {};
   authorityAssistId: any[] = [];
   params: any;
+  changeValue: boolean = false
   schema!: SFSchema;
   authority: any[] = [];
   constructor(private modal: NzModalRef, public service: SystemService) {}
@@ -61,6 +62,7 @@ export class SettingRoleEditComponent implements OnInit {
   }
 
   getRoleInfo() {
+    this.roleInfoData = []
     const params = {
       id: this.params.id
     };
@@ -73,17 +75,26 @@ console.log(this.params.infoUrl)
     });
   }
   getData(res: { authority: any[]; authorityAssistId: any[] }) {
+    console.log('修改了');
+    
     this.authority = res.authority;
     this.authorityAssistId = res.authorityAssistId;
   }
   close() {
     this.modal.destroy();
   }
+  changeIF(value: any) {
+    console.log(value);
+    console.log('54545');
+    this.changeValue = true
+  }
   sure() {
     if (!this.sf?.valid) {
       this.service.msgSrv.warning('角色名称不能为空');
       return;
     }
+    console.log(this.changeValue);
+   
     const auths = this.menu?.washTree();
     if (auths.authorityAssistId.length === 0) {
       this.service.msgSrv.warning('请选择权限!');
@@ -95,6 +106,7 @@ console.log(this.params.infoUrl)
       authority: auths.authority,
       authorityAssistId: auths.authorityAssistId
     };
+
     if (this.params.id === 0) {
       delete params.id;
     }

src/app/routes/sys-setting/components/role-management/menu/menu.component.ts

@@ -1,5 +1,5 @@
 import { ChangeDetectorRef, Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges, ViewChild } from '@angular/core';
-import { ModalHelper, _HttpClient } from '@delon/theme';
+import { _HttpClient } from '@delon/theme';
 import { EAEnvironmentService } from '@shared';
 import { NzTreeComponent } from 'ng-zorro-antd/tree';
 import { SystemService } from '../../../services/system.service';
@@ -34,9 +34,9 @@ export class SettingMenuComponent implements OnInit, OnChanges {
         this.authority = this.isAuthorityIdDTOList || [];
       }
     }
-    if (changes.authorityAssistId) {
+    // if (changes.authorityAssistId) {
-      this.defaultCheckedKeys = [...this.authorityAssistId];
+    //   this.defaultCheckedKeys = [...this.authorityAssistId];
-    }
+    // }
   }
 
   ngOnInit() {

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>

src/environments/eascs/environment.dev.ts

@@ -11,6 +11,7 @@ import { Environment } from '@delon/theme';
 export const environment = {
   production: true,
   useHash: true,
+  isHiddenLog: true,
   api: {
     baseUrl: 'https://tms-api-dev.eascs.com',
     refreshTokenEnabled: false,

src/environments/eascs/environment.test.ts

@@ -3,6 +3,7 @@ import { Environment } from '@delon/theme';
 export const environment = {
   production: true,
   useHash: true,
+  isHiddenLog: true,
   api: {
     baseUrl: 'https://tms-api-test.eascs.com',
     refreshTokenEnabled: false,

src/environments/environment.prod.ts

@@ -3,6 +3,7 @@ import { Environment } from '@delon/theme';
 export const environment = {
   production: true,
   useHash: true,
+  isHiddenLog: true,
   api: {
     baseUrl: 'https://tms-api.yunduoxing.com',
     refreshTokenEnabled: true,

src/environments/environment.ts

@@ -10,6 +10,7 @@ import * as MOCKDATA from '../../_mock';
 export const environment = {
   production: false,
   useHash: true,
+  isHiddenLog: false,
   api: {
     baseUrl: './',
     refreshTokenEnabled: true,

src/main.ts

@@ -12,6 +12,11 @@ if (environment.production) {
   enableProdMode();
 }
 
+if (environment.isHiddenLog) {
+  // 取消系统信息输出
+  window.console.log = () => {};
+}
+
 platformBrowserDynamic()
   .bootstrapModule(AppModule, {
     defaultEncapsulation: ViewEncapsulation.Emulated,