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 8669a08f..2b3372de 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
@@ -1,27 +1,27 @@
-
- {{accountInfo?.company}}
+ {{headerTotalInfo?.ltdName}}
- {{totalInfo?.balance |currency}}
+ {{headerTotalInfo?.balance |currency}}
- {{totalInfo?.income |currency}}
+ {{headerTotalInfo?.income |currency}}
- {{totalInfo?.spending |currency}}
+ {{headerTotalInfo?.spending |currency}}
- {{accountInfo?.name}} {{accountInfo?.phone}}
+ {{headerTotalInfo?.name}} {{headerTotalInfo?.phone}}
@@ -40,7 +40,7 @@
- - {{item.amount | currency }}
+ {{item.amount | currency }}
+
+ {{item?.accountBalance |currency}}
+
+
diff --git a/src/app/routes/partner/account-management/components/account-detail/account-detail.component.ts b/src/app/routes/partner/account-management/components/account-detail/account-detail.component.ts
index 860ea7c4..c93b8aab 100644
--- a/src/app/routes/partner/account-management/components/account-detail/account-detail.component.ts
+++ b/src/app/routes/partner/account-management/components/account-detail/account-detail.component.ts
@@ -1,4 +1,5 @@
import { Component, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
import { STColumn, STComponent } from '@delon/abc/st';
import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
import { ModalHelper, _HttpClient } from '@delon/theme';
@@ -10,17 +11,20 @@ import { AccountManagemantService } from '../../services/account-managemant.serv
styleUrls: ['./account-detail.component.less']
})
export class PartnerAccountManagementAccountDetailComponent implements OnInit {
- totalInfo: any = {
- balance: 0,
- income: 1500,
- spending: 2400,
- total: 186
+ headerTotalInfo: any = {
+ allAmount: 0,
+ incomeAmount: 0,
+ payAmount: 0,
+ name: '',
+ ltdName: '',
+ phone: ''
};
- accountInfo = {
- name: '张三',
- phone: '13812345678',
- company: '天津怡亚通物流科技有限公司(平安)'
- }
+ footerTotalInfo: any = {
+ incomeAmount: 0,
+ payAmount: 0,
+ total: 0
+ };
+
url = `/user`;
schema: SFSchema = {};
@@ -31,14 +35,27 @@ export class PartnerAccountManagementAccountDetailComponent implements OnInit {
columns: STColumn[] = [];
+ roleId = '';
+ bankType = '';
+ channelSource = '';
+ ltdId = '';
+ constructor(public service: AccountManagemantService, public ar: ActivatedRoute) {
- constructor(public service: AccountManagemantService) { }
+ this.roleId = this.ar.snapshot.params.id;
+ this.ar.queryParamMap.subscribe((res: any) => {
+ this.ltdId = res?.params?.ltdId;
+ this.channelSource = res?.params?.channelSource;
+ this.bankType = res?.params?.bankType;
+ })
+ }
get reqParams() {
- return { ...this.sf?.value };
+ return { ...this.sf?.value, roleId: this.roleId, ltdId: this.ltdId, channelSource: this.channelSource, bankType: this.bankType };
}
ngOnInit(): void {
+ this.getHeaderSummary();
+ this.getFooterSummary();
this.initSF();
this.initST();
}
@@ -59,21 +76,21 @@ export class PartnerAccountManagementAccountDetailComponent implements OnInit {
format: 'yyyy-MM-dd',
} as SFDateWidgetSchema,
},
- abnormalCause: {
+ transactionNumber: {
title: '流水号',
type: 'string',
ui: {
placeholder: '请输入',
},
},
- abnormalCause1: {
+ businessNumber: {
title: '交易单号',
type: 'string',
ui: {
placeholder: '请输入',
},
},
- bankType: {
+ tradeType: {
type: 'string',
title: '交易类型',
default: '',
@@ -90,7 +107,7 @@ export class PartnerAccountManagementAccountDetailComponent implements OnInit {
},
},
},
- bankType1: {
+ incomeType: {
type: 'string',
title: '收支类型',
default: '',
@@ -118,16 +135,16 @@ export class PartnerAccountManagementAccountDetailComponent 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: '账户余额', render: 'approvalStatus3', className: 'text-right', width: 180 },
- { title: '付款方', index: 'approvalStatus4', className: 'text-center', width: 200 },
- { title: '收款方', index: 'approvalStatus4', className: 'text-center', width: 120 },
+ { title: '交易时间', index: 'createTime', className: 'text-center', width: 200 },
+ { title: '流水号', index: 'transactionNumber', className: 'text-center', width: 150 },
+ { title: '交易类型', index: 'tradeTypeLabel', className: 'text-center', width: 200 },
+ { title: '交易单号', index: 'businessNumber', className: 'text-center', width: 120 },
+ { title: '备注', index: 'tradeContent', className: 'text-center', width: 180 },
+ { title: '收支类型', index: 'incomeTypeLabel', className: 'text-center', width: 180 },
+ { title: '交易金额', render: 'amount', className: 'text-center', width: 180 },
+ { title: '账户余额', render: 'accountBalance', className: 'text-center', width: 180 },
+ { title: '付款方', index: 'payName', className: 'text-center', width: 200 },
+ { title: '收款方', index: 'payeeName', className: 'text-center', width: 120 },
];
}
resetSF() {
@@ -145,6 +162,34 @@ export class PartnerAccountManagementAccountDetailComponent implements OnInit {
this._$expand = !this._$expand;
this.sf?.setValue('/_$expand', this._$expand);
}
+ /**
+ * 头部汇总
+ */
+ getHeaderSummary() {
+ const params = {
+ roleId: this.roleId,
+ ltdId: this.ltdId,
+ channelSource: this.channelSource,
+ bankType: this.bankType
+ };
+ this.service.request(this.service.$api_get_account_detail_header_summary, { ...params }).subscribe(res => {
+ if (res) {
+ this.headerTotalInfo = res;
+ console.log(res);
+ }
+ })
+ }
+ /**
+ * 脚部汇总
+ */
+ getFooterSummary() {
+ this.service.request(this.service.$api_get_account_detail_footer_summary, this.reqParams).subscribe(res => {
+ if (res) {
+ this.footerTotalInfo = res;
+ }
+ })
+ }
+
search() {
this.st.load(1);
@@ -154,4 +199,6 @@ export class PartnerAccountManagementAccountDetailComponent implements OnInit {
goBack() {
window.history.go(-1);
}
+
+
}
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 7e58f5e1..1f2e53b8 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
@@ -61,13 +61,13 @@ export class PartnerAccountManagementListComponent implements OnInit {
this.columns = [
{ 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: '账户总额(元)', render: 'allBalance', className: 'text-right', sort: true, width: 150 },
+ { title: '待入账余额(元)', render: 'unEntryAmount', className: 'text-right', sort: true, width: 150 },
+ { title: '可用余额(元)', render: 'availableBalance', className: 'text-right', sort: true, width: 150 },
{ title: '虚拟账户', index: 'virtualAccount', className: 'text-center', width: 200 },
{
title: '操作',
- width: 100,
+ width: 150,
buttons: [
{
text: '虚拟账户明细',
@@ -90,12 +90,12 @@ export class PartnerAccountManagementListComponent implements OnInit {
* @param _record 当前行信息
*/
viewVirtual(_record: any) {
-
+ console.log()
const modalRef = this.modal.create({
nzTitle: '虚拟账户明细',
nzContent: PartnerAccountManagementVirtualAccountDetailComponent,
nzComponentParams: {
- roleId: _record?.roleId
+ roleId: _record?.roleId,
},
nzWidth: '85%',
nzFooter: null
diff --git a/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.ts b/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.ts
index 5d77e7ba..8095df64 100644
--- a/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.ts
+++ b/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.ts
@@ -1,4 +1,5 @@
import { Component, OnInit, ViewChild } from '@angular/core';
+import { Router } from '@angular/router';
import { STColumn, STComponent } from '@delon/abc/st';
import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
import { _HttpClient } from '@delon/theme';
@@ -19,9 +20,10 @@ export class PartnerAccountManagementVirtualAccountDetailComponent implements On
columns: STColumn[] = [];
roleId = '';
_$expand = false;
+ record = {};
constructor(public shipperservice: ShipperBaseService, public service: AccountManagemantService,
- private modalRef: NzModalRef) {
+ private modalRef: NzModalRef, public router: Router) {
}
get reqParams() {
@@ -52,7 +54,7 @@ export class PartnerAccountManagementVirtualAccountDetailComponent implements On
placeholder: '请输入',
},
},
- abnormalCause2: {
+ ltdId: {
title: '网络货运人',
type: 'string',
default: '',
@@ -81,7 +83,7 @@ export class PartnerAccountManagementVirtualAccountDetailComponent implements On
},
},
},
- abnormalCause3: {
+ virtualAccount: {
title: '虚拟账户',
type: 'string',
ui: {
@@ -165,7 +167,21 @@ export class PartnerAccountManagementVirtualAccountDetailComponent implements On
* @param _record 当前行信息
*/
viewDetail(_record: any) {
- window.open(location.origin + `/#/partner/account-management/am/detail/${_record?.id}`);
+ // record: {
+ // channelSource: _record?.accountType,
+ // roleId: _record?.roleId,
+ // bankType: _record?.bankType,
+ // ltdId: _record?.ltdId
+ // }
+ this.router.navigate([`/partner/account-management/am/detail/${_record?.roleId}`], {
+ queryParams: {
+ channelSource: _record?.accountType,
+ bankType: _record?.bankType,
+ ltdId: _record?.ltdId
+ }
+ });
+ return;
+ window.open(location.origin + `/#/partner/account-management/am/detail/${_record?.roleId}?ltdId=${_record?.ltdId}&channelSource=${_record?.accountType}&bankType=${_record?.bankType}`);
}
close() {
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 8b9d9acb..0c3359a3 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
@@ -9,6 +9,9 @@ export class AccountManagemantService extends BaseService {
$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`;// 提现记录
+ $api_get_account_detail_page = `/api/bpc/accountBalancePartner/getAccountBalancePartnerByOperatorPage`;// 账户明细
+ $api_get_account_detail_footer_summary = `/api/bpc/accountBalancePartner/getAccountBalancePartnerIncomeDetailByOperator`;// 账户明细脚部汇总
+ $api_get_account_detail_header_summary = `/api/bpc/accountBalancePartner/getAccountBalancePartnerAmountByOperator`;// 账户明细头部汇总
constructor(public injector: Injector) {
super(injector)
diff --git a/src/app/routes/partner/recorded/components/detail/detail.component.ts b/src/app/routes/partner/recorded/components/detail/detail.component.ts
index f2782ef5..6e9a5b99 100644
--- a/src/app/routes/partner/recorded/components/detail/detail.component.ts
+++ b/src/app/routes/partner/recorded/components/detail/detail.component.ts
@@ -19,12 +19,12 @@ export class PartnerRecordedDetailComponent implements OnInit {
constructor(public service: RecordedService, private route: ActivatedRoute, private nzModalService: NzModalService) {
this.id = route.snapshot.params.id;
- this.loadRefundDetail(this.id);
+ this.getRecordedDetail(this.id);
}
ngOnInit(): void { }
- loadRefundDetail(id: string) {
+ getRecordedDetail(id: string) {
this.service.request(this.service.$api_get_recorded_record_detail, { id }).subscribe(res => {
if (res) {
this.formData = res;
@@ -106,7 +106,7 @@ export class PartnerRecordedDetailComponent implements OnInit {
});
modal.afterClose.subscribe((res: any) => {
if (res) {
- this.loadRefundDetail(this.id);
+ this.getRecordedDetail(this.id);
}
});
}
diff --git a/src/app/routes/partner/recorded/components/record/record.component.html b/src/app/routes/partner/recorded/components/record/record.component.html
index e6233910..ce514695 100644
--- a/src/app/routes/partner/recorded/components/record/record.component.html
+++ b/src/app/routes/partner/recorded/components/record/record.component.html
@@ -32,7 +32,7 @@
已选择
- {{ selectedRows.length }} 条数据 累计提现 {{
+ {{ selectedRows.length }} 条数据,累计入账 {{
totalCallNo }}
@@ -44,7 +44,7 @@
{{ item.bankName }}
{{ item.bankCardNumber }}
diff --git a/src/app/routes/partner/recorded/components/record/record.component.ts b/src/app/routes/partner/recorded/components/record/record.component.ts
index 7e154473..9751a9cb 100644
--- a/src/app/routes/partner/recorded/components/record/record.component.ts
+++ b/src/app/routes/partner/recorded/components/record/record.component.ts
@@ -70,7 +70,7 @@ export class PartnerRecordedRecordComponent implements OnInit {
};
afterRes = (data: any[], rawData?: any) => {
- data = data.map(node => ({ ...node, disabled: node.refundStatus !== '1' }));
+ data = data.map(node => ({ ...node, disabled: node.sts !== '0' }));
return data;
};
@@ -104,7 +104,7 @@ export class PartnerRecordedRecordComponent implements OnInit {
}
let totalCallNo = 0;
this.selectedRows.forEach((item => {
- totalCallNo = new Big(this.totalCallNo).plus(item?.amount).parse();
+ totalCallNo = new Big(this.totalCallNo).plus(item?.entryAmount).parse();
}));
this.totalCallNo = totalCallNo;
} else if (e.type === 'loaded') {
@@ -125,6 +125,10 @@ export class PartnerRecordedRecordComponent implements OnInit {
}
auditAction(item?: any, type: string = '1') {
+ if (!item && this.selectedRows.length === 0) {
+ this.service.msgSrv.warning('请选择需要审核的记录');
+ return;
+ }
this.msg = '';
let params: Array = [];
if (item) {
@@ -252,7 +256,7 @@ export class PartnerRecordedRecordComponent implements OnInit {
widget: 'select',
placeholder: '请选择',
allowClear: true,
- asyncData: () => this.shipperSrv.getNetworkFreightForwarder(),
+ asyncData: () => this.shipperSrv.getNetworkFreightForwarder({}, true),
}
},
submitTime: {
@@ -313,7 +317,7 @@ export class PartnerRecordedRecordComponent implements OnInit {
buttons: [
{
text: '审核',
- iif: item => item.refundStatus === '0',
+ iif: item => item.sts === '0',
click: item => this.auditAction(item)
},
{
@@ -335,7 +339,7 @@ export class PartnerRecordedRecordComponent implements OnInit {
*/
audit(params: any, callback: Function, msg = '成功') {
this.service
- .request(this.service.$api_audit_recored, ...params)
+ .request(this.service.$api_audit_recored, { ...params })
.subscribe(res => {
if (res) {
this.service.msgSrv.success(msg);
diff --git a/src/app/routes/partner/recorded/services/recorded.service.ts b/src/app/routes/partner/recorded/services/recorded.service.ts
index bb27a3dc..dcf5393f 100644
--- a/src/app/routes/partner/recorded/services/recorded.service.ts
+++ b/src/app/routes/partner/recorded/services/recorded.service.ts
@@ -6,8 +6,8 @@ import { BaseService } from '@shared';
})
export class RecordedService extends BaseService {
- $api_get_recorded_page = `/api/bpc/partnerInvoice/getDetail`; // 查询合伙人发票入账主表
- $api_get_recorded_record_detail = `api/bpc/partnerInvoice/getDetailByOpration`; // 入账记录详情
+ $api_get_recorded_page = `/api/bpc/partnerInvoiceEntry/queryInvoiceEntrylist`; // 查询合伙人发票入账主表
+ $api_get_recorded_record_detail = `/api/bpc/partnerInvoice/getDetailByOpration`; // 入账记录详情
$api_disagree_recorded = ``; // 拒绝审核
$api_agree_recorded = ``; // 同意审核
$api_audit_recored = `/api/bpc/partnerInvoiceEntry/oprationAudit`; // 审核单据