From e3f6f9107d62d5779a5f0d87bddf8ff7e107f485 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 21 Jan 2025 17:12:33 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=8F=AF=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E9=80=89=E9=A1=B9=E4=B8=8D=E8=B6=B3=E6=97=B6=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=88=87=E6=8D=A2=E8=A7=92=E8=89=B2=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-layout/components/trialsNavbar.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/trials/trials-layout/components/trialsNavbar.vue b/src/views/trials/trials-layout/components/trialsNavbar.vue
index c5c47cc9..004aa805 100644
--- a/src/views/trials/trials-layout/components/trialsNavbar.vue
+++ b/src/views/trials/trials-layout/components/trialsNavbar.vue
@@ -146,7 +146,11 @@ export default {
       return this.$store.state.user.roles
     },
     hasRole() {
-      return this.roles && this.roles.length > 1
+      return (
+        this.roles &&
+        this.roles.length > 1 &&
+        this.roles.filter((item) => !item.IsUserRoleDisabled).length > 1
+      )
     },
   },
   watch: {

From b209c6566b509e294dcf1b6457e4dc544bd0dc85 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 22 Jan 2025 09:48:25 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=96=E9=83=A8?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=BC=B9=E6=A1=86=E6=8C=89=E9=92=AE=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../setting/personnel-manage/components/staffExternalForm.vue   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue b/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
index d1fe8dbd..18dc25d1 100644
--- a/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
+++ b/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
@@ -24,6 +24,7 @@
         <el-button
           size="mini"
           type="primary"
+          style="margin-right: 10px"
           icon="el-icon-refresh-left"
           @click="handleReset"
         >
@@ -491,6 +492,7 @@ export default {
 .participant-container {
   height: 100%;
   .el-header {
+    padding-right: 5px;
     .filter-container {
       display: flex;
       align-items: center;