fix:解决合并人员组织架构分支的冲突

11f4ee76 · yuananting · 422e709c · 4c65917e · 11f4ee76 · 11f4ee76
Commit 11f4ee76 authored Aug 09, 2021 by yuananting
13 changed files
--- a/src/modules/college-manage/EmployeeManage.less
+++ b/src/modules/college-manage/EmployeeManage.less
@@ -17,4 +17,10 @@
        font-size:14px;
        color:#5289FA;
    }
+    .post-name{
+        max-width: 200px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
 }
\ No newline at end of file
--- a/src/modules/college-manage/EmployeeManage.tsx
+++ b/src/modules/college-manage/EmployeeManage.tsx
@@ -9,7 +9,7 @@ import React, { useEffect, useState } from 'react';
 import { withRouter } from 'react-router-dom';
 import _ from 'underscore';
 import { CheckBox, PageControl } from '@/components';
-import { Button, Table, Modal, message, Input } from 'antd';
+import { Button, Table, Modal, message, Input, Tooltip } from 'antd';
 import { XMTable } from '@/components';
 import college from '@/common/lottie/college.json';
 import StoreService from '@/domains/store-domain/storeService';
@@ -33,7 +33,7 @@ interface RecordTypes {
  phone: string;
  avatar?: string;
  weChatAccount?: string;
-  depNameList: Array<string>;
+  depNameList: any;
 }
 interface RoleItemType {
@@ -58,6 +58,7 @@ interface ChoosedItemType {
  avatar?: string;
  storeUserId?: string;
  weChatAccount?: string;
+  depNameList?: any;
 }
 function EmployeeManage() {
@@ -140,7 +141,7 @@ function EmployeeManage() {
    const columns = [
      {
        title: '员工',
-        dataIndex: 'nickName',
+        dataIndex: 'weChatAccount',
        render: (val: string, record: RecordTypes) => {
          return (
            <div className='employee-info'>
@@ -170,14 +171,27 @@ function EmployeeManage() {
          if (!record.depNameList) {
            return <span>-</span>;
          }
-          return record.depNameList.map((item, index) => {
+          if (record.depNameList.length === 0) {
-            return (
+            return <span>-</span>;
-              <span>
+          }
-                <WWOpenDataCom type='departmentName' openid={item} />
+          // return record.depNameList.map((item,index)=>{
-                {index < record.depNameList.length - 1 ? '、' : ''}
+          //   return <span><WWOpenDataCom type="departmentName" openid={item}/>{index<(record.depNameList.length -1)?';':''}</span>;
-              </span>
+          // })
-            );
+          return (
-          });
+            <Tooltip title={<div>{handleDepName(record.depNameList)}</div>} placement='top' arrowPointAtCenter>
+              <div className='post-name'>
+                {' '}
+                {record.depNameList.map((item: any, index: any) => {
+                  return (
+                    <span>
+                      <WWOpenDataCom type='departmentName' openid={item} />
+                      {index < record.depNameList.length - 1 ? '；' : ''}
+                    </span>
+                  );
+                })}
+              </div>
+            </Tooltip>
+          );
        },
      },
      {
@@ -227,8 +241,19 @@ function EmployeeManage() {
    return columns;
  }
+  function handleDepName(depArray: any): any {
+    const depArrayDom = depArray.map((item: any, index: any) => {
+      return (
+        <span>
+          <WWOpenDataCom type='departmentName' openid={item} />；
+        </span>
+      );
+    });
+    return depArrayDom;
+  }
  function handleEditEmployee(record: RecordTypes) {
-    const { nickName, phone, roleCodes, avatar, id, weChatAccount } = record;
+    const { nickName, phone, roleCodes, avatar, id, weChatAccount, depNameList } = record;
    const _choosesItem = {
      nickName: nickName,
      phone: phone,
@@ -236,6 +261,7 @@ function EmployeeManage() {
      avatar: avatar,
      storeUserId: id,
      weChatAccount,
+      depNameList: depNameList,
    };
    setChooseItem(_choosesItem);
    const model: React.ReactNode = (
@@ -251,6 +277,7 @@ function EmployeeManage() {
            avatar: '',
            storeUserId: '',
            weChatAccount: '',
+            depNameList: [],
          });
        }}
        isWorkWechat={isWorkWechat}
@@ -326,10 +353,10 @@ function EmployeeManage() {
      userType: 'USER',
    };
    StoreService.syncWorkWeChatDepartment(params).then((res) => {
+      getEmployeeList();
      message.success('已更新');
    });
  }
  return (
    <div className='page employee-manage-page'>
      <div className='content-header'>角色管理</div>
@@ -459,35 +486,39 @@ function EmployeeManage() {
            bordered
          />
        </div>
-        <div className='box-footer'>
+        {model}
-          <PageControl
+        {employeeModal && (
-            current={query.current}
+          <NewChooseMembersModal
-            pageSize={query.size}
+            treeDepType='DEP_CHAT'
-            total={total}
+            visible={employeeModal}
-            toPage={(page: any) => {
+            type='USER'
-              const queryStates = _.clone(query);
+            close={() => {
-              queryStates.current = page;
+              setEmployeeModal(false);
-              setQuery(queryStates);
+            }}
+            onConfirm={() => {
+              setEmployeeModal(false);
+              message.success('添加成功');
+              getEmployeeList();
            }}
          />
-        </div>
+        )}
+        {model}
+        {employeeModal && (
+          <NewChooseMembersModal
+            treeDepType='DEP_CHAT'
+            visible={employeeModal}
+            type='USER'
+            close={() => {
+              setEmployeeModal(false);
+            }}
+            onConfirm={() => {
+              setEmployeeModal(false);
+              message.success('添加成功');
+              getEmployeeList();
+            }}
+          />
+        )}
      </div>
-      {model}
-      {employeeModal && (
-        <NewChooseMembersModal
-          treeDepType='DEP_CHAT'
-          visible={employeeModal}
-          type='USER'
-          close={() => {
-            setEmployeeModal(false);
-          }}
-          onConfirm={() => {
-            setEmployeeModal(false);
-            message.success('添加成功');
-            getEmployeeList();
-          }}
-        />
-      )}
    </div>
  );
 }

--- a/src/modules/college-manage/components/DepartMentTabCon.jsx
+++ b/src/modules/college-manage/components/DepartMentTabCon.jsx
 import React, { useEffect, useState } from "react";
 import { withRouter } from "react-router-dom";
-import { Button, Input, message,Modal} from "antd";
+import { Button, Input, message,Modal,Tooltip} from "antd";
 import NewChooseMembersModal from "@/modules/college-manage/modal/NewChooseMembersModal";
 import LeftStructureTree from "./LeftStructureTree";
 import { XMTable, PageControl } from "@/components";
@@ -37,8 +37,8 @@ function DepartMentTabCon(props) {
        return (
          <div>
            {item.sourceEnum === "WORK_WE_CHAT" ?
-               <span> <WWOpenDataCom type="userName" openid={val}/></span>:
+              <Tooltip title={<div><WWOpenDataCom type="userName" openid={val}/></div>}><span className="student-name"><WWOpenDataCom type="userName" openid={val}/></span></Tooltip>:
-               <span>{val}</span>
+              <Tooltip title={val}><span className="student-name">{val}</span></Tooltip>
            }
            <span
              className="tag"
@@ -73,17 +73,17 @@ function DepartMentTabCon(props) {
      title: "岗位",
      dataIndex: "depNameList",
      render: (val, record) => {
        if(!record.depNameList){
          return <span>-</span>
        }else{
          if(record.depNameList.length === 0){
            return <span>-</span>
          }
-          return <div className="post-name"> {record.depNameList.map((item, index) => {
+          return <Tooltip title={handleDepName(record.depNameList)} placement='top' arrowPointAtCenter><div className="post-name"> {record.depNameList.map((item, index) => {
-            return <span>{item}{index!==record.depNameList.length-1 && <span>、</span>}</span>;
+            return <span>{item}{index!==record.depNameList.length-1 && <span>；</span>}</span>
            })}
          </div>
+          </Tooltip>
        }
      }
@@ -92,7 +92,11 @@ function DepartMentTabCon(props) {
      title: "手机号",
      dataIndex: "phone",
      render: (val, item) => {
-        return <span>{val}</span>;
+        if(!val){
+            return <span>-</span>
+        }else{
+          return <span>{item.phone}</span>
+        }
      },
    },
    {
@@ -110,7 +114,8 @@ function DepartMentTabCon(props) {
        return (
          <div className="operate">
            {props.currentTab==='departMentTab'?
-              <div className="operate__item" onClick={()=>delUser('single',item.userId)}>删除</div>
+              <span>-</span>
+              // <div className="operate__item" onClick={()=>delUser('single',item.userId)}>删除</div>
              :
              <div className="operate__item" onClick={()=>delUser('single',item.userId)}>移出</div>
            }
@@ -119,6 +124,17 @@ function DepartMentTabCon(props) {
      },
    },
  ];
+  function handleDepName(depArray){
+    let depStr = '';
+    depArray.forEach((item, index) => {
+      if (index < depArray.length - 1) {
+        depStr = depStr + item + '；';
+      } else {
+        depStr = depStr + item;
+      }
+    });
+    return depStr;
+  };
  function closeChooseMembersModal() {
    setChooseMembersModalVisible(false);
  }
@@ -197,7 +213,7 @@ function DepartMentTabCon(props) {
      storeId:User.getStoreId()
    }
    console.log('selectDep',selectDep)
-    if(selectDep.id==='100'){
+    if(selectDep.depId==='10000'){
      params.userType='WE_CHAT';
    }else{
      params.userType='WORK_WE_CHAT';
@@ -205,7 +221,7 @@ function DepartMentTabCon(props) {
    StoreService.delDepartmentUser(params).then((res) => {
      message.success(`删除成功`);
      getUserList();
-      Bus.trigger("changeTreeData");
+      Bus.trigger("changeTreeData",{treeType:props.currentTab});
    });
  }
  function handleSelectUserList(record, selected){
@@ -281,7 +297,7 @@ function DepartMentTabCon(props) {
      <div className="table-con">
        {props.currentTab === "departMentTab" && (
          <div className="operate-area">
-            { selectDep.id !== '100' &&
+            { selectDep.depId !== '10000' &&
              <Button
                type="primary"
                className="add-user-btn"
@@ -292,8 +308,10 @@ function DepartMentTabCon(props) {
                添加学员
              </Button>
            }
-            <Button className="del-user-btn" onClick={()=>delUser('multiple')}>删除学员</Button>
+            {(props.currentTab === "postGrouptab" || props.currentTab === "customGroupTab") &&
-            { selectDep.id !== '100' &&
+              <Button className="del-user-btn" onClick={()=>delUser('multiple')}>删除学员</Button>
+            }
+            { selectDep.depId !== '10000' &&
              <>
                <Button className="update-user-btn" onClick={()=>{updateListData()}}>更新列表数据</Button>
                <span className="origin-text">数据来源企业微信通讯录</span>

--- a/src/modules/college-manage/components/DepartMentTabCon.less
+++ b/src/modules/college-manage/components/DepartMentTabCon.less
@@ -9,6 +9,14 @@
          text-overflow: ellipsis;
          white-space: nowrap;
        }
+        .student-name{
+          max-width: 120px;
+          white-space:nowrap;
+          overflow:hidden;
+          text-overflow:ellipsis;
+          vertical-align: middle;
+          display: inline-block; 
+        }
        .operate-area{
          margin-bottom:16px;
          .add-user-btn{

--- a/src/modules/college-manage/components/LeftStructureTree.jsx
+++ b/src/modules/college-manage/components/LeftStructureTree.jsx
--- a/src/modules/college-manage/components/LeftStructureTree.less
+++ b/src/modules/college-manage/components/LeftStructureTree.less
 .left-structure-tree {
    margin-right: 24px;
-    width:250px;
+    width:260px;
    height: calc(~'100vh - 260px');
+    overflow-y: scroll;
    .organization{
      overflow: scroll;
      .search-con{

--- a/src/modules/college-manage/components/MemberTree.jsx
+++ b/src/modules/college-manage/components/MemberTree.jsx
@@ -38,6 +38,7 @@ function MemberTree(props) {
  }
  function handleData(dataArray){
    const _dataArray = dataArray.map((item,index)=>{
+      item.title = "";
      item.key=item.id;
      item.children = []
      if(item.departmentUserVOList){

--- a/src/modules/college-manage/modal/AddOrEditPostGroupModal.jsx
+++ b/src/modules/college-manage/modal/AddOrEditPostGroupModal.jsx
@@ -2,7 +2,7 @@
 * @Author: wufan
 * @Date: 2020-11-27 16:21:49
 * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-08-03 17:23:40
+ * @LastEditTime: 2021-08-06 17:10:50
 * @Description: Description
 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
 */
@@ -16,24 +16,28 @@ function AddOrEditPostGroupModal(props) {
  const [nameErrorMsg,setNameErrorMsg] = useState('');
  const [validateStatus,setValidateStatus] = useState('success');
  const [postGroupName,setPostGroupName] = useState('');
+  const [isError,setIsError] = useState(false)
  useEffect(() => {
  },[]);
  function changePostGroupName(e){
-    let isError = false;
+    setIsError(false)
    setValidateStatus('success');
    setNameErrorMsg('');
+    if((!e.target.value) || /^\s+$/.test(e.target.value)){
+      setValidateStatus('error');
+      setNameErrorMsg(`${props.label}不能为空`);
+      setIsError(true)
+    }
    props.postGroupTreeData.map((item,index)=>{
        if(item.name === e.target.value){
          setValidateStatus('error');
          setNameErrorMsg(`该${props.label}已存在`);
-          isError = true;
+          setIsError(true)
        }
        return item;
    })
-    if(!isError){
+    setPostGroupName(e.target.value);
-      setPostGroupName(e.target.value);
-    }
  }
  function handleConfirm(){
@@ -44,10 +48,11 @@ function AddOrEditPostGroupModal(props) {
    }
  }
  function addGroup(){
-    if(!postGroupName){
+    if(isError){
      return;
    }
    const { postGroupModalLevel,currentTab,currentGroupData,label} = props
    let parmas={
      depLevel:postGroupModalLevel,
      depType:DepType[currentTab],
@@ -68,7 +73,7 @@ function AddOrEditPostGroupModal(props) {
    });
  }
  function editGroup(){
-    if(!postGroupName){
+    if(isError){
      return;
    }
    const {postGroupModalLevel,currentTab,currentGroupData,label} = props

--- a/src/modules/college-manage/modal/ChooseMembersModal.jsx
+++ b/src/modules/college-manage/modal/ChooseMembersModal.jsx
@@ -16,7 +16,6 @@ import './ChooseMembersModal.less';
 import _ from 'underscore';
 const { Search } = Input;
 class ChooseMembersModal extends React.Component {
  constructor(props) {
    super(props);
@@ -162,6 +161,7 @@ class ChooseMembersModal extends React.Component {
        })   
      }
    })
  }
  addCustomer = () => {

--- a/src/modules/college-manage/modal/NewChooseMembersModal.jsx
+++ b/src/modules/college-manage/modal/NewChooseMembersModal.jsx
@@ -119,9 +119,15 @@ class NewChooseMembersModal extends React.Component {
        _item.departmentId = item.departmentId;
        _item.enterpriseVisibleUserId = item.userId;
      }else{
-        _item.depUserType = 'STORE_USER';
+        if(item.depId === '10000'){
-        _item.departmentId = this.props.selectDep.id;
+          _item.depUserType = 'WE_CHART_USER'; // depid=10000代表是微信学员
+          _item.userId = item.userId;
+        }else{
+          _item.depUserType = 'STORE_USER';
+        }
        _item.enterpriseVisibleUserId = item.enterpriseUserId;
+        _item.departmentId = this.props.selectDep.id;
      }
      return _item 
    })

--- a/src/modules/college-manage/modal/SetEmployeeModal.jsx
+++ b/src/modules/college-manage/modal/SetEmployeeModal.jsx
@@ -19,12 +19,27 @@ export default class SetEmployeeModal extends React.Component {
    })
    const selectedData = list[0] || {};
    this.state = {
-      list,
+      list:this.uniqArr([...list]),
      selected: selectedData.userId,
      roleCode: selectedData.roleCode,
+      submit:false
    }
  }
+  uniqArr(arr){
+    let obj={};
+    arr.map((item,index)=>{
+        // 若重复则删除该项
+        if(obj.hasOwnProperty(item.userId)){
+            arr.splice(index,1);
+        // 不重复则存入obj
+        }else{
+            obj[item.userId]=item.userName;
+        }
+    });
+    return arr;
+  }
  handleChangeValues(value) {
    const { list, selected } = this.state;
    list.map((item) => {
@@ -33,7 +48,7 @@ export default class SetEmployeeModal extends React.Component {
      }
    })
    this.props.onChange(selected, value);
-    this.setState({ roleCode: value, list });
+    this.setState({ roleCode: value, list});
  }
  render() {
@@ -41,6 +56,7 @@ export default class SetEmployeeModal extends React.Component {
      list,
      roleCode,
      selected,
+      submit
    } = this.state;
    return (
      <Modal
@@ -55,7 +71,7 @@ export default class SetEmployeeModal extends React.Component {
          <div className="modal-footer">
            <Button style={{ float: 'left' }} onClick={() => this.props.onClose()}>上一步</Button>
            <Button onClick={() => this.props.onCancel()}>取消</Button>
-            <Button onClick={() => this.props.onOk(list)} type="primary">确定</Button>
+            <Button onClick={() =>{this.setState({submit:true},()=>this.props.onOk(list))}} type="primary" disabled={submit}>确定</Button>
          </div>
        }
      >

--- a/src/modules/root/Header.jsx
+++ b/src/modules/root/Header.jsx
@@ -2,7 +2,7 @@
 * @Author: 吴文洁
 * @Date: 2019-09-10 18:26:03
 * @LastEditors: yuananting
- * @LastEditTime: 2021-08-05 19:50:53
+ * @LastEditTime: 2021-08-09 19:20:55
 * @Description:
 */
 import React, { useRef, useContext, useEffect, useState } from 'react';
@@ -76,8 +76,8 @@ function Header(props) {
      storeUserId: User.getStoreUserId(),
    };
    BaseService.getStoreUser(param).then((res) => {
-      const { nickName, phone } = res.result;
+      const { weChatAccount, phone } = res.result;
-      setNickName(nickName);
+      setNickName(weChatAccount);
      setPhone(phone);
      setAvatar(res.result.avatar);
      User.setAvatar(res.result.avatar);

--- a/src/modules/store-manage/EmployeeAddOrEditModal.tsx
+++ b/src/modules/store-manage/EmployeeAddOrEditModal.tsx