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

src/views/trials/trials-panel/setting/email-manage/components/EmailForm.vue

@@ -56,13 +56,12 @@
         >
           <el-select
             v-model="form.ToUserTypeList"
-            disabled
             clearable
             multiple
             class="mr"
           >
             <el-option
-              v-for="item of $d.UserType"
+              v-for="item of UserTypeList"
               :key="`ToUserTypeList${item.label}`"
               :label="item.label"
               :value="item.value"
@@ -77,13 +76,12 @@
         >
           <el-select
             v-model="form.CopyUserTypeList"
-            disabled
             clearable
             multiple
             class="mr"
           >
             <el-option
-              v-for="item of $d.UserType"
+              v-for="item of UserTypeList"
               :key="`CopyUserTypeList${item.label}`"
               :label="item.label"
               :value="item.value"
@@ -310,6 +308,12 @@ export default {
         return {}
       },
     },
+    UserTypeList: {
+      type: Array,
+      default() {
+        return []
+      },
+    },
   },
   components: { vcrontab },
   data() {

src/views/trials/trials-panel/setting/email-manage/components/EmailList.vue

@@ -339,6 +339,7 @@
           :data="currentRow"
           :criterion-type="criterionType"
           :is-distinguish-criteria="isDistinguishCriteria"
+          :UserTypeList="UserTypeList"
           @closeDialog="closeDialog"
           @getList="getList"
         />
@@ -422,7 +423,7 @@ export default {
   computed: {
     UserTypeList() {
       return this.$d.UserType.filter(
-        (item) => ![7, 31, 32, 21, 26, 27].includes(item.value)
+        (item) => ![7, 8, 31, 32, 21, 26, 27].includes(item.value)
       )
     },
   },

src/views/trials/trials-panel/setting/personnel-manage/components/staff.vue

@@ -148,25 +148,9 @@
         :label="$t('trials:staff:table:userType')"
         show-overflow-tooltip
         sortable
-        width="140"
+        width="160"
       >
         <template slot-scope="scope">
-          <el-tooltip
-            class="item"
-            effect="dark"
-            :content="$t('trials:staff:tip:userTypeDisabled')"
-            placement="top"
-            style="margin-right: 3px"
-            v-if="
-              Array.isArray(scope.row.TrialUserRoleList) &&
-              scope.row.TrialUserRoleList.length > 0 &&
-              scope.row.TrialUserRoleList.some(
-                (item) => item.IsDeleted || item.IsUserRoleDisabled
-              )
-            "
-          >
-            <i class="el-icon-warning icon-i"></i>
-          </el-tooltip>
           <el-button
             v-if="
               Array.isArray(scope.row.TrialUserRoleList) &&
@@ -175,6 +159,20 @@
             type="text"
             @click.stop="openRoleList(scope.row)"
           >
+            <el-tooltip
+              class="item"
+              effect="dark"
+              :content="$t('trials:staff:tip:userTypeDisabled')"
+              placement="top"
+              style="margin-right: 2px"
+              v-if="
+                scope.row.TrialUserRoleList.some(
+                  (item) => item.IsDeleted || item.IsUserRoleDisabled
+                )
+              "
+            >
+              <i class="el-icon-warning icon-i"></i>
+            </el-tooltip>
             <span>{{
               scope.row.TrialUserRoleList.map(
                 (item) => item.UserTypeShortName