|
@@ -14,10 +14,11 @@ import {
|
|
|
queryUserList,
|
|
|
queryCompanyOAById,
|
|
|
queryControlSpaceCompany,
|
|
|
- deleteUser,
|
|
|
} from '@/services/sagacare_service/member';
|
|
|
|
|
|
const Member: React.FC = () => {
|
|
|
+ const { initialState } = useModel('@@initialState');
|
|
|
+
|
|
|
const [perVisible, setPerVisible] = useState(false); //人员对话框显示
|
|
|
const [temporary, setTemporary] = useState(false); //是否是临时成员添加
|
|
|
const [invalidSign, setInvalidSign] = useState(false); //显示作废
|
|
@@ -173,7 +174,7 @@ const Member: React.FC = () => {
|
|
|
criteria: {
|
|
|
param: searchStr,
|
|
|
status: 1,
|
|
|
- companyId: 'ff80c708fe72446eb790b764c3a7b66b',
|
|
|
+ companyId: initialState?.currentUser?.companyId,
|
|
|
},
|
|
|
page: page.pageNum,
|
|
|
size: page.pageSize,
|
|
@@ -199,96 +200,12 @@ const Member: React.FC = () => {
|
|
|
setLoading(false);
|
|
|
});
|
|
|
}, [searchStr, page, sorter, refreshNum]);
|
|
|
- useEffect(() => {
|
|
|
- // const spaceMap3 = {
|
|
|
- // '北京中海金融街|2层': [
|
|
|
- // {
|
|
|
- // id: '22',
|
|
|
- // companyId: 'ff80c708fe72446eb790b764c3a7b66b',
|
|
|
- // spaceId: 'Sp110102000292ab218dd67011e88bee87db7e0ad2b711',
|
|
|
- // spaceName: 'D-303',
|
|
|
- // floorId: 'Fl1101020002bf10b9cad5c811e88bee1113190f5c6a11',
|
|
|
- // floorName: '2层',
|
|
|
- // buildingId: 'Bd110102000223fbec0accfb11e8a471b5d1be3b6dfe',
|
|
|
- // buildingName: '北京中海金融街',
|
|
|
- // isPermanentSpace: true,
|
|
|
- // createTime: 1692761562000,
|
|
|
- // updateTime: 1692760902000,
|
|
|
- // },
|
|
|
- // {
|
|
|
- // id: '33',
|
|
|
- // companyId: 'ff80c708fe72446eb790b764c3a7b66b',
|
|
|
- // spaceId: 'Sp110102000292ab218dd67011e88bee87db7e0ad2b722',
|
|
|
- // spaceName: 'D-304',
|
|
|
- // floorId: 'Fl1101020002bf10b9cad5c811e88bee1113190f5c6a22',
|
|
|
- // floorName: '2层',
|
|
|
- // buildingId: 'Bd110102000223fbec0accfb11e8a471b5d1be3b6dfe',
|
|
|
- // buildingName: '北京中海金融街',
|
|
|
- // isPermanentSpace: true,
|
|
|
- // createTime: 1692761562000,
|
|
|
- // updateTime: 1692760902000,
|
|
|
- // },
|
|
|
- // {
|
|
|
- // id: '55',
|
|
|
- // companyId: 'ff80c708fe72446eb790b764c3a7b66b',
|
|
|
- // spaceId: 'Sp110102000292ab218dd67011e88bee87db7e0ad2b733',
|
|
|
- // spaceName: 'D-306',
|
|
|
- // floorId: 'Fl1101020002bf10b9cad5c811e88bee1113190f5c6a',
|
|
|
- // floorName: '2层',
|
|
|
- // buildingId: 'Bd110102000223fbec0accfb11e8a471b5d1be3b6dfe',
|
|
|
- // buildingName: '北京中海金融街',
|
|
|
- // isPermanentSpace: true,
|
|
|
- // createTime: 1692761562000,
|
|
|
- // updateTime: 1692760902000,
|
|
|
- // },
|
|
|
- // ],
|
|
|
- // '北京中海金融街|3层': [
|
|
|
- // {
|
|
|
- // id: '22',
|
|
|
- // companyId: 'ff80c708fe72446eb790b764c3a7b66b',
|
|
|
- // spaceId: 'Sp110102000292ab218dd67011e88bee87db7e0ad2b744',
|
|
|
- // spaceName: 'C-303',
|
|
|
- // floorId: 'Fl1101020002bf10b9cad5c811e88bee1113190f5c6a',
|
|
|
- // floorName: '3层',
|
|
|
- // buildingId: 'Bd110102000223fbec0accfb11e8a471b5d1be3b6dfe',
|
|
|
- // buildingName: '北京中海金融街',
|
|
|
- // isPermanentSpace: true,
|
|
|
- // createTime: 1692761562000,
|
|
|
- // updateTime: 1692760902000,
|
|
|
- // },
|
|
|
- // {
|
|
|
- // id: '33',
|
|
|
- // companyId: 'ff80c708fe72446eb790b764c3a7b66b',
|
|
|
- // spaceId: 'Sp110102000292ab218dd67011e88bee87db7e0ad2b755',
|
|
|
- // spaceName: 'C-304',
|
|
|
- // floorId: 'Fl1101020002bf10b9cad5c811e88bee1113190f5c6a',
|
|
|
- // floorName: '3层',
|
|
|
- // buildingId: 'Bd110102000223fbec0accfb11e8a471b5d1be3b6dfe',
|
|
|
- // buildingName: '北京中海金融街',
|
|
|
- // isPermanentSpace: true,
|
|
|
- // createTime: 1692761562000,
|
|
|
- // updateTime: 1692760902000,
|
|
|
- // },
|
|
|
- // {
|
|
|
- // id: '55',
|
|
|
- // companyId: 'ff80c708fe72446eb790b764c3a7b66b',
|
|
|
- // spaceId: 'Sp110102000292ab218dd67011e88bee87db7e0ad2b766',
|
|
|
- // spaceName: 'C-306',
|
|
|
- // floorId: 'Fl1101020002bf10b9cad5c811e88bee1113190f5c6a',
|
|
|
- // floorName: '3层',
|
|
|
- // buildingId: 'Bd110102000223fbec0accfb11e8a471b5d1be3b6dfe',
|
|
|
- // buildingName: '北京中海金融街',
|
|
|
- // isPermanentSpace: true,
|
|
|
- // createTime: 1692761562000,
|
|
|
- // updateTime: 1692760902000,
|
|
|
- // },
|
|
|
- // ],
|
|
|
- // };
|
|
|
|
|
|
+ useEffect(() => {
|
|
|
//查询受控列表
|
|
|
var paramObj = {
|
|
|
criteria: {
|
|
|
- companyId: 'ff80c708fe72446eb790b764c3a7b66b',
|
|
|
+ companyId: initialState?.currentUser?.companyId,
|
|
|
},
|
|
|
};
|
|
|
queryControlSpaceCompany(paramObj)
|
|
@@ -297,7 +214,7 @@ const Member: React.FC = () => {
|
|
|
setSpaceMap(data);
|
|
|
})
|
|
|
.catch((err) => {});
|
|
|
- queryCompanyOAById({ companyId: 'ff80c708fe72446eb790b764c3a7b66b' })
|
|
|
+ queryCompanyOAById({ companyId: initialState?.currentUser?.companyId })
|
|
|
.then((res) => {
|
|
|
var isSyncOa = res?.isSyncOa;
|
|
|
setIsSyncOa(isSyncOa == 1 ? true : false);
|
|
@@ -348,7 +265,7 @@ const Member: React.FC = () => {
|
|
|
title={<FormattedMessage id="menu.member" />}
|
|
|
action={
|
|
|
<div className={styles.headerRight}>
|
|
|
- <Search setSearchStr={setSearchStr} />
|
|
|
+ <Search changeSearchStr={setSearchStr} />
|
|
|
{isSyncOa ? (
|
|
|
<>
|
|
|
<div className={styles.allIn}>已开启OA同步</div>
|