Merge branch 'main' into dev/supplier-email-drawer

# Conflicts:
#	src/views/Conversations/Online/order/CustomerProfile.jsx

src/stores/OrderStore.js

@@ -232,8 +232,31 @@ export const OrderStatusDefaultOptionsMapped = OrderStatusDefaultOptions.reduce(
   return { ...acc, [String(cur.value)]: cur }
 }, {})
 
+/**
+ * @useage 订单跟踪:高级搜索
+ */
 export const RemindStateDefaultOptions = [
   { value: '1', label: '一催' },
   { value: '2', label: '二催' },
   { value: '3', label: '三催' }
 ]
+
+/**
+ * @useage 订单信息: 标记状态
+ */
+export const remindStatusOptions = [
+  { value: '1', label: '已发一催' },
+  { value: '2', label: '已发二催' },
+  { value: '3', label: '已发三催' },
+  { value: 'important', label: '重点团' },
+  { value: 'sendsurvey', label: '已发 travel advisor survey' },
+];
+
+
+/**
+ * @param {Object} params { coli_sn, remindstate }
+ */
+export const fetchSetRemindStateAction = async (params) => {
+  const { errcode, result } = await fetchJSON(`${API_HOST}/SetRemindState`, params);
+  return errcode === 0 ? result : {};
+};

src/views/Conversations/Online/order/CustomerProfile.jsx

@@ -1,5 +1,5 @@
 import { LinkOutlined, MailOutlined, PhoneOutlined, UserOutlined, WhatsAppOutlined, FieldNumberOutlined } from "@ant-design/icons";
-import { App, Button, Card, Empty, Flex, Select, Spin, Typography, Divider, Modal, List, Row, Col, Tag, Drawer, Input } from "antd";
+import { App, Button, Card, Empty, Flex, Select, Spin, Typography, Divider, Modal, List, Row, Col, Tag, Checkbox, Drawer, Input } from "antd";
 import { useEffect, useState, useRef, useCallback } from "react";
 import { useNavigate } from "react-router-dom";
 import { useShallow } from 'zustand/react/shallow';
@@ -7,7 +7,7 @@ import { useShallow } from 'zustand/react/shallow';
 import { copy, isEmpty } from "@/utils/commons";
 import { Conditional } from "@/components/Conditional";
 import useConversationStore from "@/stores/ConversationStore";
-import { useOrderStore, OrderLabelDefaultOptions, OrderStatusDefaultOptions } from "@/stores/OrderStore";
+import { useOrderStore, OrderLabelDefaultOptions, OrderStatusDefaultOptions, remindStatusOptions, fetchSetRemindStateAction } from "@/stores/OrderStore";
 import useAuthStore from "@/stores/AuthStore";
 import QuotesHistory from "./QuotesHistory";
 import ConversationBind from "./../ConversationBind";
@@ -148,6 +148,25 @@ const CustomerProfile = () => {
     updateCurrentConversation({ coli_sn });
   };
 
+  const [orderRemindState, setOrderRemindState] = useState(orderDetail.remindstate);
+  const handleSetRemindState = async (checkedValue) => {
+    const state = checkedValue.filter(v => v !== orderRemindState);
+    const oldState = orderRemindState;
+
+    try {
+      if (isEmpty(state)) {
+        setOrderRemindState(null);
+      } else {
+        setOrderRemindState(state[0]);
+      }
+      await fetchSetRemindStateAction({ coli_sn: chatOrder, remindstate: state });
+      message.success('设置成功');
+    } catch (error) {
+      notification.warning({ message: '设置失败', description: error.message, placement: 'top', duration: 60 });
+      setOrderRemindState(oldState);
+    }
+  }
+
 	if (currentOrder) {
 		return (
 			<div className="divide-x-0 divide-y divide-dashed divide-gray-300">
@@ -256,6 +275,10 @@ const CustomerProfile = () => {
 							</Flex>
 						</Flex>
 					</Card>
+          <Divider orientation="left">
+            <Typography.Text strong>催信:</Typography.Text>
+          </Divider>
+          <Checkbox.Group key='substatus' value={[orderRemindState]} options={remindStatusOptions} onChange={handleSetRemindState} />
 					<Divider orientation="left">
 						<Typography.Text strong>最新报价</Typography.Text>
 					</Divider>

wai-server/helper/wai.msg.helper.js

@@ -297,6 +297,8 @@ const waiMsgTypeMapped = {
 const ctxToSendBuilder = ctxContent => {
   const { contentToSend } = waiMsgTypeMapped[ctxContent.msgtype];
   const msgReady = contentToSend(ctxContent);
+  msgReady.from = ctxContent.from.replace('+', '');
+  msgReady.to = ctxContent.to.replace('+', '');
   return msgReady;
 };