mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-20 13:26:08 +00:00
Improve
This commit is contained in:
@@ -453,9 +453,10 @@ export class CreateProcessPage implements OnInit {
|
||||
}
|
||||
}
|
||||
else if(this.task.activityInstanceName =='Concluir Despacho' ||
|
||||
this.task.activityInstanceName == 'Concluir Parecer' ||
|
||||
this.task.activityInstanceName =='Concluir Deferimento' ||
|
||||
this.task.activityInstanceName =='Reapreciar Deferimento'
|
||||
this.task.activityInstanceName == 'Concluir Parecer' ||
|
||||
this.task.activityInstanceName =='Concluir Deferimento' ||
|
||||
this.task.activityInstanceName =='Reapreciar Deferimento' ||
|
||||
this.task.activityInstanceName == 'Tarefa de Deferimento'
|
||||
) {
|
||||
|
||||
body = {
|
||||
@@ -470,6 +471,7 @@ export class CreateProcessPage implements OnInit {
|
||||
|
||||
} else {
|
||||
alert('!!!')
|
||||
console.log('this.task', this.task)
|
||||
}
|
||||
|
||||
console.log(body);
|
||||
|
||||
@@ -210,7 +210,15 @@ export class PedidoPage implements OnInit {
|
||||
},
|
||||
translucent: true
|
||||
});
|
||||
return await popover.present();
|
||||
await popover.present();
|
||||
|
||||
popover.onDidDismiss().then(( res =>{
|
||||
|
||||
if( res['data'] == 'close') {
|
||||
this.goBack()
|
||||
}
|
||||
|
||||
}))
|
||||
}
|
||||
|
||||
async repreciar(note:string, documents:any) {
|
||||
|
||||
@@ -98,7 +98,7 @@
|
||||
</div>
|
||||
<div class="exp-bottom-detail">
|
||||
<div class="exp-remetente">
|
||||
<ion-label>{{task.Senders}} sender</ion-label>
|
||||
<ion-label>{{task.Senders}}</ion-label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="exp-middle-detail">
|
||||
|
||||
@@ -108,7 +108,7 @@ export class RequestOptionsPage implements OnInit {
|
||||
}
|
||||
|
||||
async openExpedientActionsModal(taskAction: any, task: any) {
|
||||
this.popoverController.dismiss();
|
||||
|
||||
//this.modalController.dismiss();
|
||||
let classs;
|
||||
if( window.innerWidth <= 800) {
|
||||
@@ -129,14 +129,15 @@ export class RequestOptionsPage implements OnInit {
|
||||
await modal.present();
|
||||
modal.onDidDismiss().then(res=> {
|
||||
console.log(res['data']);
|
||||
if(res['data']=='openDiscart'){
|
||||
if(res['data']=='openDiscart') {
|
||||
console.log('open discart');
|
||||
|
||||
this.distartExpedientModal();
|
||||
this.modalController.dismiss()
|
||||
|
||||
}
|
||||
|
||||
this.modalController.dismiss('close')
|
||||
this.popoverController.dismiss('close')
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user