Commit 4a133475 by zhangleyuan

feat:处理学员的搜索

parent aca11922
......@@ -175,6 +175,9 @@ function EmployeeManage() {
dataIndex: "depNameList",
key: "depNameList",
render: (val:string,record:RecordTypes) => {
if(!record.depNameList){
return <span></span>
}
return record.depNameList.map((item,index)=>{
return <span>{item}{index<(record.depNameList.length -1)?'、':''}</span>;
})
......
......@@ -112,7 +112,6 @@ function DepartMentTabCon(props) {
function closeChooseMembersModal() {
setChooseMembersModalVisible(false);
}
function getUserList(record,treeType,current) {
const params = {
...query,
......@@ -122,6 +121,7 @@ function DepartMentTabCon(props) {
storeId: User.getStoreId(),
userId: User.getUserId(),
};
if(record){
if(record.id){
params.departmentId = record.id;
}else{
......@@ -132,6 +132,7 @@ function DepartMentTabCon(props) {
}else{
params.queryName = null;
}
}
if (current) {
params.current = current;
}
......
......@@ -6,6 +6,7 @@ import User from '@/common/js/user'
import StoreService from "@/domains/store-domain/storeService";
import { DepType } from '@/domains/store-domain/constants';
import Bus from '@/core/bus';
import WWOpenDataCom from '@/components/WWOpenDataCom';
import "./LeftStructureTree.less";
const { Search } = Input;
......@@ -491,7 +492,11 @@ function LeftStructureTree(props) {
: "78%",
}}
>
{ props.treeType==='departMentTab'?
<span><WWOpenDataCom type="departmentName" openid={nodeData.name}/></span>
:
<span>{nodeData.name}</span>
}
</div>
<div className="item-count">({nodeData.departmentCount || 0})</div>
{ (props.treeType==='postGrouptab' || props.treeType=== 'customGroupTab') && (
......
......@@ -2,11 +2,11 @@ import React, { useEffect, useState } from "react";
import { withRouter } from "react-router-dom";
import { Tree} from "antd";
import StoreService from "@/domains/store-domain/storeService";
import User from '@/common/js/user'
import User from '@/common/js/user';
import WWOpenDataCom from '@/components/WWOpenDataCom';
import "./MemberTree.less";
import _ from 'underscore';
const { DirectoryTree } = Tree;
function MemberTree(props) {
const [treeData,setTreeData]=useState([]);
useEffect(()=>{
......@@ -76,12 +76,12 @@ function MemberTree(props) {
{nodeData.userId ?
<div>
<span className="icon iconfont title-icon">&#xe603;</span>
<span>{nodeData.userName}</span>
<span><WWOpenDataCom type="userName" openid={nodeData.userName}/></span>
</div>
:
<div>
<span className="icon iconfont title-icon">&#xe604;</span>
<span>{nodeData.name}</span>
<span><WWOpenDataCom type="departmentName" openid={nodeData.name}/></span>
</div>
}
</div>
......
import React, { useEffect, useState } from "react";
import { withRouter } from "react-router-dom";
import { Input} from "antd";
import StoreService from "@/domains/store-domain/storeService";
import User from '@/common/js/user';
import WWOpenDataCom from '@/components/WWOpenDataCom';
const { Search } = Input;
function SearchUser(props) {
return (
<div className="search-user">
<Search
placeholder='搜索成员'
className='search search-input'
enterButton={<span className="icon iconfont">&#xe832;</span>}
/>
<div className="drop-down">
<div>
<div>
员工
</div>
<div>
<div>
<div>佳欢</div>
<div>小麦助教</div>
</div>
<div>
<div>佳欢</div>
<div>小麦助教</div>
</div>
</div>
</div>
</div>
</div>
);
}
export default withRouter(SearchUser);
......@@ -15,6 +15,7 @@ import search from '../../lottie/search/data.json';
import MemberTree from '../components/MemberTree'
import { DepType } from "@/domains/store-domain/constants";
import StoreService from "@/domains/store-domain/storeService";
import SearchUser from "../components/SearchUser"
import './ChooseMembersModal.less';
import _ from 'underscore';
......@@ -296,7 +297,8 @@ class NewChooseMembersModal extends React.Component {
className='search search-input'
enterButton={<span className="icon iconfont">&#xe832;</span>}
/> */}
{this.Complete()}
{/* {this.Complete()} */}
<SearchUser/>
<div className='container-left-body-table'>
<MemberTree treeDepType={treeDepType} onSelect={(record)=>{this.treeSelect(record)}} selectUserList={selectUserList}/>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment