From 2f0789c087589a053f6c80e3bfb17b0a4c2c4514 Mon Sep 17 00:00:00 2001
From: Jack <jack.su@pollex.com.tw>
Date: 星期三, 01 十二月 2021 17:54:30 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.0.10:29418/pcalife/PAM
---
PAMapp/components/BackActionBar.vue | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/PAMapp/components/BackActionBar.vue b/PAMapp/components/BackActionBar.vue
index a57cb21..1bfc41a 100644
--- a/PAMapp/components/BackActionBar.vue
+++ b/PAMapp/components/BackActionBar.vue
@@ -34,7 +34,7 @@
featureLabel = '���“���';
break;
case 'agentInfo':
- featureLabel = '璆剖�鞈��'
+ featureLabel = _.isEqual(this.currentRole,Role.ADMIN) ? '���董�����' : '璆剖�鞈��'
break;
default:
featureLabel = '�����';
@@ -60,8 +60,11 @@
return '�����';
}
}
+
pushRouterByLoginRole():void{
- this.$router.go(-1);
+ const backToPrevious = ['recommendConsultant-result', 'agentInfo-agentNo', 'questionnaire-agentNo'];
+ const find = backToPrevious.findIndex(item => this.$route.name?.includes(item));
+ find > -1 ? this.$router.go(-1) : this.$router.push('/');
}
}
</script>
--
Gitblit v1.8.0