From 4b77aa689e8a7c9396533fdaf3ffade85365ffc0 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Wed, 26 Jun 2024 15:57:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E7=BC=BA=E5=B0=91=E8=8B=B1?=
 =?UTF-8?q?=E6=96=87=E5=90=8D=E7=A7=B0=E6=97=B6,=20=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E8=AF=AD=E7=A7=8D=E8=A1=A8=E4=B8=AD=E6=96=87=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/products/Audit.jsx | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/views/products/Audit.jsx b/src/views/products/Audit.jsx
index 72a5742..2cbb8b1 100644
--- a/src/views/products/Audit.jsx
+++ b/src/views/products/Audit.jsx
@@ -62,6 +62,8 @@ const PriceTable = ({ dataSource, refresh }) => {
   const { message, notification } = App.useApp();
   const stateMapVal = useProductsAuditStatesMapVal();
 
+  // console.log(dataSource);
+
   const handleAuditPriceItem = (state, row) => {
     postProductsQuoteAuditAction(state, { id: row.id, travel_agency_id: activeAgency.travel_agency_id })
       .then((json) => {
@@ -83,7 +85,7 @@ const PriceTable = ({ dataSource, refresh }) => {
   };
 
   const columns = [
-    { key: 'title', dataIndex: ['info', 'title'], width: '16rem', title: t('Title'), onCell: (r, index) => ({ rowSpan: r.rowSpan }) },
+    { key: 'title', dataIndex: ['info', 'title'], width: '16rem', title: t('Title'), onCell: (r, index) => ({ rowSpan: r.rowSpan }), render: (text, r) => text || r.lgc_details?.['2']?.title || '' },
     { key: 'adult', title: t('AgeType.Adult'), render: (_, { value, currency, unit_name }) => `${value} ${currency} / ${unit_name}` },
     { key: 'child', title: t('AgeType.Child'), render: (_, { value, currency, unit_name }) => `${value} ${currency} / ${unit_name}` },
     // {key: 'price', title: t('Currency'), },
@@ -135,16 +137,33 @@ const TypesPanels = (props) => {
   const [activeKey, setActiveKey] = useState([]);
   const [showTypes, setShowTypes] = useState([]);
   useEffect(() => {
-    // 只显示有产品的类型; 展开产品的价格表, 合并名称列
+    // 只显示有产品的类型; 展开产品的价格表, 合并名称列; 转化为价格主表, 携带产品属性信息
     const hasDataTypes = Object.keys(agencyProducts);
     const _show = productsTypes
       .filter((kk) => hasDataTypes.includes(kk.value))
       .map((ele) => ({
         ...ele,
+        extra: t('Table.Total', { total: agencyProducts[ele.value].length }),
         children: (
           <PriceTable
             // loading={loading}
-            dataSource={agencyProducts[ele.value].reduce((r, c) => r.concat(c.quotation.map((q, i) => ({ ...q, weekdays: q.weekdays.split(',').filter(Boolean).map(w => t(`weekdaysShort.${w}`)).join(', '), info: c.info, rowSpan: i === 0 ? c.quotation.length : 0 }))), [])}
+            dataSource={agencyProducts[ele.value].reduce(
+              (r, c) =>
+                r.concat(
+                  c.quotation.map((q, i) => ({
+                    ...q,
+                    weekdays: q.weekdays
+                      .split(',')
+                      .filter(Boolean)
+                      .map((w) => t(`weekdaysShort.${w}`))
+                      .join(', '),
+                    info: c.info,
+                    lgc_details: c.lgc_details.reduce((rlgc, clgc) => ({...r, [clgc.lgc]: clgc}), {}),
+                    rowSpan: i === 0 ? c.quotation.length : 0,
+                  }))
+                ),
+              []
+            )}
             refresh={props.refresh}
           />
         ),