From 3188d0805f38ab8b34f4998e2fa2c6a376749ae8 Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Thu, 28 Apr 2022 15:00:43 +0800
Subject: [PATCH] edit

---
 .../financial-managemen-routing.module.ts     |  4 +-
 .../onecar-publish.component.html             |  4 +-
 .../supply-management-routing.module.ts       | 46 ++++++++++++-------
 3 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/src/app/routes/financial-management/financial-managemen-routing.module.ts b/src/app/routes/financial-management/financial-managemen-routing.module.ts
index ba87c4ec..43fcbaca 100644
--- a/src/app/routes/financial-management/financial-managemen-routing.module.ts
+++ b/src/app/routes/financial-management/financial-managemen-routing.module.ts
@@ -66,8 +66,8 @@ const routes: Routes = [
   { path: 'receipt-order/detail/:id', component: ReceiptOrderDetailComponent },
   { path: 'advance-collection', component: AdvanceCollectionComponent },
   { path: 'advance-collection/detail/:id', component: AdvanceCollectionDetailComponent },
-  { path: 'receivable-order', component: ReceivableOrderComponent },
-  { path: 'receivable-order/detail/:id', component: ReceivableOrderDetailComponent },
+  { path: 'receivable-order', component: ReceivableOrderComponent, data: { guard: { ability: ['FINANCIAL-RECEIVABLE-list'] } }  },
+  { path: 'receivable-order/detail/:id', component: ReceivableOrderDetailComponent, data: { guard: { ability: ['FINANCIAL-RECEIVABLE-DETAIL-view'] } }  },
   { path: 'payable-order', component: PayableOrderComponent },
   { path: 'payable-order/detail/:id', component: PayableOrderDetailComponent },
   { path: 'bank-card-management/index', component: CwcBankCardManagementIndexComponent }
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 3c489ffb..73a34d9a 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
@@ -260,9 +260,9 @@
     <button *ngIf="this.PageStatus == '整车修改'" nz-button nzType="primary" style="margin-left: 48px"
       (click)="submitConfirm()" acl [acl-ability]="['SUPPLY-VEHICLE-AMEND-submitChange']">提交修改</button>
     <button nz-button nzType="primary" *ngIf="this.PageStatus == '整车下一单'" (click)="submitConfirm('assign')" acl
-      [acl-ability]="['SUPPLY-BULK-PLACEORDER-vehicleDesignate']">指派熟车</button>
+      [acl-ability]="['SUPPLY-VEHICLE-PLACEORDER-vehicleDesignate']">指派熟车</button>
     <button *ngIf="this.PageStatus == '整车下一单'" nz-button nzType="primary" style="margin-left: 48px"
       (click)="submitConfirm('publish')" acl
-      [acl-ability]="['SUPPLY-BULK-PLACEORDER-vehicleAnotherOrder']">司机抢单</button>
+      [acl-ability]="['SUPPLY-VEHICLE-PLACEORDER-vehicleAnotherOrder']">司机抢单</button>
   </div>
 </nz-card>
diff --git a/src/app/routes/supply-management/supply-management-routing.module.ts b/src/app/routes/supply-management/supply-management-routing.module.ts
index 10425568..29f59068 100644
--- a/src/app/routes/supply-management/supply-management-routing.module.ts
+++ b/src/app/routes/supply-management/supply-management-routing.module.ts
@@ -51,6 +51,15 @@ const routes: Routes = [
   {
     path: 'vehicle-amend/:id',
     component: SupplyManagementOnecarPublishComponent,
+    data: {
+      guard: {
+        ability: ['SUPPLY-VEHICLE-AMEND-submitChange']
+      }
+    }
+  },
+  {
+    path: 'vehicle-next/:id',
+    component: SupplyManagementOnecarPublishComponent,
     data: {
       guard: {
         ability: [
@@ -58,25 +67,30 @@ const routes: Routes = [
           'SUPPLY-VEHICLE-PLACEORDER-vehicleDesignate',
           'SUPPLY-VEHICLE-PLACEORDER-vehicleAnotherOrder'
         ]
-  }
-  }
+      }
+    }
   },
   {
-    path: 'vehicle-next/:id',
-    component: SupplyManagementOnecarPublishComponent,
-    // data: {
-    //   guard: {
-    //     ability: [
-    //       'SUPPLY-VEHICLE-PLACEORDER-QRCode',
-    //       'SUPPLY-VEHICLE-PLACEORDER-vehicleDesignate',
-    //       'SUPPLY-VEHICLE-PLACEORDER-vehicleAnotherOrder'
-    //     ]
-    //   }
-    // }
+    path: 'vehicle-release',
+    component: SupplyManagementReleasePublishComponent,
+    data: {
+      guard: { ability: ['SUPPLY-VEHICLE-RELEASE-bulkDesignate', 'SUPPLY-VEHICLE-RELEASE-bulkDriverOrder'] }
+    }
+  },
+  {
+    path: 'bulk-release',
+    component: SupplyManagementBulkReleasePublishComponent,
+    data: {
+      guard: { ability: ['SUPPLY-BULK-RELEASE-consignBulkAssign', 'SUPPLY-BULK-RELEASE-consignBulk'] }
+    }
+  },
+  {
+    path: 'bulk-next/:id',
+    component: SupplyManagementBulkPublishComponent,
+    data: {
+      guard: { ability: ['SUPPLY-BULK-PLACEORDER-vehicleAnotherOrder', 'SUPPLY-BULK-PLACEORDER-vehicleDesignate'] }
+    }
   },
-  { path: 'vehicle-release', component: SupplyManagementReleasePublishComponent },
-  { path: 'bulk-release', component: SupplyManagementBulkReleasePublishComponent },
-  { path: 'bulk-next/:id', component: SupplyManagementBulkPublishComponent },
   { path: 'bulk-amend/:id', component: SupplyManagementBulkPublishComponent }
 ];