Merge remote-tracking branch 'origin/main'

src/stores/OrderStore.js

@@ -128,6 +128,17 @@ export const useOrderStore = create(devtools((set, get) => ({
 
   },
 
+  importEmailMessage: ({ orderId, orderNumber }) => {
+    return fetchJSON(`${API_HOST}/generate_email_msg`, { coli_sn: orderId, coli_id: orderNumber })
+      .then(json => {
+        if (json.errcode === 0) {
+          console.info(json)
+        } else {
+          throw new Error(json?.errmsg + ': ' + json.errcode)
+        }
+      })
+  },
+
   fetchOtherEmail: (coli_sn) => {
     return fetchJSON(`${EMAIL_HOST}/email_supplier`, { coli_sn })
       .then(json => {
@@ -139,7 +150,6 @@ export const useOrderStore = create(devtools((set, get) => ({
           throw new Error(json?.errmsg + ': ' + json.errcode)
         }
       })
-
   },
 
   setOrderPropValue: async (colisn, propName, value) => {

src/views/orders/Follow.jsx

@@ -7,7 +7,7 @@ import { WhatsAppOutlined } from '@ant-design/icons'
 import {
   App, Badge,
   Empty,
-  Flex,
+  Flex,Button,
   Radio, Space, Switch, Table,
   Tabs, Divider,
   Tag, Tooltip
@@ -39,6 +39,7 @@ function OrderGroupTable({ formValues }) {
               {text}
             </Link>
             {tagIcon}
+            <Button color="default" variant="filled" size='small' onClick={() => {importEmailMessage({ orderId: record.COLI_SN, orderNumber: record.COLI_ID })}}>导入</Button>
           </Space>
         )
       }
@@ -128,6 +129,7 @@ function OrderGroupTable({ formValues }) {
   const [loading, setLoading] = useState(false)
   const orderList = useOrderStore((state) => state.orderList)
   const fetchOrderList = useOrderStore((state) => state.fetchOrderList)
+  const importEmailMessage = useOrderStore((state) => state.importEmailMessage)
   const loginUser = useAuthStore((state) => state.loginUser)
 
   useEffect(() => {