Merge remote-tracking branch 'origin/master'

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
@@ -38,17 +38,20 @@ const DealerOrder: React.FC = () => {
   const [users, setUsers] = useState<any[]>([])
   const [visible1, setVisible1] = useState(false)
   const [text1, setText1] = useState('')
+  const [selectedUserId, setSelectedUserId] = useState<number | undefined>(undefined)
   const [visible2, setVisible2] = useState(false)
   const [text2, setText2] = useState('')
+  const [selectedFirstUserId, setSelectedFirstUserId] = useState<number | undefined>(undefined)
   const [visible3, setVisible3] = useState(false)
-  const [text3, setText3] = useState('')
+  // const [text3, setText3] = useState('')
+  const [selectedSecondUserId, setSelectedSecondUserId] = useState<number | undefined>(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 {
@@ -59,15 +62,26 @@ const DealerOrder: React.FC = () => {
       } else {
         setLoadingMore(true)
       }
-      const result = await pageShopDealerOrder({
+      console.log(selectedUserId, selectedFirstUserId, selectedSecondUserId,'selectedUserIds...')
-        userId: userId || undefined,
+      let where = {
+        userId: selectedUserId,
+        firstUserId: selectedSecondUserId,
+        secondUserId: selectedSecondUserId,
         isInvalid: 0,
         isSettled: 1,
         resourceId: getResourceId(),
         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 => ({
@@ -98,7 +112,7 @@ const DealerOrder: React.FC = () => {
       setRefreshing(false)
       setLoadingMore(false)
     }
-  }, [dealerUser?.userId, date])
+  }, [dealerUser?.userId, date, selectedUserId, selectedFirstUserId, selectedSecondUserId])
 
   // 下拉刷新
   const handleRefresh = async () => {
@@ -133,15 +147,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,21 +168,39 @@ 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 = (
-    options: PickerOption[],
+    _: PickerOption[],
     values: (string | number)[]
   ) => {
     if(values && values.length > 0){
-      Number(values[0])
+      const secondUserId = Number(values[0])
-      options.forEach((option: any) => {
+      // options.forEach((option: any) => {
-        setText3(`${option.text}`)
+        // setText3(`${option.text}`)
-      })
+      // })
+      // 清空其他两个筛选条件
+      setSelectedUserId(undefined)
+      setSelectedFirstUserId(undefined)
+      setText1('')
+      setText2('')
+      // 设置渠道二筛选条件
+      setSelectedSecondUserId(secondUserId)
+      // 关闭选择器
+      setVisible3(false)
     }
   }
 
@@ -174,10 +211,10 @@ const DealerOrder: React.FC = () => {
   }
 
   function fetchUsers() {
-
+    pageShopDealerReferee({
-    pageUsers({}).then(data => {
+      dealerId: selectedFirstUserId || selectedUserId || Taro.getStorageSync('UserId'),
-      console.log(data,'datadatadatadatadatadata')
+    }).then(res => {
-      const userList = data?.list.map(d => {
+      const data = res?.list.map(d => {
         return {
           text: d.nickname,
           value: d.userId,
@@ -186,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 || [])
+    // })
   }
 
   // 初始化加载数据
@@ -195,10 +244,10 @@ const DealerOrder: React.FC = () => {
     if (dealerUser?.userId) {
       fetchOrders(1).then()
     }
+    fetchUsers()
   }, [fetchOrders, date])
 
   useEffect(() => {
-    fetchUsers()
   },[])
 
   const renderOrderItem = (order: OrderWithDetails) => (
@@ -316,8 +365,8 @@ const DealerOrder: React.FC = () => {
             </View>
             <Space className={'select-user'}>
               <Button size={'mini'} onClick={() => setVisible1(!visible1)}>{text1 || '业务员'}</Button>
-              <Button size={'mini'} onClick={() => setVisible2(!visible2)}>{text2 || '渠道一'}</Button>
+              {selectedUserId && <Button size={'mini'} onClick={() => setVisible2(!visible2)}>{text2 || '渠道员'}</Button>}
-              <Button size={'mini'} onClick={() => setVisible3(!visible3)}>{text3 || '渠道二'}</Button>
+              {/*<Button size={'mini'} onClick={() => setVisible3(!visible3)}>{text3 || '渠道二'}</Button>*/}
             </Space>
           </View>
           {/*账单列表*/}