Merge branch 'main' of github.com:hainatravel/GHHub

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",

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'
@@ -111,6 +111,7 @@ function App() {
 										isPermitted(PERM_OVERSEA) ? { key: 'report', label: <Link to='/report'>{t('menu.Report')}</Link> } : null,
 										isPermitted(PERM_AIR_TICKET) ? { key: 'airticket', label: <Link to='/airticket'>{t('menu.Airticket')}</Link> } : null,
 										isPermitted(PERM_PRODUCTS_MANAGEMENT) ? { key: 'products', label: <Link to='/products'>{t('menu.Products')}</Link> } : null,
+										isPermitted(PERM_PRODUCTS_INFO_PUT) ? { key: 'products', label: <Link to='/products/edit'>{t('menu.Products')}</Link> } : null,
 										{
 											key: 'notice',
 											label: (

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 () => {};