From 004eeaed7d52f37bebd8f0404c26c8a4423ac3c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=80=A1?= <jl-liuc59@chinaunicom.cn>
Date: Mon, 4 Aug 2025 17:05:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .dockerignore                   | 35 ---------------------------------
 src/pages/System/Menu/index.tsx | 17 ++++------------
 src/pages/System/Role/index.tsx | 10 ++++------
 src/pages/System/User/index.tsx |  2 +-
 4 files changed, 9 insertions(+), 55 deletions(-)
 delete mode 100644 .dockerignore

diff --git a/.dockerignore b/.dockerignore
deleted file mode 100644
index 8e90ca6..0000000
--- a/.dockerignore
+++ /dev/null
@@ -1,35 +0,0 @@
-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-
-# dependencies
-**/node_modules
-/src/utils/request-temp.js
-
-# production
-/.vscode
-
-# misc
-.DS_Store
-npm-debug.log*
-yarn-error.log
-
-/coverage
-.idea
-yarn.lock
-package-lock.json
-*bak
-.vscode
-
-# visual studio code
-.history
-*.log
-
-functions/mock
-.temp/**
-
-# umi
-.umi
-.umi-production
-
-# screenshot
-screenshot
-.firebase
\ No newline at end of file
diff --git a/src/pages/System/Menu/index.tsx b/src/pages/System/Menu/index.tsx
index bdc6ef1..c346f9c 100644
--- a/src/pages/System/Menu/index.tsx
+++ b/src/pages/System/Menu/index.tsx
@@ -26,15 +26,6 @@ type MenuItem = MenuData & {
   children?: MenuItem[]; // 用于处理树结构
 };
 
-// 工具函数：将平铺数组转为树形结构
-function listToTree<T extends { menuId: string; parentId?: string; children?: T[] }>(list: T[], parentId: string = '0'): T[] {
-  return list
-    .filter(item => (item.parentId ?? '0') === parentId)
-    .map(item => ({
-      ...item,
-      children: listToTree(list, item.menuId)
-    }));
-}
 
 // 菜单管理组件
 
@@ -89,10 +80,9 @@ const MenuManagement: React.FC = () => {
 
   // 处理编辑
   const handleEdit = (item: MenuItem) => {
-    debugger;
     setEditingItem(item);
     form.setFieldsValue({
-      id: item.menuId,
+      menuId: item.menuId,
       parentId: item.parentId,
       // parentName: item.parentName,
       menuName: item.menuName,
@@ -141,7 +131,7 @@ const MenuManagement: React.FC = () => {
       menuId: '-1', // 临时标识新增项
     });
     form.setFieldsValue({
-      id: null,
+      menuId: null,
       menuName: '',
       menuOrder: 0,
       menuUrl: '',
@@ -255,6 +245,7 @@ const MenuManagement: React.FC = () => {
   // 模态框确定按钮处理
   const handleOk = async () => {
     try {
+      debugger
       const values = await form.validateFields();
       if (!values.parentId) values.parentId = '0';
       if (editingItem && editingItem.menuId !== '-1') {
@@ -337,7 +328,7 @@ const MenuManagement: React.FC = () => {
         >
           <Form form={form} {...layout}>
             <Form.Item
-              name="id"
+              name="menuId"
               hidden={true}
             >
               <Input />
diff --git a/src/pages/System/Role/index.tsx b/src/pages/System/Role/index.tsx
index 3cdfc62..224fc90 100644
--- a/src/pages/System/Role/index.tsx
+++ b/src/pages/System/Role/index.tsx
@@ -5,7 +5,7 @@ import { getPage, getDataById, deleteRole, addRole, updateRole, getMenuTreeAll }
 // import './styles.less';
 import { getDicData } from '@/utils/session';
 import TextArea from 'antd/lib/input/TextArea';
-import { proTableValueEnum } from '@/utils/CommonUtils';
+import { proTableValueEnum, returnDictVal } from '@/utils/CommonUtils';
 import tableProps from '@/utils/tableProps';
 
 // 处理树形选择的级联逻辑
@@ -222,11 +222,7 @@ function createSelect(data: any) {
       title: '角色范围', dataIndex: 'roleScope',
       valueEnum: proTableValueEnum(dictData['role_scope=system']),
       render: (_, record) => {
-        if (record.roleScope === 'EBTP') {
-          return (<>招标采购中心</>)
-        } else {
-          return (<></>)
-        }
+        return <>{returnDictVal(dictData['role_scope=system'], record.roleScope)}</>
       }
     },
     { title: '创建时间', dataIndex: 'createDate', width: '10%', valueType: 'dateTime', search: false },
@@ -348,6 +344,8 @@ function createSelect(data: any) {
       closeModal();
     } catch (error) {
       console.error(error);
+    } finally {
+      actionRef.current?.reload()
     }
   };
   const checkSupModal = (
diff --git a/src/pages/System/User/index.tsx b/src/pages/System/User/index.tsx
index 89f3d0b..e111b8e 100644
--- a/src/pages/System/User/index.tsx
+++ b/src/pages/System/User/index.tsx
@@ -40,7 +40,7 @@ const entrust: React.FC<{}> = () => {
     getDepartmentList();
   }, []);
 
-  //委托列表
+  //用户信息列表
   const columns: ProColumns<any>[] = [
     { title: '序号', valueType: 'index', width: 50, },
     { title: '用户名', dataIndex: 'name', },