From 0647d845ba71054d40f123c82183ee3d090bb285 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Thu, 1 Aug 2024 13:55:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E7=AE=A1=E7=90=86:=20?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91,=20=E5=AE=9A=E4=BD=8D;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/stores/Products/Index.js                  | 2 ++
 src/views/products/Audit.jsx                  | 2 +-
 src/views/products/Detail.jsx                 | 3 ++-
 src/views/products/Detail/Header.jsx          | 3 ++-
 src/views/products/Detail/NewProductModal.jsx | 2 +-
 src/views/products/Detail/ProductInfoLgc.jsx  | 6 ++++--
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/stores/Products/Index.js b/src/stores/Products/Index.js
index 6317f25..224c816 100644
--- a/src/stores/Products/Index.js
+++ b/src/stores/Products/Index.js
@@ -163,6 +163,8 @@ export const useProductsStore = create(
       if (editingProduct?.info?.id) {
         const item = (productsData[editingProduct.info.product_type_id] || []).find((item) => item.info.id === editingProduct.info.id);
         setEditingProduct(item);
+      } else {
+        setEditingProduct({});
       }
       setLoading(false);
     },
diff --git a/src/views/products/Audit.jsx b/src/views/products/Audit.jsx
index f469c49..1ab45c1 100644
--- a/src/views/products/Audit.jsx
+++ b/src/views/products/Audit.jsx
@@ -58,7 +58,7 @@ const PriceTable = ({ productType, dataSource, refresh }) => {
   const columns = [
     { key: 'title', dataIndex: ['info', 'title'], width: '16rem', title: t('Title'), onCell: (r, index) => ({ rowSpan: r.rowSpan, }), className: 'bg-white', render: (text, r) => {
       const title = text || r.lgc_details?.['2']?.title || r.lgc_details?.['1']?.title || '';
-      return isPermitted(PERM_PRODUCTS_OFFER_PUT) ? <Link to={`/products/${travel_agency_id}/${use_year}/${audit_state}/edit`} onClick={() => setEditingProduct({info: r.info})}>{title}</Link> : title;
+      return isPermitted(PERM_PRODUCTS_OFFER_PUT) ? <span onClick={() => setEditingProduct({info: r.info})}><Link to={`/products/${travel_agency_id}/${use_year}/${audit_state}/edit`} >{title}</Link></span> : title;
     } },
     // ...(productType === 'B' ? [{ key: 'km', dataIndex: ['info', 'km'], title: t('KM')}] : []),
     { key: 'adult', title: t('AgeType.Adult'), render: (_, { adult_cost, currency, unit_id, unit_name }) => `${adult_cost} ${currency} / ${t(`PriceUnit.${unit_id}`)}` },
diff --git a/src/views/products/Detail.jsx b/src/views/products/Detail.jsx
index 6307de5..33a8938 100644
--- a/src/views/products/Detail.jsx
+++ b/src/views/products/Detail.jsx
@@ -46,6 +46,7 @@ function Detail() {
     const state = pick_state ?? audit_state;
     const param = { travel_agency_id: agency, use_year: year, audit_state: state };
     setSwitchParams(param);
+    // setEditingProduct({});
     getAgencyProducts(param);
     // console.log("AgencyProducts",agencyProducts);
     // navigate(`/products/${agency}/${year}/${audit_state}/edit`);
@@ -230,7 +231,7 @@ function Detail() {
             <Divider type={'vertical'} className='mx-1 h-auto' />
             <div className=' flex-auto grow-0 min-w-[800px]'>
               <ProductInfo editable={editable} />
-              <Extras productId={editingProduct?.info?.id} />
+              {!isEmpty(editingProduct) && <Extras productId={editingProduct?.info?.id} />}
             </div>
           </Flex>
 
diff --git a/src/views/products/Detail/Header.jsx b/src/views/products/Detail/Header.jsx
index e5215ad..9820cbe 100644
--- a/src/views/products/Detail/Header.jsx
+++ b/src/views/products/Detail/Header.jsx
@@ -24,7 +24,7 @@ const Header = ({ refresh, editable, ...props }) => {
   const yearOptions = [];
   const currentYear = dayjs().year();
   const baseYear = use_year ? Number(use_year === 'all' ? currentYear : use_year) : currentYear;
-  for (let i = baseYear - 5; i <= baseYear + 5; i++) {
+  for (let i = currentYear - 5; i <= baseYear + 5; i++) {
     yearOptions.push({ label: i, value: i });
   }
 
@@ -115,6 +115,7 @@ const Header = ({ refresh, editable, ...props }) => {
           {t('Edit')}
         </Link>
       </RequireAuth>
+      {/* todo: edit/audit 链接 */}
       <RequireAuth subject={PERM_PRODUCTS_OFFER_AUDIT}>
         <Button size='small' type={'primary'} onClick={() => handleAuditItem('2', activeAgency)}>
           {t('products:auditStateAction.Published')}
diff --git a/src/views/products/Detail/NewProductModal.jsx b/src/views/products/Detail/NewProductModal.jsx
index ac439be..406ea9e 100644
--- a/src/views/products/Detail/NewProductModal.jsx
+++ b/src/views/products/Detail/NewProductModal.jsx
@@ -24,7 +24,7 @@ export const NewProductsForm = ({ initialValues, onFormInstanceReady, ...props }
       <Form.Item name={`products_type`} label={t('products:ProductType')} rules={[{ required: true }]}>
         <ProductsTypesSelector maxTagCount={1} mode={null} placeholder={t('All')} />
       </Form.Item>
-      <Form.Item name={`title`} label={t('products:Title')}>
+      <Form.Item name={`title`} label={t('products:Title')} rules={[{ required: true }]} >
         <Input />
       </Form.Item>
     </Form>
diff --git a/src/views/products/Detail/ProductInfoLgc.jsx b/src/views/products/Detail/ProductInfoLgc.jsx
index adbd7ec..8ef5349 100644
--- a/src/views/products/Detail/ProductInfoLgc.jsx
+++ b/src/views/products/Detail/ProductInfoLgc.jsx
@@ -39,7 +39,8 @@ const ProductInfoLgc = ({ editable, ignoreEditable, formInstance, ...props }) =>
               // onChange={(e) => handleChange('title', e.target.value)}
               // disabled={isCanEditable}
               // disabled={ignoreEditable ? false : (!isEmpty(ele.title) || !editable)}
-              disabled={!editable}
+              disabled={ignoreEditable ? false : (!editable)}
+              // disabled={!editable}
             />
           </Form.Item>
           <Form.Item name={[li, 'description']} label={t('products:Description')} initialValue={ele.descriptions}>
@@ -47,7 +48,8 @@ const ProductInfoLgc = ({ editable, ignoreEditable, formInstance, ...props }) =>
               rows={3} allowClear
               // onChange={(e) => handleChange('description', e.target.value)}
               // disabled={ignoreEditable ? false : (!isEmpty(ele.descriptions) || !editable)}
-              disabled={!editable}
+              disabled={ignoreEditable ? false : (!editable)}
+              // disabled={!editable}
             />
           </Form.Item>
           <Form.Item hidden name={[li, 'lgc']} initialValue={ele.lgc}>