From bc6b5cbed15894dfeaabdc0441ae79bc0277ec0a Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Mon, 15 Jul 2024 14:17:49 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BE=9B=E5=BA=94=E5=95=86=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9;=20perf:=20=E4=BA=A7=E5=93=81=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E9=A1=B5=E9=9D=A2=E5=A4=B4=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BackBtn.jsx                 |  2 +-
 src/components/ProductsTypesSelector.jsx   |  9 -------
 src/components/SearchForm.jsx              | 12 +++------
 src/components/SecondHeaderWrapper.jsx     |  4 +--
 src/components/VendorSelector.jsx          | 29 ++++++++++++++++++++++
 src/views/products/Detail/CopyProducts.jsx |  3 ++-
 6 files changed, 37 insertions(+), 22 deletions(-)
 create mode 100644 src/components/VendorSelector.jsx

diff --git a/src/components/BackBtn.jsx b/src/components/BackBtn.jsx
index 26068e0..baefd53 100644
--- a/src/components/BackBtn.jsx
+++ b/src/components/BackBtn.jsx
@@ -9,7 +9,7 @@ const BackBtn = ({to, ...props}) => {
   const navigate = useNavigate();
   return (
     <>
-      {isNotEmpty(to) ? <Link to={to}>{t('Back')}</Link> : <Button type='link' onClick={() => navigate(-1)}>{t('Back')}</Button>}
+      {isNotEmpty(to) ? <Link to={to} className='px-4'>{t('Back')}</Link> : <Button type='link' onClick={() => navigate(-1)}>{t('Back')}</Button>}
     </>
   );
 };
diff --git a/src/components/ProductsTypesSelector.jsx b/src/components/ProductsTypesSelector.jsx
index ca61815..6c719fe 100644
--- a/src/components/ProductsTypesSelector.jsx
+++ b/src/components/ProductsTypesSelector.jsx
@@ -2,15 +2,6 @@ import { Select } from 'antd';
 import { useProductsTypes } from '@/hooks/useProductsSets';
 import { useTranslation } from 'react-i18next';
 
-import { fetchJSON } from '@/utils/request';
-import { HT_HOST } from '@/config';
-
-//供应商列表
-export const fetchVendorList = async (q) => {
-  const { errcode, result } = await fetchJSON(`${HT_HOST}/Service_BaseInfoWeb/VendorList`, { q })
-  return errcode !== 0 ? [] : result
-}
-
 const ProductsTypesSelector = ({...props}) => {
   const productsTypes = useProductsTypes();
   const { t } = useTranslation();
diff --git a/src/components/SearchForm.jsx b/src/components/SearchForm.jsx
index ab0be78..89b79b9 100644
--- a/src/components/SearchForm.jsx
+++ b/src/components/SearchForm.jsx
@@ -9,8 +9,9 @@ import { useTranslation } from 'react-i18next';
 import SearchInput from './SearchInput';
 import AuditStateSelector from './AuditStateSelector';
 import DeptSelector from './DeptSelector';
-import ProductsTypesSelector, { fetchVendorList } from './ProductsTypesSelector';
+import ProductsTypesSelector from './ProductsTypesSelector';
 import CitySelector from '@/components/CitySelector';
+import VendorSelector from '@/components/VendorSelector';
 
 const { RangePicker } = DatePicker;
 
@@ -248,14 +249,7 @@ function getFields(props) {
       'agency',
       99,
       <Form.Item name='agency' label={t('products:Vendor')} {...fieldProps.agency} initialValue={at(props, 'initialValue.agency')[0]}>
-        <SearchInput
-          placeholder={t('products:Vendor')}
-          mode={'multiple'}
-          maxTagCount={0}
-          {...fieldComProps.agency}
-          fetchOptions={fetchVendorList}
-          map={{ travel_agency_name: 'label', travel_agency_id: 'value' }}
-        />
+        <VendorSelector {...fieldComProps.agency} />
       </Form.Item>,
       fieldProps?.agency?.col || 6
     ),
diff --git a/src/components/SecondHeaderWrapper.jsx b/src/components/SecondHeaderWrapper.jsx
index 9a4f7bd..b456bca 100644
--- a/src/components/SecondHeaderWrapper.jsx
+++ b/src/components/SecondHeaderWrapper.jsx
@@ -3,7 +3,7 @@ import { Layout, Flex, theme, Spin, Divider } from 'antd';
 import BackBtn from './BackBtn';
 
 const { Content, Header } = Layout;
-const HeaderWrapper = ({ children, header, loading, ...props }) => {
+const HeaderWrapper = ({ children, header, loading, backTo, ...props }) => {
   const navigate = useNavigate();
   const {
     token: { colorBgContainer },
@@ -16,7 +16,7 @@ const HeaderWrapper = ({ children, header, loading, ...props }) => {
             <Flex justify={'space-between'} align={'center'} className='h-full'>
               {/* {header} */}
               <div className='grow h-full'>{header}</div>
-              <BackBtn />
+              <BackBtn to={backTo} />
             </Flex>
           </Header>
           <Divider className='my-2' />
diff --git a/src/components/VendorSelector.jsx b/src/components/VendorSelector.jsx
new file mode 100644
index 0000000..639db96
--- /dev/null
+++ b/src/components/VendorSelector.jsx
@@ -0,0 +1,29 @@
+import { createContext, useEffect, useState } from 'react';
+import {} from 'antd';
+import SearchInput from './SearchInput';
+import { fetchJSON } from '@/utils/request';
+import { HT_HOST } from '@/config';
+import { useTranslation } from 'react-i18next';
+
+//供应商列表
+export const fetchVendorList = async (q) => {
+  const { errcode, result } = await fetchJSON(`${HT_HOST}/Service_BaseInfoWeb/VendorList`, { q });
+  return errcode !== 0 ? [] : result;
+};
+
+const VendorSelector = ({ ...props }) => {
+  const { t } = useTranslation();
+  return (
+    <>
+      <SearchInput
+        placeholder={t('products:Vendor')}
+        mode={'multiple'}
+        maxTagCount={0}
+        {...props}
+        fetchOptions={fetchVendorList}
+        map={{ travel_agency_name: 'label', travel_agency_id: 'value' }}
+      />
+    </>
+  );
+};
+export default VendorSelector;
diff --git a/src/views/products/Detail/CopyProducts.jsx b/src/views/products/Detail/CopyProducts.jsx
index 6b4d151..14ba6be 100644
--- a/src/views/products/Detail/CopyProducts.jsx
+++ b/src/views/products/Detail/CopyProducts.jsx
@@ -5,7 +5,8 @@ import { useTranslation } from 'react-i18next';
 
 import SearchInput from '@/components/SearchInput';
 import DeptSelector from '@/components/DeptSelector';
-import ProductsTypesSelector, { fetchVendorList } from '@/components/ProductsTypesSelector';
+import ProductsTypesSelector from '@/components/ProductsTypesSelector';
+import { fetchVendorList } from '@/components/VendorSelector';
 import dayjs from 'dayjs';
 import arraySupport from 'dayjs/plugin/arraySupport';
 import { copyAgencyDataAction } from '@/stores/Products/Index';