解决冲突

src/app/routes/supply-management/components/vehicle/vehicle.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-12 10:52:50
  * @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
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -65,6 +65,7 @@
       [columns]="columns"
       [req]="{ params: reqParams }"
       [res]="{ process: afterRes }"
+      [page]="{ }"
       [loading]="service.http.loading"
       [scroll]="{ x: '1200px', y: '500px' }"
     >

src/app/routes/supply-management/components/vehicle/vehicle.component.ts

@@ -65,9 +65,10 @@ export class SupplyManagementVehicleComponent implements OnInit {
   afterRes = (data: any[], rawData?: any) => {
     return data.map(item => ({
       ...item,
-      disabled: item.auditStatus !== '1'
+      disabled: item.auditStatus !== '1',
     }));
   };
+  
   get selectedRows() {
     return this.st?.list.filter(item => item.checked) || [];
   }