From c28d68960e88b4ae108007da5a6d257761d54bf1 Mon Sep 17 00:00:00 2001 From: Lei OT Date: Thu, 19 Sep 2024 15:44:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BA=A7=E5=93=81=E7=AE=A1=E7=90=86?= =?UTF-8?q?:=20=E5=9B=BD=E5=86=85=E4=BE=9B=E5=BA=94=E5=95=86=E5=AF=BC?= =?UTF-8?q?=E8=88=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/App.jsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/App.jsx b/src/views/App.jsx index c3080dc..3ac4b81 100644 --- a/src/views/App.jsx +++ b/src/views/App.jsx @@ -11,7 +11,7 @@ import enLocale from 'antd/locale/en_US' import 'dayjs/locale/zh-cn' import { BugOutlined } from "@ant-design/icons" import ErrorBoundary from '@/components/ErrorBoundary' -import { BUILD_VERSION, } from '@/config' +import { BUILD_VERSION, PERM_PRODUCTS_OFFER_PUT, PERM_PRODUCTS_INFO_PUT } from '@/config' import useNoticeStore from '@/stores/Notice' import useAuthStore from '@/stores/Auth' import { useThemeContext } from '@/stores/ThemeContext' @@ -103,6 +103,7 @@ function App() { isPermitted(PERM_OVERSEA) ? { key: 'report', label: {t('menu.Report')} } : null, isPermitted(PERM_AIR_TICKET) ? { key: 'airticket', label: {t('menu.Airticket')} } : null, isPermitted(PERM_PRODUCTS_MANAGEMENT) ? { key: 'products', label: {t('menu.Products')} } : null, + isPermitted(PERM_PRODUCTS_INFO_PUT) ? { key: 'products', label: {t('menu.Products')} } : null, { key: 'notice', label: ( From 024f06607521d86a8c865e58831ed7413c65ae28 Mon Sep 17 00:00:00 2001 From: Lei OT Date: Thu, 19 Sep 2024 15:50:52 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BA=A7=E5=93=81=E7=AE=A1=E7=90=86?= =?UTF-8?q?:=20=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2:=20=E6=97=A0=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=9D=83=E9=99=90=E7=9A=84=E5=A4=B4=E9=83=A8=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/products/Detail/Header.jsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/products/Detail/Header.jsx b/src/views/products/Detail/Header.jsx index 03743b5..a40cf3f 100644 --- a/src/views/products/Detail/Header.jsx +++ b/src/views/products/Detail/Header.jsx @@ -15,6 +15,7 @@ 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'; import { saveAs } from "file-saver"; @@ -26,6 +27,7 @@ const Header = ({ refresh, ...props }) => { const showEditA = !location.pathname.includes('edit'); const showAuditA = !location.pathname.includes('audit'); const { travel_agency_id, use_year, audit_state } = useParams(); + const { travelAgencyId } = usingStorage(); const { t } = useTranslation(); const isPermitted = useAuthStore((state) => state.isPermitted); const [activeAgency, setActiveAgency] = useProductsStore((state) => [state.activeAgency, state.setActiveAgency]); @@ -49,7 +51,7 @@ const Header = ({ refresh, ...props }) => { const [pickAuditState, setPickAuditState] = useState(); useEffect(() => { const _param = objectMapper(param, { pick_year: 'use_year', pick_agency: 'travel_agency_id', pick_state: 'audit_state' }); - setSwitchParams({ ..._param }); + setSwitchParams({ ..._param, travel_agency_id: _param?.travel_agency_id || travelAgencyId }); refresh(param); return () => {}; From ef8046d1ae27867daf1a8e39b52f84f3f6ea818a Mon Sep 17 00:00:00 2001 From: Lei OT Date: Thu, 19 Sep 2024 15:51:37 +0800 Subject: [PATCH 3/3] 2.0.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6848b2c..5744dfb 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "global-highlights-hub", "private": true, - "version": "2.0.0", + "version": "2.0.1", "type": "module", "scripts": { "dev": "vite",