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-05-05 13:31:36 +08:00
parent 0aa73e4170 58e16934e9
commit 7221365583
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/routes/sys-setting/components/organization-management/api-auth-modal/api-auth-modal.component.html
View File

@ -1,12 +1,8 @@
<nz-card [nzLoading]="loadingInfo" [nzBordered]="false"> <nz-card [nzLoading]="loadingInfo" [nzBordered]="false">
<se-container se-container="1"> <app-menu-tree #menu (changeData)="getData($event)" [appId]="params.appId"
<se label="接口权限" required [labelWidth]="120"> [isAuthorityIdDTOList]="roleInfoData.authority || []"
<app-menu-tree #menu (changeData)="getData($event)" [appId]="params.appId" [authorityAssistId]="roleInfoData.authorityAssistId || []">
[isAuthorityIdDTOList]="roleInfoData.authority || []" </app-menu-tree>
[authorityAssistId]="roleInfoData.authorityAssistId || []">
</app-menu-tree>
</se>
</se-container>
</nz-card> </nz-card>
<div class="modal-footer"> <div class="modal-footer">

4
src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.ts
View File

@ -152,9 +152,7 @@ export class ETCInvoicedListComponent implements OnInit {
{ title: '订单号', index: 'billCode', width: 200 }, { title: '订单号', index: 'billCode', width: 200 },
{ {
title: '开票状态', title: '开票状态',
index: 'invoicingStatus', index: 'invoicingStatusLabel',
type: 'enum',
enum: { '0': '待开票', '1': '开票中', '2': '已开票', '3': '开票失败' },
width: 120 width: 120
}, },
{ title: '订单类型', index: 'billTypeLabel', width: 120 }, { title: '订单类型', index: 'billTypeLabel', width: 120 },