diff --git a/src/dealer/orders/index.tsx b/src/dealer/orders/index.tsx index 24eea38..6a8ae21 100644 --- a/src/dealer/orders/index.tsx +++ b/src/dealer/orders/index.tsx @@ -7,6 +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"; interface OrderWithDetails extends ShopDealerOrder { orderNo?: string @@ -22,20 +23,6 @@ interface PickerOption { className?: string | number } -const listData1 = [ - [ - { value: 1, text: '南京市' }, - { value: 2, text: '无锡市' }, - { value: 3, text: '海北藏族自治区' }, - { value: 4, text: '北京市' }, - { value: 5, text: '连云港市' }, - { value: 8, text: '大庆市' }, - { value: 9, text: '绥化市' }, - { value: 10, text: '潍坊市' }, - { value: 12, text: '乌鲁木齐市' }, - ], -] - const DealerOrder: React.FC = () => { const [loading, setLoading] = useState(false) const d = new Date() @@ -48,14 +35,20 @@ const DealerOrder: React.FC = () => { const [orders, setOrders] = useState([]) const [currentPage, setCurrentPage] = useState(1) const [hasMore, setHasMore] = useState(true) + const [users, setUsers] = useState([]) const [visible1, setVisible1] = useState(false) - const [baseDesc, setBaseDesc] = useState('') + const [text1, setText1] = useState('') + const [visible2, setVisible2] = useState(false) + const [text2, setText2] = useState('') + const [visible3, setVisible3] = useState(false) + const [text3, setText3] = useState('') + const {dealerUser} = useDealerUser() const {user} = useUser() // 获取订单数据 - const fetchOrders = useCallback(async (page: number = 1, isRefresh: boolean = false) => { + const fetchOrders = useCallback(async (page: number = 1, isRefresh: boolean = false,userId?: number) => { if (!dealerUser?.userId) return try { @@ -66,8 +59,8 @@ const DealerOrder: React.FC = () => { } else { setLoadingMore(true) } - const result = await pageShopDealerOrder({ + userId: userId || undefined, isInvalid: 0, isSettled: 1, resourceId: getResourceId(), @@ -136,29 +129,43 @@ const DealerOrder: React.FC = () => { return user.roles.some(role => role.roleCode === roleCode); } - const changePicker = (list: any[], option: any, columnIndex: number) => { - console.log(list,'list>>>') - console.log(columnIndex, option) - } - - const confirmPicker = ( + const confirmPicker1 = ( options: PickerOption[], values: (string | number)[] ) => { - let description = '' - options.forEach((option: any) => { - description += ` ${option.text}` - }) - console.log(values,'values') - setBaseDesc(description) - } - - // 初始化加载数据 - useEffect(() => { - if (dealerUser?.userId) { - fetchOrders(1) + // let description = '' + // options.forEach((option: any) => { + // description += ` ${option.text}` + // }) + if(values && values.length > 0){ + Number(values[0]) + options.forEach((option: any) => { + setText1(`${option.text}`) + }) } - }, [fetchOrders, date]) + } + const confirmPicker2 = ( + options: PickerOption[], + values: (string | number)[] + ) => { + if(values && values.length > 0){ + Number(values[0]) + options.forEach((option: any) => { + setText2(`${option.text}`) + }) + } + } + const confirmPicker3 = ( + options: PickerOption[], + values: (string | number)[] + ) => { + if(values && values.length > 0){ + Number(values[0]) + options.forEach((option: any) => { + setText3(`${option.text}`) + }) + } + } const getStatusText = (isSettled?: number, isInvalid?: number) => { if (isInvalid === 1) return '未签约' @@ -166,6 +173,34 @@ const DealerOrder: React.FC = () => { return '待结算' } + function fetchUsers() { + + pageUsers({}).then(data => { + console.log(data,'datadatadatadatadatadata') + const userList = data?.list.map(d => { + return { + text: d.nickname, + value: d.userId, + disabled: false, + children: [], + className: '' + } + }) + setUsers(userList || []) + }) + } + + // 初始化加载数据 + useEffect(() => { + if (dealerUser?.userId) { + fetchOrders(1).then() + } + }, [fetchOrders, date]) + + useEffect(() => { + fetchUsers() + },[]) + const renderOrderItem = (order: OrderWithDetails) => ( @@ -280,9 +315,9 @@ const DealerOrder: React.FC = () => { setShow1(true)}/> - - - + + + {/*账单列表*/} @@ -331,12 +366,25 @@ const DealerOrder: React.FC = () => { }} /> confirmPicker(list, values)} + options={users} + onConfirm={(list, values) => confirmPicker1(list, values)} onClose={() => setVisible1(false)} - onChange={changePicker} + /> + confirmPicker2(list, values)} + onClose={() => setVisible2(false)} + /> + confirmPicker3(list, values)} + onClose={() => setVisible3(false)} /> )