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

2022-04-29 14:18:57 +08:00
parent b213aa4f91 2e4c264ee0
commit b04b7bece0
34 changed files with 392 additions and 299 deletions
--- a/src/app/routes/commom/components/basic-table/basic-table.component.ts
+++ b/src/app/routes/commom/components/basic-table/basic-table.component.ts
@ -73,22 +73,29 @@ export class BasicTableComponent implements AfterViewInit, OnDestroy {
      for (let index = 0; index < tabset.length; index++) {
        tabsetHeight += tabset[index].clientHeight;
      }
-      console.log('tabsetHeight', tabsetHeight);
      if (tabset) {
        scrollY -= tabsetHeight;
      }
      // 剔除高度容器
-      // 计算所有tabs高度
      const headerBox = document.getElementsByClassName('header_box');
      let headerBoxHeight = 0;
      for (let index = 0; index < headerBox.length; index++) {
        headerBoxHeight += headerBox[index].clientHeight;
      }
-      console.log('headerBoxHeight', headerBoxHeight);
-
      if (headerBox) {
        scrollY -= headerBoxHeight;
      }
+
+      // 剔除高度容器
+      const heightBox = document.getElementsByClassName('height_box');
+      let heightBoxHeight = 0;
+      for (let index = 0; index < heightBox.length; index++) {
+        heightBoxHeight += heightBox[index].clientHeight;
+      }
+      if (heightBox) {
+        scrollY -= heightBoxHeight;
+      }
+
      if (typeof this.deviationHeight === 'number') {
        scrollY -= this.deviationHeight;
      }
--- a/src/app/routes/commom/less/commom-table.less
+++ b/src/app/routes/commom/less/commom-table.less
@ -136,4 +136,6 @@
      margin-right: 6px;
    }
  }
-}
+}
+
+.height_box{}
--- a/src/app/routes/commom/less/common-table-bar.less
+++ b/src/app/routes/commom/less/common-table-bar.less
@ -0,0 +1,17 @@
+:host::ng-deep {
+    nz-card {
+        margin: -8px -8px 0 !important
+    }
+
+    .height_box {
+        margin-bottom: 18px !important;
+    }
+}
+
+.total-footer {
+    position   : absolute;
+    bottom     : 0px;
+    height     : 32px;
+    margin     : 4px 8px;
+    line-height: 32px;
+}
--- a/src/app/routes/datatable/datatable-routing.module.ts
+++ b/src/app/routes/datatable/datatable-routing.module.ts
@ -1,3 +1,13 @@
+/*
+ * @Description  :
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-04-28 20:27:07
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-04-28 21:10:06
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\datatable\\datatable-routing.module.ts
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+ */
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 import { DatatableCustomindexComponent } from './components/customtable/customindex/customindex.component';
@ -20,29 +30,33 @@ import { DatatableReportingFundInfoComponent } from './reporting/components/fund
 import { DatatableDatascreenComponent } from './components/datascreen/datascreen.component';

 const routes: Routes = [
-  { path: 'dataindex', component: DatatableDataindexComponent },
-  { path: 'customtable/customindex', component: DatatableCustomindexComponent },
-  { path: 'customtable/owner', component: DatatableOwnerComponent },
-  { path: 'customtable/driver', component: DatatableDriverComponent },
-  { path: 'customtable/mancustomtable', component: DatatableMancustomtableComponent },
-  { path: 'customtable/partnertable', component: DatatablePartnertableComponent },
-  { path: 'operationtable', component: DatatableOperationtableComponent },
-  { path: 'reporting/order', component: DatatableOrderReportingComponent },
-  { path: 'compliancetabel/index', component: DatatableComplianceIndexComponent },
-  { path: 'compliancetabel/salesman', component: DatatableComplianceSalesmanComponent },
-  { path: 'compliancetabel/customer', component: DatatableComplianceCustomerComponent },
-  { path: 'financetable', component: DatatableFinancetableComponent },
-  { path: 'invoicetable', component: DatatableInvoicetableComponent },
-  { path: 'reporting/fund', component: DatatableFundReportingComponent },
-  { path: 'busitable/busiindex', component: DatatableBusiindexComponent },
-  { path: 'busitable/mantable', component: DatatableMantableComponent },
-  { path: 'reporting/fund', component: DatatableFundReportingComponent },
-  { path: 'fund-info', component: DatatableReportingFundInfoComponent },
-  { path: 'datascreen', component: DatatableDatascreenComponent }];
-
+  { path: 'dataindex', component: DatatableDataindexComponent, data: { guard: { ability: ['dataindex-search'] } } },
+  { path: 'customtable/customindex', component: DatatableCustomindexComponent, data: { guard: { ability: ['customindex-client'] } } },
+  { path: 'customtable/owner', component: DatatableOwnerComponent, data: { guard: { ability: ['owner-search'] } } },
+  { path: 'customtable/driver', component: DatatableDriverComponent, data: { guard: { ability: ['driver-search'] } } },
+  {
+    path: 'customtable/mancustomtable',
+    component: DatatableMancustomtableComponent,
+    data: { guard: { ability: ['mancustomtable-search'] } }
+  },
+  { path: 'customtable/partnertable', component: DatatablePartnertableComponent,
+  data: { guard: { ability: ['partnertable-search'] } } },
+  { path: 'operationtable', component: DatatableOperationtableComponent, data: { guard: { ability: ['operationtable-search'] } }  },
+  { path: 'reporting/order', component: DatatableOrderReportingComponent, data: { guard: { ability: ['ORDER-REPORTING-search'] } } },
+  { path: 'compliancetabel/index', component: DatatableComplianceIndexComponent , data: { guard: { ability: ['index-lRateQualified'] } }},
+  { path: 'compliancetabel/salesman', component: DatatableComplianceSalesmanComponent, data: { guard: { ability: ['salesman-ComplianceReportPage'] } } },
+  { path: 'compliancetabel/customer', component: DatatableComplianceCustomerComponent, data: { guard: { ability: ['customer-search'] } } },
+  { path: 'financetable', component: DatatableFinancetableComponent , data: { guard: { ability: ['financetable-search'] } }},
+  { path: 'invoicetable', component: DatatableInvoicetableComponent , data: { guard: { ability: ['invoicetable-search'] } }},
+  { path: 'reporting/fund', component: DatatableFundReportingComponent , data: { guard: { ability: ['FUND-REPORTING-search'] } }},
+  { path: 'busitable/busiindex', component: DatatableBusiindexComponent , data: { guard: { ability: ['busiindex-search'] } }},
+  { path: 'busitable/mantable', component: DatatableMantableComponent, data: { guard: { ability: ['customer-search'] } } },
+  { path: 'fund-info', component: DatatableReportingFundInfoComponent , data: { guard: { ability: ['customer-search'] } }},
+  { path: 'datascreen', component: DatatableDatascreenComponent, data: { guard: { ability: ['datascreen-search'] } } }
+];

@NgModule({
  imports: [RouterModule.forChild(routes)],
  exports: [RouterModule]
 })
-export class DatatableRoutingModule { }
+export class DatatableRoutingModule {}
--- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html
+++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html
@ -1,3 +1,13 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-04-28 20:27:07
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-04-28 21:15:20
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\datatable\\reporting\\components\\order-reporting\\order-reporting.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
 <page-header-wrapper [title]="''"></page-header-wrapper>

 <nz-card>
@ -85,6 +95,6 @@
    <button nz-button nzType="primary" (click)="updateData()" acl
      [acl-ability]="['ORDER-REPORTING-update-data']">更新数据</button>
    <button nz-button nzType="primary" (click)="uploadSetting()" acl
