edit

src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.html

@@ -9,21 +9,24 @@
 <nz-card>
     <nz-row [nzGutter]="16">
         <nz-col [nzXl]="9" [nzLg]="8" [nzSm]="12">
-            <nz-statistic nzValue="天津怡亚通物流科技有限公司（平安）" [nzTitle]="'张三（13812345678'"
+            <nz-statistic [nzValue]="params?.ltdName+'('+(params?.bankType===1?'平安':'浦发')+')'"
-                [nzValueStyle]="{'font-size':'16px','font-weight':'bold'}" class="bold">
+                [nzTitle]="params.name+'('+params.phone+')'" [nzValueStyle]="{'font-size':'16px','font-weight':'bold'}"
+                class="bold">
             </nz-statistic>
         </nz-col>
         <nz-col [nzXl]="5" [nzLg]="8" [nzSm]="12">
-            <nz-statistic nzValue="100,000,000.00 元" [nzTitle]="'账户余额'"
+            <nz-statistic [nzValue]="(params?.availableBalance || 0)+'元' " [nzTitle]="'账户余额'"
                 [nzValueStyle]="{'font-size':'16px',color:'red'}">
             </nz-statistic>
         </nz-col>
         <nz-col [nzXl]="5" [nzLg]="8" [nzSm]="12">
-            <nz-statistic nzValue="100,000.00 元" [nzTitle]="'收入金额'" [nzValueStyle]="{'font-size':'16px',color:'red'}">
+            <nz-statistic [nzValue]="(info?.incomeAmount || 0) +'元'" [nzTitle]="'收入金额'"
+                [nzValueStyle]="{'font-size':'16px',color:'red'}">
             </nz-statistic>
         </nz-col>
         <nz-col [nzXl]="5" [nzLg]="8" [nzSm]="12">
-            <nz-statistic nzValue="100,000.00 元" [nzTitle]="'支出金额'" [nzValueStyle]="{'font-size':'16px',color:'red'}">
+            <nz-statistic [nzValue]="(info?.payAmount || 0) +'元'" [nzTitle]="'支出金额'"
+                [nzValueStyle]="{'font-size':'16px',color:'red'}">
             </nz-statistic>
         </nz-col>
     </nz-row>
@@ -50,9 +53,9 @@
 </nz-card>
 
 <nz-card class="content-box" nzBordered>
