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

2022-04-19 16:22:21 +08:00
parent 867e2cc4ba 49865f6426
commit f20df8ac89
22 changed files with 247 additions and 110 deletions
--- a/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.html
+++ b/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.html
@ -5,7 +5,7 @@
    <div class="chooseBox">
      <button nz-button nzType="primary" (click)="exportFun()">导出</button>
      <div class="timeBox">
-        <nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()">
+        <nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()" acl  [acl-ability]="['busiindex-tabel']">
          <label nz-radio-button nzValue="year">年</label>
          <label nz-radio-button nzValue="month">月</label>
          <label nz-radio-button nzValue="date">日</label>
@ -27,7 +27,7 @@
  <ng-template #extraTemplate01>
    <div class="chooseBox">
      <div class="timeBox">
-        <nz-radio-group [(ngModel)]="modeNext" nzButtonStyle="solid" (ngModelChange)="changeDataNext()">
+        <nz-radio-group [(ngModel)]="modeNext" nzButtonStyle="solid" (ngModelChange)="changeDataNext()" acl  [acl-ability]="['busiindex-report']">
          <label nz-radio-button nzValue="year">年</label>
          <label nz-radio-button nzValue="month">月</label>
        </nz-radio-group>
--- a/src/app/routes/datatable/components/compliance/customer/customer.component.html
+++ b/src/app/routes/datatable/components/compliance/customer/customer.component.html
@ -19,7 +19,7 @@
        <ng-template sf-template="no4" let-me let-ui="ui" let-schema="schema">
          <div class="chooseBox">
            <div class="timeBox">
-              <nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()">
+              <nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()" acl  [acl-ability]="['customer-search']">
                <label nz-radio-button nzValue="year">年</label>
                <label nz-radio-button nzValue="month">月</label>
                <label nz-radio-button nzValue="date">日</label>
--- a/src/app/routes/datatable/components/compliance/index/index.component.html
+++ b/src/app/routes/datatable/components/compliance/index/index.component.html
@ -9,7 +9,7 @@
    <div nz-col nzSpan="6">
      <div class="chooseBox">
        <div class="timeBox">
-          <nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()">
+          <nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()"  acl  [acl-ability]="['index-lRateQualified']">
            <label nz-radio-button nzValue="year">年</label>
            <label nz-radio-button nzValue="month">月</label>
          </nz-radio-group>
--- a/src/app/routes/datatable/components/compliance/salesman/salesman.component.html
+++ b/src/app/routes/datatable/components/compliance/salesman/salesman.component.html
@ -20,7 +20,7 @@
        <ng-template sf-template="no4" let-me let-ui="ui" let-schema="schema">
          <div class="chooseBox">
            <div class="timeBox">
-              <nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()">
+              <nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()" acl  [acl-ability]="['salesman-ComplianceReportPage']">
                <label nz-radio-button nzValue="year">年</label>
                <label nz-radio-button nzValue="month">月</label>
                <label nz-radio-button nzValue="date">日</label>
--- a/src/app/routes/datatable/components/customtable/customindex/customindex.component.html
+++ b/src/app/routes/datatable/components/customtable/customindex/customindex.component.html
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2022-04-06 13:20:56
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-14 15:43:56
+ * @LastEditTime : 2022-04-19 15:52:16
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\customtable\\customindex\\customindex.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@ -32,7 +32,7 @@
  <ng-template #extraTemplate>
    <div class="chooseBox">
      <div class="timeBox">
-        <nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()">
+        <nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()"  acl  [acl-ability]="['customindex-client']">
          <label nz-radio-button nzValue="year">年</label>
          <label nz-radio-button nzValue="month">月</label>
          <label nz-radio-button nzValue="date">日</label>
@ -80,7 +80,7 @@
  <ng-template #extraTemplate01>
    <div class="chooseBox">
      <div class="timeBox">
-        <nz-radio-group [(ngModel)]="modeNext" nzButtonStyle="solid" (ngModelChange)="changeDataNext2()">
+        <nz-radio-group [(ngModel)]="modeNext" nzButtonStyle="solid" (ngModelChange)="changeDataNext2()" acl  [acl-ability]="['customindex-totalAdd']">
          <label nz-radio-button nzValue="year">年</label>
          <label nz-radio-button nzValue="month">月</label>
        </nz-radio-group>
