From b0a8c149a1f687bd2bc25c373c59a33ca503755d Mon Sep 17 00:00:00 2001 From: Lei OT Date: Thu, 10 Oct 2024 15:27:58 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95:?= =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0=E6=B8=A0=E9=81=93=E5=92=8C=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ChatHistory.jsx | 2 +- src/views/Conversations/History/SearchForm.jsx | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/views/ChatHistory.jsx b/src/views/ChatHistory.jsx index 10c072d..96106c0 100644 --- a/src/views/ChatHistory.jsx +++ b/src/views/ChatHistory.jsx @@ -33,7 +33,7 @@ const Index = (props) => { const getConversationsList = async () => { setConversationsListLoading(true); - const params = flush(pick(formValues, ['opisn', 'whatsapp_id', 'search', 'from_date', 'end_date', 'coli_id', 'lasttime'])); + const params = flush(pick(formValues, ['opisn', 'whatsapp_id', 'search', 'from_date', 'end_date', 'coli_id', 'lasttime', 'mtype', 'mchannel'])); const data = await fetchConversationsSearch({ ...params, ...pageParam, pagesize: CONVERSATION_PAGE_SIZE }); setConversationsListLoading(false); setConversationsList(conversationsList.concat(data)); diff --git a/src/views/Conversations/History/SearchForm.jsx b/src/views/Conversations/History/SearchForm.jsx index 961f4ac..0315086 100644 --- a/src/views/Conversations/History/SearchForm.jsx +++ b/src/views/Conversations/History/SearchForm.jsx @@ -1,6 +1,6 @@ /* eslint-disable react/display-name */ import { memo } from 'react'; -import { Form, Flex, Input, Button, DatePicker } from 'antd'; +import { Form, Flex, Input, Button, DatePicker, Select } from 'antd'; import SearchInput from '@/components/SearchInput'; import { isNotEmpty } from '@/utils/commons'; import { fetchSalesAgentWithDD as fetchSalesAgent, fetchCustomerList } from '@/actions/CommonActions'; @@ -39,6 +39,22 @@ const SearchForm = memo(function ({ initialValues, onSubmit, onReset }) { + + +