diff --git a/src/main.jsx b/src/main.jsx index eea4b11..3c63d25 100644 --- a/src/main.jsx +++ b/src/main.jsx @@ -45,7 +45,7 @@ const router = createBrowserRouter([ { path: 'unassign', element: }, ], }, - { path: 'chat/unassign/:whatsappid/:conversationid', element: }, + { path: 'chat/unassign/:whatsappid', element: }, { path: 'm/chat/:order_sn', element: }, { path: 'm/chat', element: }, { @@ -66,7 +66,7 @@ const router = createBrowserRouter([ { path: 'order/chat/:order_sn', element: }, { path: 'order/chat', element: }, { path: 'account/profile', element: }, - { path: 'chat/unassign/:whatsappid/:conversationid', element: }, + { path: 'chat/unassign/:whatsappid', element: }, { path: 'chat/unassign', element: }, ], }, diff --git a/src/views/Conversations/ChatAssign.jsx b/src/views/Conversations/ChatAssign.jsx index e73bbb7..77d68c1 100644 --- a/src/views/Conversations/ChatAssign.jsx +++ b/src/views/Conversations/ChatAssign.jsx @@ -1,4 +1,4 @@ -import { useEffect } from 'react'; +import { useEffect, useState } from 'react'; import { Layout } from 'antd'; import MessagesHeader from '@/views/Conversations/Online/MessagesHeader'; import MessagesWrapper from '@/views/Conversations/Online/MessagesWrapper'; @@ -13,14 +13,19 @@ const { Content, Header, Footer } = Layout; function ChatAssign() { const navigate = useNavigate(); - const { whatsappid, conversationid } = useParams(); + const { whatsappid, } = useParams(); const [currentConversation, setCurrentConversation] = useConversationStore(useShallow((state) => [state.currentConversation, state.setCurrentConversation])); + const [conversationid, setConversationid] = useState(); + const [opi, setOpi] = useState({}); + async function refreshConversationList() { const _list = await fetchConversationsSearch({ whatsapp_id: whatsappid }); if (_list.length > 0) { setCurrentConversation(_list[0]); + setConversationid(String(_list[0].conversationid)); + setOpi({ label: _list[0].opi_name, value: String(_list[0].opi_sn) }); } } @@ -35,7 +40,7 @@ function ChatAssign() { <>
- +
diff --git a/src/views/Conversations/InputAssign.jsx b/src/views/Conversations/InputAssign.jsx index 5e71766..ae66ef2 100644 --- a/src/views/Conversations/InputAssign.jsx +++ b/src/views/Conversations/InputAssign.jsx @@ -5,7 +5,7 @@ import { fetchSalesAgentWithDD } from '@/actions/CommonActions'; import { postAssignConversation } from '@/actions/ConversationActions'; import useAuthStore from '@/stores/AuthStore'; -const InputAssign = ({ initialValues, ...props }) => { +const InputAssign = ({ initialValues, conversationid, ...props }) => { const [userId, username] = useAuthStore((state) => [state.loginUser.userId, state.loginUser.username]); const actionDisabled = !['79', '383', '404', '227'].includes(String(userId)); @@ -16,9 +16,11 @@ const InputAssign = ({ initialValues, ...props }) => { async function handleSubmit(values) { const valuesSub = { ...values, + conversationid, opi_sn: values.opi_sn.value, from_opi_sn: userId, // 谁在操作 }; + // console.log(valuesSub); setSubLoading(true); await postAssignConversation(valuesSub); setSubLoading(false);