Skip to content

D
dd_school
Commit b969a69b by Cat
Options

zd 社团bug修改

parent a38f89b4
Showing with 125 additions and 30 deletions
ruoyi-ui/src/views/smartSchool/massOrganization/basicInformationManagement/index.vue
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryForm" ref="queryForm" size="small" :inline="true" label-width="80px"> <el-form
:model="queryForm"
ref="queryForm"
size="small"
:inline="true"
label-width="80px"
>
<el-form-item prop="name" label="社团名称"> <el-form-item prop="name" label="社团名称">
<el-input v-model="queryForm.name" placeholder="社团名称"></el-input> <el-input v-model="queryForm.name" placeholder="社团名称"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="teachers" label="指导教师"> <el-form-item prop="teachers" label="指导教师">
<el-input v-model="queryForm.teachers" placeholder="指导教师"></el-input> <el-input
v-model="queryForm.teachers"
placeholder="指导教师"
></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd()">新增</el-button> <el-button
type="primary"
icon="el-icon-plus"
size="mini"
@click="handleAdd()"
>新增</el-button
>
</el-col> </el-col>
</el-row> </el-row>
<!-- 列表 --> <!-- 列表 -->
<div class="listBlock"> <div class="listBlock">
<div class="itemBlock" v-for="(task, index) in tasks" :key="index"> <div class="itemBlock" v-for="(task, index) in tasks" :key="index">
<div style=" <div
style="
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
"> "
>
<div style="width: 50%"> <div style="width: 50%">
<!-- 任务详细信息 --> <!-- 任务详细信息 -->
<div class="task-info"> <div class="task-info">
...@@ -52,17 +77,49 @@ ...@@ -52,17 +77,49 @@
<!-- 按钮 --> <!-- 按钮 -->
<div class="task-buttons"> <div class="task-buttons">
<el-button style="margin-left: 10px" size="mini" type="danger" round @click="handleDelete(task)">删除 <el-button
style="margin-left: 10px"
size="mini"
type="danger"
round
@click="handleDelete(task)"
>删除
</el-button> </el-button>
<el-button type="success" size="small" round <el-button
@click="clubRegistrationReview(task.id, task.teachers)">社团报名审核</el-button> type="success"
<el-button type="info" size="small" round @click="clubActivityRecord(task.id)">社团活动记录</el-button> size="small"
<el-button type="warning" size="small" round @click="memberManagement(task.id)">成员管理 round
@click="clubRegistrationReview(task.id, task.teachers)"
>社团报名审核</el-button
>
<el-button
type="info"
size="small"
round
@click="clubActivityRecord(task.id)"
>社团活动记录</el-button
>
<el-button
type="warning"
size="small"
round
@click="memberManagement(task.id)"
>成员管理
</el-button> </el-button>
<el-button class="purpleBtn" size="small" round type="primary" <el-button
@click="communityStyle(task.id, task.teachers)">社团风采 class="purpleBtn"
size="small"
round
type="primary"
@click="communityStyle(task.id, task.teachers)"
>社团风采
</el-button> </el-button>
<el-button type="primary" size="small" round @click="basicInformation(task.id, task.teachers)">基础信息管理 <el-button
type="primary"
size="small"
round
@click="basicInformation(task.id, task.teachers)"
>基础信息管理
</el-button> </el-button>
</div> </div>
</div> </div>
...@@ -72,22 +129,45 @@ ...@@ -72,22 +129,45 @@
<el-form ref="form" :model="form" :rules="rules" label-width="110px"> <el-form ref="form" :model="form" :rules="rules" label-width="110px">
<div> <div>
<el-form-item label="社团名称" prop="name"> <el-form-item label="社团名称" prop="name">
<el-input v-model="form.name" placeholder="请输入社团名称"></el-input> <el-input
v-model="form.name"
placeholder="请输入社团名称"
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="指导教师" prop="teachers"> <el-form-item label="指导教师" prop="teachers">
<el-select style="width: 100%" multiple v-model="form.teachers" filterable placeholder="请选择指导教师" <el-select
@change="changeTeacher"> style="width: 100%"
<el-option v-for="item in teacherInfo" :key="item.teacherCode" :label="item.teacherName" multiple
:value="item.teacherCode"> v-model="form.teachers"
filterable
placeholder="请选择指导教师"
@change="changeTeacher"
>
<el-option
v-for="item in teacherInfo"
:key="item.id"
:label="item.teacherName"
:value="item.id"
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="社团宗旨" prop="aim"> <el-form-item label="社团宗旨" prop="aim">
<el-input type="textarea" :rows="4" v-model="form.aim" placeholder="请输入社团宗旨"></el-input> <el-input
type="textarea"
:rows="4"
v-model="form.aim"
placeholder="请输入社团宗旨"
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="社团简介" prop="intro"> <el-form-item label="社团简介" prop="intro">
<el-input type="textarea" :rows="4" v-model="form.intro" placeholder="请输入社团简介"></el-input> <el-input
type="textarea"
:rows="4"
v-model="form.intro"
placeholder="请输入社团简介"
></el-input>
</el-form-item> </el-form-item>
</div> </div>
</el-form> </el-form>
...@@ -175,14 +255,29 @@ export default { ...@@ -175,14 +255,29 @@ export default {
}, },
// 查询教师姓名、id // 查询教师姓名、id
changeTeacher(value) { changeTeacher(value) {
// // console.log("value", value);
// this.teachersId = []; //初始化数据
// this.teachers = []; //初始化数据
// for (let i = 0; i <= value.length - 1; i++) {
// this.teacherInfo.find((item) => {
// //这里的options就是数据源
// if (item.teacherCode == value[i]) {
// this.teachersId.push(item.teacherCode); //这里的value我改成了id
// this.teachers.push(item.teacherName); //这里的label我改成了roleName
// }
// });
// }
// console.log("this.teachersId ", this.teachersId);
// console.log("this.teachers ", this.teachers);
// console.log("value", value); // console.log("value", value);
this.teachersId = []; //初始化数据 this.teachersId = []; //初始化数据
this.teachers = []; //初始化数据 this.teachers = []; //初始化数据
for (let i = 0; i <= value.length - 1; i++) { for (let i = 0; i <= value.length - 1; i++) {
this.teacherInfo.find((item) => { this.teacherInfo.find((item) => {
//这里的options就是数据源 //这里的options就是数据源
if (item.teacherCode == value[i]) { if (item.id == value[i]) {
this.teachersId.push(item.teacherCode); //这里的value我改成了id this.teachersId.push(item.id); //这里的value我改成了id
this.teachers.push(item.teacherName); //这里的label我改成了roleName this.teachers.push(item.teacherName); //这里的label我改成了roleName
} }
}); });
...@@ -288,7 +383,7 @@ export default { ...@@ -288,7 +383,7 @@ export default {
this.$message.success("修改成功"); this.$message.success("修改成功");
this.open = false; this.open = false;
}) })
.catch((err) => { }); .catch((err) => {});
} else { } else {
// 新增 // 新增
const params = { const params = {
...@@ -305,7 +400,7 @@ export default { ...@@ -305,7 +400,7 @@ export default {
this.$message.success("新增成功"); this.$message.success("新增成功");
this.open = false; this.open = false;
}) })
.catch((err) => { }); .catch((err) => {});
} }
} }
}); });
...@@ -323,7 +418,7 @@ export default { ...@@ -323,7 +418,7 @@ export default {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");
}) })
.catch(() => { }); .catch(() => {});
}, },
// 重置表单 // 重置表单
reset() { reset() {
...@@ -386,7 +481,7 @@ export default { ...@@ -386,7 +481,7 @@ export default {
text-align: left; text-align: left;
} }
.task-level>span { .task-level > span {
margin-right: 25px; margin-right: 25px;
} }
...@@ -410,13 +505,13 @@ export default { ...@@ -410,13 +505,13 @@ export default {
padding-left: 60%; padding-left: 60%;
} }
.task-count>.count { .task-count > .count {
font-weight: bold; font-weight: bold;
color: #307def; color: #307def;
font-size: 45px; font-size: 45px;
} }
.task-count>.sun { .task-count > .sun {
color: rgba(16, 16, 16, 1); color: rgba(16, 16, 16, 1);
font-size: 18px; font-size: 18px;
text-align: center; text-align: center;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment