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 17:59:15 +08:00
parent 1dbaae5277 0d0f5b3596
commit b9125e3972
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/routes/financial-management/components/payable-order/payable-order.component.html
View File

@ -51,6 +51,6 @@
</div> </div>
</div> </div>
<st #st [data]="service.$api_get_fico_ph_page" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}" <st #st [data]="service.$api_get_fico_ph_page" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}"
[loading]="false" [scroll]="{ x:'1200px' }" (change)="stChange($event)"> [loading]="false" [scroll]="{ x:'1200px',y:scrollY }" (change)="stChange($event)">
</st> </st>
</nz-card> </nz-card>

1
src/app/routes/financial-management/components/payable-order/payable-order.component.ts
View File

@ -23,7 +23,6 @@ export class PayableOrderComponent extends BasicTableComponent implements OnInit
info: any = {}; info: any = {};
constructor( constructor(
public service: FreightAccountService, public service: FreightAccountService,
private nzModalService: NzModalService,
private router: Router, private router: Router,
public searchDrawerService: SearchDrawerService public searchDrawerService: SearchDrawerService
) { ) {

2
src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html
View File

@ -117,7 +117,7 @@
<ng-template #extraTemplate> <ng-template #extraTemplate>
<div> <div>
<button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()" acl <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()" acl
[acl-ability]="['ORDER-RECEIPTS-search']">查询</button> [acl-ability]="['ORDER-RECEIPTS-search']">筛选</button>
<button nz-button nzDanger [disabled]="false" (click)="exprot()" acl [acl-ability]="['ORDER-RECEIPTS-export']">导出</button> <button nz-button nzDanger [disabled]="false" (click)="exprot()" acl [acl-ability]="['ORDER-RECEIPTS-export']">导出</button>
<button nz-button nz-dropdown [nzDropdownMenu]="menu" nzPlacement="bottomLeft"> <button nz-button nz-dropdown [nzDropdownMenu]="menu" nzPlacement="bottomLeft">
更多<i nz-icon nzType="down" nzTheme="outline"></i></button> 更多<i nz-icon nzType="down" nzTheme="outline"></i></button>

8
src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.ts
View File

@ -288,7 +288,13 @@ export class ETCBlacklistComponent implements OnInit {
className: 'text-center', className: 'text-center',
buttons: [ buttons: [
{ {
text: '删除', text: '删除', iif: () => this.tabType === 1,
acl: { ability: ['TICKET-ETC-BLACK_LIST-deleteFreight'] },
click: item => this.deleteAction(item)
},
{
text: '删除', iif: () => this.tabType === 2,
acl: { ability: ['TICKET-ETC-BLACK_LIST-deleteCart'] },
click: item => this.deleteAction(item) click: item => this.deleteAction(item)
} }
] ]