--- a/src/app/routes/datatable/components/customtable/driver/driver.component.html
+++ b/src/app/routes/datatable/components/customtable/driver/driver.component.html
@ -9,8 +9,8 @@
          <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 (click)="resetSF()">重置</button>
+          <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="search()"acl  [acl-ability]="['driver-search']">查询</button>
+          <button nz-button (click)="resetSF()"  >重置</button>
          <!-- <button nz-button (click)="export()">导出</button> -->
          <button nz-button nzType="link" (click)="expandToggle()">
            {{ !_$expand ? '展开' : '收起' }}
--- a/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.html
+++ b/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.html
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2022-03-30 17:57:46
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-18 16:45:14
+ * @LastEditTime : 2022-04-19 15:09:26
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\customtable\\mancustomtable\\mancustomtable.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@ -24,7 +24,7 @@
        <ng-template sf-template="no4" let-me let-ui="ui" let-schema="schema">
          <div class="chooseBox">
            <div class="timeBox">
-              <nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()">
+              <nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()" acl  [acl-ability]="['mancustomtable-search']">
                <label nz-radio-button nzValue="year">年</label>
                <label nz-radio-button nzValue="month">月</label>
                <label nz-radio-button nzValue="date">日</label>
--- a/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts
+++ b/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts
@ -19,7 +19,7 @@ export class DatatableMancustomtableComponent implements OnInit {
  mode = 'year';
  date: any = null;
  defineDate = [];
-  columns: STColumn[] =[];
+  columns: STColumn[] = [];
  resourceStatus: number = 1;
  time: any = ['2022-01-01 00:00:00'];
  dateFormat = 'yyyy';
@ -61,41 +61,139 @@ export class DatatableMancustomtableComponent implements OnInit {
      }
    }
  };
