fix

2025-01-19 12:52:58 +08:00
parent 027a8e5493 8dccf8e554
commit 705af6bfa8
48 changed files with 276 additions and 607 deletions
--- a/src/components/ChatAi/index.jsx
+++ b/src/components/ChatAi/index.jsx
@@ -202,13 +202,13 @@ export default function ChatAIDrawer({ open, onClose, onExport }) {
              placeholder="请输入您的问题..."
              onChange={handleInputChange}
              disabled={isLoading}
-              className="flex-1 rounded-lg border-gray-300 hover:border-blue-400 focus:border-blue-600 focus:shadow-blue-100"
+              className="flex-1 rounded-md "
            />
            <Button 
              type="primary"
              htmlType="submit"
              loading={isLoading}
-              className="rounded-lg bg-blue-600 hover:bg-blue-700"
+              className="rounded-md"
            >
              发送
            </Button>
--- a/src/components/Layout/Sidebar.jsx
+++ b/src/components/Layout/Sidebar.jsx
@@ -44,6 +44,10 @@ const Sidebar = ({ collapsed }) => {
    }, []);
  }, [location.pathname]);

+  const selectedKey = useMemo(() => {
+    return location.pathname;
+  }, [location.pathname]);
+
  const handleMenuClick = ({ key }) => {
    navigate(key);
  };
