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 2b3372de..47e81e17 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,17 +11,17 @@ {{headerTotalInfo?.ltdName}} - {{headerTotalInfo?.balance |currency}} + {{headerTotalInfo?.allAmount |currency}} - {{headerTotalInfo?.income |currency}} + {{headerTotalInfo?.incomeAmount |currency}} - {{headerTotalInfo?.spending |currency}} + {{headerTotalInfo?.payAmount |currency}} - {{headerTotalInfo?.name}} {{headerTotalInfo?.phone}} + {{headerTotalInfo?.name}}   {{headerTotalInfo?.phone}} @@ -46,20 +46,20 @@ [page]="{ show: true, showSize: true, pageSizes: [5,10, 20, 50, 100, 200, 500] }" [loading]="service.http.loading" [scroll]="{x:'1200px'}"> -
- {{item.amount | currency }}
-
+ {{item.amount | currency }}
+
- {{item.amount | currency:' ' }}
+
+ {{item.amount | currency:' ' }}
-
{{item?.accountBalance |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 c93b8aab..4e595c8b 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 @@ -136,15 +136,15 @@ export class PartnerAccountManagementAccountDetailComponent implements OnInit { initST() { this.columns = [ { 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: 'transactionNumber', className: 'text-center', width: 180 }, + { title: '交易类型', index: 'tradeTypeLabel', className: 'text-center', width: 150 }, + { title: '交易单号', index: 'businessNumber', className: 'text-center', width: 180 }, { 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: '交易金额', render: 'amount', className: 'text-center', width: 150 }, + { title: '账户余额', render: 'accountBalance', className: 'text-center', width: 150 }, { title: '付款方', index: 'payName', className: 'text-center', width: 200 }, - { title: '收款方', index: 'payeeName', className: 'text-center', width: 120 }, + { title: '收款方', index: 'payeeName', className: 'text-center', width: 200 }, ]; } resetSF() { 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 e4e84339..b811832d 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 @@ -17,13 +17,13 @@ [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }" [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"> + [loading]="service.http.loading" multiSort>
{{item.allBalance | currency:' '}}
{{item.unEntryAmount | currency:' + [routerLink]="'/partner/account-management/am/recorded/detail/'+item?.roleId">{{item.unEntryAmount | 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 56881170..1a12dd8c 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,9 +61,15 @@ 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: 150 }, - { title: '待入账余额(元)', render: 'unEntryAmount', className: 'text-right', sort: true, width: 150 }, - { title: '可用余额(元)', render: 'availableBalance', className: 'text-right', sort: true, width: 150 }, + { + title: '账户总额(元)', index: 'allBalance', className: 'text-right', sort: true, width: 150, type: 'currency', + }, + { + title: '待入账余额(元)', render: 'unEntryAmount', className: 'text-right', width: 150, + }, + { + title: '可用余额(元)', index: 'availableBalance', className: 'text-right', sort: true, width: 150, type: 'currency' + }, { title: '虚拟账户', index: 'virtualAccount', className: 'text-center', width: 220 }, { title: '操作', @@ -90,7 +96,6 @@ export class PartnerAccountManagementListComponent implements OnInit { * @param _record 当前行信息 */ viewVirtual(_record: any) { - console.log() const modalRef = this.modal.create({ nzTitle: '虚拟账户明细', nzContent: PartnerAccountManagementVirtualAccountDetailComponent, @@ -100,8 +105,8 @@ export class PartnerAccountManagementListComponent implements OnInit { nzWidth: '85%', nzFooter: null }); - modalRef.afterClose.subscribe(result => { - }); + // modalRef.afterClose.subscribe(result => { + // }); } /** 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 5fbc2ce6..feab2ad6 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 @@ -55,10 +55,16 @@ {{accountInfo?.name}} {{totalInfo?.spending |currency: ' '}} - - -
{{item?.amount |currency :' '}}
+ + +
+ {{item?.year }}年 + {{item?.month }}月 +
+
+ +
{{item?.profitAmountSum |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 a3dc1911..3b7611af 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 @@ -1,5 +1,5 @@ import { Component, OnInit, ViewChild } from '@angular/core'; -import { Router } from '@angular/router'; +import { ActivatedRoute, Router } from '@angular/router'; import { STColumn, STComponent } from '@delon/abc/st'; import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema, Widget } from '@delon/form'; import { ModalHelper, _HttpClient } from '@delon/theme'; @@ -32,12 +32,16 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit { columns: STColumn[] = []; billDetailColumns: STColumn[] = []; showBillDetail = false; + billDetailList = []; + roleId = ''; - constructor(public service: AccountManagemantService, public router: Router) { } + constructor(public service: AccountManagemantService, public router: Router, public ar: ActivatedRoute) { + this.roleId = this.ar.snapshot.params.id; + } get reqParams() { - return { ...this.sf?.value }; + return { ...this.sf?.value, roleId: this.roleId }; } get billDetailReqParams() { @@ -46,7 +50,6 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit { ngOnInit(): void { this.initSF(); this.initST(); - this.initBillDetailST(); } initSF() { @@ -96,8 +99,8 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit { initBillDetailST() { this.billDetailColumns = [ - { title: '账单月份', index: 'carNo', className: 'text-center', width: '40%' }, - { title: '返佣金额(元)', render: 'amount', className: 'text-center', width: '40%' }, + { title: '账单月份', render: 'month', className: 'text-center', width: '40%' }, + { title: '返佣金额(元)', render: 'profitAmountSum', className: 'text-center', width: '40%' }, { title: '操作', className: 'text-center', width: '20%', buttons: [ { @@ -122,6 +125,19 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit { search() { this.st.load(1); } + + /** + * 获取账单明细 + */ + getBillDetail(ltdId: string) { + this.service.request(this.service.$api_get_bill_detail, { ltdId }).subscribe(res => { + if (res) { + this.billDetailList = res; + } + }) + } + + export() { } /** @@ -137,10 +153,16 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit { * @param record 当前行 */ viewAccountDetail(record: any) { + this.billDetailColumns = []; this.showBillDetail = true; + this.initBillDetailST(); + this.getBillDetail(record?.ltdId); + + } handleCancel() { this.showBillDetail = false; + } goBack() { window.history.go(-1); 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 ae98a690..21bfeea2 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 @@ -34,5 +34,5 @@ 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 8095df64..6840cddd 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 @@ -167,20 +167,13 @@ export class PartnerAccountManagementVirtualAccountDetailComponent implements On * @param _record 当前行信息 */ viewDetail(_record: any) { - // 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; + // this.router.navigate([`/partner/account-management/am/detail/${_record?.roleId}`], { + // queryParams: { + // channelSource: _record?.accountType, + // bankType: _record?.bankType, + // ltdId: _record?.ltdId + // } + // }); window.open(location.origin + `/#/partner/account-management/am/detail/${_record?.roleId}?ltdId=${_record?.ltdId}&channelSource=${_record?.accountType}&bankType=${_record?.bankType}`); } 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 0c3359a3..f85ee094 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 @@ -12,6 +12,7 @@ export class AccountManagemantService extends BaseService { $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`;// 账户明细头部汇总 + $api_get_bill_detail = `/api/bpc/partnerIncomeDetail/findPartnerWaitIncomeByOperator`; // 查看账单明细 constructor(public injector: Injector) { super(injector) diff --git a/src/app/routes/partner/recorded/components/detail/detail.component.html b/src/app/routes/partner/recorded/components/detail/detail.component.html index 714483bc..8bfafd61 100644 --- a/src/app/routes/partner/recorded/components/detail/detail.component.html +++ b/src/app/routes/partner/recorded/components/detail/detail.component.html @@ -16,11 +16,11 @@
-

待审批

-
+

{{formData?.stsLabel}}

+
+ '0' ?'审核':'复审'}}
@@ -61,14 +61,14 @@ {{formData?.stsLabel}} - + - {{formData?.expressName}} - - 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 6e9a5b99..bbfad88e 100644 --- a/src/app/routes/partner/recorded/components/detail/detail.component.ts +++ b/src/app/routes/partner/recorded/components/detail/detail.component.ts @@ -88,7 +88,7 @@ export class PartnerRecordedDetailComponent implements OnInit { this.service.msgSrv.warning('请填写拒绝原因 '); return; } - this.audit({ id: params, rejectReason: this.msg, sts: '3' }, () => { + this.audit({ ids: params, rejectReason: this.msg, sts: '3' }, () => { modal.destroy(true); }, '审核拒绝成功'); } @@ -97,7 +97,7 @@ export class PartnerRecordedDetailComponent implements OnInit { label: '通过', type: 'primary', onClick: () => { - this.audit({ id: params, rejectReason: this.msg, sts: this.formData?.sts === '0' ? 1 : 2 }, () => { + this.audit({ ids: params, rejectReason: this.msg, sts: this.formData?.sts === '0' ? 1 : 2 }, () => { modal.destroy(true); }, `${this.formData?.sts === '1' ? '审核' : '复审'}通过成功`); } 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 ce514695..2de32d76 100644 --- a/src/app/routes/partner/recorded/components/record/record.component.html +++ b/src/app/routes/partner/recorded/components/record/record.component.html @@ -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 9751a9cb..d4e0d8de 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.sts !== '0' })); + // data = data.map(node => ({ ...node, disabled: node.sts !== '0' })); return data; }; @@ -148,7 +148,7 @@ export class PartnerRecordedRecordComponent implements OnInit { this.service.msgSrv.warning('请填写拒绝原因 '); return; } - this.audit({ id: params, rejectReason: this.msg, sts: '3' }, () => { + this.audit({ ids: params, rejectReason: this.msg, sts: '3' }, () => { modal.destroy(); this.st.load(1); }, '审核拒绝成功'); @@ -170,7 +170,7 @@ export class PartnerRecordedRecordComponent implements OnInit { label: '通过', type: 'primary', onClick: () => { - this.audit({ id: params, rejectReason: this.msg, sts: '1' }, () => { + this.audit({ ids: params, rejectReason: this.msg, sts: '1' }, () => { modal.destroy(); this.st.load(1); }, '审核通过成功'); @@ -238,10 +238,10 @@ export class PartnerRecordedRecordComponent implements OnInit { default: '', enum: [ { label: '全部', value: '' }, - { label: '待初审', value: 0 }, - { label: '待复核', value: 1 }, - { label: '已入账', value: 2 }, - { label: '已拒绝', value: 3 }, + { label: '待初审', value: '0' }, + { label: '待复核', value: '1' }, + { label: '已入账', value: '2' }, + { label: '已拒绝', value: '3' }, ], ui: { widget: 'select', @@ -309,7 +309,7 @@ export class PartnerRecordedRecordComponent implements OnInit { }, { title: '提交时间', index: 'submitTime', width: 160, className: 'text-center' }, - { title: '入账状态', index: 'stsLabel', width: 100, className: 'text-center' }, + { title: '入账状态', index: 'stsLabel', width: 120, className: 'text-center' }, { title: '操作', fixed: 'right',