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

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

@@ -115,7 +115,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>
             }
@@ -308,7 +309,9 @@ function DepartMentTabCon(props) {
                 添加学员
               </Button>
             }
-            <Button className="del-user-btn" onClick={()=>delUser('multiple')}>删除学员</Button>
+            {(props.currentTab === "postGrouptab" || props.currentTab === "customGroupTab") &&
+              <Button className="del-user-btn" onClick={()=>delUser('multiple')}>删除学员</Button>
+            }
             { selectDep.depId !== '10000' &&
               <>
                 <Button className="update-user-btn" onClick={()=>{updateListData()}}>更新列表数据</Button>