From 488f4c5f6b480dd3d3605ccf897a531422eb5672 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Mon, 21 Feb 2022 16:04:27 +0800
Subject: [PATCH] fix bug

---
 .../bulk-detail/bulk-detail.component.html        |  6 +++---
 .../bulk-publish/bulk-publish.component.html      |  6 +++---
 .../bulk-release-publish.component.html           |  6 +++---
 .../components/bulk/bulk.component.html           |  6 +++---
 .../components/bulk/bulk.component.ts             |  8 ++++++--
 .../onecar-publish/onecar-publish.component.html  |  6 +++---
 .../release-publish.component.html                |  4 ++--
 .../vehicle-detail/vehicle-detail.component.html  |  8 ++++----
 .../components/vehicle/vehicle.component.html     |  8 ++++----
 .../components/vehicle/vehicle.component.ts       | 15 ++++++++++-----
 .../driver-config/driver-config.component.ts      |  2 +-
 11 files changed, 42 insertions(+), 33 deletions(-)

diff --git a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html
index 4d7567db..fb4c2eb6 100644
--- a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html
+++ b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html
@@ -13,9 +13,9 @@
       <div nz-row>
         <div nz-col nzSpan="14" class="text-grey-darker">网络货运人：{{ i?.shipperAppUserName }}</div>
         <div nz-col nzSpan="10">
-          <button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'">取消货源</button>
-          <button nz-button (click)="updatePrice(i)" *ngIf="i?.resourceStatus === '1'">修改单价</button>
-          <button nz-button nzType="primary" nzGhost (click)="placeOrder(i)">再下一单</button>
+          <button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'"  acl  [acl-ability]="['SUPPLY-BULK-DETAIL-cancelSupply']">取消货源</button>
+          <button nz-button (click)="updatePrice(i)" *ngIf="i?.resourceStatus === '1'"  acl  [acl-ability]="['SUPPLY-BULK-DETAIL-updatePrice']">修改单价</button>
+          <button nz-button nzType="primary" nzGhost (click)="placeOrder(i)"  acl  [acl-ability]="['SUPPLY-BULK-DETAIL-bulkAnotherOrder']">再下一单</button>
         </div>
       </div>
       <div class="mt-sm mb-sm" nz-row>
diff --git a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html
index 99efb8e8..fea654b7 100644
--- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html
+++ b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html
@@ -220,9 +220,9 @@
 </nz-card>
 <nz-card>
   <div class="align-center">
-    <button nz-button nzType="primary"  (click)="submitConfirm('qrcode')">生成二维码</button>
-    <button nz-button nzType="primary" style="margin-left: 48px" (click)="submitConfirm('assign')">指派熟车</button>
+    <button nz-button nzType="primary"  (click)="submitConfirm('qrcode')"  acl  [acl-ability]="['SUPPLY-VEHICLE-PLACEORDER- QRCode']">生成二维码</button>
+    <button nz-button nzType="primary" style="margin-left: 48px" (click)="submitConfirm('assign')"  acl  [acl-ability]="['SUPPLY-VEHICLE-PLACEORDER-bulkDesignate']">指派熟车</button>
     <!-- <button nz-button nzType="primary"    (click)="choose()">取消</button> -->
-    <button nz-button nzType="primary" style="margin-left: 48px" (click)="submitConfirm('publish')">司机抢单</button>
+    <button nz-button nzType="primary" style="margin-left: 48px" (click)="submitConfirm('publish')"  acl  [acl-ability]="['SUPPLY-VEHICLE-PLACEORDER-bulkAnotherOrder']">司机抢单</button>
   </div>
 </nz-card>
diff --git a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html
index ab161395..88cd31bb 100644
--- a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html
+++ b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html
@@ -241,8 +241,8 @@
 <nz-card>
   <div class="align-center">
     <!-- <button nz-button nzType="primary" (click)="choose()">取消</button> -->
