From 03df7542cd456dc3e63a33cdd1f4cced5364f867 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 27 二月 2024 13:27:17 +0800
Subject: [PATCH] #

---
 zy-asrs-flow/src/pages/system/dept/index.jsx |  134 +++++++++++++++++++++-----------------------
 1 files changed, 65 insertions(+), 69 deletions(-)

diff --git a/zy-asrs-flow/src/pages/system/dept/index.jsx b/zy-asrs-flow/src/pages/system/dept/index.jsx
index f22950a..154b647 100644
--- a/zy-asrs-flow/src/pages/system/dept/index.jsx
+++ b/zy-asrs-flow/src/pages/system/dept/index.jsx
@@ -12,17 +12,10 @@
 import Edit from './components/edit'
 import { TextFilter, SelectFilter, DatetimeRangeFilter, LinkFilter } from '@/components/TableSearch'
 import { transformTreeData } from '@/utils/tree-util'
+import { statusMap } from '@/utils/enum-util'
+import { repairBug } from '@/utils/common-util';
 
-const statusMap = {
-    1: {
-        color: 'green',
-        text: '姝e父',
-    },
-    0: {
-        color: 'red',
-        text: '绂佺敤',
-    },
-};
+const TABLE_KEY = "pro-table-dept";
 
 const handleSave = async (val) => {
     const hide = message.loading('姝e湪娣诲姞');
@@ -115,27 +108,20 @@
 
     const columns = [
         {
-            title: 'No',
-            dataIndex: 'index',
-            valueType: 'indexBorder',
-            width: 48,
-        },
-        {
             title: '閮ㄩ棬鍚嶇О',
             dataIndex: 'name',
             valueType: 'text',
             hidden: false,
-            width: 140,
-            copyable: true,
-            filterDropdown: (props) => <TextFilter
-                name='name'
-                {...props}
-                actionRef={actionRef}
-                setSearchParam={setSearchParam}
-            />,
+            width: 240,
+            // filterDropdown: (props) => <TextFilter
+            //     name='name'
+            //     {...props}
+            //     actionRef={actionRef}
+            //     setSearchParam={setSearchParam}
+            // />,
         },
         {
-            title: '涓婄骇閮ㄩ棬鍚�',
+            title: '涓婄骇閮ㄩ棬',
             dataIndex: 'parentName',
             valueType: 'text',
             hidden: true,
@@ -151,7 +137,7 @@
             title: '鍏ㄧО',
             dataIndex: 'fullName',
             valueType: 'text',
-            hidden: true,
+            hidden: false,
             width: 140,
             filterDropdown: (props) => <TextFilter
                 name='fullName'
@@ -164,7 +150,7 @@
             title: '绠�杩�',
             dataIndex: 'brief',
             valueType: 'text',
-            hidden: true,
+            hidden: false,
             width: 140,
             filterDropdown: (props) => <TextFilter
                 name='brief'
@@ -177,7 +163,7 @@
             title: '鏍囪瘑',
             dataIndex: 'code',
             valueType: 'text',
-            hidden: true,
+            hidden: false,
             width: 140,
             filterDropdown: (props) => <TextFilter
                 name='code'
@@ -190,7 +176,7 @@
             title: '绫诲瀷',
             dataIndex: 'type',
             valueType: 'text',
-            hidden: true,
+            hidden: false,
             width: 140,
             filterDropdown: (props) => <TextFilter
                 name='type'
@@ -205,18 +191,18 @@
             valueType: 'text',
             hidden: false,
             width: 140,
-            filterDropdown: (props) => <TextFilter
-                name='leader'
-                {...props}
-                actionRef={actionRef}
-                setSearchParam={setSearchParam}
-            />,
+            // filterDropdown: (props) => <TextFilter
+            //     name='leader'
+            //     {...props}
+            //     actionRef={actionRef}
+            //     setSearchParam={setSearchParam}
+            // />,
         },
         {
             title: '鏁伴噺',
             dataIndex: 'count',
             valueType: 'text',
-            hidden: true,
+            hidden: false,
             width: 140,
             filterDropdown: (props) => <TextFilter
                 name='count'
@@ -231,12 +217,12 @@
             valueType: 'text',
             hidden: false,
             width: 140,
-            filterDropdown: (props) => <TextFilter
-                name='sort'
-                {...props}
-                actionRef={actionRef}
-                setSearchParam={setSearchParam}
-            />,
+            // filterDropdown: (props) => <TextFilter
+            //     name='sort'
+            //     {...props}
+            //     actionRef={actionRef}
+            //     setSearchParam={setSearchParam}
+            // />,
             render: (_, record) => {
                 return <span style={{ fontWeight: "bold" }}>{_}</span>
             }
@@ -247,16 +233,16 @@
             valueType: 'text',
             hidden: false,
             width: 140,
-            filterDropdown: (props) => <SelectFilter
-                name='status'
-                {...props}
-                actionRef={actionRef}
-                setSearchParam={setSearchParam}
-                data={[
-                    { label: '姝e父', value: 1 },
-                    { label: '绂佺敤', value: 0 },
-                ]}
-            />,
+            // filterDropdown: (props) => <SelectFilter
+            //     name='status'
+            //     {...props}
+            //     actionRef={actionRef}
+            //     setSearchParam={setSearchParam}
+            //     data={[
+            //         { label: '姝e父', value: 1 },
+            //         { label: '绂佺敤', value: 0 },
+            //     ]}
+            // />,
             render: (_, record) => {
                 const status = statusMap[record.status]
                 return <Tag color={status.color}>{status.text}</Tag>
@@ -268,12 +254,12 @@
             valueType: 'text',
             hidden: false,
             width: 140,
-            filterDropdown: (props) => <DatetimeRangeFilter
-                name='updateTime'
-                {...props}
-                actionRef={actionRef}
-                setSearchParam={setSearchParam}
-            />,
+            // filterDropdown: (props) => <DatetimeRangeFilter
+            //     name='updateTime'
+            //     {...props}
+            //     actionRef={actionRef}
+            //     setSearchParam={setSearchParam}
+            // />,
         },
         {
             title: '淇敼浜哄憳',
@@ -281,19 +267,19 @@
             valueType: 'text',
             hidden: false,
             width: 140,
-            filterDropdown: (props) => <LinkFilter
-                name='updateBy'
-                major='user'
-                {...props}
-                actionRef={actionRef}
-                setSearchParam={setSearchParam}
-            />,
+            // filterDropdown: (props) => <LinkFilter
+            //     name='updateBy'
+            //     major='user'
+            //     {...props}
+            //     actionRef={actionRef}
+            //     setSearchParam={setSearchParam}
+            // />,
         },
         {
             title: '澶囨敞',
             dataIndex: 'memo',
             valueType: 'text',
-            hidden: true,
+            hidden: false,
             width: 140,
             filterDropdown: (props) => <TextFilter
                 name='memo'
@@ -345,7 +331,11 @@
     ];
 
     return (
-        <PageContainer>
+        <PageContainer
+            header={{
+                breadcrumb: {},
+            }}
+        >
             <div style={{ width: '100%', float: 'right' }}>
                 <ProTable
                     key="dept"
@@ -356,7 +346,7 @@
                     cardBordered
                     scroll={{ x: 1300 }}
                     dateFormatter="string"
-                    pagination={{ pageSize: 20 }}
+                    pagination={{ pageSize: 100 }}
                     search={false}
                     toolbar={{
                         search: {
@@ -416,9 +406,15 @@
                         }
                     }}
                     columnsState={{
-                        persistenceKey: 'pro-table-dept',
+                        persistenceKey: TABLE_KEY,
                         persistenceType: 'localStorage',
                         defaultValue: {
+                            fullName: { show: repairBug(TABLE_KEY, 'fullName', false) },
+                            brief: { show: repairBug(TABLE_KEY, 'brief', false) },
+                            code: { show: repairBug(TABLE_KEY, 'code', false) },
+                            type: { show: repairBug(TABLE_KEY, 'type', false) },
+                            count: { show: repairBug(TABLE_KEY, 'count', false) },
+                            memo: { show: repairBug(TABLE_KEY, 'memo', false) },
                             option: { fixed: 'right', disable: true },
                         },
                         onChange(value) {

--
Gitblit v1.9.1