From bb4eca48f67cdc0de67786b81b670ab278069b88 Mon Sep 17 00:00:00 2001
From: Jimmy Liow <lyj@hainatravel.com>
Date: Fri, 20 Sep 2024 13:50:03 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E8=B0=83=E5=A2=9E=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=A0=8F=E6=8C=89=E9=92=AE=E5=8F=8A=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/products/Detail/Header.jsx       | 42 +++++++++-------------
 src/views/products/Detail/ProductsTree.jsx | 12 ++++++-
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/src/views/products/Detail/Header.jsx b/src/views/products/Detail/Header.jsx
index a40cf3f..45dd5a0 100644
--- a/src/views/products/Detail/Header.jsx
+++ b/src/views/products/Detail/Header.jsx
@@ -13,8 +13,6 @@ import { PERM_PRODUCTS_OFFER_AUDIT, PERM_PRODUCTS_OFFER_PUT } from '@/config';
 import dayjs from 'dayjs';
 import VendorSelector from '@/components/VendorSelector';
 import AuditStateSelector from '@/components/AuditStateSelector';
-import NewProductModal from './NewProductModal';
-import ContractRemarksModal from './ContractRemarksModal'
 import { usingStorage } from '@/hooks/usingStorage';
 
 import AgencyContract from '../Print/AgencyContract_v0903';
@@ -170,6 +168,23 @@ const Header = ({ refresh, ...props }) => {
           <Button onClick={() => refresh(param)} type='text' className='text-primary round-none' icon={<ReloadOutlined />} />
         </h2>
       </div>
+      {/* todo: export, 审核完成之后才能导出 */}
+      <RequireAuth subject={PERM_PRODUCTS_OFFER_AUDIT}>
+        <Button size='small' onClick={handleDownload}>{t('Export')} .docx</Button>
+        {/* <PrintContractPDF /> */}
+      </RequireAuth>
+      {/* {activeAgencyState === 0 && ( */}
+      <>
+          <RequireAuth subject={PERM_PRODUCTS_OFFER_PUT}>
+            <Popconfirm title={t('products:sureSubmitAudit')} onConfirm={handleSubmitForAudit} okText={t('Yes')} placement={'bottomLeft'}>
+              <Button size='small' type={'primary'} >
+                {t('Submit')}
+                {t('Audit')}
+              </Button>
+            </Popconfirm>
+          </RequireAuth>
+        </>
+      {/* )} */}
       {showEditA && (
         <Link className='px-2' to={isPermitted(PERM_PRODUCTS_OFFER_AUDIT) ? `/products/${activeAgency.travel_agency_id}/${pickYear}/${audit_state}/edit` : `/products/edit`}>
           {t('Edit')}
@@ -193,29 +208,6 @@ const Header = ({ refresh, ...props }) => {
           {t('products:auditStateAction.Rejected')}
         </Button>
       </RequireAuth>
-      <ContractRemarksModal />
-      {/* todo: export, 审核完成之后才能导出 */}
-      <RequireAuth subject={PERM_PRODUCTS_OFFER_AUDIT}>
-        <Button size='small' onClick={handleDownload}>{t('Export')} .docx</Button>
-        {/* <PrintContractPDF /> */}
-      </RequireAuth>
-      {/* 编辑 */}
-      <Divider type='vertical' />
-      {isEditPage && (
-        <NewProductModal />
-      )}
-      {/* {activeAgencyState === 0 && ( */}
-        <>
-          <RequireAuth subject={PERM_PRODUCTS_OFFER_PUT}>
-            <Popconfirm title={t('products:sureSubmitAudit')} onConfirm={handleSubmitForAudit} okText={t('Yes')} placement={'bottomLeft'}>
-              <Button size='small' type={'primary'} >
-                {t('Submit')}
-                {t('Audit')}
-              </Button>
-            </Popconfirm>
-          </RequireAuth>
-        </>
-      {/* )} */}
     </div>
   );
 };
diff --git a/src/views/products/Detail/ProductsTree.jsx b/src/views/products/Detail/ProductsTree.jsx
index 9132f07..65cff51 100644
--- a/src/views/products/Detail/ProductsTree.jsx
+++ b/src/views/products/Detail/ProductsTree.jsx
@@ -1,10 +1,12 @@
 import { createContext, useEffect, useState } from 'react';
-import { Tree, Input } from 'antd';
+import { Tree, Input, Divider } from 'antd';
 import { CaretDownOutlined } from '@ant-design/icons';
 import { useTranslation } from 'react-i18next';
 import useProductsStore from '@/stores/Products/Index';
 import { useProductsTypes, useProductsAuditStatesMapVal } from '@/hooks/useProductsSets';
 import { groupBy, sortBy } from '@/utils/commons';
+import NewProductModal from './NewProductModal';
+import ContractRemarksModal from './ContractRemarksModal'
 
 const flattenTreeFun = (tree) => {
   let flatList = [];
@@ -40,6 +42,8 @@ const getParentKey = (key, tree) => {
 
 const ProductsTree = ({ onNodeSelect, ...props }) => {
   const { t } = useTranslation();
+
+  const isEditPage = location.pathname.includes('edit');
   const [agencyProducts, editingProduct, setEditingProduct] = useProductsStore((state) => [state.agencyProducts, state.editingProduct, state.setEditingProduct]);
   const [activeAgency] = useProductsStore((state) => [state.activeAgency]);
   const productsTypes = useProductsTypes();
@@ -150,6 +154,12 @@ const ProductsTree = ({ onNodeSelect, ...props }) => {
   return (
     <div className={`${props.className} relative`} style={props.style}>
       <Input.Search placeholder='Search' onChange={onSearch} allowClear className='sticky top-1 z-20 mb-3' />
+      {/* 编辑 */}
+      {isEditPage && (
+        <NewProductModal />
+      )}
+      <Divider type='vertical' />
+      <ContractRemarksModal />
       <Tree
         blockNode
         showLine defaultExpandAll expandAction={'doubleClick'}