diff --git a/src/app/routes/partner/account-management/components/account-detail/account-detail.component.html b/src/app/routes/partner/account-management/components/account-detail/account-detail.component.html
index 47e81e17..b232905e 100644
--- a/src/app/routes/partner/account-management/components/account-detail/account-detail.component.html
+++ b/src/app/routes/partner/account-management/components/account-detail/account-detail.component.html
@@ -11,13 +11,13 @@
{{headerTotalInfo?.ltdName}}
- {{headerTotalInfo?.allAmount |currency}}
+ {{headerTotalInfo?.allAmount |currency}}
- {{headerTotalInfo?.incomeAmount |currency}}
+ {{headerTotalInfo?.incomeAmount |currency}}
- {{headerTotalInfo?.payAmount |currency}}
+ {{headerTotalInfo?.payAmount |currency}}
diff --git a/src/app/routes/partner/account-management/components/list/list.component.ts b/src/app/routes/partner/account-management/components/list/list.component.ts
index 1a12dd8c..3d98844e 100644
--- a/src/app/routes/partner/account-management/components/list/list.component.ts
+++ b/src/app/routes/partner/account-management/components/list/list.component.ts
@@ -59,7 +59,7 @@ export class PartnerAccountManagementListComponent implements OnInit {
*/
initST() {
this.columns = [
- { title: '合伙人名称', index: 'userName', className: 'text-center', width: 250 },
+ { title: '合伙人名称', index: 'name', className: 'text-center', width: 250 },
{ title: '手机号', index: 'phone', className: 'text-center', width: 200 },
{
title: '账户总额(元)', index: 'allBalance', className: 'text-right', sort: true, width: 150, type: 'currency',
diff --git a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.html b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.html
index 0dc738c1..218de752 100644
--- a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.html
+++ b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.html
@@ -8,23 +8,27 @@
- {{summaryObj?.company}}
+ {{summaryObj?.taxno}}
- {{summaryObj?.totalRebate |currency}}
+ {{(summaryObj?.totalRebate?summaryObj?.totalRebate: 0 )|currency :'
+ '}}
- {{summaryObj?.totalRebate |currency}}
+ {{(summaryObj?.recordedAmount?summaryObj?.recordedAmount:0
+ )|currency:' '}}
- {{summaryObj?.taxPersonalSum |currency}}
+ {{(summaryObj?.taxPersonalSum?summaryObj?.taxPersonalSum:0
+ )|currency:' '}}
- {{summaryObj?.waitRecordedAmount |currency}}
+ {{(summaryObj?.waitRecordedAmount?summaryObj?.waitRecordedAmount:0)
+ |currency:' '}}
- {{summaryObj?.name}}
+ {{summaryObj?.ltdName}}
@@ -43,11 +47,11 @@
@@ -55,8 +59,8 @@
- {{detailRecord?.ltdName}}
- {{detailRecord?.totalRebate |currency: ' '}}
+ {{detailRecord?.ltdName}}
+ {{detailRecord?.totalRebate |currency: ' '}}
diff --git a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts
index e86373e0..cf4e33ec 100644
--- a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts
+++ b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts
@@ -19,6 +19,12 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit {
taxno: ''
};
+ footerSummary = {
+ total: 0,
+ income: 0,
+ spending: 0
+ }
+
detailRecord: any = {};
url = `/user`;
@@ -156,6 +162,7 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit {
this.billDetailColumns = [];
this.showBillDetail = true;
this.initBillDetailST();
+ this.detailRecord = record;
this.getBillDetail(record?.ltdId);
}
@@ -169,6 +176,7 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit {
handleCancel() {
this.showBillDetail = false;
+ this.detailRecord = {};
}
goBack() {