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

edit

Browse Source
This commit is contained in:
Taric Xin
2022-01-19 17:37:30 +08:00
parent 94c8c45126
commit 2837f3ef07
17 changed files with 127 additions and 276 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

@ -31,7 +31,7 @@
</nz-row>
</nz-card>
<nz-card class="search-box" nzBordered>
<nz-card nzBordered>
<div nz-row nzGutter="8">
<div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
<sf #sf [schema]="searchSchema"

25
src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.less
View File

@ -1,25 +0,0 @@
:host::ng-deep {
.search-box {
.ant-card-body {
padding-bottom: 18px;
}
}
.content-box {
.ant-card-body {
padding-top: 16px;
}
}
nz-range-picker {
width: 100%;
}
.bold {
.ant-statistic-title {
font-weight: 600;
color : #000;
font-size : 16px;
}
}
}

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

@ -8,7 +8,7 @@ import { FreightAccountService } from '../../../services/freight-account.service
@Component({
selector: 'app-freight-account-detail',
templateUrl: './freight-account-detail.component.html',
styleUrls: ['./freight-account-detail.component.less']
styleUrls: ['../../../../commom/less/box.less']
})
export class FreightAccountDetailComponent implements OnInit {
@ViewChild('st', { static: true })
@ -41,8 +41,8 @@ export class FreightAccountDetailComponent implements OnInit {
Object.assign(requestOptions.body, {
...this.sf.value,
createTime: {
start: this.sf?.value.createTime?.[0] || null,
end: this.sf?.value.createTime?.[1] || null
start: this.sf?.value.createTime?.[0] || '',
end: this.sf?.value.createTime?.[1] || ''
}
});
}
@ -60,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] || '',
end: this.sf?.value.createTime?.[1] || ''
}
})
.subscribe(res => {
@ -71,8 +71,7 @@ export class FreightAccountDetailComponent implements OnInit {
});
}
stChange(e: STChange): void {
}
stChange(e: STChange): void {}
exportList() {
this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageIndex: this.st.pi, pageSize: this.st.ps });
@ -189,12 +188,26 @@ export class FreightAccountDetailComponent implements OnInit {
return [
{ title: '交易时间', index: 'createTime', type: 'date' },
{ title: '流水号', index: 'transactionNumber' },
{ title: '交易类型', index: 'tradeTypeLabel' },
{ title: '交易类型', index: 'tradeTypeLabel', className: 'text-center' },
{ title: '关联单号', index: 'businessNumber' },
{ title: '所属项目', index: 'projectId' },
{ title: '收支类型', index: 'incomeTypeLabel' },
{ title: '交易金额', index: 'amount' },
{ title: '账户余额', index: 'accountBalance' }
{ title: '收支类型', index: 'incomeTypeLabel', className: 'text-center' },
{
title: '交易金额',
index: 'amount',
width: 150,
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.amount }) }
},
{
title: '账户余额',
index: 'accountBalance',
width: 150,
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.accountBalance }) }
}
];
}
}

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

@ -27,5 +27,8 @@
[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' }">
<ng-template st-row="description" let-item let-index="index">
<a (click)="showAccountDetail(item)">{{ item.availableBalance | currency}}</a>
</ng-template>
</st>
</nz-card>

32
src/app/routes/financial-management/components/freight-account/freight-account.component.less
View File

@ -1,32 +0,0 @@
:host::ng-deep {
.search-box {
.ant-card-body {
padding-bottom: 18px;
}
}
.content-box {
.ant-card-body {
padding-top: 14px;
}
}
nz-range-picker {
width: 100%;
}
}
.expend-options {
margin-top: 0px;
}
@media (min-width: 1200px) {
.expend-options {
max-width : 400px;
position : absolute;
right : 0;
bottom : 25px;
}
}

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

@ -14,8 +14,7 @@ import { FreightAccountService } from '../../services/freight-account.service';
@Component({
selector: 'app-freight-account',
templateUrl: './freight-account.component.html',
styleUrls: ['./freight-account.component.less'],
providers: [CurrencyPipe]
styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less']
})
export class FreightAccountComponent implements OnInit {
@ViewChild('st', { static: true })
@ -29,12 +28,7 @@ export class FreightAccountComponent implements OnInit {
_$expand = false;
constructor(
public service: FreightAccountService,
private router: Router,
private modal: NzModalService,
private currencyPipe: CurrencyPipe
) {}
constructor(public service: FreightAccountService, private router: Router, private modal: NzModalService) {}
ngOnInit(): void {}
@ -173,22 +167,23 @@ export class FreightAccountComponent implements OnInit {
{
title: '可用余额',
index: 'availableBalance',
type: 'currency',
format: item => `${this.currencyPipe.transform(item.availableBalance)}`
width: 150,
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.availableBalance }) }
},
{
title: '冻结余额',
index: 'freezeBalance',
type: 'currency',
format: item => `${this.currencyPipe.transform(item.availableBalance)}`
width: 150,
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.freezeBalance }) }
},
{
title: '账户总余额',
index: 'description',
className: 'text-right',
type: 'link',
format: item => `${this.currencyPipe.transform(item.availableBalance)}`,
click: item => this.showAccountDetail(item)
render: 'description',
className: 'text-right'
},
{ title: '创建时间', index: 'createTime', type: 'date', width: 150 },
{