--fix 选择组织

This commit is contained in:
yuping
2023-01-30 13:20:12 +08:00
parent aee5aa2299
commit 119db319f0

View File

@@ -99,7 +99,7 @@
</div>
</div>
</a-tab-pane>
<!-- <a-tab-pane :key="2" tab="添加组织">
<a-tab-pane :key="2" tab="添加组织">
<div :style="{ height: screenHeight - 235 + 'px' }">
<div class="tab2">
<a-form-item label="组织:">
@@ -121,14 +121,17 @@
<a-button
@click="resetOrg"
style="margin-left: 20px; border-radius: 4px"
>重置</a-button
>重置
</a-button
>
</a-form-item>
</div>
<div class="boeTree">
<a-tree
:tree-data="searchOrgName.keyword ? orgData : treeData"
:tree-data="searchOrgName.keyword ? orgData : treeOrgData"
@select="onOrgSelectChange"
:loading="orgOrgLoading"
:load-data="onLoadOrgData"
:fieldNames="{
children: 'treeChildList',
key: 'id',
@@ -142,7 +145,7 @@
</a-tree>
</div>
</div>
</a-tab-pane> -->
</a-tab-pane>
<a-tab-pane :key="3" tab="受众关联">
<div :style="{ height: screenHeight - 235 + 'px' }">
<div>
@@ -224,28 +227,31 @@
>
<div @click="person = !person" class="sw">收起&lt;</div>
</div>
<!--组织-->
<!-- <div class="dept">添加组织</div>-->
<!-- <div v-for="(item,i) in selectsData.deptList" >-->
<!-- <div v-if="i<11">-->
<!-- <div class="chose1">-->
<!-- <div class="span"> {{ item.name }}</div>-->
<!-- <div class="ch1" @click="orgDel(i)"></div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div v-else> -->
<!-- <div v-if ="dept">-->
<!-- <div class="chose1">-->
<!-- <div class="span"> {{ item.name }}</div>-->
<!-- <div class="ch1" @click="orgDel(i)"></div>-->
<!-- </div>-->
<!-- </div>-->
<!-- -->
<!-- </div>-->
<!-- -->
<!-- </div>-->
<!-- <div v-if="!dept && selectsData.deptList.length >10" class="ifsw"><div @click="dept = !dept" class=sw>查看更多></div></div>-->
<!-- <div v-if="dept && selectsData.deptList.length >10" class="ifsw" ><div @click="dept = !dept" class="sw"> 收起&lt; </div></div>-->
<div class="dept">添加组织</div>
<div v-for="(item,i) in selectsData.deptList">
<div v-if="i<11">
<div class="chose1">
<div class="span"> {{ item.name }}</div>
<div class="ch1" @click="orgDel(i)"></div>
</div>
</div>
<div v-else>
<div v-if="dept">
<div class="chose1">
<div class="span"> {{ item.name }}</div>
<div class="ch1" @click="orgDel(i)"></div>
</div>
</div>
</div>
</div>
<div v-if="!dept && selectsData.deptList.length >10" class="ifsw">
<div @click="dept = !dept" class=sw>查看更多></div>
</div>
<div v-if="dept && selectsData.deptList.length >10" class="ifsw">
<div @click="dept = !dept" class="sw"> 收起&lt;</div>
</div>
<!--受众-->
<div class="group">受众关联</div>
<div v-for="(item, i) in selectsData.groupList">
@@ -444,11 +450,11 @@ const audienceName = ref({
page: 1,
pageSize: 10,
});
// const searchOrgName = ref({
// keyword: '',
// page: 1,
// pageSize: 10
// })
const searchOrgName = ref({
keyword: '',
page: 1,
pageSize: 10
})
const stageIds = computed(() => props.stage);
const {
data: stuData,
@@ -464,10 +470,10 @@ const {
totalPage: (res) => res.result.totalPage,
total: (res) => res.result.totalElement,
});
// const {
// data: orgData,
// fetch: searchOrg,
// } = useBoeApiPage(ORG_LIST, searchOrgName.value)
const {
data: orgData,
fetch: searchOrg,
} = useBoeApiPage(ORG_LIST, searchOrgName.value)
const {data: treeData, loading: orgLoading} = useBoeApi(
ORG_LIST,
{keyword: ""},
@@ -476,6 +482,15 @@ const { data: treeData, loading: orgLoading } = useBoeApi(
result: (res) => res.result.map((e) => ({...e, isLeaf: false})),
}
);
const {data: treeOrgData, loading: orgOrgLoading} = useBoeApi(
ORG_LIST,
{keyword: ""},
{
init: true,
result: (res) => res.result.map((e) => ({...e, isLeaf: false})),
}
);
const {
data: audiData,
fetch: searchAudi,
@@ -599,6 +614,7 @@ const closeDrawer = () => {
stuData.value = [];
nameSearch.value.keyword = "";
};
function onLoadData(treeNode) {
return request(ORG_CHILD_LIST, {keyword: "", orgId: treeNode.id}).then(
(r) => {
@@ -607,6 +623,16 @@ function onLoadData(treeNode) {
}
);
}
function onLoadOrgData(treeNode) {
return request(ORG_CHILD_LIST, {keyword: "", orgId: treeNode.id}).then(
(r) => {
treeNode.dataRef.treeChildList = r.result.directChildList;
treeOrgData.value = [...treeOrgData.value];
}
);
}
const closeChangeModal = () => {
stageVisible.value = false;
};
@@ -702,9 +728,9 @@ const deleteDepSelect = () => {
stuSelectKeys.value = [];
};
//重置组织
// const resetOrg = () => {
// searchOrgName.value = {keyword: '', page: 1, pageSize: 10}
// };
const resetOrg = () => {
searchOrgName.value = {keyword: '', page: 1, pageSize: 10}
};
//重置受众
const resetAudienceInfo = () => {
audienceName.value.keyword = "";