Hello
-}
\ No newline at end of file
diff --git a/src/pages/company.jsx b/src/pages/company.jsx
index 4700f79..eafb603 100644
--- a/src/pages/company.jsx
+++ b/src/pages/company.jsx
@@ -10,7 +10,8 @@ import OperateDialog from '../components/dialog';
import jsPDF from 'jspdf';
import moment from 'moment';
import qs from 'qs';
-import { message, Spin } from 'antd';
+import { message, Spin, notification } from 'antd';
+import { SmileOutlined } from '@ant-design/icons';
let active = 'top';
let drawerCom = null;
@@ -31,6 +32,14 @@ export default function companyPage() {
const [timelineId, setTimelineId] = useState(0);
const infoRef = useRef();
+ useEffect(() => {
+ notification.open({
+ message: '提示',
+ description:
+ '组织架构图中编制数和在编数显示初始化需参考文档配置定时任务并执行！！！(编制数默认取本年度最新编制信息,人数统计展示仅限于行政维度)',
+ icon:
@@ -166,7 +177,13 @@ export default function companyPage() {
d.data.fname
} style="width: 110px;margin: 0 auto;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;-o-text-overflow:ellipsis;
line-height: 18px;word-break: break-all;">${d.data.fname}
-
+ ${d.data.staffNum} /
+ ${d.data.onJobNum}
+
+
+
+ `;
} else if (d.data.ftype == 2) {
return `
@@ -179,6 +196,10 @@ export default function companyPage() {
font-family: Microsoft YaHei-Regular, Microsoft YaHei;color: #333333;text-align: center;">
+
`;
@@ -326,7 +347,12 @@ export default function companyPage() {
const timeLineSearch = (timeline) => {
setTimelineId(timeline.id);
const fclass = topbar.state.requestData.fclass;
- const resetParams = { root: undefined, level: '2', fisvitual: '0' };
+ const resetParams = {
+ root: undefined,
+ level: '2',
+ fisvitual: '0',
+ hidedept: '0',
+ };
topbar.handleFormChange({ ...resetParams });
topbar.getNodeTreeNode(
`/api/bs/hrmorganization/orgchart/getSubCompanyTree?fclass=${fclass}&id=${timeline.id}`,
diff --git a/src/pages/dragTree.jsx b/src/pages/dragTree.jsx
index 37acab6..ba718fb 100644
--- a/src/pages/dragTree.jsx
+++ b/src/pages/dragTree.jsx
@@ -1,25 +1,31 @@
-import { Tree, message, Modal, Popconfirm, Spin } from 'antd';
+import { Tree, message, Modal, Popconfirm, Spin, Layout, Drawer } from 'antd';
import React, { useEffect, useState, useRef } from 'react';
import * as d3 from 'd3';
import qs from 'qs';
import MergeDialog from '../components/dialog/mergeDialog';
import CopyDialog from '../components/dialog/copyDialog';
+import inset from '../../public/img/back/inset.png';
import {
HomeOutlined,
FolderOutlined,
ClusterOutlined,
ApartmentOutlined,
+ QuestionCircleOutlined,
} from '@ant-design/icons';
+const { Header, Footer, Sider, Content } = Layout;
import './index.less';
const DragTree = () => {
const [gData, setGData] = useState([]);
const [expandedKeys, setExpandedKeys] = useState([undefined]);
const childRef = useRef(null);
- const [tip, setTip] = useState('正在加载...');
+ const copyChildRef = useRef(null);
+ const [tip, setTip] = useState('正在加载,请稍候...');
const [loading, setLoading] = useState(false);
const [showCanceled, setShowCanceled] = useState(0);
+ const [drawerOpen, setDrawerOpen] = useState(false);
+ const [iframe, setIframe] = useState('');
const [open, setOpen] = useState(false);
const [mergeId, setMergeId] = useState(null);
@@ -30,10 +36,10 @@ const DragTree = () => {
getMoveTree(0);
}, [true]);
- const getMoveTree = (showCanceled) => {
+ const getMoveTree = (showCanceled, expandedKeys = '') => {
setLoading(true);
d3.json(
- `/api/bs/hrmorganization/orgchart/getMovingTree?showCanceled=${showCanceled}`,
+ `/api/bs/hrmorganization/orgchart/getMovingTree?showCanceled=${showCanceled}&expandedKeys=${expandedKeys}`,
).then((data) => {
setGData(data.movingTree);
setExpandedKeys(data.expandedKeys);
@@ -59,79 +65,95 @@ const DragTree = () => {
};
const onDrop = (info) => {
- setLoading(true);
- setTip('正在转移，请稍候...');
const dropKey = info.node.key;
const dragKey = info.dragNode.key;
const dropPos = info.node.pos.split('-');
const dropPosition =
info.dropPosition - Number(dropPos[dropPos.length - 1]);
- fetch('/api/bs/hrmorganization/dept/dragDepartment', {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json',
- },
- body: JSON.stringify({
- sourcekey: dragKey,
- targetkey: dropKey,
- dropPosition: dropPosition,
- }),
- })
- .then((response) => response.json())
- .then((res) => {
- if (res.code == 200) {
- const data = [...gData];
- // Find dragObject
- let dragObj;
- loop(data, dragKey, (item, index, arr) => {
- arr.splice(index, 1);
- dragObj = item;
- });
- if (!info.dropToGap) {
- // Drop on the content
- loop(data, dropKey, (item) => {
- item.children = item.children || [];
- // where to insert 示例添加到头部，可以是随意位置
- item.children.unshift(dragObj);
- });
- } else if (
- (info.node.props.children || []).length > 0 &&
- // Has children
- info.node.props.expanded &&
- // Is expanded
- dropPosition === 1 // On the bottom gap
- ) {
- loop(data, dropKey, (item) => {
- item.children = item.children || [];
- // where to insert 示例添加到头部，可以是随意位置
- item.children.unshift(dragObj);
- // in previous version, we use item.children.push(dragObj) to insert the
- // item to the tail of the children
- });
- } else {
- let ar = [];
- let i;
- loop(data, dropKey, (_item, index, arr) => {
- ar = arr;
- i = index;
- });
- if (dropPosition === -1) {
- ar.splice(i, 0, dragObj);
+
+ if (dropPosition == -1) {
+ return message.error('不支持该操作！！！', 2);
+ }
+ let pos = dropPosition == 0 ? '内部' : '下方';
+
+ let title = `确定将【${info.dragNode.title}】移到 【${info.node.title}】${pos}`;
+ Modal.confirm({
+ title: '转移操作',
+ content: title,
+ okText: '确认',
+ cancelText: '取消',
+ onOk() {
+ setLoading(true);
+ setTip('正在转移，请稍候...');
+
+ fetch('/api/bs/hrmorganization/dept/dragDepartment', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ body: JSON.stringify({
+ sourcekey: dragKey,
+ targetkey: dropKey,
+ dropPosition: dropPosition,
+ }),
+ })
+ .then((response) => response.json())
+ .then((res) => {
+ if (res.code == 200) {
+ const data = [...gData];
+ // Find dragObject
+ let dragObj;
+ loop(data, dragKey, (item, index, arr) => {
+ arr.splice(index, 1);
+ dragObj = item;
+ });
+ if (!info.dropToGap) {
+ // Drop on the content
+ loop(data, dropKey, (item) => {
+ item.children = item.children || [];
+ // where to insert 示例添加到头部，可以是随意位置
+ item.children.unshift(dragObj);
+ });
+ } else if (
+ (info.node.props.children || []).length > 0 &&
+ // Has children
+ info.node.props.expanded &&
+ // Is expanded
+ dropPosition === 1 // On the bottom gap
+ ) {
+ loop(data, dropKey, (item) => {
+ item.children = item.children || [];
+ // where to insert 示例添加到头部，可以是随意位置
+ item.children.unshift(dragObj);
+ // in previous version, we use item.children.push(dragObj) to insert the
+ // item to the tail of the children
+ });
+ } else {
+ let ar = [];
+ let i;
+ loop(data, dropKey, (_item, index, arr) => {
+ ar = arr;
+ i = index;
+ });
+ if (dropPosition === -1) {
+ ar.splice(i, 0, dragObj);
+ } else {
+ ar.splice(i + 1, 0, dragObj);
+ }
+ }
+ setGData(data);
+ message.success('转移成功', 2);
} else {
- ar.splice(i + 1, 0, dragObj);
+ message.warning(res.msg, 2);
}
- }
- setGData(data);
- } else {
- message.warning(res.msg, 2);
- }
- setLoading(false);
- })
- .catch((error) => {
- message.error('接口异常,请联系管理员');
- });
-
- setTimeout(function () {}, 1000);
+ setLoading(false);
+ })
+ .catch((error) => {
+ message.error('接口异常,请联系管理员');
+ });
+ },
+ onCancel() {},
+ });
};
/**
@@ -145,7 +167,7 @@ const DragTree = () => {
headers: {
'Content-Type': 'application/json',
},
- body: JSON.stringify({ ids: nodeData.id }),
+ body: JSON.stringify({ ids: nodeData.id.substring(1) }),
})
.then((response) => response.json())
.then((res) => {
@@ -172,6 +194,7 @@ const DragTree = () => {
* @param {*} nodeData
*/
const onCancel = (nodeData) => {
+ setShowCanceled(0);
const extend = nodeData.type == '1' ? 'comp' : 'dept';
fetch(`/api/bs/hrmorganization/${extend}/updateForbiddenTagById`, {
method: 'POST',
@@ -179,7 +202,7 @@ const DragTree = () => {
'Content-Type': 'application/json',
},
body: JSON.stringify({
- id: nodeData.id,
+ id: nodeData.id.substring(1),
canceled: nodeData.canceled != '0',
}),
})
@@ -187,11 +210,18 @@ const DragTree = () => {
.then((res) => {
if (res.code == 200) {
const data = [...gData];
- loop(data, nodeData.key, (item, index, arr) => {
- arr.splice(index, 1);
- });
+ if (nodeData.canceled != '0') {
+ message.success('恢复成功', 2);
+ loop(data, nodeData.key, (item, index, arr) => {
+ arr[index].canceled = '0';
+ });
+ } else {
+ loop(data, nodeData.key, (item, index, arr) => {
+ arr.splice(index, 1);
+ });
+ message.success('封存成功', 2);
+ }
setGData(data);
- message.success('封存成功', 2);
} else {
message.warning(res.msg, 2);
}
@@ -229,6 +259,7 @@ const DragTree = () => {
.then((response) => response.json())
.then((res) => {
if (res.code == 200) {
+ getMoveTree(0, values.department);
message.success('合并成功', 2);
} else {
message.warning(res.msg, 2);
@@ -245,22 +276,31 @@ const DragTree = () => {
* @param {*} nodeData
*/
const onCopy = (nodeData) => {
+ if (copyChildRef.current) {
+ copyChildRef.current.getTreeData();
+ }
setCopyOpen(true);
setCopyId(nodeData.id);
};
const onCopyCreate = (values) => {
+ let params = {
+ company: values.company,
+ copySubDept: values.copySubDept ? '1' : '0',
+ ids: copyId.substring(1),
+ };
fetch(`/api/bs/hrmorganization/dept/copyDepartment`, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
- body: JSON.stringify({ ...values, ids: copyId }),
+ body: JSON.stringify(params),
})
.then((response) => response.json())
.then((res) => {
if (res.code == 200) {
setCopyOpen(false);
+ getMoveTree(0, values.company);
message.success('复制成功', 2);
} else {
message.warning(res.msg, 2);
@@ -282,7 +322,6 @@ const DragTree = () => {
<>
{nodeData.type == 0 ? (
- {' '}
+ ${d.data.staffNum} /
+ ${d.data.onJobNum}
+
- window.open(
- `/spa/organization/static/index.html#/main/organization/${extend}/${nodeData.id}`,
- '_blank',
- )
- }
+ onClick={() => {
+ setDrawerOpen(true);
+ setIframe(
+ `/spa/organization/static/index.html#/main/organization/${extend}/${nodeData.id.substring(
+ 1,
+ )}`,
+ );
+ }}
>
查看
onDelete(nodeData)}
okText="确认"
cancelText="取消"
@@ -343,43 +393,87 @@ const DragTree = () => {
);
};
+ const onExpand = (info) => {
+ setExpandedKeys(info);
+ };
+
return (
- <>
- {
- const value = showCanceled == 0 ? 1 : 0;
- setShowCanceled(value);
- getMoveTree(value);
+
+
+
+
+ {
+ setOpen(false);
}}
/>
-
- {
- setOpen(false);
- }}
- />
- {/* {
setCopyOpen(false);
- }}/> */}
-
-
+ }}
+ />
+
);
};
export default DragTree;
diff --git a/src/pages/index.less b/src/pages/index.less
index 59cd9b4..bd93022 100644
--- a/src/pages/index.less
+++ b/src/pages/index.less
@@ -1,3 +1,7 @@
+#root {
+ min-height: 100vh;
+}
+
.title {
background: rgb(121, 242, 157);
}
@@ -24,11 +28,11 @@
#drag-button-ops {
display: none;
- width: 500px;
height: 16px;
font-size: 12px;
line-height: 16px;
margin-left: 100px;
+
.drag-button {
display: inline-block;
padding: 0 10px;
@@ -40,3 +44,76 @@
color: #22c8fb;
}
}
+
+.drag-wrapper {
+ min-height: inherit;
+ background-image: url('../../public/img/back/background.png') !important;
+}
+
+.drag-layout {
+ min-height: inherit;
+ padding: 25px;
+
+ .drag-header {
+ text-align: center;
+
+ div {
+ display: inline-block;
+ font-size: 25px;
+ font-weight: 400;
+ }
+ }
+
+ .drag-content {
+ width: auto;
+ background: #f8fafc;
+ border: 1px solid rgba(218, 237, 255, 1);
+ border-radius: 8px;
+ margin-top: 20px;
+
+ .drag-showcanceled {
+ font-size: 18px;
+ line-height: 30px;
+ margin-left: 5px;
+ margin-top: 5px;
+ }
+ }
+
+ .drag-footer {
+ margin-top: 15px;
+ background: #f8fafc;
+ border: 1px solid rgba(218, 237, 255, 1);
+ border-radius: 8px;
+ padding: 22px;
+
+ p {
+ span {
+ color: #178eff;
+ margin-right: 5px;
+ }
+ font-family: PingFangSC-Medium;
+ font-size: 14px;
+ color: #596378;
+ line-height: 24px;
+ font-weight: 500;
+ }
+
+ .tips {
+ font-family: PingFangSC-Regular;
+ font-size: 14px;
+ color: #596378;
+ line-height: 21px;
+ font-weight: 400;
+ letter-spacing: 0.5px;
+ }
+ }
+}
+
+.ant-tree {
+ background: transparent;
+}
+
+.ant-drawer-body {
+ padding: 0px;
+ overflow: hidden;
+}
diff --git a/src/pages/statisticsTable.jsx b/src/pages/statisticsTable.jsx
new file mode 100644
index 0000000..79b5c73
--- /dev/null
+++ b/src/pages/statisticsTable.jsx
@@ -0,0 +1,89 @@
+/*
+ * @Author: Chengliang 1546584672@qq.com
+ * @Date: 2023-09-11 15:33:27
+ * @LastEditors: Chengliang 1546584672@qq.com
+ * @LastEditTime: 2023-09-13 17:49:16
+ * @FilePath: /org-chart-frant/src/pages/statisticsTable.jsx
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+import React, { useEffect, useState, useRef } from 'react';
+import * as d3 from 'd3';
+import qs from 'qs';
+import { Table } from 'antd';
+
+const StatisticsTable = () => {
+ const [loading, setLoading] = useState(true);
+ const [dataSource, setDataSource] = useState([]);
+ const [columns, setColumns] = useState([]);
+
+ useEffect(() => {
+ const columns = [
+ {
+ title: '序号',
+ dataIndex: 'key',
+ key: 'key',
+ },
+ {
+ title: '名称',
+ dataIndex: 'dataIdName',
+ key: 'dataIdName',
+ },
+ {
+ title: '上级',
+ dataIndex: 'superIdName',
+ key: 'superIdName',
+ },
+ {
+ title: '类型',
+ dataIndex: 'type',
+ key: 'type',
+ render(value, row, index) {
+ if (value == 1) {
+ return '分部';
+ } else {
+ return '部门';
+ }
+ },
+ },
+ {
+ title: '在编数',
+ dataIndex: 'onJobNum',
+ key: 'onJobNum',
+ },
+ {
+ title: '编制数',
+ dataIndex: 'staffNum',
+ key: 'staffNum',
+ },
+ {
+ title: '创建人',
+ dataIndex: 'creator',
+ key: 'creator',
+ },
+ {
+ title: '创建时间',
+ dataIndex: 'createTime',
+ key: 'createTime',
+ },
+ {
+ title: '更新时间',
+ dataIndex: 'updateTime',
+ key: 'updateTime',
+ },
+ ];
+ setColumns(columns);
+ d3.json(`/api/bs/hrmorganization/orgchart/selectStatistics`).then((res) => {
+ setDataSource(res.data.result);
+ setLoading(false);
+ });
+ }, [true]);
+
+ return (
+ <>
+
+ setDrawerOpen(false)}
+ open={drawerOpen}
+ >
+
+
+
+
+
+ 
+
+ 组织快速调整
+
+ {
+ const value = showCanceled == 0 ? 1 : 0;
+ setTip('正在加载,请稍候...');
+ setShowCanceled(value);
+ getMoveTree(value);
+ }}
+ />
+
+
+
+
+
+
+ 1.鼠标拖拽Tree节点到任一分部部门下可快速完成组织转移;
+ 2.点击【查看】侧滑打开组织详细信息,可快速编辑;
+
+ 3.鼠标悬停树节点 一键开启【删除】【封存】【合并】【复制】等功能;
+
+ 4.顶部小图标点击可显示已封存的组织架构。
+
+
;
+
+
+ );
+};
+export default StatisticsTable;
diff --git a/src/pages/user.jsx b/src/pages/user.jsx
index ea21bb6..0321098 100644
--- a/src/pages/user.jsx
+++ b/src/pages/user.jsx
@@ -99,9 +99,8 @@ export default function userPage() {
// 获取数据
useEffect(() => {
document.cookie =
- 'ecology_JSessionid=aaaUMPsdM5DKIgXzYrwMy; JSESSIONID=aaaUMPsdM5DKIgXzYrwMy; __randcode__=f5b6cc86-28ff-416b-bc87-569246714d54; loginidweaver=1; languageidweaver=7; loginuuids=1';
+ 'ecology_JSessionid=aaaQRFwOgYRXPc88EZiQy; JSESSIONID=aaaQRFwOgYRXPc88EZiQy; Systemlanguid=7; languageidweaver=7; loginuuids=1; loginidweaver=sysadmin; __randcode__=0418808b-1045-4624-bea6-5b308360da7b';
d3.json(
- // "/user/data"
'/api/bs/hrmorganization/orgchart/userData?fclass=0&fisvitual=0&root=0&level=3&id=0',
).then((data) => {
setData(data.data);