登录账号 header
This commit is contained in:
@@ -20,8 +20,9 @@ export const HeaderUserInfo: React.FC = () => {
|
|||||||
disabled: true, // 只展示,不可操作
|
disabled: true, // 只展示,不可操作
|
||||||
label: (
|
label: (
|
||||||
<Space size={8} style={{ color: 'rgba(0,0,0,0.88)' }}>
|
<Space size={8} style={{ color: 'rgba(0,0,0,0.88)' }}>
|
||||||
<span>{userInfo.username}</span>
|
<span>
|
||||||
<span>({userInfo.nickname})</span>
|
{userInfo.username} ({userInfo.nickname})
|
||||||
|
</span>
|
||||||
</Space>
|
</Space>
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -59,7 +59,7 @@ const GrpListForm: React.FC = () => {
|
|||||||
fixed: tableFixedByPhone('left'),
|
fixed: tableFixedByPhone('left'),
|
||||||
render: (_, item) => (
|
render: (_, item) => (
|
||||||
<GapBox>
|
<GapBox>
|
||||||
{item?.group_id != 1 && (
|
{item?.group_id != localStorage.getItem('admin_id') && (
|
||||||
<>
|
<>
|
||||||
{auth.SF_ADMIN_GROUP_EDIT && (
|
{auth.SF_ADMIN_GROUP_EDIT && (
|
||||||
<Button
|
<Button
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ const DepListForm: React.FC = () => {
|
|||||||
fixed: tableFixedByPhone('left'),
|
fixed: tableFixedByPhone('left'),
|
||||||
render: (_, item) => (
|
render: (_, item) => (
|
||||||
<GapBox>
|
<GapBox>
|
||||||
{item?.admin_id != 1 && (
|
{item?.admin_id != localStorage.getItem('admin_id') && (
|
||||||
<>
|
<>
|
||||||
{auth.SF_ADMIN_DEPART_EDIT && (
|
{auth.SF_ADMIN_DEPART_EDIT && (
|
||||||
<Button
|
<Button
|
||||||
|
|||||||
@@ -16,7 +16,6 @@ import CompanySelect from '@/pages/Company/List/components/CompanySelect';
|
|||||||
import { type IUserEditModalType, UserEditModal } from '@/pages/User/List/components/UserEditModal';
|
import { type IUserEditModalType, UserEditModal } from '@/pages/User/List/components/UserEditModal';
|
||||||
import { UserServices } from '@/services/UserServices';
|
import { UserServices } from '@/services/UserServices';
|
||||||
import { useAuthStore } from '@/store/AuthStore';
|
import { useAuthStore } from '@/store/AuthStore';
|
||||||
import { useUserStore } from '@/store/UserStore';
|
|
||||||
import { tableFixedByPhone, toArray } from '@/utils/common';
|
import { tableFixedByPhone, toArray } from '@/utils/common';
|
||||||
import { useRequest } from '@/utils/useRequest';
|
import { useRequest } from '@/utils/useRequest';
|
||||||
|
|
||||||
@@ -35,10 +34,7 @@ type IParams = IParamsBase & {
|
|||||||
|
|
||||||
/** 用户列表页面 */
|
/** 用户列表页面 */
|
||||||
const UserListForm: React.FC = () => {
|
const UserListForm: React.FC = () => {
|
||||||
const user = useUserStore().user;
|
|
||||||
console.log('user', user);
|
|
||||||
const auth = useAuthStore().auth;
|
const auth = useAuthStore().auth;
|
||||||
console.log('auth', auth);
|
|
||||||
const [ajaxData, setAjaxData] = useState<IAjaxData>({ count: 0, data: [] });
|
const [ajaxData, setAjaxData] = useState<IAjaxData>({ count: 0, data: [] });
|
||||||
const [showMoreSearch, setShowMoreSearch] = useState(false);
|
const [showMoreSearch, setShowMoreSearch] = useState(false);
|
||||||
const UserEditModalRef = useRef<IUserEditModalType>(null);
|
const UserEditModalRef = useRef<IUserEditModalType>(null);
|
||||||
|
|||||||
Reference in New Issue
Block a user