diff --git a/src/dealer/orders/index.tsx b/src/dealer/orders/index.tsx index 6a8ae21..05be86d 100644 --- a/src/dealer/orders/index.tsx +++ b/src/dealer/orders/index.tsx @@ -38,17 +38,20 @@ const DealerOrder: React.FC = () => { const [users, setUsers] = useState([]) const [visible1, setVisible1] = useState(false) const [text1, setText1] = useState('') + const [selectedUserId, setSelectedUserId] = useState(undefined) const [visible2, setVisible2] = useState(false) const [text2, setText2] = useState('') + const [selectedFirstUserId, setSelectedFirstUserId] = useState(undefined) const [visible3, setVisible3] = useState(false) const [text3, setText3] = useState('') + const [selectedSecondUserId, setSelectedSecondUserId] = useState(undefined) const {dealerUser} = useDealerUser() const {user} = useUser() // 获取订单数据 - const fetchOrders = useCallback(async (page: number = 1, isRefresh: boolean = false,userId?: number) => { + const fetchOrders = useCallback(async (page: number = 1, isRefresh: boolean = false) => { if (!dealerUser?.userId) return try { @@ -60,7 +63,9 @@ const DealerOrder: React.FC = () => { setLoadingMore(true) } const result = await pageShopDealerOrder({ - userId: userId || undefined, + userId: selectedUserId, + firstUserId: selectedFirstUserId, + secondUserId: selectedSecondUserId, isInvalid: 0, isSettled: 1, resourceId: getResourceId(), @@ -98,7 +103,7 @@ const DealerOrder: React.FC = () => { setRefreshing(false) setLoadingMore(false) } - }, [dealerUser?.userId, date]) + }, [dealerUser?.userId, date, selectedUserId, selectedFirstUserId, selectedSecondUserId]) // 下拉刷新 const handleRefresh = async () => { @@ -133,15 +138,20 @@ const DealerOrder: React.FC = () => { options: PickerOption[], values: (string | number)[] ) => { - // let description = '' - // options.forEach((option: any) => { - // description += ` ${option.text}` - // }) if(values && values.length > 0){ - Number(values[0]) + const userId = Number(values[0]) options.forEach((option: any) => { setText1(`${option.text}`) }) + // 清空其他两个筛选条件 + setSelectedFirstUserId(undefined) + setSelectedSecondUserId(undefined) + setText2('') + setText3('') + // 设置业务员筛选条件 + setSelectedUserId(userId) + // 关闭选择器 + setVisible1(false) } } const confirmPicker2 = ( @@ -149,10 +159,19 @@ const DealerOrder: React.FC = () => { values: (string | number)[] ) => { if(values && values.length > 0){ - Number(values[0]) + const firstUserId = Number(values[0]) options.forEach((option: any) => { setText2(`${option.text}`) }) + // 清空其他两个筛选条件 + setSelectedUserId(undefined) + setSelectedSecondUserId(undefined) + setText1('') + setText3('') + // 设置渠道一筛选条件 + setSelectedFirstUserId(firstUserId) + // 关闭选择器 + setVisible2(false) } } const confirmPicker3 = ( @@ -160,10 +179,19 @@ const DealerOrder: React.FC = () => { values: (string | number)[] ) => { if(values && values.length > 0){ - Number(values[0]) + const secondUserId = Number(values[0]) options.forEach((option: any) => { setText3(`${option.text}`) }) + // 清空其他两个筛选条件 + setSelectedUserId(undefined) + setSelectedFirstUserId(undefined) + setText1('') + setText2('') + // 设置渠道二筛选条件 + setSelectedSecondUserId(secondUserId) + // 关闭选择器 + setVisible3(false) } }