diff --git a/src/App.jsx b/src/App.jsx index 48358dc..59d2c36 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -1,144 +1,10 @@ import React from "react"; import { BrowserRouter } from "react-router-dom"; -import { ConfigProvider, theme } from "antd"; import { ThemeProvider } from "./contexts/ThemeContext"; import { AuthProvider } from "./contexts/AuthContext"; import AppRoutes from "./routes/AppRoutes"; -import { useTheme } from "./contexts/ThemeContext"; import { RootStoreProvider } from "./contexts/RootStore"; -const ThemedApp = () => { - const { isDarkMode } = useTheme(); - - return ( - - - - - - ); -}; const App = () => { return ( @@ -146,7 +12,7 @@ const App = () => { - + diff --git a/src/contexts/ThemeContext.jsx b/src/contexts/ThemeContext.jsx index b86fcdb..e1afa32 100644 --- a/src/contexts/ThemeContext.jsx +++ b/src/contexts/ThemeContext.jsx @@ -20,46 +20,119 @@ export const ThemeProvider = ({ children }) => { return ( diff --git a/src/pages/company/customer/detail/index.jsx b/src/pages/company/customer/detail/index.jsx index d0a2825..44f4933 100644 --- a/src/pages/company/customer/detail/index.jsx +++ b/src/pages/company/customer/detail/index.jsx @@ -83,7 +83,7 @@ const CustomerForm = () => { }; return ( - + { }; return ( - + { const [form] = Form.useForm(); const navigate = useNavigate(); - const { id } = useParams(); + const { id} = useParams(); + const [searchParams] = useSearchParams(); + const isView = searchParams.get("isView") === "true"; const [loading, setLoading] = useState(false); const location = useLocation(); const isEdit = location.search.includes("edit=true"); @@ -136,7 +138,7 @@ const ServiceForm = () => { }; return ( - + { > 返回 - form.submit()} loading={loading} > 保存 - + } } @@ -176,8 +178,9 @@ const ServiceForm = () => { onFinish={onFinish} onValuesChange={handleValuesChange} layout="vertical" + variant="filled" + disabled={isView} > - {/* 基本信息 */} { - {/* 服务明细 */} { ), }, - { - title: "总金额", - dataIndex: ["attributes", "totalAmount"], - key: "totalAmount", - className: "min-w-[150px] text-right", - render: (amount) => ( - - ¥ - {amount?.toLocaleString("zh-CN", { - minimumFractionDigits: 2, - maximumFractionDigits: 2, - }) || "0.00"} - - ), - }, + // { + // title: "总金额", + // dataIndex: ["attributes", "totalAmount"], + // key: "totalAmount", + // className: "min-w-[150px] text-right", + // render: (amount) => ( + // + // ¥ + // {amount?.toLocaleString("zh-CN", { + // minimumFractionDigits: 2, + // maximumFractionDigits: 2, + // }) || "0.00"} + // + // ), + // }, { title: "操作", key: "action", diff --git a/src/pages/company/supplier/detail/index.jsx b/src/pages/company/supplier/detail/index.jsx index 19d9e1f..6bed383 100644 --- a/src/pages/company/supplier/detail/index.jsx +++ b/src/pages/company/supplier/detail/index.jsx @@ -83,7 +83,7 @@ const SupplierForm = () => { }; return ( - + { }; return ( - +