From eb42a89f0f03797d558f64b3eeae5c74f60c2f95 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 19 Jan 2022 14:02:10 +0800 Subject: [PATCH 1/3] edit --- .../recharge-record.component.ts | 10 ++++- .../transaction-flow.component.ts | 44 ++++++++++++------- .../withdrawals-record.component.ts | 31 +++++++++---- .../services/freight-account.service.ts | 44 +++++++++++++++++-- .../etc-invoiced-list.component.ts | 20 +++++++-- .../etc-invoiced-logs.component.ts | 44 +++++++++++++++---- 6 files changed, 152 insertions(+), 41 deletions(-) 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 14cda69d..9f050cfe 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 @@ -176,8 +176,14 @@ export class RechargeRecordComponent implements OnInit { className: 'text-center', buttons: [ { - text: '查看回单' - // click: item => this.router.navigate(['/financial-management/freight-account/detail/1']) + text: '查看回单', + click: item => + this.service.getReceiptUrl(item.receiptUrl, { + bankType: item.bankType, + rmYll: item.roleId, + snglFlgCd: item.paySerialNumber, + bussType: '06' + }) } ] } 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 ba186628..a3375c70 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 @@ -27,7 +27,7 @@ export class TransactionFlowComponent implements OnInit { private nzModalService: NzModalService, private router: Router, private currencyPipe: CurrencyPipe - ) {} + ) {} ngOnInit(): void {} @@ -36,8 +36,8 @@ export class TransactionFlowComponent implements OnInit { Object.assign(requestOptions.body, { ...this.sf.value, createTime: { - start: this.sf.value.tcreateTimeime?.[0] || null, - end: this.sf.value.createTime?.[1] || null + start: this.sf.value.tcreateTimeime?.[0] || '', + end: this.sf.value.createTime?.[1] || '' } }); } @@ -217,22 +217,26 @@ export class TransactionFlowComponent implements OnInit { { title: '流水号', index: 'transactionNumber', width: 150 }, { title: '交易类型', index: 'tradeTypeLabel', width: 120 }, { title: '关联单号', index: 'businessNumber', width: 150 }, - { title: '账户类型', index: 'accountTypeLabel', width: 100 }, + { title: '账户类型', index: 'accountTypeLabel', width: 130 }, { title: '账户名称', index: 'roleName', width: 100 }, - { title: '所属项目', index: 'projectName', width: 100 }, - { title: '收支类型', index: 'incomeTypeLabel', width: 100 }, - { title: '交易金额', + { title: '所属项目', index: 'projectName', width: 140 }, + { title: '收支类型', index: 'incomeTypeLabel', width: 100, className: 'text-center' }, + { + title: '交易金额', index: 'amount', width: 100, - type: 'currency', - format: item => `${this.currencyPipe.transform(item.amount)}` - }, - { title: '账户余额', - type: 'currency', + type: 'widget', + className: 'text-right', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.amount }) } + }, + { + title: '账户余额', width: 150, - format: item => `${this.currencyPipe.transform(item.accountBalance)}` - }, - { title: '网络货运人', index: 'ltdName', width: 120 }, + type: 'widget', + className: 'text-right', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.accountBalance }) } + }, + { title: '网络货运人', index: 'ltdName', width: 140 }, { title: '银行类型', index: 'bankTypeLabel', width: 100 }, { title: '银行流水号', index: 'channelPaySn', width: 120 }, { @@ -242,8 +246,14 @@ export class TransactionFlowComponent implements OnInit { width: 120, buttons: [ { - text: '查看回单' - // click: item => this.refund(item) + text: '查看回单', + click: item => + this.service.getReceiptUrl(item.receiptUrl, { + bankType: item.bankType, + rmYll: item.roleId, + snglFlgCd: item.channelPaySn, + bussType: '07' + }) } ] } 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 416ef781..37e4b3b8 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 @@ -242,32 +242,47 @@ export class WithdrawalsRecordComponent implements OnInit { { title: '', index: 'key', type: 'checkbox' }, { title: '提现时间', index: 'createTime', width: 180 }, { title: '提现单号', index: 'refundApplyCode', width: 120 }, - { title: '网络货运人', index: 'ltdName', width: 120 }, + { title: '网络货运人', index: 'ltdName', width: 140 }, { title: '银行类型', index: 'bankTypeLabel', width: 100 }, { title: '账户类型', index: 'bankTypeLabel', width: 100 }, - { title: '账户名称', index: 'bankAccountName', width: 100 }, + { title: '账户名称', index: 'bankAccountName', width: 140 }, { title: '虚拟账户', index: 'virtualAccount', width: 100 }, - { title: '提现金额', index: 'amount', width: 100 }, - { title: '提现银行账户', render: 'bankCardNumber', width: 120 }, + { + title: '提现金额', + index: 'amount', + width: 120, + type: 'widget', + className: 'text-right', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.amount }) } + }, + { title: '提现银行账户', render: 'bankCardNumber', width: 180 }, { title: '提现状态', index: 'refundStatusLabel', width: 100 }, { title: '银行流水号', index: 'bankSerialNumber', width: 120 }, { title: '失败原因', index: 'failCause', width: 150 }, { title: '操作', + fixed: 'right', + className: 'text-center', width: '110px', buttons: [ { - text: '审核　　', + text: '审核', iif: item => item.refundStatus === '1', click: item => this.auditAction(item) }, { text: '查看回单', - iif: item => item.refundStatus === '3' - // click: item => this.auditAction(item) + iif: item => item.refundStatus === '3', + click: item => + this.service.getReceiptUrl(item.receiptUrl, { + bankType: item.bankType, + rmYll: item.userId, + snglFlgCd: item.bankSerialNumber, + bussType: '06' + }) }, { - text: '详情　　', + text: '详情', click: item => this.router.navigate(['/financial-management/withdrawals-record/detail/' + item.id]) } ] diff --git a/src/app/routes/financial-management/services/freight-account.service.ts b/src/app/routes/financial-management/services/freight-account.service.ts index d2ee5de4..5e398b64 100644 --- a/src/app/routes/financial-management/services/freight-account.service.ts +++ b/src/app/routes/financial-management/services/freight-account.service.ts @@ -1,5 +1,5 @@ /* - * @Description : + * @Description : * @Version : 1.0 * @Author : Shiming * @Date : 2022-01-18 15:57:44 @@ -53,7 +53,6 @@ export class FreightAccountService extends ShipperBaseService { // 运营端获取账户余额交易明细 $api_get_account_blance = '/api/fcc/accountBalanceDetail/getAccountBalanceByPage'; - // 查询费用单抬头 $api_get_cost_page = '/api/fcc/ficoFeeH/list/page'; // 根据费用头ID查询费用单及开票明细 @@ -91,7 +90,46 @@ export class FreightAccountService extends ShipperBaseService { // 收款单浏览表格明细 $api_get_ficoInpinvL_getListByBrmHid = '/api/fcc/ficoBrmYsk/getListByBrmHid'; - constructor(public injector: Injector,public eaCacheSrv: EACacheService) { + // 下载银行回单请求 + $api_download_receipt_apply = '/api/fcc/spd/callback/receiptApply'; + + constructor(public injector: Injector, public eaCacheSrv: EACacheService) { super(injector, eaCacheSrv); } + + getReceiptUrl(url: string, params: any) { + if (url) { + this.reviewPDF(url); + } else { + this.request(this.$api_download_receipt_apply, { ...params }).subscribe(res => { + if (res?.receiptUrl) { + this.reviewPDF(res.receiptUrl); + } else { + this.msgSrv.warning(res.statusMsg || '获取回单失败'); + } + }); + } + } + + reviewPDF(url: string) { + if (!url) { + return; + } + const uA = window.navigator.userAgent; // 判断浏览器内核 + const isIE = + /msie\s|trident\/|edge\//i.test(uA) && + !!('uniqueID' in document || 'documentMode' in document || 'ActiveXObject' in window || 'MSInputMethodContext' in window); + const objectUrl = url; + const a = document.createElement('a'); + document.body.appendChild(a); + a.href = objectUrl; + a.download = '面单.pdf'; + if (isIE) { + // 兼容IE11无法触发下载的问题 + (navigator as any).msSaveBlob(url, a.download); + } else { + a.click(); + } + a.remove(); + } } diff --git a/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.ts b/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.ts index b740463f..872de3e7 100644 --- a/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.ts +++ b/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.ts @@ -45,7 +45,7 @@ export class ETCInvoicedListComponent implements OnInit { nzOkText: '导出' }); modal.afterClose.subscribe(res => { - if(res){ + if (res) { this.st.load(); } }); @@ -155,8 +155,22 @@ export class ETCInvoicedListComponent implements OnInit { { title: '车辆信息', render: 'call12No' }, { title: '托运人', index: 'shipperAppUserName' }, { title: '网络货运人', index: 'enterpriseInfoName' }, - { title: '开票金额', index: 'invoicingAmount' }, - { title: '开票张数', index: 'invoicingNumber' }, + { + title: '开票金额', + index: 'invoicingAmount', + width: 100, + type: 'widget', + className: 'text-right', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.invoicingAmount }) } + }, + { + title: '开票张数', + index: 'invoicingNumber', + width: 100, + type: 'widget', + className: 'text-right', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.invoicingNumber }) } + }, { title: '申请时间', index: 'orderReceivingTime', type: 'date' }, { title: '操作', diff --git a/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.ts b/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.ts index 58a00dd9..0bb7ef77 100644 --- a/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.ts +++ b/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.ts @@ -156,20 +156,48 @@ export class ETCInvoicedLogsComponent implements OnInit { private initST(): STColumn[] { return [ { title: '发票号码', index: 'invoiceNum', width: 100, type: 'link', click: item => this.routeTo(item) }, - { title: '发票代码', index: 'invoiceCode', width: 100 }, - { title: '订单号', index: 'billCode', width: 100 }, - { title: '运单号', index: 'waybillCode', width: 100 }, + { title: '发票代码', index: 'invoiceCode', width: 130 }, + { title: '订单号', index: 'billCode', width: 140 }, + { title: '运单号', index: 'waybillCode', width: 140 }, { title: '入站口', index: 'enStationName', width: 100 }, { title: '出站口', index: 'exStationName', width: 100 }, { title: '司机', render: 'call3No', width: 140 }, { title: '车牌号', index: 'carNo', width: 100 }, { title: '里程（km）', index: 'mileage', width: 120 }, - { title: '交易id', index: 'tradeId', width: 100 }, - { title: '交易金额（元）', index: 'fee', width: 130 }, + { title: '交易id', index: 'tradeId', width: 200 }, + { + title: '交易金额（元）', + index: 'fee', + width: 130, + type: 'widget', + className: 'text-right', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.fee }) } + }, { title: '税率', index: 'taxRate', width: 90 }, - { title: '金额（元）', index: 'invoiceAmount', width: 120 }, - { title: '税额（元）', index: 'totalTaxAmount', width: 120 }, - { title: '价税合计（元）', index: 'totalAmount', width: 130 }, + { + title: '金额（元）', + index: 'invoiceAmount', + width: 120, + type: 'widget', + className: 'text-right', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.invoiceAmount }) } + }, + { + title: '税额（元）', + index: 'totalTaxAmount', + width: 120, + type: 'widget', + className: 'text-right', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.totalTaxAmount }) } + }, + { + title: '价税合计（元）', + index: 'totalAmount', + width: 130, + type: 'widget', + className: 'text-right font-weight-bold', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.totalAmount }) } + }, { title: '交易时间', index: 'exTime', type: 'date', width: 150 }, { title: '开票日期', index: 'invoiceMakeTime', type: 'date', width: 150 }, { title: '销售方', index: 'sellerName', width: 90 }, From 182e54e421048140dea5e0691eece38fa1e28901 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 19 Jan 2022 14:08:27 +0800 Subject: [PATCH 2/3] edit --- .../recharge-record/recharge-record.component.ts | 8 ++++---- .../withdrawals-record.component.ts | 11 +++++------ 2 files changed, 9 insertions(+), 10 deletions(-) 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 9f050cfe..83169344 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 @@ -158,14 +158,14 @@ export class RechargeRecordComponent implements OnInit { private initST(): STColumn[] { return [ { title: '充值时间', index: 'createTime', type: 'date', width: 180 }, - { title: '充值单号', index: 'rechargeNo', width: 120 }, - { title: '网络货运人', index: 'ltdName', width: 120 }, + { title: '充值单号', index: 'rechargeNo', width: 140 }, + { title: '网络货运人', index: 'ltdName', width: 160 }, { title: '银行类型', index: 'bankTypeLabel', width: 100 }, { title: '账户类型', index: 'accountTypeLabel', width: 100 }, - { title: '账户名称', index: 'rechargeName', width: 100 }, + { title: '账户名称', index: 'rechargeName', width: 140 }, { title: '虚拟账户', index: 'virtualAccount', width: 100 }, { title: '充值金额', index: 'rechargeAmount', width: 100 }, - { title: '充值银行账户', render: 'transferBankAccount', width: 140 }, + { title: '充值银行账户', render: 'transferBankAccount', width: 200 }, { title: '充值方式', index: 'payChannelLabel', width: 100 }, { title: '充值状态', index: 'rechargeStatusLabel', width: 100 }, { title: '银行流水号', index: 'paySerialNumber', width: 120 }, 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 37e4b3b8..864fae29 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 @@ -262,14 +262,8 @@ export class WithdrawalsRecordComponent implements OnInit { { title: '操作', fixed: 'right', - className: 'text-center', width: '110px', buttons: [ - { - text: '审核', - iif: item => item.refundStatus === '1', - click: item => this.auditAction(item) - }, { text: '查看回单', iif: item => item.refundStatus === '3', @@ -281,6 +275,11 @@ export class WithdrawalsRecordComponent implements OnInit { bussType: '06' }) }, + { + text: '审核', + iif: item => item.refundStatus === '1', + click: item => this.auditAction(item) + }, { text: '详情', click: item => this.router.navigate(['/financial-management/withdrawals-record/detail/' + item.id]) From ce64b4867481375fd0b061fd733d8225a1d3d504 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 19 Jan 2022 14:21:42 +0800 Subject: [PATCH 3/3] edit --- .../components/transaction-flow/transaction-flow.component.ts | 1 + 1 file changed, 1 insertion(+) 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 a3375c70..c53490d6 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 @@ -247,6 +247,7 @@ export class TransactionFlowComponent implements OnInit { buttons: [ { text: '查看回单', + iif: item => item.tradeType !== '9' && item.tradeType !== '10', click: item => this.service.getReceiptUrl(item.receiptUrl, { bankType: item.bankType,