fix bug

2022-04-19 16:21:55 +08:00
parent ec7374a5fd
commit 9babeb38b1
13 changed files with 36 additions and 24 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
@ -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/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/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/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>