diff --git a/src/views/products/Detail/Header.jsx b/src/views/products/Detail/Header.jsx index a40cf3f..45dd5a0 100644 --- a/src/views/products/Detail/Header.jsx +++ b/src/views/products/Detail/Header.jsx @@ -13,8 +13,6 @@ import { PERM_PRODUCTS_OFFER_AUDIT, PERM_PRODUCTS_OFFER_PUT } from '@/config'; import dayjs from 'dayjs'; 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'; @@ -170,6 +168,23 @@ const Header = ({ refresh, ...props }) => { + {/* */} + + {/* {activeAgencyState === 0 && ( */} + <> + + + + + + + {/* )} */} {showEditA && ( {t('Edit')} @@ -193,29 +208,6 @@ const Header = ({ refresh, ...props }) => { {t('products:auditStateAction.Rejected')} - - {/* todo: export, 审核完成之后才能导出 */} - - - {/* */} - - {/* 编辑 */} - - {isEditPage && ( - - )} - {/* {activeAgencyState === 0 && ( */} - <> - - - - - - - {/* )} */} ); }; diff --git a/src/views/products/Detail/ProductsTree.jsx b/src/views/products/Detail/ProductsTree.jsx index 9132f07..65cff51 100644 --- a/src/views/products/Detail/ProductsTree.jsx +++ b/src/views/products/Detail/ProductsTree.jsx @@ -1,10 +1,12 @@ import { createContext, useEffect, useState } from 'react'; -import { Tree, Input } from 'antd'; +import { Tree, Input, Divider } from 'antd'; import { CaretDownOutlined } from '@ant-design/icons'; import { useTranslation } from 'react-i18next'; import useProductsStore from '@/stores/Products/Index'; import { useProductsTypes, useProductsAuditStatesMapVal } from '@/hooks/useProductsSets'; import { groupBy, sortBy } from '@/utils/commons'; +import NewProductModal from './NewProductModal'; +import ContractRemarksModal from './ContractRemarksModal' const flattenTreeFun = (tree) => { let flatList = []; @@ -40,6 +42,8 @@ const getParentKey = (key, tree) => { const ProductsTree = ({ onNodeSelect, ...props }) => { const { t } = useTranslation(); + + const isEditPage = location.pathname.includes('edit'); const [agencyProducts, editingProduct, setEditingProduct] = useProductsStore((state) => [state.agencyProducts, state.editingProduct, state.setEditingProduct]); const [activeAgency] = useProductsStore((state) => [state.activeAgency]); const productsTypes = useProductsTypes(); @@ -150,6 +154,12 @@ const ProductsTree = ({ onNodeSelect, ...props }) => { return (
+ {/* 编辑 */} + {isEditPage && ( + + )} + +