Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

Browse Source
This commit is contained in:
Lingzi
2022-04-06 11:22:02 +08:00
parent c8c2184003 1d1331d6db
commit a64112037d
2 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
proxy.conf.js
View File

@ -20,17 +20,7 @@ module.exports = {
// } // }
'//api': { '//api': {
target: { target: {
host: 'tms-api-dev.eascs.com', host: 'tms-api-test.eascs.com',
protocol: 'https:',
port: 443
},
secure: false,
changeOrigin: true,
logLevel: 'debug'
},
'//sascs': {
target: {
host: 'sascs-tj-tms-dev.obs.cn-south-1.myhuaweicloud.com',
protocol: 'https:', protocol: 'https:',
port: 443 port: 443
}, },

36
src/app/routes/financial-management/services/freight-account.service.ts
View File

@ -59,14 +59,14 @@ export class FreightAccountService extends ShipperBaseService {
// 拒绝提现 // 拒绝提现
$api_disagree_refund = '/api/fcc/refundApplicationOBC/disagreeRefund'; $api_disagree_refund = '/api/fcc/refundApplicationOBC/disagreeRefund';
// 查询订单退款申请表 // 查询订单退款申请表
$api_get_refund_record_page = '/api/fcc/billRefundApplication/list/page'; $api_get_refund_record_page = '/api/fcc/billRefundApplication/list/page';
// 同意退款 // 同意退款
$api_agree_refund_record= '/api/fcc/billRefundApplication/agreeRefund'; $api_agree_refund_record = '/api/fcc/billRefundApplication/agreeRefund';
// 不同意退款 // 不同意退款
$api_disagree_refund_record = '/api/fcc/billRefundApplication/disagreeRefund'; $api_disagree_refund_record = '/api/fcc/billRefundApplication/disagreeRefund';
// 重新发起 // 重新发起
$api_rebulid_refund_record = '/api/fcc/billRefundApplication/rebulid'; $api_rebulid_refund_record = '/api/fcc/billRefundApplication/rebulid';
// 查询充值信息表 // 查询充值信息表
$api_get_recharge_page = '/api/fcc/rechargeInfo/list/getPageByOperator'; $api_get_recharge_page = '/api/fcc/rechargeInfo/list/getPageByOperator';
@ -122,6 +122,7 @@ export class FreightAccountService extends ShipperBaseService {
// 下载银行回单请求 // 下载银行回单请求
$api_download_receipt_apply = '/api/fcc/spd/callback/receiptApply'; $api_download_receipt_apply = '/api/fcc/spd/callback/receiptApply';
$api_download_receipt_apply_byte = '/api/fcc/spd/callback/receiptApplyByte';
// 查询预收款余额 // 查询预收款余额
$api_get_advance_collection_page = '/api/fcc/ficoYskBla/list/page'; $api_get_advance_collection_page = '/api/fcc/ficoYskBla/list/page';
@ -137,12 +138,25 @@ export class FreightAccountService extends ShipperBaseService {
} }
getReceiptUrl(url: string, params: any) { getReceiptUrl(url: string, params: any) {
const { bankType, snglFlgCd } = params;
if (url) { if (url) {
this.reviewPDF(url); if (params?.bankType === '1') {
window.open(params?.receiptUrl);
} else if (params?.bankType === '2') {
this.exportFile({ bankType, receiptUrl: url, bankSerialNumber: snglFlgCd }, this.$api_download_receipt_apply_byte);
}
} else { } else {
this.request(this.$api_download_receipt_apply, { ...params }).subscribe(res => { this.request(this.$api_download_receipt_apply, { ...params }).subscribe(res => {
if (res?.receiptUrl) { if (res?.receiptUrl) {
this.reviewPDF(res.receiptUrl); if (bankType === '1') {
window.open(res?.receiptUrl);
} else if (bankType === '2') {
this.downloadFile(this.$api_download_receipt_apply_byte, {
bankType,
receiptUrl: res.receiptUrl,
bankSerialNumber: snglFlgCd
});
}
} else { } else {
this.msgSrv.warning(res.statusMsg || '获取回单失败'); this.msgSrv.warning(res.statusMsg || '获取回单失败');
} }
@ -163,7 +177,7 @@ export class FreightAccountService extends ShipperBaseService {
const a = document.createElement('a'); const a = document.createElement('a');
document.body.appendChild(a); document.body.appendChild(a);
a.href = objectUrl; a.href = objectUrl;
a.download = '回单.pdf'; a.download = `回单.pdf`;
if (isIE) { if (isIE) {
// 兼容IE11无法触发下载的问题 // 兼容IE11无法触发下载的问题
(navigator as any).msSaveBlob(url, a.download); (navigator as any).msSaveBlob(url, a.download);