From 987b7d589a5cea62fc15dce3b0eccea60a4e0184 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Thu, 31 Jul 2025 12:05:38 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9B=94=20=E4=BA=A7=E5=93=81=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8:=20=E5=B7=B2=E5=8F=91=E5=B8=83=E7=9A=84=E4=BB=B7?=
 =?UTF-8?q?=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/products/Audit.jsx                  | 40 +++++++++----------
 .../Detail/ProductQuotationLogPopover.jsx     |  6 +--
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/views/products/Audit.jsx b/src/views/products/Audit.jsx
index cb8a113..a55db7e 100644
--- a/src/views/products/Audit.jsx
+++ b/src/views/products/Audit.jsx
@@ -126,26 +126,26 @@ const PriceTable = ({ productType, dataSource, refresh }) => {
           </RequireAuth>
         ) : null,
     },
-    {
-      title: '',
-      key: 'action2',
-      width: '6rem',
-      className: 'bg-white',
-      onCell: (r, index) => ({ rowSpan: r.rowSpan }),
-      render: (_, r) => {
-        const showPublicBtn = null; // r.pendingQuotation ? <Popover title='查看已发布的价格' trigger={['click']}> <Button  size='small' className='ml-2' onClick={() => { }}>✈</Button></Popover> : null;
-        const btn2 = r.showPublicBtn ? (
-          <ProductQuotationLogPopover
-            method={'published'}
-            {...{ travel_agency_id, product_id: r.info.id, price_id: r.id, use_year }}
-            triggerProps={{ type: 'primary', ghost: true, size: 'small' }}
-            placement='bottom'
-            className='max-w-[1000px]'
-          />
-        ) : null;
-        return <div className='absolute bottom-2 right-1'>{btn2}</div>;
-      },
-    },
+    // {
+    //   title: '',
+    //   key: 'action2',
+    //   width: '6rem',
+    //   className: 'bg-white',
+    //   onCell: (r, index) => ({ rowSpan: r.rowSpan }),
+    //   render: (_, r) => {
+    //     const showPublicBtn = null; // r.pendingQuotation ? <Popover title='查看已发布的价格' trigger={['click']}> <Button  size='small' className='ml-2' onClick={() => { }}>✈</Button></Popover> : null;
+    //     const btn2 = r.showPublicBtn ? (
+    //       <ProductQuotationLogPopover
+    //         method={'published'}
+    //         {...{ travel_agency_id, product_id: r.info.id, price_id: r.id, use_year }}
+    //         triggerProps={{ type: 'primary', ghost: true, size: 'small' }}
+    //         placement='bottom'
+    //         className='max-w-[1000px]'
+    //       />
+    //     ) : null;
+    //     return <div className='absolute bottom-2 right-1'>{btn2}</div>;
+    //   },
+    // },
   ];
   return (
     <Table
diff --git a/src/views/products/Detail/ProductQuotationLogPopover.jsx b/src/views/products/Detail/ProductQuotationLogPopover.jsx
index e1f59fb..155ea8c 100644
--- a/src/views/products/Detail/ProductQuotationLogPopover.jsx
+++ b/src/views/products/Detail/ProductQuotationLogPopover.jsx
@@ -151,7 +151,7 @@ const useLogMethod = (method) => {
       btnText: t('versionHistory'),
       fetchData: async (params) => {
         const data = await getPPLogAction(params);
-        return data;
+        return { data };
       },
     },
     'published': {
@@ -160,7 +160,7 @@ const useLogMethod = (method) => {
       fetchData: async (params) => {
         const { travel_agency_id, product_id, price_id, use_year } = params;
         const data = await getPPRunningAction({ travel_agency_id, product_id_list: product_id, use_year });
-        return data?.[0]?.quotation || [];
+        return { data: data?.[0]?.quotation || [] };
       },
     },
   };
@@ -198,7 +198,7 @@ const ProductQuotationLogPopover = ({ method, triggerProps = {}, onOpenChange, .
   const [loading, setLoading] = useState(false);
   const getData = async () => {
     setLoading(true);
-    const data = await fetchData({ travel_agency_id, product_id, price_id, use_year });
+    const { data } = await fetchData({ travel_agency_id, product_id, price_id, use_year });
     setLogData(data);
     invokeOpenChange(true);
     setLoading(false);