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
fd969040
Commit
fd969040
authored
Mar 30, 2022
by
前端-黄佳鑫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修改业务员管理 新增/修改选择下级 会员id 重复的问题
parent
97cefc8c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
38 additions
and
7 deletions
+38
-7
detail.tsx
src/pages/channel/memberList/detail.tsx
+10
-4
add.tsx
src/pages/systemSetting/salesmanManage/salesmanBind/add.tsx
+28
-3
No files found.
src/pages/channel/memberList/detail.tsx
View file @
fd969040
...
...
@@ -31,6 +31,7 @@ import ModalTable from '@/components/ModalTable';
import
{
useRowSelectionTable
}
from
'@/hooks/useRowSelectionTable'
;
import
{
getMemberAbilitySalesChannel
,
getMemberAbilitySalesChannelPage
,
getMemberAbilitySalesSelect
,
postMemberAbilitySalesChannelBind
,
postMemberAbilitySalesChannelUnbind
}
from
'@/services/MemberV2Api'
;
import
AuthButton
from
'@/components/AuthButton'
import
{
FormEffectHooks
,
useFormEffects
}
from
'@formily/antd'
;
const
TabFormErrors
=
props
=>
{
return
(
...
...
@@ -53,7 +54,7 @@ const fetchMemberAbilitySelect = async (params) => {
const
MemberDetail
:
React
.
FC
<
{}
>
=
()
=>
{
const
ref
=
useRef
<
any
>
({})
const
staticData
=
useRef
<
any
>
([])
const
[
rowSelection
,
rowCtl
]
=
useRowSelectionTable
({
customKey
:
'
member
Id'
})
const
[
rowSelection
,
rowCtl
]
=
useRowSelectionTable
({
customKey
:
'
relation
Id'
})
const
[
realRowSelection
,
realRowCtl
]
=
useRowSelectionTable
({
customKey
:
'relationId'
})
const
[
memberVisible
,
setMemberVisible
]
=
useState
(
false
)
const
{
pageStatus
,
id
}
=
usePageStatus
()
...
...
@@ -86,6 +87,7 @@ const MemberDetail: React.FC<{}> = () => {
return
[]
}
}
useEffect
(()
=>
{
if
(
id
)
{
fetchSaleChannel
()
...
...
@@ -115,7 +117,7 @@ const MemberDetail: React.FC<{}> = () => {
},
[
realRowCtl
.
selectedRowKeys
])
useEffect
(()
=>
{
rowCtl
.
setSelectedRowKeys
(
tableData
.
map
(
v
=>
v
.
member
Id
))
rowCtl
.
setSelectedRowKeys
(
tableData
.
map
(
v
=>
v
.
relation
Id
))
rowCtl
.
setSelectRow
([...
tableData
])
realRowCtl
.
setSelectedRowKeys
(
tableData
.
filter
(
v
=>
!
staticData
.
current
.
includes
(
v
)))
...
...
@@ -157,7 +159,6 @@ const MemberDetail: React.FC<{}> = () => {
align
:
'center'
}
]
const
connectMemberColumns
:
any
[]
=
[
{
key
:
'memberId'
,
...
...
@@ -382,6 +383,11 @@ const MemberDetail: React.FC<{}> = () => {
actions=
{
formAction
}
editable=
{
pageStatus
!==
PageStatus
.
PREVIEW
}
previewPlaceholder=
" "
effects=
{
(
$
,
ctx
)
=>
{
$
(
'onFieldChange'
,
'userId'
).
subscribe
(
async
state
=>
{
fetchMemberSaleChannel
({
current
:
1
,
pageSize
:
10
})
})
}
}
schema=
{
{
type
:
'object'
,
properties
:
{
...
...
@@ -510,7 +516,7 @@ const MemberDetail: React.FC<{}> = () => {
rowSelection=
{
rowSelection
}
columns=
{
modalMemberColumns
}
fetchTableData=
{
fetchTableData
}
rowKey=
{
'
member
Id'
}
rowKey=
{
'
relation
Id'
}
forceRender
formilyProps=
{
{
ctx
:
{
...
...
src/pages/systemSetting/salesmanManage/salesmanBind/add.tsx
View file @
fd969040
...
...
@@ -30,7 +30,7 @@ const fetchMemberAbilitySelect = async (params) => {
const
SalesmanBindAdded
=
(
props
)
=>
{
const
ref
=
useRef
<
any
>
({})
const
staticData
=
useRef
<
any
>
([])
const
[
rowSelection
,
rowCtl
]
=
useRowSelectionTable
({
customKey
:
'
member
Id'
})
const
[
rowSelection
,
rowCtl
]
=
useRowSelectionTable
({
customKey
:
'
relation
Id'
})
const
[
realRowSelection
,
realRowCtl
]
=
useRowSelectionTable
({
customKey
:
'relationId'
})
const
[
memberVisible
,
setMemberVisible
]
=
useState
(
false
)
const
{
pageStatus
,
id
}
=
usePageStatus
()
...
...
@@ -38,6 +38,8 @@ const SalesmanBindAdded = (props) => {
const
[
keywordName
,
setKeywordName
]
=
useState
<
string
>
(
''
)
const
intl
=
useIntl
()
console
.
log
(
rowSelection
,
rowCtl
,
'测试'
)
const
fliterTableData
=
useMemo
(()
=>
{
if
(
!
keywordName
)
{
return
tableData
...
...
@@ -74,7 +76,8 @@ const SalesmanBindAdded = (props) => {
},
[
realRowCtl
.
selectedRowKeys
])
useEffect
(()
=>
{
rowCtl
.
setSelectedRowKeys
(
tableData
.
map
(
v
=>
v
.
memberId
))
console
.
log
(
tableData
,
'tableData'
)
rowCtl
.
setSelectedRowKeys
(
tableData
.
map
(
v
=>
v
.
relationId
))
rowCtl
.
setSelectRow
([...
tableData
])
realRowCtl
.
setSelectedRowKeys
(
tableData
.
filter
(
v
=>
!
staticData
.
current
.
includes
(
v
)))
...
...
@@ -297,6 +300,23 @@ const SalesmanBindAdded = (props) => {
}
};
const
fetchMemberSaleChannel
=
async
(
params
)
=>
{
const
userInfo
=
formAction
.
getFieldValue
(
'userId'
)
if
(
userInfo
&&
userInfo
.
length
>
0
)
{
const
userId
=
userInfo
[
0
].
userId
const
{
data
,
code
}
=
await
getMemberAbilitySalesChannel
({
userId
,
...
params
})
if
(
code
===
1000
)
{
setTableData
(
data
.
data
)
}
return
code
===
1000
?
data
:
[]
}
else
{
return
[]
}
}
return
(
<
PeripheralLayout
hideBreak
...
...
@@ -324,6 +344,11 @@ const SalesmanBindAdded = (props) => {
actions=
{
formAction
}
editable=
{
pageStatus
!==
PageStatus
.
PREVIEW
}
previewPlaceholder=
" "
effects=
{
(
$
,
ctx
)
=>
{
$
(
'onFieldChange'
,
'userId'
).
subscribe
(
async
state
=>
{
fetchMemberSaleChannel
({
current
:
1
,
pageSize
:
10
})
})
}
}
schema=
{
{
type
:
'object'
,
properties
:
{
...
...
@@ -453,7 +478,7 @@ const SalesmanBindAdded = (props) => {
rowSelection=
{
rowSelection
}
columns=
{
modalMemberColumns
}
fetchTableData=
{
fetchTableData
}
rowKey=
{
'
member
Id'
}
rowKey=
{
'
relation
Id'
}
forceRender
formilyProps=
{
{
ctx
:
{
...
...
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