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 | 204 ++++++++++++++++++++-------------------------------
1 files changed, 80 insertions(+), 124 deletions(-)
diff --git a/zy-asrs-flow/src/pages/system/dept/index.jsx b/zy-asrs-flow/src/pages/system/dept/index.jsx
index c4cb0de..154b647 100644
--- a/zy-asrs-flow/src/pages/system/dept/index.jsx
+++ b/zy-asrs-flow/src/pages/system/dept/index.jsx
@@ -1,6 +1,6 @@
import React, { useState, useRef, useEffect } from 'react';
-import { Button, message, Modal } from 'antd';
+import { Button, message, Modal, Tag } from 'antd';
import {
FooterToolbar,
PageContainer,
@@ -11,6 +11,11 @@
import Http from '@/utils/http';
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 TABLE_KEY = "pro-table-dept";
const handleSave = async (val) => {
const hide = message.loading('姝ｅ湪娣诲姞');
@@ -95,78 +100,34 @@
const [currentRow, setCurrentRow] = useState();
const [searchParam, setSearchParam] = useState({});
+ const [treeData, setTreeData] = useState([]);
+
useEffect(() => {
}, []);
const columns = [
{
- title: 'No',
- dataIndex: 'index',
- valueType: 'indexBorder',
- width: 48,
- },
- {
- title: '鍚嶇О',
+ 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: '涓婄骇閮ㄩ棬',
- dataIndex: 'parentId',
- valueType: 'text',
- hidden: false,
- width: 140,
- filterDropdown: (props) => <TextFilter
- name='parentId'
- {...props}
- actionRef={actionRef}
- setSearchParam={setSearchParam}
- />,
- },
- {
- title: '涓婄骇閮ㄩ棬鍚�',
dataIndex: 'parentName',
valueType: 'text',
- hidden: false,
+ hidden: true,
width: 140,
filterDropdown: (props) => <TextFilter
name='parentName'
- {...props}
- actionRef={actionRef}
- setSearchParam={setSearchParam}
- />,
- },
- {
- title: '鍏宠仈璺緞',
- dataIndex: 'path',
- valueType: 'text',
- hidden: false,
- width: 140,
- filterDropdown: (props) => <TextFilter
- name='path'
- {...props}
- actionRef={actionRef}
- setSearchParam={setSearchParam}
- />,
- },
- {
- title: '鍏宠仈璺緞鍚�',
- dataIndex: 'pathName',
- valueType: 'text',
- hidden: false,
- width: 140,
- filterDropdown: (props) => <TextFilter
- name='pathName'
{...props}
actionRef={actionRef}
setSearchParam={setSearchParam}
@@ -230,12 +191,12 @@
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: '鏁伴噺',
@@ -256,12 +217,15 @@
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>
+ }
},
{
title: '鐘舵��',
@@ -269,43 +233,20 @@
valueType: 'text',
hidden: false,
width: 140,
- filterDropdown: (props) => <SelectFilter
- name='status'
- {...props}
- actionRef={actionRef}
- setSearchParam={setSearchParam}
- data={[
- { label: '姝ｅ父', value: 1 },
- { label: '绂佺敤', value: 0 },
- ]}
- />,
- },
- {
- title: '娣诲姞鏃堕棿',
- dataIndex: 'createTime$',
- valueType: 'text',
- hidden: false,
- width: 140,
- filterDropdown: (props) => <DatetimeRangeFilter
- name='createTime'
- {...props}
- actionRef={actionRef}
- setSearchParam={setSearchParam}
- />,
- },
- {
- title: '娣诲姞浜哄憳',
- dataIndex: 'createBy$',
- valueType: 'text',
- hidden: false,
- width: 140,
- filterDropdown: (props) => <LinkFilter
- name='createBy'
- major='user'
- {...props}
- actionRef={actionRef}
- setSearchParam={setSearchParam}
- />,
+ // filterDropdown: (props) => <SelectFilter
+ // name='status'
+ // {...props}
+ // actionRef={actionRef}
+ // setSearchParam={setSearchParam}
+ // data={[
+ // { label: '姝ｅ父', value: 1 },
+ // { label: '绂佺敤', value: 0 },
+ // ]}
+ // />,
+ render: (_, record) => {
+ const status = statusMap[record.status]
+ return <Tag color={status.color}>{status.text}</Tag>
+ },
},
{
title: '淇敼鏃堕棿',
@@ -313,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: '淇敼浜哄憳',
@@ -326,13 +267,13 @@
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: '澶囨敞',
@@ -390,7 +331,11 @@
];
return (
- <PageContainer>
+ <PageContainer
+ header={{
+ breadcrumb: {},
+ }}
+ >
<div style={{ width: '100%', float: 'right' }}>
<ProTable
key="dept"
@@ -401,7 +346,7 @@
cardBordered
scroll={{ x: 1300 }}
dateFormatter="string"
- pagination={{ pageSize: 20 }}
+ pagination={{ pageSize: 100 }}
search={false}
toolbar={{
search: {
@@ -443,10 +388,14 @@
],
}}
request={(params, sorter, filter) =>
- Http.doPostPromise('/api/dept/page', { ...params, ...searchParam }, (res) => {
+ Http.doPostPromise('/api/dept/tree', { ...params, ...searchParam }, (res) => {
+ const rootMenu = { id: 0, name: '鏍圭洰褰�', value: 0, children: [] };
+ rootMenu.children = res.data;
+ const treeData = transformTreeData([rootMenu]);
+ setTreeData(treeData);
+
return {
- data: res.data.records,
- total: res.data.total,
+ data: res.data,
success: true,
}
})
@@ -457,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) {
@@ -503,6 +458,7 @@
<Edit
open={modalVisible}
values={currentRow || {}}
+ treeData={treeData}
onCancel={
() => {
setModalVisible(false);
--
Gitblit v1.9.1