Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

edit

Browse Source
This commit is contained in:
Taric Xin
2021-12-29 16:15:38 +08:00
parent 128e785a41
commit a82a0ba1ae
21 changed files with 471 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,7 +52,7 @@
</nz-card>
<nz-card class="content-box" nzBordered>
<st #st [data]="service.$api_get_shipper_or_driver_account_detail" [columns]="columns"
<st #st [data]="service.$api_get_shipper_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] }"

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

@ -38,7 +38,13 @@ export class FreightAccountDetailComponent implements OnInit {
roleId: this.params.roleId
});
if (this.sf) {
Object.assign(requestOptions.body, { ...this.sf.value });
Object.assign(requestOptions.body, {
...this.sf.value,
createTime: {
start: this.sf?.value.createTime?.[0] || null,
end: this.sf?.value.createTime?.[1] || null
}
});
}
return requestOptions;
};
@ -46,7 +52,7 @@ export class FreightAccountDetailComponent implements OnInit {
loadInfo() {
this.service
.request(this.service.$api_get_shipper_account_balance_detail, {
...this.sf.value,
...this.sf?.value,
ltdid: this.params.ltdid,
projectId: this.params.projectId,
enterpriseId: this.params.enterpriseId,
@ -54,8 +60,8 @@ export class FreightAccountDetailComponent implements OnInit {
pageIndex: this.st.pi,
pageSize: this.st.ps,
createTime: {
start: this.sf.value.createTime?.[0] || null,
end: this.sf.value.createTime?.[1] || null
start: this.sf?.value.createTime?.[0] || null,
end: this.sf?.value.createTime?.[1] || null
}
})
.subscribe(res => {

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

@ -147,15 +147,15 @@ export class FreightAccountComponent implements OnInit {
{ title: '银行类型', index: 'bankType', type: 'enum', enum: { 1: '平安银行', 2: '浦发银行' } },
{ title: '虚拟账户', index: 'virtualAccount' },
{ title: '可用余额', index: 'availableBalance' },
{ title: '冻结余额', index: 'availableBalance' },
{ title: '冻结余额', index: 'freezeBalance' },
{ title: '累计消费金额', index: 'description' },
{ title: '账户总余额', render: 'availableBalance' },
{ title: '账户总余额', render: 'description' },
{ title: '创建时间', index: 'createTime', type: 'date', width: 150 },
{
title: '状态',
render: 'stateLocked',
index: 'stateDeleted',
type: 'badge',
badge: { 0: { text: '正常', color: 'success' }, 1: { text: '锁定', color: 'warning' } }
badge: { 0: { text: '正常', color: 'success' }, 1: { text: '停用', color: 'warning' } }
},
{
title: '操作',