-      [acl-ability]="['ORDER-REPORTING-search']">上传设置</button>
+      [acl-ability]="['ORDER-REPORTING-search-updata']">上传设置</button>
  </div>
 </ng-template>
--- a/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts
+++ b/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts
@ -46,7 +46,7 @@ export class FreightAccountDetailComponent implements OnInit {
        }
      });
    }
-    // this.loadStatistics(requestOptions.body);
+    this.loadStatistics(requestOptions.body);
    return requestOptions;
  };

@ -75,6 +75,8 @@ export class FreightAccountDetailComponent implements OnInit {
  loadStatistics(params: any) {
    this.service.request(this.service.$api_get_shipper_account_balance_detail, params).subscribe(res => {
      if (res) {
+        console.log(res);
+        
        this.static = res;
      }
    });
--- a/src/app/routes/financial-management/components/payable-order/payable-order.component.html
+++ b/src/app/routes/financial-management/components/payable-order/payable-order.component.html
@ -1,17 +1,10 @@
-<!--
- * @Description  : 
- * @Version      : 1.0
- * @Author       : Shiming
- * @Date         : 2022-01-14 14:39:04
- * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-20 16:20:54
- * @FilePath     : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\payable-order\\payable-order.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>
+<nz-card class="height_box">
+    <div class="header_box" style="margin-left: -16px; margin-top: -16px;">
+        <label class="page_title"> <label class="driver">|</label> 应付核销</label>
+    </div>
    <nz-row [nzGutter]="16">
        <nz-col [nzXl]="5" [nzLg]="8" [nzSm]="12">
            <nz-statistic [nzValue]="((info?.prmoneySum || 0) | currency)+'元' " [nzTitle]="'应付金额'"
@ -31,7 +24,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"
@ -41,17 +34,22 @@
        <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)">查询</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 class="content-box" nzBordered>
+</nz-card> -->
+<nz-card class="table-box">
+    <div class="header_box">
+        <div></div>
+        <div class="mr-sm">
+            <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()">筛选</button>
+        </div>
+    </div>
    <st #st [data]="service.$api_get_fico_ph_page" [columns]="columns" [req]="{  process: beforeReq }" [page]="{}"
        [loading]="false" [scroll]="{ x:'1200px' }" (change)="stChange($event)">
    </st>
--- a/src/app/routes/financial-management/components/payable-order/payable-order.component.ts
+++ b/src/app/routes/financial-management/components/payable-order/payable-order.component.ts
@ -3,24 +3,21 @@ 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-payable-order',
  templateUrl: './payable-order.component.html',
-  styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less'],
-  providers: [CurrencyPipe]
+  styleUrls: ['../../../commom/less/commom-table.less', '../../../commom/less/common-table-bar.less']
 })
