除二开文件外 合并到20240719版本

src/components/drawer/index.jsx

@@ -367,7 +367,6 @@ export default class DrawerComponents extends React.Component {
   };
 
   onStatusChange = (checkedValues) => {
-    const { labelData } = this.props;
     if (checkedValues.length === 0) {
       return message.error(`${getLabel(547728, labelData)}`, 2);
     }
@@ -385,7 +384,6 @@ export default class DrawerComponents extends React.Component {
   };
 
   onTypeChange = (checkedValues) => {
-    const { labelData } = this.props;
     if (this.state.showJob) {
       return message.error(`${getLabel(547729, labelData)}`, 2);
     }

src/components/timeline/index.jsx

@@ -7,12 +7,10 @@
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
 import React from 'react';
-import { Timeline, Drawer, Popconfirm, message } from 'antd';
+import { Timeline, Drawer } from 'antd';
 import styles from './index.less';
 import leftTreeShow from './img/leftTree-show.png';
 import leftHide from './img/leftTree-hide.png';
-import { CloseCircleOutlined } from '@ant-design/icons';
-import { getLabel } from '../../util/i18n.js';
 
 export default class TimeLine extends React.Component {
   constructor(props) {
@@ -37,21 +35,6 @@ export default class TimeLine extends React.Component {
     this.props.onClick(data);
   }
 
-  handleDelete(key) {
-    const { labelData } = this.props;
-    let api = `/api/bs/hrmorganization/orgchart/versionDelete?versionId=${key}`;
-    fetch(api)
-      .then((res) => res.json())
-      .then((data) => {
-        if (data.api_status) {
-          message.success(`${getLabel(547484, labelData)}`, 2, 3);
-          window.location.reload(true);
-        } else {
-          message.error(`${getLabel(547483, labelData)}`, 2, 3);
-        }
-      });
-  }
-
   componentDidMount() {
     this.searchTimeLines(this.props.url);
   }
@@ -73,8 +56,6 @@ export default class TimeLine extends React.Component {
   };
 
   render() {
-    const { labelData } = this.props;
-
     let showStyle = {};
     let positionStyle = {};
     if (this.state.open) {
@@ -108,30 +89,14 @@ export default class TimeLine extends React.Component {
               return (
                 <Timeline.Item
                   key={item.key}
+                  onClick={this.handleLineClick.bind(this, item)}
                   className={styles.timeline}
                   color={item.color}
-                >
-                  <div
-                    className={styles.title}
                   style={{
                     color: item.color == 'blue' ? '#1890ff' : 'dimgray',
                   }}
-                    onClick={this.handleLineClick.bind(this, item)}
                 >
-                    {item.title}
-                  </div>
-                  {item.key != 0 && (
-                    <Popconfirm
-                      title={`${getLabel(547491, labelData)}[${item.title}]?`}
-                      onConfirm={this.handleDelete.bind(this, item.key)}
-                      okText={getLabel(547319, labelData)}
-                      cancelText={getLabel(547318, labelData)}
-                    >
-                      <div className={styles.delete}>
-                        <CloseCircleOutlined />
-                      </div>
-                    </Popconfirm>
-                  )}
+                  <div>{item.title}</div>
                   <div className={styles.time}>{item.time}</div>
                 </Timeline.Item>
               );

src/components/timeline/index.less

@@ -15,25 +15,21 @@
     cursor: pointer;
   }
 
-  // .timeline .title:hover {
-  //   color: #1890ff;
-  // }
+  .timeline :hover {
+    color: #1890ff;
+  }
 
   .time {
     color: dimgray;
   }
-
-  .delete :hover {
-    color: red;
-  }
 }
 
 .leftRightLayoutBtn {
   width: 18px;
   height: 60px;
-  position: fixed;
+  position: absolute;
   top: 50%;
-  // margin-top: -30px;
+  margin-top: -30px;
   z-index: 101;
   cursor: pointer;
 }

src/components/topBar/index.jsx

@@ -22,7 +22,7 @@ const { TextArea } = Input;
 import moment from 'moment';
 import 'moment/locale/zh-cn';
 import locale from 'antd/lib/date-picker/locale/zh_CN';
-import { HomeOutlined, FolderOutlined } from '@ant-design/icons';
+import { HomeOutlined } from '@ant-design/icons';
 moment.locale('zh-cn');
 import { getLabel } from '../../util/i18n.js';
 import { SmileOutlined } from '@ant-design/icons';
@@ -45,8 +45,6 @@ export class TopBar extends React.Component {
       open: false,
       confirmLoading: false,
       description: '',
-      timelineId: '0',
-      treeKey: 1,
     };
   }
 
@@ -59,29 +57,10 @@ export class TopBar extends React.Component {
     this.setState({ requestData });
   }
 
-  handleTreeData(treeData = [], timelineId) {
-    this.setState({
-      rootTreeData: treeData,
-      timelineId: timelineId,
-      treeKey: this.state.treeKey + 1,
-    });
-  }
-
   onChange = (e) => {
     this.setState({ description: e.target.value });
   };
 
-  generateKey = (
-    length = 5,
-    chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789',
-  ) => {
-    let result = '';
-    for (let i = 0; i < length; i++) {
-      result += chars.charAt(Math.floor(Math.random() * chars.length));
-    }
-    return result;
-  };
-
   /**
    * 弹窗确认
    */
@@ -138,9 +117,6 @@ export class TopBar extends React.Component {
           }
           arr.map((item, index) => {
             item.icon = <HomeOutlined />;
-            if (item.type == 2) {
-              item.icon = <FolderOutlined />;
-            }
           });
           this.setState({
             rootTreeData: arr,
@@ -159,14 +135,11 @@ export class TopBar extends React.Component {
       const { id } = treeNode;
       setTimeout(() => {
         const { fclass } = this.state.requestData;
-        const { timelineId } = this.state;
         let api =
           '/api/bs/hrmorganization/orgchart/getSubCompanyTree?subcompany=' +
           id +
           '&fclass=' +
-          fclass +
-          '&id=' +
-          timelineId;
+          fclass;
         this.getNodeTreeNode(api);
         resolve(undefined);
       }, 500);
@@ -219,8 +192,7 @@ export class TopBar extends React.Component {
 
   render() {
     const { disabled, type, labelData } = this.props;
-    const { rootTreeData, open, confirmLoading, treeExpandedKeys, treeKey } =
-      this.state;
+    const { rootTreeData, open, confirmLoading, treeExpandedKeys } = this.state;
 
     return (
       <div className={style.topbarWrapper}>
@@ -257,11 +229,9 @@ export class TopBar extends React.Component {
               ))}
             </Select>
           </Col>
-
-          <Col span={8}>
+          <Col span={6}>
             {getLabel(547294, labelData)}：
             <TreeSelect
-              key={treeKey}
               treeDataSimpleMode
               allowClear
               style={{ width: '65%' }}
@@ -274,7 +244,7 @@ export class TopBar extends React.Component {
               treeIcon
             />
           </Col>
-          <Col span={5}>
+          <Col span={6}>
             <Checkbox
               style={{ marginTop: '5px', marginLeft: 100 }}
               checked={this.state.requestData.hidedept == '1'}
@@ -296,7 +266,7 @@ export class TopBar extends React.Component {
               />
             </Tooltip>
           </Col>
-          <Col span={5}>
+          <Col span={6}>
             {getLabel(547299, labelData)}：
             <Select
               defaultValue="3"
@@ -334,8 +304,7 @@ export class TopBar extends React.Component {
               />
             </Tooltip>
           </Col>
-
-          <Col span={10}>
+          <Col span={16}>
             {this.state.requestData.fclass == '0' && (
               <span>
                 <Button
@@ -365,7 +334,7 @@ export class TopBar extends React.Component {
                   }}
                 >
                   {getLabel(547313, labelData)}
-                </Button>
+                </Button>{' '}
               </span>
             )}
 

src/pages/company.jsx

@@ -351,10 +351,6 @@ export default function companyPage() {
    */
   const handleExport = (type) => {
     if (type == 'png') {
-      const hiddenElements = document.querySelectorAll('.tooltitle');
-      const hiddenElementsArray = Array.from(hiddenElements);
-      // 从 DOM 中移除隐藏内容
-      hiddenElementsArray.forEach((el) => (el.style.display = 'none'));
       orgChart && orgChart.exportImg({ full: true });
     } else {
       orgChart && downloadPdf(orgChart);
@@ -375,8 +371,6 @@ export default function companyPage() {
       hidedept: '0',
     };
     topbar.handleFormChange({ ...resetParams });
-    //根节点初始化
-    topbar.handleTreeData([], timeline.id);
     topbar.getNodeTreeNode(
       `/api/bs/hrmorganization/orgchart/getSubCompanyTree?fclass=${fclass}&id=${timeline.id}`,
       false,
@@ -496,7 +490,6 @@ export default function companyPage() {
             timeLineSearch(timeline);
           }}
           url={'/api/bs/hrmorganization/orgchart/timeLines?fclass=0'}
-          labelData={labelData}
         />
         <Spin size="large" spinning={spinning}>
           <OrgChartComponent

src/pages/dragTree.jsx

@@ -5,7 +5,6 @@ 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 { getLabel } from '../util/i18n.js';
 
 import {
   HomeOutlined,
@@ -22,7 +21,7 @@ const DragTree = () => {
   const [expandedKeys, setExpandedKeys] = useState([undefined]);
   const childRef = useRef(null);
   const copyChildRef = useRef(null);
-  const [tip, setTip] = useState('');
+  const [tip, setTip] = useState('正在加载,请稍候...');
   const [loading, setLoading] = useState(false);
   const [showCanceled, setShowCanceled] = useState(0);
   const [drawerOpen, setDrawerOpen] = useState(false);
@@ -37,7 +36,6 @@ const DragTree = () => {
   useEffect(() => {
     d3.json('/api/bs/hrmorganization/orgchart/i18n').then((res) => {
       setLabelData(res.data);
-      setTip(`${getLabel(547473, res.data)}`);
     });
     getMoveTree(0);
   }, [true]);
@@ -77,26 +75,40 @@ const DragTree = () => {
     const dropPosition =
       info.dropPosition - Number(dropPos[dropPos.length - 1]);
 
-    if (dropPosition == -1) {
-      return message.error(`${getLabel(547475, labelData)}`, 2);
+    if (dropPosition == -1 || dropPosition == 1) {
+      return message.error('不支持该操作！！！', 2);
     }
-    let pos =
-      dropPosition == 0
-        ? `${getLabel(547476, labelData)}`
-        : `${getLabel(547477, labelData)}`;
 
-    let title = `${getLabel(547478, labelData)}【${
-      info.dragNode.title
-    } ${getLabel(547479, labelData)} 【${info.node.title}】${pos}`;
+    let pos = dropPosition == 0 ? '内部' : '下方';
+    let title = `确定将【${info.dragNode.title}】移到 【${info.node.title}】${pos}`;
     Modal.confirm({
-      title: `${getLabel(547480, labelData)}`,
+      title: '转移操作(仅转移到内部时工作流提醒生效)',
       content: title,
-      okText: `${getLabel(547319, labelData)}`,
-      cancelText: `${getLabel(547318, labelData)}`,
-      onOk() {
+      okText: '确认',
+      cancelText: '取消',
+      async onOk() {
         setLoading(true);
-        setTip(`${getLabel(547481, labelData)}`);
-
+        setTip('正在转移，请稍候...');
+        if (dropPosition == 0) {
+          let extend = 'dept';
+          let tranfeserType = 1;
+          if (dragKey.slice(0, 1).toLowerCase() === 's') {
+            extend = 'comp';
+            tranfeserType = 2;
+          }
+          if (dropKey.slice(0, 1).toLowerCase() === 's') {
+            tranfeserType = 2;
+          }
+          await messageRemind(
+            extend,
+            'MOVE',
+            dragKey.slice(1),
+            false,
+            dropKey.slice(1),
+            '',
+            tranfeserType,
+          );
+        }
         fetch('/api/bs/hrmorganization/dept/dragDepartment', {
           method: 'POST',
           headers: {
@@ -153,14 +165,14 @@ const DragTree = () => {
                 }
               }
               setGData(data);
-              message.success(`${getLabel(547482, labelData)}`, 2);
+              message.success('转移成功', 2);
             } else {
               message.warning(res.msg, 2);
             }
             setLoading(false);
           })
           .catch((error) => {
-            message.error(`${getLabel(547483, labelData)}`);
+            message.error('接口异常,请联系管理员');
           });
       },
       onCancel() {},
@@ -173,12 +185,14 @@ const DragTree = () => {
    */
   const onDelete = (nodeData) => {
     const extend = nodeData.type == '1' ? 'comp' : 'dept';
+    let id = nodeData.id.substring(1);
+    let title = nodeData.title;
     fetch(`/api/bs/hrmorganization/${extend}/deleteByIds`, {
       method: 'POST',
       headers: {
         'Content-Type': 'application/json',
       },
-      body: JSON.stringify({ ids: nodeData.id.substring(1) }),
+      body: JSON.stringify({ ids: id }),
     })
       .then((response) => response.json())
       .then((res) => {
@@ -189,14 +203,78 @@ const DragTree = () => {
               arr.splice(index, 1);
             });
             setGData(data);
-            message.success(`${getLabel(547484, labelData)}`, 2);
+            message.success('删除成功', 2);
+            messageRemind(extend, 'DELETE', title);
           } else {
             message.warning(res.data.message, 2);
           }
         }
       })
       .catch((error) => {
-        message.error(`${getLabel(547483, labelData)}`);
+        message.error('接口异常,请联系管理员');
+      });
+  };
+
+  /**
+   * 工作流提醒
+   */
+  const messageRemind = (
+    type,
+    operateType,
+    fromId,
+    canceled,
+    toId = '',
+    mergeName = '',
+    tranfeserType = null,
+  ) => {
+    debugger;
+    return new Promise((reslove, reject) => {
+      let params = {
+        workflowId: 1,
+        operateType: operateType,
+        mergeName: mergeName,
+        type: type,
+        canceled: canceled,
+        tranfeserType: tranfeserType,
+      };
+      if (type == 'dept') {
+        params = {
+          ...params,
+          departmentIdFrom: fromId,
+        };
+        if (tranfeserType == 2) {
+          params = {
+            ...params,
+            subCompanyIdTo: toId,
+          };
+        } else {
+          params = {
+            ...params,
+            departmentIdTo: toId,
+          };
+        }
+      } else {
+        params = {
+          ...params,
+          subCompanyIdFrom: fromId,
+          subCompanyIdTo: toId,
+        };
+      }
+
+      fetch('/api/bs/hrmorganization/remind/quickly/workflow/message', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify(params),
+      })
+        .then((response) => response.json())
+        .then((res) => {
+          reslove();
+        })
+        .catch((error) => {
+          message.error('系统默认工作流提醒失败');
+        });
     });
   };
 
@@ -207,14 +285,16 @@ const DragTree = () => {
   const onCancel = (nodeData) => {
     setShowCanceled(0);
     const extend = nodeData.type == '1' ? 'comp' : 'dept';
+    let id = nodeData.id.substring(1);
+    let canceled = nodeData.canceled != '0';
     fetch(`/api/bs/hrmorganization/${extend}/updateForbiddenTagById`, {
       method: 'POST',
       headers: {
         'Content-Type': 'application/json',
       },
       body: JSON.stringify({
-        id: nodeData.id.substring(1),
-        canceled: nodeData.canceled != '0',
+        id: id,
+        canceled: canceled,
       }),
     })
       .then((response) => response.json())
@@ -222,7 +302,7 @@ const DragTree = () => {
         if (res.code == 200) {
           const data = [...gData];
           if (nodeData.canceled != '0') {
-            message.success(`${getLabel(547485, labelData)}`, 2);
+            message.success('恢复成功', 2);
             loop(data, nodeData.key, (item, index, arr) => {
               arr[index].canceled = '0';
             });
@@ -230,15 +310,16 @@ const DragTree = () => {
             loop(data, nodeData.key, (item, index, arr) => {
               arr.splice(index, 1);
             });
-            message.success(`${getLabel(547486, labelData)}`, 2);
+            message.success('封存成功', 2);
           }
           setGData(data);
+          messageRemind(extend, 'CANCELED', id, canceled);
         } else {
           message.warning(res.msg, 2);
         }
       })
       .catch((error) => {
-        message.error(`${getLabel(547483, labelData)}`);
+        message.error('接口异常,请联系管理员');
       });
   };
 
@@ -255,10 +336,13 @@ const DragTree = () => {
   };
 
   const onMergeCreate = (values) => {
+    let fromId = mergeId.substring(1);
+    let toId = values.department.substring(1);
+    let mergeName = values.mergeName;
     let params = {
-      department: values.department.substring(1),
-      mergeName: values.mergeName,
-      id: mergeId.substring(1),
+      department: toId,
+      mergeName: mergeName,
+      id: fromId,
     };
     fetch('/api/bs/hrmorganization/dept/mergeDepartment', {
       method: 'POST',
@@ -271,14 +355,15 @@ const DragTree = () => {
       .then((res) => {
         if (res.code == 200) {
           getMoveTree(0, values.department);
-          message.success(`${getLabel(547487, labelData)}`, 2);
+          message.success('合并成功', 2);
+          messageRemind('dept', 'MERGE', fromId, false, toId, mergeName);
         } else {
           message.warning(res.msg, 2);
         }
         setOpen(false);
       })
       .catch((error) => {
-        message.error(`${getLabel(547483, labelData)}`);
+        message.error('接口异常,请联系管理员');
       });
   };
 
@@ -312,13 +397,13 @@ const DragTree = () => {
         if (res.code == 200) {
           setCopyOpen(false);
           getMoveTree(0, values.company);
-          message.success(`${getLabel(547488, labelData)}`, 2);
+          message.success('复制成功', 2);
         } else {
           message.warning(res.msg, 2);
         }
       })
       .catch((error) => {
-        message.error(`${getLabel(547483, labelData)}`);
+        message.error('接口异常,请联系管理员');
       });
   };
 
@@ -344,7 +429,7 @@ const DragTree = () => {
                 {nodeData.title}
                 {nodeData.canceled == '1' ? (
                   <span style={{ color: 'red', marginLeft: '5px' }}>
-                    ({getLabel(547489, labelData)})
+                    (已封存)
                   </span>
                 ) : (
                   ''
@@ -363,28 +448,25 @@ const DragTree = () => {
                   );
                 }}
               >
-                {getLabel(547490, labelData)}
+                查看
               </span>
-              <Popconfirm
-                title={`${getLabel(547491, labelData)}[${nodeData.title}]?`}
+              {/**<Popconfirm
+                title={`确认要删除[${nodeData.title}] 吗?`}
                 onConfirm={() => onDelete(nodeData)}
-                okText={getLabel(547319, labelData)}
-                cancelText={getLabel(547318, labelData)}
+                okText="确认"
+                cancelText="取消"
               >
-                <span className="drag-button">
-                  {getLabel(547492, labelData)}
-                </span>
+                <span className="drag-button">删除</span>
               </Popconfirm>
+              **/}
               <Popconfirm
-                title={`${getLabel(547493, labelData)} [${nodeData.title}]?`}
+                title={`确认要封存或恢复 [${nodeData.title}] 吗?`}
                 onConfirm={() => onCancel(nodeData)}
-                okText={getLabel(547319, labelData)}
-                cancelText={getLabel(547318, labelData)}
+                okText="确认"
+                cancelText="取消"
               >
                 <span className="drag-button">
-                  {nodeData.canceled == '0'
-                    ? `${getLabel(547494, labelData)}`
-                    : `${getLabel(547495, labelData)}`}
+                  {nodeData.canceled == '0' ? '封存' : '恢复'}
                 </span>
               </Popconfirm>
               <span
@@ -392,14 +474,14 @@ const DragTree = () => {
                 className="drag-button"
                 onClick={() => onMerge(nodeData)}
               >
-                {getLabel(547194, labelData)}
+                合并
               </span>
               <span
                 style={{ display: attr }}
                 className="drag-button"
                 onClick={() => onCopy(nodeData)}
               >
-                {getLabel(547196, labelData)}
+                复制
               </span>
             </div>
           </>
@@ -413,13 +495,12 @@ const DragTree = () => {
   };
 
   return (
-    Object.keys(labelData).length != 0 && (
     <div className="drag-wrapper">
       <Spin tip={tip} spinning={loading}>
         <div className="drag-layout">
           <div className="drag-header">
             <img src={inset} />
-              <div>{getLabel(547282, labelData)}</div>
+            <div>组织快速调整</div>
           </div>
           <div className="drag-content">
             <ApartmentOutlined
@@ -427,7 +508,7 @@ const DragTree = () => {
               style={{ color: showCanceled == 0 ? '#000' : '#1890ff' }}
               onClick={() => {
                 const value = showCanceled == 0 ? 1 : 0;
-                  setTip(`${getLabel(547473, labelData)}`);
+                setTip('正在加载,请稍候...');
                 setShowCanceled(value);
                 getMoveTree(value);
               }}
@@ -459,13 +540,15 @@ const DragTree = () => {
           <div className="drag-footer">
             <p>
               <QuestionCircleOutlined />
-                {getLabel(547283, labelData)}
+              小提示
             </p>
             <div className="tips">
-                <div>1.{getLabel(547284, labelData)}</div>
-                <div>2.{getLabel(547285, labelData)}</div>
-                <div>3.{getLabel(547286, labelData)}</div>
-                <div>4.{getLabel(547287, labelData)}</div>
+              <div>1.鼠标拖拽Tree节点到任一分部部门下可快速完成组织转移;</div>
+              <div>2.点击【查看】侧滑打开组织详细信息,可快速编辑;</div>
+              <div>
+                3.鼠标悬停树节点 一键开启【删除】【封存】【合并】【复制】等功能;
+              </div>
+              <div>4.顶部小图标点击可显示已封存的组织架构。</div>
             </div>
           </div>
         </div>
@@ -490,7 +573,6 @@ const DragTree = () => {
         labelData={labelData}
       />
     </div>
-    )
   );
 };
 export default DragTree;

src/pages/user.jsx

@@ -99,7 +99,7 @@ export default function userPage() {
   // 获取数据
   useEffect(() => {
     document.cookie =
-      'ecology_JSessionid=aaaLiDqzA0rZHgPBdxGez; JSESSIONID=aaaLiDqzA0rZHgPBdxGez; Systemlanguid=7; languageidweaver=7; loginuuids=1; loginidweaver=sysadmin; __randcode__=7b9b3b9b-a780-4d6a-b8d5-22d0f8aaf11a';
+      'ecology_JSessionid=aaayMjvxCzkVJaNpQnW7y; JSESSIONID=aaayMjvxCzkVJaNpQnW7y; __randcode__=d1d05beb-637c-4417-bee5-e7ee0061eb7e; Systemlanguid=7; languageidweaver=7; loginidweaver=sysadmin;';
     d3.json(
       '/api/bs/hrmorganization/orgchart/userData?fclass=0&fisvitual=0&root=0&level=3&id=0',
     ).then((data) => {