Commit fd969040 authored by 前端-黄佳鑫's avatar 前端-黄佳鑫

fix: 修改业务员管理 新增/修改选择下级 会员id 重复的问题

parent 97cefc8c
......@@ -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: 'memberId' })
const [rowSelection, rowCtl] = useRowSelectionTable({ customKey: 'relationId' })
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.memberId))
rowCtl.setSelectedRowKeys(tableData.map(v => v.relationId))
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={'memberId'}
rowKey={'relationId'}
forceRender
formilyProps={{
ctx: {
......
......@@ -30,7 +30,7 @@ const fetchMemberAbilitySelect = async (params) => {
const SalesmanBindAdded = (props) => {
const ref = useRef<any>({})
const staticData = useRef<any>([])
const [rowSelection, rowCtl] = useRowSelectionTable({ customKey: 'memberId' })
const [rowSelection, rowCtl] = useRowSelectionTable({ customKey: 'relationId' })
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={'memberId'}
rowKey={'relationId'}
forceRender
formilyProps={{
ctx: {
......
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