-export class PayableOrderComponent implements OnInit {
+export class PayableOrderComponent extends BasicTableComponent implements OnInit {
  @ViewChild('st', { static: true })
  st!: STComponent;
-  @ViewChild('sf', { static: false })
-  sf!: SFComponent;
  columns: STColumn[] = this.initST();
-  searchSchema: SFSchema = this.initSF();
-
-  _$expand = false;
+  schema: SFSchema = this.initSF();

  selectedRows: any[] = [];
  info: any = {};
@ -28,10 +25,15 @@ export class PayableOrderComponent implements OnInit {
    public service: FreightAccountService,
    private nzModalService: NzModalService,
    private router: Router,
-    private currencyPipe: CurrencyPipe
-  ) {}
+    public searchDrawerService: SearchDrawerService
+  ) {
+    super(searchDrawerService);
+  }

-  ngOnInit(): void {
+  ngOnInit(): void {}
+
+  search() {
+    this.st?.load(1);
  }

  loadInfo() {
@ -76,21 +78,6 @@ export class PayableOrderComponent implements OnInit {
    }
  }

-  /**
-   * 重置表单
-   */
-  resetSF() {
-    this.sf.reset();
-    this._$expand = false;
-  }
-
-  /**
-   * 伸缩查询条件
-   */
-  expandToggle() {
-    this._$expand = !this._$expand;
-    this.sf?.setValue('/expand', this._$expand);
-  }

  private initSF(): SFSchema {
    return {
@ -133,9 +120,6 @@ export class PayableOrderComponent implements OnInit {
          ui: {
            widget: 'select',
            placeholder: '请选择',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
          }
        },
        cno: {
@ -146,9 +130,6 @@ export class PayableOrderComponent implements OnInit {
            placeholder: '请选择',
            allowClear: true,
            asyncData: () => this.service.getCloseAccount(),
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
          }
        },
        driver2IdName: {
@ -157,9 +138,6 @@ export class PayableOrderComponent implements OnInit {
          ui: {
            widget: 'select',
            placeholder: '请选择',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
          }
        },
        sts: {
@ -172,9 +150,6 @@ export class PayableOrderComponent implements OnInit {
          ui: {
            widget: 'select',
            placeholder: '请选择',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
          }
        },
        phxdate: {
@ -183,9 +158,6 @@ export class PayableOrderComponent implements OnInit {
          ui: {
            widget: 'sl-from-to-search',
            format: 'yyyy-MM-dd',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
          } as SFDateWidgetSchema
        },
        createTime: {
@ -194,9 +166,6 @@ export class PayableOrderComponent implements OnInit {
          ui: {
            widget: 'sl-from-to-search',
            format: 'yyyy-MM-dd',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
          } as SFDateWidgetSchema
        },
        billHCode: {
@ -204,9 +173,6 @@ export class PayableOrderComponent implements OnInit {
          title: '订单号',
          ui: {
            placeholder: '请输入',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
          }
        },
        feeHCode: {
@ -214,9 +180,6 @@ export class PayableOrderComponent implements OnInit {
          title: '费用号',
          ui: {
            placeholder: '请输入',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
          }
        },
        remarks: {
@ -225,9 +188,6 @@ export class PayableOrderComponent implements OnInit {
          ui: {
            autocomplete: 'off',
            placeholder: '请选择',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
          }
        }
      }
@ -246,15 +206,17 @@ export class PayableOrderComponent implements OnInit {
        title: '核销金额',
        index: 'phxmoney',
        width: 140,
+        type: 'widget',
        className: 'text-right',
-        format: item => `${this.currencyPipe.transform(item.phxmoney || 0)}`
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.phxmoney }) }
      },
      {
        title: '应付金额',
        index: 'prmoney',
        width: 140,
+        type: 'widget',
        className: 'text-right',
-        format: item => `${this.currencyPipe.transform(item.prmoney || 0)}`
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.prmoney }) }
      },
      { title: '银行类型', index: 'banktype', type: 'enum', enum: { '1': '平安', '2': '浦发' }, width: 120 },
      { title: '付款类型', index: 'brmtype', type: 'enum', enum: { '1': '费用款项' }, width: 120 },
--- a/src/app/routes/financial-management/components/platform-account/platform-account.component.html
+++ b/src/app/routes/financial-management/components/platform-account/platform-account.component.html
@ -1,7 +1,10 @@
-<page-header-wrapper title="平台账户">
-</page-header-wrapper>
+<!-- <page-header-wrapper title="平台账户">
+</page-header-wrapper> -->

-<nz-card>
+<nz-card class="height_box">
+  <div class="header_box" style="margin-left: -16px; margin-top: -16px;">
+    <label class="page_title"> <label class="driver">|</label> 平台账户</label>
+  </div>
  <nz-row [nzGutter]="16">
    <nz-col [nzXl]="4" [nzLg]="6" [nzSm]="12">
      <nz-statistic [nzValue]="((info.availableBalance |currency:' ') || 0)+'元'" nzTitle="平台账户余额"
@ -36,10 +39,10 @@
  </nz-row>
 </nz-card>

-<nz-card class="search-box">
+<!-- <nz-card class="search-box">
  <div nz-row nzGutter="8">
    <div nz-col [nzXl]="18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
-      <sf #sf [schema]="searchSchema" [ui]="{ '*': { spanLabelFixed: 110,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}"
+      <sf #sf [schema]="schema" [ui]="{ '*': { spanLabelFixed: 110,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}"
        [compact]="true" [button]="'none'"></sf>
    </div>
    <div nz-col [nzXl]="6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
@ -48,9 +51,16 @@
      <button nz-button (click)="exportList()"> 导出</button>
    </div>
  </div>
-</nz-card>
+</nz-card> -->

-<nz-card class="content-box">
+<nz-card class="table-box">
+  <div class="header_box">
+    <div></div>
+    <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_platform_account_page" [columns]="columns" [req]="{  process: beforeReq }"
    [page]="{}" [scroll]="{ x: '1200px' }" [loading]="service.http.loading">
  </st>
@ -60,4 +70,4 @@
    <label class="text-red-dark font-weight-bold">{{static?.payAmount | currency }}</label>
  </div>

-</nz-card>
+</nz-card>
--- a/src/app/routes/financial-management/components/platform-account/platform-account.component.ts
+++ b/src/app/routes/financial-management/components/platform-account/platform-account.component.ts
@ -2,7 +2,9 @@ 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 { 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 { CwcBankCardManagementBindComponent } from '../bank-card-management/bind/bind.component';
 import { CwcAccountManagementWithdrawDepositComponent } from './withdraw-deposit/withdraw-deposit.component';
@ -10,14 +12,12 @@ import { CwcAccountManagementWithdrawDepositComponent } from './withdraw-deposit
@Component({
  selector: 'app-platform-account',
  templateUrl: './platform-account.component.html',
-  styleUrls: ['../../../commom/less/box.less']
+  styleUrls: ['../../../commom/less/commom-table.less', '../../../commom/less/common-table-bar.less']
 })
-export class PlatformAccountComponent implements OnInit {
+export class PlatformAccountComponent extends BasicTableComponent implements OnInit {
  @ViewChild('st', { static: true })
  st!: STComponent;
-  @ViewChild('sf', { static: false })
-  sf!: SFComponent;
-  searchSchema: SFSchema = this.initSF();
+  schema: SFSchema = this.initSF();
  columns: STColumn[] = this.initST();

  info: any = {};
@ -27,11 +27,16 @@ export class PlatformAccountComponent implements OnInit {
    public service: FreightAccountService,
    private router: Router,
    private nzModalService: NzModalService,
-    public modal: NzModalService
-  ) {}
+    public modal: NzModalService,
+    public searchDrawerService: SearchDrawerService
+  ) {
+    super(searchDrawerService);
+  }

-  ngOnInit(): void {
-    this.loadInfo();
+  ngOnInit(): void {}
+
+  search() {
+    this.st?.load(1);
  }

  beforeReq = (requestOptions: STRequestOptions) => {
@ -39,6 +44,7 @@ export class PlatformAccountComponent implements OnInit {
      Object.assign(requestOptions.body, { ...this.sf?.value });
    }
    this.loadStatistics(requestOptions.body);
+    this.loadInfo();
    return requestOptions;
  };

--- a/src/app/routes/financial-management/components/receivable-order/receivable-order.component.html
+++ b/src/app/routes/financial-management/components/receivable-order/receivable-order.component.html
@ -1,16 +1,29 @@
-<!--
- * @Description  : 
- * @Version      : 1.0
- * @Author       : Shiming
- * @Date         : 2022-01-14 14:39:04
- * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-20 16:20:10
- * @FilePath     : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\receivable-order\\receivable-order.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>
+<!-- <nz-card class="search-box" nzBordered>
+  <div nz-row nzGutter="8">
+    <div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
+      <sf #sf [schema]="searchSchema" [ui]="{ '*': { spanLabelFixed: 110, grid: { lg: 8, md: 12, sm: 12, xs: 24 } } }"
+        [compact]="true" [button]="'none'"></sf>
+    </div>
+    <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right"
+      [class.expend-options]="_$expand">
+      <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
+      <button nz-button [disabled]="false" (click)="resetSF()">重置</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 class="height_box">
+  <div class="header_box" style="margin-left: -16px; margin-top: -16px;">
+    <label class="page_title"> <label class="driver">|</label> 应收核销</label>
+  </div>
  <nz-row [nzGutter]="16">
    <nz-col [nzXl]="5" [nzLg]="8" [nzSm]="12">
      <nz-statistic [nzValue]="((info?.armoneySum || 0) | currency)+'元' " [nzTitle]="'应收金额'"
@ -30,28 +43,15 @@
  </nz-row>
 </nz-card>

-<nz-card class="search-box" nzBordered>
-  <div nz-row nzGutter="8">
-    <div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
-      <sf #sf [schema]="searchSchema" [ui]="{ '*': { spanLabelFixed: 110, grid: { lg: 8, md: 12, sm: 12, xs: 24 } } }"
-        [compact]="true" [button]="'none'"></sf>
-    </div>
-    <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right"
-      [class.expend-options]="_$expand">
-      <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
-      <button nz-button [disabled]="false" (click)="resetSF()">重置</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>
+<nz-card class="table-box">
+  <div class="header_box">
+    <div></div>
+    <div class="mr-sm">
+      <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()">筛选</button>
    </div>
  </div>
-</nz-card>

-<nz-card class="content-box" nzBordered>
  <st #st [data]="service.$api_get_fico_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>
--- a/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts
+++ b/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts
@ -3,25 +3,22 @@ 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 { TicketService } from 'src/app/routes/ticket-management/services/ticket.service';
 import { FreightAccountService } from '../../services/freight-account.service';

@Component({
  selector: 'app-receivable-order',
  templateUrl: './receivable-order.component.html',
-  styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less'],
-  providers: [CurrencyPipe]
+  styleUrls: ['../../../commom/less/commom-table.less','../../../commom/less/common-table-bar.less']
 })
-export class ReceivableOrderComponent implements OnInit {
+export class ReceivableOrderComponent extends BasicTableComponent implements OnInit {
  @ViewChild('st', { static: true })
  st!: STComponent;
-  @ViewChild('sf', { static: false })
-  sf!: SFComponent;
  columns: STColumn[] = this.initST();
-  searchSchema: SFSchema = this.initSF();
-
-  _$expand = false;
+  schema: SFSchema = this.initSF();

  selectedRows: any[] = [];

@ -30,10 +27,15 @@ export class ReceivableOrderComponent implements OnInit {
    public service: FreightAccountService,
    private nzModalService: NzModalService,
    private router: Router,
-    private currencyPipe: CurrencyPipe
-  ) {}
+    public searchDrawerService: SearchDrawerService
+  ) {
+    super(searchDrawerService);
+  }

-  ngOnInit(): void {
+  ngOnInit(): void {}
+
+  search() {
+    this.st?.load(1);
  }

  loadInfo() {
@ -78,21 +80,6 @@ export class ReceivableOrderComponent implements OnInit {
    }
  }

-  /**
-   * 重置表单
-   */
-  resetSF() {
-    this.sf.reset();
-    this._$expand = false;
-  }
-
-  /**
-   * 伸缩查询条件
-   */
-  expandToggle() {
-    this._$expand = !this._$expand;
-    this.sf?.setValue('/expand', this._$expand);
-  }

  private initSF(): SFSchema {
    return {
@ -135,9 +122,6 @@ export class ReceivableOrderComponent implements OnInit {
            widget: 'dict-select',
            params: { dictKey: 'driverrecord:receive:type' },
            placeholder: '请选择',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
          }
        },
        arvattype: {
@ -147,9 +131,6 @@ export class ReceivableOrderComponent implements OnInit {
            widget: 'dict-select',
            params: { dictKey: 'pay:type' },
            placeholder: '请选择',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
          }
        },
        cno: {
@ -160,9 +141,6 @@ export class ReceivableOrderComponent implements OnInit {
            placeholder: '请选择',
            allowClear: true,
            asyncData: () => this.service.getCloseAccount(),
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
          }
        },
        arto: {
@ -175,9 +153,6 @@ export class ReceivableOrderComponent implements OnInit {
            searchLoadingText: '搜索中...',
            allowClear: true,
            onSearch: (q: any) => this.service.getEnterpriceList({ enterpriseName: q }),
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
          }
        },
        sts: {
@ -190,9 +165,7 @@ export class ReceivableOrderComponent implements OnInit {
          ui: {
            widget: 'select',
            placeholder: '请选择',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
+           
          }
        },
        banktype: {
@ -206,9 +179,7 @@ export class ReceivableOrderComponent implements OnInit {
          ui: {
            widget: 'select',
            placeholder: '请选择',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
+           
          },
          default: ''
        },
@ -218,9 +189,7 @@ export class ReceivableOrderComponent implements OnInit {
          ui: {
            widget: 'sl-from-to-search',
            format: 'yyyy-MM-dd',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
+            
          } as SFDateWidgetSchema
        },
        createTime: {
@ -229,9 +198,6 @@ export class ReceivableOrderComponent implements OnInit {
          ui: {
            widget: 'sl-from-to-search',
            format: 'yyyy-MM-dd',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
          } as SFDateWidgetSchema
        },
        billHCode: {
@ -239,9 +205,6 @@ export class ReceivableOrderComponent implements OnInit {
          title: '订单号',
          ui: {
            placeholder: '请输入',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
          }
        },
        // orderS3: {
@ -260,9 +223,6 @@ export class ReceivableOrderComponent implements OnInit {
          ui: {
            autocomplete: 'off',
            placeholder: '请选择',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
          }
        }
      }
@ -282,15 +242,17 @@ export class ReceivableOrderComponent implements OnInit {
        title: '核销金额',
        index: 'ahxmoney',
        width: 140,
+        type: 'widget',
        className: 'text-right',
-        format: item => `${this.currencyPipe.transform(item.ahxmoney)}`
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ahxmoney }) }
      },
      {
        title: '应收金额',
        index: 'armoney',
        width: 140,
+        type: 'widget',
        className: 'text-right',
-        format: item => `${this.currencyPipe.transform(item.armoney)}`
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.armoney }) }
      },
      { title: '银行类型', index: 'banktype', type: 'enum', enum: { '1': '平安', '2': '浦发' }, width: 120 },
      { title: '收款类型', index: 'arvattype', type: 'enum', enum: { '1': '费用款项' }, width: 120 },
--- a/src/app/routes/financial-management/financial-managemen-routing.module.ts
+++ b/src/app/routes/financial-management/financial-managemen-routing.module.ts
@ -64,8 +64,12 @@ const routes: Routes = [
  { path: 'voucher-summary/detail/:id', component: SummaryDetailComponent },
  { path: 'voucher-summary/list/:id', component: VoucherListComponent },
  { path: 'voucher-summary/list/detail/:id', component: VoucherDetailComponent },
-  { path: 'cost-management', component: CostManagementComponent },
-  { path: 'cost-management/detail/:id', component: CostManagementDetailComponent },
+  { path: 'cost-management', component: CostManagementComponent, data: { guard: { ability: ['FINANCIAL-COST-list'] } } },
+  {
+    path: 'cost-management/detail/:id',
+    component: CostManagementDetailComponent,
+    data: { guard: { ability: ['FINANCIAL-COST-DETAIL-view'] } }
+  },
  { path: 'cost-management/expenses-receivable/:id', component: ExpensesReceivableComponent },
  { path: 'cost-management/expenses-payable/:id', component: ExpensesPayableComponent },
  { path: 'abnormal-gold', component: AbnormalGoldComponent },
--- a/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.html
+++ b/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.html
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2022-01-12 10:52:50
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-08 16:34:26
+ * @LastEditTime : 2022-04-29 10:41:20
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\abnormal-warning\\abnormal-warning.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@ -35,25 +35,27 @@
  <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]="['ORDER-COMPLIANCE-AUDIT-search']">筛选</button>
-      <button nz-button nzDanger acl [acl-ability]="['ORDER-COMPLIANCE-AUDIT-export']" (click)="exprot()">导出</button>
+      <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()">筛选</button>
+      <button nz-button nzDanger acl [acl-ability]="['ORDER-ABNORMAL-export']" (click)="exprot()">导出</button>
    </div>
  </div>
  <div>
-    <st #st [bordered]="true" [scroll]="{ x: '2000px' ,y:scrollY }" [data]="service.$api_get_abnormalWarning"
+    <st
+      #st
+      [bordered]="true"
+      [scroll]="{ x: '2000px', y: scrollY }"
+      [data]="service.$api_get_abnormalWarning"
      [columns]="columns"
      [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
      [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
-      [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="false">
-
-
+      [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+      [loading]="false"
+    >
      <ng-template st-row="driverName" let-item let-index="index">
-        <div> {{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : '' }} </div>
+        <div> {{ item?.driverName }}{{ item?.driverPhone ? '/' + item?.driverPhone : '' }} </div>
      </ng-template>
      <ng-template st-row="longitude" let-item let-index="index">
-        <div> {{ item?.longitude }}
-          {{ item?.latitude ? "," + item?.latitude : '' }} </div>
+        <div> {{ item?.longitude }} {{ item?.latitude ? ',' + item?.latitude : '' }} </div>
      </ng-template>
      <ng-template st-row="billCode" let-item let-index="index">
        <!-- <a *ngIf="item.billType == '1'" [routerLink]="'/order-management/vehicle/vehicle-detail/' + item.id">{{ item.billCode }}</a>
@ -63,14 +65,11 @@
          <span>{{ item?.billStatusLabel }}</span>
        </div>
        <div>
-          <span>{{item?.billTypeLabel}}{{item?.serviceTypeLabel === item?.billTypeLabel ?
-            '':item?.serviceTypeLabel}}</span>
+          <span>{{ item?.billTypeLabel }}{{ item?.serviceTypeLabel === item?.billTypeLabel ? '' : item?.serviceTypeLabel }}</span>
        </div>
      </ng-template>
    </st>
  </div>
 </nz-card>

-<ng-template #extraTemplate>
-
-</ng-template>
+<ng-template #extraTemplate> </ng-template>
--- a/src/app/routes/order-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/order-management/components/bulk/bulk.component.ts
@ -528,7 +528,7 @@ export class OrderManagementBulkComponent extends BasicTableComponent implements
            text: '确认签收',
            click: _record => this.confirmReceipt(_record),
            iif: item => item.billStatus == '4',
-            acl: { ability: ['VEHICLE-LIST-view'] }
+            acl: { ability: ['ORDER-BULK-signBulkOrder'] }
          },
          {
            text: '取消订单',
--- a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html
+++ b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2022-01-12 10:52:50
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-06 11:06:05
+ * @LastEditTime : 2022-04-29 10:29:12
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\receipts-audit\\receipts-audit.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@ -118,7 +118,7 @@
  <div>
    <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()" acl
      [acl-ability]="['ORDER-RECEIPTS-search']">查询</button>
-    <button nz-button nzDanger [disabled]="false" (click)="exprot()">导出</button>
+    <button nz-button nzDanger [disabled]="false" (click)="exprot()" acl [acl-ability]="['ORDER-RECEIPTS-export']">导出</button>
    <button nz-button nz-dropdown [nzDropdownMenu]="menu" nzPlacement="bottomLeft">
      更多<i nz-icon nzType="down" nzTheme="outline"></i></button>
    <nz-dropdown-menu #menu="nzDropdownMenu">
--- a/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.html
+++ b/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.html
@ -4,14 +4,14 @@
 * @Author       : Shiming
 * @Date         : 2021-12-29 14:51:07
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-08 13:21:35
+ * @LastEditTime : 2022-04-28 22:11:32
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\modify-rate\\modify-rate.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
 <nz-alert nzType="info" [nzMessage]="'已选择'+ data?.ids?.length + '条订单'" nzShowIcon></nz-alert>
 <sf style="margin-top: 15px" #sf mode="edit" [schema]="schema" [ui]="ui" button="none"></sf>

-<st #st [data]="service.$api_searchAdditionalRateBatch" [columns]="columns"
+<st #st [data]="dataList" [columns]="columns"
 [req]="{ method: 'POST',params: reqParams}"
 [res]="{ reName: { list: 'data' } }"
 [page]="{show: false,showSize: false,front: false}"
--- a/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts
+++ b/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts
@ -1,10 +1,11 @@
+import { STComponent } from '@delon/abc/st';
 /*
 * @Description  : 
 * @Version      : 1.0
 * @Author       : Shiming
 * @Date         : 2021-12-29 14:51:07
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-08 13:21:59
+ * @LastEditTime : 2022-04-28 22:12:14
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\modify-rate\\modify-rate.component.ts
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 */
@ -23,28 +24,30 @@ import { OrderManagementService } from '../../../services/order-management.servi
 })
 export class VehicleModifyRateComponent implements OnInit {
  @ViewChild('sf', { static: false }) sf!: SFComponent;
+  @ViewChild('st', { static: false }) st!: STComponent;
  schema: SFSchema = {};
  ui: SFUISchema = {};
  columns: STColumn[] = [
    { title: '订单号', index: 'billCode' },
    { title: '原附加费率', render: 'oldAdditionalRate' },
    { title: '原附加费', render: 'oldSurcharge' },
-    // { title: '新附加费', render: 'newSurcharge' },
+    { title: '新附加费', render: 'newSurcharge' },
  ];
  aggreechecked = false;
-
+  modiUrl: string= this.service.$api_searchAdditionalRateBatch
  @Input()
  data: any;
+  dataList: any;

  constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public service: OrderManagementService) {}

  ngOnInit(): void {
    console.log(this.data);
    this.initSF();
+    this.initData();
    console.log(this.data?.ids)
  }
  get reqParams() {
-
    return { 
      // operateObject: this.i?.resourceCode,
      // operateType: 4,
@ -52,6 +55,14 @@ export class VehicleModifyRateComponent implements OnInit {
      additionalRate: this.sf?.value?.additionalRate || 0
     };
  }
+  initData() {
+    console.log(this.reqParams);
+    
+    this.service.request(this.service.$api_searchAdditionalRateBatch, this.reqParams).subscribe((res: any) => {
+      console.log(res);
+      this.dataList = res
+    })
+  }
  initSF() {
    this.schema = {
      properties: {
@ -63,7 +74,13 @@ export class VehicleModifyRateComponent implements OnInit {
          ui: {
            unit: '%',
            widgetWidth: 200,
-            precision: 2
+            precision: 2,
+            change:(item: any) => {
+              console.log(item);
+              setTimeout(() => {
+              this.initData() 
+              });
+            }
          } as SFNumberWidgetSchema
        }
      },
--- a/src/app/routes/order-management/order-management-routing.module.ts
+++ b/src/app/routes/order-management/order-management-routing.module.ts
@ -1,10 +1,10 @@
 /*
- * @Description  : 
+ * @Description  :
 * @Version      : 1.0
 * @Author       : Shiming
 * @Date         : 2022-01-06 09:24:00
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-07 09:43:47
+ * @LastEditTime : 2022-04-29 10:41:21
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\order-management-routing.module.ts
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 */
@ -25,22 +25,34 @@ import { OrderManagementVehicleDetailComponent } from './components/vehicle-deta
 import { OrderManagementVehicleComponent } from './components/vehicle/vehicle.component';

 const routes: Routes = [
-  { path: 'vehicle', component: OrderManagementVehicleComponent },
-  { path: 'vehicle/vehicle-detail/:id', component: OrderManagementVehicleDetailComponent },
+  { path: 'vehicle', component: OrderManagementVehicleComponent, data: { guard: { ability: ['ORDER-VEHICLE-search'] } } },
+  {
+    path: 'vehicle/vehicle-detail/:id',
+    component: OrderManagementVehicleDetailComponent,
+    data: { guard: { ability: ['ORDER-VEHICLE-DETAIL-search'] } }
+  },
  { path: 'vehicle-detailChange/:id', component: OrderManagementVehicleDetailChangeComponent },
-  { path: 'bulk', component: OrderManagementBulkComponent },
-  { path: 'bulk/bulk-detail/:id', component: OrderManagementBulkeDetailComponent },
+  { path: 'bulk', component: OrderManagementBulkComponent, data: { guard: { ability: ['ORDER-BULK-search'] } } },
+  {
+    path: 'bulk/bulk-detail/:id',
+    component: OrderManagementBulkeDetailComponent,
+    data: { guard: { ability: ['ORDER-BULK-DETAIL-search'] } }
+  },
  { path: 'bulk-detailChange/:id', component: OrderManagementBulkDetailChangeComponent },
-  { path: 'risk', component: OrderManagementRiskComponent },
+  { path: 'risk', component: OrderManagementRiskComponent, data: { guard: { ability: ['ORDER-RISK-search'] } } },
  { path: 'risk-detail/:id', component: OrderManagementRiskDetailComponent },
-  { path: 'complaint', component: OrderManagementComplaintComponent },
+  { path: 'complaint', component: OrderManagementComplaintComponent, data: { guard: { ability: ['ORDER-COMPLAINT-search'] } } },
  { path: 'complaint-detail/:id', component: OrderManagementComplaintDetailComponent },
-  { path: 'receipts-audit', component: OrderManagementReceiptsAuditComponent },
-  { path: 'compliance-audit', component: OrderManagementComplianceAuditComponent },
-  { path: 'abnormal-warning', component: OrderManagementAbnormalWarningComponent },
-]
+  { path: 'receipts-audit', component: OrderManagementReceiptsAuditComponent, data: { guard: { ability: ['ORDER-RECEIPTS-search'] } } },
+  {
+    path: 'compliance-audit',
+    component: OrderManagementComplianceAuditComponent,
+    data: { guard: { ability: ['ORDER-COMPLIANCE-AUDIT-search'] } }
+  },
+  { path: 'abnormal-warning', component: OrderManagementAbnormalWarningComponent, data: { guard: { ability: ['ORDER-ABNORMAL-search'] } } }
+];
@NgModule({
  imports: [RouterModule.forChild(routes)],
  exports: [RouterModule]
 })
-export class OrderManagementRoutingModule { }
+export class OrderManagementRoutingModule {}
--- a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html
+++ b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html
@ -162,7 +162,7 @@
            nzTheme="fill" class="mr-xs"></i>通过
        </label>
        <label *ngIf="detailData?.esignCheckStatus === 2" style="color: #1890ff"><i nz-icon nzType="close-circle"
-            nzTheme="fill" class="mr-xs"></i>未认证
+            nzTheme="fill" class="mr-xs"></i>未认证：&nbsp;&nbsp;{{detailData?.esignCheckMsg}}
        </label>
      </p>
    </sv-title>
--- a/src/app/routes/sys-setting/components/close-account/close-account.component.html
+++ b/src/app/routes/sys-setting/components/close-account/close-account.component.html
@ -22,8 +22,8 @@
        <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
      </div>
      <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.expend-options]="_$expand" class="text-right">
-        <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
-        <button nz-button [disabled]="false" nzType="primary">导出</button>
+        <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)" >查询</button>
+        <button nz-button [disabled]="false" nzType="primary" acl [acl-ability]="['SYSTEM-CLOSE-ACCOUNT-export']">导出</button>
        <button nz-button [disabled]="false" (click)="resetSF()">重置</button>
        <button nz-button nzType="link" (click)="expandToggle()">
          {{ !_$expand ? '展开' : '收起' }}
@ -38,7 +38,7 @@

  <div class="d-flex justify-content-end mb-sm mt-sm">
    <div>
-      <button nz-button nzType="primary" (click)="roleAction('',1)">新增结算客户</button>
+      <button nz-button nzType="primary" (click)="roleAction('',1)" acl [acl-ability]="['SYSTEM-CLOSE-ACCOUNT-add']">新增结算客户</button>
    </div>
  </div>
  <st #st [data]="service.$api_settlementCustomer_page" [columns]="columns" [req]="{ params: reqParams }" [page]="{}"
--- a/src/app/routes/sys-setting/components/close-account/close-account.component.ts
+++ b/src/app/routes/sys-setting/components/close-account/close-account.component.ts
@ -40,11 +40,13 @@ export class CloseAccountComponent implements OnInit {
      buttons: [
        {
          text: '编辑',
-          click: item => this.roleAction(item, 2)
+          click: item => this.roleAction(item, 2),
+          acl: { ability: ['SYSTEM-CLOSE-ACCOUNT-edit'] },
        },
        {
          text: '删除',
-          click: item => this.deleteAction(item)
+          click: item => this.deleteAction(item),
+          acl: { ability: ['SYSTEM-CLOSE-ACCOUNT-delete'] },
        },
      ]
    }
--- a/src/app/routes/sys-setting/components/network-freight/network-freight.component.html
+++ b/src/app/routes/sys-setting/components/network-freight/network-freight.component.html
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2021-12-24 15:54:08
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-24 11:10:44
+ * @LastEditTime : 2022-04-29 10:20:21
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\network-freight\\network-freight.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@ -48,7 +48,7 @@
 <nz-card class="content-box">
  <!-- 工具栏 -->
  <div class="toolbar" style="float: right; padding-bottom: 15px">
-    <button nz-button nzType="primary" (click)="creat()">新增</button>
+    <button nz-button nzType="primary" (click)="creat()"  acl  [acl-ability]="['SYSTEM-NETWORK-FREIGHT-ADD']">新增</button>
  </div>
  <st
    #st
--- a/src/app/routes/sys-setting/components/network-freight/network-freight.component.ts
+++ b/src/app/routes/sys-setting/components/network-freight/network-freight.component.ts
@ -129,24 +129,29 @@ export class NetworkFreightComponent implements OnInit {
        { type: 'divider' },
        {
          text: '基础设置<br>',
-          click: item => this.creat(item)
+          click: item => this.creat(item),
+          acl: { ability: ['SYSTEM-NETWORK-FREIGHT-basicSetting'] },
        },
        {
          text: '财务设置<br>',
-          click: item => this.ticket(item)
+          click: item => this.ticket(item),
+          acl: { ability: ['SYSTEM-NETWORK-FREIGHT-finanical'] },
        },
        {
          text: '充值账户<br>',
-          click: item => this.settingPay(item)
+          click: item => this.settingPay(item),
+          acl: { ability: ['SYSTEM-NETWORK-FREIGHT-TOPUP'] },
        },
        {
          text: '应用设置<br>',
-          click: item => this.settingApp(item)
+          click: item => this.settingApp(item),
+          acl: { ability: ['SYSTEM-NETWORK-FREIGHT-APPLY'] },
        },

        {
          text: '系统配置<br>',
-          click: item => this.settingAction(item)
+          click: item => this.settingAction(item),
+          acl: { ability: ['SYSTEM-NETWORK-FREIGHT-SYSTEMCONFIG'] },
        },
        // {
        //   text: '合同设置',
--- a/src/app/routes/sys-setting/components/network-freight/new/new.component.html
+++ b/src/app/routes/sys-setting/components/network-freight/new/new.component.html
@ -8,7 +8,12 @@
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\network-freight\\new\\new.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
-<page-header-wrapper [title]="TabText"></page-header-wrapper>
+<page-header-wrapper [title]="TabText" [logo]="logo">
+  <ng-template #logo>
+    <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
+      <i nz-icon nzType="left" nzTheme="outline"></i>
+    </button> </ng-template
+></page-header-wrapper>
 <nz-card>
  <sf #sf1 [ui]="ui" [schema]="schema1" [formData]="sf1FormData" [button]="'none'">
    <ng-template sf-template="tipsS" let-me let-ui="ui" let-schema="schema">
@ -17,15 +22,13 @@
          <dt>正面照</dt>
          <dd>示例</dd>
        </dl>
-        <div class="pa2"> <app-imagelist style="height: 102px;" [imgList]="['./assets/images/company.png']"></app-imagelist></div>
+        <div class="pa2"> <app-imagelist style="height: 102px" [imgList]="['./assets/images/company.png']"></app-imagelist></div>
      </div>
    </ng-template>
    <ng-template sf-template="legalPersonIdentityVO/tipsY" let-me let-ui="ui" let-schema="schema">
-      <div class="pr" style="height: 0;">
-        <dl >
-          请上传道运证照片，支持JPG、PNG格式，文件小于5M。蓝牌绿牌车辆，可不用传道运证
-        </dl>
-        <div class="pa"> <app-imagelist style="height: 152px;" [imgList]="['./assets/images/road.png']"></app-imagelist></div>
+      <div class="pr" style="height: 0">
+        <dl> 请上传道运证照片，支持JPG、PNG格式，文件小于5M。蓝牌绿牌车辆，可不用传道运证 </dl>
+        <div class="pa"> <app-imagelist style="height: 152px" [imgList]="['./assets/images/road.png']"></app-imagelist></div>
      </div>
    </ng-template>
    <ng-template sf-template="title1" let-me let-ui="ui" let-schema="schema">
@ -42,14 +45,14 @@
    </ng-template>

    <ng-template sf-template="legalPersonIdentityVO/title2" let-me let-ui="ui" let-schema="schema">
-      <div class="form-title" style="margin-top: 40px;margin-left: -180px;">营业执照法人信息</div>
+      <div class="form-title" style="margin-top: 40px; margin-left: -180px">营业执照法人信息</div>
    </ng-template>
    <ng-template sf-template="legalPersonIdentityVO/title3" let-me let-ui="ui" let-schema="schema">
-      <div class="form-title" style="margin-top: 40px;margin-left: -180px;">道运证信息</div>
+      <div class="form-title" style="margin-top: 40px; margin-left: -180px">道运证信息</div>
    </ng-template>
    <ng-template sf-template="legalPersonIdentityVO/roadImg" let-me let-ui="ui" let-schema="schema">
      <img height="104" src="./assets/images/road.png" class="borderImg" />
-  </ng-template>
+    </ng-template>
    <ng-template sf-template="legalPersonIdentityVO/tipsC" let-me let-ui="ui" let-schema="schema">
      <div class="pr">
        <div>请上传身份证原件的高清照片，若上传复印件，则需申请人签字；</div>
@ -83,7 +86,7 @@
  </sf>

  <div style="padding-left: 379px">
-    <button nz-button type="button" nzType="primary" (click)="submitForm()">{{subText}}</button>
+    <button nz-button type="button" nzType="primary" (click)="submitForm()">{{ subText }}</button>
    <button nz-button (click)="goBack()">返回</button>
  </div>
-</nz-card>
+</nz-card>
--- a/src/app/routes/sys-setting/components/network-freight/new/new.component.ts
+++ b/src/app/routes/sys-setting/components/network-freight/new/new.component.ts
@ -180,14 +180,8 @@ export class NetworkFreightNewComponent implements OnInit {
    if (this.sf1.value.isLoingDate) {
      this.sf1.value.operatingEndTime = '';
    }
-    console.log(this.sf1.value);
-    console.log(this.sf1.valid);
-    console.log(this.sf?.value);
-    console.log(this.sf.valid);
    const sfVlaue = this.sf1.value;
    const params: any = {};
-    console.log(this.sf1.value);
-    
    Object.assign(params, {
      ...this.sf?.value,
      enterpriseInfoDTO: {
@ -203,7 +197,6 @@ export class NetworkFreightNewComponent implements OnInit {
      roadTransportLicenceNo: this.sf1.value.legalPersonIdentityVO.roadTransportLicenceNo, //道路运输照片
    });
    delete params.enterpriseInfoDTO.legalPersonIdentityVO;
-    console.log(params);
    params.enterpriseInfoDTO.enterpriseAddressCode = this.sf1.value?.enterpriseAddressCode?.[2];
    if (this.route.snapshot.params.id !== 'undefined') {
      params.id = this.route.snapshot.params.id;
--- a/src/app/routes/sys-setting/sys-setting-routing.module.ts
+++ b/src/app/routes/sys-setting/sys-setting-routing.module.ts
@ -1,7 +1,7 @@
 /*
 * @Author: your name
 * @Date: 2021-12-03 15:23:05
- * @LastEditTime : 2022-02-23 17:17:53
+ * @LastEditTime : 2022-04-28 21:40:03
 * @LastEditors  : Shiming
 * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\sys-setting\\sys-setting-routing.module.ts
@ -34,7 +34,7 @@ const routes: Routes = [
  { path: 'role-management/freight/:type', component: RoleManagementComponent },
  { path: 'organization-management', component: OrganizationManagementComponent, data: { guard: { ability: ['SYSTEM-ROLE-list'] } } },
  { path: 'basic-setting', component: BasicSettingComponent, data: { guard: { ability: ['SYSTEM-BASIC_SETTING-list'] } } },
-  { path: 'note-management', component: NoTeManagementComponent },
+  { path: 'note-management', component: NoTeManagementComponent, data: { guard: { ability: ['NOTE-MANAGEMENT-search'] } }  },
  { path: 'basic-config', component: BasicConfigComponent },
  { path: 'audit-reason-config', component: AuditReasonConfigComponent },
  {
@ -52,7 +52,7 @@ const routes: Routes = [
  { path: 'crm-management', component: CrmManagementComponent, data: { guard: { ability: ['SYSTEM-CRM-list'] } } },
  { path: 'network-freight', component: NetworkFreightComponent, data: { guard: { ability: ['SYSTEM-NETWORK-FREIGHT-list'] } } },
  { path: 'network-freight/new/:id', component: NetworkFreightNewComponent },
-  { path: 'close-account', component: CloseAccountComponent },
+  { path: 'close-account', component: CloseAccountComponent, data: { guard: { ability: ['SYSTEM-CLOSE-ACCOUNT-list'] } } },
  // { path: 'btn-management', component: BtnManagementComponent },
  { path: 'announcement-message', component: AnnouncementMessageComponent, data: { guard: { ability: ['SYSTEM-ANNOUNCEMENT-list'] } } },
  { path: 'insurance-set', component: InsuranceSetComponent },
--- a/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.html
+++ b/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.html
@ -7,7 +7,7 @@
      <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
    </div>
    <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
-      <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="search()" >查询</button>
+      <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="search()">查询</button>
      <button nz-button (click)="resetSF()">重置</button>
      <button nz-button (click)="export()" acl [acl-ability]="['TAX_INVOICE_REPORT-export']">导出</button>
      <button nz-button nzType="link" (click)="expandToggle()">
@ -18,32 +18,37 @@
  </div>
 </nz-card>
 <nz-card>
-  <nz-tabset [nzTabBarExtraContent]="extraTemplate" *ngIf="tabs.length>0">
-    <nz-tab *ngFor="let tab of tabs" [nzTitle]="tab.name" (nzSelect)="selectChange(tab)">
-    </nz-tab>
+  <nz-tabset [nzTabBarExtraContent]="extraTemplate" *ngIf="tabs.length > 0">
+    <nz-tab *ngFor="let tab of tabs" [nzTitle]="tab.name" (nzSelect)="selectChange(tab)"> </nz-tab>
  </nz-tabset>
  <!-- 数据列表 -->
-  <st #st [scroll]="{x:'1200px'}" [data]="service.$api_getInvoiceReport_page" [columns]="columns"
+  <st
+    #st
+    [scroll]="{ x: '1200px' }"
+    [data]="service.$api_getInvoiceReport_page"
+    [columns]="columns"
    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
-    [page]="{ show: true, showSize: true, pageSizes: [10,20, 50, 100] }" [loading]="service.http.loading">
+    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 50, 100] }"
+    [loading]="service.http.loading"
+  >
    <ng-template st-row="uploadSts" let-item let-index="index">
      <!-- <a (click)="viewAuditResult(item)" *ngIf="item?.billStatus === '2'">{{item?.billStatusLabel}}</a> -->
      <span *ngIf="item?.uploadSts == '1'">待上传</span>
      <span *ngIf="item?.uploadSts == '3'">已上传</span>
      <span *ngIf="item?.uploadSts == '2'">上传中</span>
-      <span *ngIf="item?.uploadSts == '4'" style="color: red;">上传异常</span>
+      <span *ngIf="item?.uploadSts == '4'" style="color: red">上传异常</span>
      <!-- <span  *ngIf="item?.uploadSts == '4'" style="color: red;" (click)="unnormal(item)">上传异常</span> -->
    </ng-template>
    <ng-template st-row="invoiceType" let-item let-index="index">
      <span>增值税专用发票</span>
    </ng-template>
    <ng-template st-row="sts" let-item let-index="index">
-      <span *ngIf="item.sts==='1'">有效</span>
-      <span *ngIf="item.sts==='2'">作废</span>
+      <span *ngIf="item.sts === '1'">有效</span>
+      <span *ngIf="item.sts === '2'">作废</span>
    </ng-template>
    <ng-template st-row="orderAmount" let-item let-index="index">
-      <div class="text-right">{{item?.orderAmount | currency }}</div>
+      <div class="text-right">{{ item?.orderAmount | currency }}</div>
    </ng-template>
  </st>
 </nz-card>
@ -53,7 +58,17 @@
      已选择
      <strong class="text-red">{{ selectedRows.length }}</strong> 条数据
    </div>
-    <button *ngIf="selectedIndex === '1' || selectedIndex === '4'" nz-button nzType="primary" (click)="upload()">上传</button>
-    <button *ngIf="selectedIndex === '3'" nz-button nzType="primary" (click)="recall()" acl [acl-ability]="['TAX_INVOICE_REPORT-recall']">撤回</button>
+    <button
+      *ngIf="selectedIndex === '1' || selectedIndex === '4'"
+      nz-button
+      nzType="primary"
+      (click)="upload()"
+      acl
+      [acl-ability]="['TAX_INVOICE_REPORT-upload']"
+      >上传</button
+    >
+    <button *ngIf="selectedIndex === '3'" nz-button nzType="primary" (click)="recall()" acl [acl-ability]="['TAX_INVOICE_REPORT-recall']"
+      >撤回</button
+    >
  </div>
 </ng-template>
--- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html
+++ b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html
@ -139,7 +139,7 @@
            nzTheme="fill" class="mr-xs"></i>通过
        </label>
        <label *ngIf="detailData?.esignCheckStatus===2" style="color:  #1890ff;"><i nz-icon nzType="close-circle"
-            nzTheme="fill" class="mr-xs"></i>未认证
+            nzTheme="fill" class="mr-xs"></i>未认证：&nbsp;&nbsp;{{detailData?.esignCheckMsg}}
        </label>
      </p>
    </sv-title>
--- a/src/app/routes/vehicle/components/audit/detail/detail.component.html
+++ b/src/app/routes/vehicle/components/audit/detail/detail.component.html
@ -85,6 +85,17 @@
        <nz-option *ngFor="let i of contenCarLength" [nzLabel]="i.label" [nzValue]="i.value"></nz-option>
      </nz-select>
    </sv>
+    <sv label="车辆能源类型">
+      <nz-select
+        [(ngModel)]="detailData.carEnergyType"
+        [nzPlaceHolder]="isEdit ? '' : '-'"
+        [nzBorderless]="!isEdit"
+        [nzShowArrow]="isEdit"
+        [nzDisabled]="!isEdit"
+      >
+        <nz-option *ngFor="let i of contenCarEnergy" [nzLabel]="i.label" [nzValue]="i.value"></nz-option>
+      </nz-select>
+    </sv>
    <sv label="是否为挂车">
      <nz-select
        [(ngModel)]="detailData.isTrailer"
@ -210,7 +221,7 @@
  </sv-container>

  <sv-container col="3">
-    <sv label="载重（吨）">
+    <sv label="核定载质量（吨）">
      <input
        nz-input
        type="text"
@ -230,6 +241,16 @@
        [placeholder]="isEdit ? '' : '-'"
      />
    </sv>
+    <sv label="总质量">
+      <input
+        nz-input
+        type="text"
+        [(ngModel)]="detailData.carTotalLoad"
+        [readonly]="!isEdit"
+        [nzBorderless]="!isEdit"
+        [placeholder]="isEdit ? '' : '-'"
+      />
+    </sv>
    <sv label="所有人">
      <input
        nz-input
--- a/src/app/routes/vehicle/components/audit/detail/detail.component.ts
+++ b/src/app/routes/vehicle/components/audit/detail/detail.component.ts
@ -31,6 +31,7 @@ export class VehicleComponentsAuditDetailComponent implements OnInit, OnDestroy
  contenCarNoColor: any;
  contencarModel: any;
  contenCarLength: any;
+  contenCarEnergy: any;
  isEdit = false;
  approvalOpinion = '';
  uploadURl = apiConf.waterFileUpload;
@ -243,6 +244,7 @@ export class VehicleComponentsAuditDetailComponent implements OnInit, OnDestroy
    this.Serveice('car:color');
    this.Serveice('car:model');
    this.Serveice('car:length');
+    this.Serveice('car:energy:type');
  }
  Serveice(param: any) {
    let value: any;
@ -257,6 +259,8 @@ export class VehicleComponentsAuditDetailComponent implements OnInit, OnDestroy
          this.contencarModel = res;
        } else if (param === 'car:length') {
          this.contenCarLength = res;
+        } else if (param === 'car:energy:type') {
+          this.contenCarEnergy = res;
        }
      });
    return value;
--- a/src/app/routes/vehicle/components/list/detail/detail.component.html
+++ b/src/app/routes/vehicle/components/list/detail/detail.component.html
@ -72,6 +72,17 @@
            <nz-option *ngFor="let i of contenCarLength" [nzLabel]="i.label" [nzValue]="i.value"></nz-option>
          </nz-select>
        </sv>
+        <sv label="车辆能源类型">
+          <nz-select
+            [(ngModel)]="detailData.carEnergyType"
+            [nzPlaceHolder]="isEdit ? '' : '-'"
+            [nzBorderless]="!isEdit"
+            [nzShowArrow]="isEdit"
+            [nzDisabled]="!isEdit"
+          >
+            <nz-option *ngFor="let i of contenCarEnergy" [nzLabel]="i.label" [nzValue]="i.value"></nz-option>
+          </nz-select>
+        </sv>
        <sv label="是否挂靠">
          <nz-select
            [(ngModel)]="detailData.isSelf"
@ -210,7 +221,7 @@
    </sv-container>

    <sv-container col="3">
-      <sv label="载重（吨）">
+      <sv label="核定载质量（吨）">
        <input
          nz-input
          type="text"
@ -230,6 +241,16 @@
          [placeholder]="isEdit ? '' : '-'"
        />
      </sv>
+      <sv label="总质量">
+        <input
+          nz-input
+          type="text"
+          [(ngModel)]="detailData.carTotalLoad"
+          [readonly]="!isEdit"
+          [nzBorderless]="!isEdit"
+          [placeholder]="isEdit ? '' : '-'"
+        />
+      </sv>
      <sv label="所有人">
        <input
          style="width: '300px'"
@ -241,6 +262,7 @@
          [placeholder]="isEdit ? '' : '-'"
        />
      </sv>
+     
    </sv-container>
    <sv-container col="1">
      <sv label="行驶证照片">
--- a/src/app/routes/vehicle/components/list/detail/detail.component.ts
+++ b/src/app/routes/vehicle/components/list/detail/detail.component.ts
@ -41,6 +41,7 @@ export class VehicleComponentsListDetailComponent implements OnInit {
  contenCarNoColor: any;
  contencarModel: any;
  contenCarLength: any;
+  contenCarEnergy: any;

  constructor(
    private http: _HttpClient,
@ -158,6 +159,8 @@ export class VehicleComponentsListDetailComponent implements OnInit {
    this.Serveice('car:color');
    this.Serveice('car:model');
    this.Serveice('car:length');
+    this.Serveice('car:energy:type');
+
  }
  Serveice(param: any) {
    let value: any;
@ -172,6 +175,8 @@ export class VehicleComponentsListDetailComponent implements OnInit {
          this.contencarModel = res;
        } else if (param === 'car:length') {
          this.contenCarLength = res;
+        } else if (param === 'car:energy:type') {
+          this.contenCarEnergy = res;
        }
      });
    return value;
--- a/src/app/shared/components/search-drawer/search-drawer.component.ts
+++ b/src/app/shared/components/search-drawer/search-drawer.component.ts
@ -21,6 +21,7 @@ export class SearchDrawerComponent implements OnInit, AfterViewInit {
  ngAfterViewInit(): void {}

  ngOnInit(): void {
+    this.defaultValue = {};
    this.service.createEvent.subscribe(({ defaultValue, newSchema, newUI }) => {
      if (defaultValue) {
        this.defaultValue = defaultValue;