diff --git a/src/app/routes/partner/account-management/components/list/list.component.html b/src/app/routes/partner/account-management/components/list/list.component.html index d071efc2..e4e84339 100644 --- a/src/app/routes/partner/account-management/components/list/list.component.html +++ b/src/app/routes/partner/account-management/components/list/list.component.html @@ -18,21 +18,18 @@ [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"> - - {{item.yskmoney}} + +
{{item.allBalance | currency:' '}}
- -
{{item.approvalStatus1 | currency:' '}}
-
- + {{item.yskmoney | currency:' + [routerLink]="'/partner/account-management/am/recorded/detail/'+item?.id">{{item.unEntryAmount | currency:' '}} - - -
{{item.yskmoney | currency:' '}}
+ +
{{item.availableBalance | 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 84e281a5..7e58f5e1 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 @@ -36,14 +36,14 @@ export class PartnerAccountManagementListComponent implements OnInit { initSF() { this.schema = { properties: { - abnormalCause: { + userName: { title: '合伙人名称', type: 'string', ui: { placeholder: '请输入', }, }, - abnormalCause1: { + phone: { title: '手机号', type: 'string', ui: { @@ -59,14 +59,15 @@ export class PartnerAccountManagementListComponent implements OnInit { */ initST() { this.columns = [ - { title: '合伙人名称', index: 'carNo', className: 'text-center', width: 300 }, - { title: '手机号', render: 'carModelLabel', className: 'text-center', width: 200 }, - { title: '账户总额(元)', render: 'approvalStatus1', className: 'text-right', sort: true, width: 200 }, - { title: '待入账余额(元)', render: 'approvalStatus2', className: 'text-right', sort: true, width: 200 }, - { title: '可用余额(元)', render: 'approvalStatus3', className: 'text-right', sort: true, width: 250 }, - { title: '虚拟账户', index: 'approvalStatus4', className: 'text-center', width: 200 }, + { title: '合伙人名称', index: 'userName', className: 'text-center', width: 250 }, + { title: '手机号', index: 'phone', className: 'text-center', width: 200 }, + { title: '账户总额(元)', render: 'allBalance', className: 'text-right', sort: true, width: 200 }, + { title: '待入账余额(元)', render: 'unEntryAmount', className: 'text-right', sort: true, width: 200 }, + { title: '可用余额(元)', render: 'availableBalance', className: 'text-right', sort: true, width: 250 }, + { title: '虚拟账户', index: 'virtualAccount', className: 'text-center', width: 200 }, { title: '操作', + width: 100, buttons: [ { text: '虚拟账户明细', @@ -94,7 +95,7 @@ export class PartnerAccountManagementListComponent implements OnInit { nzTitle: '虚拟账户明细', nzContent: PartnerAccountManagementVirtualAccountDetailComponent, nzComponentParams: { - id: _record?.id + roleId: _record?.roleId }, nzWidth: '85%', nzFooter: null diff --git a/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.html b/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.html index 649ddc1c..ae98a690 100644 --- a/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.html +++ b/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.html @@ -14,12 +14,23 @@
- + [loading]="service.http.loading"> + +
+ {{item.allBalance}} +
+
+ +
+ {{item.availableBalance}} +
+
+
- diff --git a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts index 6a428518..8abf556f 100644 --- a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts +++ b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts @@ -5,6 +5,7 @@ import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form'; import { NzModalService } from 'ng-zorro-antd/modal'; import { FreightAccountService } from 'src/app/routes/financial-management/services/freight-account.service'; import Big from 'src/app/shared/utils/deal-precision'; +import { AccountManagemantService } from '../../services/account-managemant.service'; @Component({ @@ -27,7 +28,7 @@ export class PartnerAccountManagementWithdrawalsRecordComponent implements OnIni refundStatus: any = ''; msg = ''; - constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router, public ar: ActivatedRoute) { } + constructor(public service: FreightAccountService, public amService: AccountManagemantService, private nzModalService: NzModalService, private router: Router, public ar: ActivatedRoute) { } ngOnInit(): void { } diff --git a/src/app/routes/partner/account-management/services/account-managemant.service.ts b/src/app/routes/partner/account-management/services/account-managemant.service.ts index d88522a1..8b9d9acb 100644 --- a/src/app/routes/partner/account-management/services/account-managemant.service.ts +++ b/src/app/routes/partner/account-management/services/account-managemant.service.ts @@ -6,7 +6,10 @@ import { BaseService } from '@shared'; }) export class AccountManagemantService extends BaseService { - $api_get_account_management_page = `/api/fcc/ficoBrmH/list/page`; + $api_get_account_management_page = `/api/bpc/accountBalancePartner/getPartnerAccountBalanceByOperator`; // 账户管理 + $api_get_virtual_detail_page = `/api/bpc/accountBalancePartner/getPartnerAccountBalanceInfoByOperator`;//虚拟账户明细 + $api_get_withdraw_record_page = `/api/fcc/refundApplicationOBC/list/partnerPage`;// 提现记录 + constructor(public injector: Injector) { super(injector) }