Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

This commit is contained in:
wangshiming
2021-12-23 14:44:26 +08:00
23 changed files with 900 additions and 789 deletions

View File

@ -9,20 +9,21 @@
<nz-card>
<nz-row [nzGutter]="16">
<nz-col [nzXl]="9" [nzLg]="8" [nzSm]="12">
<nz-statistic nzValue="证件号码49040012345678903" [nzTitle]="'张三13812345678'"
[nzValueStyle]="{'font-size':'21px'}">
<nz-statistic nzValue="天津怡亚通物流科技有限公司(平安)" [nzTitle]="'张三13812345678'"
[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]="'账户余额'" [nzValueStyle]="{'font-size':'21px'}">
<nz-statistic nzValue="100,000,000.00 元" [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':'21px'}">
<nz-statistic nzValue="100,000.00 元" [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':'21px'}">
<nz-statistic nzValue="100,000.00 元" [nzTitle]="'支出金额'" [nzValueStyle]="{'font-size':'16px',color:'red'}">
</nz-statistic>
</nz-col>
</nz-row>
@ -39,7 +40,7 @@
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>
<button nz-button (click)="exportList()"> 导出</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
@ -49,9 +50,9 @@
</nz-card>
<nz-card class="content-box" nzBordered>
<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: '300px' }" (change)="stChange($event)"></st>
[loading]="service.http.loading" [scroll]="{ x:'1200px',y: '300px' }"></st>
</nz-card>

View File

@ -14,6 +14,14 @@
nz-range-picker {
width: 100%;
}
.bold {
.ant-statistic-title {
font-weight: 600;
color : #000;
font-size : 16px;
}
}
}
.expend-options {
@ -26,7 +34,7 @@
max-width : 400px;
position : absolute;
right : 0;
bottom : 30px;
bottom : 25px;
}
}

View File

@ -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-driver-account-detail',
@ -16,130 +17,24 @@ export class DriverAccountDetailComponent implements OnInit {
st!: STComponent;
@ViewChild('sf', { static: false })
sf!: SFComponent;
columns: STColumn[] = [
{ 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' }
];
searchSchema: SFSchema = {
properties: {
expand: {
type: 'boolean',
ui: {
hidden: true
}
},
createTime: {
title: '交易时间',
type: 'string',
ui: {
widget: 'date',
mode: 'range',
format: 'yyyy-MM-dd',
visibleIf: {
expand: (value: boolean) => value
}
} as SFDateWidgetSchema
},
orderSn2: {
type: 'string',
title: '流水号',
ui: {
placeholder: '请输入',
autocomplete: 'off'
}
},
orderSn3: {
type: 'string',
title: '订单号',
ui: {
placeholder: '请输入',
autocomplete: 'off'
}
},
receiveName: {
type: 'string',
title: '交易类型',
enum: [
{ label: '全部', value: '' },
{ 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);
},
visibleIf: {
expand: (value: boolean) => value
}
},
default: ''
},
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
}
},
default: ''
},
receiveName4: {
type: 'string',
title: '无车承运人',
enum: [{ label: '全部', value: '' }],
ui: {
widget: 'select',
placeholder: '请选择',
change: (i: any) => {
this.sf.value.receiveName4 = i;
this.sf?.setValue('/receiveName4', i);
},
visibleIf: {
expand: (value: boolean) => value
}
},
default: ''
}
}
};
columns: STColumn[] = this.initST();
searchSchema: SFSchema = this.initSF();
reqParams = {};
_$expand = false;
constructor(public service: TicketService) {}
constructor(public service: FreightAccountService) {}
ngOnInit(): void {}
stChange(e: STChange): void {
switch (e.type) {
case 'filter':
this.st.load();
break;
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
this.reqParams = { ...this.sf.value };
}
return requestOptions;
};
exportList() {
this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageIndex: this.st.pi, pageSize: this.st.ps });
}
goBack() {
@ -161,4 +56,97 @@ export class DriverAccountDetailComponent implements OnInit {
this._$expand = !this._$expand;
this.sf?.setValue('/expand', this._$expand);
}
private initSF(): SFSchema {
return {
properties: {
expand: {
type: 'boolean',
ui: {
hidden: true
}
},
createTime: {
title: '交易时间',
type: 'string',
ui: {
widget: 'date',
mode: 'range',
format: 'yyyy-MM-dd'
} as SFDateWidgetSchema
},
orderSn2: {
type: 'string',
title: '流水号',
ui: {
placeholder: '请输入'
}
},
orderSn3: {
type: 'string',
title: '关联单号',
ui: {
placeholder: '请输入'
}
},
receiveName: {
type: 'string',
title: '交易类型',
enum: [
{ label: '全部', value: '' },
{ 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);
},
visibleIf: {
expand: (value: boolean) => value
}
},
default: ''
},
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
}
},
default: ''
}
}
};
}
private initST(): STColumn[] {
return [
{ title: '交易时间', index: 'updatedAt', type: 'date' },
{ title: '流水号', index: 'callNo' },
{ title: '交易类型', index: 'callNo' },
{ title: '关联单号', index: 'callNo' },
{ title: '收支类型', index: 'callNo' },
{ title: '交易金额', index: 'callNo' },
{ title: '账户余额', index: 'callNo' }
];
}
}

