Merge remote-tracking branch 'origin/main'

src/stores/AuthStore.js

@@ -7,6 +7,7 @@ import { API_HOST, BUILD_VERSION } from '@/config'
 export const PERM_MERGE_CONVERSATION = 'merge-conversation'
 export const PERM_ASSIGN_NEW_CONVERSATION = 'assign-new-conversation'
 export const PERM_USE_EMAL = 'use-email'
+export const PERM_IMPORT_EMAIL = 'import-email'
 
 const useAuthStore = create(devtools((set, get) => ({
   loginUser: {
@@ -30,6 +31,10 @@ const useAuthStore = create(devtools((set, get) => ({
       return ['599', '495', '143', '370', '639', '513', '654', '404', '383', '227'].includes(loginUser.userId)
     }
 
+    if (perm === PERM_IMPORT_EMAIL && window.localStorage.getItem('PERM_IMPORT_EMAIL')) {
+      return true
+    }
+
     if (perm === PERM_MERGE_CONVERSATION) {
       return ['404', '383', '227'].includes(loginUser.userId)
     }

src/views/orders/Follow.jsx

@@ -1,6 +1,6 @@
 import { Conditional } from '@/components/Conditional'
 import useAuthStore from '@/stores/AuthStore'
-import { PERM_MERGE_CONVERSATION } from '@/stores/AuthStore'
+import { PERM_IMPORT_EMAIL } from '@/stores/AuthStore'
 import useFormStore from '@/stores/FormStore'
 import { useOrderStore } from '@/stores/OrderStore'
 import { copy, isNotEmpty, isEmpty } from '@/utils/commons'
@@ -24,11 +24,11 @@ function OrderGroupTable({ formValues }) {
 
   const handleImportEmail = useCallback((order) => {
     importEmailMessage({ orderId: order.COLI_SN, orderNumber: order.COLI_ID })
-      .then((result) => {
+      .then((r) => {
-        console.info(result)
+        console.info(r)
         notification.info({
           message: 'Notification',
-          description: '订单邮件消息导入成功',
+          description: '订单：' + order.COLI_ID + ' 导入' + r.result.length + '条邮件消息',
           placement: 'top',
         })
       })
@@ -56,7 +56,7 @@ function OrderGroupTable({ formValues }) {
         return (
           <Space>
             <Conditional
-              condition={isPermitted(PERM_MERGE_CONVERSATION)}
+              condition={isPermitted(PERM_IMPORT_EMAIL)}
               whenTrue={<Button type="default" shape="round" icon={<ImportOutlined />} size='small' onClick={() => handleImportEmail(record)} />}
             />
             <Link to={`/order/chat/${record.COLI_SN}`} state={record}>