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) ? setEditingProduct({info: r.info})}>{title} : title; + return isPermitted(PERM_PRODUCTS_OFFER_PUT) ? setEditingProduct({info: r.info})}>{title} : 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() {
- + {!isEmpty(editingProduct) && }
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')} + {/* todo: edit/audit 链接 */}