diff --git a/src/dealer/orders/index.tsx b/src/dealer/orders/index.tsx index 05be86d..13aeb96 100644 --- a/src/dealer/orders/index.tsx +++ b/src/dealer/orders/index.tsx @@ -7,7 +7,7 @@ import {pageShopDealerOrder} from '@/api/shop/shopDealerOrder' import {useDealerUser} from '@/hooks/useDealerUser' import type {ShopDealerOrder} from '@/api/shop/shopDealerOrder/model' import {useUser} from "@/hooks/useUser"; -import {pageUsers} from "@/api/system/user"; +import {pageShopDealerReferee} from "@/api/shop/shopDealerReferee"; interface OrderWithDetails extends ShopDealerOrder { orderNo?: string @@ -43,7 +43,7 @@ const DealerOrder: React.FC = () => { const [text2, setText2] = useState('') const [selectedFirstUserId, setSelectedFirstUserId] = useState(undefined) const [visible3, setVisible3] = useState(false) - const [text3, setText3] = useState('') + // const [text3, setText3] = useState('') const [selectedSecondUserId, setSelectedSecondUserId] = useState(undefined) @@ -62,9 +62,10 @@ const DealerOrder: React.FC = () => { } else { setLoadingMore(true) } - const result = await pageShopDealerOrder({ + console.log(selectedUserId, selectedFirstUserId, selectedSecondUserId,'selectedUserIds...') + let where = { userId: selectedUserId, - firstUserId: selectedFirstUserId, + firstUserId: selectedSecondUserId, secondUserId: selectedSecondUserId, isInvalid: 0, isSettled: 1, @@ -72,7 +73,15 @@ const DealerOrder: React.FC = () => { month: date, page, limit: 10 - }) + }; + if(selectedUserId){ + where = {...where,userId: selectedUserId} + } + if(selectedFirstUserId){ + where = {...where,secondUserId: selectedFirstUserId} + } + + const result = await pageShopDealerOrder(where) if (result?.list) { const newOrders = result.list.map(order => ({ @@ -147,7 +156,7 @@ const DealerOrder: React.FC = () => { setSelectedFirstUserId(undefined) setSelectedSecondUserId(undefined) setText2('') - setText3('') + // setText3('') // 设置业务员筛选条件 setSelectedUserId(userId) // 关闭选择器 @@ -164,10 +173,10 @@ const DealerOrder: React.FC = () => { setText2(`${option.text}`) }) // 清空其他两个筛选条件 - setSelectedUserId(undefined) - setSelectedSecondUserId(undefined) - setText1('') - setText3('') + // setSelectedUserId(undefined) + // setSelectedSecondUserId(undefined) + // setText1('') + // setText3('') // 设置渠道一筛选条件 setSelectedFirstUserId(firstUserId) // 关闭选择器 @@ -175,14 +184,14 @@ const DealerOrder: React.FC = () => { } } const confirmPicker3 = ( - options: PickerOption[], + _: PickerOption[], values: (string | number)[] ) => { if(values && values.length > 0){ const secondUserId = Number(values[0]) - options.forEach((option: any) => { - setText3(`${option.text}`) - }) + // options.forEach((option: any) => { + // setText3(`${option.text}`) + // }) // 清空其他两个筛选条件 setSelectedUserId(undefined) setSelectedFirstUserId(undefined) @@ -202,10 +211,10 @@ const DealerOrder: React.FC = () => { } function fetchUsers() { - - pageUsers({}).then(data => { - console.log(data,'datadatadatadatadatadata') - const userList = data?.list.map(d => { + pageShopDealerReferee({ + dealerId: selectedFirstUserId || selectedUserId || Taro.getStorageSync('UserId'), + }).then(res => { + const data = res?.list.map(d => { return { text: d.nickname, value: d.userId, @@ -214,8 +223,20 @@ const DealerOrder: React.FC = () => { className: '' } }) - setUsers(userList || []) + setUsers(data || []) }) + // pageUsers({}).then(data => { + // const userList = data?.list.map(d => { + // return { + // text: d.nickname, + // value: d.userId, + // disabled: false, + // children: [], + // className: '' + // } + // }) + // setUsers(userList || []) + // }) } // 初始化加载数据 @@ -223,10 +244,10 @@ const DealerOrder: React.FC = () => { if (dealerUser?.userId) { fetchOrders(1).then() } + fetchUsers() }, [fetchOrders, date]) useEffect(() => { - fetchUsers() },[]) const renderOrderItem = (order: OrderWithDetails) => ( @@ -344,8 +365,8 @@ const DealerOrder: React.FC = () => { - - + {selectedUserId && } + {/**/} {/*账单列表*/}