解决冲突
This commit is contained in:
@ -4,7 +4,7 @@
|
|||||||
* @Author : Shiming
|
* @Author : Shiming
|
||||||
* @Date : 2022-01-12 10:52:50
|
* @Date : 2022-01-12 10:52:50
|
||||||
* @LastEditors : Shiming
|
* @LastEditors : Shiming
|
||||||
* @LastEditTime : 2022-02-11 10:30:16
|
* @LastEditTime : 2022-02-25 11:18:30
|
||||||
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\vehicle\\vehicle.component.html
|
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\vehicle\\vehicle.component.html
|
||||||
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||||
-->
|
-->
|
||||||
@ -65,6 +65,7 @@
|
|||||||
[columns]="columns"
|
[columns]="columns"
|
||||||
[req]="{ params: reqParams }"
|
[req]="{ params: reqParams }"
|
||||||
[res]="{ process: afterRes }"
|
[res]="{ process: afterRes }"
|
||||||
|
[page]="{ }"
|
||||||
[loading]="service.http.loading"
|
[loading]="service.http.loading"
|
||||||
[scroll]="{ x: '1200px', y: '500px' }"
|
[scroll]="{ x: '1200px', y: '500px' }"
|
||||||
>
|
>
|
||||||
|
|||||||
@ -65,9 +65,10 @@ export class SupplyManagementVehicleComponent implements OnInit {
|
|||||||
afterRes = (data: any[], rawData?: any) => {
|
afterRes = (data: any[], rawData?: any) => {
|
||||||
return data.map(item => ({
|
return data.map(item => ({
|
||||||
...item,
|
...item,
|
||||||
disabled: item.auditStatus !== '1'
|
disabled: item.auditStatus !== '1',
|
||||||
}));
|
}));
|
||||||
};
|
};
|
||||||
|
|
||||||
get selectedRows() {
|
get selectedRows() {
|
||||||
return this.st?.list.filter(item => item.checked) || [];
|
return this.st?.list.filter(item => item.checked) || [];
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user