-    <st #st [data]="service.$mock_url" [columns]="columns"
+    <st #st [data]="service.$api_get_shipper_or_driver_account_detail" [columns]="columns"
         [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
         [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
         [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
-        [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '300px' }"></st>
+        [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '300px' }" (change)="stChange($event)"></st>
 </nz-card>

src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
-import { Router } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st';
 import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form';
 import { NzModalService } from 'ng-zorro-antd/modal';
@@ -19,17 +19,58 @@ export class DriverAccountDetailComponent implements OnInit {
   searchSchema: SFSchema = this.initSF();
 
   _$expand = false;
-  constructor(public service: FreightAccountService) {}
 
-  ngOnInit(): void {}
+  info: any = {};
+  params: any = {};
+  constructor(public service: FreightAccountService, private route: ActivatedRoute) {
+    this.params = route.snapshot.queryParams;
+  }
+
+  ngOnInit(): void {
+    this.loadInfo();
+  }
 
   beforeReq = (requestOptions: STRequestOptions) => {
+    Object.assign(requestOptions.body, {
+      ltdid: this.params.ltdid,
+      projectId: this.params.projectId,
+      enterpriseId: this.params.enterpriseId,
+      roleId: this.params.roleId
+    });
     if (this.sf) {
       Object.assign(requestOptions.body, { ...this.sf.value });
     }
     return requestOptions;
   };
 
+  loadInfo() {
+    console.log(1);
+    
+    this.service
+      .request(this.service.$api_get_driver_account_balance_detail, {
+        ...this.sf?.value,
+        ltdid: this.params.ltdid,
+        projectId: this.params.projectId,
+        enterpriseId: this.params.enterpriseId,
+        roleId: this.params.roleId,
+        pageIndex: this.st.pi,
+        pageSize: this.st.ps,
+        createTime: {
+          start: this.sf?.value?.createTime?.[0] || null,
+          end: this.sf?.value?.createTime?.[1] || null
+        }
+      })
+      .subscribe(res => {
+        if (res) {
+          this.info = res;
+        }
+      });
+  }
+
+  stChange(e: STChange): void {
+    console.log(e);
+  }
+
   exportList() {
     this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageIndex: this.st.pi, pageSize: this.st.ps });
   }
@@ -67,9 +108,10 @@ export class DriverAccountDetailComponent implements OnInit {
           title: '交易时间',
           type: 'string',
           ui: {
-            widget: 'date',
+            widget: 'sl-from-to-search',
-            mode: 'range',
+            format: 'yyyy-MM-dd',
-            format: 'yyyy-MM-dd'
+            placeholder: '请选择',
+            nzShowTime: true
           } as SFDateWidgetSchema
         },
         orderSn2: {

src/app/routes/financial-management/components/driver-account/driver-account.component.html

@@ -1,4 +1,4 @@
-<page-header-wrapper title="货主账户">
+<page-header-wrapper title="司机账户">
 </page-header-wrapper>
 
 <nz-card class="search-box">

src/app/routes/financial-management/components/driver-account/driver-account.component.ts

@@ -61,17 +61,17 @@ export class DriverAccountComponent implements OnInit {
             hidden: true
           }
         },
-        tenantName: {
+        name: {
           type: 'string',
           title: '司机姓名',
           ui: { placeholder: '请输入' }
         },
-        phone: {
+        idNo: {
           type: 'string',
           title: '证件号码',
           ui: { placeholder: '请输入' }
         },
-        page: {
+        phone: {
           type: 'string',
           title: '手机号',
           ui: {
@@ -126,9 +126,9 @@ export class DriverAccountComponent implements OnInit {
           title: '创建时间',
           type: 'string',
           ui: {
-            widget: 'date',
+            widget: 'sl-from-to-search',
-            mode: 'range',
             format: 'yyyy-MM-dd',
+            placeholder: '请选择',
             visibleIf: {
               expand: (value: boolean) => value
             }
@@ -140,15 +140,15 @@ export class DriverAccountComponent implements OnInit {
 
   private initST(): STColumn[] {
     return [
-      { title: '司机姓名', index: 'tenantName' },
+      { title: '司机姓名', index: 'name' },
-      { title: '证件号码', index: 'description' },
+      { title: '证件号码', index: 'idNo' },
-      { title: '手机号', index: 'description' },
+      { title: '手机号', index: 'phone' },
-      { title: '网络货运人', index: 'ltdid' },
+      { title: '网络货运人', index: 'ltdName' },
-      { title: '银行类型', index: 'description', type: 'enum', enum: { 1: '平安银行', 2: '浦发银行' } },
+      { title: '银行类型', index: 'bankType', type: 'enum', enum: { 1: '平安银行', 2: '浦发银行' } },
       { title: '虚拟账户', index: 'virtualAccount' },
       { title: '可用余额', index: 'availableBalance' },
       { title: '冻结余额', index: 'freezeBalance' },
-      { title: '本月累计提现金额', index: 'description', width: 150 },
+      { title: '本月累计提现金额', index: 'withdrawBalance', width: 150 },
       { title: '账户总余额', index: 'availableBalance' },
       { title: '创建时间', index: 'createTime', type: 'date', width: 150 },
       {
@@ -156,7 +156,20 @@ export class DriverAccountComponent implements OnInit {
         buttons: [
           {
             text: '查看明细',
-            click: item => this.router.navigate(['/financial-management/driver-account/detail/1'])
+            click: item =>
+              this.router.navigate(['/financial-management/driver-account/detail/' + item.id], {
+                queryParams: {
+                  name: item.name,
+                  phone: item.phone,
+                  ltdName: item.ltdName,
+                  bankType: item.bankType,
+                  projectId: item.projectId,
+                  availableBalance: item.availableBalance,
+                  enterpriseId: item.enterpriseId,
+                  roleId: item.roleId,
+                  ltdid: item.ltdid
+                }
+              })
           }
         ]
       }

src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.html

@@ -14,7 +14,7 @@
             </nz-statistic>
         </nz-col>
         <nz-col [nzXl]="5" [nzLg]="8" [nzSm]="12">
-            <nz-statistic nzValue="100,000,000.00 元" [nzTitle]="'账户余额'"
+            <nz-statistic [nzValue]="params?.availableBalance+'元' " [nzTitle]="'账户余额'"
                 [nzValueStyle]="{'font-size':'16px',color:'red'}">
             </nz-statistic>
         </nz-col>
@@ -39,7 +39,8 @@
                 [button]="'none'"></sf>
         </div>
         <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
-            <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
+            <button nz-button nzType="primary" [nzLoading]="service.http.loading"
+                (click)="st?.load(1);loadInfo();">查询</button>
             <button nz-button (click)="resetSF()">重置</button>
             <button nz-button (click)="exportList()"> 导出</button>
             <button nz-button nzType="link" (click)="expandToggle()">
@@ -51,9 +52,9 @@
 </nz-card>
 
 <nz-card class="content-box" nzBordered>
-    <st #st [data]="service.$api_get_shipper_account_detail" [columns]="columns"
+    <st #st [data]="service.$api_get_shipper_or_driver_account_detail" [columns]="columns"
         [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' },  process: beforeReq }"
-        [res]="{ reName: { list: 'data.records', total: 'data.total' } ,  process: afterReq }"
+        [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
         [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
-        [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '300px' }"></st>
+        [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '300px' }" (change)="stChange($event)"></st>
 </nz-card>

src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts

@@ -19,7 +19,6 @@ export class FreightAccountDetailComponent implements OnInit {
   searchSchema: SFSchema = this.initSF();
 
   info: any = {};
-
   params: any = {};
 
   _$expand = false;
@@ -27,12 +26,15 @@ export class FreightAccountDetailComponent implements OnInit {
     this.params = route.snapshot.queryParams;
   }
 
-  ngOnInit(): void {}
+  ngOnInit(): void {
+    this.loadInfo();
+  }
 
   beforeReq = (requestOptions: STRequestOptions) => {
     Object.assign(requestOptions.body, {
       ltdid: this.params.ltdid,
       projectId: this.params.projectId,
+      enterpriseId: this.params.enterpriseId,
       roleId: this.params.roleId
     });
     if (this.sf) {
@@ -41,15 +43,31 @@ export class FreightAccountDetailComponent implements OnInit {
     return requestOptions;
   };
 
-  afterReq = (data: any[], rawData?: any) => {
+  loadInfo() {
-    if (rawData?.success) {
+    this.service
-      this.info = {
+      .request(this.service.$api_get_shipper_account_balance_detail, {
-        incomeAmount: rawData.data.rawData,
+        ...this.sf.value,
-        payAmount: rawData.data.payAmount
+        ltdid: this.params.ltdid,
-      };
+        projectId: this.params.projectId,
-    }
+        enterpriseId: this.params.enterpriseId,
-    return data;
+        roleId: this.params.roleId,
-  };
+        pageIndex: this.st.pi,
+        pageSize: this.st.ps,
+        createTime: {
+          start: this.sf.value.createTime?.[0] || null,
+          end: this.sf.value.createTime?.[1] || null
+        }
+      })
+      .subscribe(res => {
+        if (res) {
+          this.info = res;
+        }
+      });
+  }
+
+  stChange(e: STChange): void {
+    console.log(e);
+  }
 
   exportList() {
     this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageIndex: this.st.pi, pageSize: this.st.ps });

src/app/routes/financial-management/components/freight-account/freight-account.component.ts

@@ -126,9 +126,9 @@ export class FreightAccountComponent implements OnInit {
           title: '创建时间',
           type: 'string',
           ui: {
-            widget: 'date',
+            widget: 'sl-from-to-search',
-            mode: 'range',
             format: 'yyyy-MM-dd',
+            placeholder: '请选择',
             visibleIf: {
               expand: (value: boolean) => value
             }
@@ -168,7 +168,9 @@ export class FreightAccountComponent implements OnInit {
                   tenantName: item.tenantName,
                   ltdName: item.ltdName,
                   bankType: item.bankType,
+                  availableBalance: item.availableBalance,
                   projectId: item.projectId,
+                  enterpriseId: item.enterpriseId,
                   roleId: item.roleId,
                   ltdid: item.ltdid
                 }

src/app/routes/financial-management/services/freight-account.service.ts

@@ -13,7 +13,11 @@ export class FreightAccountService extends ShipperBaseService {
   $api_get_driver_account_page = '/api/fcc/accountBalance/getDriverAccountBalanceByOperator';
 
   // 运营端获取货主账户明细信息
-  $api_get_shipper_account_detail = '/api/fcc/accountBalance/getShipperAccountBalanceDetailByOperator';
+  $api_get_shipper_or_driver_account_detail = '/api/fcc/accountBalance/getShipperAccountBalanceDetailByOperator';
+  // 运营端端获取货主交易收入与支出金额
+  $api_get_shipper_account_balance_detail = '/api/fcc/accountBalanceDetail/getAccountBalanceShipperIncomeDetailByOperator';
+  // 运营端端获取司机交易收入与支出金额
+  $api_get_driver_account_balance_detail = '/api/fcc/accountBalanceDetail/getAccountBalanceDriverIncomeDetailByOperator';
 
   // 货主端获取账户余额交易明细
   $api_get_balance_by_shipper = '/api/fcc/accountBalanceDetail/getAccountBalanceByShipperPage';

src/app/routes/sys-setting/components/user-logs/user-logs.component.ts

@@ -14,8 +14,6 @@ export class UserLogsComponent implements OnInit {
   @ViewChild('sf', { static: false })
   sf!: SFComponent;
 
-  url = `/rule?_allow_anonymous=true`;
-
   searchSchema: SFSchema = {
     properties: {
       expand: {