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

-- 受众查询

Browse Source
This commit is contained in:
yuping
2022-12-20 18:48:10 +08:00
parent c5682075d0
commit 127039cc61
1 changed files with 472 additions and 635 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
<!-- eslint-disable vue/no-parsing-error -->
<!-- eslint-disable vue/require-v-for-key -->
<template>
<div class="CommonStudent">
<div>
<a-drawer
:visible="visiable"
class="drawerStyle ProjCheckship"
@@ -11,7 +11,7 @@
<div class="drawerMain" id="ProjCheckship">
<div class="header">
<div class="headerTitle">
{{ { 1: "添加学员", 2: "添加学员", 3: "添加学员" }[type] || "" }}
{{ {1: '添加学员', 2: '添加学员', 3: '添加学员'}[type] || '' }}
</div>
<img
style="width: 29px; height: 29px; cursor: pointer"
@@ -19,10 +19,8 @@
@click="closeDrawer"
/>
</div>
<div
style="width: 100%; display: grid; grid-template-columns: 750px auto"
>
<div class="tabs" style="min-height: 800px">
<div style="width:100%;display: grid;grid-template-columns: 750px auto;">
<div class="tabs" style="min-height:800px;">
<a-tabs v-model:activeKey="activeKey">
<a-tab-pane :key="1" tab="快速选人">
<div :style="{ height: screenHeight - 235 + 'px' }">
@@ -33,35 +31,19 @@
style="width: 270px; height: 40px; border-radius: 8px"
placeholder="请输入姓名"
/>
<a-button
type="primary"
@click="onSearchStu"
style="margin-left: 20px; border-radius: 4px"
>
<a-button type="primary" @click="onSearchStu" style="margin-left: 20px;border-radius: 4px">
<template #icon>
<SearchOutlined/>
</template>
搜索
</a-button>
<a-button
@click="resetStu"
style="margin-left: 20px; border-radius: 4px"
>重置</a-button
>
<a-button @click="resetStu" style="margin-left: 20px;border-radius: 4px">重置</a-button>
</a-form-item>
</div>
<div
class="chooseLeft"
style="display: grid; grid-template-columns: 250px auto"
>
<div
:style="{
height: screenHeight - 180 + 'px',
overflowY: 'auto',
}"
style="border: 1px solid #f0f0f0"
>
<div class="tree" style="margin: 10px 4px 220px 10px">
<div class="chooseLeft" style="display: grid;grid-template-columns: 250px auto">
<div :style="{ height: screenHeight - 180 + 'px' ,overflowY:'auto'}"
style="border: 1px solid #f0f0f0; ;">
<div class="tree" style="margin: 10px 4px 220px 10px;">
<a-tree
allow-clear
tree-default-expand-all
@@ -77,13 +59,7 @@
</a-tree>
</div>
</div>
<div
class="tableBox tabb"
style="
margin: 0px 4px 120px 10px;
border: 1px solid #f0f0f0;
"
>
<div class="tableBox tabb" style="margin: 0px 4px 120px 10px; border: 1px solid #f0f0f0;">
<a-table
:columns="stuColumns"
:data-source="stuData"
@@ -96,52 +72,6 @@
</div>
</div>
</a-tab-pane>
<<<<<<< HEAD
<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' }"-->
@@ -180,9 +110,10 @@
<!-- </div>-->
<!-- </div>-->
<!-- </a-tab-pane>-->
>>>>>>> 0bbb4403e7650fcaf87f158833a10c02c3e51841
<a-tab-pane :key="3" tab="受众关联">
<div :style="{ height: screenHeight - 235 + 'px' }">
<div
:style="{ height: screenHeight - 235 + 'px' }"
>
<div>
<a-form-item label="受众名称：">
<a-input
@@ -190,21 +121,13 @@
style="width: 260px; height: 40px; border-radius: 8px"
placeholder="请输入受众名称"
/>
<a-button
type="primary"
@click="searchAudi"
style="margin-left: 20px; border-radius: 4px"
>
<a-button type="primary" @click="searchAudi" style="margin-left: 20px;border-radius: 4px">
<template #icon>
<SearchOutlined/>
</template>
搜索
</a-button>
<a-button
@click="resetAudienceInfo"
style="margin-left: 20px; border-radius: 4px"
>重置</a-button
>
<a-button @click="resetAudienceInfo" style="margin-left: 20px;border-radius: 4px">重置</a-button>
</a-form-item>
</div>
<div class="tableBox tabb">
@@ -226,7 +149,9 @@
<div class="onerow">
<div class="onleft">
<div class="already">已选</div>
</div>
</div>
<div
class="selecteds"
@@ -248,64 +173,17 @@
<div class="ch" @click="stuDel(i)"></div>
</div>
</div>
</div>
<<<<<<< HEAD
</div>
<div
v-if="!person && selectsData.studentList.length > 10"
class="ifsw"
>
<div @click="person = !person" class="“sw”">查看更多></div>
<div v-if="!person && selectsData.studentList.length >10" class="ifsw">
<div @click="person = !person" class=“sw”>查看更多></div>
</div>
<div
v-if="person && selectsData.studentList.length > 10"
class="ifsw"
>
<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="group">受众关联</div>
<div v-for="(item, i) in selectsData.groupList">
<div v-if="i < 11">
<div class="chose2">
<div class="span">{{ item.audienceName }}</div>
=======
</div>
</div>
<div v-if="!person && selectsData.studentList.length >10" class="ifsw"><div @click="person = !person" class=“sw”>查看更多></div></div>
<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" >-->
@@ -343,28 +221,21 @@
<div v-if="group">
<div class="chose2">
<div class="span"> {{ item.audienceName }}</div>
>>>>>>> 0bbb4403e7650fcaf87f158833a10c02c3e51841
<div class="ch2" @click="AuditDel(i)"></div>
</div>
</div>
<div v-else>
<div v-if="group">
<div class="chose2">
<div class="span">{{ item.audienceName }}</div>
<div class="ch2" @click="AuditDel(i)"></div>
</div>
</div>
</div>
</div>
<div
v-if="!group && selectsData.groupList.length > 10"
class="ifsw"
>
<div @click="group = !group" class="“sw”">查看更多></div>
<div v-if="!group && selectsData.groupList.length >10" class="ifsw">
<div @click="group = !group" class=“sw”>查看更多></div>
</div>
<div v-if="group && selectsData.groupList >10" class="ifsw">
<div @click="group = !group" class="sw"> 收起&lt;</div>
</div>
</div>
</div>
<!-- <div style="padding:100px 0 0 20px;display: grid;grid-template-rows: auto auto auto;">
@@ -412,60 +283,33 @@
<slot></slot>
</div>
</div>
<a-modal
v-model:visible="stageVisible"
width="1000px"
title="选择阶段"
@ok="handleStageOk"
>
<a-modal v-model:visible="stageVisible" width="1000px" title="选择阶段" @ok="handleStageOk">
<div>
{{ type === 1 ? "选择阶段" : "选择关卡" }}
<a-select
style="width: 150px"
:placeholder="type === 1 ? '选择阶段' : '选择关卡'"
v-model:value="selectsData.stageId"
className="cus-select"
>
<a-select-option v-for="(item, i) in stageIds" :key="i" :value="item.id"
>{{ item.name || "默认" }}
{{ type === 1 ? '选择阶段' : '选择关卡' }}
<a-select style="width: 150px" :placeholder="type===1?'选择阶段':'选择关卡'" v-model:value="selectsData.stageId"
className="cus-select">
<a-select-option v-for="(item,i) in stageIds" :key="i" :value="item.id">{{
item.name || '默认'
}}
</a-select-option>
</a-select>
</div>
</a-modal>
</template>
<script setup>
<<<<<<< HEAD
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 { saveStu } from "@/api/index1";
=======
import {computed, defineEmits, defineProps, ref, watch} from "vue";
import {useStore} from "vuex";
import {useBoeApiPage} from "@/api/request";
import {AUDIENCE_LIST, USER_LIST} from "@/api/ThirdApi";
import {saveStu} from "@/api/index1";
>>>>>>> 0bbb4403e7650fcaf87f158833a10c02c3e51841
const store = useStore();
const emit = defineEmits({});
const emit = defineEmits({})
const props = defineProps({
type: Number,
id: String,
stage: {
type: Array,
<<<<<<< HEAD
default: () => [],
},
});
const person = ref(false);
const dept = ref(false);
const group = ref(false);
const visiable = ref(false);
const activeKey = ref(1);
const stageVisible = ref(false);
=======
default: () => []
}
})
@@ -475,31 +319,21 @@ const group =ref(false)
const visiable = ref(false)
const activeKey = ref(1)
const stageVisible = ref(false)
>>>>>>> 0bbb4403e7650fcaf87f158833a10c02c3e51841
const selectsData = ref({
stageId: "",
stageId: '',
studentList: [],
deptList: [],
groupList: [],
});
groupList: []
})
const nameSearch = ref({
keyword: "",
keyword: '',
departId: null,
page: 1,
pageSize: 10,
});
pageSize: 10
})
const audienceName = ref({
keyword: "",
keyword: '',
page: 1,
<<<<<<< HEAD
pageSize: 10,
});
const searchOrgName = ref({
keyword: "",
page: 1,
pageSize: 10,
});
=======
pageSize: 10
})
// const searchOrgName = ref({
@@ -507,9 +341,8 @@ const searchOrgName = ref({
// page: 1,
// pageSize: 10
// })
>>>>>>> 0bbb4403e7650fcaf87f158833a10c02c3e51841
const stageIds = computed(() => props.stage);
const stageIds = computed(() => props.stage)
const {
data: stuData,
@@ -517,25 +350,18 @@ const {
page: stuPageNo,
pageSize: stuPageSize,
loading: stuLoading,
total: stuTotal,
total: stuTotal
} = useBoeApiPage(USER_LIST, nameSearch.value, {
init: false,
result: (res) => res.result.userInfoList,
totalPage: (res) => res.result.totalPage,
total: (res) => res.result.totalElement,
});
result: res => res.result.userInfoList,
totalPage: res => res.result.totalPage,
total: res => res.result.totalElement
})
<<<<<<< HEAD
const { data: orgData, fetch: searchOrg } = useBoeApi(
ORG_LIST,
searchOrgName.value
);
=======
// const {
// data: orgData,
// fetch: searchOrg,
// } = useBoeApi(ORG_LIST, searchOrgName.value)
>>>>>>> 0bbb4403e7650fcaf87f158833a10c02c3e51841
const {
data: audiData,
@@ -543,14 +369,13 @@ const {
page: audiPageNo,
pageSize: audiPageSize,
loading: audiLoading,
total: audiTotal,
total: audiTotal
} = useBoeApiPage(AUDIENCE_LIST, audienceName.value, {
init: true,
result: (res) =>
res.result.audienceList.map((e) => ({ ...e, id: e.id + "" })),
totalPage: (res) => res.result.totalPage,
total: (res) => res.result.totalElement,
});
result: res => res.result.audienceList.map(e => ({...e, id: e.id + ''})),
totalPage: res => res.result.totalPage,
total: res => res.result.totalElement
})
const stuColumns = ref([
{
@@ -589,9 +414,8 @@ const stuColumns = ref([
className: "h",
ellipsis: true,
},
]);
const audiColums = ref([
{
])
const audiColums = ref([{
title: "id",
dataIndex: "id",
key: "id",
@@ -624,52 +448,52 @@ const audiColums = ref([
align: "center",
className: "h",
},
]);
const stuSelectKeys = ref([]);
const orgSelectKeys = ref([]);
const auditSelectKeys = ref([]);
const screenHeight = ref(document.body.clientHeight);
])
const stuSelectKeys = ref([])
const orgSelectKeys = ref([])
const auditSelectKeys = ref([])
const screenHeight = ref(document.body.clientHeight)
const stuRowSelection = computed(() => ({
columnWidth: 20,
selectedRowKeys: stuSelectKeys.value,
onChange: onStuSelectChange,
preserveSelectedRowKeys: true,
}));
}))
const orgRowSelection = computed(() => ({
columnWidth: 20,
selectedRowKeys: orgSelectKeys.value,
onChange: onOrgSelectChange,
preserveSelectedRowKeys: true,
}));
}))
const stuPagination = computed(() => ({
total: stuTotal.value,
showSizeChanger: false,
current: stuPageNo.value,
pageSize: stuPageSize.value,
onChange: changePagination,
}));
onChange: changePagination
}))
const auditPagination = computed(() => ({
total: audiTotal.value,
showSizeChanger: false,
current: audiPageNo.value,
pageSize: audiPageSize.value,
onChange: auditChangePagination,
}));
onChange: auditChangePagination
}))
const auditRowSelection = computed(() => ({
columnWidth: 20,
selectedRowKeys: auditSelectKeys.value,
onChange: onAuditSelectChange,
preserveSelectedRowKeys: true,
}));
}))
const closeDrawer = () => {
visiable.value = false;
visiable.value = false
};
const openDrawer = () => {
visiable.value = true;
visiable.value = true
};
//获取组织树
const treeData = computed(() => {
@@ -677,43 +501,31 @@ const treeData = computed(() => {
});
function onSearchStu() {
nameSearch.value.page = 1;
searchStu();
nameSearch.value.page = 1
searchStu()
}
function stuStuOrgSelect(e) {
nameSearch.value.departId = e.join("");
searchStu();
nameSearch.value.departId = e.join('')
searchStu()
}
function stuDel(i) {
stuSelectKeys.value = stuSelectKeys.value.filter(
(e) => e !== selectsData.value.studentList[i].id
);
selectsData.value.studentList.splice(i, 1);
stuSelectKeys.value = stuSelectKeys.value.filter(e => e !== selectsData.value.studentList[i].id)
selectsData.value.studentList.splice(i, 1)
}
<<<<<<< HEAD
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)
// }
>>>>>>> 0bbb4403e7650fcaf87f158833a10c02c3e51841
function AuditDel(i) {
auditSelectKeys.value = auditSelectKeys.value.filter(
(e) => e !== selectsData.value.groupList[i].id
);
selectsData.value.groupList.splice(i, 1);
auditSelectKeys.value = auditSelectKeys.value.filter(e => e !== selectsData.value.groupList[i].id)
selectsData.value.groupList.splice(i, 1)
}
// function orgSelect(key, obj) {
// console.log(obj)
//request(ORG_CHILD_LIST, {orgId: null}).then(res => {
@@ -722,18 +534,18 @@ function AuditDel(i) {
//}
function onStuSelectChange(e, l) {
stuSelectKeys.value = e;
selectsData.value.studentList = l;
stuSelectKeys.value = e
selectsData.value.studentList = l
}
function onOrgSelectChange(e, l) {
orgRowSelection.value = e;
selectsData.value.deptList = l.selectedNodes;
orgRowSelection.value = e
selectsData.value.deptList = l.selectedNodes
}
function onAuditSelectChange(e, l) {
auditSelectKeys.value = e;
selectsData.value.groupList = l;
auditSelectKeys.value = e
selectsData.value.groupList = l
}
// const stuDepartmentSelect = (e) => {
@@ -744,38 +556,32 @@ function onAuditSelectChange(e, l) {
//分页获取学员
const changePagination = (page) => {
nameSearch.value.page = page;
searchStu();
searchStu()
};
const auditChangePagination = (page) => {
audienceName.value.page = page;
searchAudi();
searchAudi()
};
//重置
const resetStu = () => {
deleteDepSelect();
nameSearch.value = { keyword: "", page: 1, pageSize: 10 };
nameSearch.value = {keyword: '', page: 1, pageSize: 10}
};
//清空选择部门信息
const deleteDepSelect = () => {
stuSelectKeys.value = [];
stuSelectKeys.value = []
};
//重置组织
<<<<<<< HEAD
const resetOrg = () => {
searchOrgName.value = { keyword: "", page: 1, pageSize: 10 };
};
=======
// const resetOrg = () => {
// searchOrgName.value = {keyword: '', page: 1, pageSize: 10}
// };
>>>>>>> 0bbb4403e7650fcaf87f158833a10c02c3e51841
//重置受众
const resetAudienceInfo = () => {
audienceName.value = { keyword: "", page: 1, pageSize: 10 };
audienceName.value = {keyword: '', page: 1, pageSize: 10}
};
//全部清除
@@ -789,43 +595,47 @@ const resetAudienceInfo = () => {
//确定添加授权
const submitAuth = () => {
if (props.type === 2) {
stageVisible.value = true;
stageVisible.value = true
} else {
handleStageOk();
handleStageOk()
}
};
function handleStageOk() {
stageVisible.value = false;
visiable.value = false;
emit("finash", false);
stageVisible.value = false
visiable.value = false
emit('finash', false)
saveStu({
targetId: props.id,
type: props.type,
deptIds: selectsData.value.deptList?.map((e) => e.id),
deptIds: selectsData.value.deptList?.map(e => e.id),
stageId: selectsData.value.stageId,
groupIds: selectsData.value.groupList?.map((e) => e.id),
studentList: selectsData.value.studentList,
groupIds: selectsData.value.groupList?.map(e => e.id),
studentList: selectsData.value.studentList
}).then(() => {
emit("finash", true);
});
emit('finash', true)
})
}
watch(visiable, () => {
stuSelectKeys.value = [];
orgSelectKeys.value = [];
auditSelectKeys.value = [];
stuData.value = [];
stuSelectKeys.value = []
orgSelectKeys.value = []
auditSelectKeys.value = []
stuData.value = []
audienceName.value.keyword=''
audienceName.value.page=1
audienceName.value.pageSize=10
selectsData.value = {
stageId: "",
stageId: '',
studentList: [],
deptList: [],
groupList: [],
};
});
groupList: []
}
searchAudi()
})
</script>
<style lang="scss">
.CommonStudent {
.ant-btn-primary {
background-color: #4ea6ff !important;
}
@@ -834,23 +644,28 @@ watch(visiable, () => {
height: 40px;
border-radius: 8px;
}
.tableBox .ant-table-row .ant-table-cell {
height: 48px;
font-size: 14px;
font-size: 12px;
font-weight: 400;
color: #4f5156;
color: #4F5156;
line-height: 29px;
padding: 0px;
}
.tableBox .ant-table-thead tr th {
font-size: 14px;
font-size: 12px;
}
.ant-tabs-tabpane {
height: 100%;
}
.ant-tabs {
overflow: visible;
}
.right1 {
border-left: 1px solid #f2f6fe;
width: 100%;
@@ -864,9 +679,11 @@ watch(visiable, () => {
flex-wrap: wrap;
width: 100%;
.onleft {
display: flex;
text-align: center;
.already {
color: rgba(51, 51, 51, 1);
font-size: 16px;
@@ -875,17 +692,20 @@ watch(visiable, () => {
white-space: nowrap;
// margin-bottom: 20px;
}
.count {
color: #4ea6ff;
font-size: 16px;
margin: 0 6px;
}
.peo {
color: rgba(51, 51, 51, 1);
font-size: 16px;
font-weight: 500;
}
}
.clbox {
margin-right: 50px;
display: flex;
@@ -896,6 +716,7 @@ watch(visiable, () => {
height: 32px;
border-radius: 4px;
background: #4ea6ff;
.colose {
width: 16px;
height: 16px;
@@ -906,21 +727,25 @@ watch(visiable, () => {
background-size: 100%;
margin-right: 4px;
}
.allclear {
color: rgba(255, 255, 255, 1);
font-size: 14px;
}
}
}
.selecteds {
display: flex;
flex-wrap: wrap;
margin-left: 32px;
.person {
width: 100%;
margin-top: 20px;
border-top: 1px solid #f2f6fe;
}
.chose {
width: 64px;
height: 24px;
@@ -934,6 +759,7 @@ watch(visiable, () => {
color: rgba(56, 139, 225, 1);
font-size: 12px;
position: relative;
.ch {
position: absolute;
width: 18px;
@@ -943,12 +769,14 @@ watch(visiable, () => {
top: -8px;
}
}
.ifsw {
display: flex;
align-items: end;
justify-content: center;
color: #4ea6ff;
}
.sw {
display: flex;
align-items: center;
@@ -958,11 +786,13 @@ watch(visiable, () => {
margin-top: 23px;
margin-left: 10px;
}
.dept {
width: 100%;
margin-top: 30px;
border-top: 1px solid #f2f6fe;
}
.chose1 {
//width: 90px;
height: 24px;
@@ -976,11 +806,13 @@ watch(visiable, () => {
color: rgba(56, 139, 225, 1);
font-size: 12px;
position: relative;
.span {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.ch1 {
position: absolute;
width: 18px;
@@ -989,12 +821,15 @@ watch(visiable, () => {
right: -8px;
top: -8px;
}
}
.group {
width: 100%;
margin-top: 30px;
border-top: 1px solid #f2f6fe;
}
.chose2 {
//width: 120px;
height: 24px;
@@ -1008,11 +843,13 @@ watch(visiable, () => {
color: rgba(56, 139, 225, 1);
font-size: 12px;
position: relative;
.span {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.ch2 {
position: absolute;
width: 18px;
@@ -1021,7 +858,7 @@ watch(visiable, () => {
right: -8px;
top: -8px;
}
}
}
}
}