Commit e5172866 by zhangleyuan

feat:处理中文不能输入的问题

parent c1e330b9
...@@ -263,7 +263,7 @@ function DepartMentTabCon(props) { ...@@ -263,7 +263,7 @@ function DepartMentTabCon(props) {
<div className="department-tab-con"> <div className="department-tab-con">
<LeftStructureTree <LeftStructureTree
treeType={props.currentTab} treeType={props.currentTab}
searchUserList={(params,treeType) => getUserList(params,treeType)} searchUserList={(params,treeType) => getUserList(params,treeType,1)}
onChangeSelectDep={(record)=>{setSelectDep(record)}} onChangeSelectDep={(record)=>{setSelectDep(record)}}
/> />
<div className="table-con"> <div className="table-con">
...@@ -352,7 +352,7 @@ function DepartMentTabCon(props) { ...@@ -352,7 +352,7 @@ function DepartMentTabCon(props) {
const queryStates = _.clone(query); const queryStates = _.clone(query);
queryStates.current = page; queryStates.current = page;
setQuery(queryStates); setQuery(queryStates);
getUserList(); getUserList(null,null,current);
}} }}
/> />
</div> </div>
......
...@@ -68,7 +68,8 @@ function LeftStructureTree(props) { ...@@ -68,7 +68,8 @@ function LeftStructureTree(props) {
dropdownClassName="certain-category-search-dropdown" dropdownClassName="certain-category-search-dropdown"
dropdownMatchSelectWidth={250} dropdownMatchSelectWidth={250}
allowClear allowClear
onChange={getCompleteOptionData} // onChange={(value)=>{setQueryName(value)}}
onSearch={(value)=>{setQueryName(value)}}
notFoundContent={notFoundContentNode()} notFoundContent={notFoundContentNode()}
value={queryName} value={queryName}
open={open} open={open}
...@@ -92,7 +93,7 @@ function LeftStructureTree(props) { ...@@ -92,7 +93,7 @@ function LeftStructureTree(props) {
// 获取关键词的搜索结果 // 获取关键词的搜索结果
function getCompleteOptionData(value){ function getCompleteOptionData(value){
setQueryName(value); // setQueryName(value);
const params = { const params = {
depType:DepType[props.treeType], depType:DepType[props.treeType],
queryName:value, queryName:value,
...@@ -402,22 +403,26 @@ function LeftStructureTree(props) { ...@@ -402,22 +403,26 @@ function LeftStructureTree(props) {
<div className="left-structure-tree"> <div className="left-structure-tree">
<div className="organization"> <div className="organization">
<div className="search-con"> <div className="search-con">
<Complete/> {/* <Complete/> */}
{/* <AutoComplete <AutoComplete
dropdownClassName="certain-category-search-dropdown"
dropdownMatchSelectWidth={250}
allowClear allowClear
onChange={(value)=>setQueryName(value)}
onSearch={(value)=>{getCompleteOptionData(value)}}
notFoundContent={notFoundContentNode()}
value={queryName}
open={open}
onFocus={()=>{setOpen(true)}}
onBlur={()=>{setOpen(false)}}
style={{ style={{
width: 250, width: 250,
}} }}
onSearch={getCompleteOptionData} options={completeOptions}
placeholder="搜索员工、部门" onSelect={confirmSearchSelect}
placeholder='搜索员工、部门'
> >
<Option><span>部门</span></Option> </AutoComplete>
{departmentUserResult.map((item) => (
<Option key={item.userName} value={item.userName}>
{email}
</Option>
))}
</AutoComplete> */}
</div> </div>
{ (props.treeType==='postGrouptab' || props.treeType=== 'customGroupTab') && ( { (props.treeType==='postGrouptab' || props.treeType=== 'customGroupTab') && (
<div className="operate"> <div className="operate">
......
...@@ -57,7 +57,10 @@ class NewChooseMembersModal extends React.Component { ...@@ -57,7 +57,10 @@ class NewChooseMembersModal extends React.Component {
<div className='avatar'> <div className='avatar'>
<span className="icon iconfont avatar-icon">&#xe84a;</span> <span className="icon iconfont avatar-icon">&#xe84a;</span>
<Tooltip title={userName}> <Tooltip title={userName}>
<span className='userImg'>{userName}</span> <span className='userImg'>
<WWOpenDataCom type="userName" openid={userName}/>
{/* {userName} */}
</span>
</Tooltip> </Tooltip>
</div> </div>
) )
...@@ -99,7 +102,7 @@ class NewChooseMembersModal extends React.Component { ...@@ -99,7 +102,7 @@ class NewChooseMembersModal extends React.Component {
}) })
} }
// 清空所有成员 // 清空所有成员
clearAllUser = () => { clearAllUser = () => {
this.setState({ this.setState({
selectUserList : [], selectUserList : [],
}) })
...@@ -132,7 +135,8 @@ class NewChooseMembersModal extends React.Component { ...@@ -132,7 +135,8 @@ class NewChooseMembersModal extends React.Component {
this.props.onConfirm(); this.props.onConfirm();
}) })
} }
// 批量添加成员(点击确定)
// 批量添加成员(点击确定)
addUser = (selectUserList) => { addUser = (selectUserList) => {
let enterpriseUserList = []; // 保存新加进去的成员 let enterpriseUserList = []; // 保存新加进去的成员
selectUserList.map((item) => { selectUserList.map((item) => {
...@@ -155,6 +159,7 @@ class NewChooseMembersModal extends React.Component { ...@@ -155,6 +159,7 @@ class NewChooseMembersModal extends React.Component {
} }
}) })
} }
renderTitle = (title) => { renderTitle = (title) => {
return <span>{title}</span> return <span>{title}</span>
} }
...@@ -207,7 +212,6 @@ class NewChooseMembersModal extends React.Component { ...@@ -207,7 +212,6 @@ class NewChooseMembersModal extends React.Component {
> >
</AutoComplete> </AutoComplete>
} }
getCompleteOptionData=(value)=>{ getCompleteOptionData=(value)=>{
if(!value){ if(!value){
this.setState({ this.setState({
......
import React from 'react'; import React from 'react';
import { Modal, Button, Radio, Tooltip } from 'antd'; import { Modal, Button, Radio, Tooltip } from 'antd';
import WWOpenDataCom from '@/components/WWOpenDataCom';
import './SetEmployeeModal.less' import './SetEmployeeModal.less'
const RadioGroup = Radio.Group; const RadioGroup = Radio.Group;
...@@ -70,7 +71,10 @@ export default class SetEmployeeModal extends React.Component { ...@@ -70,7 +71,10 @@ export default class SetEmployeeModal extends React.Component {
> >
<span className="icon iconfont avatar-icon">&#xe84a;</span> <span className="icon iconfont avatar-icon">&#xe84a;</span>
<Tooltip title={item.name}> <Tooltip title={item.name}>
<span className='name'>{item.userName}</span> <span className='name'>
{/* {item.userName} */}
<WWOpenDataCom type="userName" openid={tem.userName}/>
</span>
</Tooltip> </Tooltip>
<span className="tag">{tagMap[item.roleCode]}</span> <span className="tag">{tagMap[item.roleCode]}</span>
</div> </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