diff --git a/src/components/OrderProfile.jsx b/src/components/OrderProfile.jsx index b8bd723..cd9f699 100644 --- a/src/components/OrderProfile.jsx +++ b/src/components/OrderProfile.jsx @@ -9,18 +9,18 @@ import { CalendarOutlined, EditOutlined, CheckOutlined, - ReloadOutlined, } from '@ant-design/icons' import { useEffect, useState } from 'react' import { Link } from 'react-router-dom' -import { App, Flex, Select, Tooltip, Divider, Typography, Skeleton, Checkbox, Drawer, Button, Form, Input } from 'antd' +import { App, Flex, Select, Tooltip, Divider, Typography, Skeleton, Checkbox, Drawer, Button, Empty, Form, Input } from 'antd' import { useOrderStore, fetchSetRemindStateAction, OrderLabelDefaultOptions, OrderStatusDefaultOptions, remindStatusOptions } from '@/stores/OrderStore' import { copy, isEmpty } from '@/utils/commons' import { useShallow } from 'zustand/react/shallow' import useConversationStore from '@/stores/ConversationStore' import useAuthStore from '@/stores/AuthStore' const OrderProfile = ({ coliSN, ...props }) => { + const { notification, message } = App.useApp() const [formComment] = Form.useForm() const [formWhatsApp] = Form.useForm() @@ -97,8 +97,9 @@ const OrderProfile = ({ coliSN, ...props }) => { return orderDetail.DidPlan === 0 ? '未做计划' : '已做计划' } - return ( - <> + const renderOrderDetail = () => { + return ( + <> @@ -226,12 +227,8 @@ const OrderProfile = ({ coliSN, ...props }) => { {orderDetail.customer_request} 外联备注 - {/* - - */} {orderDetail.wl_memo} - 附加信息 @@ -350,7 +347,21 @@ const OrderProfile = ({ coliSN, ...props }) => { - ) + ) + } + + const renderDefaultEmpty = () => { + return ( + 没有订单关联}> + + ) + } + + if (orderId) { + return renderOrderDetail() + } else { + return props.renderEmpty ? props.renderEmpty() : renderDefaultEmpty() + } } export default OrderProfile diff --git a/src/views/ChatWindow.jsx b/src/views/ChatWindow.jsx index 1f38461..84f79bd 100644 --- a/src/views/ChatWindow.jsx +++ b/src/views/ChatWindow.jsx @@ -1,30 +1,36 @@ -import { useEffect, useState } from 'react'; -import { Layout, Spin, Button } from 'antd'; -import { RightCircleOutlined, RightOutlined, ReloadOutlined, MenuFoldOutlined, MenuUnfoldOutlined, LeftOutlined } from '@ant-design/icons'; -// import { useParams, useNavigate } from 'react-router-dom'; -import MessagesHeader from './Conversations/Online/MessagesHeader'; -import MessagesWrapper from './Conversations/Online/MessagesWrapper'; -import ConversationsList from './Conversations/Online/ConversationsList'; +import { useState } from 'react' +import { Layout, Empty, Button } from 'antd' +import { RightOutlined, LeftOutlined } from '@ant-design/icons' +import MessagesHeader from './Conversations/Online/MessagesHeader' +import MessagesWrapper from './Conversations/Online/MessagesWrapper' +import ConversationsList from './Conversations/Online/ConversationsList' import OrderProfile from '@/components/OrderProfile' -import ReplyWrapper from './Conversations/Online/ReplyWrapper'; -import useConversationStore from '@/stores/ConversationStore'; -import { useShallow } from 'zustand/react/shallow'; +import useAuthStore from '@/stores/AuthStore' +import ReplyWrapper from './Conversations/Online/ReplyWrapper' +import useConversationStore from '@/stores/ConversationStore' +import { useShallow } from 'zustand/react/shallow' -import './Conversations/Conversations.css'; -import EmailEditorPopup from './Conversations/Online/Input/EmailEditorPopup'; +import ConversationBind from '@/views/Conversations/Online/ConversationBind' +import './Conversations/Conversations.css' +import EmailEditorPopup from './Conversations/Online/Input/EmailEditorPopup' -const { Sider, Content, Header, Footer } = Layout; +const { Sider, Content, Header, Footer } = Layout -/** - * - */ const ChatWindow = () => { + const [collapsedRight, setCollapsedRight] = useState(true) - const [collapsedLeft, setCollapsedLeft] = useState(false); - const [collapsedRight, setCollapsedRight] = useState(true); + const loginUser = useAuthStore((state) => state.loginUser) + const currentOrder = useConversationStore(useShallow((state) => state.currentConversation?.coli_sn || '')) + const currentConversationID = useConversationStore(useShallow((state) => state.currentConversation?.sn || '')) + const [updateCurrentConversation] = useConversationStore((state) => [state.updateCurrentConversation]) - - const currentOrder = useConversationStore(useShallow(state => state.currentConversation?.coli_sn || "")); + const renderEmptyOrder = () => { + return ( + 没有订单关联}> + updateCurrentConversation({ coli_sn })} /> + + ) + } return ( <> @@ -54,7 +60,7 @@ const ChatWindow = () => { {/*