fix bug
This commit is contained in:
@ -15,7 +15,7 @@ import {
|
||||
import { apiConf } from '@conf/api.conf';
|
||||
import { _HttpClient } from '@delon/theme';
|
||||
import { NzMessageService } from 'ng-zorro-antd/message';
|
||||
import { NzModalRef } from 'ng-zorro-antd/modal';
|
||||
import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
|
||||
import { Observable, Observer } from 'rxjs';
|
||||
import { EAEnvironmentService } from '@shared';
|
||||
import { OrderManagementService } from '../../../services/order-management.service';
|
||||
@ -46,7 +46,8 @@ export class orderManagementVoucherViewComponent implements OnInit {
|
||||
public http: _HttpClient,
|
||||
public service: OrderManagementService,
|
||||
private datePipe: DatePipe,
|
||||
private envSrv: EAEnvironmentService
|
||||
private envSrv: EAEnvironmentService,
|
||||
private modalService: NzModalService
|
||||
) {}
|
||||
|
||||
ngOnInit(): void {
|
||||
@ -581,13 +582,25 @@ export class orderManagementVoucherViewComponent implements OnInit {
|
||||
switch (res[0]?.esignFlowStatus) {
|
||||
case 1:
|
||||
case '1':
|
||||
this.service.msgSrv.success('电子装货单签署中!')
|
||||
let time = 0
|
||||
setInterval (function () {
|
||||
time+=1
|
||||
}, 1000); //反复执行函数本身
|
||||
const modal = this.modalService.success({
|
||||
nzTitle: '电子装货单签署中!',
|
||||
nzContent: `
|
||||
请等待${time}秒后自动关闭
|
||||
`
|
||||
});
|
||||
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()
|
||||
}, 5000);
|
||||
return ;
|
||||
case 2:
|
||||
|
||||
@ -610,13 +623,26 @@ export class orderManagementVoucherViewComponent implements OnInit {
|
||||
switch (res[0]?.esignFlowStatus) {
|
||||
case 1:
|
||||
case '1':
|
||||
this.service.msgSrv.success('电子卸货单签署中!')
|
||||
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);
|
||||
}
|
||||
let time = 0
|
||||
setInterval (function () {
|
||||
time+=1
|
||||
}, 1000); //反复执行函数本身
|
||||
const modal = this.modalService.success({
|
||||
nzTitle: '电子卸货单签署中!',
|
||||
nzContent: `
|
||||
请等待${time}秒后自动关闭
|
||||
`
|
||||
});
|
||||
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);
|
||||
}
|
||||
});
|
||||
modal.destroy()
|
||||
}, 5000);
|
||||
|
||||
return ;
|
||||
case 2:
|
||||
return;
|
||||
|
||||
@ -228,25 +228,6 @@ export class FreightConfigComponent implements OnInit {
|
||||
asyncData: () => this.shipperservice.getNetworkFreightForwarder()
|
||||
}
|
||||
},
|
||||
goodsSurchargeRatio: {
|
||||
title: '货源单费率',
|
||||
type: 'string',
|
||||
ui: {
|
||||
placeholder: '请输入',
|
||||
showRequired: false
|
||||
}
|
||||
},
|
||||
contractSurchargeRatio: {
|
||||
title: '合同单费率',
|
||||
type: 'string',
|
||||
ui: {
|
||||
placeholder: '请输入',
|
||||
showRequired: false,
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
}
|
||||
},
|
||||
createTime: {
|
||||
title: '注册时间',
|
||||
type: 'string',
|
||||
@ -255,9 +236,6 @@ export class FreightConfigComponent implements OnInit {
|
||||
format: 'yyyy-MM-dd',
|
||||
placeholder: '请选择',
|
||||
nzShowTime: true,
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
} as SFDateWidgetSchema
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user