From 252240bfca04ad719fd8d3d6f8826a50163b34e3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 20 二月 2024 13:11:32 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/system/menu/components/edit.jsx | 4
zy-asrs-flow/src/pages/system/dept/components/edit.jsx | 132 ++++----------------------
zy-asrs-flow/src/pages/system/dept/index.jsx | 116 +++++++---------------
3 files changed, 62 insertions(+), 190 deletions(-)
diff --git a/zy-asrs-flow/src/pages/system/dept/components/edit.jsx b/zy-asrs-flow/src/pages/system/dept/components/edit.jsx
index e6de44a..188f718 100644
--- a/zy-asrs-flow/src/pages/system/dept/components/edit.jsx
+++ b/zy-asrs-flow/src/pages/system/dept/components/edit.jsx
@@ -4,7 +4,8 @@
ProFormDigit,
ProFormText,
ProFormSelect,
- ProFormDateTimePicker
+ ProFormDateTimePicker,
+ ProFormTreeSelect
} from '@ant-design/pro-components';
import { Form, Modal } from 'antd';
import moment from 'moment';
@@ -57,84 +58,33 @@
hidden={true}
/>
<ProForm.Group>
- <ProFormText
- name="name"
- label="鍚嶇О"
- colProps={{ md: 12, xl: 12 }}
- placeholder="璇疯緭鍏�"
- rules={[{ required: true, message: "鍚嶇О涓嶈兘涓虹┖锛�" }]}
- />
- <ProFormDigit
+ <ProFormTreeSelect
name="parentId"
label="涓婄骇閮ㄩ棬"
+ params={props.treeData}
+ request={async () => {
+ return props.treeData;
+ }}
colProps={{ md: 12, xl: 12 }}
- fieldProps={{ precision: 0 }}
+ placeholder="璇烽�夋嫨"
+ rules={[{ required: true, message: "涓婄骇閮ㄩ棬涓嶈兘涓虹┖" }]}
+ fieldProps={{
+ treeDefaultExpandedKeys: [0]
+ }}
+ />
+ <ProFormText
+ name="name"
+ label="閮ㄩ棬鍚嶇О"
+ colProps={{ md: 12, xl: 12 }}
placeholder="璇疯緭鍏�"
+ rules={[{ required: true, message: "閮ㄩ棬鍚嶇О涓嶈兘涓虹┖锛�" }]}
/>
</ProForm.Group>
<ProForm.Group>
- <ProFormText
- name="parentName"
- label="涓婄骇閮ㄩ棬鍚�"
- colProps={{ md: 12, xl: 12 }}
- placeholder="璇疯緭鍏�"
- />
- <ProFormText
- name="path"
- label="鍏宠仈璺緞"
- colProps={{ md: 12, xl: 12 }}
- placeholder="璇疯緭鍏�"
- />
- </ProForm.Group>
- <ProForm.Group>
- <ProFormText
- name="pathName"
- label="鍏宠仈璺緞鍚�"
- colProps={{ md: 12, xl: 12 }}
- placeholder="璇疯緭鍏�"
- />
- <ProFormText
- name="fullName"
- label="鍏ㄧО"
- colProps={{ md: 12, xl: 12 }}
- placeholder="璇疯緭鍏�"
- />
- </ProForm.Group>
- <ProForm.Group>
- <ProFormText
- name="brief"
- label="绠�杩�"
- colProps={{ md: 12, xl: 12 }}
- placeholder="璇疯緭鍏�"
- />
- <ProFormText
- name="code"
- label="鏍囪瘑"
- colProps={{ md: 12, xl: 12 }}
- placeholder="璇疯緭鍏�"
- />
- </ProForm.Group>
- <ProForm.Group>
- <ProFormDigit
- name="type"
- label="绫诲瀷"
- colProps={{ md: 12, xl: 12 }}
- fieldProps={{ precision: 0 }}
- placeholder="璇疯緭鍏�"
- />
<ProFormText
name="leader"
label="璐熻矗浜�"
colProps={{ md: 12, xl: 12 }}
- placeholder="璇疯緭鍏�"
- />
- </ProForm.Group>
- <ProForm.Group>
- <ProFormDigit
- name="count"
- label="鏁伴噺"
- colProps={{ md: 12, xl: 12 }}
- fieldProps={{ precision: 0 }}
placeholder="璇疯緭鍏�"
/>
<ProFormDigit
@@ -156,49 +106,11 @@
{ label: '绂佺敤', value: 0 },
]}
/>
- <ProFormDateTimePicker
- name="createTime"
- label="娣诲姞鏃堕棿"
+ <ProFormText
+ name="memo"
+ label=" 澶囨敞"
colProps={{ md: 12, xl: 12 }}
- placeholder="璇烽�夋嫨"
- transform={(value) => moment(value).toISOString()}
- />
- </ProForm.Group>
- <ProForm.Group>
- <ProFormSelect
- name="createBy"
- label="娣诲姞浜哄憳"
- colProps={{ md: 12, xl: 12 }}
- fieldProps={{ precision: 0 }}
- placeholder="璇烽�夋嫨"
- showSearch
- debounceTime={300}
- request={async ({ keyWords }) => {
- const resp = await Http.doPostForm('api/user/query', { condition: keyWords });
- return resp.data;
- }}
- />
- <ProFormDateTimePicker
- name="updateTime"
- label="淇敼鏃堕棿"
- colProps={{ md: 12, xl: 12 }}
- placeholder="璇烽�夋嫨"
- transform={(value) => moment(value).toISOString()}
- />
- </ProForm.Group>
- <ProForm.Group>
- <ProFormSelect
- name="updateBy"
- label="淇敼浜哄憳"
- colProps={{ md: 12, xl: 12 }}
- fieldProps={{ precision: 0 }}
- placeholder="璇烽�夋嫨"
- showSearch
- debounceTime={300}
- request={async ({ keyWords }) => {
- const resp = await Http.doPostForm('api/user/query', { condition: keyWords });
- return resp.data;
- }}
+ placeholder="璇疯緭鍏�"
/>
</ProForm.Group>
diff --git a/zy-asrs-flow/src/pages/system/dept/index.jsx b/zy-asrs-flow/src/pages/system/dept/index.jsx
index c4cb0de..f22950a 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,18 @@
import Http from '@/utils/http';
import Edit from './components/edit'
import { TextFilter, SelectFilter, DatetimeRangeFilter, LinkFilter } from '@/components/TableSearch'
+import { transformTreeData } from '@/utils/tree-util'
+
+const statusMap = {
+ 1: {
+ color: 'green',
+ text: '姝ｅ父',
+ },
+ 0: {
+ color: 'red',
+ text: '绂佺敤',
+ },
+};
const handleSave = async (val) => {
const hide = message.loading('姝ｅ湪娣诲姞');
@@ -95,6 +107,8 @@
const [currentRow, setCurrentRow] = useState();
const [searchParam, setSearchParam] = useState({});
+ const [treeData, setTreeData] = useState([]);
+
useEffect(() => {
}, []);
@@ -107,7 +121,7 @@
width: 48,
},
{
- title: '鍚嶇О',
+ title: '閮ㄩ棬鍚嶇О',
dataIndex: 'name',
valueType: 'text',
hidden: false,
@@ -121,23 +135,10 @@
/>,
},
{
- 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'
@@ -147,36 +148,10 @@
/>,
},
{
- 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}
- />,
- },
- {
title: '鍏ㄧО',
dataIndex: 'fullName',
valueType: 'text',
- hidden: false,
+ hidden: true,
width: 140,
filterDropdown: (props) => <TextFilter
name='fullName'
@@ -189,7 +164,7 @@
title: '绠�杩�',
dataIndex: 'brief',
valueType: 'text',
- hidden: false,
+ hidden: true,
width: 140,
filterDropdown: (props) => <TextFilter
name='brief'
@@ -202,7 +177,7 @@
title: '鏍囪瘑',
dataIndex: 'code',
valueType: 'text',
- hidden: false,
+ hidden: true,
width: 140,
filterDropdown: (props) => <TextFilter
name='code'
@@ -215,7 +190,7 @@
title: '绫诲瀷',
dataIndex: 'type',
valueType: 'text',
- hidden: false,
+ hidden: true,
width: 140,
filterDropdown: (props) => <TextFilter
name='type'
@@ -241,7 +216,7 @@
title: '鏁伴噺',
dataIndex: 'count',
valueType: 'text',
- hidden: false,
+ hidden: true,
width: 140,
filterDropdown: (props) => <TextFilter
name='count'
@@ -262,6 +237,9 @@
actionRef={actionRef}
setSearchParam={setSearchParam}
/>,
+ render: (_, record) => {
+ return <span style={{ fontWeight: "bold" }}>{_}</span>
+ }
},
{
title: '鐘舵��',
@@ -279,33 +257,10 @@
{ 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}
- />,
+ render: (_, record) => {
+ const status = statusMap[record.status]
+ return <Tag color={status.color}>{status.text}</Tag>
+ },
},
{
title: '淇敼鏃堕棿',
@@ -338,7 +293,7 @@
title: '澶囨敞',
dataIndex: 'memo',
valueType: 'text',
- hidden: false,
+ hidden: true,
width: 140,
filterDropdown: (props) => <TextFilter
name='memo'
@@ -443,10 +398,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,
}
})
@@ -503,6 +462,7 @@
<Edit
open={modalVisible}
values={currentRow || {}}
+ treeData={treeData}
onCancel={
() => {
setModalVisible(false);
diff --git a/zy-asrs-flow/src/pages/system/menu/components/edit.jsx b/zy-asrs-flow/src/pages/system/menu/components/edit.jsx
index 0c48746..2f7a7e1 100644
--- a/zy-asrs-flow/src/pages/system/menu/components/edit.jsx
+++ b/zy-asrs-flow/src/pages/system/menu/components/edit.jsx
@@ -80,10 +80,10 @@
/>
<ProFormText
name="name"
- label="鍚嶇О"
+ label="鑿滃崟鍚嶇О"
colProps={{ md: 12, xl: 12 }}
placeholder="璇疯緭鍏�"
- rules={[{ required: true, message: "鍚嶇О涓嶈兘涓虹┖锛�" }]}
+ rules={[{ required: true, message: "鑿滃崟鍚嶇О涓嶈兘涓虹┖锛�" }]}
/>
</ProForm.Group>
<ProForm.Group>
--
Gitblit v1.9.1