Commit f9006b9b by zhangleyuan

feat:处理重名问题

parent ac4b314f
......@@ -388,7 +388,7 @@ function DepartMentTabCon(props) {
image: college,
description: "暂无数据",
}}
scroll={{ x: 1500 }}
scroll={{ x: 800 }}
bordered
size="middle"
pagination={false}
......
.department-tab-con{
display: flex;
.table-con{
margin-left:16px;
flex:1;
.post-name{
max-width: 200px;
......
......@@ -65,6 +65,8 @@ function LeftStructureTree(props) {
display: 'flex',
justifyContent: 'space-between',
}}
depId={record.id}
type={type}
>
{type === 'user'?
<div><WWOpenDataCom type="userName" openid={record.userName}/></div>
......@@ -104,17 +106,21 @@ function LeftStructureTree(props) {
return placeholder
}
function confirmSearchSelect(value,option){
const param = {}
setOpen(false);
setQueryName(value);
console.log('option',option);
console.log('_option',option);
// setSelctQueryName(option.label.props.children[0].props.children.props);
props.searchUserList({queryName:value},treeType,1);
if(option.label.props.type === 'user'){
param.queryName = value;
}else{
param.id = option.label.props.depId;
}
props.searchUserList(param,treeType,1);
}
// 获取关键词的搜索结果
function getCompleteOptionData(value){
// setQueryName(value);
setCompleteOption([]);
console.log("treeType",props.treeType);
const params = {
depType:DepType[props.treeType],
......@@ -326,7 +332,7 @@ function LeftStructureTree(props) {
let content= '删除后,该岗位组下的岗位及也将全部删除。';
if(record.departmentCount && record.departmentCount>0 ){
title = '删除失败';
if(record.level>0){
if(record.depLevel>0){
content = `${record.name}存在学员,不能删除该岗位`;
}else{
content = `${record.name}存在学员,不能删除该岗位组`;
......
.left-structure-tree {
margin-right: 24px;
margin-right: 17px;
width:260px;
flex-shrink: 0;
height: calc(~'100vh - 260px');
overflow: scroll;
flex-shrink: 0;
border-right:1px solid #eee;
.organization{
overflow: scroll;
.search-con{
margin-bottom: 10px;
}
......
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