|
@@ -25,6 +25,7 @@ const Company = props => {
|
|
|
teamTagColorMap,
|
|
teamTagColorMap,
|
|
|
personTags,
|
|
personTags,
|
|
|
teamTags,
|
|
teamTags,
|
|
|
|
|
+ natures,
|
|
|
dispatch,
|
|
dispatch,
|
|
|
shouldUpdate,
|
|
shouldUpdate,
|
|
|
loading
|
|
loading
|
|
@@ -38,11 +39,13 @@ const Company = props => {
|
|
|
|
|
|
|
|
const [tagState, setTagState] = useState({
|
|
const [tagState, setTagState] = useState({
|
|
|
tagIds: [],
|
|
tagIds: [],
|
|
|
- tagCooperationIds: []
|
|
|
|
|
|
|
+ tagCooperationIds: [],
|
|
|
|
|
+ natureIds: []
|
|
|
})
|
|
})
|
|
|
const tag = useMemo(() => {
|
|
const tag = useMemo(() => {
|
|
|
const personTagMap = {}
|
|
const personTagMap = {}
|
|
|
const teamTagMap = {}
|
|
const teamTagMap = {}
|
|
|
|
|
+ const narnatureMap = {}
|
|
|
const personOptions = []
|
|
const personOptions = []
|
|
|
const teamOptions = []
|
|
const teamOptions = []
|
|
|
personTags.forEach(item => {
|
|
personTags.forEach(item => {
|
|
@@ -73,8 +76,17 @@ const Company = props => {
|
|
|
)
|
|
)
|
|
|
}
|
|
}
|
|
|
})
|
|
})
|
|
|
|
|
+ natures.forEach(item => {
|
|
|
|
|
+ narnatureMap[item.value] = {
|
|
|
|
|
+ text: (
|
|
|
|
|
+ <>
|
|
|
|
|
+ <span>{item.label}</span>
|
|
|
|
|
+ </>
|
|
|
|
|
+ )
|
|
|
|
|
+ }
|
|
|
|
|
+ })
|
|
|
|
|
|
|
|
- return { personTagMap, teamTagMap, personOptions, teamOptions }
|
|
|
|
|
|
|
+ return { personTagMap, teamTagMap, narnatureMap, personOptions, teamOptions }
|
|
|
}, [loading])
|
|
}, [loading])
|
|
|
|
|
|
|
|
const [state, setState] = useState({
|
|
const [state, setState] = useState({
|
|
@@ -250,7 +262,9 @@ const Company = props => {
|
|
|
dataIndex: 'nature',
|
|
dataIndex: 'nature',
|
|
|
key: 'nature',
|
|
key: 'nature',
|
|
|
search: false,
|
|
search: false,
|
|
|
- width: 80
|
|
|
|
|
|
|
+ width: 80,
|
|
|
|
|
+ filters: true,
|
|
|
|
|
+ valueEnum: tag.narnatureMap
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
title: '单位地址',
|
|
title: '单位地址',
|
|
@@ -517,6 +531,7 @@ export default connect(({ company, refresh, loading }) => ({
|
|
|
personTags: company.personTags,
|
|
personTags: company.personTags,
|
|
|
teamTagColorMap: company.teamTagColorMap,
|
|
teamTagColorMap: company.teamTagColorMap,
|
|
|
teamTags: company.teamTags,
|
|
teamTags: company.teamTags,
|
|
|
|
|
+ natures: company.natures,
|
|
|
loading: loading.models.company,
|
|
loading: loading.models.company,
|
|
|
shouldUpdate: refresh.company
|
|
shouldUpdate: refresh.company
|
|
|
}))(Company)
|
|
}))(Company)
|