From cd5dbb3be51127db99d9aa43fc65067016df9972 Mon Sep 17 00:00:00 2001 From: LiaoYijun Date: Tue, 24 Jun 2025 10:43:01 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=A2=9E=E5=8A=A0=20WA=E3=80=81?= =?UTF-8?q?=E9=99=84=E5=8A=A0=E4=BF=A1=E6=81=AF=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/OrderProfile.jsx | 87 +++++++++++++++++++++++++-------- src/stores/OrderStore.js | 42 +++++++++++++++- 2 files changed, 106 insertions(+), 23 deletions(-) diff --git a/src/components/OrderProfile.jsx b/src/components/OrderProfile.jsx index 64478de..a51eee1 100644 --- a/src/components/OrderProfile.jsx +++ b/src/components/OrderProfile.jsx @@ -13,7 +13,7 @@ import { } from '@ant-design/icons' import { useEffect, useState } from 'react' -import { Link, useNavigate } from 'react-router-dom' +import { Link } from 'react-router-dom' import { App, Flex, Select, Tooltip, Divider, Typography, Skeleton, Checkbox, Drawer, Button, Form, Input } from 'antd' import { useOrderStore, fetchSetRemindStateAction, OrderLabelDefaultOptions, OrderStatusDefaultOptions, remindStatusOptions } from '@/stores/OrderStore' import { copy, isEmpty } from '@/utils/commons' @@ -21,24 +21,28 @@ import { useShallow } from 'zustand/react/shallow' import useConversationStore from '@/stores/ConversationStore' import useAuthStore from '@/stores/AuthStore' const OrderProfile = ({ coliSN, ...props }) => { - const navigate = useNavigate() const { notification, message } = App.useApp() - const [formComment, formWhatsApp] = Form.useForm() + const [formComment] = Form.useForm() + const [formWhatsApp] = Form.useForm() + const [formExtra] = Form.useForm() const [loading, setLoading] = useState(false) const [openOrderCommnet, setOpenOrderCommnet] = useState(false) const [openWhatsApp, setOpenWhatsApp] = useState(false) + const [openExtra, setOpenExtra] = useState(false) const orderLabelOptions = copy(OrderLabelDefaultOptions) orderLabelOptions.unshift({ value: 0, label: '未设置', disabled: true }) const orderStatusOptions = copy(OrderStatusDefaultOptions) - const [orderDetail, customerDetail, fetchOrderDetail, setOrderPropValue, appendOrderComment] = useOrderStore((s) => [ + const [orderDetail, customerDetail, fetchOrderDetail, setOrderPropValue, appendOrderComment, updateWhatsapp, updateExtraInfo] = useOrderStore((s) => [ s.orderDetail, s.customerDetail, s.fetchOrderDetail, s.setOrderPropValue, s.appendOrderComment, + s.updateWhatsapp, + s.updateExtraInfo, ]) const loginUser = useAuthStore((state) => state.loginUser) @@ -47,8 +51,8 @@ const OrderProfile = ({ coliSN, ...props }) => { const [orderRemindState, setOrderRemindState] = useState(orderDetail.remindstate) useEffect(() => { - setOrderRemindState(orderDetail.remindstate); - }, [orderDetail.remindstate]); + setOrderRemindState(orderDetail.remindstate) + }, [orderDetail.remindstate]) useEffect(() => { if (orderId) { setLoading(true) @@ -119,12 +123,15 @@ const OrderProfile = ({ coliSN, ...props }) => { - {isEmpty(customerDetail.whatsapp_phone_number) ? - : - - {customerDetail.whatsapp_phone_number} - - } + {isEmpty(customerDetail.whatsapp_phone_number) ? ( + + ) : ( + + {customerDetail.whatsapp_phone_number} + + )} @@ -227,9 +234,14 @@ const OrderProfile = ({ coliSN, ...props }) => { 附加信息 - {/* - - */} + + { + setOpenExtra(true) + }} + /> + {orderDetail.COLI_Introduction} @@ -240,7 +252,6 @@ const OrderProfile = ({ coliSN, ...props }) => { initialValues={{ comment: '' }} scrollToFirstError onFinish={(values) => { - console.log('Received values of form: ', values) appendOrderComment(loginUser.userId, orderId, values.comment) .then(() => { notification.success({ @@ -276,15 +287,49 @@ const OrderProfile = ({ coliSN, ...props }) => { initialValues={{ number: '' }} scrollToFirstError onFinish={(values) => { - console.log('Received values of form: ', values) - // appendOrderComment(loginUser.userId, orderId, values.number) + updateWhatsapp(orderId, values.number) .then(() => { notification.success({ message: '温性提示', description: '设置 WhatsApp 成功', }) setOpenWhatsApp(false) - formComment.setFieldsValue({ number: '' }) + formWhatsApp.setFieldsValue({ number: '' }) + }) + .catch((reason) => { + notification.error({ + message: '设置出错', + description: reason.message, + placement: 'top', + duration: 60, + }) + }) + }}> + + + + + + + + + setOpenExtra(false)} open={openExtra}> +
{ + console.log('Received values of form: ', values) + updateExtraInfo(orderId, values.extra) + .then(() => { + notification.success({ + message: '温性提示', + description: '设置附加信息成功', + }) + setOpenExtra(false) }) .catch((reason) => { notification.error({ @@ -295,8 +340,8 @@ const OrderProfile = ({ coliSN, ...props }) => { }) }) }}> - - + +