@@ -56,13 +60,17 @@ const Sidebar = ({ collapsed }) => {
      theme={isDarkMode ? "dark" : "light"}
      width={256}
      collapsedWidth={80} 
-      className={`app-sidebar ${collapsed ? "collapsed" : ""}`} 
+      className={`app-sidebar ${collapsed ? "collapsed" : ""} overflow-auto`} 
    >
      <Logo collapsed={collapsed} isDarkMode={isDarkMode} />
      <Menu
        theme={isDarkMode ? "dark" : "light"}
        mode="inline"
+<<<<<<< HEAD
        selectedKeys={getSelectedKeys}
+=======
+        selectedKeys={[selectedKey]}
+>>>>>>> 8dccf8e554eefcfa832eca45be35be4dddad3cb8
        defaultOpenKeys={defaultOpenKeys}
        items={menuClient}
        onClick={handleMenuClick}
--- a/src/components/SectionList/index.jsx
+++ b/src/components/SectionList/index.jsx
@@ -187,50 +187,44 @@ const SectionList = ({
            {availableSections.map((section) => (
              <div
                key={section.id}
-                className="group relative bg-white rounded-lg shadow-sm border border-gray-200 hover:shadow-lg transition-all duration-300 cursor-pointer"
+                className="group relative bg-white dark:bg-gray-800 rounded-lg shadow-sm border border-gray-200 dark:border-gray-700 hover:shadow-lg transition-all duration-300 cursor-pointer"
                onClick={() => handleUseTemplate(section, add)}
              >
                <div className="p-6">
                  <div className="text-center mb-4">
-                    <h3 className="text-lg font-medium group-hover:text-blue-500 transition-colors">
+                    <h3 className="text-lg font-medium text-gray-900 dark:text-gray-100 group-hover:text-blue-500 transition-colors">
                      {section.attributes.name}
                    </h3>
-                    <div className="text-sm text-gray-500 mt-1">
+                    <div className="text-sm text-gray-500 dark:text-gray-400 mt-1">
                      {section.attributes.items?.length || 0} 个项目
                    </div>
                  </div>

-                  <div className="space-y-2 mt-4 border-t pt-4">
-                    {(section.attributes.items || [])
-                      .slice(0, 3)
-                      .map((item, index) => (
-                        <div
-                          key={index}
-                          className="flex justify-between items-center"
-                        >
-                          <span className="text-sm text-gray-600 truncate flex-1">
-                            {item.name}
-                          </span>
-                          <span className="text-sm text-gray-500 ml-2">
-                            {formatExchangeRate(currentCurrency, item.price)}
-                          </span>
-                        </div>
-                      ))}
+                  <div className="space-y-2 mt-4 border-t dark:border-gray-700 pt-4">
+                    {(section.attributes.items || []).slice(0, 3).map((item, index) => (
+                      <div key={index} className="flex justify-between items-center">
+                        <span className="text-sm text-gray-600 dark:text-gray-300 truncate flex-1">
+                          {item.name}
+                        </span>
+                        <span className="text-sm text-gray-500 dark:text-gray-400 ml-2">
+                          {formatExchangeRate(currentCurrency, item.price)}
+                        </span>
+                      </div>
+                    ))}
                    {(section.attributes.items || []).length > 3 && (
-                      <div className="text-sm text-gray-500 text-center">
+                      <div className="text-sm text-gray-500 dark:text-gray-400 text-center">
                        还有 {section.attributes.items.length - 3} 个项目...
                      </div>
                    )}
                  </div>

-                  <div className="mt-4 pt-4 border-t flex justify-between items-center">
-                    <span className="text-sm text-gray-600">总金额</span>
-                    <span className="text-base font-medium text-blue-500">
+                  <div className="mt-4 pt-4 border-t dark:border-gray-700 flex justify-between items-center">
+                    <span className="text-sm text-gray-600 dark:text-gray-300">总金额</span>
+                    <span className="text-base font-medium text-blue-500 dark:text-blue-400">
                      {formatExchangeRate(
                        currentCurrency,
                        (section.attributes.items || []).reduce(
-                          (sum, item) =>
-                            sum + (item.price * (item.quantity || 1) || 0),
+                          (sum, item) => sum + (item.price * (item.quantity || 1) || 0),
                          0
                        )
                      )}
@@ -241,12 +235,12 @@ const SectionList = ({
            ))}
          </div>

-          <div className="flex justify-center">
+          <div className="flex justify-center mt-6">
            <Button
              type="primary"
              icon={<PlusOutlined />}
              onClick={() => handleCreateCustom(add, fieldsLength)}
-              className="bg-blue-600 hover:bg-blue-700 border-0 shadow-md hover:shadow-lg transition-all duration-200 h-10 px-6 rounded-lg flex items-center gap-2"
+              className="bg-blue-600 dark:bg-blue-500 hover:bg-blue-700 dark:hover:bg-blue-600 border-0 shadow-md hover:shadow-lg transition-all duration-200 h-10 px-6 rounded-lg flex items-center gap-2"
            >
              <span className="font-medium">自定义模块</span>
            </Button>
@@ -256,7 +250,7 @@ const SectionList = ({
        <div className="flex flex-col items-center justify-center py-16 px-4">
          <div className="w-48 h-48 mb-8">
            <svg
-              className="w-full h-full text-gray-200"
+              className="w-full h-full text-gray-200 dark:text-gray-700"
              xmlns="http://www.w3.org/2000/svg"
              fill="none"
              viewBox="0 0 24 24"
@@ -270,10 +264,10 @@ const SectionList = ({
              />
            </svg>
          </div>
-          <h3 className="text-xl font-medium text-gray-900 mb-2">
+          <h3 className="text-xl font-medium text-gray-900 dark:text-gray-100 mb-2">
            暂无可用模板
          </h3>
-          <p className="text-gray-500 text-center max-w-sm mb-8">
+          <p className="text-gray-500 dark:text-gray-400 text-center max-w-sm mb-8">
            您可以选择创建一个自定义模块开始使用
          </p>
          <Button
@@ -281,7 +275,7 @@ const SectionList = ({
            icon={<PlusOutlined />}
            onClick={() => handleCreateCustom(add, fieldsLength)}
            size="large"
-            className="shadow-md hover:shadow-lg transition-shadow"
+            className="shadow-md hover:shadow-lg transition-shadow dark:bg-blue-500 dark:hover:bg-blue-600"
          >
            创建自定义模块
          </Button>
--- a/src/components/TaskList/index.jsx
+++ b/src/components/TaskList/index.jsx
@@ -199,7 +199,7 @@ const SectionList = ({ form, isView, formValues, type }) => {
            {availableSections.map((section) => (
              <div
                key={section.id}
-                className="group relative bg-white rounded-lg shadow-sm border border-gray-200 hover:shadow-lg transition-all duration-300 cursor-pointer"
+                className="group relative bg-white dark:bg-gray-800 rounded-lg shadow-sm border border-gray-200 dark:border-gray-700 hover:shadow-lg transition-all duration-300 cursor-pointer"
                onClick={() => handleUseTemplate(section, add)}
              >
                <div className="p-6">
@@ -241,7 +241,7 @@ const SectionList = ({ form, isView, formValues, type }) => {
            ))}
          </div>

-          <div className="flex justify-center">
+          <div className="flex justify-center mt-6">
            <Button
              type="primary"
              icon={<PlusOutlined />}
--- a/src/components/auth/ProtectedRoute.jsx
+++ b/src/components/auth/ProtectedRoute.jsx
@@ -2,7 +2,7 @@ import React from "react";
 import { Navigate, useLocation } from "react-router-dom";
 import { useAuth } from "@/contexts/AuthContext";

-const PUBLIC_PATHS = ['login', '404'];
+const PUBLIC_PATHS = ['login', '404','home'];
 export const ProtectedRoute = ({ children }) => {
  const { user } = useAuth();
  const location = useLocation();
@@ -15,13 +15,12 @@ export const ProtectedRoute = ({ children }) => {
      return currentPath === key || currentPath.startsWith(`${key}/`);
    });

-    if (!hasPermission ) {
-      return <Navigate to="/404" replace />;
+    if (!hasPermission) {
+      return <Navigate to="/home" replace />;
    }

    return children;
  }

-  // 如果用户未登录，重定向到登录页
  return <Navigate to="/login" state={{ from: location }} replace />;
 };
--- a/src/components/difyChatAi/index.jsx
+++ b/src/components/difyChatAi/index.jsx
@@ -215,20 +215,20 @@ export default function DifyChatDrawer({ open, onClose, onExport }) {
          <div ref={messagesEndRef} />
        </div>

-        <div className="border-t dark:border-gray-700 bg-white dark:bg-gray-800 p-4">
+        <div className="border-t dark:border-gray-700 p-4">
          <form onSubmit={handleSendMessage} className="flex gap-2">
            <Input
              value={input}
              placeholder="请输入您的问题..."
              onChange={(e) => setInput(e.target.value)}
              disabled={isLoading}
-              className="flex-1 rounded-lg border-gray-300 dark:border-gray-600 hover:border-blue-400 dark:hover:border-blue-500 focus:border-blue-600 dark:focus:border-blue-500 focus:shadow-blue-100 dark:focus:shadow-blue-900 dark:bg-gray-700 dark:text-gray-200"
+              className="flex-1 rounded-md "
            />
            <Button 
              type="primary"
              htmlType="submit"
              loading={isLoading}
-              className="rounded-lg bg-blue-600 hover:bg-blue-700 dark:bg-blue-700 dark:hover:bg-blue-800"
+              className="rounded-md "
            >
              发送
            </Button>
--- a/src/hooks/resource/useResource.js
+++ b/src/hooks/resource/useResource.js
@@ -24,8 +24,6 @@ export const useResources = (initialPagination, initialSorter, type) => {

        setCurrentPagination(newPagination);
        setCurrentSorter(newSorter);
-        console.log(params.searchQuery,'params.searchQuery');
-        
        const { data, total: newTotal } = await resourceService.getResources({
          page: newPagination.current,
          pageSize: newPagination.pageSize,
@@ -77,8 +75,6 @@ export const useResources = (initialPagination, initialSorter, type) => {
  const deleteResource = async (id) => {
    try {
     const data= await resourceService.deleteResource(id, type);
-     console.log(data,data.length,'data');
-     
     if(data?.length>0){
      const newCurrent =
        resources.length === 1 && currentPagination.current > 1
@@ -87,7 +83,7 @@ export const useResources = (initialPagination, initialSorter, type) => {
      await fetchResources({ current: newCurrent });
      message.success("删除成功");
    }else{
-      throw new Error("no level");
+      throw new Error("暂无权限");
    }
    } catch (error) {
      throw error;
--- a/src/hooks/supabaseService.js
+++ b/src/hooks/supabaseService.js
@@ -1,5 +1,5 @@
 import { supabase } from "@/config/supabase";
-
+import { message } from "antd";
 class SupabaseService {
  async select(table, options = {}) {
    try {
@@ -60,12 +60,22 @@ class SupabaseService {
        .from(table)
        .insert(data)
        .select();
+      if (error) {
+        if (error.code === '42501' || error.status === 403) {
+          throw new Error('暂无权限：您没有执行此操作的权限');

-      if (error) throw error;
+        }
+        throw new Error(error.message || '数据库操作失败');
+      }
+      if (result?.length === 0) {
+        throw new Error('暂无权限：您没有执行此操作的权限');
+      }
      return result;
    } catch (error) {
-      console.error(`Error inserting into ${table}:`, error.message);
-      throw error;
+      // 确保错误始终是 Error 对象
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      console.error(`Insert error for table ${table}:`, errorMessage);
+      throw new Error(errorMessage);
    }
  }

@@ -83,22 +93,21 @@ class SupabaseService {
      }

      const { data, error } = await query.select();
-
+      if(data.length===0) throw '暂无权限' ;
      if (error) throw error;
      return data;
    } catch (error) {
-      console.error(`Error updating ${table}:`, error.message);
-      throw error;
+      throw new Error('更新失败');
    }
  }

  // 通用 DELETE 请求
  async delete(table, match) {
    try {
-      const { error } = await supabase.from(table).delete().match(match);
-
+      const { data,error } = await supabase.from(table).delete().match(match).select();
+      if(data.length===0) throw '暂无权限';
      if (error) throw error;
-      return true;
+      return data;
    } catch (error) {
      console.error(`Error deleting from ${table}:`, error.message);
      throw error;
--- a/src/index.css
+++ b/src/index.css
@@ -1,3 +0,0 @@
-
-
-
--- a/src/pages/company/customer/index.jsx
+++ b/src/pages/company/customer/index.jsx
@@ -158,7 +158,7 @@ const CustomerPage = () => {
        columns={columns}
        dataSource={customers}
        rowKey="id"
-        scroll={{ x: true }}
+        scroll={{ x: true}}
        loading={loading}
        onChange={handleTableChange}
        pagination={{
--- a/src/pages/company/project/detail/index.jsx
+++ b/src/pages/company/project/detail/index.jsx
@@ -228,8 +228,7 @@ export default function ProjectDetail() {
          .select();
      }

-      if (result.error) throw result.error;
-
+      if (result.error||result.data.length===0) throw 'error';
      message.success("保存成功");
      navigate("/company/project");
    } catch (error) {
@@ -257,7 +256,7 @@ export default function ProjectDetail() {
  }, [id, templateId]);

  return (
-    <div className="bg-gradient-to-b from-gray-50 to-white dark:from-gray-800 dark:to-gray-900/90 min-h-screen p-2">
+    <div className="bg-gradient-to-b  min-h-screen p-2">
      <Card
        className="shadow-lg rounded-lg border-0"
        title={
--- a/src/pages/company/project/index.jsx
+++ b/src/pages/company/project/index.jsx
@@ -338,7 +338,7 @@ const ProjectPage = () => {
        columns={columns}
        dataSource={projects}
        rowKey="id"
-        scroll={{ x: true }}
+        scroll={{ x: true}}
        loading={loadingProjects}
        onChange={handleTableChange}
        pagination={{
--- a/src/pages/company/quotation/detail/index.jsx
+++ b/src/pages/company/quotation/detail/index.jsx
@@ -268,7 +268,10 @@ const QuotationForm = () => {
      }

      if (result.error) throw result.error;
-
+      if(result.length===0){
+        message.error('暂无权限');
+        return;
+      };
      message.success("保存成功");
      navigate("/company/quotation");
    } catch (error) {
@@ -359,7 +362,7 @@ const QuotationForm = () => {
  };

  return (
-    <div className="bg-gradient-to-b from-gray-50 to-white dark:from-gray-800 dark:to-gray-900/90 min-h-screen p-2">
+    <div className="bg-gradient-to-b  min-h-screen p-2">
      <Card
        className="shadow-lg rounded-lg border-0"
        title={
--- a/src/pages/company/quotation/index.jsx
+++ b/src/pages/company/quotation/index.jsx
@@ -381,7 +381,7 @@ useEffect(()=>{
          columns={columns}
          dataSource={quotations}
          rowKey="id"
-          scroll={{ x: true }}
+          scroll={{ x: true}}
          loading={loadingQuotations}
          onChange={handleTableChange}
          pagination={{
@@ -405,7 +405,7 @@ useEffect(()=>{
          <Button 
            key="custom" 
            onClick={() => handleConfirm()}
-            className=" gap-2 px-6 rounded-full hover:bg-gray-100"
+            className="gap-2 px-6 rounded-full hover:bg-gray-100 dark:hover:bg-gray-700 dark:text-gray-200"
          >
            <FileAddOutlined /> 自定义创建
          </Button>,
@@ -414,28 +414,28 @@ useEffect(()=>{
            type="primary"
            disabled={!selectedTemplateId}
            onClick={handleConfirm}
-            className="gap-2 px-6 rounded-full bg-blue-600 hover:bg-blue-700"
+            className="gap-2 px-6 rounded-full "
          >
            <AppstoreOutlined /> 使用选中模板
          </Button>,
        ]}
        width={900}
-        className="template-modal"
+        className="template-modal "
      >
        {loading ? (
-          <div className="flex justify-center items-center h-[400px]">
+          <div className="flex justify-center items-center h-[400px] ">
            <Spin size="large" />
          </div>
        ) : templates.length === 0 ? (
-          <Empty description="暂无可用模板" />
+          <Empty description={<span className="dark:text-gray-400">暂无可用模板</span>} />
        ) : (
-          <div className="max-h-[600px] overflow-y-auto px-4">
+          <div className="max-h-[600px] overflow-y-auto px-4 ">
            {getTemplatesByCategory().map((group, groupIndex) => (
              <div key={groupIndex} className="mb-10 last:mb-2">
                <div className="flex items-center gap-3 mb-6">
-                  <h3 className="text-xl font-medium text-gray-900">
+                  <h3 className="text-xl font-medium text-gray-900 dark:text-gray-100">
                    {group.name}
-                    <span className="ml-2 text-sm text-gray-500">
+                    <span className="ml-2 text-sm text-gray-500 dark:text-gray-400">
                      ({group.templates.length})
                    </span>
                  </h3>
@@ -450,18 +450,18 @@ useEffect(()=>{
                        relative p-6 rounded-xl cursor-pointer transition-all duration-200
                        ${
                          selectedTemplateId === template.id
-                            ? "ring-2 ring-blue-500 bg-blue-50/40"
-                            : "hover:shadow-lg border border-gray-200 hover:border-blue-200"
+                            ? "ring-2 ring-blue-500 dark:ring-blue-400 bg-blue-50/40 dark:bg-blue-900/30"
+                            : "hover:shadow-lg border border-gray-200 dark:border-gray-700 hover:border-blue-200 dark:hover:border-blue-700"
                        }
-                        transform hover:-translate-y-1
+                        transform hover:-translate-y-1 dark:bg-gray-800
                      `}
                    >
                      <div className="flex justify-between items-start gap-3 mb-4">
                        <div className="flex-1 min-w-0">
-                          <h4 className="text-lg font-medium text-gray-900 truncate">
+                          <h4 className="text-lg font-medium text-gray-900 dark:text-gray-100 truncate">
                            {template.attributes.templateName}
                          </h4>
-                          <p className="text-sm text-gray-600 mt-2 line-clamp-2">
+                          <p className="text-sm text-gray-600 dark:text-gray-400 mt-2 line-clamp-2">
                            {template.attributes.description || "暂无描述"}
                          </p>
                        </div>
@@ -475,16 +475,16 @@ useEffect(()=>{
                              rounded-lg p-3 text-sm border
                              ${
                                selectedTemplateId === template.id
-                                  ? "bg-white border-blue-200"
-                                  : "bg-gray-50 border-gray-100"
+                                  ? "bg-white dark:bg-gray-700 border-blue-200 dark:border-blue-600"
+                                  : "bg-gray-50 dark:bg-gray-800 border-gray-100 dark:border-gray-700"
                              }
                            `}
                          >
                            <div className="flex justify-between items-center">
-                              <span className="font-medium text-gray-700 truncate flex-1">
+                              <span className="font-medium text-gray-700 dark:text-gray-200 truncate flex-1">
                                {section.sectionName}
                              </span>
-                              <span className="text-gray-500 ml-2 text-xs px-2 py-0.5 bg-gray-100 rounded-full">
+                              <span className="text-gray-500 dark:text-gray-400 ml-2 text-xs px-2 py-0.5 bg-gray-100 dark:bg-gray-600 rounded-full">
                                {section.items.length}项
                              </span>
                            </div>
@@ -494,7 +494,7 @@ useEffect(()=>{

                      {selectedTemplateId === template.id && (
                        <div className="absolute top-4 right-4">
-                          <div className="w-6 h-6 bg-blue-600 rounded-full flex items-center justify-center shadow-md">
+                          <div className="w-6 h-6 bg-blue-600 dark:bg-blue-500 rounded-full flex items-center justify-center shadow-md">
                            <svg
                              className="w-4 h-4 text-white"
                              fill="currentColor"
--- a/src/pages/company/quotation/view/index.jsx
+++ b/src/pages/company/quotation/view/index.jsx
@@ -42,61 +42,70 @@ const QuotationPreview = () => {
  // PDF导出函数
  const exportPDF = async () => {
    try {
-      // 显示加载中
      message.loading('正在生成PDF...', 0);
-      
-      // 获取要导出的DOM元素
      const element = document.getElementById('quotation-content');
      
-      // 使用html2canvas将DOM转换为canvas
-      const canvas = await html2canvas(element, {
-        scale: 2, // 提高清晰度
-        useCORS: true, // 允许加载跨域图片
-        logging: false, // 关闭日志
-        backgroundColor: '#ffffff' // 设置背景色
+      // A4 尺寸（单位：pt，1mm ≈ 2.83pt）
+      const a4Width = 595.28;
+      const a4Height = 841.89;
+      const margin = 40; // 页边距（pt）
+      
+      // 初始化 PDF
+      const pdf = new jsPDF({
+        unit: 'pt',
+        format: 'a4',
      });

-      // 获取canvas的宽高
-      const imgWidth = 210; // A4纸的宽度(mm)
-      const pageHeight = 297; // A4纸的高度(mm)
-      const imgHeight = canvas.height * imgWidth / canvas.width;
-      const pdfWidth = imgWidth;
-      const pdfHeight = imgHeight;
+      // 获取内容的总高度
+      let remainingContent = element.cloneNode(true);
+      document.body.appendChild(remainingContent);
+      remainingContent.style.width = `${a4Width - 2 * margin}pt`;
+      const totalHeight = remainingContent.offsetHeight;
      
-      // 将canvas转为图片
-      const imgData = canvas.toDataURL('image/jpeg', 1.0);
+      // 计算需要的页数
+      const contentHeight = a4Height - 2 * margin;
+      const pageCount = Math.ceil(totalHeight / contentHeight);
      
-      // 初始化jsPDF
-      const pdf = new jsPDF('p', 'mm', 'a4');
-      
-      // 计算分页
-      let position = 0;
-      let currentPage = 1;
-
-      while (position < pdfHeight) {
-        // 添加图片到PDF
-        pdf.addImage(
-          imgData, 
-          'JPEG', 
-          0, // x坐标
-          position === 0 ? 0 : -position, // y坐标
-          pdfWidth, // 图片宽度
-          pdfHeight // 图片高度
-        );
-
-        position += pageHeight;
-        
-        // 如果还有内容，添加新页面
-        if (position < pdfHeight) {
+      // 逐页处理内容
+      for (let i = 0; i < pageCount; i++) {
+        if (i > 0) {
          pdf.addPage();
-          currentPage++;
        }
+
+        // 创建当前页的容器
+        const pageDiv = document.createElement('div');
+        pageDiv.style.width = `${a4Width - 2 * margin}pt`;
+        pageDiv.style.height = `${contentHeight}pt`;
+        pageDiv.style.position = 'absolute';
+        pageDiv.style.top = '0';
+        pageDiv.style.left = '0';
+        pageDiv.style.overflow = 'hidden';
+        
+        // 克隆原始内容
+        const contentClone = element.cloneNode(true);
+        contentClone.style.transform = `translateY(-${i * contentHeight}pt)`;
+        pageDiv.appendChild(contentClone);
+        document.body.appendChild(pageDiv);
+
+        // 转换为图片并添加到 PDF
+        const canvas = await html2canvas(pageDiv, {
+          scale: 2,
+          useCORS: true,
+          logging: false,
+          backgroundColor: '#ffffff',
+        });
+
+        const imgData = canvas.toDataURL('image/jpeg', 1.0);
+        pdf.addImage(imgData, 'JPEG', margin, margin, a4Width - 2 * margin, contentHeight);
+        
+        // 清理临时元素
+        document.body.removeChild(pageDiv);
      }

-      // 保存PDF
-      pdf.save(`${quotation.attributes.quataName || '报价单'}.pdf`);
+      // 清理克隆的元素
+      document.body.removeChild(remainingContent);

-      // 关闭加载提示
+      pdf.save(`${quotation.attributes.quataName || '报价单'}.pdf`);
      message.destroy();
      message.success('PDF导出成功！');
    } catch (error) {
--- a/src/pages/company/service/detail/components/ProjectTemplate.jsx
+++ b/src/pages/company/service/detail/components/ProjectTemplate.jsx
@@ -8,9 +8,9 @@ const ProjectTemplate = ({ form, id, isView }) => {
      layout="vertical"
      disabled={isView}
    >
-      {/* 专案模板特有的字段和组件 */}
+     
      <Card>
-        {/* 项目阶段、时间线等内容 */}
+     
      </Card>
    </Form>
  );
--- a/src/pages/company/service/detail/components/QuotationTemplate.jsx
+++ b/src/pages/company/service/detail/components/QuotationTemplate.jsx
@@ -103,21 +103,17 @@ const QuotationTemplate = ({ id, isView, onCancel,isEdit }) => {
      };

      if (id) {
-        // 更新
-        await supabaseService.update('resources', 
-          { id }, 
-          serviceData
-        );
+        await supabaseService.update('resources', { id }, serviceData);
      } else {
-        // 新增
        await supabaseService.insert('resources', serviceData);
      }

      message.success("保存成功");
      onCancel();
    } catch (error) {
+      const errorMsg = error instanceof Error ? error.message : '保存失败';
      console.error("保存失败:", error);
-      message.error("保存失败");
+      message.error(errorMsg);
    } finally {
      setLoading(false);
    }
--- a/src/pages/company/service/detail/components/TaskTemplate.jsx
+++ b/src/pages/company/service/detail/components/TaskTemplate.jsx
@@ -104,15 +104,14 @@ const TaskTemplate = ({ id, isView, onCancel,isEdit }) => {
          serviceData
        );
      } else {
-        // 新增
        await supabaseService.insert('resources', serviceData);
      }

      message.success("保存成功");
      onCancel();
    } catch (error) {
+      message.error('保存失败');
      console.error("保存失败:", error);
-      message.error("保存失败");
    } finally {
      setLoading(false);
    }
--- a/src/pages/company/service/detail/index.jsx
+++ b/src/pages/company/service/detail/index.jsx
@@ -7,7 +7,6 @@ import TaskTemplate from './components/TaskTemplate';

 const { Title } = Typography;

-// 模板类型配置
 const TEMPLATE_CONFIG = {
  quotation: {
    title: '报价单模板',
@@ -36,9 +35,8 @@ const ServiceForm = () => {
  if (!currentTemplate) {
    return <div>无效的模板类型</div>;
  }
-
  return (
-    <div className="bg-gradient-to-b from-gray-50 to-white dark:from-gray-800 dark:to-gray-900/90 min-h-screen p-2" >
+    <div className="bg-gradient-to-b  min-h-screen p-2" >
      <Card
        className="shadow-lg rounded-lg border-0"
        title={
--- a/src/pages/company/service/index.jsx
+++ b/src/pages/company/service/index.jsx
@@ -88,7 +88,7 @@ const ServicePage = () => {
      setData(services || []);
    } catch (error) {
      console.error("获取服务模板失败:", error);
-      message.error("获取服<EFBFBD><EFBFBD><EFBFBD>模板失败");
+      message.error("获取服务模板失败");
    } finally {
      setLoading(false);
    }
@@ -127,7 +127,7 @@ const ServicePage = () => {
      fetchServices();
    } catch (error) {
      console.error("删除失败:", error);
-      message.error("删除失败");
+      message.error(error);
    }
  };

@@ -173,7 +173,7 @@ const ServicePage = () => {
      }
    } catch (error) {
      console.error("保存失败:", error);
-      message.error("保存失败");
+      message.error(error);
    }
  };

@@ -263,7 +263,6 @@ const ServicePage = () => {
            title: "名称",
            dataIndex: "name",
            key: "name",
-            width: "15%",
            render: (text, item, index) => {
              const isEditing =
                editingKey === `${record.id}-${section.key}-${index}`;
@@ -286,7 +285,6 @@ const ServicePage = () => {
            title: "单位",
            dataIndex: "unit",
            key: "unit",
-            width: "10%",
            render: (text, item, index) => {
              const isEditing =
                editingKey === `${record.id}-${section.key}-${index}`;
@@ -320,7 +318,6 @@ const ServicePage = () => {
            title: "单价",
            dataIndex: "price",
            key: "price",
-            width: "10%",
            render: (text, item, index) => {
              const isEditing =
                editingKey === `${record.id}-${section.key}-${index}`;
@@ -343,7 +340,6 @@ const ServicePage = () => {
            title: "数量",
            dataIndex: "quantity",
            key: "quantity",
-            width: "10%",
            render: (text, item, index) => {
              const isEditing =
                editingKey === `${record.id}-${section.key}-${index}`;
@@ -677,7 +673,7 @@ const ServicePage = () => {
              </Popconfirm>
            </div>
            <Table
-              scroll={{ x: true }}
+              scroll={{ x: true}}
              dataSource={section.items}
              pagination={false}
              size="small"
@@ -714,7 +710,6 @@ const ServicePage = () => {
      title: "模板名称",
      dataIndex: ["attributes", "templateName"],
      key: "templateName",
-      className: "min-w-[200px]",
    },
    {
      title: "模板类型",
@@ -766,6 +761,7 @@ const ServicePage = () => {
      title: "创建时间",
      dataIndex: "created_at",
      key: "created_at",
+      width: 220,
      render: (text) => new Date(text).toLocaleString(),
      sorter: (a, b) => new Date(a.created_at) - new Date(b.created_at),
    },
@@ -858,7 +854,7 @@ const ServicePage = () => {
    <Card className="shadow-lg rounded-lg">
      <TableHeader />
      <Table
-        scroll={{ x: true }}
+        scroll={{ x: true}}
        columns={columns}
        dataSource={data}
        rowKey="id"
--- a/src/pages/company/service/itemsManange/classify/index.jsx
+++ b/src/pages/company/service/itemsManange/classify/index.jsx
@@ -267,7 +267,7 @@ const Classify = ({activeType,typeList}) => {
      <div className="rounded-lg shadow-sm">
        <Form form={form}>
          <Table
-            scroll={{ x: true }}
+            scroll={{ x: true}}
            columns={columns}
            dataSource={data}
            rowKey="id"
--- a/src/pages/company/service/itemsManange/unit/index.jsx
+++ b/src/pages/company/service/itemsManange/unit/index.jsx
@@ -263,7 +263,7 @@ const UnitManagement = ({ activeType, typeList }) => {
      <div className="rounded-lg shadow-sm">
        <Form form={form}>
          <Table
-            scroll={{ x: true }}
+            scroll={{ x: true}}
            columns={columns}
            dataSource={data}
            rowKey="id"
--- a/src/pages/company/supplier/detail/index.jsx
+++ b/src/pages/company/supplier/detail/index.jsx
@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Select, Button, Space, Card, Typography } from 'antd';
+import { Form, Input, Select, Button, Space, Card, Typography, message } from 'antd';
 import { ArrowLeftOutlined, SaveOutlined } from '@ant-design/icons';
 import { supabase } from '@/config/supabase';
 import { useNavigate, useParams, useSearchParams } from 'react-router-dom';
@@ -22,7 +22,6 @@ const SupplierForm = () => {
        .select('*')
        .eq('id', id)
        .single();
-
      if (error) throw error;
    
      if (id) {
@@ -74,10 +73,14 @@ const SupplierForm = () => {
          .insert([supplierData])
          .select();
      }
-
+        if(result.data.length===0){
+          message.error('暂无权限');
+          return;
+        };
      if (result.error) throw result.error;
      navigate('/company/supplier');
    } catch (error) {
+      message.error('暂无权限');
      console.error('保存失败:', error);
    }
  };
--- a/src/pages/company/supplier/index.jsx
+++ b/src/pages/company/supplier/index.jsx
@@ -144,7 +144,7 @@ const SupplierPage = () => {
      }
    >
      <Table
-        scroll={{ x: true }}
+        scroll={{ x: true}}
        columns={columns}
        dataSource={suppliers}
        rowKey="id"
--- a/src/pages/company/task/detail/index.jsx
+++ b/src/pages/company/task/detail/index.jsx
@@ -264,7 +264,7 @@ export default function TaskForm() {
  }, [id, templateId]);

  return (
-    <div className="bg-gradient-to-b from-gray-50 to-white dark:from-gray-800 dark:to-gray-900/90 min-h-screen p-2">
+    <div className="bg-gradient-to-b  min-h-screen p-2">
      <Card
        className="shadow-lg rounded-lg border-0"
        title={
--- a/src/pages/company/task/index.jsx
+++ b/src/pages/company/task/index.jsx
@@ -251,9 +251,7 @@ const TaskPage = () => {
      setLoading(true);
      const newAttributes = JSON.parse(JSON.stringify(record.attributes));
      
-      // 修改任务名称，添加"副本"标识
      newAttributes.taskName = `${newAttributes.taskName} (副本)`;
-
      const { data, error } = await supabase
        .from("resources")
        .insert([
@@ -261,10 +259,12 @@ const TaskPage = () => {
            type: "task",
            attributes: newAttributes,
          },
-        ]);
-
+        ]).select()
+        if(!data||data?.length===0){
+          message.error('暂无权限');
+          return;
+        };
      if (error) throw error;
-
      message.success("复制成功");
      fetchTasks(); // 刷新列表
    } catch (error) {
@@ -344,7 +344,7 @@ const TaskPage = () => {
            </Tag>
          </Space>
        }
-        className="h-full w-full overflow-auto dark:bg-gray-800 dark:border-gray-700"
+        className="h-full w-full overflow-auto "
        extra={
          <Space>
          <Select
@@ -385,7 +385,7 @@ const TaskPage = () => {
          columns={columns}
          dataSource={tasks}
          rowKey="id"
-          scroll={{ x: true }}
+          scroll={{ x: true}}
          loading={loadingTasks}
          onChange={handleTableChange}
          pagination={{
@@ -423,7 +423,7 @@ const TaskPage = () => {
            type="primary"
            disabled={!selectedTemplateId}
            onClick={handleConfirm}
-            className="gap-2 px-6 rounded-full bg-blue-600 hover:bg-blue-700 dark:bg-blue-600 dark:hover:bg-blue-700"
+            className="gap-2 px-6 rounded-full "
          >
            <AppstoreOutlined /> 使用选中模板
          </Button>,
--- a/src/pages/home/index.jsx
+++ b/src/pages/home/index.jsx
@@ -0,0 +1,11 @@
+import React from 'react';
+
+const Home = () => {
+  return (
+    <div>
+     首页
+    </div>
+  );
+};
+
+export default Home;
--- a/src/pages/marketing/campaign/index.jsx
+++ b/src/pages/marketing/campaign/index.jsx
@@ -1,8 +0,0 @@
-import React from 'react';
-import { Outlet } from 'react-router-dom';
-
-const MarketingCampaign = () => {
-  return <Outlet />;
-};
-
-export default MarketingCampaign;
--- a/src/pages/marketing/campaign/performance/index.jsx
+++ b/src/pages/marketing/campaign/performance/index.jsx
@@ -1,34 +0,0 @@
-import React from 'react';
-import { Card, DatePicker } from 'antd';
-import { LineChart, Line, XAxis, YAxis, CartesianGrid, Tooltip, Legend, ResponsiveContainer } from 'recharts';
-
-const CampaignPerformance = () => {
-  const data = [
-    { name: '1月', 点击率: 400, 转化率: 240 },
-    { name: '2月', 点击率: 300, 转化率: 139 },
-    { name: '3月', 点击率: 200, 转化率: 980 },
-  ];
-
-  return (
-    <Card title="活动成效分析">
-      <div className="mb-4">
-        <DatePicker.RangePicker />
-      </div>
-      <div style={{ width: '100%', height: 400 }}>
-        <ResponsiveContainer>
-          <LineChart data={data}>
-            <CartesianGrid strokeDasharray="3 3" />
-            <XAxis dataKey="name" />
-            <YAxis />
-            <Tooltip />
-            <Legend />
-            <Line type="monotone" dataKey="点击率" stroke="#8884d8" />
-            <Line type="monotone" dataKey="转化率" stroke="#82ca9d" />
-          </LineChart>
-        </ResponsiveContainer>
-      </div>
-    </Card>
-  );
-};
-
-export default CampaignPerformance;
--- a/src/pages/marketing/campaign/plan/index.jsx
+++ b/src/pages/marketing/campaign/plan/index.jsx
@@ -1,48 +0,0 @@
-import React from 'react';
-import { Card, Table, Button, Tag } from 'antd';
-import { PlusOutlined } from '@ant-design/icons';
-
-const CampaignPlan = () => {
-  const columns = [
-    {
-      title: '计划名称',
-      dataIndex: 'name',
-      key: 'name',
-    },
-    {
-      title: '开始时间',
-      dataIndex: 'startTime',
-      key: 'startTime',
-    },
-    {
-      title: '结束时间',
-      dataIndex: 'endTime',
-      key: 'endTime',
-    },
-    {
-      title: '状态',
-      dataIndex: 'status',
-      key: 'status',
-      render: status => (
-        <Tag color={status === '进行中' ? 'green' : 'default'}>
-          {status}
-        </Tag>
-      ),
-    },
-  ];
-
-  return (
-    <Card
-      title="活动计划"
-      extra={
-        <Button type="primary" icon={<PlusOutlined />}>
-          新增计划
-        </Button>
-      }
-    >
-      <Table columns={columns} dataSource={[]} rowKey="id" />
-    </Card>
-  );
-};
-
-export default CampaignPlan;
--- a/src/pages/marketing/campaign/project/components/ProjectForm.jsx
+++ b/src/pages/marketing/campaign/project/components/ProjectForm.jsx
@@ -1,45 +0,0 @@
-import React from 'react';
-import { Form, Input, DatePicker, Select } from 'antd';
-import { STATUS } from '@/constants/status';
-
-export const ProjectForm = ({ form }) => (
-  <Form form={form} layout="vertical">
-    <Form.Item
-      name="name"
-      label="专案名称"
-      rules={[{ required: true, message: '请输入专案名称' }]}
-    >
-      <Input />
-    </Form.Item>
-    
-    <Form.Item
-      name="manager"
-      label="负责人"
-      rules={[{ required: true, message: '请选择负责人' }]}
-    >
-      <Select placeholder="请选择负责人" />
-    </Form.Item>
-    
-    <Form.Item
-      name="startDate"
-      label="开始日期"
-      rules={[{ required: true, message: '请选择开始日期' }]}
-    >
-      <DatePicker />
-    </Form.Item>
-    
-    <Form.Item
-      name="status"
-      label="状态"
-      rules={[{ required: true, message: '请选择状态' }]}
-    >
-      <Select>
-        {Object.values(STATUS).map(status => (
-          <Select.Option key={status} value={status}>
-            {status}
-          </Select.Option>
-        ))}
-      </Select>
-    </Form.Item>
-  </Form>
-);
--- a/src/pages/marketing/campaign/project/index.jsx
+++ b/src/pages/marketing/campaign/project/index.jsx
@@ -1,71 +0,0 @@
-import React, { useState } from 'react';
-import { Card, Modal, Form } from 'antd';
-import { PageHeader } from '@/components/common/PageHeader';
-import { BaseTable } from '@/components/common/BaseTable';
-import { ProjectForm } from './components/ProjectForm';
-import { useProjectData } from './hooks/useProjectData';
-import { getStatusColumn, getDateColumn } from '@/utils/tableColumns';
-
-const CampaignProject = () => {
-  const [form] = Form.useForm();
-  const [visible, setVisible] = useState(false);
-  const { loading, data, pagination, loadData } = useProjectData();
-
-  const columns = [
-    {
-      title: '专案名称',
-      dataIndex: 'name',
-      key: 'name',
-    },
-    {
-      title: '负责人',
-      dataIndex: 'manager',
-      key: 'manager',
-    },
-    getDateColumn('开始日期', 'startDate'),
-    getStatusColumn(),
-  ];
-
-  const handleAdd = () => {
-    setVisible(true);
-  };
-
-  const handleSubmit = async () => {
-    try {
-      const values = await form.validateFields();
-      console.log('Success:', values);
-      setVisible(false);
-      form.resetFields();
-      loadData();
-    } catch (error) {
-      console.error('Failed:', error);
-    }
-  };
-
-  return (
-    <Card>
-      <PageHeader 
-        title="行销活动专案" 
-        onAdd={handleAdd}
-        addButtonText="新增专案"
-      />
-      <BaseTable 
-        columns={columns}
-        dataSource={data}
-        loading={loading}
-        pagination={pagination}
-        onChange={loadData}
-      />
-      <Modal
-        title="新增专案"
-        open={visible}
-        onOk={handleSubmit}
-        onCancel={() => setVisible(false)}
-      >
-        <ProjectForm form={form} />
-      </Modal>
-    </Card>
-  );
-};
-
-export default CampaignProject;
--- a/src/pages/marketing/communication/index.jsx
+++ b/src/pages/marketing/communication/index.jsx
@@ -1,8 +0,0 @@
-import React from 'react';
-import { Outlet } from 'react-router-dom';
-
-const Communication = () => {
-  return <Outlet />;
-};
-
-export default Communication;
--- a/src/pages/marketing/communication/journey/index.jsx
+++ b/src/pages/marketing/communication/journey/index.jsx
@@ -1,40 +0,0 @@
-import React from 'react';
-import { Card, Timeline, Button } from 'antd';
-import { ClockCircleOutlined } from '@ant-design/icons';
-
-const CommunicationJourney = () => {
-  return (
-    <Card 
-      title="沟通历程"
-      extra={
-        <Button type="primary">导出记录</Button>
-      }
-    >
-      <Timeline
-        mode="alternate"
-        items={[
-          {
-            children: '创建营销活动 2023-10-25 10:00:00',
-          },
-          {
-            children: '发送邮件通知 2023-10-25 10:30:00',
-            color: 'green',
-          },
-          {
-            dot: <ClockCircleOutlined style={{ fontSize: '16px' }} />,
-            children: '客户查看邮件 2023-10-25 11:00:00',
-          },
-          {
-            color: 'red',
-            children: '系统提醒跟进 2023-10-25 14:00:00',
-          },
-          {
-            children: '完成跟进 2023-10-25 16:00:00',
-          },
-        ]}
-      />
-    </Card>
-  );
-};
-
-export default CommunicationJourney;
--- a/src/pages/marketing/communication/list/index.jsx
+++ b/src/pages/marketing/communication/list/index.jsx
@@ -1,48 +0,0 @@
-import React from 'react';
-import { Card, Table, Button, Input } from 'antd';
-import { PlusOutlined } from '@ant-design/icons';
-
-const { Search } = Input;
-
-const CommunicationList = () => {
-  const columns = [
-    {
-      title: '名单名称',
-      dataIndex: 'name',
-      key: 'name',
-    },
-    {
-      title: '联系人数量',
-      dataIndex: 'contactCount',
-      key: 'contactCount',
-    },
-    {
-      title: '创建日期',
-      dataIndex: 'createdAt',
-      key: 'createdAt',
-    },
-    {
-      title: '更新日期',
-      dataIndex: 'updatedAt',
-      key: 'updatedAt',
-    },
-  ];
-
-  return (
-    <Card
-      title="名单管理"
-      extra={
-        <Button type="primary" icon={<PlusOutlined />}>
-          新增名单
-        </Button>
-      }
-    >
-      <div className="mb-4">
-        <Search placeholder="搜索名单" allowClear enterButton />
-      </div>
-      <Table columns={columns} dataSource={[]} rowKey="id" />
-    </Card>
-  );
-};
-
-export default CommunicationList;
--- a/src/pages/marketing/communication/preview/index.jsx
+++ b/src/pages/marketing/communication/preview/index.jsx
@@ -1,42 +0,0 @@
-import React from 'react';
-import { Card, Tabs, Button } from 'antd';
-import { SendOutlined } from '@ant-design/icons';
-
-const CommunicationPreview = () => {
-  const items = [
-    {
-      key: '1',
-      label: '邮件预览',
-      children: (
-        <div className="p-4 border rounded">
-          <h2>邮件主题</h2>
-          <div className="mt-4">邮件内容预览区域</div>
-        </div>
-      ),
-    },
-    {
-      key: '2',
-      label: '短信预览',
-      children: (
-        <div className="p-4 border rounded">
-          <div className="mt-4">短信内容预览区域</div>
-        </div>
-      ),
-    },
-  ];
-
-  return (
-    <Card
-      title="消息预览"
-      extra={
-        <Button type="primary" icon={<SendOutlined />}>
-          发送测试
-        </Button>
-      }
-    >
-      <Tabs items={items} />
-    </Card>
-  );
-};
-
-export default CommunicationPreview;
--- a/src/pages/marketing/index.jsx
+++ b/src/pages/marketing/index.jsx
@@ -1,8 +0,0 @@
-import React from 'react';
-import { Outlet } from 'react-router-dom';
-
-const MarketingCenter = () => {
-  return <Outlet />;
-};
-
-export default MarketingCenter;
--- a/src/pages/marketing/template/index.jsx
+++ b/src/pages/marketing/template/index.jsx
@@ -1,43 +0,0 @@
-import React from 'react';
-import { Card, Table, Button } from 'antd';
-import { PlusOutlined } from '@ant-design/icons';
-
-const TemplatePage = () => {
-  const columns = [
-    {
-      title: '模版名称',
-      dataIndex: 'name',
-      key: 'name',
-    },
-    {
-      title: '类型',
-      dataIndex: 'type',
-      key: 'type',
-    },
-    {
-      title: '创建日期',
-      dataIndex: 'createdAt',
-      key: 'createdAt',
-    },
-    {
-      title: '状态',
-      dataIndex: 'status',
-      key: 'status',
-    },
-  ];
-
-  return (
-    <Card
-      title="模版管理"
-      extra={
-        <Button type="primary" icon={<PlusOutlined />}>
-          新增模版
-        </Button>
-      }
-    >
-      <Table columns={columns} dataSource={[]} rowKey="id" />
-    </Card>
-  );
-};
-
-export default TemplatePage;
--- a/src/pages/resource/resourceTask/edit/index.jsx
+++ b/src/pages/resource/resourceTask/edit/index.jsx
@@ -261,7 +261,7 @@ const ResourceTaskForm = () => {
            bordered={false}
          >
            <Table
-              scroll={{ x: true }}
+              scroll={{ x: true}}
              dataSource={dataSource}
              columns={columns}
              pagination={false}
--- a/src/pages/resource/resourceTask/index.jsx
+++ b/src/pages/resource/resourceTask/index.jsx
@@ -148,7 +148,7 @@ const ResourceTask = () => {
      }
    >
      <Table
-        scroll={{ x: true }}
+        scroll={{ x: true}}
        columns={columns}
        dataSource={quotations}
        rowKey="id"
--- a/src/pages/resource/role/index.jsx
+++ b/src/pages/resource/role/index.jsx
@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Card, App, Table, Button, Modal, Form, Select, message, Input, Divider } from 'antd';
+import { Card, App, Table, Button, Modal, Form, Select, message, Input, Divider, Popconfirm } from 'antd';
 import { PlusOutlined, DeleteOutlined, EditOutlined } from '@ant-design/icons';
 import { supabase } from '@/config/supabase';

@@ -366,23 +366,31 @@ export default function PermissionManagement() {
    {
      title: '操作',
      key: 'operation',
+      fixed: 'right',
      render: (_, record) => (
        <div className="space-x-2">
          <Button
-            type="text"
+           type="link"
            icon={<EditOutlined />}
            onClick={() => {
              setModalType('edit');
              form.setFieldsValue(record);
              setModalVisible(true);
            }}
-          />
-          <Button
-            type="text"
-            danger
-            icon={<DeleteOutlined />}
-            onClick={() => handleDelete(record.id)}
-          />
+          >编辑</Button>
+          <Popconfirm
+            title="确认删除"
+            description="确定要删除这条权限记录吗？"
+            okText="确认"
+            cancelText="取消"
+            onConfirm={() => handleDelete(record.id)}
+          >
+            <Button
+             type="link"
+              danger
+              icon={<DeleteOutlined />}
+            >删除</Button>
+          </Popconfirm>
        </div>
      ),
    },
@@ -515,7 +523,7 @@ export default function PermissionManagement() {

  return (
    <App>
-      <Card title="权限管理" bordered={false}>
+      <Card title="权限管理" >
        <RoleHeader 
          onAdd={() => {
            setModalType('add');
@@ -531,12 +539,14 @@ export default function PermissionManagement() {
        />
        
        <Table
+          scroll={{ x: true}}
          columns={columns}
          dataSource={permissions}
          rowKey="id"
          loading={loading}
          pagination={pagination}
          onChange={handleTableChange}
+          className='w-full'
        />

        <Modal
--- a/src/pages/resource/team/components/MembershipTable.jsx
+++ b/src/pages/resource/team/components/MembershipTable.jsx
@@ -212,7 +212,7 @@ export const MembershipTable = ({ memberships, onUpdate, onDelete, onAdd }) => {
      </Button>
      <Form form={form} component={false}>
        <Table
-          scroll={{ x: true }}
+          scroll={{ x: true}}
          components={{
            body: {
              cell: EditableMembershipCell,
--- a/src/pages/resource/team/components/TeamTable.jsx
+++ b/src/pages/resource/team/components/TeamTable.jsx
@@ -106,6 +106,7 @@ export const TeamTable = ({ tableLoading,pagination,dataSource, onTableChange,on
      title: '操作',
      key: 'action',
      width: 180,
+      fixed: 'right',
      render: (_, record) => {
        const editable = isEditing(record);
        return editable ? (
@@ -180,7 +181,7 @@ export const TeamTable = ({ tableLoading,pagination,dataSource, onTableChange,on
  return (
    <Form form={form} component={false}>
      <Table
-      scroll={{ x: true }}
+      scroll={{ x: true}}
      pagination={pagination}
        loading={loading||tableLoading}
        components={{
--- a/src/pages/resource/team/index.jsx
+++ b/src/pages/resource/team/index.jsx
@@ -183,7 +183,7 @@ const TeamManagement = () => {

  return (
    <App>
-      <Card title="团队管理" bordered={false}>
+      <Card title="团队管理" >
        <TeamHeader onSearch={handleSearch} onAdd={handleAdd} />
        <TeamTable 
          loading={loading}
--- a/src/routes/AppRoutes.jsx
+++ b/src/routes/AppRoutes.jsx
@@ -68,8 +68,8 @@ const AppRoutes = () => {
      <Route 
        path="/login" 
        element={
-          user?.id && user.menukeys?.includes('company/serviceTemplate') ? (
-            <Navigate to="/company/serviceTemplate" replace />
+          user?.id ? (
+            <Navigate to="/home" replace />
          ) : (
            <Login />
          )
@@ -84,10 +84,9 @@ const AppRoutes = () => {
          </ProtectedRoute>
        }
      >
-        {/* 默认重定向到服务管理页面 */}
        <Route 
          index 
-          element={<Navigate to="/company/serviceTemplate" replace />} 
+          element={<Navigate to="/home" replace />} 
        />
        {renderRoutes(allRoutes)}
        <Route path="*" element={<NotFound />} />
--- a/src/routes/routes.js
+++ b/src/routes/routes.js
@@ -1,7 +1,13 @@
 import { lazy } from "react";

-// 所有可用的路由配置
 export const allRoutes = [
+  {
+    path: "/home",
+    component: lazy(() => import("@/pages/home")),
+    name: "首页",
+    hidden: true,
+    key: "home",
+  },
  {
    path: "dashboard",
    component: lazy(() => import("@/pages/Dashboard")),
@@ -76,13 +82,23 @@ export const allRoutes = [
        key: "company/quotaInfo",
      },
      {
+<<<<<<< HEAD
        path: "quotaInfo/preview/:id?", // 添加可选的 id 参数
+=======
+        path: "quotaInfo/preview/:id?",
+>>>>>>> 8dccf8e554eefcfa832eca45be35be4dddad3cb8
        hidden: true,
        component: lazy(() => import("@/pages/company/quotation/view")),
        name: "报价单预览",
        icon: "file",
+<<<<<<< HEAD
        key:'company/quotaInfo/preview'
      },
+=======
+        key: "company/quotaInfo/preview",
+      },
+      
+>>>>>>> 8dccf8e554eefcfa832eca45be35be4dddad3cb8
      {
        path: "project",
        component: lazy(() => import("@/pages/company/project")),
@@ -119,7 +135,10 @@ export const allRoutes = [
        name: "服务模版详情",
        icon: "container",
        key: "company/serviceTemplateInfo",
+<<<<<<< HEAD

+=======
+>>>>>>> 8dccf8e554eefcfa832eca45be35be4dddad3cb8
      },
      {
        path: "supplier",
@@ -157,7 +176,11 @@ export const allRoutes = [
        component: lazy(() => import("@/pages/company/service/itemsManange")),
        name: "资源类型",
        icon: "container",
+<<<<<<< HEAD
        key:'company/templateItemManage'
+=======
+        key: "company/templateItem",
+>>>>>>> 8dccf8e554eefcfa832eca45be35be4dddad3cb8
      },
    ]
  }
--- a/src/styles/main.scss
+++ b/src/styles/main.scss
@@ -5,6 +5,7 @@


 :root {
+  // Light mode colors
  --primary-color: #1677ff;
  --primary-gradient: linear-gradient(45deg, #1677ff, #36cff0);
  --success-color: #52c41a;
@@ -12,6 +13,25 @@
  --error-color: #ff4d4f;
  --font-family: 'Poppins', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial,
    'Noto Sans', sans-serif;
+    
+  // Google-style scrollbar colors (Light mode)
+  --scrollbar-thumb: rgba(0, 0, 0, .2);
+  --scrollbar-thumb-hover: rgba(0, 0, 0, .4);
+  --scrollbar-track: transparent;
+}
+
+:root.dark {
+  // Dark mode colors
+  --primary-color: #4f9eff;  // 更亮的蓝色适配暗色模式
+  --primary-gradient: linear-gradient(45deg, #4f9eff, #60deff);
+  --success-color: #6ede3b;
+  --warning-color: #ffc53d;
+  --error-color: #ff7875;
+  
+  // Google-style scrollbar colors (Dark mode)
+  --scrollbar-thumb: rgba(255, 255, 255, .2);
+  --scrollbar-thumb-hover: rgba(255, 255, 255, .4);
+  --scrollbar-track: transparent;
 }

 body {
@@ -152,42 +172,36 @@ body {
  }
 }

-/* 滚动条基础样式 */
+/* 自定义滚动条样式 */
 ::-webkit-scrollbar {
  width: 8px;
-  /* 垂直滚动条宽度 */
  height: 8px;
-  /* 水平滚动条高度 */
 }

-/* 亮色模式滚动条样式 */
 ::-webkit-scrollbar-track {
-  @apply bg-gray-100;
-  /* 轨道背景色 */
+  background: var(--scrollbar-track);
 }

 ::-webkit-scrollbar-thumb {
-  @apply bg-gray-300 rounded-full hover:bg-gray-400 transition-colors;
-  /* 滑块样式 */
+  background-color: var(--scrollbar-thumb);
+  border-radius: 4px;
+  transition: background-color 0.2s ease;
 }

-/* 暗色模式滚动条样式 */
-.dark {
-  ::-webkit-scrollbar-track {
-    @apply bg-gray-800;
-    /* 暗色模式轨道背景 */
-  }
-
-  ::-webkit-scrollbar-thumb {
-    @apply bg-gray-600 hover:bg-gray-500;
-    /* 暗色模式滑块样式 */
-  }
+::-webkit-scrollbar-thumb:hover {
+  background-color: var(--scrollbar-thumb-hover);
 }

 /* Firefox 滚动条样式 */
 * {
  scrollbar-width: thin;
-  scrollbar-color: theme('colors.gray.300') theme('colors.gray.100');
+  scrollbar-color: var(--scrollbar-thumb) var(--scrollbar-track);
+}
+
+@media (prefers-color-scheme: dark) {
+  * {
+    scrollbar-color: rgba(255, 255, 255, 0.2) transparent;
+  }
 }

 .dark * {
--- a/src/utils/menuUtils.jsx
+++ b/src/utils/menuUtils.jsx
@@ -39,7 +39,7 @@ const generateMenuItems = (routes, menuKeys = [], parentPath = "") => {
      const icon = route.icon && <ColorIcon icon={getAntIcon(route.icon)} />;

      const menuItem = {
-        key: route.key,  // 使用 key 而不是 fullPath
+        key: fullPath,
        icon,
        label: route.name,
      };