From 4d5f329c62cd41ed42b55c78af7f3fa691042ec2 Mon Sep 17 00:00:00 2001 From: weiyu Date: Thu, 28 Apr 2022 14:01:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../routes/order-management/components/bulk/bulk.component.ts | 4 ++-- .../order-management/components/vehicle/vehicle.component.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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'] }, } ] } From 9c8ed295eb72f7340cfb6355c3fcbe935cbac950 Mon Sep 17 00:00:00 2001 From: weiyu Date: Thu, 28 Apr 2022 14:35:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/shared/index.ts | 2 +- src/app/shared/shared.module.ts | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) 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,