Commit fccac31c authored by 赵伟庚's avatar 赵伟庚

fix:组织管理平台用户组织位置一直维持在第一个

parent 692ce9b4
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
</div> </div>
<div class="icon_content bg-scroll"> <div class="icon_content bg-scroll">
<div class="icon_item" v-for="(e,i) in showIconArr" :key="i+100" @click="changeIcon(e)"> <div class="icon_item" v-for="(e,i) in showIconArr" :key="i+100" @click="changeIcon(e)">
<span> <span :title="e.name">
<bg-icon <bg-icon
class="selectBgIcon" class="selectBgIcon"
:icon="'#' + e.icon" :icon="'#' + e.icon"
...@@ -321,7 +321,7 @@ defineExpose({ setForm , menuForm, menuRef }) ...@@ -321,7 +321,7 @@ defineExpose({ setForm , menuForm, menuRef })
height: 36px; height: 36px;
margin: 0 8px 8px 0; margin: 0 8px 8px 0;
color: #202531; color: #202531;
padding-left: 16px; padding: 0 16px;
line-height: 36px; line-height: 36px;
cursor: pointer; cursor: pointer;
&:hover, &:hover,
...@@ -336,6 +336,13 @@ defineExpose({ setForm , menuForm, menuRef }) ...@@ -336,6 +336,13 @@ defineExpose({ setForm , menuForm, menuRef })
width: 14px; width: 14px;
margin-right: 10px; margin-right: 10px;
} }
span {
display: inline-block;
width: 100%;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
}
} }
} }
} }
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<div v-if="selectData && selectData.data_type === 0" class="action" @click="treeAction({type: 'org',action: 'create',target: 'child'})">新建下级组织</div> <div v-if="selectData && selectData.data_type === 0" class="action" @click="treeAction({type: 'org',action: 'create',target: 'child'})">新建下级组织</div>
<div v-if="selectData && selectData.data_type === 0" class="action" @click="treeAction({type: 'directory',action: 'edit',target: 'local'})">编辑目录</div> <div v-if="selectData && selectData.data_type === 0" class="action" @click="treeAction({type: 'directory',action: 'edit',target: 'local'})">编辑目录</div>
<div v-if="selectData && selectData.data_type === 0" class="action" @click="treeAction({type: 'directory',action: 'delete',target: 'local'})">删除</div> <div v-if="selectData && selectData.data_type === 0" class="action" @click="treeAction({type: 'directory',action: 'delete',target: 'local'})">删除</div>
<div :class="{'disable': mvDataParent.indexOf(selectData) === 0 }" v-if="selectData && selectData.data_type === 0" class="action" @click="treeAction({type: 'directory',action: 'mvup',target: 'local'})">上移</div> <div :class="{'disable': mvDataParent.indexOf(selectData) === 0 || (mvDataParent.indexOf(selectData) === 1 && mvDataParent[0].data_type == 2) }" v-if="selectData && selectData.data_type === 0" class="action" @click="treeAction({type: 'directory',action: 'mvup',target: 'local'})">上移</div>
<div :class="{'disable': mvDataParent.indexOf(selectData) === (mvDataParent.length-1) }" v-if="selectData && selectData.data_type === 0" class="action" @click="treeAction({type: 'directory',action: 'mvdown',target: 'local'})">下移</div> <div :class="{'disable': mvDataParent.indexOf(selectData) === (mvDataParent.length-1) }" v-if="selectData && selectData.data_type === 0" class="action" @click="treeAction({type: 'directory',action: 'mvdown',target: 'local'})">下移</div>
<!-- 组织 --> <!-- 组织 -->
<div v-if="selectData && selectData.data_type === 1" class="action" @click="treeAction({type: 'org',action: 'create',target: 'local'})">新建本级组织</div> <div v-if="selectData && selectData.data_type === 1" class="action" @click="treeAction({type: 'org',action: 'create',target: 'local'})">新建本级组织</div>
...@@ -175,7 +175,8 @@ import { useRouter } from 'vue-router'; ...@@ -175,7 +175,8 @@ import { useRouter } from 'vue-router';
} }
}else if(params.action === 'mvup') { }else if(params.action === 'mvup') {
if(mvDataParent.value.indexOf(selectData.value) === 0) { // 已经是第一个元素 或者上一个元素是平台组织 则不可上移 平台组织始终在第一个
if(mvDataParent.value.indexOf(selectData.value) === 0 || ( mvDataParent.value.indexOf(selectData.value) === 1 && mvDataParent.value[0].data_type == 2) ) {
// $message.error('已经是第一个元素,不可上移') // $message.error('已经是第一个元素,不可上移')
return 0; return 0;
}else { }else {
......
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