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

fix bug

Browse Source
This commit is contained in:
wangshiming
2022-04-24 10:27:44 +08:00
parent 8626dcaabf
commit af9f6b1400
2 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts
View File

@ -525,30 +525,27 @@ export class orderManagementVoucherViewComponent implements OnInit {
}); });
this.service.request(this.service.$api_createBillEsignGoods, [this.datas?.id]).subscribe(res => { this.service.request(this.service.$api_createBillEsignGoods, [this.datas?.id]).subscribe(res => {
if (res) { if (res) {
switch (res[0]?.esignFlowStatus) { res.forEach((element:any) => {
case 1: switch (element?.esignFlowStatus) {
case '1': case '1':
setTimeout(() => { setTimeout(() => {
this.service.request(this.service.$api_getBillGoodsEsignFile, [this.datas?.id]).subscribe(res => { this.service.request(this.service.$api_getBillGoodsEsignFile, [this.datas?.id]).subscribe(res => {
if (res[0]?.esignFlowStatus == '2') { if (res[0]?.esignFlowStatus == '2') {
this.service.msgSrv.success('生成电子单据成功！'); this.service.msgSrv.success('生成电子单据成功！');
this.modal.destroy(true); this.modal.destroy(true);
} }
}); });
}, 9000);
return;
default:
this.service.msgSrv.error('签署异常!');
modal.destroy(); modal.destroy();
}, 9000); return;
}
return; });
case 2:
modal.destroy();
return;
default:
this.service.msgSrv.error('电子卸货单签署异常!');
modal.destroy();
return;
}
} else { } else {
this.service.msgSrv.error('电子卸货单签署异常!'); this.service.msgSrv.error('签署异常!');
modal.destroy(); modal.destroy();
} }
}); });

2
src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.ts
View File

@ -208,6 +208,8 @@ export class ETCInvoicedLogsComponent implements OnInit {
className: 'text-right font-weight-bold', className: 'text-right font-weight-bold',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.totalAmount }) } widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.totalAmount }) }
}, },
{ title: '进站时间', index: 'trafficStartTime', type: 'date', width: 150 },
{ title: '出站时间', index: 'trafficEndTime', type: 'date', width: 150 },
{ title: '交易时间', index: 'exTime', type: 'date', width: 150 }, { title: '交易时间', index: 'exTime', type: 'date', width: 150 },
{ title: '开票日期', index: 'invoiceMakeTime', type: 'date', width: 150 }, { title: '开票日期', index: 'invoiceMakeTime', type: 'date', width: 150 },
{ title: '销售方', index: 'sellerName', width: 150 }, { title: '销售方', index: 'sellerName', width: 150 },