Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main

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: {

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;