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:
wangshiming
2022-04-11 20:44:26 +08:00
parent 2e94b562f2 29cdcd0294
commit 08f6b42d17
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/app/routes/ticket-management/components/invoice-requested/print-order-modal/print-order-modal.component.ts
View File

@ -39,13 +39,15 @@ export class PrintOrderModalComponent implements OnInit {
sure() { sure() {
if (this.type === 1) { if (this.type === 1) {
this.service.request(this.service.$api_create_express, this.vatappcodes).subscribe(res => { this.service.request(this.service.$api_create_express + '?_allow_badcode=true', this.vatappcodes).subscribe(res => {
if (res?.length > 0) { if (res.status === 200) {
this.getPDF(res); if (res?.data?.length > 0) {
this.getPDF(res.data);
} else { } else {
this.service.msgSrv.warning('请到快递信息页面打印'); this.service.msgSrv.warning('请到快递信息页面打印');
this.modal.destroy(true); this.modal.destroy(true);
} }
}
}); });
} else { } else {
if (!this.data.rcontactInfo || !this.data.scontactInfo) { if (!this.data.rcontactInfo || !this.data.scontactInfo) {
@ -62,13 +64,15 @@ export class PrintOrderModalComponent implements OnInit {
delete this.data.scontactInfo.ltdId; delete this.data.scontactInfo.ltdId;
delete this.data.scontactInfo.shipperId; delete this.data.scontactInfo.shipperId;
delete this.data.scontactInfo.id; delete this.data.scontactInfo.id;
this.service.request(this.service.$api_get_order_summary, params).subscribe(res => { this.service.request(this.service.$api_get_order_summary + '?_allow_badcode=true', params).subscribe(res => {
if (res?.length > 0) { if (res.status === 200) {
this.service.reviewPDF(res); if (res?.data?.length > 0) {
this.service.reviewPDF(res?.data);
} else { } else {
this.service.msgSrv.warning('请到快递信息页面打印'); this.service.msgSrv.warning('请到快递信息页面打印');
this.modal.destroy(true); this.modal.destroy(true);
} }
}
}); });
} }
} }
@ -86,8 +90,6 @@ export class PrintOrderModalComponent implements OnInit {
}); });
} }
close() { close() {
this.modal.destroy(); this.modal.destroy();
} }