edit

2021-12-22 21:00:37 +08:00
parent 51326de661
commit 716bbea97c
8 changed files with 209 additions and 163 deletions
--- a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts
+++ b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts
@ -159,14 +159,25 @@ export class RechargeRecordComponent implements OnInit {
    return [
      { title: '充值时间', index: 'updatedAt', type: 'date' },
      { title: '充值单号', index: 'callNo' },
-      { title: '账户主体', index: 'callNo' },
+      { title: '网络货运人', index: 'callNo' },
+      { title: '银行类型', index: 'callNo' },
+      { title: '账户类型', index: 'callNo' },
      { title: '账户名称', index: 'callNo' },
      { title: '虚拟账户', index: 'callNo' },
-      { title: '账户类型', index: 'callNo' },
      { title: '充值金额', index: 'callNo' },
+      { title: '充值银行账户', index: 'callNo',format: item=> `中国招商银行</br>6238293829388888` },
      { title: '充值方式', index: 'callNo' },
      { title: '充值状态', index: 'callNo' },
-      { title: '银行流水号', index: 'callNo' }
+      { title: '银行流水号', index: 'callNo' },
+      {
+        title: '操作',
+        buttons: [
+          {
+            text: '查看回单',
+            // click: item => this.router.navigate(['/financial-management/freight-account/detail/1'])
+          }
+        ]
+      }
    ];
  }
 }
--- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html
+++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html
@ -9,39 +9,45 @@
 <nz-card>
    <nz-alert nzType="info" nzMessage="提现信息" class="mb-md"></nz-alert>
    <div se-container [labelWidth]="100">
-        <se label="账户主体">
+        <se label="网络货运人">
            天津怡亚通物流科技有限公司
        </se>
+        <se label="银行类型">
+            平安银行
+        </se>
        <se label="提现单号">
            EA202110012313
        </se>
-        <se label="提现状态">
-            已完成
+        <se label="账户名称">
+            茅台集团
        </se>
        <se label="提现时间">
            2021-10-11 08:50:08
        </se>
-        <se label="账户名称">
-            茅台集团
-        </se>
        <se label="虚拟账户">
            6202110111234
        </se>
+        <se label="提现状态">
+            已完成
+        </se>
        <se label="提现金额">
            10000.00
        </se>
-        <se label="提现手续费">
+        <se label="银行流水号">
            10.00
        </se>
+        <se label="提现至银行卡">
+            P20181230123012385756
+        </se>
        <se label="提现至银行卡">
            招商银行(8889)
        </se>
-        <se label="银行流水号">
-            P20181230123012385756
+        <se label="银行回" col="1">
+            <img src="" alt="" style="width: 200px;height: 160px;">
        </se>
    </div>

-    <nz-alert nzType="info" nzMessage="提现进度" class="mb-md"></nz-alert>
+    <nz-alert nzType="info" nzMessage="提现进度" class="mb-md mt-md"></nz-alert>
    <div nz-row class="mt-xl">
        <div nz-col nzSpan="12" nzOffset="1">
            <app-logistics-time-line></app-logistics-time-line>
--- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.html
+++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.html
@ -1,7 +1,7 @@
 <page-header-wrapper [title]="'提现记录'">
 </page-header-wrapper>

-<nz-card>
+<!-- <nz-card>
    <nz-row [nzGutter]="16">
        <nz-col [nzXl]="6" [nzLg]="6" [nzSm]="12">
            <nz-statistic nzValue="100 笔" [nzTitle]="'待审核订单数'" [nzValueStyle]="{'font-size':'21px'}">
@ -20,7 +20,7 @@
            </nz-statistic>
        </nz-col>
    </nz-row>
-</nz-card>
+</nz-card> -->

 <nz-card class="search-box" nzBordered>
    <div nz-row nzGutter="8">
@ -29,7 +29,8 @@
                [ui]="{ '*': { spanLabelFixed: 90,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="text-right">
+        <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> 导出</button>
@ -42,25 +43,30 @@
 </nz-card>

 <nz-card class="content-box" nzBordered>
-    <nz-tabset>
+    <nz-tabset [nzTabBarExtraContent]="extraTemplate">
        <nz-tab nzTitle="全部"></nz-tab>
        <nz-tab nzTitle="待审核"></nz-tab>
