From 6908a84e2567c5ada38057dd571c43feb137e764 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 2 Mar 2022 16:15:39 +0800 Subject: [PATCH 1/2] edit --- src/app/routes/commom/less/box.less | 8 +++++ .../freight-account-detail.component.html | 7 +++- .../freight-account-detail.component.ts | 35 ++++++++++++------- .../platform-account.component.html | 10 ++++-- .../platform-account.component.ts | 11 ++++++ .../services/freight-account.service.ts | 2 ++ 6 files changed, 57 insertions(+), 16 deletions(-) diff --git a/src/app/routes/commom/less/box.less b/src/app/routes/commom/less/box.less index 77c5fe87..59f98100 100644 --- a/src/app/routes/commom/less/box.less +++ b/src/app/routes/commom/less/box.less @@ -31,4 +31,12 @@ font-size : 16px; } } +} + +.total-footer { + position : absolute; + bottom : 30px; + height : 32px; + margin : 16px 0; + line-height: 32px; } \ No newline at end of file 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 1e0e0cbc..9b55d1a7 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 @@ -31,7 +31,7 @@ - +
+
+ 合计 项，收入 + ，支出 + +
\ No newline at end of file diff --git a/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts b/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts index 3a0302bb..8330957b 100644 --- a/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts +++ b/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts @@ -20,7 +20,7 @@ export class FreightAccountDetailComponent implements OnInit { info: any = {}; params: any = {}; - + static: any = {}; _$expand = false; constructor(public service: FreightAccountService, private nzModalService: NzModalService, private route: ActivatedRoute) { this.params = route.snapshot.queryParams; @@ -46,6 +46,7 @@ export class FreightAccountDetailComponent implements OnInit { } }); } + this.loadStatistics(requestOptions.body); return requestOptions; }; @@ -71,6 +72,14 @@ export class FreightAccountDetailComponent implements OnInit { }); } + loadStatistics(params: any) { + this.service.request(this.service.$api_get_shipper_account_balance_detail, params).subscribe(res => { + if (res) { + this.static = res; + } + }); + } + stChange(e: STChange): void {} exportList() { @@ -186,15 +195,15 @@ export class FreightAccountDetailComponent implements OnInit { private initST(): STColumn[] { return [ - { title: '交易时间', index: 'createTime', type: 'date' }, - { title: '流水号', index: 'transactionNumber' }, - { title: '交易类型', index: 'tradeTypeLabel', className: 'text-center' }, - { title: '交易单号', index: 'businessNumber' }, - { title: '订单号', index: 'business2Number' }, - { title: '运单号', index: 'busine1ssNumber' }, - { title: '货主', index: 'busine11ssNumber' }, - { title: '所属项目', index: 'projectId' }, - { title: '收支类型', index: 'incomeTypeLabel', className: 'text-center' }, + { title: '交易时间', index: 'createTime', type: 'date', width: 170 }, + { title: '流水号', index: 'transactionNumber', width: 170 }, + { title: '交易类型', index: 'tradeTypeLabel', className: 'text-center', width: 140 }, + { title: '交易单号', index: 'businessNumber', width: 170 }, + { title: '订单号', index: 'business2Number', width: 170 }, + { title: '运单号', index: 'busine1ssNumber', width: 170 }, + { title: '货主', index: 'enterpriseName' , width: 170}, + { title: '所属项目', index: 'projectName' , width: 170}, + { title: '收支类型', index: 'incomeTypeLabel', className: 'text-center', width: 140 }, { title: '交易金额', index: 'amount', @@ -211,9 +220,9 @@ export class FreightAccountDetailComponent implements OnInit { className: 'text-right', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.accountBalance }) } }, - { title: '付款方', index: 'busine111ssNumber' }, - { title: '收款方', index: 'payeeName' }, - { title: '备注', index: 'projectId1' }, + { title: '付款方', index: 'busine111ssNumber' , width: 170}, + { title: '收款方', index: 'payeeName', width: 170 }, + { title: '备注', index: 'projectId1', width: 170 } ]; } } 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 c6357c07..0cda0ad8 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 @@ -52,7 +52,13 @@ - + +
+ 合计 项，收入 + ，支出 + +
+ \ 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 0a976ab6..d8c09e0d 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 @@ -19,6 +19,8 @@ export class PlatformAccountComponent implements OnInit { columns: STColumn[] = this.initST(); info: any = {}; + + static: any = {}; constructor(public service: FreightAccountService, private router: Router, private nzModalService: NzModalService) {} ngOnInit(): void { @@ -29,6 +31,7 @@ export class PlatformAccountComponent implements OnInit { if (this.sf) { Object.assign(requestOptions.body, { ...this.sf.value }); } + this.loadStatistics(requestOptions.body); return requestOptions; }; @@ -44,6 +47,14 @@ export class PlatformAccountComponent implements OnInit { }); } + loadStatistics(params: any) { + this.service.request(this.service.$api_get_platform_account_statistics, params).subscribe(res => { + if (res) { + this.static = res; + } + }); + } + /** * 重置表单 */ 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 428616c8..8003fe98 100644 --- a/src/app/routes/financial-management/services/freight-account.service.ts +++ b/src/app/routes/financial-management/services/freight-account.service.ts @@ -25,6 +25,8 @@ export class FreightAccountService extends ShipperBaseService { // 运营端获取平台余额 $api_get_platform_account_header = '/api/fcc/accountBalance/getPlatformBalanceByOperator'; // 运营端获取平台余额 + $api_get_platform_account_statistics = '/api/fcc/accountBalanceDetail/getAccountBalancePlatformIncomeDetailByOperator'; + // 运营端获取平台余额 $api_get_platform_account_page = '/api/fcc/accountBalance/getPlatformAccountBalanceByOperator'; // 运营端获取账户余额交易明细 $api_get_platform_account_detail_page = '/api/fcc/accountBalanceDetail/getAccountBalanceByPage'; From 6b890e638c5a8e763137eef7b746437c7e37b90a Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 2 Mar 2022 16:17:29 +0800 Subject: [PATCH 2/2] edit --- .../cost-management-detail.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.html b/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.html index 8f1ab456..f1b614cb 100644 --- a/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.html +++ b/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.html @@ -36,7 +36,7 @@ {{ costInfo?.armoeny | currency }} - + 基本信息（应付费用） {{ costInfo?.ltdName }}