Commit 86e11a38 authored by suzhiquan's avatar suzhiquan

修复查询条件不起效bug、隐藏不需要页面入口

parent eb13eca7
...@@ -149,7 +149,7 @@ const MemberMaintain: React.FC<[]> = () => { ...@@ -149,7 +149,7 @@ const MemberMaintain: React.FC<[]> = () => {
}), }),
dataIndex: 'outerStatusName', dataIndex: 'outerStatusName',
filters: [], filters: [],
onFilter: (value, record) => record.outerStatus === value, onFilter: (value, record) => record.outerStatus === value || value === 0,
render: (text, record) => ( render: (text, record) => (
<StatusTag <StatusTag
type={MEMBER_OUTER_STATUS_TYPE[record.outerStatus]} type={MEMBER_OUTER_STATUS_TYPE[record.outerStatus]}
...@@ -163,7 +163,7 @@ const MemberMaintain: React.FC<[]> = () => { ...@@ -163,7 +163,7 @@ const MemberMaintain: React.FC<[]> = () => {
}), }),
dataIndex: 'innerStatusName', dataIndex: 'innerStatusName',
filters: [], filters: [],
onFilter: (value, record) => record.innerStatus === value, onFilter: (value, record) => record.innerStatus === value || value===0,
render: (text, record) => ( render: (text, record) => (
<Badge <Badge
color={ color={
......
...@@ -51,7 +51,7 @@ const commonColumns = [ ...@@ -51,7 +51,7 @@ const commonColumns = [
title: `${intl.formatMessage({ id: 'member.memberEvaluate.hooks.useEvaluateColumn.innerState'})}`, title: `${intl.formatMessage({ id: 'member.memberEvaluate.hooks.useEvaluateColumn.innerState'})}`,
dataIndex: 'status', dataIndex: 'status',
filters: [], filters: [],
onFilter: (_value, record) => record.status === _value, onFilter: (_value, record) => record.status === _value || _value===0,
render: (text, record) => { render: (text, record) => {
const offset = record.status % (TYPE.length) const offset = record.status % (TYPE.length)
return ( return (
......
...@@ -258,9 +258,9 @@ const MemberMaintainDetailed: React.FC<QueryProps> = props => { ...@@ -258,9 +258,9 @@ const MemberMaintainDetailed: React.FC<QueryProps> = props => {
<Bookmark value={getBookmarkKey()} onChange={handleBookmarkChange}> <Bookmark value={getBookmarkKey()} onChange={handleBookmarkChange}>
<Bookmark.Item value="basicInfo" title={intl.formatMessage({ id: 'member.management.maintain.basic' })} icon={<UnorderedListOutlined />} /> <Bookmark.Item value="basicInfo" title={intl.formatMessage({ id: 'member.management.maintain.basic' })} icon={<UnorderedListOutlined />} />
<Bookmark.Item value="archiveInfo" title={intl.formatMessage({ id: 'member.management.maintain.detail.archivalInfo' })} icon={<FolderOutlined />} /> <Bookmark.Item value="archiveInfo" title={intl.formatMessage({ id: 'member.management.maintain.detail.archivalInfo' })} icon={<FolderOutlined />} />
<Bookmark.Item value="levelInfo" title={intl.formatMessage({ id: 'member.management.maintain.detail.levelInfo' })} icon={<BarChartOutlined />} /> {/* <Bookmark.Item value="levelInfo" title={intl.formatMessage({ id: 'member.management.maintain.detail.levelInfo' })} icon={<BarChartOutlined />} /> */}
<Bookmark.Item value="equityInfo" title={intl.formatMessage({ id: 'member.management.maintain.detail.equityInfo' })} icon={<InsuranceOutlined />} /> {/* <Bookmark.Item value="equityInfo" title={intl.formatMessage({ id: 'member.management.maintain.detail.equityInfo' })} icon={<InsuranceOutlined />} /> */}
<Bookmark.Item value="sincerityInfo" title={intl.formatMessage({ id: 'member.management.maintain.detail.sincerityInfo' })} icon={<BulbOutlined />} /> {/* <Bookmark.Item value="sincerityInfo" title={intl.formatMessage({ id: 'member.management.maintain.detail.sincerityInfo' })} icon={<BulbOutlined />} /> */}
<Bookmark.Item value="changedInfo" title={intl.formatMessage({ id: 'member.management.maintain.detail.changedInfo' })} icon={<EditOutlined />} /> <Bookmark.Item value="changedInfo" title={intl.formatMessage({ id: 'member.management.maintain.detail.changedInfo' })} icon={<EditOutlined />} />
</Bookmark> </Bookmark>
)} )}
......
...@@ -101,7 +101,7 @@ const MemberMaintain: React.FC<[]> = () => { ...@@ -101,7 +101,7 @@ const MemberMaintain: React.FC<[]> = () => {
title: intl.formatMessage({ id: 'member.management.maintain.query.outerStatusName' }), title: intl.formatMessage({ id: 'member.management.maintain.query.outerStatusName' }),
dataIndex: 'outerStatusName', dataIndex: 'outerStatusName',
filters: [], filters: [],
onFilter: (value, record) => record.outerStatus === value, onFilter: (value, record) => record.outerStatus === value || value === 0,
render: (text, record) => ( render: (text, record) => (
<StatusTag type={MEMBER_OUTER_STATUS_TYPE[record.outerStatus]} title={text} /> <StatusTag type={MEMBER_OUTER_STATUS_TYPE[record.outerStatus]} title={text} />
), ),
...@@ -110,7 +110,7 @@ const MemberMaintain: React.FC<[]> = () => { ...@@ -110,7 +110,7 @@ const MemberMaintain: React.FC<[]> = () => {
title: intl.formatMessage({ id: 'member.management.maintain.query.innerStatusName' }), title: intl.formatMessage({ id: 'member.management.maintain.query.innerStatusName' }),
dataIndex: 'innerStatusName', dataIndex: 'innerStatusName',
filters: [], filters: [],
onFilter: (value, record) => record.innerStatus === value, onFilter: (value, record) => record.innerStatus === value || value===0,
render: (text, record) => <Badge color={MEMBER_INNER_STATUS_BADGE_COLOR[record.innerStatus] || '#606266'} text={text} />, render: (text, record) => <Badge color={MEMBER_INNER_STATUS_BADGE_COLOR[record.innerStatus] || '#606266'} text={text} />,
}, },
{ {
......
...@@ -230,9 +230,9 @@ const MemberQueryDetailed: React.FC<QueryProps> = props => { ...@@ -230,9 +230,9 @@ const MemberQueryDetailed: React.FC<QueryProps> = props => {
<Bookmark value={getBookmarkKey()} onChange={handleBookmarkChange}> <Bookmark value={getBookmarkKey()} onChange={handleBookmarkChange}>
<Bookmark.Item value="basicInfo" title={intl.formatMessage({ id: 'member.management.maintain.basic' })} icon={<UnorderedListOutlined />} /> <Bookmark.Item value="basicInfo" title={intl.formatMessage({ id: 'member.management.maintain.basic' })} icon={<UnorderedListOutlined />} />
<Bookmark.Item value="archiveInfo" title={intl.formatMessage({ id: 'member.management.maintain.detail.archivalInfo' })} icon={<FolderOutlined />} /> <Bookmark.Item value="archiveInfo" title={intl.formatMessage({ id: 'member.management.maintain.detail.archivalInfo' })} icon={<FolderOutlined />} />
<Bookmark.Item value="levelInfo" title={intl.formatMessage({ id: 'member.management.maintain.detail.levelInfo' })} icon={<BarChartOutlined />} /> {/* <Bookmark.Item value="levelInfo" title={intl.formatMessage({ id: 'member.management.maintain.detail.levelInfo' })} icon={<BarChartOutlined />} />
<Bookmark.Item value="equityInfo" title={intl.formatMessage({ id: 'member.management.maintain.detail.equityInfo' })} icon={<InsuranceOutlined />} /> <Bookmark.Item value="equityInfo" title={intl.formatMessage({ id: 'member.management.maintain.detail.equityInfo' })} icon={<InsuranceOutlined />} />
<Bookmark.Item value="sincerityInfo" title={intl.formatMessage({ id: 'member.management.maintain.detail.sincerityInfo' })} icon={<BulbOutlined />} /> <Bookmark.Item value="sincerityInfo" title={intl.formatMessage({ id: 'member.management.maintain.detail.sincerityInfo' })} icon={<BulbOutlined />} /> */}
</Bookmark> </Bookmark>
)} )}
> >
......
...@@ -54,7 +54,7 @@ export const commonColumns = [ ...@@ -54,7 +54,7 @@ export const commonColumns = [
const offset = record.outerStatus % OuterStatusType.length; const offset = record.outerStatus % OuterStatusType.length;
return <StatusTag type={OuterStatusType[offset] as 'success'} title={record.outerStatusName} /> return <StatusTag type={OuterStatusType[offset] as 'success'} title={record.outerStatusName} />
}, },
onFilter: (value, record) => record.outerStatus === value, onFilter: (value, record) => record.outerStatus === value || value === 0,
} }
] ]
...@@ -43,7 +43,7 @@ const listColumns: ColumnsType<GetMemberRectifySummaryPageResponseDetail> = [ ...@@ -43,7 +43,7 @@ const listColumns: ColumnsType<GetMemberRectifySummaryPageResponseDetail> = [
const offset = record.outerStatus % OuterStatusType.length; const offset = record.outerStatus % OuterStatusType.length;
return <StatusTag type={OuterStatusType[offset] as 'success'} title={record.outerStatusName} /> return <StatusTag type={OuterStatusType[offset] as 'success'} title={record.outerStatusName} />
}, },
onFilter: (value, record) => { return record.outerStatus === value }, onFilter: (value, record) => { return record.outerStatus === value|| value === 0 },
} }
] ]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment