完善卷宗和合同的数据隔离的效果

app/api/evaluation_points/reviews.ts

@@ -58,6 +58,7 @@ interface AuditStatus {
   document_id: string | number;
   evaluation_point_id: string | number;
   edit_audit_status: number;
+  message: string;
   [key: string]: unknown;
 }
 
@@ -205,13 +206,13 @@ export async function getReviewPoints(fileId: string) {
     const manualReviewPointsData = extractApiData<AuditStatus[]>(manualReviewPointsResponse.data);
     
     // 构建评查点ID到editAuditStatus的映射
-    const editAuditStatusMap = new Map<string | number, {id: string | number, status: number}>();
+    const editAuditStatusMap = new Map<string | number, {id: string | number, status: number, message: string}>();
     
     // 如果有查询结果，则根据evaluation_point_id索引到对应数据
     if (manualReviewPointsData && Array.isArray(manualReviewPointsData)) {
         manualReviewPointsData.forEach(auditStatus => {
             if (auditStatus.evaluation_point_id && auditStatus.edit_audit_status !== undefined) {
-                editAuditStatusMap.set(auditStatus.evaluation_point_id, {id: auditStatus.id, status: auditStatus.edit_audit_status});
+                editAuditStatusMap.set(auditStatus.evaluation_point_id, {id: auditStatus.id, status: auditStatus.edit_audit_status, message: auditStatus.message});
             }
         });
     }
@@ -220,7 +221,7 @@ export async function getReviewPoints(fileId: string) {
     if (manualReviewPointsIds.length > 0) {
         manualReviewPointsIds.forEach(pointId => {
             if (!editAuditStatusMap.has(pointId)) {
-                editAuditStatusMap.set(pointId, {id: '', status: 0});
+                editAuditStatusMap.set(pointId, {id: '', status: 0, message: ''});
             }
         });
     }
@@ -247,7 +248,7 @@ export async function getReviewPoints(fileId: string) {
     const resultData: ReviewPointResult[] = evaluationResultsData.map(result => {
         const point = pointsMap.get(result.evaluation_point_id) || {} as EvaluationPoint;
         const group = groupsMap.get(point.evaluation_point_groups_id || 0) || {} as EvaluationPointGroup;
-        const editAuditStatus = editAuditStatusMap.get(result.evaluation_point_id) || {id: '', status: 0};
+        const editAuditStatus = editAuditStatusMap.get(result.evaluation_point_id) || {id: '', status: 0, message: ''};
 
         // 评查结果内容改成由evaluated_point_results_log中获取
         const evaluatedPointResultsLog = result.evaluated_point_results_log || {};
@@ -304,6 +305,7 @@ export async function getReviewPoints(fileId: string) {
           pointId: point.id,
           editAuditStatusId: editAuditStatus.id,
           editAuditStatus: editAuditStatus.status,
+          editAuditStatusMessage: editAuditStatus.message,
           title: message,
           pointName: point.name || '',
           groupName: group.name || '',
@@ -667,8 +669,8 @@ export async function updateReviewResult(resultId: string, editAuditStatusId: st
     // 构建要更新的数据，保留原有字段
     const updatedEvaluatedResults = {
       ...currentEvaluatedResults,
-      // 如果是重新审核操作，不更新result，只更新message
+      // 如果是重新审核操作，不更新result和message
-      ...(isReview ? { message } : { result: result === 'true' ? true : false, message }),
+      ...(isReview ? {} : { result: result === 'true' ? true : false, message }),
     };
     
     const updatedData = {
@@ -696,7 +698,11 @@ export async function updateReviewResult(resultId: string, editAuditStatusId: st
       // 更新现有审核状态记录
       const auditStatusResponse = await postgrestPut(
         'audit_status',
-        { edit_audit_status: editAuditStatusValue },
+        { 
+          edit_audit_status: editAuditStatusValue,
+          // 重新审核时不更新message
+          ...(isReview ? {} : { message })
+        },
         { id: editAuditStatusId }
       );
       
@@ -714,7 +720,8 @@ export async function updateReviewResult(resultId: string, editAuditStatusId: st
         document_id: documentId,
         evaluation_point_id: evaluationPointId,
         evaluation_result_id: resultId,
-        edit_audit_status: editAuditStatusValue
+        edit_audit_status: editAuditStatusValue,
+        message: isReview ? '' : message
       };
       
       // 使用postgrestPost创建新记录

app/api/evaluation_points/rules-files.ts

@@ -267,11 +267,12 @@ export async function getReviewFiles(searchParams: DocumentSearchParams = {}): P
     
     // 处理文件类型筛选
     if (searchParams.fileType) {
+      // console.log('API处理文件类型筛选:', searchParams.fileType);
       // 特殊处理 'record' 类型，表示 type_id 为 2 或 3
       if (searchParams.fileType === 'record') {
         filter['type_id'] = 'in.(2,3)';
       } else {
-        filter['type_id'] = `eq.${searchParams.fileType}`;
+        filter['type_id'] = `eq.${Number(searchParams.fileType)}`;
       }
     }
     
@@ -319,7 +320,7 @@ export async function getReviewFiles(searchParams: DocumentSearchParams = {}): P
     // }
     
     params.filter = filter;
-    // console.log('params-----',params);
+    // console.log('API请求参数:', params);
     
     // 发送API请求获取文档列表
     const response = await postgrestGet<Document[]>('documents', params);

app/api/evaluation_points/rules.ts

@@ -34,6 +34,7 @@ export interface RulesQueryParams {
   keyword?: string;
   orderBy?: string;
   orderDirection?: 'asc' | 'desc';
+  reviewType?: string; // 添加 reviewType 参数，值为 contract 或 record
 }
 
 /**
@@ -162,7 +163,8 @@ export async function getRulesList(params: RulesQueryParams): Promise<{data: Rul
       isActive, 
       keyword,
       orderBy = 'created_at',
-      orderDirection = 'desc'
+      orderDirection = 'desc',
+      reviewType
     } = params;
     
     // 构建PostgrestParams参数
@@ -204,6 +206,46 @@ export async function getRulesList(params: RulesQueryParams): Promise<{data: Rul
       postgrestParams.filter!['is_enabled'] = `eq.${isActive}`;
     }
     
+    // 根据reviewType添加过滤条件
+    if (reviewType) {
+      try {
+        // 先获取所有评查点组数据，用于找到对应的pid
+        const groupsAllResponse = await postgrestGet<{code: number; msg: string; data: Array<{id: number; pid: number}>}>('evaluation_point_groups', {
+          select: 'id,pid'
+        });
+        
+        let groups: Array<{id: number; pid: number}> = [];
+        
+        if (!groupsAllResponse.error) {
+          if (groupsAllResponse.data && 'code' in groupsAllResponse.data && groupsAllResponse.data.data) {
+            groups = groupsAllResponse.data.data;
+          } else if (Array.isArray(groupsAllResponse.data)) {
+            groups = groupsAllResponse.data;
+          }
+        }
+        
+        // 根据reviewType过滤pid
+        let pidList: number[] = [];
+        
+        if (reviewType === 'contract') {
+          // 合同类型，找到所有pid=3的评查点组
+          const contractGroups = groups.filter(g => g.pid === 3).map(g => g.id);
+          pidList = contractGroups;
+        } else if (reviewType === 'record') {
+          // 卷宗类型，找到所有pid=1或pid=2的评查点组
+          const recordGroups = groups.filter(g => g.pid === 1 || g.pid === 2).map(g => g.id);
+          pidList = recordGroups;
+        }
+        
+        // 如果有过滤的组id，则添加到查询条件中
+        if (pidList.length > 0) {
+          postgrestParams.filter!['evaluation_point_groups_id'] = `in.(${pidList.join(',')})`;
+        }
+      } catch (error) {
+        console.error('获取评查点组数据出错:', error);
+      }
+    }
+    
     // 如果指定了评查点类型ID，需要先查询该类型下的所有规则组ID
     if (ruleType) {
       try {
@@ -790,9 +832,10 @@ export interface RuleGroup {
 
 /**
  * 获取评查点类型列表
+ * @param reviewType 评查类型，contract表示合同，record表示卷宗
  * @returns 评查点类型列表
  */
-export async function getRuleTypes(): Promise<{data: RuleType[]; error?: never} | {data?: never; error: string; status?: number}> {
+export async function getRuleTypes(reviewType?: string): Promise<{data: RuleType[]; error?: never} | {data?: never; error: string; status?: number}> {
   try {
     // 构建PostgrestParams参数
     const postgrestParams: PostgrestParams = {
@@ -810,6 +853,15 @@ export async function getRuleTypes(): Promise<{data: RuleType[]; error?: never}
       }
     };
     
+    // 根据 reviewType 添加过滤条件
+    if (reviewType === 'contract') {
+      // 如果是合同类型，只加载id=3的评查点类型
+      postgrestParams.filter!['id'] = 'eq.3';
+    } else if (reviewType === 'record') {
+      // 如果是卷宗类型，只加载id=1和id=2的评查点类型
+      postgrestParams.filter!['id'] = 'in.(1,2)';
+    }
+    
     // 发送请求获取评查点类型列表
     const response = await postgrestGet<{code: number; msg: string; data: Array<{
       id: number;

app/components/layout/Layout.tsx

@@ -73,7 +73,7 @@ export function Layout({ children, userRole = 'developer' }: LayoutProps) {
     if (typeof window !== 'undefined') {
       try {
         const reviewType = sessionStorage.getItem('reviewType');
-        console.log('Layout 路由变化, reviewType:', reviewType, '路径:', location.pathname);
+        // console.log('Layout 路由变化, reviewType:', reviewType, '路径:', location.pathname);
         if (reviewType && REVIEW_TYPE_TO_APP[reviewType]) {
           setSelectedApp(REVIEW_TYPE_TO_APP[reviewType]);
         }

app/components/layout/Sidebar.tsx

@@ -147,13 +147,13 @@ export function Sidebar({ onToggle, collapsed, userRole, selectedApp = 'contract
           path: '/rules-files',
           icon: 'ri-list-check-2'
         },
-        {
+        // {
-          id: 'rule-new',
+        //   id: 'rule-new',
-          title: '新增评查点',
+        //   title: '新增评查点',
-          path: '/rules-new',
+        //   path: '/rules-new',
-          requiredRole: 'developer',
+        //   requiredRole: 'developer',
-          icon: 'ri-add-circle-line'
+        //   icon: 'ri-add-circle-line'
-        },
+        // },
         // {
         //   id: 'review-detail',
         //   title: '评查详情',

app/components/reviews/ReviewPointsList.tsx

@@ -78,6 +78,7 @@ export interface ReviewPoint {
   pointId?: string;
   editAuditStatusId?: string | number;
   editAuditStatus: number;
+  editAuditStatusMessage?: string; // 添加审核意见字段
   pointName: string;
   title: string;
   groupName: string;
@@ -354,19 +355,12 @@ export function ReviewPointsList({
 
   // 初始化建议文本
   useEffect(() => {
-    // 将所有评查点的建议文本存储到状态中
-    const suggestions: Record<string, string> = {};
-
-    reviewPoints.forEach(point => {
-      suggestions[point.id] = point.suggestion || '';
-    });
-    // setSuggestionTexts(suggestions);
-
     // 使用函数式更新，不再需要外部 manualReviewNotes 变量
     setManualReviewNotes(prev => {
       const notes = { ...prev };
       reviewPoints.forEach(point => {
-        notes[point.id] = point.actionContent || '';
+        // 优先使用editAuditStatusMessage，如果为空则使用actionContent或suggestion
+        notes[point.id] = point.editAuditStatusMessage || point.actionContent || point.suggestion || '';
       });
       return notes;
     });
@@ -388,37 +382,33 @@ export function ReviewPointsList({
    * @param message 用户输入的审核内容
    */
   const handleReviewAction = (reviewPointResultId: string, editAuditStatusId: string | number | undefined, action: 'approve' | 'reject' | 'review', message: string) => {
-    // 更新评查点状态
+    // 通过/不通过时，必须有输入内容
-    // console.log('handleReviewAction-------', reviewPointResultId, editAuditStatusId, action, message);
+    if(action !== 'review' && message.trim() === ''){
-    if(message.trim() === ''){
       toastService.error('请输入审核意见');
       return;
     }
+    
     if (action === 'review') {
-      // 重新审核时，不更新结果状态，只更新审核意见和审核状态
+      // 重新审核时，不更新结果状态，也不更新审核意见和审核状态
-      // console.log('重新审核-------', reviewPointResultId, editAuditStatusId || '', 'review', message);
       onStatusChange(reviewPointResultId, editAuditStatusId || '', 'review', message);
       
       // 找到当前评查点并更新其editAuditStatus为0，使其立即显示通过/不通过按钮
       const updatedReviewPoint = reviewPoints.find(point => point.id === reviewPointResultId);
       if (updatedReviewPoint) {
         updatedReviewPoint.editAuditStatus = 0;
+        // 重新审核时不更新输入框内容
       }
     } else {
       // 通过/不通过时，更新结果状态和审核意见
-      // console.log('通过/不通过-------', reviewPointResultId, editAuditStatusId || '', action === 'approve' ? 'true' : 'false', message);
       onStatusChange(reviewPointResultId, editAuditStatusId || '', action === 'approve' ? 'true' : 'false', message);
+      
+      // 找到当前评查点并立即更新其editAuditStatusMessage
+      const updatedReviewPoint = reviewPoints.find(point => point.id === reviewPointResultId);
+      if (updatedReviewPoint) {
+        updatedReviewPoint.editAuditStatusMessage = message;
+      }
     }
 
-    // 将参数输出到控制台
-    // console.log('评查点审核操作', {
-    //   id: reviewPointResultId,
-    //   editAuditStatusId: editAuditStatusId,
-    //   action: action,
-    //   content: message,
-    //   status: action === 'approve' ? 'true' : (action === 'reject' ? 'false' : 'review')
-    // });
-
     // 清除编辑状态
     setEditingReviewPoint(null);
   };
@@ -2008,10 +1998,11 @@ export function ReviewPointsList({
                 <div className="mb-3">
                   <textarea
                     id={`manual-review-${reviewPoint.id}`}
-                    className="w-full p-2 border rounded bg-white text-xs min-h-[80px] focus:outline-none focus:border-primary"
+                    className={`w-full p-2 border rounded text-xs min-h-[80px] focus:outline-none ${reviewPoint.editAuditStatus !== 0 ? 'bg-gray-100 cursor-not-allowed' : 'bg-white'} focus:border-[#00684a] focus:shadow-[0_0_0_2px_rgba(0,104,74,0.2)]`}
-                    placeholder="请输入重新审核意见..."
+                    placeholder="请输入审核意见..."
                     value={manualReviewNotes[reviewPoint.id] || ''}
                     onChange={(e) => handleNoteChange(reviewPoint.id, e.target.value)}
+                    disabled={reviewPoint.editAuditStatus !== 0}
                   ></textarea>
                 </div>
 
@@ -2034,7 +2025,7 @@ export function ReviewPointsList({
                   ) : (
                     <button
                       className="bg-purple-600 hover:bg-purple-700 text-sm text-white py-1 px-2 rounded-md flex items-center justify-center"
-                      onClick={() => handleReviewAction(reviewPoint.id, reviewPoint.editAuditStatusId, 'review', note)}
+                      onClick={() => handleReviewAction(reviewPoint.id, reviewPoint.editAuditStatusId, 'review', '')}
                     >
                       <i className="ri-refresh-line mr-1"></i> 重新审核
                     </button>
@@ -2138,9 +2129,10 @@ export function ReviewPointsList({
               </div>
               <textarea
                 value={manualReviewNotes[reviewPoint.id] || ''}
-                placeholder={reviewPoint.postAction === 'manual' ? "请输入审核意见(可选)..." : "请输入建议修改内容..."}
+                placeholder={reviewPoint.postAction === 'manual' ? "请输入审核意见..." : "请输入建议修改内容..."}
                 onChange={(e) => handleManualReviewNotesChange(reviewPoint.id, e.target.value)}
-                className="text-xs w-full p-2 border rounded bg-white min-h-[100px] focus:outline-none focus:border-[#00684a] focus:shadow-[0_0_0_2px_rgba(0,104,74,0.2)]"
+                disabled={reviewPoint.editAuditStatus !== 0}
+                className={`text-xs w-full p-2 border rounded ${reviewPoint.editAuditStatus !== 0 ? 'bg-gray-100 cursor-not-allowed' : 'bg-white'} min-h-[100px] focus:outline-none focus:border-[#00684a] focus:shadow-[0_0_0_2px_rgba(0,104,74,0.2)]`}
               />
             </div>
           )}
@@ -2186,8 +2178,8 @@ export function ReviewPointsList({
                   <button
                     className="bg-purple-600 hover:bg-purple-700 text-white py-1 px-2 rounded-md text-sm"
                     onClick={() => {
-                      const note = manualReviewNotes[reviewPoint.id] || '';
+                      // 重新审核时不传递message
-                      handleReviewAction(reviewPoint.id, reviewPoint.editAuditStatusId, 'review', note);
+                      handleReviewAction(reviewPoint.id, reviewPoint.editAuditStatusId, 'review', '');
                     }}
                   >
                     <i className="ri-refresh-line mr-1"></i> 重新审核

app/routes/files.upload.tsx

@@ -340,6 +340,17 @@ export default function FilesUpload() {
         // 根据 reviewType 过滤文档类型和文档列表
         filterDocumentTypes(storedReviewType, loaderData.documentTypes);
         filterDocuments(storedReviewType);
+        
+        // 如果reviewType是contract，自动选择合同文档类型
+        if (storedReviewType === 'contract') {
+          // 查找ID为1的合同文档类型
+          const contractType = loaderData.documentTypes.find(type => type.id === 1);
+          if (contractType) {
+            setFileType(contractType.id.toString());
+            // 清除可能存在的文件类型错误
+            setFileTypeError(null);
+          }
+        }
       }
     } catch (error) {
       console.error('获取 sessionStorage 中的 reviewType 失败:', error);

app/routes/reviews.tsx

@@ -409,7 +409,8 @@ export default function ReviewDetails() {
             ...point, 
             result: newStatus === 'true' ? true : (newStatus === 'false' ? false : point.result),
             editAuditStatus: boolResult === 'review' ? 0 : 1,
-            title: message 
+            title: boolResult === 'review' ? point.title : message,
+            editAuditStatusMessage: boolResult === 'review' ? point.editAuditStatusMessage : message
           } : point
         );
         

app/routes/rules-files.tsx

@@ -7,8 +7,8 @@ import { FileIcon } from "~/components/ui/FileIcon";
 import { FilterPanel, FilterSelect, SearchFilter, DateRangeFilter } from "~/components/ui/FilterPanel";
 import { Pagination } from "~/components/ui/Pagination";
 import { Table } from "~/components/ui/Table";
-import { Tag } from "~/components/ui/Tag";
 import { StatusBadge } from "~/components/ui/StatusBadge";
+import { FileTypeTag, links as fileTypeTagLinks } from "~/components/ui/FileTypeTag";
 import rulesFilesStyles from "~/styles/pages/rules-files.css?url";
 import { 
   getReviewFiles, 
@@ -22,7 +22,8 @@ import { toastService } from "~/components/ui/Toast";
 import { downloadFile } from "~/api/axios-client";
 
 export const links = () => [
-  { rel: "stylesheet", href: rulesFilesStyles }
+  { rel: "stylesheet", href: rulesFilesStyles },
+  ...fileTypeTagLinks()
 ];
 
 export const handle = {
@@ -153,10 +154,11 @@ export default function RulesFiles() {
     try {
       if (typeof window !== 'undefined') {
         const storedReviewType = sessionStorage.getItem('reviewType');
-        setReviewType(storedReviewType);
         
         // 根据 reviewType 过滤文档类型选项
         if (storedReviewType) {
+          setReviewType(storedReviewType);
+          
           if (storedReviewType === 'contract') {
             // 只保留 id=1 的选项
             const filteredTypes = allDocumentTypes.filter((type: {id: number}) => type.id === 1);
@@ -167,14 +169,57 @@ export default function RulesFiles() {
             setDocumentTypes(filteredTypes);
           }
           
-          // 加载数据
+          // 直接使用 storedReviewType 构建搜索参数
-          fetchData(Object.fromEntries(searchParams.entries()));
+          const currentParams = Object.fromEntries(searchParams.entries());
+          const apiSearchParams: DocumentSearchParams = {
+            fileType: currentParams.fileType || undefined,
+            reviewStatus: currentParams.reviewStatus || undefined,
+            dateFrom: currentParams.dateFrom || undefined,
+            dateTo: currentParams.dateTo || undefined,
+            keyword: currentParams.keyword || undefined,
+            sortOrder: currentParams.sortOrder || 'upload_time_desc',
+            page: parseInt(currentParams.page || "1", 10),
+            pageSize: parseInt(currentParams.pageSize || "10", 10)
+          };
+          
+          // 根据 storedReviewType 添加类型过滤
+          if (storedReviewType === 'contract') {
+            apiSearchParams.fileType = '1';
+          } else if (storedReviewType === 'record') {
+            apiSearchParams.fileType = 'record';
+          }
+          
+          // 如果用户手动选择了文件类型，优先使用用户选择的
+          if (currentParams.fileType) {
+            apiSearchParams.fileType = currentParams.fileType;
+          }
+          
+          // 设置加载状态
+          setIsLoading(true);
+          
+          // 获取文件列表
+          getReviewFiles(apiSearchParams)
+            .then(filesResponse => {
+              if (filesResponse.error) {
+                throw new Error(filesResponse.error);
+              }
+              
+              setFiles(filesResponse.data?.files || []);
+              setTotalCount(filesResponse.data?.total || 0);
+            })
+            .catch(error => {
+              console.error('获取评查文件列表失败:', error);
+              toastService.error('获取评查文件列表失败: ' + (error instanceof Error ? error.message : '未知错误'));
+            })
+            .finally(() => {
+              setIsLoading(false);
+            });
         }
       }
     } catch (error) {
       console.error('获取 sessionStorage 中的 reviewType 失败:', error);
     }
-  }, [allDocumentTypes, fetchData, searchParams]);
+  }, [allDocumentTypes, searchParams]);
 
   // 监听 URL 参数变化，重新获取数据
   useEffect(() => {
@@ -382,12 +427,14 @@ export default function RulesFiles() {
       key: "fileType",
       width: "12%",
       render: (_: unknown, file: ReviewFileUI) => (
-        <Tag 
+        <FileTypeTag 
-          color="blue"
+          type="other" 
-          size="sm"
+          typeName={file.fileType}
-        >
+          text={file.fileType}
-          {file.fileType}
+          size="sm" 
-        </Tag>
+          showIcon={false}
+          colorMode="light"
+        />
       )
     },
     {

app/routes/rules._index.tsx

@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useCallback } from 'react';
 import { type MetaFunction, type LoaderFunctionArgs } from "@remix-run/node";
 import { useLoaderData, useSearchParams, Link, useNavigate, useFetcher, useRouteLoaderData } from "@remix-run/react";
 import { Button } from '~/components/ui/Button';
@@ -45,6 +45,7 @@ export type LoaderData = {
   pageSize: number;
   totalPages: number;
   ruleTypes: ApiRuleType[]; // 添加评查点类型
+  initialLoad?: boolean; // 添加初始加载标志
 };
 
 // API返回的数据映射到前端模型
@@ -90,16 +91,12 @@ export async function loader({ request }: LoaderFunctionArgs) {
   
   // 从 URL 参数中提取查询条件
   const params = {
-    ruleType: url.searchParams.get("ruleType") || undefined,
-    groupId: url.searchParams.get("groupId") || undefined,
-    isActive: url.searchParams.get("isActive") ? url.searchParams.get("isActive") === "true" : undefined,
-    keyword: url.searchParams.get("keyword") || undefined,
     page: parseInt(url.searchParams.get("page") || "1", 10),
     pageSize: parseInt(url.searchParams.get("pageSize") || "10", 10)
   };
   
   try {
-    // 获取评查点类型列表
+    // 获取评查点类型列表，供前端筛选使用
     const typeResponse = await getRuleTypes();
     
     if (typeResponse.error) {
@@ -108,24 +105,14 @@ export async function loader({ request }: LoaderFunctionArgs) {
     
     const ruleTypes = typeResponse.error ? [] : typeResponse.data;
     
-    // 使用API调用获取数据
+    // 返回初始空数据，客户端将根据 sessionStorage 中的 reviewType 加载实际数据
-    const response = await getRulesList(params);
-    
-    // API错误处理集中在rules.ts中，这里只需检查是否有错误
-    if (response.error) {
-      throw new Error(response.error);
-    }
-    
-    const apiRules = response.data?.rules || [];
-    const totalCount = response.data?.totalCount || 0;
-    const rules = apiRules.map((apiRule: ApiRule) => mapApiRuleToModel(apiRule));
-    
     return Response.json({
-      rules,
+      rules: [],
-      totalCount,
+      totalCount: 0,
       currentPage: params.page,
       pageSize: params.pageSize,
-      ruleTypes
+      ruleTypes,
+      initialLoad: true
     }, {
       headers: {
         "Cache-Control": "max-age=60, s-maxage=180"
@@ -180,8 +167,7 @@ const priorityLabels = {
 export default function RulesIndex() {
   const loaderData = useLoaderData<typeof loader>();
   const rootData = useRouteLoaderData("root") as { userRole: UserRole };
-  const { rules, totalCount, currentPage, pageSize } = loaderData;
+  const { rules: initialRules, totalCount: initialTotalCount, currentPage, pageSize, ruleTypes: initialRuleTypes, initialLoad } = loaderData;
-  const ruleTypes = loaderData.ruleTypes || []; // 添加默认空数组避免undefined
   const [searchParams, setSearchParams] = useSearchParams();
   const navigate = useNavigate();
   const fetcher = useFetcher<ActionResponse>();
@@ -189,6 +175,11 @@ export default function RulesIndex() {
   // 状态管理
   const [ruleGroups, setRuleGroups] = useState<RuleGroup[]>([]);
   const [loadingGroups, setLoadingGroups] = useState(false);
+  const [reviewType, setReviewType] = useState<string | null>(null);
+  const [loading, setLoading] = useState(false);
+  const [filteredRules, setFilteredRules] = useState<Rule[]>(initialRules);
+  const [filteredTotalCount, setFilteredTotalCount] = useState<number>(initialTotalCount);
+  const [ruleTypes, setRuleTypes] = useState<ApiRuleType[]>(initialRuleTypes);
   
   // 获取当前的ruleType值
   const ruleTypeParam = searchParams.get('ruleType');
@@ -200,6 +191,37 @@ export default function RulesIndex() {
   const userRole = rootData?.userRole || 'common';
   const isDeveloper = userRole === 'developer';
   
+  // 在组件渲染时初始化状态
+  useEffect(() => {
+    setFilteredRules(initialRules);
+    setFilteredTotalCount(initialTotalCount);
+    setRuleTypes(initialRuleTypes);
+  }, [initialRules, initialTotalCount, initialRuleTypes]);
+  
+  // 在组件挂载时从 sessionStorage 获取 reviewType
+  useEffect(() => {
+    try {
+      if (typeof window !== 'undefined') {
+        const storedReviewType = sessionStorage.getItem('reviewType');
+        if (storedReviewType !== reviewType) {
+          setReviewType(storedReviewType);
+          
+          if (initialLoad) {
+            // 如果是初始加载，立即加载数据
+            // 不需要更新 URL 参数，因为下一步的 loadRulesData 会处理
+          } else {
+            // 如果不是初始加载，更新 URL 参数
+            const newParams = new URLSearchParams(searchParams);
+            newParams.set('page', '1'); // 回到第一页
+            setSearchParams(newParams);
+          }
+        }
+      }
+    } catch (error) {
+      console.error('获取 sessionStorage 中的 reviewType 失败:', error);
+    }
+  }, [reviewType, searchParams, setSearchParams, initialLoad]);
+
   // 使用useEffect监听loaderData.error变化并显示Toast
   useEffect(() => {
     if(loaderData.error) {
@@ -254,6 +276,87 @@ export default function RulesIndex() {
     }
   }, [fetcher.data,fetcher.state]);
 
+  // 添加客户端数据加载函数
+  const loadRulesData = useCallback(async () => {
+    if (!reviewType) return;
+    
+    setLoading(true);
+    try {
+      // 构建查询参数
+      const queryParams = {
+        ruleType: ruleTypeParam || undefined,
+        groupId: searchParams.get('groupId') || undefined,
+        isActive: searchParams.get('isActive') ? searchParams.get('isActive') === 'true' : undefined,
+        keyword: searchParams.get('keyword') || undefined,
+        page: currentPage,
+        pageSize,
+        reviewType
+      };
+      
+      // 调用 API 获取数据
+      const response = await getRulesList(queryParams);
+      
+      if (response.data) {
+        const apiRules = response.data.rules || [];
+        const total = response.data.totalCount || 0;
+        const mappedRules = apiRules.map((apiRule: ApiRule) => mapApiRuleToModel(apiRule));
+        
+        setFilteredRules(mappedRules);
+        setFilteredTotalCount(total);
+      }
+    } catch (error) {
+      console.error('客户端加载评查点列表失败:', error);
+      toastService.error('加载评查点列表失败');
+    } finally {
+      setLoading(false);
+    }
+  }, [reviewType, ruleTypeParam, searchParams, currentPage, pageSize]);
+  
+  // 添加加载评查点类型的函数
+  const loadRuleTypes = useCallback(async () => {
+    if (!reviewType) return;
+    
+    try {
+      // 调用 API 获取评查点类型，传递 reviewType 参数
+      const response = await getRuleTypes(reviewType);
+      
+      if (response.data) {
+        const typesData = response.data;
+        // 这里可以添加类型过滤的逻辑，但实际上 API 中已经根据 reviewType 进行了过滤
+        
+        // 更新状态
+        const updatedTypes = typesData;
+        // 替换掉 loaderData 中的 ruleTypes
+        setRuleTypes(updatedTypes);
+      }
+    } catch (error) {
+      console.error('加载评查点类型失败:', error);
+      toastService.error('加载评查点类型失败');
+    }
+  }, [reviewType]);
+
+  // 在 reviewType 变化时加载评查点类型
+  useEffect(() => {
+    if (reviewType) {
+      loadRuleTypes();
+    }
+  }, [reviewType, loadRuleTypes]);
+
+  // 在 reviewType 变化或其他参数变化时加载数据
+  useEffect(() => {
+    if (reviewType) {
+      loadRulesData();
+    }
+  }, [reviewType, loadRulesData]);
+
+  // 在初始加载完成后，如果有 reviewType，立即加载数据
+  useEffect(() => {
+    if (initialLoad && reviewType) {
+      loadRuleTypes();
+      loadRulesData();
+    }
+  }, [initialLoad, reviewType, loadRuleTypes, loadRulesData]);
+
   // 筛选评查点
   const handleFilterChange = (e: React.ChangeEvent<HTMLSelectElement | HTMLInputElement>) => {
     const { name, value } = e.target;
@@ -349,7 +452,9 @@ export default function RulesIndex() {
     if (input) {
       (input as HTMLInputElement).value = '';
     }
-    setSearchParams(new URLSearchParams());
+    // 保留reviewType的过滤条件，只重置其他条件
+    const newParams = new URLSearchParams();
+    setSearchParams(newParams);
   };
   
   // 定义表格列配置
@@ -530,27 +635,29 @@ export default function RulesIndex() {
       
       {/* 评查点列表 - 使用Table组件 */}
       <Card className="ant-card">
-        <Table
+        <div className={loading ? "opacity-70 pointer-events-none transition-opacity" : ""}>
-          columns={columns}
+          <Table
-          dataSource={rules}
+            columns={columns}
-          rowKey="id"
+            dataSource={filteredRules.length > 0 ? filteredRules : initialRules}
-          emptyText="暂无评查点数据"
+            rowKey="id"
-          className="rules-table"
+            emptyText="暂无评查点数据"
-        />
+            className="rules-table"
-        
-        {/* 分页 */}
-        {totalCount > 0 && (
-          <Pagination
-            currentPage={currentPage}
-            total={totalCount}
-            pageSize={pageSize}
-            onChange={handlePageChange}
-            onPageSizeChange={handlePageSizeChange}
-            showTotal={true}
-            showPageSizeChanger={true}
-            pageSizeOptions={[10, 20, 30, 50]}
           />
-        )}
+          
+          {/* 分页 */}
+          {filteredTotalCount > 0 && (
+            <Pagination
+              currentPage={currentPage}
+              total={filteredTotalCount > 0 ? filteredTotalCount : initialTotalCount}
+              pageSize={pageSize}
+              onChange={handlePageChange}
+              onPageSizeChange={handlePageSizeChange}
+              showTotal={true}
+              showPageSizeChanger={true}
+              pageSizeOptions={[10, 20, 30, 50]}
+            />
+          )}
+        </div>
       </Card>
       
     </div>