新增用户和租户禁用权限判断

src/views/admin/personal/index.vue

@@ -230,14 +230,17 @@ const onAvatarSuccess = (res: AxiosResponse) => {
 }
 
 // 上传头像失败
-const onAvatarError = (err: any) => {
+const onAvatarError = (error: any) => {
   state.avatarLoading = false
-  if (err.message) {
-    const res = JSON.parse(err.message) as AxiosResponse
-    if (!res?.success && res.msg) {
-      proxy.$modal.msgError(res.msg)
+  let message = ''
+  if (error.message) {
+    try {
+      message = JSON.parse(error.message)?.msg
+    } catch (err) {
+      message = error.message || ''
     }
   }
+  if (message) proxy.$modal.msgError(message)
 }
 
 // 更新个人信息

src/views/admin/tenant/index.vue

@@ -19,15 +19,23 @@
         <el-table-column prop="realName" label="姓名" width="120" show-overflow-tooltip />
         <el-table-column prop="phone" label="手机号" width="120" show-overflow-tooltip />
         <el-table-column prop="email" label="邮箱" min-width="120" show-overflow-tooltip />
-        <el-table-column label="启用" width="70" align="center" show-overflow-tooltip>
+        <el-table-column label="状态" width="80" align="center">
           <template #default="{ row }">
             <el-switch
+              v-if="auth('api:admin:tenant:set-enable')"
               v-model="row.enabled"
               :loading="row.loading"
               :active-value="true"
               :inactive-value="false"
+              inline-prompt
+              active-text="启用"
+              inactive-text="禁用"
               :before-change="() => onSetEnable(row)"
             />
+            <template v-else>
+              <el-tag type="success" v-if="row.enabled">启用</el-tag>
+              <el-tag type="danger" v-else>禁用</el-tag>
+            </template>
           </template>
         </el-table-column>
         <el-table-column label="操作" width="160" fixed="right" header-align="center" align="center">

src/views/admin/user/index.vue

@@ -37,15 +37,23 @@
                 {{ row.roleNames ? row.roleNames.join(',') : '' }}
               </template>
             </el-table-column>
-            <el-table-column label="启用" width="70" align="center" show-overflow-tooltip>
+            <el-table-column label="状态" width="80" align="center">
               <template #default="{ row }">
                 <el-switch
+                  v-if="auth('api:admin:user:set-enable')"
                   v-model="row.enabled"
                   :loading="row.loading"
                   :active-value="true"
                   :inactive-value="false"
+                  inline-prompt
+                  active-text="启用"
+                  inactive-text="禁用"
                   :before-change="() => onSetEnable(row)"
                 />
+                <template v-else>
+                  <el-tag type="success" v-if="row.enabled">启用</el-tag>
+                  <el-tag type="danger" v-else>禁用</el-tag>
+                </template>
               </template>
             </el-table-column>
             <el-table-column label="操作" width="160" fixed="right" header-align="center" align="center">