diff --git a/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts b/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts index e8eeb206..0538f015 100644 --- a/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts +++ b/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts @@ -576,10 +576,10 @@ export class orderManagementVoucherViewComponent implements OnInit { openlaod(value: any) { if (value === 1) { // 逻辑: 先判断电子提货单是否已生成,文件为空则触发签署文件,再查询是否签署成功,成功则退出,刷新页面,再次点击为预览 - let time = 10 - setInterval (function () { - time-=1 - }, 1000); //反复执行函数本身 + let time = 10; + setInterval(function () { + time -= 1; + }, 1000); //反复执行函数本身 const modal = this.modalService.success({ nzTitle: '电子装货单签署中!', nzContent: ` @@ -593,22 +593,23 @@ export class orderManagementVoucherViewComponent implements OnInit { case 1: case '1': setTimeout(() => { - this.service.request(this.service.$api_getBillTakeEsignFile, [this.datas?.id]).subscribe(res => { - if(res[0]?.esignFlowStatus == '2') { - this.service.msgSrv.success('电子装货单已生效!') - this.modal.destroy(true); - } - }); - modal.destroy() - }, 10000); - return ; - case 2: - modal.destroy() + this.service.request(this.service.$api_getBillTakeEsignFile, [this.datas?.id]).subscribe(res => { + if (res[0]?.esignFlowStatus == '2') { + this.service.msgSrv.success('电子装货单已生效!'); + this.modal.destroy(true); + } + }); + modal.destroy(); + }, 10000); + return; + case 2: + modal.destroy(); + return; + case '13': + case 13: + this.service.msgSrv.error('签署异常!'); + modal.destroy(); return; - case 13: - this.service.msgSrv.error('签署异常!') - modal.destroy() - return; } } }); @@ -620,36 +621,42 @@ export class orderManagementVoucherViewComponent implements OnInit { document.body.removeChild(a); //下载完成移除元素 } } else { - // 逻辑: 先判断电子提货单是否已生成,文件为空则触发签署文件,再查询是否签署成功,成功则退出,刷新页面,再次点击为预览 - let time = 10 - setInterval (function () { - time-=1 - }, 1000); //反复执行函数本身 - const modal = this.modalService.success({ - nzTitle: '电子卸货单签署中!', - nzContent: ` + // 逻辑: 先判断电子提货单是否已生成,文件为空则触发签署文件,再查询是否签署成功,成功则退出,刷新页面,再次点击为预览 + let time = 10; + setInterval(function () { + time -= 1; + }, 1000); //反复执行函数本身 + const modal = this.modalService.success({ + nzTitle: '电子卸货单签署中!', + nzContent: ` 请等待${time}秒后自动关闭 ` - }); + }); if (!this.datas?.unloadingElectronicsLadingBillFilePath) { this.service.request(this.service.$api_createBillDischargeGoods, [this.datas?.id]).subscribe(res => { if (res) { switch (res[0]?.esignFlowStatus) { case 1: case '1': - setTimeout(() => { this.service.request(this.service.$api_getBillDischargeEsignFile, [this.datas?.id]).subscribe(res => { - if(res[0]?.esignFlowStatus == '2') { - this.service.msgSrv.success('电子卸货单已生效!') - this.modal.destroy(true); + if (res[0]?.esignFlowStatus == '2') { + this.service.msgSrv.success('电子卸货单已生效!'); + this.modal.destroy(true); } }); - modal.destroy() + modal.destroy(); }, 10000); - - return ; + + return; case 2: + modal.destroy(); + + return; + case '13': + case 13: + this.service.msgSrv.error('签署异常!'); + modal.destroy(); return; } }