- initST() {
-  this.columns =[
-    { title: '部门', index: 'department', className: 'text-center', width: '200px' },
-    { title: '业务员', index: 'salesmen', className: 'text-center', width: '200px' },
-    { title: '已认证货主数', index: 'certifiedCount', className: 'text-center', width: '100px', iif: ()=>  {
-      console.log(this.resourceStatus);
-      return this.resourceStatus !== 1
-      
-    } },
-    { title: '已认证合伙人', index: 'certifiedCount', className: 'text-center', width: '100px' },
-    { title: '新增合伙人数', index: 'addCount', className: 'text-center', width: '100px' },
-    { title: '合伙人活跃率', index: 'alivePer', className: 'text-center', width: '100px' },
-    { title: '活跃合伙人数', index: 'aliveCount', className: 'text-center', width: '100px' },
-    { title: '沉默合伙人数', index: 'silentCount', className: 'text-center', width: '100px' },
-    { title: '流失合伙人数', index: 'drainCount', className: 'text-center', width: '100px' },
-    { title: '未激活合伙人数', index: 'notActiveCount', className: 'text-center', width: '100px' },
+  initST() {
+    this.columns = [
+      { title: '部门', index: 'department', className: 'text-center', width: '150px' },
+      { title: '业务员', index: 'salesmen', className: 'text-center', width: '150px' },
+      {
+        title: '已认证货主数',
+        index: 'certifiedCount',
+        className: 'text-center',
+        width: '150px',
+        iif: () => {
+          return this?.resourceStatus !== 1 ? false : true;
+        }
+      },
+      {
+        title: '已认证合伙人',
+        index: 'certifiedCount',
+        className: 'text-center',
+        width: '150px',
+        iif: () => {
+          return this?.resourceStatus !== 2 ? false : true;
+        }
+      },
+      {
+        title: '新增合伙人数',
+        index: 'addCount',
+        className: 'text-center',
+        width: '150px',
+        iif: () => {
+          return this?.resourceStatus !== 2 ? false : true;
+        }
+      },
+      {
+        title: '合伙人活跃率',
+        index: 'alivePer',
+        className: 'text-center',
+        width: '150px',
+        iif: () => {
+          return this?.resourceStatus !== 2 ? false : true;
+        }
+      },
+      {
+        title: '活跃合伙人数',
+        index: 'aliveCount',
+        className: 'text-center',
+        width: '150px',
+        iif: () => {
+          return this?.resourceStatus !== 2 ? false : true;
+        }
+      },
+      {
+        title: '沉默合伙人数',
+        index: 'silentCount',
+        className: 'text-center',
+        width: '150px',
+        iif: () => {
+          return this?.resourceStatus !== 2 ? false : true;
+        }
+      },
+      {
+        title: '流失合伙人数',
+        index: 'drainCount',
+        className: 'text-center',
+        width: '150px',
+        iif: () => {
+          return this?.resourceStatus !== 2 ? false : true;
+        }
+      },
+      {
+        title: '未激活合伙人数',
+        index: 'notActiveCount',
+        className: 'text-center',
+        width: '150px',
+        iif: () => {
+          return this?.resourceStatus !== 2 ? false : true;
+        }
+      },

-    { title: '新增货主数', index: 'addCount', className: 'text-center', width: '100px' },
-    { title: '货主活跃率', index: 'alivePer', className: 'text-center', width: '100px' },
-    {
-      title: '活跃货主数',
-      index: 'aliveCount',
-      className: 'text-center',
-      width: '100px'
-    },
-    { title: '沉默货主数', index: 'silentCount', className: 'text-center', width: '100px' },
-    {
-      title: '流失货主数',
-      index: 'drainCount',
-      className: 'text-right',
-      width: '100px',
-    },
-    { title: '未激活货主数', index: 'notActiveCount', className: 'text-center', width: '120px' }
-  ];
- }
+      {
+        title: '新增货主数',
+        index: 'addCount',
+        className: 'text-center',
+        width: '150px',
+        iif: () => {
+          return this?.resourceStatus !== 1 ? false : true;
+        }
+      },
+      {
+        title: '货主活跃率',
+        index: 'alivePer',
+        className: 'text-center',
+        width: '150px',
+        iif: () => {
+          return this?.resourceStatus !== 1 ? false : true;
+        }
+      },
+      {
+        title: '活跃货主数',
+        index: 'aliveCount',
+        className: 'text-center',
+        width: '150px',
+        iif: () => {
+          return this?.resourceStatus !== 1 ? false : true;
+        }
+      },
+      {
+        title: '沉默货主数',
+        index: 'silentCount',
+        className: 'text-center',
+        width: '150px',
+        iif: () => {
+          return this?.resourceStatus !== 1 ? false : true;
+        }
+      },
+      {
+        title: '流失货主数',
+        index: 'drainCount',
+        className: 'text-right',
+        width: '150px',
+        iif: () => {
+          return this?.resourceStatus !== 1 ? false : true;
+        }
+      },
+      {
+        title: '未激活货主数',
+        index: 'notActiveCount',
+        className: 'text-center',
+        width: '150px',
+        iif: () => {
+          return this?.resourceStatus !== 1 ? false : true;
+        }
+      }
+    ];
+  }
  /**
   * 查询参数
   */
@ -238,12 +336,10 @@ export class DatatableMancustomtableComponent implements OnInit {
  }
  selectChange(e: number) {
    console.log(e);
-    
    this.resourceStatus = e + 1;
-    // this.initST();
    setTimeout(() => {
-      this.initST();
-      // this.st.load(1);
+      this.st?.resetColumns();
+      this.st?.load(1);
    }, 500);
  }
 }
--- a/src/app/routes/datatable/components/customtable/owner/owner.component.html
+++ b/src/app/routes/datatable/components/customtable/owner/owner.component.html
@ -9,7 +9,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()"  acl  [acl-ability]="['owner-search']">查询</button>
          <button nz-button (click)="resetSF()">重置</button>
          <!-- <button nz-button (click)="export()">导出</button> -->
          <button nz-button nzType="link" (click)="expandToggle()">
--- a/src/app/routes/datatable/components/customtable/partnertable/partnertable.component.html
+++ b/src/app/routes/datatable/components/customtable/partnertable/partnertable.component.html
@ -6,7 +6,7 @@
    <div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
        <sf #sf mode="search" [schema]="schema" [button]="'none'">
          <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading"
