Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'weiyu' into develop

Browse Source
This commit is contained in:
weiyu
2022-04-28 14:36:57 +08:00
parent ab77085d2a 9c8ed295eb
commit d03583c865
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/routes/order-management/components/bulk/bulk.component.ts
View File

@ -555,8 +555,8 @@ export class OrderManagementBulkComponent extends BasicTableComponent implements
},{ },{
text: '订单上报推送', text: '订单上报推送',
click: _record => this.orderReportPush(_record), click: _record => this.orderReportPush(_record),
iif: item => item.overallPaymentStatus === '2' && (item.billStatus === '4' || item.billStatus === '5') iif: item => item.overallPaymentStatus === '2' && (item.billStatus === '4' || item.billStatus === '5'),
// acl: { ability: ['VEHICLE-LIST-view'] }, acl: { ability: ['ORDER-BULK-push'] },
} }
] ]
} }

4
src/app/routes/order-management/components/vehicle/vehicle.component.ts
View File

@ -473,8 +473,8 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme
{ {
text: '订单上报推送', text: '订单上报推送',
click: _record => this.orderReportPush(_record), click: _record => this.orderReportPush(_record),
iif: item => item.overallPaymentStatus === '2' && (item.billStatus === '4' || item.billStatus === '5') iif: item => item.overallPaymentStatus === '2' && (item.billStatus === '4' || item.billStatus === '5'),
// acl: { ability: ['VEHICLE-LIST-view'] }, acl: { ability: ['ORDER-VEHICLE-push'] },
} }
] ]
} }

2
src/app/shared/index.ts
View File

@ -22,7 +22,7 @@ export * from './components/dynamic-setting';
export * from './components/singlepage-setting'; export * from './components/singlepage-setting';
export * from './components/insurance-table/index'; export * from './components/insurance-table/index';
export * from './components/rebate-table/index'; export * from './components/rebate-table/index';
export * from './components/search-drawer'; export * from './components/search-drawer/index';
// Utils // Utils
export * from './utils'; export * from './utils';

5
src/app/shared/shared.module.ts
View File

@ -39,8 +39,9 @@ import { PipeModule } from './pipes';
import { AccountDetailComponent } from './components/account-detail/account-detail.component'; import { AccountDetailComponent } from './components/account-detail/account-detail.component';
import { CaptchaModule } from './components/captcha'; import { CaptchaModule } from './components/captcha';
import { rebateTableModule } from './components/rebate-table'; import { rebateTableModule } from './components/rebate-table';
import { SearchDrawerComponent } from './components/search-drawer/search-drawer.component'; import { SearchDrawerModule } from './components/search-drawer';
import { SearchDrawerModule } from './components/search-drawer/search-drawer.module'; // import { SearchDrawerComponent } from './components/search-drawer/search-drawer.component';
const MODULES = [ const MODULES = [
AddressModule, AddressModule,