-        <nz-tab nzTitle="已完成"></nz-tab>
+        <nz-tab nzTitle="处理中"></nz-tab>
+        <nz-tab nzTitle="提现成功"></nz-tab>
+        <nz-tab nzTitle="提现失败"></nz-tab>
        <nz-tab nzTitle="已拒绝"></nz-tab>
    </nz-tabset>

-    <div class="d-flex align-items-center mb-md">
-        <button nz-button (click)="this.auditAction(null)">审核</button>
-        <div class="ml-md">
-            已选择
-            <strong class="text-primary">{{ selectedRows.length }}</strong> 条数据&nbsp;&nbsp; 累计提现 <strong>{{
-                totalCallNo }}</strong>
-            <a *ngIf="totalCallNo > 0" (click)="st.clearCheck()" class="ml-lg">清空</a>
+    <ng-template #extraTemplate>
+        <div class="d-flex align-items-center ">
+            <div class="mr-md">
+                已选择
+                <strong class="text-red">{{ selectedRows.length }}</strong> 条数据&nbsp;&nbsp; 累计提现 <strong
+                    class="text-red">{{
+                    totalCallNo }}</strong>
+                <a *ngIf="totalCallNo > 0" (click)="st.clearCheck()" class="ml-lg">清空</a>
+            </div>
+            <button nz-button (click)="this.auditAction(null)">审核</button>
        </div>
-    </div>
+    </ng-template>

-    <st #st [data]="url" [columns]="columns"
-        [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+    <st #st [data]="service.$mock_url" [columns]="columns"
+        [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams, 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: '370px' }" (change)="stChange($event)"></st>
--- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.less
+++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.less
@ -20,3 +20,18 @@
        padding-right: 16px;
    }
 }
+
+.expend-options {
+    margin-top: 0px;
+}
+
+
+@media (min-width: 1200px) {
+    .expend-options {
+        max-width: 400px;
+        position : absolute;
+        right    : 0;
+        bottom   : 25px;
+    }
+
+}
--- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts
+++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts
@ -1,9 +1,10 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { Router } from '@angular/router';
-import { STComponent, STColumn, STChange } from '@delon/abc/st';
+import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st';
 import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { TicketService } from 'src/app/routes/ticket-management/services/system.service';
+import { FreightAccountService } from '../../services/freight-account.service';

@Component({
  selector: 'app-withdrawals-record',
@ -11,131 +12,14 @@ import { TicketService } from 'src/app/routes/ticket-management/services/system.
  styleUrls: ['./withdrawals-record.component.less']
 })
 export class WithdrawalsRecordComponent implements OnInit {
-  url = `/rule?_allow_anonymous=true`;
  @ViewChild('st', { static: true })
  st!: STComponent;
  @ViewChild('sf', { static: false })
  sf!: SFComponent;
  @ViewChild('auditModal', { static: false })
  auditModal!: any;
-  columns: STColumn[] = [
-    { title: '', index: 'key', type: 'checkbox' },
-    { title: '提现时间', index: 'no' },
-    { title: '提现单号', index: 'callNo' },
-    { title: '账户主体', index: 'callNo' },
-    { title: '账户名称', index: 'callNo' },
-    { title: '虚拟账户', index: 'callNo' },
-    { title: '账户类型', index: 'callNo' },
-    { title: '提现金额', index: 'callNo' },
-    { title: '提现手续费', index: 'callNo' },
-    { title: '银行账户', index: 'callNo' },
-    { title: '提现状态', index: 'callNo' },
-    {
-      title: '操作',
-      buttons: [
-        {
-          text: '审核',
-          click: item => this.auditAction(item)
-        },
-        {
-          text: '详情',
-          click: item => this.routeTo(item)
-        }
-      ]
-    }
-  ];
-  searchSchema: SFSchema = {
-    properties: {
-      expand: {
-        type: 'boolean',
-        ui: {
-          hidden: true
-        }
-      },
-      orderSn: {
-        type: 'string',
-        title: '提现单号',
-        ui: {
-          autocomplete: 'off'
-        }
-      },
-      receiveName: {
-        type: 'string',
-        title: '提现状态',
-        enum: [
-          { label: '全部', value: '全部' },
-          { label: '待审核', value: '待审核' },
-          { label: '处理中', value: '处理中' },
-          { label: '已完成', value: '已完成' },
-          { label: '已拒绝', value: '已拒绝' }
-        ],
-        ui: {
-          widget: 'select',
-          placeholder: '请选择',
-          change: (i: any) => {
-            this.sf.value.receiveName = i;
-            this.sf?.setValue('/receiveName', i);
-          }
-        }
-      },
-      createTime: {
-        title: '提现时间',
-        type: 'string',
-        ui: {
-          widget: 'date',
-          mode: 'range',
-          format: 'yyyy-MM-dd'
-        } as SFDateWidgetSchema
-      },
-      orderSn2: {
-        type: 'string',
-        title: '账户名称',
-        ui: {
-          placeholder: '请输入',
-          autocomplete: 'off',
-          visibleIf: {
-            expand: (value: boolean) => value
-          }
-        }
-      },
-      receiveName2: {
-        type: 'string',
-        title: '账户类型',
-        enum: [
-          { label: '全部', value: '全部' },
-          { label: '个人', value: '个人' },
-          { label: '企业', value: '企业' }
-        ],
-        ui: {
-          widget: 'select',
-          placeholder: '请选择',
-          change: (i: any) => {
-            this.sf.value.receiveName2 = i;
-            this.sf?.setValue('/receiveName2', i);
-          },
-          visibleIf: {
-            expand: (value: boolean) => value
-          }
-        }
-      },
-      receiveName3: {
-        type: 'string',
-        title: '账户主体',
-        enum: [{ label: '全部', value: '全部' }],
-        ui: {
-          widget: 'select',
-          placeholder: '请选择',
-          change: (i: any) => {
-            this.sf.value.receiveName3 = i;
-            this.sf?.setValue('/receiveName3', i);
-          },
-          visibleIf: {
-            expand: (value: boolean) => value
-          }
-        }
-      }
-    }
-  };
+  columns: STColumn[] = this.initST();
+  searchSchema: SFSchema = this.initSF();

  reqParams = {};

@ -143,19 +27,23 @@ export class WithdrawalsRecordComponent implements OnInit {

  selectedRows: any[] = [];
  totalCallNo = 0;
-  constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) {}
+  constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) {}

  ngOnInit(): void {}