-            (click)="st?.load(1)" acl [acl-ability]="['companyStaff-search']">查询</button>
+            (click)="st?.load(1)" acl [acl-ability]="['partnertable-search']">查询</button>
          <button nz-button (click)="resetSF()">重置</button>
        </sf>
    </div>
@ -18,7 +18,7 @@
      </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)="st?.load(1)" acl [acl-ability]="['companyStaff-search']">查询</button>
+          (click)="st?.load(1)" acl [acl-ability]="['partnertable-search']">查询</button>
        <button nz-button (click)="resetSF()">重置</button>
        <button nz-button nzType="link" (click)="expandToggle()">
          {{ !_$expand ? '展开' : '收起' }}
--- a/src/app/routes/datatable/components/customtable/partnertable/partnertable.component.ts
+++ b/src/app/routes/datatable/components/customtable/partnertable/partnertable.component.ts
@ -8,7 +8,7 @@ import { DataService } from '../../../services/data.service';

@Component({
  selector: 'app-datatable-partnertable',
-  templateUrl: './partnertable.component.html',
+  templateUrl: './partnertable.component.html'
 })
 export class DatatablePartnertableComponent implements OnInit {
  @ViewChild('st', { static: false }) st!: STComponent;
@ -24,7 +24,7 @@ export class DatatablePartnertableComponent implements OnInit {
    public service: DataService,
    private modalSrv: NzModalService,
    private modal: ModalHelper,
-    private envSrv: EAEnvironmentService,
+    private envSrv: EAEnvironmentService
  ) {}

  /**
@ -47,7 +47,7 @@ export class DatatablePartnertableComponent implements OnInit {
   * 选中行
   */
  get selectedRows() {
-    return this.st?.list.filter((item) => item.checked) || [];
+    return this.st?.list.filter(item => item.checked) || [];
  }

  /**
@ -60,17 +60,17 @@ export class DatatablePartnertableComponent implements OnInit {
  /**
   * 重置表单
   */
-   resetSF() {
+  resetSF() {
    this.sf.reset();
    this._$expand = false;
-    this.isLoading = true
+    this.isLoading = true;
  }
  /**
   * 程序初始化入口
   */
  ngOnInit() {
    this.initSF();
-    this.initST()
+    this.initST();
  }

  /**
@ -84,33 +84,37 @@ export class DatatablePartnertableComponent implements OnInit {
          title: '合伙人名称',
          type: 'string',
          ui: { placeholder: '请输入' },
-          readOnly: false,
+          readOnly: false
        },
        phone: {
          title: '合伙人类型',
          type: 'string',
-          ui: { 
+          ui: {
            widget: 'select',
-            placeholder: '请输入' },
-          readOnly: false,
+            placeholder: '请输入'
+          },
+          readOnly: false
        },
        phone01: {
          title: '合伙人状态',
          type: 'string',
-          ui: { 
+          ui: {
            widget: 'select',
-            placeholder: '请输入' },
-          readOnly: false,
+            placeholder: '请输入'
+          },
+          readOnly: false
        },
        createTime: {
          type: 'string',
          title: '注册时间',
-          ui: { widget: 'sl-from-to', type: 'date', format: 'yyyy-MM-dd' } as SFDateWidgetSchema,
-        },
+          ui: { widget: 'sl-from-to', type: 'date', format: 'yyyy-MM-dd', visibleIf: {
+            _$expand: (value: boolean) => value,
+          }, } as SFDateWidgetSchema
+        }
      },
-      type: 'object',
+      type: 'object'
    };
-    this.ui = { '*': { spanLabelFixed: 80, grid: { span: 8, gutter: 4 }, enter: () => this.st?.load(1) } };
+    this.ui = { '*': { spanLabelFixed: 120, grid: { span: 8, gutter: 4 }, enter: () => this.st?.load(1) } };
  }

  /**
@ -118,7 +122,7 @@ export class DatatablePartnertableComponent implements OnInit {
   */
  initST() {
    this.columns = [
-      { title: '合伙人名称', index: 'name', className: 'text-center' },
+      { title: '合伙人名称', index: 'networkTransporterName', className: 'text-center' },
      { title: '注册时间', index: 'telephone', className: 'text-center' },
      { title: '注册时间', index: 'roleName', className: 'text-center' },
      { title: '业务员', index: 'lastLoginDate', className: 'text-center' },
@ -127,23 +131,21 @@ export class DatatablePartnertableComponent implements OnInit {
        index: 'stateLocked',
        className: 'text-center',
        type: 'enum',
-        enum: { 0: '正常', 1: '冻结' },
+        enum: { 0: '正常', 1: '冻结' }
      },
      { title: '客户数', index: 'lastLoginDate', className: 'text-center' },
      { title: '收益额', index: 'lastLoginDate', className: 'text-center' },
      { title: '已提现金额', index: 'lastLoginDate', className: 'text-center' },
      { title: '订单数', index: 'lastLoginDate', className: 'text-center' },
      { title: '订单金额', index: 'lastLoginDate', className: 'text-center' },
-      { title: '应收订单数', index: 'lastLoginDate', className: 'text-center' },
+      { title: '应收订单数', index: 'lastLoginDate', className: 'text-center' }
    ];
  }
- 
+
  /**
   * 数据列表状态变化事件
   */
  change(change: STChange) {
    // console.log(change);
  }
-
- 
 }
--- a/src/app/routes/datatable/components/financetable/financetable.component.html
+++ b/src/app/routes/datatable/components/financetable/financetable.component.html
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2022-04-06 10:57:56
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-11 15:52:10
+ * @LastEditTime : 2022-04-19 16:11:10
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\financetable\\financetable.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@ -15,7 +15,7 @@
    <div class="chooseBox">
      <!-- <button nz-button nzType="primary" (click)="exportFun()">导出</button> -->
      <div class="timeBox">
-        <nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()">
+        <nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()" acl  [acl-ability]="['financetable-table']">
          <label nz-radio-button nzValue="year">年</label>
          <label nz-radio-button nzValue="month">月</label>
          <label nz-radio-button nzValue="date">日</label>
@ -69,11 +69,11 @@
 <nz-card nzTitle="运营报表" [nzExtra]="extraTemplate01">
  <ng-template #extraTemplate01>
    <div class="chooseBox">
-      <nz-select [(ngModel)]="enterpriseInfoId" style="width: 200px" (ngModelChange)="initPillarData()">
+      <nz-select [(ngModel)]="enterpriseInfoId" style="width: 200px" (ngModelChange)="initPillarData()" acl  [acl-ability]="['financetable-report']">
        <nz-option [nzValue]="item.value" [nzLabel]="item.label" *ngFor="let item of interManlist"></nz-option>
      </nz-select>
      <div class="timeBox">
-        <nz-radio-group [(ngModel)]="modeNext" nzButtonStyle="solid" (ngModelChange)="changeDataNext()">
+        <nz-radio-group [(ngModel)]="modeNext" nzButtonStyle="solid" (ngModelChange)="changeDataNext()" acl  [acl-ability]="['financetable-report']">
          <label nz-radio-button nzValue="year">年</label>
          <label nz-radio-button nzValue="month">月</label>
        </nz-radio-group>
--- a/src/app/routes/datatable/components/operationtable/operationtable.component.html
+++ b/src/app/routes/datatable/components/operationtable/operationtable.component.html
@ -3,9 +3,9 @@
 <nz-card nzTitle="运营报表" [nzExtra]="extraTemplate">
  <ng-template #extraTemplate>
    <div class="chooseBox">
-      <button nz-button nzType="primary" (click)="exportFun()">导出</button>
+      <button nz-button nzType="primary" (click)="exportFun()" acl  [acl-ability]="['operationtable-export']">导出</button>
      <div class="timeBox">
-        <nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()">
+        <nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()" acl  [acl-ability]="['operationtable-table']">
          <label nz-radio-button nzValue="year">年</label>
          <label nz-radio-button nzValue="month">月</label>
          <label nz-radio-button nzValue="date">日</label>
@ -28,7 +28,7 @@
 <nz-card nzTitle="运营报表" [nzExtra]="extraTemplate01">
  <ng-template #extraTemplate01>
    <div class="chooseBox">
-      <nz-select [(ngModel)]="enterpriseInfoId" style="width: 200px" (ngModelChange)="initPillarData(true)">
+      <nz-select [(ngModel)]="enterpriseInfoId" style="width: 200px" (ngModelChange)="initPillarData(true)" acl  [acl-ability]="['operationtable-operationalReport']">
        <nz-option [nzValue]="item.value" [nzLabel]="item.label" *ngFor="let item of interManlist"></nz-option>
      </nz-select>
      <div class="timeBox">
--- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts
+++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts
@ -123,10 +123,13 @@ export class WithdrawalsDetailComponent implements OnInit {
    history.go(-1);
  }

-    // 导出
-    exprot() {
-      this.service.exportStart({ ...this.inputSF.value, pageSize: -1 }, this.service.$api_export_refund_detail_page);
-    }
+  // 导出
+  exprot() {
+    this.service.exportStart(
+      { ...this.inputSF.value, pageSize: -1, refundApplicationId: this.route.snapshot.params.id },
+      this.service.$api_export_refund_detail_page
+    );
+  }

  private initInputSF(): SFSchema {
    return {
@ -228,7 +231,7 @@ export class WithdrawalsDetailComponent implements OnInit {
      { title: '运费明细', render: 'amountDetails', className: 'text-right', width: 150 },
      { title: '货主', index: 'ltdName', className: 'text-left', width: 200 },
      { title: '订单号', render: 'billId', width: 200 },
-      { title: '运单号', render: 'wayBillId',  width: 200 },
+      { title: '运单号', render: 'wayBillId', width: 200 },
      { title: '货源编号', index: 'resourceCode', width: 200 },
      {
        title: '服务类型',
--- 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
@ -1,4 +1,4 @@
-<!--
+billCode<!--
 * @Description  : 
 * @Version      : 1.0
 * @Author       : Shiming
--- a/src/app/routes/order-management/components/risk/risk.component.html
+++ b/src/app/routes/order-management/components/risk/risk.component.html
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2022-01-12 10:52:50
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-08 13:51:12
+ * @LastEditTime : 2022-04-19 16:21:02
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\risk\\risk.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@ -64,7 +64,7 @@
      [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
      [loading]="false"
    >
-      <ng-template st-row="billCode" let-item let-index="index">
+      <!-- <ng-template st-row="billCode" let-item let-index="index">
        <a  [routerLink]="'/order-management/risk-detail/' + item.id">{{ item.billCode }}</a>
        <div>
          <span>{{ item?.representationsStatusLabel }}</span>
@ -72,6 +72,18 @@
        <div>
          <span >{{item?.billTypeLabel}}{{item?.billTypeLabel === item?.serviceTypeLabel ? '' : item?.serviceTypeLabel}}</span>
        </div>
+      </ng-template> -->
+      <ng-template st-row="billCode" let-item let-index="index">
+        <!-- <div>{{ item.billCode }}</div> -->
+        <a *ngIf="item.billType == '1'" [routerLink]="'/order-management/vehicle/vehicle-detail/' + item.id">{{ item.billCode }}</a>
+        <a *ngIf="item.billType == '2'"  [routerLink]="'/order-management/bulk/bulk-detail/' + item.id">{{ item.billCode }}</a>
+        <a *ngIf="item.billType == '3'"  [routerLink]="'/order-management/vehicle/vehicle-detail/' + item.id">{{ item.billCode }}</a>
+        <div>
+          <span>{{ item?.representationsStatusLabel }}</span>
+        </div>
+        <div>
+          <span >{{item?.billTypeLabel}}{{item?.billTypeLabel === item?.serviceTypeLabel ? '' : item?.serviceTypeLabel}}</span>
+        </div>
      </ng-template>
      <ng-template st-row="timeer" let-item let-index="index">
        <p>创建时间：{{ item?.createTime }}</p>
--- a/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.html
+++ b/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.html
@ -20,7 +20,7 @@
  </p>
  <p>
    <label nz-checkbox [(ngModel)]="aggreechecked"></label>
-    <span>&nbsp;确认已阅读并知晓 <a target="_blank" [routerLink]="['/agreement']" [queryParams]="{ type: 3, data:  dataJSON }">《变更协议》</a></span>
+    <span>&nbsp;确认已阅读并知晓 <a (click)="agreement()">《变更协议》</a></span>
  </p>
 </div>

@ -28,3 +28,9 @@
  <button nz-button type="button" (click)="close()">关闭</button>
  <button nz-button type="submit" nzType="primary" (click)="save(sf.value)" [disabled]="!aggreechecked">确定</button>
 </div>
+<nz-modal [(nzVisible)]="isVisible" nzTitle="变更协议" nzClassName="modal_content" (nzOnOk)="handleOK()"
+  (nzOnCancel)="handleCancel()" [nzWidth]="800">
+  <ng-container *nzModalContent>
+    <div [innerHTML]="modalcontent | html" class=""></div>
+  </ng-container>
+</nz-modal>
--- a/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts
+++ b/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts
@ -24,6 +24,8 @@ export class VehicleUpdateFreightComponent implements OnInit {
  @ViewChild('sf', { static: false }) sf!: SFComponent;
  schema: SFSchema = {};
  ui: SFUISchema = {};
+  isVisible = false;
+  modalcontent = '';

  aggreechecked = false;

@ -192,4 +194,30 @@ export class VehicleUpdateFreightComponent implements OnInit {
    };
    return params;
  }
+  agreement() {
+
+    const param = {
+      billId: this.data.id,
+      pre: this.sf.value.prePay,
+      rece: this.sf.value.toPay,
+      back: this.sf.value.receiptPay,
+      total: this.data.totalFreight,
+      freightAmount: this.data.totalAmount,
+    }
+    this.service.request(this.service.$api_getSupplementaryAgreement, param).subscribe(res => {
+      if (res) {
+        this.modalcontent = res.contractContent;
+        this.isVisible = true;
+      }
+    });
+
+  }
+
+
+  handleCancel() {
+    this.isVisible = false;
+  }
+  handleOK() {
+    this.isVisible = false;
+  }
 }
--- a/src/app/routes/order-management/services/order-management.service.ts
+++ b/src/app/routes/order-management/services/order-management.service.ts
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2021-12-03 15:31:52
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-13 18:52:24
+ * @LastEditTime : 2022-04-19 15:16:37
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\services\\order-management.service.ts
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 */
@ -206,6 +206,8 @@ export class OrderManagementService extends ShipperBaseService {
  $api_asyncExportComplaintListDrv = `/api/sdc/complaint/operate/asyncExportComplaintListDrv`;
    //操作日志
    public $api_get_log_list = `/api/mdc/pbc/operationLogRecords/getOperationLogRecordsList`;
+      // 查看补充协议
+  public $api_getSupplementaryAgreement = `/api/sdc/billShipper/getSupplementaryAgreement`;
  /**
   * 根据企业ID，获取企业历史网络货运人
   * @returns
--- a/src/app/routes/sys-setting/services/system.service.ts
+++ b/src/app/routes/sys-setting/services/system.service.ts
@ -65,7 +65,7 @@ export class SystemService extends BaseService {
  $api_deletebatch_crmCustomer = '/api/mdc/cuc/crmCustomer/deletebatch';

  // 获取某个应用的所有菜单
-  $api_getAllFunctionInfoByAppId: string = '/api/mdc/cuc/functionInfo/getAllFunctionInfoByAppId';
+  $api_getAllFunctionInfoByAppId: string = '/api/mdc/cuc/functionInfo/getAllFunctionInfoByAppIdNoHide';

  // 查询网络货运信息表
  $api_networkTransporter_page = '/api/mdc/cuc/networkTransporter/list/page';
--- a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts
+++ b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts
@ -140,19 +140,7 @@ export class TaxManagementIndividualDeclareComponent implements OnInit {
            }
          }
        },
-        declareResult: {
-          title: '申报结果',
-          type: 'string',
-          ui: {
-            placeholder: '请选择',
-            widget: 'dict-select',
-            params: { dictKey: 'service:type' },
-            containsAllLabel: true,
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            }
-          }
-        },
+      
        isOvertime: {
          title: '是否逾期',
          type: 'string',
--- a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts
+++ b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts
@ -268,10 +268,10 @@ export class InvoiceDetailComponent implements OnInit {
      },
      {
        title: '开票金额',
-        index: 'vatnotax',
+        index: 'vatmoney',
        type: 'widget',
        className: 'text-right',
-        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vatnotax }) }
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vatmoney }) }
      }
    ];
  }