mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git
synced 2025-12-17 23:06:47 +08:00
feat:合并
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
width="85%"
|
||||
@after-visible-change="afterVisibleChange"
|
||||
>
|
||||
<div class="drawerMain">
|
||||
<div class="drawerMain" id="ProjOwnership">
|
||||
<div class="header">
|
||||
<div class="headerTitle">归属权</div>
|
||||
<img
|
||||
@@ -121,11 +121,10 @@
|
||||
</div>
|
||||
</div>
|
||||
</a-tab-pane>
|
||||
|
||||
</a-tabs>
|
||||
</div>
|
||||
</div>
|
||||
<div class="right" >
|
||||
<div class="right">
|
||||
<div class="onerow">
|
||||
<div class="onleft">
|
||||
<div class="already">已选</div>
|
||||
@@ -139,27 +138,22 @@
|
||||
</div>
|
||||
<div class="line"></div>
|
||||
<div class="tit">快速选人</div>
|
||||
<div style="position: relative;min-height:180px ">
|
||||
<div
|
||||
style="height: 160px"
|
||||
class="selectedsBox"
|
||||
id="selectedsBox"
|
||||
>
|
||||
<div class="selecteds" id="selecteds">
|
||||
<!-- 遍历生成 -->
|
||||
<div class="chose" v-for="item in choosepeople" :key="item.key">
|
||||
<div>{{ item.name }}</div>
|
||||
<div class="ch" @click="deleteChoosePeople(item)"></div>
|
||||
<div style="position: relative; min-height: 180px">
|
||||
<div style="height: 160px" class="selectedsBox" id="selectedsBox">
|
||||
<div class="selecteds" id="selecteds">
|
||||
<!-- 遍历生成 -->
|
||||
<div class="chose" v-for="item in choosepeople" :key="item.key">
|
||||
<div>{{ item.name }}</div>
|
||||
<div class="ch" @click="deleteChoosePeople(item)"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div
|
||||
<div
|
||||
class="chose"
|
||||
style="
|
||||
position: absolute;
|
||||
right: 32px;
|
||||
bottom: -9px;
|
||||
style="
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
margin-right: 20px;
|
||||
font-size: 12px;
|
||||
font-weight: 500;
|
||||
color: #409eff;
|
||||
@@ -168,17 +162,20 @@
|
||||
v-if="showMore"
|
||||
@click="morePeopleShow"
|
||||
>
|
||||
<div>查看更多 <img
|
||||
<div>
|
||||
查看更多
|
||||
<img
|
||||
style="width: 10px; height: 12px; margin-top: -2px"
|
||||
src="../../assets/images/projectadd/go.png"
|
||||
/></div>
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
class="chose"
|
||||
style="
|
||||
position: absolute;
|
||||
right: 32px;
|
||||
bottom: -9px;
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
margin-right: 20px;
|
||||
font-size: 12px;
|
||||
font-weight: 500;
|
||||
color: #409eff;
|
||||
@@ -187,13 +184,15 @@
|
||||
v-if="showHidden"
|
||||
@click="morePeopleHidden"
|
||||
>
|
||||
<div>收起 <img
|
||||
<div>
|
||||
收起
|
||||
<img
|
||||
style="width: 10px; height: 12px; margin-top: -2px"
|
||||
src="../../assets/images/projectadd/pickUp.png"
|
||||
/></div>
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="btnn">
|
||||
@@ -259,9 +258,9 @@ export default {
|
||||
pageSize2: 10,
|
||||
currentPage2: 1,
|
||||
tableDataTotal2: 50,
|
||||
|
||||
|
||||
selectedRowKeys1: [],
|
||||
|
||||
|
||||
activeKey: "1",
|
||||
value: [], //级联选择框
|
||||
choosevalue: null, //受众选择
|
||||
@@ -310,7 +309,7 @@ export default {
|
||||
title: "研究部6",
|
||||
value: "研究部6",
|
||||
},
|
||||
{
|
||||
{
|
||||
title: "研究部7",
|
||||
value: "研究部7",
|
||||
},
|
||||
@@ -594,16 +593,14 @@ export default {
|
||||
},
|
||||
],
|
||||
|
||||
|
||||
//快速选人-------------------------------------
|
||||
valueSelectboe: null, //快速选人的选择组织
|
||||
choosepeople: [], //总的数组
|
||||
selectedKeys: [], //选中部门
|
||||
showMore: false, //是否显示快速选人的查看更多
|
||||
showHidden: false, //是否显示收回
|
||||
selectedRowKeys: [],//表格选中的key
|
||||
selectedRowKeys: [], //表格选中的key
|
||||
//快速选人-------------------------------------
|
||||
|
||||
});
|
||||
const closeDrawer = () => {
|
||||
state.activeKey = "1";
|
||||
@@ -614,8 +611,6 @@ export default {
|
||||
console.log("state", bool);
|
||||
};
|
||||
|
||||
|
||||
|
||||
const getClientHeight = () => {
|
||||
state.screenHeight = document.body.clientHeight;
|
||||
};
|
||||
@@ -670,46 +665,45 @@ export default {
|
||||
//根据右侧快速选人高度,判断是否显示更多
|
||||
const selectedsHeight = () => {
|
||||
let resize = elementResizeDetectorMaker();
|
||||
resize.listenTo(document.getElementById("selecteds"), function (ele) {
|
||||
resize.listenTo(document.getElementById('Ownership').querySelector("#selecteds"), function (ele) {
|
||||
console.log("ele", ele.offsetHeight);
|
||||
if (ele.offsetHeight > 160 && !state.showHidden) {
|
||||
state.showMore = true;
|
||||
document.getElementById("selectedsBox").style.overflow = "hidden";
|
||||
document.getElementById("selectedsBox").style.height = "160px";
|
||||
document.getElementById('Ownership').querySelector("#selectedsBox").style.overflow = "hidden";
|
||||
document.getElementById('Ownership').querySelector("#selectedsBox").style.height = "160px";
|
||||
} else if (ele.offsetHeight < 160) {
|
||||
state.showMore = false;
|
||||
state.showHidden = false;
|
||||
document.getElementById("selectedsBox").style.overflow = "hidden";
|
||||
document.getElementById("selectedsBox").style.height = "160px";
|
||||
document.getElementById('Ownership').querySelector("#selectedsBox").style.overflow = "hidden";
|
||||
document.getElementById('Ownership').querySelector("#selectedsBox").style.height = "160px";
|
||||
}
|
||||
});
|
||||
};
|
||||
const morePeopleShow = () => {
|
||||
state.showMore = false;
|
||||
state.showHidden = true;
|
||||
document.getElementById("selectedsBox").style.overflow = "";
|
||||
document.getElementById("selectedsBox").style.height = "";
|
||||
document.getElementById('Ownership').querySelector("#selectedsBox").style.overflow = "";
|
||||
document.getElementById('Ownership').querySelector("#selectedsBox").style.height = "";
|
||||
};
|
||||
const morePeopleHidden = () => {
|
||||
state.showMore = true;
|
||||
state.showHidden = false;
|
||||
document.getElementById("selectedsBox").style.overflow = "hidden";
|
||||
document.getElementById("selectedsBox").style.height = "160px";
|
||||
document.getElementById('Ownership').querySelector("#selectedsBox").style.overflow = "hidden";
|
||||
document.getElementById('Ownership').querySelector("#selectedsBox").style.height = "160px";
|
||||
};
|
||||
|
||||
// 结束 快速选人------------------------------------------------------------------
|
||||
|
||||
//全部清除
|
||||
const deleteAll=()=>{
|
||||
//快速选人-------------------------------------
|
||||
state.valueSelectboe=null //快速选人的选择组织
|
||||
state.choosepeople=[] //总的数组
|
||||
state.showMore=false //是否显示快速选人的查看更多
|
||||
state.showHidden=false//是否显示收回
|
||||
state.selectedRowKeys=[]//表格选中的key
|
||||
const deleteAll = () => {
|
||||
//快速选人-------------------------------------
|
||||
|
||||
}
|
||||
state.valueSelectboe = null; //快速选人的选择组织
|
||||
state.choosepeople = []; //总的数组
|
||||
state.showMore = false; //是否显示快速选人的查看更多
|
||||
state.showHidden = false; //是否显示收回
|
||||
state.selectedRowKeys = []; //表格选中的key
|
||||
//快速选人-------------------------------------
|
||||
};
|
||||
return {
|
||||
...toRefs(state),
|
||||
afterVisibleChange,
|
||||
@@ -1172,7 +1166,7 @@ export default {
|
||||
.right {
|
||||
width: 320px;
|
||||
flex-shrink: 0;
|
||||
overflow-y:auto ;
|
||||
overflow-y: auto;
|
||||
.onerow {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
@@ -1450,7 +1444,7 @@ export default {
|
||||
}
|
||||
}
|
||||
}
|
||||
.ant-modal-close-x{
|
||||
.ant-modal-close-x {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user