From 6bb5f3808e3d38a4d07e6f2f30d8a2b48601ab83 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Mon, 28 Mar 2022 17:47:04 +0800 Subject: [PATCH] e --- .../driver-account-detail.component.ts | 9 +++++++-- .../driver-account/driver-account.component.ts | 5 +++-- .../recharge-record/recharge-record.component.ts | 3 ++- .../transaction-flow/transaction-flow.component.ts | 3 ++- .../withdrawals-detail/withdrawals-detail.component.ts | 3 ++- .../withdrawals-record/withdrawals-record.component.ts | 3 ++- .../withdrawals-detail/withdrawals-detail.component.ts | 6 +++--- .../withdrawals-record/withdrawals-record.component.ts | 3 ++- 8 files changed, 23 insertions(+), 12 deletions(-) diff --git a/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts b/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts index 0a384b6c..679bd575 100644 --- a/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts +++ b/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts @@ -165,7 +165,9 @@ export class DriverAccountDetailComponent implements OnInit { { title: '交易时间', index: 'createTime', type: 'date' }, { title: '流水号', index: 'channelPaySn' }, { title: '交易类型', index: 'tradeTypeLabel', className: 'text-center' }, - { title: '关联单号', index: 'businessNumber' }, + { title: '交易单号', index: 'businessNumber' }, + { title: '订单号', index: 'orderSn' }, + { title: '运单号', index: 'transportSn' }, { title: '收支类型', index: 'incomeTypeLabel', className: 'text-center' }, { title: '交易金额', @@ -182,7 +184,10 @@ export class DriverAccountDetailComponent implements OnInit { type: 'widget', className: 'text-right', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.accountBalance }) } - } + }, + { title: '付款方', index: 'payName'}, + { title: '收款方', index: 'payeeName' }, + { title: '备注', index: 'tradeContent' }, ]; } } diff --git a/src/app/routes/financial-management/components/driver-account/driver-account.component.ts b/src/app/routes/financial-management/components/driver-account/driver-account.component.ts index 6ab9883f..7861fd50 100644 --- a/src/app/routes/financial-management/components/driver-account/driver-account.component.ts +++ b/src/app/routes/financial-management/components/driver-account/driver-account.component.ts @@ -164,7 +164,7 @@ export class DriverAccountComponent implements OnInit { { title: '司机姓名', width: 140, index: 'name' }, { title: '证件号码', width: 140, index: 'idNo' }, { title: '手机号', width: 140, index: 'phone' }, - { title: '网络货运人', width: 140, index: 'ltdName' }, + { title: '网络货运人', width: 180, index: 'ltdName' }, { title: '银行类型', width: 120, index: 'bankTypeLabel' }, { title: '虚拟账户', width: 140, index: 'virtualAccount' }, { @@ -186,13 +186,14 @@ export class DriverAccountComponent implements OnInit { { title: '本月累计提现金额', index: 'withdrawBalance', - width: 150, + width: 160, type: 'widget', className: 'text-right', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.withdrawBalance }) } }, { title: '账户总余额', render: 'availableBalance', className: 'text-right', width: 180 }, { title: '创建时间', index: 'createTime', type: 'date', width: 150 }, + { title: '状态', index: 'stateDeletedLabel', width: 120 }, { title: '操作', width: 120, diff --git a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts index c73b8833..85e4899b 100644 --- a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts +++ b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts @@ -190,7 +190,8 @@ export class RechargeRecordComponent implements OnInit { rmYll: item.roleId, snglFlgCd: item.paySerialNumber2, bussType: '06', - ltdId: item.ltdId + ltdId: item.ltdId, + accountType: item.accountType }) } ] diff --git a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts index 92cb10f7..98465648 100644 --- a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts +++ b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts @@ -253,7 +253,8 @@ export class TransactionFlowComponent { rmYll: item.roleId, snglFlgCd: item.channelPaySn, bussType: item.tradeType === '7' ? '05' : item.tradeType === '8' ? '06' : '07', - ltdId: item.ltdId + ltdId: item.ltdId, + accountType: item.accountType }) } ] diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts index 77f2cfd9..85144954 100644 --- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts +++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts @@ -99,7 +99,8 @@ export class WithdrawalsDetailComponent implements OnInit { rmYll: this.formData.userId, snglFlgCd: this.formData.coreSerNo, bussType: '06', - ltdId: this.formData.ltdId + ltdId: this.formData.ltdId, + accountType: this.formData.accountType }); } diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts index 42734ac9..907c9ad5 100644 --- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts +++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts @@ -297,7 +297,8 @@ export class WithdrawalsRecordComponent { rmYll: item.userId, snglFlgCd: item.coreSerNo, bussType: '06', - ltdId: item.ltdId + ltdId: item.ltdId, + accountType: item.accountType }) } ] diff --git a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts index 95657e1e..baf83686 100644 --- a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts +++ b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts @@ -2,7 +2,6 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { FreightAccountService } from 'src/app/routes/financial-management/services/freight-account.service'; - @Component({ selector: 'app-partner-account-management-withdrawals-detail', templateUrl: './withdrawals-detail.component.html', @@ -18,7 +17,7 @@ export class PartnerAccountManagementWithdralDetailComponent implements OnInit { this.loadRefundDetail(id); } - ngOnInit(): void { } + ngOnInit(): void {} loadRefundDetail(id: string) { this.service.request(this.service.$api_get_refund_detail, { id }).subscribe(res => { @@ -77,7 +76,8 @@ export class PartnerAccountManagementWithdralDetailComponent implements OnInit { rmYll: this.formData.userId, snglFlgCd: this.formData.coreSerNo, bussType: '06', - ltdId: this.formData.ltdId + ltdId: this.formData.ltdId, + accountType: this.formData.accountType }); } 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 4bb0a0d9..ad7c8ead 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 @@ -311,7 +311,8 @@ export class PartnerAccountManagementWithdrawalsRecordComponent implements OnIni rmYll: item.userId, snglFlgCd: item.coreSerNo, bussType: '06', - ltdId: item.ltdId + ltdId: item.ltdId, + accountType: item.accountType }) }, {