From 43eb54205db46a440140630b3c78e1c0902a392a Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Fri, 8 Apr 2022 17:06:33 +0800
Subject: [PATCH] fix bug

---
 .../driver-account.component.html             | 63 +++++++++++--------
 .../driver-account.component.ts               | 11 +++-
 2 files changed, 46 insertions(+), 28 deletions(-)

diff --git a/src/app/routes/financial-management/components/driver-account/driver-account.component.html b/src/app/routes/financial-management/components/driver-account/driver-account.component.html
index 9fe32a52..325369c1 100644
--- a/src/app/routes/financial-management/components/driver-account/driver-account.component.html
+++ b/src/app/routes/financial-management/components/driver-account/driver-account.component.html
@@ -1,32 +1,43 @@
-<page-header-wrapper title="司机账户">
-</page-header-wrapper>
+<page-header-wrapper title="司机账户"> </page-header-wrapper>
 
 <nz-card class="search-box">
-    <div nz-row nzGutter="8">
-        <div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
-            <sf #sf [schema]="searchSchema"
-                [ui]="{ '*': { spanLabelFixed: 110,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}" [compact]="true"
-                [button]="'none'"></sf>
-        </div>
-        <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand"
-            class="text-right">
-            <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
-            <button nz-button (click)="resetSF()">重置</button>
-            <button nz-button (click)="exportList()"> 导出</button>
-            <button nz-button nzType="link" (click)="expandToggle()">
-                {{ !_$expand ? '展开' : '收起' }}
-                <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
-            </button>
-        </div>
+  <div nz-row nzGutter="8">
+    <div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
+      <sf
+        #sf
+        [schema]="searchSchema"
+        [ui]="{ '*': { spanLabelFixed: 110, grid: { lg: 8, md: 12, sm: 12, xs: 24 } } }"
+        [compact]="true"
+        [button]="'none'"
+      ></sf>
     </div>
+    <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand" class="text-right">
+      <button nz-button nzType="primary" [nzLoading]="loading" (click)="st?.load(1)">查询</button>
+      <button nz-button [disabled]="loading" (click)="resetSF()">重置</button>
+      <button nz-button [disabled]="loading" (click)="exportList()"> 导出</button>
+      <button nz-button nzType="link" (click)="expandToggle()">
+        {{ !_$expand ? '展开' : '收起' }}
+        <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
+      </button>
+    </div>
+  </div>
 </nz-card>
 
 <nz-card class="content-box">
-    <st #st [data]="service.$api_get_driver_account_page" [columns]="columns" [req]="{  process: beforeReq }" [page]="{}"
-        [loading]="false" [scroll]="{ x: '1200px' }">
-        <ng-template st-row="availableBalance" let-item let-index="index">
-            <a (click)="showAccountDetail(item)">{{ (parseFloat(item.availableBalance) +
-                parseFloat(item.freezeBalance)).toFixed(2) | currency}}</a>
-        </ng-template>
-    </st>
-</nz-card>
\ No newline at end of file
+  <st
+    #st
+    [data]="service.$api_get_driver_account_page"
+    [columns]="columns"
+    [req]="{ process: beforeReq }"
+    [res]="{ reName: { list: 'data.records', total: 'data.total' } , process: afterRes}"
+    [page]="{}"
+    [loading]="false"
+    [scroll]="{ x: '1200px' }"
+  >
+    <ng-template st-row="availableBalance" let-item let-index="index">
+      <a (click)="showAccountDetail(item)">{{
+        (parseFloat(item.availableBalance) + parseFloat(item.freezeBalance)).toFixed(2) | currency
+      }}</a>
+    </ng-template>
+  </st>
+</nz-card>
diff --git a/src/app/routes/financial-management/components/driver-account/driver-account.component.ts b/src/app/routes/financial-management/components/driver-account/driver-account.component.ts
index 09830820..99daad10 100644
--- a/src/app/routes/financial-management/components/driver-account/driver-account.component.ts
+++ b/src/app/routes/financial-management/components/driver-account/driver-account.component.ts
@@ -18,7 +18,7 @@ export class DriverAccountComponent implements OnInit {
   st!: STComponent;
   @ViewChild('sf', { static: false })
   sf!: SFComponent;
-
+  loading: boolean = true;
   searchSchema: SFSchema = this.initSF();
   columns: STColumn[] = this.initST();
   _$expand = false;
@@ -40,9 +40,16 @@ export class DriverAccountComponent implements OnInit {
         });
       }
     }
+    this.loading = true;
     return requestOptions;
   };
-
+  afterRes = (data: any[], rawData?: any) => {
+    console.log(data)
+    this.loading = false
+    return data.map(item => ({
+      ...item,
+    }));
+  };
   showAccountDetail(item: any) {
     this.modal.create({
       nzTitle: '账户明细',