hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-16 14:26:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

--fix 选择组织

Browse Source
This commit is contained in:
yuping
2023-01-30 13:20:12 +08:00
parent aee5aa2299
commit 119db319f0
1 changed files with 184 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

342
src/components/student/CommonStudent.vue
View File

@@ -3,20 +3,20 @@
<template> <template>
<div class="CommonStudent"> <div class="CommonStudent">
<a-drawer <a-drawer
:visible="visiable" :visible="visiable"
class="drawerStyle ProjCheckship CommonStudent" class="drawerStyle ProjCheckship CommonStudent"
placement="right" placement="right"
width="60%" width="60%"
> >
<div class="drawerMain" id="ProjCheckship" style=""> <div class="drawerMain" id="ProjCheckship" style="">
<div class="header"> <div class="header">
<div class="headerTitle"> <div class="headerTitle">
{{ { 1: "添加学员", 2: "添加学员", 3: "添加学员" }[type] || "" }} {{ {1: "添加学员", 2: "添加学员", 3: "添加学员"}[type] || "" }}
</div> </div>
<img <img
style="width: 29px; height: 29px; cursor: pointer" style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png" src="../../assets/images/basicinfo/close.png"
@click="closeDrawer" @click="closeDrawer"
/> />
</div> </div>
<div style="display: flex; overflow-x: auto; overflow-y: auto"> <div style="display: flex; overflow-x: auto; overflow-y: auto">
@@ -27,157 +27,160 @@
<div class="tab1"> <div class="tab1">
<a-form-item label="姓名"> <a-form-item label="姓名">
<a-input <a-input
v-model:value="nameSearch.keyword" v-model:value="nameSearch.keyword"
style="width: 270px; height: 40px; border-radius: 8px" style="width: 270px; height: 40px; border-radius: 8px"
placeholder="请输入姓名" placeholder="请输入姓名"
@change="peopleName" @change="peopleName"
/> />
<a-button <a-button
type="primary" type="primary"
@click="onSearchStu" @click="onSearchStu"
style="margin-left: 20px; border-radius: 4px" style="margin-left: 20px; border-radius: 4px"
> >
<template #icon> <template #icon>
<SearchOutlined /> <SearchOutlined/>
</template> </template>
搜索 搜索
</a-button> </a-button>
<a-button <a-button
@click="resetStu" @click="resetStu"
style="margin-left: 20px; border-radius: 4px" style="margin-left: 20px; border-radius: 4px"
>重置 >重置
</a-button> </a-button>
</a-form-item> </a-form-item>
</div> </div>
<div <div
class="chooseLeft" class="chooseLeft"
style="display: grid; grid-template-columns: 250px auto" style="display: grid; grid-template-columns: 250px auto"
> >
<div <div
:style="{ :style="{
height: screenHeight - 180 + 'px', height: screenHeight - 180 + 'px',
overflowY: 'auto', overflowY: 'auto',
}" }"
style="border: 1px solid #f0f0f0" style="border: 1px solid #f0f0f0"
> >
<div class="tree" style="margin: 10px 4px 220px 10px"> <div class="tree" style="margin: 10px 4px 220px 10px">
<a-tree <a-tree
allow-clear allow-clear
tree-default-expand-all tree-default-expand-all
:tree-data="treeData" :tree-data="treeData"
:loading="orgLoading" :loading="orgLoading"
:load-data="onLoadData" :load-data="onLoadData"
v-model:selectedKeys="stuTreeSelectKeys" v-model:selectedKeys="stuTreeSelectKeys"
v-model:expandedKeys="stuTreeExpandedKeys" v-model:expandedKeys="stuTreeExpandedKeys"
:fieldNames="{ :fieldNames="{
children: 'treeChildList', children: 'treeChildList',
key: 'id', key: 'id',
title: 'name', title: 'name',
value: 'name', value: 'name',
}" }"
@select="stuStuOrgSelect" @select="stuStuOrgSelect"
> >
</a-tree> </a-tree>
</div> </div>
</div> </div>
<div <div
class="tableBox tabb" class="tableBox tabb"
style=" style="
margin: 0px 4px 120px 10px; margin: 0px 4px 120px 10px;
border: 1px solid #f0f0f0; border: 1px solid #f0f0f0;
" "
> >
<a-table <a-table
:columns="stuColumns" :columns="stuColumns"
:data-source="stuData" :data-source="stuData"
:pagination="stuPagination" :pagination="stuPagination"
:loading="stuLoading" :loading="stuLoading"
row-key="id" row-key="id"
:row-selection="stuRowSelection" :row-selection="stuRowSelection"
/> />
</div> </div>
</div> </div>
</div> </div>
</a-tab-pane> </a-tab-pane>
<!-- <a-tab-pane :key="2" tab="添加组织"> <a-tab-pane :key="2" tab="添加组织">
<div :style="{ height: screenHeight - 235 + 'px' }"> <div :style="{ height: screenHeight - 235 + 'px' }">
<div class="tab2"> <div class="tab2">
<a-form-item label="组织："> <a-form-item label="组织：">
<a-input <a-input
v-model:value="searchOrgName.keyword" v-model:value="searchOrgName.keyword"
style="width: 230px; height: 40px; border-radius: 8px" style="width: 230px; height: 40px; border-radius: 8px"
placeholder="请输入组织" placeholder="请输入组织"
/> />
<a-button <a-button
type="primary" type="primary"
@click="searchOrg" @click="searchOrg"
style="margin-left: 20px; border-radius: 4px" style="margin-left: 20px; border-radius: 4px"
> >
<template #icon> <template #icon>
<SearchOutlined /> <SearchOutlined/>
</template> </template>
搜索 搜索
</a-button> </a-button>
<a-button <a-button
@click="resetOrg" @click="resetOrg"
style="margin-left: 20px; border-radius: 4px" style="margin-left: 20px; border-radius: 4px"
>重置</a-button >重置
</a-button
> >
</a-form-item> </a-form-item>
</div> </div>
<div class="boeTree"> <div class="boeTree">
<a-tree <a-tree
:tree-data="searchOrgName.keyword ? orgData : treeData" :tree-data="searchOrgName.keyword ? orgData : treeOrgData"
@select="onOrgSelectChange" @select="onOrgSelectChange"
:fieldNames="{ :loading="orgOrgLoading"
:load-data="onLoadOrgData"
:fieldNames="{
children: 'treeChildList', children: 'treeChildList',
key: 'id', key: 'id',
title: 'name', title: 'name',
value: 'name', value: 'name',
}" }"
row-key="id" row-key="id"
:row-selection="orgRowSelection" :row-selection="orgRowSelection"
multiple multiple
> >
</a-tree> </a-tree>
</div> </div>
</div> </div>
</a-tab-pane> --> </a-tab-pane>
<a-tab-pane :key="3" tab="受众关联"> <a-tab-pane :key="3" tab="受众关联">
<div :style="{ height: screenHeight - 235 + 'px' }"> <div :style="{ height: screenHeight - 235 + 'px' }">
<div> <div>
<a-form-item label="受众名称："> <a-form-item label="受众名称：">
<a-input <a-input
v-model:value="audienceName.keyword" v-model:value="audienceName.keyword"
style="width: 260px; height: 40px; border-radius: 8px" style="width: 260px; height: 40px; border-radius: 8px"
placeholder="请输入受众名称" placeholder="请输入受众名称"
/> />
<a-button <a-button
type="primary" type="primary"
@click="searchAudi" @click="searchAudi"
style="margin-left: 20px; border-radius: 4px" style="margin-left: 20px; border-radius: 4px"
> >
<template #icon> <template #icon>
<SearchOutlined /> <SearchOutlined/>
</template> </template>
搜索 搜索
</a-button> </a-button>
<a-button <a-button
@click="resetAudienceInfo" @click="resetAudienceInfo"
style="margin-left: 20px; border-radius: 4px" style="margin-left: 20px; border-radius: 4px"
>重置 >重置
</a-button> </a-button>
</a-form-item> </a-form-item>
</div> </div>
<div class="tableBox tabb"> <div class="tableBox tabb">
<a-table <a-table
style="border: 1px solid #f2f6fe" style="border: 1px solid #f2f6fe"
row-key="id" row-key="id"
:columns="audiColums" :columns="audiColums"
:data-source="audiData" :data-source="audiData"
:loading="audiLoading" :loading="audiLoading"
:pagination="auditPagination" :pagination="auditPagination"
:row-selection="auditRowSelection" :row-selection="auditRowSelection"
/> />
</div> </div>
</div> </div>
@@ -191,9 +194,9 @@
</div> </div>
</div> </div>
<div <div
class="selecteds" class="selecteds"
:style="{ 'max-height': screenHeight - 235 + 'px' }" :style="{ 'max-height': screenHeight - 235 + 'px' }"
style="overflow-y: auto" style="overflow-y: auto"
> >
<div class="person">快速选人</div> <div class="person">快速选人</div>
<div v-for="(item, i) in selectsData.studentList"> <div v-for="(item, i) in selectsData.studentList">
@@ -213,39 +216,42 @@
</div> </div>
</div> </div>
<div <div
v-if="!person && selectsData.studentList.length > 10" v-if="!person && selectsData.studentList.length > 10"
class="ifsw" class="ifsw"
> >
<div @click="person = !person" class="“sw”">查看更多></div> <div @click="person = !person" class="“sw”">查看更多></div>
</div> </div>
<div <div
v-if="person && selectsData.studentList.length > 10" v-if="person && selectsData.studentList.length > 10"
class="ifsw" class="ifsw"
> >
<div @click="person = !person" class="sw">收起&lt;</div> <div @click="person = !person" class="sw">收起&lt;</div>
</div> </div>
<!--组织--> <div class="dept">添加组织</div>
<!-- <div class="dept">添加组织</div>--> <div v-for="(item,i) in selectsData.deptList">
<!-- <div v-for="(item,i) in selectsData.deptList" >--> <div v-if="i<11">
<!-- <div v-if="i<11">--> <div class="chose1">
<!-- <div class="chose1">--> <div class="span"> {{ item.name }}</div>
<!-- <div class="span"> {{ item.name }}</div>--> <div class="ch1" @click="orgDel(i)"></div>
<!-- <div class="ch1" @click="orgDel(i)"></div>--> </div>
<!-- </div>--> </div>
<!-- </div>--> <div v-else>
<!-- <div v-else> --> <div v-if="dept">
<!-- <div v-if ="dept">--> <div class="chose1">
<!-- <div class="chose1">--> <div class="span"> {{ item.name }}</div>
<!-- <div class="span"> {{ item.name }}</div>--> <div class="ch1" @click="orgDel(i)"></div>
<!-- <div class="ch1" @click="orgDel(i)"></div>--> </div>
<!-- </div>--> </div>
<!-- </div>-->
<!-- --> </div>
<!-- </div>-->
<!-- --> </div>
<!-- </div>--> <div v-if="!dept && selectsData.deptList.length >10" class="ifsw">
<!-- <div v-if="!dept && selectsData.deptList.length >10" class="ifsw"><div @click="dept = !dept" class=“sw”>查看更多></div></div>--> <div @click="dept = !dept" class=“sw”>查看更多></div>
<!-- <div v-if="dept && selectsData.deptList.length >10" class="ifsw" ><div @click="dept = !dept" class="sw"> 收起&lt; </div></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 class="group">受众关联</div>
<div v-for="(item, i) in selectsData.groupList"> <div v-for="(item, i) in selectsData.groupList">
@@ -265,8 +271,8 @@
</div> </div>
</div> </div>
<div <div
v-if="!group && selectsData.groupList.length > 10" v-if="!group && selectsData.groupList.length > 10"
class="ifsw" class="ifsw"
> >
<div @click="group = !group" class="“sw”">查看更多></div> <div @click="group = !group" class="“sw”">查看更多></div>
</div> </div>
@@ -341,13 +347,13 @@
</a-modal> </a-modal>
--> -->
<a-modal <a-modal
:style="{padding: 0,position: relative,right: '-20%'}" :style="{padding: 0,position: relative,right: '-20%'}"
:closable="true" :closable="true"
:visible="stageVisible" :visible="stageVisible"
:footer="null" :footer="null"
centered="true" centered="true"
@ok="handleStageOk" @ok="handleStageOk"
wrapClassName="changeModal" wrapClassName="changeModal"
> >
<div class="con"> <div class="con">
<div class="header"> <div class="header">
@@ -361,34 +367,34 @@
<!-- <div class="cur">当前关卡：关卡2</div> --> <!-- <div class="cur">当前关卡：关卡2</div> -->
<div class="select"> <div class="select">
<a-select <a-select
style="width: 400px" style="width: 400px"
:placeholder="type === 1 ? '选择阶段' : '选择关卡'" :placeholder="type === 1 ? '选择阶段' : '选择关卡'"
v-model:value="selectsData.stageId" v-model:value="selectsData.stageId"
className="cus-select" className="cus-select"
> >
<a-select-option <a-select-option
v-for="(item, i) in stageIds" v-for="(item, i) in stageIds"
:key="i" :key="i"
:value="item.id" :value="item.id"
>{{ item.name || "默认" }} >{{ item.name || "默认" }}
</a-select-option> </a-select-option>
</a-select> </a-select>
</div> </div>
<span style="color: #999999; margin-left: 10px" <span style="color: #999999; margin-left: 10px"
><minus-circle-outlined />已在其他关卡的学员，不会被添加到该关卡</span ><minus-circle-outlined/>已在其他关卡的学员，不会被添加到该关卡</span
> >
<div class="btn" style="margin-top: 50px"> <div class="btn" style="margin-top: 50px">
<button <button
class="sameb btn1" class="sameb btn1"
@click="closeChangeModal" @click="closeChangeModal"
style="cursor: pointer" style="cursor: pointer"
> >
取消 取消
</button> </button>
<button <button
class="sameb btn2" class="sameb btn2"
@click="handleStageOk" @click="handleStageOk"
style="cursor: pointer" style="cursor: pointer"
> >
确定 确定
</button> </button>
@@ -399,15 +405,15 @@
</a-modal> </a-modal>
</template> </template>
<script setup> <script setup>
import { computed, defineEmits, defineProps, ref, watch } from "vue"; import {computed, defineEmits, defineProps, ref, watch} from "vue";
import { request, useBoeApi, useBoeApiPage } from "@/api/request"; import {request, useBoeApi, useBoeApiPage} from "@/api/request";
import { import {
AUDIENCE_LIST, AUDIENCE_LIST,
ORG_CHILD_LIST, ORG_CHILD_LIST,
ORG_LIST, ORG_LIST,
USER_LIST, USER_LIST,
} from "@/api/ThirdApi"; } from "@/api/ThirdApi";
import { saveStu } from "@/api/index1"; import {saveStu} from "@/api/index1";
const emit = defineEmits({}); const emit = defineEmits({});
const props = defineProps({ const props = defineProps({
@@ -444,11 +450,11 @@ const audienceName = ref({
page: 1, page: 1,
pageSize: 10, pageSize: 10,
}); });
// const searchOrgName = ref({ const searchOrgName = ref({
// keyword: '', keyword: '',
// page: 1, page: 1,
// pageSize: 10 pageSize: 10
// }) })
const stageIds = computed(() => props.stage); const stageIds = computed(() => props.stage);
const { const {
data: stuData, data: stuData,
@@ -464,18 +470,27 @@ const {
totalPage: (res) => res.result.totalPage, totalPage: (res) => res.result.totalPage,
total: (res) => res.result.totalElement, total: (res) => res.result.totalElement,
}); });
// const { const {
// data: orgData, data: orgData,
// fetch: searchOrg, fetch: searchOrg,
// } = useBoeApiPage(ORG_LIST, searchOrgName.value) } = useBoeApiPage(ORG_LIST, searchOrgName.value)
const { data: treeData, loading: orgLoading } = useBoeApi( const {data: treeData, loading: orgLoading} = useBoeApi(
ORG_LIST, ORG_LIST,
{ keyword: "" }, {keyword: ""},
{ {
init: true, init: true,
result: (res) => res.result.map((e) => ({ ...e, isLeaf: false })), 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 { const {
data: audiData, data: audiData,
fetch: searchAudi, fetch: searchAudi,
@@ -487,7 +502,7 @@ const {
} = useBoeApiPage(AUDIENCE_LIST, audienceName.value, { } = useBoeApiPage(AUDIENCE_LIST, audienceName.value, {
init: true, init: true,
result: (res) => result: (res) =>
res.result.audienceList.map((e) => ({ ...e, id: e.id + "" })), res.result.audienceList.map((e) => ({...e, id: e.id + ""})),
totalPage: (res) => res.result.totalPage, totalPage: (res) => res.result.totalPage,
total: (res) => res.result.totalElement, total: (res) => res.result.totalElement,
}); });
@@ -599,14 +614,25 @@ const closeDrawer = () => {
stuData.value = []; stuData.value = [];
nameSearch.value.keyword = ""; nameSearch.value.keyword = "";
}; };
function onLoadData(treeNode) { function onLoadData(treeNode) {
return request(ORG_CHILD_LIST, { keyword: "", orgId: treeNode.id }).then( return request(ORG_CHILD_LIST, {keyword: "", orgId: treeNode.id}).then(
(r) => { (r) => {
treeNode.dataRef.treeChildList = r.result.directChildList; treeNode.dataRef.treeChildList = r.result.directChildList;
treeData.value = [...treeData.value]; treeData.value = [...treeData.value];
} }
); );
} }
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 = () => { const closeChangeModal = () => {
stageVisible.value = false; stageVisible.value = false;
}; };
@@ -630,7 +656,7 @@ function stuStuOrgSelect(e) {
function stuDel(i) { function stuDel(i) {
stuSelectKeys.value = stuSelectKeys.value.filter( stuSelectKeys.value = stuSelectKeys.value.filter(
(e) => e !== selectsData.value.studentList[i].id (e) => e !== selectsData.value.studentList[i].id
); );
selectsData.value.studentList.splice(i, 1); selectsData.value.studentList.splice(i, 1);
} }
@@ -641,7 +667,7 @@ function stuDel(i) {
// } // }
function AuditDel(i) { function AuditDel(i) {
auditSelectKeys.value = auditSelectKeys.value.filter( auditSelectKeys.value = auditSelectKeys.value.filter(
(e) => e !== selectsData.value.groupList[i].id (e) => e !== selectsData.value.groupList[i].id
); );
selectsData.value.groupList.splice(i, 1); selectsData.value.groupList.splice(i, 1);
} }
@@ -702,9 +728,9 @@ const deleteDepSelect = () => {
stuSelectKeys.value = []; stuSelectKeys.value = [];
}; };
//重置组织 //重置组织
// const resetOrg = () => { const resetOrg = () => {
// searchOrgName.value = {keyword: '', page: 1, pageSize: 10} searchOrgName.value = {keyword: '', page: 1, pageSize: 10}
// }; };
//重置受众 //重置受众
const resetAudienceInfo = () => { const resetAudienceInfo = () => {
audienceName.value.keyword = ""; audienceName.value.keyword = "";