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

Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

Browse Source
This commit is contained in:
wangshiming
2022-04-29 10:00:18 +08:00
parent 86a10c1757 8a16513dca
commit 3386780692
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/routes/financial-management/financial-managemen-routing.module.ts
View File

@ -64,8 +64,12 @@ const routes: Routes = [
{ path: 'voucher-summary/detail/:id', component: SummaryDetailComponent }, { path: 'voucher-summary/detail/:id', component: SummaryDetailComponent },
{ path: 'voucher-summary/list/:id', component: VoucherListComponent }, { path: 'voucher-summary/list/:id', component: VoucherListComponent },
{ path: 'voucher-summary/list/detail/:id', component: VoucherDetailComponent }, { path: 'voucher-summary/list/detail/:id', component: VoucherDetailComponent },
{ path: 'cost-management', component: CostManagementComponent }, { path: 'cost-management', component: CostManagementComponent, data: { guard: { ability: ['FINANCIAL-COST-list'] } } },
{ path: 'cost-management/detail/:id', component: CostManagementDetailComponent }, {
path: 'cost-management/detail/:id',
component: CostManagementDetailComponent,
data: { guard: { ability: ['FINANCIAL-COST-DETAIL-view'] } }
},
{ path: 'cost-management/expenses-receivable/:id', component: ExpensesReceivableComponent }, { path: 'cost-management/expenses-receivable/:id', component: ExpensesReceivableComponent },
{ path: 'cost-management/expenses-payable/:id', component: ExpensesPayableComponent }, { path: 'cost-management/expenses-payable/:id', component: ExpensesPayableComponent },
{ path: 'abnormal-gold', component: AbnormalGoldComponent }, { path: 'abnormal-gold', component: AbnormalGoldComponent },

1
src/app/shared/components/search-drawer/search-drawer.component.ts
View File

@ -21,6 +21,7 @@ export class SearchDrawerComponent implements OnInit, AfterViewInit {
ngAfterViewInit(): void {} ngAfterViewInit(): void {}
ngOnInit(): void { ngOnInit(): void {
this.defaultValue = {};
this.service.createEvent.subscribe(({ defaultValue, newSchema, newUI }) => { this.service.createEvent.subscribe(({ defaultValue, newSchema, newUI }) => {
if (defaultValue) { if (defaultValue) {
this.defaultValue = defaultValue; this.defaultValue = defaultValue;