Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-platform
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
shenshaokai
jinfa-platform
Commits
9c790ad5
Commit
9c790ad5
authored
Apr 21, 2022
by
许佳敏
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'v2-220418-bug' into 'v2-220418'
修复查询条件不起效bug、隐藏不需要页面入口 See merge request linkseeks-design/pro-platform!461
parents
f76f383e
86e11a38
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
12 additions
and
12 deletions
+12
-12
index.tsx
src/pages/supplier/memberAssigned/index.tsx
+2
-2
useEvaluateColumn.tsx
...pages/supplier/memberEvaluate/hooks/useEvaluateColumn.tsx
+1
-1
index.tsx
src/pages/supplier/memberMaintain/detailed/index.tsx
+3
-3
index.tsx
src/pages/supplier/memberMaintain/index.tsx
+2
-2
index.tsx
src/pages/supplier/memberQuery/detailed/index.tsx
+2
-2
columns.tsx
...upplier/memberQuery/rectificationQuery/common/columns.tsx
+1
-1
queryColumns.tsx
...plier/memberRectification/common/columns/queryColumns.tsx
+1
-1
No files found.
src/pages/supplier/memberAssigned/index.tsx
View file @
9c790ad5
...
...
@@ -149,7 +149,7 @@ const MemberMaintain: React.FC<[]> = () => {
}),
dataIndex
:
'outerStatusName'
,
filters
:
[],
onFilter
:
(
value
,
record
)
=>
record
.
outerStatus
===
value
,
onFilter
:
(
value
,
record
)
=>
record
.
outerStatus
===
value
||
value
===
0
,
render
:
(
text
,
record
)
=>
(
<
StatusTag
type=
{
MEMBER_OUTER_STATUS_TYPE
[
record
.
outerStatus
]
}
...
...
@@ -163,7 +163,7 @@ const MemberMaintain: React.FC<[]> = () => {
}),
dataIndex
:
'innerStatusName'
,
filters
:
[],
onFilter
:
(
value
,
record
)
=>
record
.
innerStatus
===
value
,
onFilter
:
(
value
,
record
)
=>
record
.
innerStatus
===
value
||
value
===
0
,
render
:
(
text
,
record
)
=>
(
<
Badge
color=
{
...
...
src/pages/supplier/memberEvaluate/hooks/useEvaluateColumn.tsx
View file @
9c790ad5
...
...
@@ -51,7 +51,7 @@ const commonColumns = [
title
:
`
${
intl
.
formatMessage
({
id
:
'member.memberEvaluate.hooks.useEvaluateColumn.innerState'
})}
`
,
dataIndex
:
'status'
,
filters
:
[],
onFilter
:
(
_value
,
record
)
=>
record
.
status
===
_value
,
onFilter
:
(
_value
,
record
)
=>
record
.
status
===
_value
||
_value
===
0
,
render
:
(
text
,
record
)
=>
{
const
offset
=
record
.
status
%
(
TYPE
.
length
)
return
(
...
...
src/pages/supplier/memberMaintain/detailed/index.tsx
View file @
9c790ad5
...
...
@@ -258,9 +258,9 @@ const MemberMaintainDetailed: React.FC<QueryProps> = props => {
<
Bookmark
value=
{
getBookmarkKey
()
}
onChange=
{
handleBookmarkChange
}
>
<
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=
"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=
"sincerityInfo"
title=
{
intl
.
formatMessage
({
id
:
'member.management.maintain.detail.sincerityInfo'
})
}
icon=
{
<
BulbOutlined
/>
}
/>
{
/* <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="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
>
)
}
...
...
src/pages/supplier/memberMaintain/index.tsx
View file @
9c790ad5
...
...
@@ -101,7 +101,7 @@ const MemberMaintain: React.FC<[]> = () => {
title
:
intl
.
formatMessage
({
id
:
'member.management.maintain.query.outerStatusName'
}),
dataIndex
:
'outerStatusName'
,
filters
:
[],
onFilter
:
(
value
,
record
)
=>
record
.
outerStatus
===
value
,
onFilter
:
(
value
,
record
)
=>
record
.
outerStatus
===
value
||
value
===
0
,
render
:
(
text
,
record
)
=>
(
<
StatusTag
type=
{
MEMBER_OUTER_STATUS_TYPE
[
record
.
outerStatus
]
}
title=
{
text
}
/>
),
...
...
@@ -110,7 +110,7 @@ const MemberMaintain: React.FC<[]> = () => {
title
:
intl
.
formatMessage
({
id
:
'member.management.maintain.query.innerStatusName'
}),
dataIndex
:
'innerStatusName'
,
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
}
/>,
},
{
...
...
src/pages/supplier/memberQuery/detailed/index.tsx
View file @
9c790ad5
...
...
@@ -230,9 +230,9 @@ const MemberQueryDetailed: React.FC<QueryProps> = props => {
<
Bookmark
value=
{
getBookmarkKey
()
}
onChange=
{
handleBookmarkChange
}
>
<
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=
"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=
"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
>
)
}
>
...
...
src/pages/supplier/memberQuery/rectificationQuery/common/columns.tsx
View file @
9c790ad5
...
...
@@ -54,7 +54,7 @@ export const commonColumns = [
const
offset
=
record
.
outerStatus
%
OuterStatusType
.
length
;
return
<
StatusTag
type=
{
OuterStatusType
[
offset
]
as
'success'
}
title=
{
record
.
outerStatusName
}
/>
},
onFilter
:
(
value
,
record
)
=>
record
.
outerStatus
===
value
,
onFilter
:
(
value
,
record
)
=>
record
.
outerStatus
===
value
||
value
===
0
,
}
]
src/pages/supplier/memberRectification/common/columns/queryColumns.tsx
View file @
9c790ad5
...
...
@@ -43,7 +43,7 @@ const listColumns: ColumnsType<GetMemberRectifySummaryPageResponseDetail> = [
const
offset
=
record
.
outerStatus
%
OuterStatusType
.
length
;
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
},
}
]
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment