diff --git a/src/app/routes/contract-management/components/index/index.component.ts b/src/app/routes/contract-management/components/index/index.component.ts
index 4c42914d..b9005e8a 100644
--- a/src/app/routes/contract-management/components/index/index.component.ts
+++ b/src/app/routes/contract-management/components/index/index.component.ts
@@ -26,7 +26,6 @@ export class ContractManagementIndexComponent implements OnInit {
const acls = acl.data.abilities || [];
this.isShowDetail = !!acls.find(acl => acl === 'CONTRACT-INDEX-searchDetail');
this.isShowFrame = !!acls.find(acl => acl === 'CONTRACT-INDEX-listFrame');
- console.log(this.isShowFrame);
}
diff --git a/src/app/routes/order-management/components/bulk/bulk.component.ts b/src/app/routes/order-management/components/bulk/bulk.component.ts
index b29ce305..0a2bb7df 100644
--- a/src/app/routes/order-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/order-management/components/bulk/bulk.component.ts
@@ -555,8 +555,8 @@ export class OrderManagementBulkComponent extends BasicTableComponent implements
},{
text: '订单上报推送',
click: _record => this.orderReportPush(_record),
- iif: item => item.overallPaymentStatus === '2' && (item.billStatus === '4' || item.billStatus === '5')
- // acl: { ability: ['VEHICLE-LIST-view'] },
+ iif: item => item.overallPaymentStatus === '2' && (item.billStatus === '4' || item.billStatus === '5'),
+ acl: { ability: ['ORDER-BULK-push'] },
}
]
}
diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
index 19b0ddd9..7411341a 100644
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
@@ -473,8 +473,8 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme
{
text: '订单上报推送',
click: _record => this.orderReportPush(_record),
- iif: item => item.overallPaymentStatus === '2' && (item.billStatus === '4' || item.billStatus === '5')
- // acl: { ability: ['VEHICLE-LIST-view'] },
+ iif: item => item.overallPaymentStatus === '2' && (item.billStatus === '4' || item.billStatus === '5'),
+ acl: { ability: ['ORDER-VEHICLE-push'] },
}
]
}
diff --git a/src/app/routes/supply-management/components/index/index.component.html b/src/app/routes/supply-management/components/index/index.component.html
index ebe89624..8849d48c 100644
--- a/src/app/routes/supply-management/components/index/index.component.html
+++ b/src/app/routes/supply-management/components/index/index.component.html
@@ -25,10 +25,10 @@
diff --git a/src/app/routes/supply-management/components/index/index.component.ts b/src/app/routes/supply-management/components/index/index.component.ts
index 17b7b0c7..bb48dc54 100644
--- a/src/app/routes/supply-management/components/index/index.component.ts
+++ b/src/app/routes/supply-management/components/index/index.component.ts
@@ -1,5 +1,6 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { STColumn, STComponent } from '@delon/abc/st';
+import { ACLService } from '@delon/acl';
import { SFSchema } from '@delon/form';
import { ModalHelper, _HttpClient } from '@delon/theme';
import { SearchDrawerService } from '@shared';
@@ -12,7 +13,14 @@ import { BasicTableComponent } from 'src/app/routes/commom';
})
export class SupplyManagementIndexComponent implements OnInit {
selectedIndex = 0;
+ isShowVehicle = false;
+ isShowBulk = false;
+ constructor(private http: _HttpClient, private modal: ModalHelper, private acl: ACLService) {
+ const acls = acl.data.abilities || [];
+ this.isShowVehicle = !!acls.find(acl => acl === 'SUPPLY-INDEX-vehicleSearch');
+ this.isShowBulk = !!acls.find(acl => acl === 'SUPPLY-INDEX-bulkSearch');
+ }
ngOnInit(): void {}
}
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 bcb7cb4a..4d122788 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
@@ -113,14 +113,16 @@
{{ i?.carrierInformationVO?.driverLicensePlate }}
-
- {{i?.carrierInformationVO.driverName || '--'}} / {{i?.carrierInformationVO.driverTelephone || '--'}} /
- {{i?.carrierInformationVO.driverLicensePlate || '--'}}
-
-
- {{i?.driverCarModelLabel || '--'}} / {{(i?.driverCarLength || '--') +'米'}} / {{(i?.driverCarWeight ||
- '--')+'吨'}}
-
+
+
+ {{i?.carrierInformationVO.driverName || '--'}} / {{i?.carrierInformationVO.driverTelephone || '--'}} /
+ {{i?.carrierInformationVO.driverLicensePlate || '--'}}
+
+
+ {{i?.driverCarModelLabel || '--'}} / {{(i?.driverCarLength || '--') +'米'}} / {{(i?.driverCarWeight ||
+ '--')+'吨'}}
+
+
装货卸货信息
(
@@ -258,4 +260,4 @@
-
+
\ No newline at end of file
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 c3eb4ba2..73eb6dd2 100644
--- a/src/app/routes/supply-management/supply-management-routing.module.ts
+++ b/src/app/routes/supply-management/supply-management-routing.module.ts
@@ -21,11 +21,46 @@ import { SupplyManagementReleasePublishComponent } from './components/release-pu
import { SupplyManagementVehicleDetailComponent } from './components/vehicle-detail/vehicle-detail.component';
const routes: Routes = [
- { path: 'index', component: SupplyManagementIndexComponent },
- { path: 'index/bulk-detail/:id', component: SupplyManagementBulkDetailComponent },
- { path: 'index/vehicle-detail/:id', component: SupplyManagementVehicleDetailComponent },
+ {
+ path: 'index',
+ component: SupplyManagementIndexComponent,
+ data: { guard: { ability: ['SUPPLY-INDEX-vehicleSearch', 'SUPPLY-INDEX-bulkSearch'] } }
+ },
+ {
+ path: 'index/bulk-detail/:id',
+ component: SupplyManagementBulkDetailComponent,
+ data: {
+ guard: { ability: ['SUPPLY-BULK-DETAIL-cancelSupply', 'SUPPLY-BULK-DETAIL-updatePrice', 'SUPPLY-BULK-DETAIL-bulkAnotherOrder'] }
+ }
+ },
+ {
+ path: 'index/vehicle-detail/:id',
+ component: SupplyManagementVehicleDetailComponent,
+ data: {
+ guard: {
+ ability: [
+ 'SUPPLY-VEHICLE-DETAIL-cancelSupply',
+ 'SUPPLY-VEHICLE-DETAIL-changeSupply',
+ 'SUPPLY-VEHICLE-DETAIL-vehiclePlaceOrder',
+ 'SUPPLY-VEHICLE-DETAIL-vehicleAnew'
+ ]
+ }
+ }
+ },
{ path: 'add-drivers', component: SupplyManagementAddDriversComponent },
- { path: 'vehicle-amend/:id', component: SupplyManagementOnecarPublishComponent },
+ {
+ path: 'vehicle-amend/:id',
+ component: SupplyManagementOnecarPublishComponent,
+ data: {
+ guard: {
+ ability: [
+ 'SUPPLY-VEHICLE-PLACEORDER-QRCode',
+ 'SUPPLY-VEHICLE-PLACEORDER-vehicleDesignate',
+ 'SUPPLY-VEHICLE-PLACEORDER-vehicleAnotherOrder'
+ ]
+ }
+ }
+ },
{ path: 'vehicle-release', component: SupplyManagementReleasePublishComponent },
{ path: 'bulk-release', component: SupplyManagementBulkReleasePublishComponent },
{ path: 'bulk-amend/:id', component: SupplyManagementBulkPublishComponent }
diff --git a/src/app/shared/index.ts b/src/app/shared/index.ts
index 68efd6c7..a4df14f5 100644
--- a/src/app/shared/index.ts
+++ b/src/app/shared/index.ts
@@ -22,7 +22,7 @@ export * from './components/dynamic-setting';
export * from './components/singlepage-setting';
export * from './components/insurance-table/index';
export * from './components/rebate-table/index';
-export * from './components/search-drawer';
+export * from './components/search-drawer/index';
// Utils
export * from './utils';
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 1662aafc..50040d13 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -39,8 +39,9 @@ import { PipeModule } from './pipes';
import { AccountDetailComponent } from './components/account-detail/account-detail.component';
import { CaptchaModule } from './components/captcha';
import { rebateTableModule } from './components/rebate-table';
-import { SearchDrawerComponent } from './components/search-drawer/search-drawer.component';
-import { SearchDrawerModule } from './components/search-drawer/search-drawer.module';
+import { SearchDrawerModule } from './components/search-drawer';
+// import { SearchDrawerComponent } from './components/search-drawer/search-drawer.component';
+
const MODULES = [
AddressModule,