Merge pull request #4079 from jumpserver/pr@v4@fix_role_sys

fixed: Fixed an issue where the delete prompt was incorrect when the user had only one organization role

src/views/users/Role/RoleDetail/RoleUsers.vue

@@ -90,7 +90,10 @@ export default {
                 this.$message.success(this.$tc('DeleteSuccessMsg'))
                 reload()
               }).catch(error => {
-                this.$message.error(this.$tc('DeleteErrorMsg') + ' ' + error)
+                this.$message.error({
+                  message: error.response.data.error,
+                  duration: 3000
+                })
               })
             }.bind(this)
           },
@@ -140,6 +143,3 @@ export default {
   }
 }
 </script>
-
-<style lang="scss" scoped>
-</style>

src/views/users/Role/RoleDetail/index.vue

@@ -68,7 +68,3 @@ export default {
   }
 }
 </script>
-
-<style lang='scss' scoped>
-
-</style>

src/views/users/Role/RoleList/BaseRoleList.vue

@@ -126,7 +126,9 @@ export default {
       return !row['builtin'] && this.$hasPerm(perm)
     },
     reloadTable() {
+      setTimeout(() => {
         this.$refs.ListTable.reloadTable()
+      }, 300)
     }
   }
 }

src/views/users/Role/RoleList/OrgRoleList.vue

@@ -13,9 +13,7 @@ export default {
     BaseRoleList
   },
   activated() {
-    setTimeout(() => {
     this.$refs.roleList.reloadTable()
-    }, 300)
   }
 }
 </script>