diff --git a/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.html b/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.html
index d3b5c732..470f971f 100644
--- a/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.html
+++ b/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.html
@@ -63,9 +63,6 @@
-
\ No newline at end of file
diff --git a/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts b/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts
index 2b670990..9a289e05 100644
--- a/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts
+++ b/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts
@@ -10,7 +10,6 @@ import { FreightAccountService } from '../../../services/freight-account.service
styleUrls: ['../../../../commom/less/box.less', '../../../../commom/less/expend-but.less']
})
export class PlatformAccountDetailComponent implements OnInit {
-
@ViewChild('st', { static: true })
st!: STComponent;
@ViewChild('sf', { static: false })
@@ -31,38 +30,30 @@ export class PlatformAccountDetailComponent implements OnInit {
}
beforeReq = (requestOptions: STRequestOptions) => {
- Object.assign(requestOptions.body, {
- ltdId: this.params.ltdId,
- projectId: this.params.projectId,
- enterpriseId: this.params.enterpriseId,
- roleId: this.params.roleId
- });
+ Object.assign(requestOptions.body, { ...this.params });
if (this.sf) {
Object.assign(requestOptions.body, {
- ...this.sf.value,
- createTime: {
- start: this.sf.value?.createTime?.[0] || '',
- end: this.sf.value?.createTime?.[1] || ''
- }
+ ...this.sf.value
});
+ if (this.sf.value.createTime) {
+ Object.assign(requestOptions.body, {
+ createTime: {
+ start: this.sf.value?.createTime?.[0] || '',
+ end: this.sf.value?.createTime?.[1] || ''
+ }
+ });
+ }
}
return requestOptions;
};
loadInfo() {
this.service
- .request(this.service.$api_get_driver_account_balance_detail, {
+ .request(this.service.$api_get_platform_account_header, {
...this.sf?.value,
- ltdId: this.params.ltdId,
- projectId: this.params.projectId,
- enterpriseId: this.params.enterpriseId,
- roleId: this.params.roleId,
+ ...this.params,
pageIndex: this.st.pi,
- pageSize: this.st.ps,
- createTime: {
- start: this.sf?.value?.createTime?.[0] || '',
- end: this.sf?.value?.createTime?.[1] || ''
- }
+ pageSize: this.st.ps
})
.subscribe(res => {
if (res) {
@@ -116,14 +107,14 @@ export class PlatformAccountDetailComponent implements OnInit {
nzShowTime: true
} as SFDateWidgetSchema
},
- transactionNumber: {
+ businessNumber: {
type: 'string',
title: '流水号',
ui: {
placeholder: '请输入'
}
},
- businessNumber: {
+ transactionNumber: {
type: 'string',
title: '交易单号',
ui: {
@@ -156,7 +147,7 @@ export class PlatformAccountDetailComponent implements OnInit {
},
default: ''
},
- incomeType1: {
+ enterpriseId: {
type: 'string',
title: '货主',
ui: {
@@ -168,7 +159,7 @@ export class PlatformAccountDetailComponent implements OnInit {
},
default: ''
},
- incomeType2: {
+ projectId: {
type: 'string',
title: '所属项目',
ui: {
@@ -186,16 +177,16 @@ export class PlatformAccountDetailComponent implements OnInit {
private initST(): STColumn[] {
return [
- { title: '交易时间', index: 'createTime', type: 'date' },
- { title: '流水号', index: 'channelPaySn' },
- { title: '交易类型', index: 'tradeTypeLabel', className: 'text-center' },
- { title: '交易单号', index: 'businessNumber' },
- { title: '订单号', index: 'businessNumber' },
- { title: '运单号', index: 'businessNumber' },
- { title: '账户类型', index: 'incomeTypeLabel', className: 'text-center' },
- { title: '账户名称', index: 'incomeTypeLabel', className: 'text-center' },
- { title: '所属项目', index: 'incomeTypeLabel', className: 'text-center' },
- { title: '收支类型', index: 'incomeTypeLabel', className: 'text-center' },
+ { title: '交易时间', index: 'createTime', type: 'date', width: 150 },
+ { title: '流水号', index: 'channelPaySn', width: 170 },
+ { title: '交易类型', index: 'tradeTypeLabel', className: 'text-center', width: 130 },
+ { title: '交易单号', index: 'transactionNumber', width: 190 },
+ { title: '订单号', index: 'orderSn', width: 170 },
+ { title: '运单号', index: 'businessNumber', width: 190 },
+ { title: '账户类型', index: 'accountTypeLabel', className: 'text-center', width: 130 },
+ { title: '账户名称', index: 'incomeTypeLabel', className: 'text-center', width: 150 },
+ { title: '所属项目', index: 'projectName', className: 'text-center', width: 150 },
+ { title: '收支类型', index: 'incomeTypeLabel', className: 'text-center', width: 130 },
{
title: '交易金额',
index: 'amount',
@@ -212,10 +203,9 @@ export class PlatformAccountDetailComponent implements OnInit {
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.accountBalance }) }
},
- { title: '付款方', index: 'incomeTypeLabel', className: 'text-center' },
- { title: '收款方', index: 'incomeTypeLabel', className: 'text-center' },
- { title: '备注', index: 'incomeTypeLabel', className: 'text-center' },
+ { title: '付款方', index: 'incomeTypeLabel', className: 'text-center', width: 150 },
+ { title: '收款方', index: 'payeeName', className: 'text-center', width: 150 },
+ { title: '备注', index: 'tradeContent', className: 'text-center', width: 150 }
];
}
-
}
diff --git a/src/app/routes/financial-management/components/platform-account/platform-account.component.html b/src/app/routes/financial-management/components/platform-account/platform-account.component.html
index 1ccb1cce..15410efd 100644
--- a/src/app/routes/financial-management/components/platform-account/platform-account.component.html
+++ b/src/app/routes/financial-management/components/platform-account/platform-account.component.html
@@ -4,32 +4,32 @@
-
-
-
-
-
-
@@ -52,7 +52,7 @@
-
\ No newline at end of file
diff --git a/src/app/routes/financial-management/components/platform-account/platform-account.component.ts b/src/app/routes/financial-management/components/platform-account/platform-account.component.ts
index de73e4d4..0a976ab6 100644
--- a/src/app/routes/financial-management/components/platform-account/platform-account.component.ts
+++ b/src/app/routes/financial-management/components/platform-account/platform-account.component.ts
@@ -18,9 +18,12 @@ export class PlatformAccountComponent implements OnInit {
searchSchema: SFSchema = this.initSF();
columns: STColumn[] = this.initST();
+ info: any = {};
constructor(public service: FreightAccountService, private router: Router, private nzModalService: NzModalService) {}
- ngOnInit(): void {}
+ ngOnInit(): void {
+ this.loadInfo();
+ }
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
@@ -29,6 +32,18 @@ export class PlatformAccountComponent implements OnInit {
return requestOptions;
};
+ loadInfo() {
+ const params = {};
+ if (this.sf) {
+ Object.assign(params, { ...this.sf.value });
+ }
+ this.service.request(this.service.$api_get_platform_account_header, params).subscribe(res => {
+ if (res) {
+ this.info = res;
+ }
+ });
+ }
+
/**
* 重置表单
*/
@@ -45,9 +60,6 @@ export class PlatformAccountComponent implements OnInit {
ui: {
widget: 'select',
placeholder: '请选择',
- visibleIf: {
- expand: (value: boolean) => value
- },
allowClear: true,
asyncData: () => this.service.getNetworkFreightForwarder()
}
@@ -62,10 +74,7 @@ export class PlatformAccountComponent implements OnInit {
],
ui: {
widget: 'select',
- placeholder: '请选择',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ placeholder: '请选择'
},
default: null
},
@@ -73,10 +82,7 @@ export class PlatformAccountComponent implements OnInit {
type: 'string',
title: '虚拟账户',
ui: {
- placeholder: '请输入',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ placeholder: '请输入'
}
}
}
@@ -86,11 +92,11 @@ export class PlatformAccountComponent implements OnInit {
private initST(): STColumn[] {
return [
{ title: '网络货运人', index: 'ltdName', width: 180 },
- { title: '银行类型', index: 'description', width: 120 },
- { title: '虚拟账户', index: 'description', width: 140 },
+ { title: '银行类型', index: 'bankTypeLabel', width: 120 },
+ { title: '虚拟账户', index: 'virtualAccount', width: 160 },
{
title: '平台账户可用余额',
- index: 'description',
+ index: 'availableBalance',
width: 180,
type: 'widget',
className: 'text-right',
@@ -98,67 +104,67 @@ export class PlatformAccountComponent implements OnInit {
},
{
title: '平台账户冻结余额',
- index: 'description',
+ index: 'freezeBalance',
width: 180,
type: 'widget',
className: 'text-right',
- widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.availableBalance }) }
+ widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.freezeBalance }) }
},
{
title: '货主账户可用余额',
- index: 'description',
+ index: 'shipperAvailableBalance',
width: 180,
type: 'widget',
className: 'text-right',
- widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.availableBalance }) }
+ widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.shipperAvailableBalance }) }
},
{
title: '货主账户冻结余额',
- index: 'description',
+ index: 'shipperFreezeBalance',
width: 180,
type: 'widget',
className: 'text-right',
- widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.availableBalance }) }
+ widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.shipperFreezeBalance }) }
},
{
title: '司机账户可用余额',
- index: 'description',
+ index: 'driverAvailableBalance',
width: 180,
type: 'widget',
className: 'text-right',
- widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.availableBalance }) }
+ widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.driverAvailableBalance }) }
},
{
title: '司机账户冻结余额',
- index: 'description',
+ index: 'driverFreezeBalance',
width: 180,
type: 'widget',
className: 'text-right',
- widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.availableBalance }) }
+ widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.driverFreezeBalance }) }
},
{
title: '累计充值金额',
- index: 'description',
+ index: 'rechargeBalance',
width: 180,
type: 'widget',
className: 'text-right',
- widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.availableBalance }) }
+ widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.rechargeBalance }) }
},
{
title: '货主累计提现金额',
- index: 'description',
+ index: 'shipperWithdrawBalance',
width: 180,
type: 'widget',
className: 'text-right',
- widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.availableBalance }) }
+ widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.shipperWithdrawBalance }) }
},
{
title: '司机累计提现金额',
- index: 'description',
+ index: 'driverWithdrawBalance',
width: 180,
type: 'widget',
className: 'text-right',
- widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.availableBalance }) }
+ widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.driverWithdrawBalance }) }
},
{
title: '操作',
@@ -168,7 +174,10 @@ export class PlatformAccountComponent implements OnInit {
buttons: [
{
text: '查看明细',
- click: item => this.router.navigate(['/financial-management/platform-account/detail/' + item.id])
+ click: item =>
+ this.router.navigate(['/financial-management/platform-account/detail/' + item.id], {
+ queryParams: { ltdId: item.ltdId, bankType: item.bankType }
+ })
}
]
}
diff --git a/src/app/routes/financial-management/services/freight-account.service.ts b/src/app/routes/financial-management/services/freight-account.service.ts
index 8582d2c3..430c974f 100644
--- a/src/app/routes/financial-management/services/freight-account.service.ts
+++ b/src/app/routes/financial-management/services/freight-account.service.ts
@@ -21,8 +21,13 @@ export class FreightAccountService extends ShipperBaseService {
$api_get_shipper_account_page = '/api/fcc/accountBalance/getShipperAccountBalanceByOperator';
// 运营端获取司机账户信息
$api_get_driver_account_page = '/api/fcc/accountBalance/getDriverAccountBalanceByOperator';
+
// 运营端获取平台余额
- $api_get_platform_page = '/api/fcc/accountBalance/getPlatformBalanceByOperator';
+ $api_get_platform_account_header = '/api/fcc/accountBalance/getPlatformBalanceByOperator';
+ // 运营端获取平台余额
+ $api_get_platform_account_page = '/api/fcc/accountBalance/getPlatformAccountBalanceByOperator';
+ // 运营端获取账户余额交易明细
+ $api_get_platform_account_detail_page = '/api/fcc/accountBalanceDetail/getAccountBalanceByPage';
// 运营端获取货主账户明细信息
$api_get_shipper_account_detail = '/api/fcc/accountBalanceDetail/getAccountBalanceShipperByOperatorPage';