-    <button nz-button nzType="primary"  (click)="submitConfirm('qrcode')">生成二维码</button>
-    <button nz-button nzType="primary" (click)="submitConfirm('assign')">指派熟车</button>
-    <button nz-button nzType="primary" style="margin-left: 48px" (click)="submitConfirm('publish')">司机抢单</button>
+    <button nz-button nzType="primary"  (click)="submitConfirm('qrcode')"  acl  [acl-ability]="['SUPPLY-BULK-RELEASE-QRCode ']">生成二维码</button>
+    <button nz-button nzType="primary"  style="margin-left: 48px" (click)="submitConfirm('assign')"  acl  [acl-ability]="['SUPPLY-BULK-RELEASE-consignBulkAssign']">指派熟车</button>
+    <button nz-button nzType="primary" style="margin-left: 48px" (click)="submitConfirm('publish')"  acl  [acl-ability]="['SUPPLY-BULK-RELEASE-consignBulk']">司机抢单</button>
   </div>
 </nz-card>
diff --git a/src/app/routes/supply-management/components/bulk/bulk.component.html b/src/app/routes/supply-management/components/bulk/bulk.component.html
index 1d1939ad..f9da7979 100644
--- a/src/app/routes/supply-management/components/bulk/bulk.component.html
+++ b/src/app/routes/supply-management/components/bulk/bulk.component.html
@@ -31,7 +31,7 @@
         <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
       </div>
       <div nz-col [nzSpan]="_$expand ? 24 : 6" class="text-right">
-        <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()">查询</button>
+        <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()"  acl  [acl-ability]="['SUPPLY-INDEX-bulkSearch']">查询</button>
         <button nz-button nzType="primary" [disabled]="service.http.loading">导入</button>
         <button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
         <button nz-button nzType="link" (click)="expandToggle()">
@@ -44,8 +44,8 @@
 </nz-card>
 <ng-template #extraTemplate>
   <div>
-    <button (click)="audit('', 2)" nz-button nzType="primary">批量审核</button>
-    <button (click)="releaseGoods()" nz-button nzType="primary">代发货源</button>
+    <button (click)="audit('', 2)" nz-button nzType="primary"  acl  [acl-ability]="['SUPPLY-INDEX-bulkBatchAudit']">批量审核</button>
+    <button (click)="releaseGoods()" nz-button nzType="primary"  acl  [acl-ability]="['SUPPLY-INDEX-bulkUndertakesToSupply']">代发货源</button>
   </div>
 </ng-template>
 <nz-card>