+  beforeReq = (requestOptions: STRequestOptions) => {
+    if (this.sf) {
+      this.reqParams = { ...this.sf.value };
+    }
+    return requestOptions;
+  };
+
  stChange(e: STChange): void {
    switch (e.type) {
      case 'checkbox':
        this.selectedRows = e.checkbox!;
        this.totalCallNo = this.selectedRows.reduce((total, cv) => total + cv.callNo, 0);
        break;
-      case 'filter':
-        this.st.load();
-        break;
    }
  }

@ -163,10 +51,6 @@ export class WithdrawalsRecordComponent implements OnInit {

  add(): void {}

-  routeTo(item: any) {
-    this.router.navigate(['/financial-management/withdrawals-detail/1']);
-  }
-
  auditAction(item: any) {
    const modal = this.nzModalService.create({
      nzTitle: '审核',
@ -224,4 +108,131 @@ export class WithdrawalsRecordComponent implements OnInit {
    this._$expand = !this._$expand;
    this.sf?.setValue('/expand', this._$expand);
  }
+
+  private initSF(): SFSchema {
+    return {
+      properties: {
+        expand: {
+          type: 'boolean',
+          ui: {
+            hidden: true
+          }
+        },
+        orderSn: {
+          type: 'string',
+          title: '提现单号',
+          ui: {
+            placeholder: '请输入'
+          }
+        },
+        receiveName: {
+          type: 'string',
+          title: '提现状态',
+          enum: [
+            { label: '全部', value: '全部' },
+            { label: '待审核', value: '待审核' },
+            { label: '处理中', value: '处理中' },
+            { label: '已完成', value: '已完成' },
+            { label: '已拒绝', value: '已拒绝' }
+          ],
+          ui: {
+            widget: 'select',
+            placeholder: '请选择'
+          }
+        },
+        createTime: {
+          title: '提现时间',
+          type: 'string',
+          ui: {
+            widget: 'date',
+            mode: 'range',
+            format: 'yyyy-MM-dd'
+          } as SFDateWidgetSchema
+        },
+        orderSn2: {
+          type: 'string',
+          title: '账户名称',
+          ui: {
+            placeholder: '请输入',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        receiveName2: {
+          type: 'string',
+          title: '账户类型',
+          enum: [
+            { label: '全部', value: '全部' },
+            { label: '货主账户', value: '货主账户' },
+            { label: '司机账户', value: '司机账户' }
+          ],
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        receiveName3: {
+          type: 'string',
+          title: '网络货运人',
+          enum: [{ label: '全部', value: '全部' }],
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        orderSn23: {
+          type: 'string',
+          title: '银行类型',
+          ui: {
+            placeholder: '请输入',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        }
+      }
+    };
+  }
+
+  private initST(): STColumn[] {
+    return [
+      { title: '', index: 'key', type: 'checkbox' },
+      { title: '提现时间', index: 'no' },
+      { title: '提现单号', index: 'callNo' },
+      { title: '网络货运人', index: 'callNo' },
+      { title: '银行类型', index: 'callNo' },
+      { title: '账户类型', index: 'callNo' },
+      { title: '账户名称', index: 'callNo' },
+      { title: '虚拟账户', index: 'callNo' },
+      { title: '提现金额', index: 'callNo' },
+      { title: '提现银行账户', index: 'callNo' },
+      { title: '提现状态', index: 'callNo' },
+      { title: '银行流水号', index: 'callNo' },
+      { title: '失败原因', index: 'callNo' },
+      {
+        title: '操作',
+        buttons: [
+          {
+            text: '审核',
+            click: item => this.auditAction(item)
+          },
+          {
+            text: '查看回单'
+            // click: item => this.auditAction(item)
+          },
+          {
+            text: '详情',
+            click: item => this.router.navigate(['/financial-management/withdrawals-record/detail/1'])
+          }
+        ]
+      }
+    ];
+  }
 }
--- a/src/app/routes/financial-management/financial-managemen-routing.module.ts
+++ b/src/app/routes/financial-management/financial-managemen-routing.module.ts
@ -2,7 +2,6 @@ import { FreightAccountComponent } from './components/freight-account/freight-ac
 import { DriverAccountComponent } from './components/driver-account/driver-account.component';
 import { RechargeRecordComponent } from './components/recharge-record/recharge-record.component';
 import { WithdrawalsRecordComponent } from './components/withdrawals-record/withdrawals-record.component';
-import { MainAccountComponent } from './components/main-account/main-account.component';
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 import { FreightAccountDetailComponent } from './components/freight-account/freight-account-detail/freight-account-detail.component';
@ -16,8 +15,7 @@ const routes: Routes = [
  { path: 'driver-account/detail/:id', component: DriverAccountDetailComponent },
  { path: 'recharge-record', component: RechargeRecordComponent },
  { path: 'withdrawals-record', component: WithdrawalsRecordComponent },
-  { path: 'withdrawals/detail/:id', component: WithdrawalsDetailComponent },
-  { path: 'main-account', component: MainAccountComponent }
+  { path: 'withdrawals-record/detail/:id', component: WithdrawalsDetailComponent },
 ];

@NgModule({
--- a/src/app/routes/financial-management/financial-management.module.ts
+++ b/src/app/routes/financial-management/financial-management.module.ts
@ -4,7 +4,6 @@ import { FreightAccountComponent } from './components/freight-account/freight-ac
 import { DriverAccountComponent } from './components/driver-account/driver-account.component';
 import { RechargeRecordComponent } from './components/recharge-record/recharge-record.component';
 import { WithdrawalsRecordComponent } from './components/withdrawals-record/withdrawals-record.component';
-import { MainAccountComponent } from './components/main-account/main-account.component';
 import { SharedModule } from '@shared';
 import { FinancialManagementRoutingModule } from './financial-managemen-routing.module';
 import { FreightAccountDetailComponent } from './components/freight-account/freight-account-detail/freight-account-detail.component';
@ -17,7 +16,6 @@ const ROUTESCOMPONENTS = [
  DriverAccountComponent,
  RechargeRecordComponent,
  WithdrawalsRecordComponent,
-  MainAccountComponent,
  WithdrawalsDetailComponent
 ];

--- a/src/assets/mocks/menu-data.json
+++ b/src/assets/mocks/menu-data.json
@ -278,8 +278,9 @@
                "link": "/financial-management/withdrawals-record"
              },
              {
-                "text": "账户主体",
-                "link": "/financial-management/main-account"
+                "text": "提现详情",
+                "hide": true,
+                "link": "/financial-management/withdrawals-record/detail/:id"
              }
            ]
          },