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

merge 1.0.0

Browse Source
This commit is contained in:
Taric Xin
2022-04-20 15:55:36 +08:00
parent f817b41e0a
commit 6b590c6021
2 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
proxy.conf.js
View File

@ -30,7 +30,7 @@ module.exports = {
// },
'//api': {
target: {
host: 'tms-api-dev.eascs.com',
host: 'tms-api-test.eascs.com',
protocol: 'https:',
port: 443
},

35
src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts
View File

@ -8,8 +8,8 @@ import { ShipperBaseService } from '@shared';
import { isTemplateRef } from 'ng-zorro-antd/core/util';
import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalService } from 'ng-zorro-antd/modal';
import { delay } from 'q';
import { pipe } from 'rxjs';
import { delay } from 'rxjs/operators';
import { TicketService } from '../../services/ticket.service';
import { PrintOrderModalComponent } from './print-order-modal/print-order-modal.component';
@ -283,21 +283,24 @@ export class InvoiceRequestedComponent {
if (item?.reconciliationUrl) {
this.service.reviewPDF(item.reconciliationUrl);
} else {
this.service.request(this.service.$api_downloadPdf, { vatappHId: item.id }).subscribe(res => {
if (res?.esignFlowId) {
delay(3000);
this.service
.request(this.service.$api_download_Reconciliatio_pdf, { vatappHId: item.id, esignFlowId: res.esignFlowId })
.subscribe(rs => {
if (rs?.reconciliationUrl) {
this.service.reviewPDF(rs.reconciliationUrl);
} else {
// this.service.msgSrv.warning('获取对账单失败');
}
});
}
// this.service.msgSrv.warning('获取对账单失败');
});
this.service
.request(this.service.$api_downloadPdf, { vatappHId: item.id })
.pipe(delay(3000))
.subscribe(res => {
if (res?.esignFlowId) {
this.service
.request(this.service.$api_download_Reconciliatio_pdf, { vatappHId: item.id, esignFlowId: res.esignFlowId })
.subscribe(rs => {
if (rs?.reconciliationUrl) {
this.service.reviewPDF(rs.reconciliationUrl);
} else {
// this.service.msgSrv.warning('获取对账单失败');
}
this.st.load(1);
});
}
// this.service.msgSrv.warning('获取对账单失败');
});
}
}