Commit e8babb29 by zhangleyuan

feat:处理岗位显示错误的问题

parent 4daf20a2
...@@ -71,13 +71,16 @@ function DepartMentTabCon(props) { ...@@ -71,13 +71,16 @@ function DepartMentTabCon(props) {
}, },
{ {
title: "岗位", title: "岗位",
dataIndex: "depNameList", dataIndex: "depPostNameList",
render: (val, record) => { render: (val, record) => {
if(!record.depNameList){ if(!record.depPostNameList){
return <span>-</span> return <span>-</span>
}else{ }else{
return record.depNameList.map((item, index) => { if(record.depPostNameList.length === 0){
return <span>{item}{index!==record.depNameList.length-1 && <span></span>}</span>; return <span>-</span>
}
return record.depPostNameList.map((item, index) => {
return <span>{item}{index!==record.depPostNameList.length-1 && <span></span>}</span>;
}) })
} }
} }
...@@ -123,7 +126,7 @@ function DepartMentTabCon(props) { ...@@ -123,7 +126,7 @@ function DepartMentTabCon(props) {
enterpriseId: User.getEnterpriseId(), enterpriseId: User.getEnterpriseId(),
source: 0, source: 0,
storeId: User.getStoreId(), storeId: User.getStoreId(),
userId: User.getUserId(), userId: User.getUserId()
}; };
if(record){ if(record){
if(record.id){ if(record.id){
......
...@@ -20,6 +20,8 @@ function MemberTree(props) { ...@@ -20,6 +20,8 @@ function MemberTree(props) {
storeId:User.getStoreId(), storeId:User.getStoreId(),
userId:User.getUserId(), userId:User.getUserId(),
whetherCount:false, whetherCount:false,
distinct:true,
queryType:props.type
} }
if(props.departmentId){ if(props.departmentId){
params.departmentId = props.departmentId; params.departmentId = props.departmentId;
......
...@@ -308,7 +308,7 @@ class NewChooseMembersModal extends React.Component { ...@@ -308,7 +308,7 @@ class NewChooseMembersModal extends React.Component {
{/* {this.Complete()} */} {/* {this.Complete()} */}
<SearchUser onChange={(value)=>{this.getCompleteOptionData(value)}} data={searchUserResultList} onSelect={(record,type)=>{this.confirmSearchSelect(record,type)}}/> <SearchUser onChange={(value)=>{this.getCompleteOptionData(value)}} data={searchUserResultList} onSelect={(record,type)=>{this.confirmSearchSelect(record,type)}}/>
<div className='container-left-body-table'> <div className='container-left-body-table'>
<MemberTree departmentId={id} treeDepType={treeDepType} nowTreeDepType={addDepType} onSelect={(record)=>{this.treeSelect(record)}} selectUserList={selectUserList} /> <MemberTree departmentId={id} treeDepType={treeDepType} nowTreeDepType={addDepType} onSelect={(record)=>{this.treeSelect(record)}} selectUserList={selectUserList} type={type}/>
</div> </div>
</div> </div>
</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