From 7c7882a67d6e4e70081eb7d16f86bd858e36791b Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Thu, 25 Apr 2024 10:40:43 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E6=9C=AA=E5=88=86=E9=85=8D=E4=BC=9A?=
 =?UTF-8?q?=E8=AF=9D:=20=E5=85=A5=E5=8F=A3=E9=93=BE=E6=8E=A5=E5=88=A0?=
 =?UTF-8?q?=E5=8E=BBconversationid,=20=E4=BB=8E=E4=BC=9A=E8=AF=9D=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.jsx                            |  4 ++--
 src/views/Conversations/ChatAssign.jsx  | 11 ++++++++---
 src/views/Conversations/InputAssign.jsx |  4 +++-
 3 files changed, 13 insertions(+), 6 deletions(-)

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: <Unassign /> },
             ],
           },
-          { path: 'chat/unassign/:whatsappid/:conversationid', element: <ChatAssign /> },
+          { path: 'chat/unassign/:whatsappid', element: <ChatAssign /> },
           { path: 'm/chat/:order_sn', element: <MobileChat /> },
           { path: 'm/chat', element: <MobileChat /> },
           {
@@ -66,7 +66,7 @@ const router = createBrowserRouter([
               { path: 'order/chat/:order_sn', element: <ChatWindow /> },
               { path: 'order/chat', element: <ChatWindow /> },
               { path: 'account/profile', element: <AccountProfile /> },
-              { path: 'chat/unassign/:whatsappid/:conversationid', element: <ChatAssign /> },
+              { path: 'chat/unassign/:whatsappid', element: <ChatAssign /> },
               { path: 'chat/unassign', element: <Unassign /> },
             ],
           },
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() {
     <>
       <Layout className='h-full chatwindow-wrapper mobilechat-wrapper' style={{ maxHeight: 'calc(100vh - 32px)', height: 'calc(100vh - 32px)', minWidth: '360px' }}>
         <Header className=' px-2 ant-layout-sider-light ant-card h-auto flex flex-col justify-between gap-1 '>
-          <InputAssign className={'block py-2'} initialValues={{ conversationid, whatsappid }} />
+          <InputAssign className={'block py-2'} initialValues={{ conversationid, whatsappid }} {...{ conversationid, opi }} />
           <MessagesHeader />
         </Header>
         <Content className='flex-grow bg-whatsapp-bg relative'>
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);