-- 屏蔽组织选择

This commit is contained in:
yuping
2022-12-20 18:24:42 +08:00
parent d9f8f7569c
commit 6cd7eb3bdc

View File

@@ -71,44 +71,44 @@
</div>
</div>
</a-tab-pane>
<a-tab-pane :key="2" tab="添加组织">
<div
:style="{ height: screenHeight - 235 + 'px' }"
>
<div class="tab2">
<a-form-item label="组织:">
<a-input
v-model:value="searchOrgName.keyword"
style="width: 230px; height: 40px; border-radius: 8px"
placeholder="请输入组织"
/>
<a-button type="primary" @click="searchOrg" style="margin-left: 20px;border-radius: 4px">
<template #icon>
<SearchOutlined/>
</template>
搜索
</a-button>
<a-button @click="resetOrg" style="margin-left: 20px;border-radius: 4px">重置</a-button>
</a-form-item>
</div>
<div class="boeTree">
<a-tree
:tree-data="searchOrgName.keyword ? orgData : treeData"
@select="onOrgSelectChange"
:fieldNames="{
children: 'treeChildList',
key: 'id',
title: 'name',
value: 'name',
}"
row-key="id"
:row-selection="orgRowSelection"
multiple
>
</a-tree>
</div>
</div>
</a-tab-pane>
<!-- <a-tab-pane :key="2" tab="添加组织">-->
<!-- <div-->
<!-- :style="{ height: screenHeight - 235 + 'px' }"-->
<!-- >-->
<!-- <div class="tab2">-->
<!-- <a-form-item label="组织:">-->
<!-- <a-input-->
<!-- v-model:value="searchOrgName.keyword"-->
<!-- style="width: 230px; height: 40px; border-radius: 8px"-->
<!-- placeholder="请输入组织"-->
<!-- />-->
<!-- <a-button type="primary" @click="searchOrg" style="margin-left: 20px;border-radius: 4px">-->
<!-- <template #icon>-->
<!-- <SearchOutlined/>-->
<!-- </template>-->
<!-- 搜索-->
<!-- </a-button>-->
<!-- <a-button @click="resetOrg" style="margin-left: 20px;border-radius: 4px">重置</a-button>-->
<!-- </a-form-item>-->
<!-- </div>-->
<!-- <div class="boeTree">-->
<!-- <a-tree-->
<!-- :tree-data="searchOrgName.keyword ? orgData : treeData"-->
<!-- @select="onOrgSelectChange"-->
<!-- :fieldNames="{-->
<!-- children: 'treeChildList',-->
<!-- key: 'id',-->
<!-- title: 'name',-->
<!-- value: 'name',-->
<!-- }"-->
<!-- row-key="id"-->
<!-- :row-selection="orgRowSelection"-->
<!-- multiple-->
<!-- >-->
<!-- </a-tree>-->
<!-- </div>-->
<!-- </div>-->
<!-- </a-tab-pane>-->
<a-tab-pane :key="3" tab="受众关联">
<div
:style="{ height: screenHeight - 235 + 'px' }"
@@ -180,27 +180,27 @@
<div v-if="person && selectsData.studentList.length >10" class="ifsw" ><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>-->
<!--受众-->
@@ -290,8 +290,8 @@
<script setup>
import {computed, defineEmits, defineProps, ref, watch} from "vue";
import {useStore} from "vuex";
import {useBoeApi, useBoeApiPage} from "@/api/request";
import {AUDIENCE_LIST, ORG_LIST, USER_LIST} from "@/api/ThirdApi";
import {useBoeApiPage} from "@/api/request";
import {AUDIENCE_LIST, USER_LIST} from "@/api/ThirdApi";
import {saveStu} from "@/api/index1";
const store = useStore();
@@ -305,7 +305,7 @@ const props = defineProps({
}
})
const person =ref(false)
const dept =ref(false)
// const dept =ref(false)
const group =ref(false)
const visiable = ref(false)
const activeKey = ref(1)
@@ -327,11 +327,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)
@@ -349,10 +349,10 @@ const {
total: res => res.result.totalElement
})
const {
data: orgData,
fetch: searchOrg,
} = useBoeApi(ORG_LIST, searchOrgName.value)
// const {
// data: orgData,
// fetch: searchOrg,
// } = useBoeApi(ORG_LIST, searchOrgName.value)
const {
data: audiData,
@@ -506,10 +506,10 @@ function stuDel(i) {
selectsData.value.studentList.splice(i, 1)
}
function orgDel(i) {
orgSelectKeys.value = orgSelectKeys.value.filter(e => e !== selectsData.value.deptList[i].id)
selectsData.value.deptList.splice(i, 1)
}
// function orgDel(i) {
// orgSelectKeys.value = orgSelectKeys.value.filter(e => e !== selectsData.value.deptList[i].id)
// selectsData.value.deptList.splice(i, 1)
// }
function AuditDel(i) {
auditSelectKeys.value = auditSelectKeys.value.filter(e => e !== selectsData.value.groupList[i].id)
@@ -566,9 +566,9 @@ const deleteDepSelect = () => {
};
//重置组织
const resetOrg = () => {
searchOrgName.value = {keyword: '', page: 1, pageSize: 10}
};
// const resetOrg = () => {
// searchOrgName.value = {keyword: '', page: 1, pageSize: 10}
// };
//重置受众
const resetAudienceInfo = () => {