diff --git a/src/app/routes/download/components/list/list.component.ts b/src/app/routes/download/components/list/list.component.ts index 91643098..00b3626b 100644 --- a/src/app/routes/download/components/list/list.component.ts +++ b/src/app/routes/download/components/list/list.component.ts @@ -99,8 +99,7 @@ export class DownloadComponentsListComponent implements OnInit { width: '170px', className: 'text-center', buttons: [ - { text: '下载', click: (_record) => this.download(_record), iif: (item) => item.status === 1 }, - { text: '删除', click: (_record) => this.delOne(_record), iif: (item) => item.status !== 0 }, + { text: '下载', click: (_record) => this.download(_record)}, ], }, ]; 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 649e61cc..88d44c85 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 @@ -45,8 +45,12 @@ export class DriverAccountComponent implements OnInit { this.modal.create({ nzTitle: '账户明细', nzContent: AccountDetailComponent, + nzNoAnimation: true, nzWidth: 600, - nzComponentParams: {}, + nzComponentParams: { + params: { accountType: 2, roleId: item.roleId }, + url: '/api/fcc/accountBalance/getDriverAccountBalanceDetailByOperator' + }, nzFooter: null }); } diff --git a/src/app/routes/financial-management/components/freight-account/freight-account.component.ts b/src/app/routes/financial-management/components/freight-account/freight-account.component.ts index b80f4f32..abd75998 100644 --- a/src/app/routes/financial-management/components/freight-account/freight-account.component.ts +++ b/src/app/routes/financial-management/components/freight-account/freight-account.component.ts @@ -52,7 +52,10 @@ export class FreightAccountComponent implements OnInit { nzContent: AccountDetailComponent, nzNoAnimation: true, nzWidth: 600, - nzComponentParams: {}, + nzComponentParams: { + params: { accountType: 1, roleId: item.roleId }, + url: '/api/fcc/accountBalance/getShipperAccountBalanceDetailByOperator' + }, nzFooter: null }); } 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 a1fe9788..a3565c95 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 @@ -244,7 +244,7 @@ export class WithdrawalsRecordComponent implements OnInit { { title: '提现单号', index: 'refundApplyCode', width: 120 }, { title: '网络货运人', index: 'ltdName', width: 120 }, { title: '银行类型', index: 'bankTypeLabel', width: 100 }, - { title: '账户类型', index: 'accountType', width: 100 }, + { title: '账户类型', index: 'bankTypeLabel', width: 100 }, { title: '账户名称', index: 'bankAccountName', width: 100 }, { title: '虚拟账户', index: 'virtualAccount', width: 100 }, { title: '提现金额', index: 'amount', width: 100 }, diff --git a/src/app/routes/usercenter/components/driver/driver.component.ts b/src/app/routes/usercenter/components/driver/driver.component.ts index 1a4cf535..9bcfc700 100644 --- a/src/app/routes/usercenter/components/driver/driver.component.ts +++ b/src/app/routes/usercenter/components/driver/driver.component.ts @@ -102,12 +102,18 @@ export class UserCenterComponentsDriverComponent implements OnInit { } showAccountDetail(item: any) { + console.log(item); + this.modal.create({ nzTitle: '资金账户', nzContent: AccountDetailComponent, nzNoAnimation: true, nzWidth: 600, - nzComponentParams: { isCanCreate: true }, + nzComponentParams: { + isCanCreate: true, + url: '/api/fcc/accountBalance/getDriverAccountDetailByOperator', + params: { accountType: 2, roleId: item.appUserId } + }, nzFooter: null }); } diff --git a/src/app/routes/usercenter/components/freight/list/list.component.ts b/src/app/routes/usercenter/components/freight/list/list.component.ts index e42efa59..1dd2178d 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.ts +++ b/src/app/routes/usercenter/components/freight/list/list.component.ts @@ -74,7 +74,11 @@ export class FreightComponentsListComponent implements OnInit { nzContent: AccountDetailComponent, nzNoAnimation: true, nzWidth: 600, - nzComponentParams: { isCanCreate: true }, + nzComponentParams: { + isCanCreate: true, + url: '/api/fcc/accountBalance/getShipperAccountBalanceDetailByOperator', + params: { accountType: 1, roleId: item.appUserId } + }, nzFooter: null }); } diff --git a/src/app/shared/components/account-detail/account-detail.component.html b/src/app/shared/components/account-detail/account-detail.component.html index 14db892e..dda3ae5a 100644 --- a/src/app/shared/components/account-detail/account-detail.component.html +++ b/src/app/shared/components/account-detail/account-detail.component.html @@ -1,11 +1,11 @@ - {{ item.promotersTelephone || '添加' }} + {{ item.promotersTelephone || '添加' }} {{ item.promotersTelephone }} @@ -13,7 +13,7 @@ - {{ item.promotersTelephone || '添加' }} + {{ item.promotersTelephone || '添加' }} {{ item.promotersTelephone }} diff --git a/src/app/shared/components/account-detail/account-detail.component.ts b/src/app/shared/components/account-detail/account-detail.component.ts index eeb43548..6b8f3631 100644 --- a/src/app/shared/components/account-detail/account-detail.component.ts +++ b/src/app/shared/components/account-detail/account-detail.component.ts @@ -1,6 +1,7 @@ import { CurrencyPipe } from '@angular/common'; import { Component, OnInit, ViewChild } from '@angular/core'; import { STComponent, STColumn, STRequestOptions } from '@delon/abc/st'; +import { NzModalRef } from 'ng-zorro-antd/modal'; import { BaseService } from '../../services'; @Component({ @@ -13,35 +14,74 @@ export class AccountDetailComponent implements OnInit { st!: STComponent; columns: STColumn[] = []; - url = ''; + url = '/api/fcc/accountBalance/getDriverAccountDetailByOperator'; isCanCreate = false; - constructor(public service: BaseService, private currencyPipe: CurrencyPipe) { + params: any = {}; + constructor(public service: BaseService, private currencyPipe: CurrencyPipe, private modalHelp: NzModalRef) { this.initST(); } ngOnInit(): void {} - createPA(item: any) {} - createPF(item: any) {} + createAccount(item: any, type: '1' | '2') { + const params = { + ltdId: item.ltdId, + roleId: item.roleId, + projectId: item.projectId, + enterpriseId: item.enterpriseId, + ctfId: this.params.ctfId, + clientName: this.params.clientName + }; + if (this.params.accountType === 1) { + this.service + .request('/api/fcc/accountBalance/saveByShipper', { + accountType: this.params.accountType, + bankType: type, + isProjectMain: 0, + ...params + }) + .subscribe(res => { + if (res) { + this.service.msgSrv.success('开户成功'); + this.modalHelp.destroy(); + } + }); + } + if (this.params.accountType === 2) { + this.service + .request('/api/fcc/accountBalance/saveByDriver', { + accountType: this.params.accountType, + bankType: type, + ...params + }) + .subscribe(res => { + if (res) { + this.service.msgSrv.success('开户成功'); + this.modalHelp.destroy(); + } + }); + } + } beforeReq = (requestOptions: STRequestOptions) => { + Object.assign(requestOptions.body, this.params); return requestOptions; }; initST() { this.columns = [ - { title: '网络货运人', index: 'phone', className: 'text-center' }, + { title: '网络货运人', index: 'ltdName', className: 'text-center' }, { title: '平安账户余额', - render: 'ltdName', + render: 'paBalance', type: 'currency', - format: item => `${this.currencyPipe.transform(item.availableBalance)}` + format: item => `${this.currencyPipe.transform(item.paBalance)}` }, { title: '浦发账户余额', - render: 'bankTypeLabel', + render: 'pfBalance', type: 'currency', - format: item => `${this.currencyPipe.transform(item.availableBalance)}` + format: item => `${this.currencyPipe.transform(item.pfBalance)}` } ]; }