解决冲突

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-25 11:18:30
+ * @LastEditTime : 2022-02-25 15:22:22
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\vehicle\\vehicle.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -25,14 +25,14 @@
       <button
         nz-button
         nzType="primary"
-        [nzLoading]="service.http.loading"
+        [nzLoading]="loading"
         (click)="search()"
         acl
         [acl-ability]="['SUPPLY-INDEX-vehicleSearch']"
         >查询</button
       >
-      <button nz-button nzType="primary" [disabled]="service.http.loading">导出</button>
-      <button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
+      <button nz-button nzType="primary" [nzLoading]="loading">导出</button>
+      <button nz-button [nzLoading]="loading" (click)="resetSF()">重置</button>
       <button nz-button nzType="link" (click)="expandToggle()">
         {{ !_$expand ? '展开' : '收起' }}
         <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
@@ -59,14 +59,16 @@
       >
       </nz-alert>
     </div>
+    <!-- [req]="{ params: reqParams }" -->
+
     <st
       #st
       [data]="service.$api_get_wholePage_list"
       [columns]="columns"
-      [req]="{ params: reqParams }"
+      [req]="{  process: beforeReq }"
       [res]="{ process: afterRes }"
       [page]="{ }"
-      [loading]="service.http.loading"
+      [loading]="loading"
       [scroll]="{ x: '1200px', y: '500px' }"
     >
       <ng-template st-row="resourceCode" let-item let-index="index">