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:
Taric Xin
2022-05-16 17:30:30 +08:00
parent bc03feb450 c803a9743f
commit 50b2c60987
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
proxy.conf.js
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-01-18 09:51:21 * @Date : 2022-01-18 09:51:21
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-05-13 14:44:24 * @LastEditTime : 2022-05-16 17:27:31
* @FilePath : \\tms-obc-web\\proxy.conf.js * @FilePath : \\tms-obc-web\\proxy.conf.js
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
*/ */

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

@ -41,8 +41,8 @@ export class ETCInvoicedListComponent extends BasicTableComponent implements OnI
afterRes = (data: any[], rawData?: any) => { afterRes = (data: any[], rawData?: any) => {
return data.map(item => ({ return data.map(item => ({
...item, ...item,
disabled: item.invoicingStatus !== '1' || item.invoicingStatus !== '9' disabled: item.invoicingStatus !== '1' && item.invoicingStatus !== '9'
})); }));
}; };
get selectedRows() { get selectedRows() {
return this.st?.list.filter(item => item.checked) || []; return this.st?.list.filter(item => item.checked) || [];