From 1d23af8af6ff4c629515fd7ea952b2958ec0ec42 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Tue, 15 Feb 2022 14:19:43 +0800
Subject: [PATCH] fix bug

---
 .../components/driver/detail/detail.component.html    |  8 ++++----
 .../components/driver/driver.component.html           |  6 +++---
 .../usercenter/components/driver/driver.component.ts  | 10 ++++++----
 .../freight/list/detail/detail.component.html         | 10 +++++-----
 .../freight/user/detail/detail.component.html         | 11 +++++------
 .../components/freight/user/user.component.html       | 10 +++++-----
 .../components/freight/user/user.component.ts         |  9 ++++++---
 7 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/src/app/routes/usercenter/components/driver/detail/detail.component.html b/src/app/routes/usercenter/components/driver/detail/detail.component.html
index be3f2ded..eaaa9465 100644
--- a/src/app/routes/usercenter/components/driver/detail/detail.component.html
+++ b/src/app/routes/usercenter/components/driver/detail/detail.component.html
@@ -17,11 +17,11 @@
             </p>
             <div style="margin-right: 24px;">
               <button *ngIf="userDetail?.stateLocked" [disabled]="service.http.loading" nz-button nzType="primary"
-                nzGhost (click)="userAction(1)">
+                nzGhost (click)="userAction(1)"  acl  [acl-ability]="['USERCENTER-DRIVER-LIST-DETAIL-lock']">
                 启用
               </button>
               <button *ngIf="!userDetail?.stateLocked" [disabled]="service.http.loading" nz-button nzDanger nzGhost
-                (click)="userAction(0)">
+                (click)="userAction(0)"  acl  [acl-ability]="['USERCENTER-DRIVER-LIST-DETAIL-lock']">
                 冻结
               </button>
             </div>
@@ -79,9 +79,9 @@
           </ng-container>
           <ng-template #elseTemplate>
             <button nz-button nzType="default" nzDanger (click)="approveUser()"
-              *ngIf="userIdentityDetail?.certificationStatus===0">审核通过</button>
+              *ngIf="userIdentityDetail?.certificationStatus===0"  acl  [acl-ability]="['USERCENTER-DRIVER-LIST-DETAIL-auditUser']">审核通过</button>
             <button nz-button nzType="default" nzDanger (click)="rejectedUser()"
-              *ngIf="userIdentityDetail?.certificationStatus===0">驳回审核</button>
+              *ngIf="userIdentityDetail?.certificationStatus===0"  acl  [acl-ability]="['USERCENTER-DRIVER-LIST-DETAIL-auditUser']">驳回审核</button>
             <button nz-button nzType="default" nzDanger (click)="ratify(0)">修改</button>
           </ng-template>
         </div>
diff --git a/src/app/routes/usercenter/components/driver/driver.component.html b/src/app/routes/usercenter/components/driver/driver.component.html
index bfa1c390..b78deb09 100644
--- a/src/app/routes/usercenter/components/driver/driver.component.html
+++ b/src/app/routes/usercenter/components/driver/driver.component.html
@@ -18,8 +18,8 @@
     </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 nzType="primary" (click)="exportList()" [disabled]="service.http.loading">导出</button>
+      <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)"  acl  [acl-ability]="['USERCENTER-DRIVER-LIST-list']">查询</button>
+      <button nz-button nzType="primary" (click)="exportList()" [disabled]="service.http.loading" acl  [acl-ability]="['USERCENTER-DRIVER-LIST-export']">导出</button>
       <button nz-button (click)="resetSF()" [disabled]="service.http.loading">重置</button>
       <button nz-button nzType="link" (click)="expandToggle()">
         {{ !_$expand ? '展开' : '收起' }}
