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:46:26 +08:00
parent eb47cc7c5d
commit 0710e2cca2
5 changed files with 309 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +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 { TicketService } from '../../services/ticket.service';
import { PrintOrderModalComponent } from './print-order-modal/print-order-modal.component';
@ -278,22 +280,25 @@ export class InvoiceRequestedComponent {
}
downloadPdf(item: any) {
this.service.request(this.service.$api_downloadPdf, { vatappHId: item.id }).subscribe(res => {
if (res?.reconciliationUrl) {
this.service.reviewPDF(res.reconciliationUrl);
} else {
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('获取对账单失败');
}
});
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('获取对账单失败');
}
});
});
}
}
/**