diff --git a/src/app/routes/supply-management/components/bulk/bulk.component.ts b/src/app/routes/supply-management/components/bulk/bulk.component.ts
index 9377a818..f64e2a74 100644
--- a/src/app/routes/supply-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/supply-management/components/bulk/bulk.component.ts
@@ -303,9 +303,10 @@ export class SupplyManagementBulkComponent implements OnInit {
           {
             text: '货源审核',
             click: (_record) => this.audit(_record, 1),
-            iif: item => item.auditStatus === '1'
+            iif: item => item.auditStatus === '1',
+            acl: { ability: ['SUPPLY-INDEX-bulkBatchAudit'] },
           },
-          {
+          { 
             text: '二维码　',
             click: (_record) => this.assignedQrcode(_record),
             iif: item => item.resourceStatus == 1,
@@ -314,15 +315,18 @@ export class SupplyManagementBulkComponent implements OnInit {
             text: '修改单价',
             click: (_record) => this.modification(_record),
             iif: item => item.resourceStatus == 1 ,
+            acl: { ability: ['SUPPLY-INDEX-modificationUnitPrice'] },
           },
           {
             text: '取消货源',
             click: (_record) => this.delOne(_record),
             iif: item => item.resourceStatus == 1,
+            acl: { ability: ['SUPPLY-INDEX-bulkCancelSupply'] },
           },
           {
             text: '再下一单',
             click: (_record) => this.nextOrder(_record),
+            acl: { ability: ['SUPPLY-INDEX-bulkPlaceOrder'] },
           },
         ],
       },
diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html
index ef8707a1..7de4a2a1 100644
--- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html
+++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html
@@ -354,11 +354,11 @@
   <div class="align-center">
     <button nz-button nzType="primary" *ngIf="this.PageStatus == '整车修改'" (click)="goBack()">取消</button>
     <button *ngIf="this.PageStatus == '整车修改'" nz-button nzType="primary" style="margin-left: 48px" (click)="submitConfirm()"
-      >提交修改</button
+    acl  [acl-ability]="['SUPPLY-VEHICLE-AMEND-submitChange']">提交修改</button
     >
-    <button nz-button nzType="primary" *ngIf="this.PageStatus == '整车下一单'" (click)="submitConfirm('assign')">指派熟车</button>
+    <button nz-button nzType="primary" *ngIf="this.PageStatus == '整车下一单'" (click)="submitConfirm('assign')" acl  [acl-ability]="['SUPPLY-BULK-PLACEORDER-vehicleDesignate']">指派熟车</button>
     <button *ngIf="this.PageStatus == '整车下一单'" nz-button nzType="primary" style="margin-left: 48px" (click)="submitConfirm()"
-      >司机抢单</button
+    acl  [acl-ability]="['SUPPLY-BULK-PLACEORDER-vehicleAnotherOrder']">司机抢单</button
     >
   </div>
 </nz-card>
diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.html b/src/app/routes/supply-management/components/release-publish/release-publish.component.html
index 49e823ef..7218b087 100644
--- a/src/app/routes/supply-management/components/release-publish/release-publish.component.html
+++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.html
@@ -364,7 +364,7 @@
 </nz-card>
 <nz-card>
   <div class="align-center">
-    <button nz-button nzType="primary" (click)="submitConfirm('assign')">指派熟车</button>
-    <button nz-button nzType="primary" style="margin-left: 48px" (click)="submitConfirm('publish')" *ngIf="type === 'add'">司机抢单</button>
+    <button nz-button nzType="primary" (click)="submitConfirm('assign')"  acl  [acl-ability]="['SUPPLY-VEHICLE-RELEASE-bulkDesignate']">指派熟车</button>
+    <button nz-button nzType="primary" style="margin-left: 48px" (click)="submitConfirm('publish')" *ngIf="type === 'add'"  acl  [acl-ability]="['SUPPLY-VEHICLE-RELEASE-bulkDriverOrder']">司机抢单</button>
   </div>
 </nz-card>
diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html
index 51da4b8d..f03c553c 100644
--- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html
+++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html
@@ -13,11 +13,11 @@
       <div nz-row>
         <div nz-col nzSpan="14" class="text-grey-darker">网络货运人：{{i?.enterpriseInfoName}}</div>
         <div nz-col nzSpan="10">
-          <button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus  === '1'">取消货源</button>
+          <button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus  === '1'"  acl  [acl-ability]="['SUPPLY-VEHICLE-DETAIL-cancelSupply']">取消货源</button>
           <button nz-button (click)="assignedCar(i)"
-            *ngIf="i?.resourceStatus  === '1' && i?.serviceType === '2'">重新指派</button>
-          <button nz-button (click)="updateGoodsSource(i)" *ngIf="i?.resourceStatus === '1'">修改货源</button>
-          <button nz-button nzType="primary" nzGhost (click)="nextOrder(i)">再下一单</button>
+            *ngIf="i?.resourceStatus  === '1' && i?.serviceType === '2'"  acl  [acl-ability]="['SUPPLY-VEHICLE-DETAIL-vehicleAnew']">重新指派</button>
+          <button nz-button (click)="updateGoodsSource(i)" *ngIf="i?.resourceStatus === '1'"  acl  [acl-ability]="['SUPPLY-VEHICLE-DETAIL-changeSupply']">修改货源</button>
+          <button nz-button nzType="primary" nzGhost (click)="nextOrder(i)" acl  [acl-ability]="['SUPPLY-VEHICLE-DETAIL-vehiclePlaceOrder']">再下一单</button>
         </div>
       </div>
       <div class="mt-sm mb-sm" nz-row>
diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.html b/src/app/routes/supply-management/components/vehicle/vehicle.component.html
index 882bda81..c88527bd 100644
--- a/src/app/routes/supply-management/components/vehicle/vehicle.component.html
+++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.html
@@ -22,7 +22,7 @@
       ></sf>
     </div>
     <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand" class="text-right">
-      <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()">查询</button>
+      <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()"  acl  [acl-ability]="['SUPPLY-INDEX-vehicleSearch']">查询</button>
       <button nz-button nzType="primary" [disabled]="service.http.loading">导出</button>
       <button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
       <button nz-button nzType="link" (click)="expandToggle()">
@@ -95,9 +95,9 @@
 </nz-card>
 <ng-template #extraTemplate>
   <div>
-    <button (click)="audit('', 2)" nz-button nzType="primary">批量审核</button>
-    <button (click)="releaseGoods()" nz-button nzType="primary">代发货源</button>
-    <button (click)="importGoodsSource()" nz-button nzType="primary">导入货源</button>
+    <button (click)="audit('', 2)" nz-button nzType="primary"  acl  [acl-ability]="['SUPPLY-INDEX-vehicleBatchAudit']">批量审核</button>
+    <button (click)="releaseGoods()" nz-button nzType="primary"  acl  [acl-ability]="['SUPPLY-INDEX-vehicleUndertakesToSupply']">代发货源</button>
+    <button (click)="importGoodsSource()" nz-button nzType="primary" >导入货源</button>
   </div>
 </ng-template>
 
diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
index aa65cee2..5a5c87c0 100644
--- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
@@ -573,12 +573,14 @@ export class SupplyManagementVehicleComponent implements OnInit {
           {
             text: '货源审核',
             click: _record => this.audit(_record, 1),
-            iif: item => item.auditStatus === '1'
+            iif: item => item.auditStatus === '1',
+            acl: { ability: ['SUPPLY-INDEX-vehicleBatchAudit'] },
           },
           {
             text: '修改货源',
             click: _record => this.amend(_record),
-            iif: item => item.resourceStatus === '1'
+            iif: item => item.resourceStatus === '1',
+            acl: { ability: ['SUPPLY-INDEX-vehicleModificationSupply'] },
           },
           // {
           //   text: '修改运费',
@@ -588,16 +590,19 @@ export class SupplyManagementVehicleComponent implements OnInit {
           {
             text: '取消货源',
             click: _record => this.cancleGoodsSource(_record),
-            iif: item => item.resourceStatus === '1'
+            iif: item => item.resourceStatus === '1',
+            acl: { ability: ['SUPPLY-INDEX-vehicleCancelSupply'] },
           },
           {
             text: '再下一单',
-            click: _record => this.nextOrder(_record)
+            click: _record => this.nextOrder(_record),
+            acl: { ability: ['SUPPLY-INDEX-vehiclePlaceOrder'] },
           },
           {
             text: '重新指派　',
             click: _record => this.assignedCar(_record),
-            iif: item => item.resourceStatus === '1' && item.serviceType === '2'
+            iif: item => item.resourceStatus === '1' && item.serviceType === '2',
+            acl: { ability: ['SUPPLY-INDEX-vehicleReassign'] },
           }
         ]
       }
diff --git a/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts b/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts
index cdce501a..c38311ea 100644
--- a/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts
+++ b/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts
@@ -86,7 +86,7 @@ export class UserCenterComponentsDriverConfigComponent implements OnInit {
 
   settingAction(item?: any) {
     this.modal.create({
-      nzTitle: '基础设置',
+      nzTitle: '配置',
       nzContent: DynamicSettingModalComponent,
       nzWidth: 900,
       nzComponentParams: {