@@ -42,7 +42,7 @@
     [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
     [loading]="service.http.loading">
     <ng-template st-row="promotersTelephone" let-item let-index="index">
-      <a (click)="addPromoter(item)">{{ item.promotersTelephone || '添加' }}</a>
+      <a (click)="addPromoter(item)"  acl  [acl-ability]="['USERCENTER-DRIVER-LIST-promoter']">{{ item.promotersTelephone || '添加' }}</a>
     </ng-template>
   </st>
 </nz-card>
diff --git a/src/app/routes/usercenter/components/driver/driver.component.ts b/src/app/routes/usercenter/components/driver/driver.component.ts
index 8e12466f..9484e0ae 100644
--- a/src/app/routes/usercenter/components/driver/driver.component.ts
+++ b/src/app/routes/usercenter/components/driver/driver.component.ts
@@ -307,16 +307,18 @@ export class UserCenterComponentsDriverComponent implements OnInit {
             text: '查看<br/>',
             click: item => {
               this.router.navigate(['./detail', item.appUserId], { relativeTo: this.ar });
-              // this.router.navigate(['./view', item.id], { relativeTo: this.ar, queryParams: { tenantId: item.tenantId } });
-            }
+            },
+            acl: { ability: ['USERCENTER-DRIVER-LIST-view'] },
           },
           {
             text: '基础设置',
-            click: item => this.settingAction(item)
+            click: item => this.settingAction(item),
+            acl: { ability: ['USERCENTER-DRIVER-LIST-basicSetting'] },
           },
           {
             text: '资金账户',
-            click: item => this.showAccountDetail(item)
+            click: item => this.showAccountDetail(item),
+            acl: { ability: ['USERCENTER-DRIVER-LIST-account'] },
           }
         ]
       }
diff --git a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html
index 0e51e5d8..8ad39bc4 100644
--- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html
+++ b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html
@@ -44,20 +44,20 @@
           </ng-container>
           <ng-template #editButton>
             <ng-container *ngIf="detailData?.approvalStatus===10">
