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 feab2ad6..0dc738c1 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 @@ -6,22 +6,25 @@ - + - {{accountInfo?.company}} + {{summaryObj?.company}} - - {{totalInfo?.balance |currency}} + + {{summaryObj?.totalRebate |currency}} - - {{totalInfo?.income |currency}} + + {{summaryObj?.totalRebate |currency}} - - {{totalInfo?.spending |currency}} + + {{summaryObj?.taxPersonalSum |currency}} + + + {{summaryObj?.waitRecordedAmount |currency}} - {{accountInfo?.name}} {{accountInfo?.phone}} + {{summaryObj?.name}} @@ -29,7 +32,7 @@
-
@@ -52,8 +55,8 @@
- {{accountInfo?.name}} - {{totalInfo?.spending |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 3b7611af..f6bc1b47 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 @@ -10,17 +10,16 @@ import { AccountManagemantService } from '../../services/account-managemant.serv templateUrl: './recorded-detail.component.html', }) export class PartnerAccountManagementRecordedDetailComponent implements OnInit { - totalInfo: any = { - balance: 0, - income: 1500, - spending: 2400, - total: 186 + summaryObj: any = { + waitRecordedAmount: 0, + totalRebate: 0, + taxPersonalSum: 0, + recordedAmount: 0, + ltdName: '', + taxno: '' }; - accountInfo = { - name: '张三', - phone: '13812345678', - company: '天津怡亚通物流科技有限公司(平安)' - } + + detailRecord: any = {}; url = `/user`; schema: SFSchema = {}; @@ -37,11 +36,12 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit { constructor(public service: AccountManagemantService, public router: Router, public ar: ActivatedRoute) { this.roleId = this.ar.snapshot.params.id; + } get reqParams() { - return { ...this.sf?.value, roleId: this.roleId }; + return { ...this.sf?.value, partnerId: this.roleId }; } get billDetailReqParams() { @@ -50,6 +50,7 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit { ngOnInit(): void { this.initSF(); this.initST(); + this.getInvoiceSummary(); } initSF() { @@ -74,13 +75,13 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit { */ initST() { this.columns = [ - { title: '网络货运人', index: 'carNo', className: 'text-center', width: 200 }, - { title: '银行类型', render: 'carModelLabel', className: 'text-center', width: 150 }, - { title: '虚拟账户', render: 'carModelLabel', className: 'text-center', width: 200 }, - { title: '返佣总额(元)', render: 'carModelLabel', className: 'text-center', width: 120 }, - { title: '已入账金额(元)', index: 'remark', className: 'text-center', width: 180 }, - { title: '代缴个税(元)', render: 'approvalStatus1', className: 'text-center', width: 180 }, - { title: '待入账金额(元)', render: 'amount', className: 'text-right', width: 180 }, + { title: '网络货运人', index: 'ltdName', className: 'text-center', width: 200 }, + { title: '银行类型', render: 'bankTypeLabel', className: 'text-center', width: 150 }, + { title: '虚拟账户', render: 'fictitiousAccount', className: 'text-center', width: 200 }, + { title: '返佣总额(元)', index: 'totalRebate', className: 'text-center', width: 120, type: 'currency' }, + { title: '已入账金额(元)', index: 'recordedAmount', className: 'text-center', width: 180, type: 'currency' }, + { title: '代缴个税(元)', index: 'taxPersonalSum', className: 'text-center', width: 180, type: 'currency' }, + { title: '待入账金额(元)', index: 'waitRecordedAmount', className: 'text-right', width: 180, type: 'currency' }, { title: '操作', className: 'text-center', width: 300, buttons: [ @@ -157,9 +158,16 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit { this.showBillDetail = true; this.initBillDetailST(); this.getBillDetail(record?.ltdId); - - } + + getInvoiceSummary() { + this.service.request(this.service.$api_get_invoice_summary, { partnerId: this.roleId }).subscribe(res => { + if (res) { + this.summaryObj = res; + } + }) + } + handleCancel() { this.showBillDetail = false; 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 f85ee094..f7fa89b0 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 @@ -13,6 +13,8 @@ export class AccountManagemantService extends BaseService { $api_get_account_detail_footer_summary = `/api/bpc/accountBalancePartner/getAccountBalancePartnerIncomeDetailByOperator`;// 账户明细脚部汇总 $api_get_account_detail_header_summary = `/api/bpc/accountBalancePartner/getAccountBalancePartnerAmountByOperator`;// 账户明细头部汇总 $api_get_bill_detail = `/api/bpc/partnerIncomeDetail/findPartnerWaitIncomeByOperator`; // 查看账单明细 + $api_get_invoice_summary = `/api/bpc/partnerInvoiceEntry/oprationEntrySummary`; // 入账明细汇总 + $api_get_invoice_detail_page = `/api/bpc/partnerInvoiceEntry/oprationEntryDetail`; // 待入账明细列表 constructor(public injector: Injector) { super(injector)