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 21:20:45 +08:00
parent 727bdd191c 56dad0348e
commit abf23dfc56
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html
View File

@ -52,7 +52,7 @@
(click)="this.rejectAction(selectedRows)">驳回</button> (click)="this.rejectAction(selectedRows)">驳回</button>
<button nz-button *ngIf="resourceStatus !=='4' && resourceStatus !=='5'" <button nz-button *ngIf="resourceStatus !=='4' && resourceStatus !=='5'"
(click)="changeAddress(selectedRows)">修改地址</button> (click)="changeAddress(selectedRows)">修改地址</button>
<button nz-button *ngIf="resourceStatus==='3' || !resourceStatus" (click)="printOrder(selectedRows)">打印面单</button> <button nz-button *ngIf="resourceStatus==='3' || !resourceStatus" (click)="printOrder(selectedRows)">快递下单</button>
</div> </div>
</ng-template> </ng-template>

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

@ -165,7 +165,7 @@ export class InvoiceRequestedComponent {
return; return;
} }
const modal = this.nzModalService.create({ const modal = this.nzModalService.create({
nzTitle: '打印面单', nzTitle: '快递下单',
nzContent: PrintOrderModalComponent, nzContent: PrintOrderModalComponent,
nzWidth: 650, nzWidth: 650,
nzComponentParams: { vatappcodes: this.selectedRows.map(item => item.vatappcode) }, nzComponentParams: { vatappcodes: this.selectedRows.map(item => item.vatappcode) },

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

@ -44,7 +44,7 @@ export class PrintOrderModalComponent implements OnInit {
if (res?.data?.length > 0) { if (res?.data?.length > 0) {
this.getPDF(res.data); this.getPDF(res.data);
} else { } else {
this.service.msgSrv.warning('请到快递信息页面打印'); this.service.msgSrv.success('快递下单成功，请到快递信息页面打印');
this.modal.destroy(true); this.modal.destroy(true);
} }
} }
@ -69,7 +69,7 @@ export class PrintOrderModalComponent implements OnInit {
if (res?.data?.length > 0) { if (res?.data?.length > 0) {
this.service.reviewPDF(res?.data); this.service.reviewPDF(res?.data);
} else { } else {
this.service.msgSrv.warning('请到快递信息页面打印'); this.service.msgSrv.success('快递下单成功，请到快递信息页面打印');
this.modal.destroy(true); this.modal.destroy(true);
} }
} }
@ -84,7 +84,7 @@ export class PrintOrderModalComponent implements OnInit {
this.modal.destroy(true); this.modal.destroy(true);
this.service.reviewPDF(res.pdfUrl); this.service.reviewPDF(res.pdfUrl);
} else { } else {
this.service.msgSrv.warning('请到快递信息页面打印'); this.service.msgSrv.success('快递下单成功，请到快递信息页面打印');
this.modal.destroy(true); this.modal.destroy(true);
} }
}); });