From 128e785a41f0c05eef3c94e5391200ad2b3786b7 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Tue, 28 Dec 2021 20:55:49 +0800 Subject: [PATCH] edit --- .../driver-account-detail.component.html | 17 +++--- .../driver-account-detail.component.ts | 54 ++++++++++++++++--- .../driver-account.component.html | 2 +- .../driver-account.component.ts | 37 ++++++++----- .../freight-account-detail.component.html | 11 ++-- .../freight-account-detail.component.ts | 40 ++++++++++---- .../freight-account.component.ts | 6 ++- .../services/freight-account.service.ts | 6 ++- .../user-logs/user-logs.component.ts | 2 - 9 files changed, 128 insertions(+), 47 deletions(-) diff --git a/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.html b/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.html index 44214d69..3d044272 100644 --- a/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.html +++ b/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.html @@ -9,21 +9,24 @@ - + - - + - + @@ -50,9 +53,9 @@ - + [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '300px' }" (change)="stChange($event)"> \ No newline at end of file diff --git a/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts b/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts index 7b005830..a85e6f86 100644 --- a/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts +++ b/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', - mode: 'range', - format: 'yyyy-MM-dd' + widget: 'sl-from-to-search', + format: 'yyyy-MM-dd', + placeholder: '请选择', + nzShowTime: true } as SFDateWidgetSchema }, orderSn2: { 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 d2633c6d..0252bdb6 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,4 +1,4 @@ - + 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 e012daa0..45bc7f8f 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 @@ -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', - mode: 'range', + widget: 'sl-from-to-search', 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: 'description' }, - { title: '手机号', index: 'description' }, - { title: '网络货运人', index: 'ltdid' }, - { title: '银行类型', index: 'description', type: 'enum', enum: { 1: '平安银行', 2: '浦发银行' } }, + { title: '司机姓名', index: 'name' }, + { title: '证件号码', index: 'idNo' }, + { title: '手机号', index: 'phone' }, + { title: '网络货运人', index: 'ltdName' }, + { 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 + } + }) } ] } diff --git a/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.html b/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.html index 4997335b..b5393930 100644 --- a/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.html +++ b/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.html @@ -14,7 +14,7 @@ - @@ -39,7 +39,8 @@ [button]="'none'">
- +