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

src/config.js

@@ -36,7 +36,7 @@ export const PERM_AIR_TICKET = '/air-ticket/all'
 
 // 价格管理
 export const PERM_PRODUCTS_MANAGEMENT = '/products/*'; // 管理
-export const PERM_PRODUCTS_NEW = '/products/info/audit'; // 新增产品
+export const PERM_PRODUCTS_NEW = '/products/new'; // 新增产品
 export const PERM_PRODUCTS_INFO_AUDIT = '/products/info/audit'; // 信息.审核
 export const PERM_PRODUCTS_INFO_PUT = '/products/info/put'; // 信息.录入
 export const PERM_PRODUCTS_OFFER_AUDIT = '/products/offer/audit'; // 价格.审核

src/views/products/Detail/NewProductModal.jsx

@@ -8,7 +8,7 @@ import useProductsStore from '@/stores/Products/Index';
 import { useNewProductRecord, useProductsTypesMapVal } from '@/hooks/useProductsSets';
 import { useDefaultLgc } from '@/i18n/LanguageSwitcher';
 import RequireAuth from '@/components/RequireAuth';
-import { PERM_PRODUCTS_OFFER_PUT } from '@/config';
+import { PERM_PRODUCTS_OFFER_PUT, PERM_PRODUCTS_NEW } from '@/config';
 
 export const NewProductsForm = ({ initialValues, onFormInstanceReady, ...props }) => {
   const { t } = useTranslation('products');
@@ -91,7 +91,7 @@ export const NewProductModal = ({ initialValues }) => {
   };
   return (
     <>
-      <RequireAuth subject={PERM_PRODUCTS_OFFER_PUT}>
+      <RequireAuth subject={PERM_PRODUCTS_NEW}>
         <Button size='small' type={'primary'} onClick={() => setOpen(true)}>
           {t('New')}
           {t('products:#')}

src/views/products/Detail/ProductInfo.jsx

@@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next';
 import { useProductsTypesMapVal, useNewProductRecord } from '@/hooks/useProductsSets';
 import useProductsStore, { postProductsSaveAction } from '@/stores/Products/Index';
 import useAuthStore from '@/stores/Auth';
-import { PERM_PRODUCTS_MANAGEMENT, PERM_PRODUCTS_OFFER_PUT } from '@/config';
+import { PERM_PRODUCTS_MANAGEMENT, PERM_PRODUCTS_OFFER_PUT, PERM_PRODUCTS_INFO_PUT, PERM_PRODUCTS_NEW } from '@/config';
 import { isEmpty, pick } from '@/utils/commons';
 import ProductInfoForm from './ProductInfoForm';
 import { usingStorage } from '@/hooks/usingStorage';
@@ -31,7 +31,7 @@ const ProductInfo = ({ ...props }) => {
 
     const hasHT = (editingProduct?.info?.htid || 0) > 0;
     // const hasAuditPer = isPermitted(PERM_PRODUCTS_OFFER_AUDIT);
-    const hasEditPer = isPermitted(PERM_PRODUCTS_OFFER_PUT);
+    const hasEditPer = isPermitted(PERM_PRODUCTS_INFO_PUT) || isPermitted(PERM_PRODUCTS_NEW); // || isPermitted(PERM_PRODUCTS_OFFER_PUT);
 
     setEditablePerm(topPerm || hasEditPer);
     // setEditable(topPerm || (hasAuditPer ? true : (!hasHT && hasEditPer)));
@@ -40,8 +40,10 @@ const ProductInfo = ({ ...props }) => {
     setInfoEditable(topPerm || (!hasHT && hasEditPer));
 
     const _priceEditable = [-1, 3].includes(activeAgency?.audit_state_id) || isEmpty(editingProduct?.info?.id);
-    // setPriceEditable(topPerm || (_priceEditable && hasEditPer));
+    const hasPricePer = isPermitted(PERM_PRODUCTS_OFFER_PUT);
-    setPriceEditable(true); // debug: 0
+    // setPriceEditable(topPerm || (_priceEditable && hasPricePer));
+    setPriceEditable(topPerm || (hasPricePer));
+    // setPriceEditable(true); // debug: 0
 
     const showExtras = topPerm && hasHT; // !isEmpty(editingProduct) &&
     setExtrasVisible(showExtras);