View File

@ -12,7 +12,7 @@
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>
<button nz-button (click)="exportList()"> 导出</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
@ -22,10 +22,10 @@
</nz-card>
<nz-card class="content-box">
<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]="{ y: '370px' }" (change)="stChange($event)">
[loading]="service.http.loading" [scroll]="{ y: '370px' }">
</st>
</nz-card>

View File

@ -23,11 +23,10 @@
@media (min-width: 1200px) {
.expend-options {
margin-top: -40px;
max-width : 400px;
position : absolute;
right : 0;
bottom : 30px;
bottom : 25px;
}
}

View File

@ -1,9 +1,8 @@
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 { SystemService } from 'src/app/routes/sys-setting/services/system.service';
import { FreightAccountService } from '../../services/freight-account.service';
@Component({
selector: 'app-driver-account',
@ -16,83 +15,21 @@ export class DriverAccountComponent implements OnInit {
@ViewChild('sf', { static: false })
sf!: SFComponent;
url = `/rule?_allow_anonymous=true`;
searchSchema: SFSchema = {
properties: {
expand: {
type: 'boolean',
ui: {
hidden: true
}
},
receiveName: {
type: 'string',
title: '司机姓名',
ui: { placeholder: '请输入' }
},
phone: {
type: 'string',
title: '证件号码',
ui: { placeholder: '请输入' }
},
page: {
type: 'string',
title: '手机号',
ui: {
placeholder: '请输入'
}
},
createTime: {
title: '创建时间',
type: 'string',
ui: {
widget: 'date',
mode: 'range',
format: 'yyyy-MM-dd',
visibleIf: {
expand: (value: boolean) => value
}
} as SFDateWidgetSchema
}
}
};
columns: STColumn[] = [
{ title: '司机姓名', index: 'description' },
{ title: '证件号码', index: 'description' },
{ title: '手机号', index: 'description' },
{ title: '账户余额', index: 'description' },
{ title: '油卡余额', index: 'description' },
{ title: '创建时间', index: 'updatedAt', type: 'date' },
{
title: '操作',
buttons: [
{
text: '查看明细',
click: item => this.routeTo(item)
}
]
}
];
reqParams = { pageIndex: 1, pageSize: 10 };
searchSchema: SFSchema = this.initSF();
columns: STColumn[] = this.initST();
reqParams = {};
_$expand = false;
constructor(public service: SystemService, private router: Router) {}
constructor(public service: FreightAccountService, private router: Router) {}
ngOnInit(): void {}
stChange(e: STChange): void {
switch (e.type) {
case 'filter':
this.st.load();
break;
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
this.reqParams = { ...this.sf.value };
}
}
routeTo(item?: any) {
this.router.navigate(['/financial-management/driver-account-detail/1']);
}
return requestOptions;
};
/**
* 重置表单
@ -109,4 +46,109 @@ export class DriverAccountComponent implements OnInit {
this._$expand = !this._$expand;
this.sf?.setValue('/expand', this._$expand);
}
exportList() {
this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageIndex: this.st.pi, pageSize: this.st.ps });
}
private initSF(): SFSchema {
return {
properties: {
expand: {
type: 'boolean',
ui: {
hidden: true
}
},
receiveName: {
type: 'string',
title: '司机姓名',
ui: { placeholder: '请输入' }
},
phone: {
type: 'string',
title: '证件号码',
ui: { placeholder: '请输入' }
},
page: {
type: 'string',
title: '手机号',
ui: {
placeholder: '请输入'
}
},
page2: {
type: 'string',
title: '网络货运人',
enum: [{ label: '全部', value: '全部' }],
ui: {
widget: 'select',
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
}
}
},
page22: {
type: 'string',
title: '银行类型',
enum: [{ label: '全部', value: '全部' }],
ui: {
widget: 'select',
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
}
}
},
page3: {
type: 'string',
title: '虚拟账户',
ui: {
placeholder: '请输入',
visibleIf: {
expand: (value: boolean) => value
}
}
},
createTime: {
title: '创建时间',
type: 'string',
ui: {
widget: 'date',
mode: 'range',
format: 'yyyy-MM-dd',
visibleIf: {
expand: (value: boolean) => value
}
} as SFDateWidgetSchema
}
}
};
}
private initST(): STColumn[] {
return [
{ title: '司机姓名', index: 'description' },
{ title: '证件号码', index: 'description' },
{ title: '手机号', index: 'description' },
{ title: '网络货运人', index: 'description' },
{ title: '银行类型', index: 'description' },
{ title: '虚拟账户', index: 'description' },
{ title: '可用余额', index: 'description' },
{ title: '冻结余额', index: 'description' },
{ title: '本月累计提现金额', index: 'description', width: 150 },
{ title: '账户总余额', index: 'description' },
{ title: '创建时间', index: 'updatedAt', type: 'date', width: 150 },
{
title: '操作',
buttons: [
{
text: '查看明细',
click: item => this.router.navigate(['/financial-management/driver-account/detail/1'])
}
]
}
];
}
}

View File

@ -9,18 +9,22 @@
<nz-card>
<nz-row [nzGutter]="16">
<nz-col [nzXl]="9" [nzLg]="8" [nzSm]="12">
<nz-statistic nzValue="统一社会信用代码904001234567890H" [nzTitle]="'天津怡亚通物流科技有限公司'" [nzValueStyle]="{'font-size':'21px'}">
<nz-statistic nzValue="天津怡亚通物流科技有限公司(浦发)" [nzTitle]="'茅台集团股份有限公司'"
[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]="'账户余额'" [nzValueStyle]="{'font-size':'21px'}">
<nz-statistic nzValue="100,000,000.00 元" [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':'21px'}"></nz-statistic>
<nz-statistic nzValue="100,000.00 元" [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':'21px'}"></nz-statistic>
<nz-statistic nzValue="100,000.00 元" [nzTitle]="'支出金额'" [nzValueStyle]="{'font-size':'16px',color:'red'}">
</nz-statistic>
</nz-col>
</nz-row>
</nz-card>
@ -32,11 +36,10 @@
[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.expend-options]="_$expand"
class="text-right">
<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 (click)="resetSF()">重置</button>
<button nz-button> 导出</button>
<button nz-button (click)="exportList()"> 导出</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
@ -46,9 +49,9 @@
</nz-card>
<nz-card class="content-box" nzBordered>
<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: '300px' }" (change)="stChange($event)"></st>
[loading]="service.http.loading" [scroll]="{ x:'1200px',y: '300px' }"></st>
</nz-card>

View File

@ -14,18 +14,12 @@
nz-range-picker {
width: 100%;
}
}
.expend-options {
margin-top: 0px;
}
@media (min-width: 990px) {
.expend-options {
margin-top: -40px;
max-width : 400px;
position : absolute;
right : 0;
bottom : 30px;
.bold {
.ant-statistic-title {
font-weight: 600;
color : #000;
font-size : 16px;
}
}
}

View File

@ -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, SFDateWidgetSchema, SFSchema } 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-freight-account-detail',
@ -11,152 +12,28 @@ import { TicketService } from 'src/app/routes/ticket-management/services/system.
styleUrls: ['./freight-account-detail.component.less']
})
export class FreightAccountDetailComponent implements OnInit {
url = `/rule?_allow_anonymous=true`;
@ViewChild('st', { static: true })
st!: STComponent;
@ViewChild('sf', { static: false })
sf!: SFComponent;
columns: STColumn[] = [
{ 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' }
];
searchSchema: SFSchema = {
properties: {
expand: {
type: 'boolean',
ui: {
hidden: true
}
},
createTime: {
title: '交易时间',
type: 'string',
ui: {
widget: 'date',
mode: 'range',
format: 'yyyy-MM-dd',
visibleIf: {
expand: (value: boolean) => value
}
} as SFDateWidgetSchema
},
orderSn2: {
type: 'string',
title: '流水号',
ui: {
placeholder: '请输入',
autocomplete: 'off'
}
},
orderSn3: {
type: 'string',
title: '订单号',
ui: {
placeholder: '请输入',
autocomplete: 'off'
}
},
receiveName: {
type: 'string',
title: '交易类型',
enum: [
{ label: '全部', value: '' },
{ 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);
},
visibleIf: {
expand: (value: boolean) => value
}
},
default: ''
},
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
}
},
default: ''
},
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
}
},
default: ''
},
receiveName4: {
type: 'string',
title: '无车承运人',
enum: [{ label: '全部', value: '' }],
ui: {
widget: 'select',
placeholder: '请选择',
change: (i: any) => {
this.sf.value.receiveName4 = i;
this.sf?.setValue('/receiveName4', i);
},
visibleIf: {
expand: (value: boolean) => value
}
},
default: ''
}
}
};
columns: STColumn[] = this.initST();
searchSchema: SFSchema = this.initSF();
reqParams = {};
_$expand = false;
constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) {}
constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) {}
ngOnInit(): void {}
stChange(e: STChange): void {
switch (e.type) {
case 'filter':
this.st.load();
break;
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
this.reqParams = { ...this.sf.value };
}
return requestOptions;
};
exportList() {
this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageIndex: this.st.pi, pageSize: this.st.ps });
}
goBack() {
@ -178,4 +55,115 @@ export class FreightAccountDetailComponent implements OnInit {
this._$expand = !this._$expand;
this.sf?.setValue('/expand', this._$expand);
}
private initSF(): SFSchema {
return {
properties: {
expand: {
type: 'boolean',
ui: {
hidden: true
}
},
createTime: {
title: '交易时间',
type: 'string',
ui: {
widget: 'date',
mode: 'range',
format: 'yyyy-MM-dd'
} as SFDateWidgetSchema
},
orderSn2: {
type: 'string',
title: '流水号',
ui: {
placeholder: '请输入'
}
},
orderSn3: {
type: 'string',
title: '关联单号',
ui: {
placeholder: '请输入'
}
},
receiveName: {
type: 'string',
title: '交易类型',
enum: [
{ label: '全部', value: '' },
{ 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);
},
visibleIf: {
expand: (value: boolean) => value
}
},
default: ''
},
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
}
},
default: ''
},
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
}
},
default: ''
}
}
};
}
private initST(): STColumn[] {
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' }
];
}
}

View File

@ -12,7 +12,7 @@
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>
<button nz-button (click)="exportList()"> 导出</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
@ -22,25 +22,10 @@
</nz-card>
<nz-card class="content-box">
<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]="{ y: '370px' }" (change)="stChange($event)">
<ng-template st-row="description1" let-item let-index="index">
<a (click)="showAccount(item)">{{item.callNo}}</a>
</ng-template>
[loading]="service.http.loading" [scroll]="{ y: '370px' }">
</st>
</nz-card>
<ng-template #accountModal>
<st #st [data]="accountList" [columns]="[
{ title: '充值账户主体', index: 'description' },
{ title: '虚拟账户', index: 'description' },
{ title: '可用余额', index: 'description' }
]" [page]="{ show: false}" [scroll]="{ y: '300px' }">
<ng-template st-row="description1" let-item let-index="index">
<a (click)="showAccount(item)">{{item.callNo}}</a>
</ng-template>
</st>
</ng-template>
</nz-card>

View File

@ -23,11 +23,10 @@
@media (min-width: 1200px) {
.expend-options {
margin-top: -40px;
max-width : 400px;
position : absolute;
right : 0;
bottom : 30px;
bottom : 25px;
}
}

View File

@ -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 { SystemService } from 'src/app/routes/sys-setting/services/system.service';
import { FreightAccountService } from '../../services/freight-account.service';
@Component({
selector: 'app-freight-account',
@ -11,124 +12,28 @@ import { SystemService } from 'src/app/routes/sys-setting/services/system.servic
styleUrls: ['./freight-account.component.less']
})
export class FreightAccountComponent implements OnInit {
@ViewChild('accountModal', { static: true })
accountModal: any;
@ViewChild('st', { static: true })
st!: STComponent;
@ViewChild('sf', { static: false })
sf!: SFComponent;
searchSchema: SFSchema = this.initSF();
columns: STColumn[] = this.initST();
url = `/rule?_allow_anonymous=true`;
searchSchema: SFSchema = {
properties: {
expand: {
type: 'boolean',
ui: {
hidden: true
}
},
receiveName: {
type: 'string',
title: '企业名称',
ui: { placeholder: '请输入' }
},
phone: {
type: 'string',
title: '联系人',
ui: { placeholder: '请输入' }
},
page: {
type: 'string',
title: '联系人电话',
ui: {
placeholder: '请输入'
}
},
createTime: {
title: '创建时间',
type: 'string',
ui: {
widget: 'date',
mode: 'range',
format: 'yyyy-MM-dd',
visibleIf: {
expand: (value: boolean) => value
}
} as SFDateWidgetSchema
},
receiveName2: {
type: 'string',
title: '无车承运人',
enum: [{ label: '全部', value: '全部' }],
ui: {
widget: 'select',
placeholder: '请选择',
change: (i: any) => {
this.sf.value.receiveName2 = i;
this.sf?.setValue('/receiveName2', i);
},
visibleIf: {
expand: (value: boolean) => value
}
}
}
}
};
columns: STColumn[] = [
{ title: '企业名称', index: 'description' },
{ title: '统一社会信用代码', index: 'description' },
{ title: '联系人', index: 'description' },
{ title: '联系人电话', index: 'description' },
{ title: '累计消费金额', index: 'description' },
{ title: '账户余额', render: 'description1' },
{ title: '创建时间', index: 'updatedAt', type: 'date' },
{
title: '操作',
buttons: [
{
text: '查看明细',
click: item => this.routeTo(item)
}
]
}
];
selectedRows: any[] = [];
reqParams = { pageIndex: 1, pageSize: 10 };
reqParams = {};
_$expand = false;
accountList = [{ description: 222 }, { description: 222 }, { description: 222 }];
constructor(public service: SystemService, private nzModalService: NzModalService, private router: Router) {}
constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) {}
ngOnInit(): void {}
stChange(e: STChange): void {
switch (e.type) {
case 'checkbox':
this.selectedRows = e.checkbox!;
break;
case 'filter':
this.st.load();
break;
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
this.reqParams = { ...this.sf.value };
}
}
showAccount(item: any) {
const modal = this.nzModalService.create({
nzTitle: '账户明细',
nzContent: this.accountModal,
nzFooter: []
});
modal.afterClose.subscribe(res => {
this.st.load();
});
}
routeTo(item?: any) {
this.router.navigate(['/financial-management/freight-account-detail/1']);
}
return requestOptions;
};
/**
* 重置表单
@ -145,4 +50,114 @@ export class FreightAccountComponent implements OnInit {
this._$expand = !this._$expand;
this.sf?.setValue('/expand', this._$expand);
}
exportList() {
this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageIndex: this.st.pi, pageSize: this.st.ps });
}
private initSF(): SFSchema {
return {
properties: {
expand: {
type: 'boolean',
ui: {
hidden: true
}
},
receiveName: {
type: 'string',
title: '企业名称',
ui: { placeholder: '请输入' }
},
phone: {
type: 'string',
title: '联系人',
ui: { placeholder: '请输入' }
},
page: {
type: 'string',
title: '联系人电话',
ui: {
placeholder: '请输入'
}
},
page2: {
type: 'string',
title: '网络货运人',
enum: [{ label: '全部', value: '全部' }],
ui: {
widget: 'select',
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
}
}
},
receiveName2: {
type: 'string',
title: '银行类型',
enum: [{ label: '全部', value: '全部' }],
ui: {
widget: 'select',
placeholder: '请选择',
change: (i: any) => {
this.sf.value.receiveName2 = i;
this.sf?.setValue('/receiveName2', i);
},
visibleIf: {
expand: (value: boolean) => value
}
}
},
page3: {
type: 'string',
title: '虚拟账户',
ui: {
placeholder: '请输入',
visibleIf: {
expand: (value: boolean) => value
}
}
},
createTime: {
title: '创建时间',
type: 'string',
ui: {
widget: 'date',
mode: 'range',
format: 'yyyy-MM-dd',
visibleIf: {
expand: (value: boolean) => value
}
} as SFDateWidgetSchema
}
}
};
}
private initST(): STColumn[] {
return [
{ title: '企业名称', index: 'description' },
{ title: '联系人', index: 'description' },
{ title: '联系人电话', index: 'description' },
{ title: '网络货运人', index: 'description' },
{ title: '银行类型', index: 'description' },
{ title: '虚拟账户', index: 'description' },
{ title: '可用余额', index: 'description' },
{ title: '冻结余额', index: 'description' },
{ title: '累计消费金额', index: 'description' },
{ title: '账户总余额', render: 'description1' },
{ title: '创建时间', index: 'updatedAt', type: 'date', width: 150 },
{ title: '状态', render: 'description1' },
{
title: '操作',
buttons: [
{
text: '查看明细',
click: item => this.router.navigate(['/financial-management/freight-account/detail/1'])
}
]
}
];
}
}

View File

@ -1,12 +1,7 @@
<page-header-wrapper [title]="'开票订单明细'" [logo]="logo">
<ng-template #logo>
<button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
<i nz-icon nzType="left" nzTheme="outline"></i>
</button>
</ng-template>
<page-header-wrapper [title]="'充值记录'">
</page-header-wrapper>
<nz-card>
<!-- <nz-card>
<nz-row [nzGutter]="16">
<nz-col [nzXl]="7" [nzLg]="8" [nzSm]="12">
<nz-statistic nzValue="100 笔" [nzTitle]="'累计充值订单数'"
@ -18,7 +13,7 @@
</nz-statistic>
</nz-col>
</nz-row>
</nz-card>
</nz-card> -->
<nz-card class="search-box" nzBordered>
<div nz-row nzGutter="8">
@ -27,11 +22,11 @@
[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"
<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>
<button nz-button (click)="exportList()"> 导出</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
@ -41,9 +36,9 @@
</nz-card>
<nz-card class="content-box" nzBordered>
<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: '300px' }" (change)="stChange($event)"></st>
[loading]="service.http.loading" [scroll]="{ x:'1200px',y: '400px' }"></st>
</nz-card>

View File

@ -15,3 +15,18 @@
width: 100%;
}
}
.expend-options {
margin-top: 0px;
}
@media (min-width: 1200px) {
.expend-options {
max-width : 400px;
position : absolute;
right : 0;
bottom : 25px;
}
}

View File

@ -1,7 +1,8 @@
import { Component, OnInit, ViewChild } from '@angular/core';
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 { TicketService } from 'src/app/routes/ticket-management/services/system.service';
import { FreightAccountService } from '../../services/freight-account.service';
@Component({
selector: 'app-recharge-record',
@ -9,131 +10,25 @@ import { TicketService } from 'src/app/routes/ticket-management/services/system.
styleUrls: ['./recharge-record.component.less']
})
export class RechargeRecordComponent implements OnInit {
url = `/rule?_allow_anonymous=true`;
@ViewChild('st', { static: true })
st!: STComponent;
@ViewChild('sf', { static: false })
sf!: SFComponent;
columns: STColumn[] = [
{ 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' }
];
searchSchema: SFSchema = {
properties: {
expand: {
type: 'boolean',
ui: {
hidden: true
}
},
orderSn2: {
type: 'string',
title: '充值单号',
ui: {
placeholder: '请输入',
autocomplete: 'off'
}
},
receiveName: {
type: 'string',
title: '充值状态',
enum: [
{ label: '全部', value: '' },
{ label: '充值中', value: '充值中' },
{ label: '已完成', value: '已完成' }
],
ui: {
widget: 'select',
placeholder: '请选择',
change: (i: any) => {
this.sf.value.receiveName = i;
this.sf?.setValue('/receiveName', i);
}
},
default: ''
},
createTime: {
title: '充值时间',
type: 'string',
ui: {
widget: 'date',
mode: 'range',
format: 'yyyy-MM-dd'
} as SFDateWidgetSchema
},
orderSn3: {
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
}
},
default: ''
},
receiveName4: {
type: 'string',
title: '账户主体',
enum: [{ label: '全部', value: '' }],
ui: {
widget: 'select',
placeholder: '请选择',
change: (i: any) => {
this.sf.value.receiveName4 = i;
this.sf?.setValue('/receiveName4', i);
},
visibleIf: {
expand: (value: boolean) => value
}
},
default: ''
}
}
};
columns: STColumn[] = this.initST();
searchSchema: SFSchema = this.initSF();
reqParams = {};
_$expand = false;
constructor(public service: TicketService) {}
constructor(public service: FreightAccountService) {}
ngOnInit(): void {}
stChange(e: STChange): void {
switch (e.type) {
case 'filter':
this.st.load();
break;
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
this.reqParams = { ...this.sf.value };
}
}
return requestOptions;
};
goBack() {
history.go(-1);
@ -154,4 +49,135 @@ export class RechargeRecordComponent implements OnInit {
this._$expand = !this._$expand;
this.sf?.setValue('/expand', this._$expand);
}
exportList() {
this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageIndex: this.st.pi, pageSize: this.st.ps });
}
private initSF(): SFSchema {
return {
properties: {
expand: {
type: 'boolean',
ui: {
hidden: true
}
},
orderSn2: {
type: 'string',
title: '充值单号',
ui: {
placeholder: '请输入'
}
},
receiveName: {
type: 'string',
title: '充值状态',
enum: [
{ label: '全部', value: '' },
{ label: '充值中', value: '充值中' },
{ label: '已完成', value: '已完成' }
],
ui: {
widget: 'select',
placeholder: '请选择',
change: (i: any) => {
this.sf.value.receiveName = i;
this.sf?.setValue('/receiveName', i);
}
},
default: ''
},
createTime: {
title: '充值时间',
type: 'string',
ui: {
widget: 'date',
mode: 'range',
format: 'yyyy-MM-dd'
} as SFDateWidgetSchema
},
orderSn3: {
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
}
},
default: ''
},
page2: {
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: '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',format: item=> `中国招商银行</br>6238293829388888` },
{ title: '充值方式', index: 'callNo' },
{ title: '充值状态', index: 'callNo' },
{ title: '银行流水号', index: 'callNo' },
{
title: '操作',
buttons: [
{
text: '查看回单',
// click: item => this.router.navigate(['/financial-management/freight-account/detail/1'])
}
]
}
];
}
}

View File

@ -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>

View File

@ -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>

View File

@ -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;
}
}

View File

@ -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'])
}
]
}
];
}
}

View File

@ -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';
@ -11,13 +10,12 @@ import { WithdrawalsDetailComponent } from './components/withdrawals-record/with
const routes: Routes = [
{ path: 'freight-account', component: FreightAccountComponent },
{ path: 'freight-account-detail/:id', component: FreightAccountDetailComponent },
{ path: 'freight-account/detail/:id', component: FreightAccountDetailComponent },
{ path: 'driver-account', component: DriverAccountComponent },
{ path: 'driver-account-detail/:id', component: DriverAccountDetailComponent },
{ 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({

View File

@ -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
];

View File

@ -0,0 +1,13 @@
import { Injectable, Injector } from '@angular/core';
import { BaseService } from '@shared';
@Injectable({
providedIn: 'root'
})
export class FreightAccountService extends BaseService {
$mock_url = '/rule?_allow_anonymous=true';
constructor(public injector: Injector) {
super(injector);
}
}

View File

@ -253,28 +253,34 @@
"children": [
{
"text": "货主账户",
"icon": "anticon anticon-dashboard",
"link": "/financial-management/freight-account"
},
{
"text": "货主账户详情",
"hide": true,
"link": "/financial-management/freight-account/detail/:id"
},
{
"text": "司机账户",
"icon": "anticon anticon-dashboard",
"link": "/financial-management/driver-account"
},
{
"text": "司机账户详情",
"hide": true,
"link": "/financial-management/driver-account/detail/:id"
},
{
"text": "充值记录",
"icon": "anticon anticon-dashboard",
"link": "/financial-management/recharge-record"
},
{
"text": "提现记录",
"icon": "anticon anticon-dashboard",
"link": "/financial-management/withdrawals-record"
},
{
"text": "账户主体",
"icon": "anticon anticon-dashboard",
"link": "/financial-management/main-account"
"text": "提现详情",
"hide": true,
"link": "/financial-management/withdrawals-record/detail/:id"
}
]
},