From 6700f4baf278dac9284a62bcb9bfec6b3c064489 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Mon, 9 Dec 2024 15:46:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8F=91=E9=80=81=E9=82=AE=E4=BB=B6:=20?=
 =?UTF-8?q?=E6=B0=94=E6=B3=A1=E6=98=BE=E7=A4=BAcoli=20id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Online/Components/EmailQuotation.jsx              |  1 +
 .../Conversations/Online/Input/EmailComposer.jsx      |  4 +++-
 .../Conversations/Online/Input/EmailEditorPopup.jsx   | 11 +++++++----
 src/views/Conversations/Online/MessagesWrapper.jsx    |  1 +
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/views/Conversations/Online/Components/EmailQuotation.jsx b/src/views/Conversations/Online/Components/EmailQuotation.jsx
index d8b5644..83d7c3c 100644
--- a/src/views/Conversations/Online/Components/EmailQuotation.jsx
+++ b/src/views/Conversations/Online/Components/EmailQuotation.jsx
@@ -76,6 +76,7 @@ const EmailQuotation = ({ sfi_sn, ...props }) => {
         fromUser={orderDetail.opi_sn}
         toEmail={currentConversation?.channels?.email || customerDetail?.email}
         fromOrder={currentConversation.coli_sn}
+        oid={orderDetail?.order_no}
         conversationid={currentConversation.sn}
         // emailMsg={ReferEmailMsg}
         // quoteid={mailID}
diff --git a/src/views/Conversations/Online/Input/EmailComposer.jsx b/src/views/Conversations/Online/Input/EmailComposer.jsx
index ae4530c..8e0aedf 100644
--- a/src/views/Conversations/Online/Input/EmailComposer.jsx
+++ b/src/views/Conversations/Online/Input/EmailComposer.jsx
@@ -145,6 +145,7 @@ const EmailComposer = ({ ...props }) => {
         subject: values.subject,
         content: body.mailcontent,
       },
+      coli_id: orderDetail?.order_no || '',
     }
     setSendLoading(true)
     body.externalID = stickToCid
@@ -177,7 +178,7 @@ const EmailComposer = ({ ...props }) => {
       <Form
         form={form}
         preserve={false}
-        name='email_max_form'
+        name='email_quick_form'
         layout={'inline'}
         // initialValues={{}}
         onFinish={handleSendEmail}
@@ -256,6 +257,7 @@ const EmailComposer = ({ ...props }) => {
           fromEmail={fromEmail}
           fromUser={fromUser}
           fromOrder={currentConversation.coli_sn}
+          oid={orderDetail?.order_no}
           conversationid={currentConversation.sn}
           toEmail={toEmail}
           draft={quickData}
diff --git a/src/views/Conversations/Online/Input/EmailEditorPopup.jsx b/src/views/Conversations/Online/Input/EmailEditorPopup.jsx
index 42d6b11..ea776dc 100644
--- a/src/views/Conversations/Online/Input/EmailEditorPopup.jsx
+++ b/src/views/Conversations/Online/Input/EmailEditorPopup.jsx
@@ -68,13 +68,13 @@ const generateMailContent = (mailData) => `
 /**
  * @property {string} fromEmail - 发件人邮箱
  * @property {string} fromUser - 发件人用户
- * @property {string} fromOrder - 发件人订单
+ * @property {string} fromOrder - 发件订单
  * @property {string} toEmail - 收件人邮箱
  * @property {string} conversationid - 会话ID
  * @property {string} quoteid - 引用邮件ID
  * @property {object} draft - 草稿
  */
-const EmailEditorPopup = ({ open, setOpen, fromEmail, fromUser, fromOrder, toEmail, conversationid, quoteid, initial = {}, mailData: _mailData, action = 'reply', draft = {}, ...props }) => {
+const EmailEditorPopup = ({ open, setOpen, fromEmail, fromUser, fromOrder, oid, toEmail, conversationid, quoteid, initial = {}, mailData: _mailData, action = 'reply', draft = {}, ...props }) => {
 	const { notification, message } = App.useApp();
   const [form] = Form.useForm();
 
@@ -115,7 +115,7 @@ const EmailEditorPopup = ({ open, setOpen, fromEmail, fromUser, fromOrder, toEma
   useEffect(() => {
     if (isEmpty(quoteid)) {
       // console.log('emailEditorPopup effect', open, '\nto', toEmail)
-      setStickToProps({ fromEmail, fromUser, fromOrder, toEmail, conversationid, quoteid, action, draft });
+      setStickToProps({ fromEmail, fromUser, fromOrder, oid, toEmail, conversationid, quoteid, action, draft });
 
       setStickToCid(conversationid)
       setEmailOrder(fromOrder)
@@ -408,6 +408,7 @@ const EmailEditorPopup = ({ open, setOpen, fromEmail, fromUser, fromOrder, toEma
         subject: values.subject,
         content: body.mailcontent,
       },
+      coli_id: stickToProps.oid || `{${emailOrder}}`
     }
     setSendLoading(true);
     body.externalID = stickToCid;
@@ -422,6 +423,8 @@ const EmailEditorPopup = ({ open, setOpen, fromEmail, fromUser, fromOrder, toEma
       const result = await postSendEmail(body);
       const mailSavedId = result.id || '';
       bubbleMsg.email.mai_sn = mailSavedId;
+      // console.log('invokeEmailMessage', bubbleMsg);
+
       invokeEmailMessage(bubbleMsg);
 
       // setSendLoading(false);
@@ -473,7 +476,7 @@ const EmailEditorPopup = ({ open, setOpen, fromEmail, fromUser, fromOrder, toEma
               </Popconfirm>
               <Select labelInValue
                 options={emailListOption}
-                value={newFromEmail}
+                value={{key: newFromEmail, value: newFromEmail, label: newFromEmail}}
                 onChange={handleSwitchEmail}
                 variant={'borderless'}
               />
diff --git a/src/views/Conversations/Online/MessagesWrapper.jsx b/src/views/Conversations/Online/MessagesWrapper.jsx
index c86fb54..bbef740 100644
--- a/src/views/Conversations/Online/MessagesWrapper.jsx
+++ b/src/views/Conversations/Online/MessagesWrapper.jsx
@@ -228,6 +228,7 @@ const MessagesWrapper = ({ updateRead = true, forceGetMessages }) => {
         fromEmail={fromEmail}
         fromUser={Number(orderDetail?.opi_sn || userId)}
         fromOrder={currentConversation.coli_sn}
+        oid={orderDetail?.order_no}
         quoteid={ReferEmailMsg.mai_sn || ReferEmailMsg.id}
         conversationid={currentConversation.sn}
         key={`email-msg-reply-top-popup_${ReferEmailMsg.id}`}