-              <button [disabled]="service.http.loading" nz-button nzDanger (click)="auditPass()">
+              <button [disabled]="service.http.loading" nz-button nzDanger (click)="auditPass()" acl  [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-audit']">
                 通过
               </button>
-              <button [disabled]="service.http.loading" nz-button nzDanger (click)="auditNo()">
+              <button [disabled]="service.http.loading" nz-button nzDanger (click)="auditNo()" acl  [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-audit']">
                 驳回
               </button>
             </ng-container>
             <ng-container *ngIf="detailData?.approvalStatus!=10">
               <button [disabled]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="enable"
-                (nzOnConfirm)="freezeOrResume(0)" nzPopconfirmPlacement="bottomRight" *ngIf="detailData?.stateLocked"  acl  [acl-ability]="['USERCENTER-FREIGHT-LIST-DETAIL-lock']">
+                (nzOnConfirm)="freezeOrResume(0)" nzPopconfirmPlacement="bottomRight" *ngIf="detailData?.stateLocked"  acl  [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-lock']">
                 启用
               </button>
               <button [disabled]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="frozen"
-                (nzOnConfirm)="freezeOrResume(1)" nzPopconfirmPlacement="bottomRight" *ngIf="!detailData?.stateLocked"  acl  [acl-ability]="['USERCENTER-FREIGHT-LIST-DETAIL-lock']">
+                (nzOnConfirm)="freezeOrResume(1)" nzPopconfirmPlacement="bottomRight" *ngIf="!detailData?.stateLocked"  acl  [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-lock']">
                 冻结
               </button>
               <button [disabled]="service.http.loading" nz-button nzDanger nz-popconfirm
@@ -71,7 +71,7 @@
                 关闭支付权限
               </button>
             </ng-container>
-            <button [disabled]="service.http.loading" nz-button nzDanger (click)="ratify()" acl  [acl-ability]="['USERCENTER-FREIGHT-LIST-DETAIL-save']">
+            <button [disabled]="service.http.loading" nz-button nzDanger (click)="ratify()" acl  [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-save']">
               修改
             </button>
           </ng-template>
diff --git a/src/app/routes/usercenter/components/freight/user/detail/detail.component.html b/src/app/routes/usercenter/components/freight/user/detail/detail.component.html
index 5e051b4a..353e8d83 100644
--- a/src/app/routes/usercenter/components/freight/user/detail/detail.component.html
+++ b/src/app/routes/usercenter/components/freight/user/detail/detail.component.html
@@ -30,11 +30,11 @@
                 <div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="24" [nzXs]="24" class="d-flex"
                   style="justify-content: flex-end;padding-right: 24px;">
                   <button *ngIf="userDetail?.stateLocked" [nzLoading]="service.http.loading" nz-button nzType="primary"
-                    nzGhost (click)="userAction(1)">
+                    nzGhost (click)="userAction(1)"  acl  [acl-ability]="['USERCENTER-FREIGHT-USER-D-lock']">
                     启用
                   </button>
                   <button *ngIf="!userDetail?.stateLocked" [nzLoading]="service.http.loading" nz-button nzDanger nzGhost
-                    (click)="userAction(0)">
+                    (click)="userAction(0)"  acl  [acl-ability]="['USERCENTER-FREIGHT-USER-D-lock']">
                     冻结
                   </button>
                 </div>
@@ -65,11 +65,10 @@
             </button>
           </ng-container>
           <ng-template #elseTemplate>
-            <button nz-button nzType="default" nzDanger (click)="auditPass()"
-              *ngIf="userIdentityDetail.certificationStatus===0" [nzLoading]="service.http.loading">审核通过</button>
+            <button nz-button nzType="default" nzDanger (click)="auditPass()"  *ngIf="userIdentityDetail.certificationStatus===0" [nzLoading]="service.http.loading" acl  [acl-ability]="['USERCENTER-FREIGHT-USER-D-audit']">审核通过</button>
             <button nz-button nzType="default" nzDanger (click)="auditNo()"
-              *ngIf="userIdentityDetail.certificationStatus===0" [nzLoading]="service.http.loading">驳回审核</button>
-            <button nz-button nzType="default" nzDanger (click)="ratify()">修改</button>
+              *ngIf="userIdentityDetail.certificationStatus===0" [nzLoading]="service.http.loading" acl  [acl-ability]="['USERCENTER-FREIGHT-USER-D-audit']">驳回审核</button>
+            <button nz-button nzType="default" nzDanger (click)="ratify()"  acl [acl-ability]="['USERCENTER-FREIGHT-USER-D-edit']" >修改</button>
           </ng-template>
         </div>
       </sv-title>
diff --git a/src/app/routes/usercenter/components/freight/user/user.component.html b/src/app/routes/usercenter/components/freight/user/user.component.html
index e1fb4d77..1e30a612 100644
--- a/src/app/routes/usercenter/components/freight/user/user.component.html
+++ b/src/app/routes/usercenter/components/freight/user/user.component.html
@@ -1,10 +1,10 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-13 10:47:28
- * @LastEditTime: 2022-01-12 09:58:12
- * @LastEditors: Please set LastEditors
+ * @LastEditTime : 2022-02-15 13:59:52
+ * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- * @FilePath: \tms-obc-web\src\app\routes\usercenter\components\freight\user\user.component.html
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\usercenter\\components\\freight\\user\\user.component.html
 -->
 <!-- 页头 -->
 <page-header-wrapper [title]="'员工列表'"></page-header-wrapper>
@@ -16,7 +16,7 @@
       <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
     </div>
     <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 nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)" acl  [acl-ability]="['USERCENTER-FREIGHT-USER-list']">查询</button>
       <button nz-button nzType="primary" [disabled]="service.http.loading" (click)="st?.load(1)">导出</button>
       <button nz-button (click)="resetSF()" [disabled]="service.http.loading">重置</button>
       <button nz-button nzType="link" (click)="expandToggle()">
@@ -51,7 +51,7 @@
       </div>
     </ng-template>
     <ng-template st-row="promotersTelephone" let-item let-index="index">
-      <a (click)="addPromoter(item)">
+      <a (click)="addPromoter(item)" acl  [acl-ability]="['USERCENTER-FREIGHT-USER-promoter']">
         {{ item.promotersTelephone || '添加' }}
       </a>
     </ng-template>
diff --git a/src/app/routes/usercenter/components/freight/user/user.component.ts b/src/app/routes/usercenter/components/freight/user/user.component.ts
index e63378df..73b44001 100644
--- a/src/app/routes/usercenter/components/freight/user/user.component.ts
+++ b/src/app/routes/usercenter/components/freight/user/user.component.ts
@@ -223,17 +223,20 @@ export class FreightComponentsUserComponent implements OnInit {
             text: '查看',
             click: (item: any) => {
               this.router.navigate(['./view', item.appUserId], { relativeTo: this.ar });
-            }
+            },
+            acl: { ability: ['USERCENTER-FREIGHT-USER-view'] },
           },
           {
             text: '冻结',
             iif: item => item.stateLocked === 0,
-            click: (item: any) => this.userAction(0, [item.appUserId])
+            click: (item: any) => this.userAction(0, [item.appUserId]),
+            acl: { ability: ['USERCENTER-FREIGHT-USER-lock'] },
           },
           {
             text: '启用',
             iif: item => item.stateLocked === 1,
-            click: (item: any) => this.userAction(1, [item.appUserId])
+            click: (item: any) => this.userAction(1, [item.appUserId]),
+            acl: { ability: ['USERCENTER-FREIGHT-USER-lock'] },
           }
         ]
       }