Merge branch 'feature/zhangleyuan/20210719/personnel-organization' into dev

src/modules/college-manage/components/LeftStructureTree.jsx

@@ -62,29 +62,23 @@ function LeftStructureTree(props) {
   const notFoundContentNode = ()=>{
   const notFoundContentNode = ()=>{
     return <span>暂无数据</span>
     return <span>暂无数据</span>
   }
   }
-
-  const Complete = () => (
-    <AutoComplete
-      dropdownClassName="certain-category-search-dropdown"
-      dropdownMatchSelectWidth={250}
-      allowClear
-      // onChange={(value)=>{setQueryName(value)}}
-      onSearch={(value)=>{setQueryName(value)}}
-      notFoundContent={notFoundContentNode()}
-      value={queryName}
-      open={open}
-      onFocus={()=>{setOpen(true)}}
-      onBlur={()=>{setOpen(false)}}
-      style={{
-        width: 250,
-      }}
-      options={completeOptions}
-      onSelect={confirmSearchSelect}
-      placeholder='搜索员工、部门'
-    >
-    </AutoComplete>
-  );
-
+  function handlePlaceHolder(){
+    let placeholder = '';
+    switch (props.treeType){
+      case 'departMentTab':
+        placeholder = '搜索学员姓名、部门';
+      break;
+      case 'postGrouptab':
+        placeholder = '搜索学员姓名/岗位/岗位组';
+      break;
+      case 'customGroupTab':
+        placeholder = '搜索学员姓名/自定义分组集合/自定义分组';
+      break;
+      default:
+      break;  
+    }
+    return placeholder
+  }
   function confirmSearchSelect(value,option){
   function confirmSearchSelect(value,option){
     console.log('option',option);
     console.log('option',option);
     setOpen(false);
     setOpen(false);
@@ -115,7 +109,7 @@ function LeftStructureTree(props) {
       const { result = {}} = res;
       const { result = {}} = res;
       const {departmentUserVOList=[],departmentVOList=[],subLevelDepartmentVOList=[]} = result;
       const {departmentUserVOList=[],departmentVOList=[],subLevelDepartmentVOList=[]} = result;
       if(departmentUserVOList.length>0){
       if(departmentUserVOList.length>0){
-        userObj.label=renderTitle('员工');
+        userObj.label=renderTitle('学员');
         userObj.options=departmentUserVOList.map((item,index)=>{
         userObj.options=departmentUserVOList.map((item,index)=>{
           return renderItem(item,'user');
           return renderItem(item,'user');
         })
         })
@@ -461,7 +455,7 @@ function LeftStructureTree(props) {
               }}
               }}
               options={completeOptions}
               options={completeOptions}
               onSelect={confirmSearchSelect}
               onSelect={confirmSearchSelect}
-              placeholder='搜索员工、部门'
+              placeholder={handlePlaceHolder()}
             >
             >
             </AutoComplete>
             </AutoComplete>
           </div>
           </div>

src/modules/college-manage/modal/AddOrEditPostGroupModal.jsx

@@ -2,7 +2,7 @@
  * @Author: wufan
  * @Author: wufan
  * @Date: 2020-11-27 16:21:49
  * @Date: 2020-11-27 16:21:49
  * @LastEditors: Please set LastEditors
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-08-06 11:43:10
+ * @LastEditTime: 2021-08-06 15:07:53
  * @Description: Description
  * @Description: Description
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */
  */
@@ -24,7 +24,7 @@ function AddOrEditPostGroupModal(props) {
     setIsError(false)
     setIsError(false)
     setValidateStatus('success');
     setValidateStatus('success');
     setNameErrorMsg('');
     setNameErrorMsg('');
-    if(!postGroupName || /^\s+$/.test(postGroupName)){
+    if((!postGroupName) || /^\s+$/.test(postGroupName)){
       setValidateStatus('error');
       setValidateStatus('error');
       setNameErrorMsg(`${props.label}不能为空`);
       setNameErrorMsg(`${props.label}不能为空`);
       setIsError(true)
       setIsError(true)

src/modules/college-manage/modal/SetEmployeeModal.jsx

@@ -19,13 +19,27 @@ export default class SetEmployeeModal extends React.Component {
     })
     })
     const selectedData = list[0] || {};
     const selectedData = list[0] || {};
     this.state = {
     this.state = {
-      list,
+      list:this.uniqArr([...list]),
       selected: selectedData.userId,
       selected: selectedData.userId,
       roleCode: selectedData.roleCode,
       roleCode: selectedData.roleCode,
       submit:false
       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) {
   handleChangeValues(value) {
     const { list, selected } = this.state;
     const { list, selected } = this.state;
     list.map((item) => {
     list.map((item) => {
@@ -34,7 +48,7 @@ export default class SetEmployeeModal extends React.Component {
       }
       }
     })
     })
     this.props.onChange(selected, value);
     this.props.onChange(selected, value);
-    this.setState({ roleCode: value, list });
+    this.setState({ roleCode: value, list});
   }
   }
 
 
   render() {
   render() {