修改页面

This commit is contained in:
曹辉 2022-08-31 14:25:05 +08:00
parent d08fb71d3e
commit c7e25d671d
2 changed files with 513 additions and 309 deletions

View File

@ -276,22 +276,36 @@
<el-dialog
:title="title"
:visible.sync="open"
width="500px"
width="600px"
append-to-body
:before-close="cancel"
>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form ref="form" :model="form" :rules="rules" label-width="130px">
<el-form-item label="所属幼儿园" prop="kindergartenId">
<el-button
@click="kininnerVisible = true"
style="width: 380px; text-align: left; height: 36px; color: #c0c4cc"
v-if="kindergartenName == '请选择所在幼儿园'"
>{{ kindergartenName }}</el-button
>
<el-button
@click="kininnerVisible = true"
style="width: 380px; text-align: left; height: 36px"
v-else
>{{ kindergartenName }}</el-button
>
</el-form-item>
<el-form-item label="所属班级" prop="classId">
<el-button
type=""
@click="innerVisible = true"
@click="classclick"
style="width: 380px; text-align: left; height: 36px; color: #c0c4cc"
v-if="classinfoName == '请选择所属班级'"
>{{ classinfoName }}</el-button
>
<el-button
type=""
@click="innerVisible = true"
@click="classclick"
style="width: 380px; text-align: left; height: 36px"
v-else
>{{ classinfoName }}</el-button
@ -343,12 +357,14 @@
v-model="form.studentName"
placeholder="请输入学生姓名"
maxlength="10"
style="width: 380px"
/>
</el-form-item>
<el-form-item label="学生编号" prop="studentNumber">
<el-input
v-model="form.studentNumber"
placeholder="请输入学生编号"
style="width: 380px"
maxlength="20"
/>
</el-form-item>
@ -360,6 +376,7 @@
</el-form-item>
<el-form-item label="出生日期" prop="birthDate">
<el-date-picker
style="width: 380px"
clearable
v-model="form.birthDate"
type="date"
@ -370,11 +387,16 @@
</el-date-picker>
</el-form-item>
<el-form-item label="身份证号" prop="cardNumber">
<el-input v-model="form.cardNumber" placeholder="请输入身份证号" />
<el-input
style="width: 380px"
v-model="form.cardNumber"
placeholder="请输入身份证号"
/>
</el-form-item>
<el-form-item label="曾用名" prop="onceName">
<el-input
v-model="form.onceName"
style="width: 380px"
placeholder="请输入曾用名"
maxlength="40"
/>
@ -383,6 +405,7 @@
<el-input
v-model="form.homeAddress"
placeholder="请输入家庭住址"
style="width: 380px"
maxlength="100"
/>
</el-form-item>
@ -391,316 +414,429 @@
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
<!-- 学生家长 -->
<el-dialog
width="800px"
title="选择学生家长"
:visible.sync="innerVisible2"
append-to-body
:before-close="prentclickok"
</el-dialog>
<!-- // -->
<el-dialog
width="850px"
title="选择所属幼儿园"
:visible.sync="kininnerVisible"
append-to-body
:before-close="kincancel"
>
<el-form
:model="kinqueryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="90px"
>
<el-form
:model="parentInfoList2"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="70px"
style="margin-bottom: -30px"
>
<el-form-item label="家长姓名" prop="parentName">
<el-input
v-model="parentInfoList2.parentName"
placeholder="请输入家长姓名"
clearable
style="width: 160px"
@keyup.enter.native="handleQuery3"
/>
</el-form-item>
<el-form-item label="联系电话" prop="phone">
<el-input
v-model="parentInfoList2.phone"
placeholder="请输入联系电话"
clearable
style="width: 160px"
@keyup.enter.native="handleQuery3"
/>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery3"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery3"
>重置</el-button
>
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="innerVisible3 = true"
style="margin-bottom: 40px"
>新增家长</el-button
>
</el-form-item>
</el-form>
<el-form-item label="幼儿园名称" prop="kindergartenName">
<el-input
v-model="kininnerVisible.kindergartenName"
placeholder="请输入幼儿园名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="幼儿园地址" prop="kindergartenAddress">
<el-input
v-model="kininnerVisible.kindergartenAddress"
placeholder="请输入幼儿园地址"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery3"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery2"
>重置</el-button
>
</el-form-item>
</el-form>
<el-table
ref="tags"
:data="parentInfoList"
<el-table
:data="kindergartenInfoList"
@cell-dblclick="kindergartenNameclick"
>
<el-table-column label="请选择" width="70" align="center">
<template slot-scope="scope">
<el-button
type="primary"
v-if="kindergartenid == scope.row.id"
style="width: 15px; height: 15px"
circle
@click="kindergartenNameclick(scope.row)"
></el-button>
<el-button
v-else
style="width: 15px; height: 15px"
circle
@click="kindergartenNameclick(scope.row)"
></el-button>
</template>
</el-table-column>
<el-table-column
property="kindergartenName"
label="幼儿园名字"
width="150"
align="center"
@cell-dblclick="handleSelectionChange2"
>
<!-- <el-table-column type="selection" label="请选择" width="100" align="center"> -->
<el-table-column label="请选择" width="100" align="center">
<template slot-scope="scope">
<el-button
type="primary"
style="width: 20px; height: 20px; padding: 0px"
v-if="parent1 == scope.row.id || parent2 == scope.row.id"
@click="handleSelectionChange3(scope.row)"
></el-button>
<el-button
v-else
style="width: 20px; height: 20px; padding: 0px"
@click="handleSelectionChange2(scope.row)"
></el-button>
</template>
</el-table-column>
<el-table-column
property="parentName"
label="家长姓名"
width="220"
align="center"
>
</el-table-column>
<el-table-column
property="classType"
label="班级性别"
width="220"
align="center"
>
<template slot-scope="scope">
{{ scope.row.parentSex == "MALE" ? "男" : "女" }}
</template>
</el-table-column>
<el-table-column
property="phone"
label="联系电话"
width="220"
align="center"
>
</el-table-column>
</el-table>
<pagination
v-show="total3 > 0"
:total="total3"
:page.sync="parentInfoList2.pageNum"
:limit.sync="parentInfoList2.pageSize"
@pagination="getList"
style="margin-top: 40px"
/>
<el-button
type="primary"
size="mini"
@click="prentclickok"
style="
margin-top: 30px;
margin-left: 85%;
width: 100px;
height: 50px;
font-size: 15px;
"
>选择完成</el-button
>
</el-dialog>
<!-- // -->
<el-dialog
width="1000px"
title="选择所属班级"
:visible.sync="innerVisible"
append-to-body
:before-close="cancel3"
>
<el-form
:model="classinfoList2"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="90px"
>
<el-form-item label="班级名称" prop="className">
<el-input
style="width: 150px"
v-model="classinfoList2.className"
placeholder="请输入班级名称"
clearable
@keyup.enter.native="handleQuery2"
/>
</el-form-item>
<el-form-item label="班级类型" prop="classType">
<el-select
v-model="classinfoList2.classType"
placeholder="请选择"
style="width: 150px"
>
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.classType"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="班主任姓名" prop="classTeacher">
<el-input
v-model="classinfoList2.classTeacher"
placeholder="请输入班主任姓名"
style="width: 150px"
clearable
@keyup.enter.native="handleQuery2"
/>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery2"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery2"
>重置</el-button
>
</el-form-item>
</el-form>
<el-table
:data="classinfoList"
</el-table-column>
<el-table-column
property="kindergartenAddress"
label="幼儿园地址"
width="150"
align="center"
style="margin-top: 10px"
@cell-dblclick="classinfoclick"
>
<el-table-column label="请选择" width="80" align="center">
<template slot-scope="scope">
<el-button
type="primary"
v-if="classinfoId == scope.row.id"
style="width: 15px; height: 15px"
circle
@click="classinfoclick(scope.row)"
></el-button>
<el-button
v-else
style="width: 15px; height: 15px"
circle
@click="classinfoclick(scope.row)"
></el-button>
</template>
</el-table-column>
<el-table-column
property="className"
label="班级名称"
width="195"
align="center"
>
</el-table-column>
<el-table-column
property="classType"
label="班级类型"
width="195"
align="center"
>
<template slot-scope="scope">
{{ scope.row.classType == dictValue1 ? "大班" : "" }}
{{ scope.row.classType == dictValue2 ? "中班" : "" }}
{{ scope.row.classType == dictValue3 ? "小班" : "" }}
{{ scope.row.classType == dictValue4 ? "毕业" : "" }}
</template>
</el-table-column>
<el-table-column
property="classTeacher"
label="班主任姓名"
width="195"
align="center"
>
</el-table-column>
<el-table-column
property="phone"
label="联系电话"
width="300"
align="center"
>
</el-table-column>
</el-table>
<pagination
v-show="total2 > 0"
:total="total2"
:page.sync="classinfoList2.pageNum"
:limit.sync="classinfoList2.pageSize"
@pagination="getList"
/>
</el-dialog>
<!-- 修改家长信息对话框 -->
<el-dialog
title="新增家长"
:visible.sync="innerVisible3"
width="500px"
append-to-body
:before-close="cancel2"
>
<el-form
ref="form"
:model="addparentlist"
:rules="rules"
label-width="80px"
</el-table-column>
<el-table-column
label="幼儿园所在组织"
align="center"
prop="organizeName"
width="150"
>
<el-form-item label="家长姓名" prop="parentName">
<el-input
v-model="addparentlist.parentName"
placeholder="请输入家长姓名"
/>
</el-form-item>
<el-form-item label="家长性别" prop="parentSex">
<el-radio-group v-model="addparentlist.parentSex">
<el-radio :label="male"></el-radio>
<el-radio :label="female"></el-radio>
</el-radio-group>
</el-form-item>
</el-table-column>
<el-table-column
property="contacts"
label="联系人"
width="150"
align="center"
>
</el-table-column>
<el-table-column
property="phone"
label="联系电话"
width="150"
align="center"
>
</el-table-column>
</el-table>
<el-form-item label="联系电话" prop="phone">
<el-input
maxlength="13"
v-model="addparentlist.phone"
placeholder="请输入联系电话"
/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="addparent"> </el-button>
<el-button @click="cancel2"> </el-button>
</div>
</el-dialog>
<pagination
v-show="kintotal > 0"
:total="kintotal"
:page.sync="kinqueryParams.pageNum"
:limit.sync="kinqueryParams.pageSize"
@pagination="kininfolist"
/>
</el-dialog>
<!-- 学生家长 -->
<el-dialog
width="800px"
title="选择学生家长"
:visible.sync="innerVisible2"
append-to-body
:before-close="prentclickok"
>
<el-form
:model="parentInfoList2"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="70px"
style="margin-bottom: -30px"
>
<el-form-item label="家长姓名" prop="parentName">
<el-input
v-model="parentInfoList2.parentName"
placeholder="请输入家长姓名"
clearable
style="width: 160px"
@keyup.enter.native="handleQuery3"
/>
</el-form-item>
<el-form-item label="联系电话" prop="phone">
<el-input
v-model="parentInfoList2.phone"
placeholder="请输入联系电话"
clearable
style="width: 160px"
@keyup.enter.native="handleQuery3"
/>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery3"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery3"
>重置</el-button
>
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="innerVisible3 = true"
style="margin-bottom: 40px"
>新增家长</el-button
>
</el-form-item>
</el-form>
<el-table
ref="tags"
:data="parentInfoList"
align="center"
@cell-dblclick="handleSelectionChange2"
>
<!-- <el-table-column type="selection" label="请选择" width="100" align="center"> -->
<el-table-column label="请选择" width="100" align="center">
<template slot-scope="scope">
<el-button
type="primary"
style="width: 20px; height: 20px; padding: 0px"
v-if="parent1 == scope.row.id || parent2 == scope.row.id"
@click="handleSelectionChange3(scope.row)"
></el-button>
<el-button
v-else
style="width: 20px; height: 20px; padding: 0px"
@click="handleSelectionChange2(scope.row)"
></el-button>
</template>
</el-table-column>
<el-table-column
property="parentName"
label="家长姓名"
width="220"
align="center"
>
</el-table-column>
<el-table-column
property="classType"
label="班级性别"
width="220"
align="center"
>
<template slot-scope="scope">
{{ scope.row.parentSex == "MALE" ? "男" : "女" }}
</template>
</el-table-column>
<el-table-column
property="phone"
label="联系电话"
width="220"
align="center"
>
</el-table-column>
</el-table>
<pagination
v-show="total3 > 0"
:total="total3"
:page.sync="parentInfoList2.pageNum"
:limit.sync="parentInfoList2.pageSize"
@pagination="getList"
style="margin-top: 40px"
/>
<el-button
type="primary"
size="mini"
@click="prentclickok"
style="
margin-top: 30px;
margin-left: 85%;
width: 100px;
height: 50px;
font-size: 15px;
"
>选择完成</el-button
>
</el-dialog>
<!-- // -->
<el-dialog
width="1000px"
title="选择所属班级"
:visible.sync="innerVisible"
append-to-body
:before-close="cancel3"
>
<el-form
:model="classinfoList2"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="90px"
>
<el-form-item label="班级名称" prop="className">
<el-input
style="width: 150px"
v-model="classinfoList2.className"
placeholder="请输入班级名称"
clearable
@keyup.enter.native="handleQuery2"
/>
</el-form-item>
<el-form-item label="班级类型" prop="classType">
<el-select
v-model="classinfoList2.classType"
placeholder="请选择"
style="width: 150px"
>
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.classType"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="班主任姓名" prop="classTeacher">
<el-input
v-model="classinfoList2.classTeacher"
placeholder="请输入班主任姓名"
style="width: 150px"
clearable
@keyup.enter.native="handleQuery2"
/>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery2"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery2"
>重置</el-button
>
</el-form-item>
</el-form>
<el-table
:data="classinfoList"
align="center"
style="margin-top: 10px"
@cell-dblclick="classinfoclick"
>
<el-table-column label="请选择" width="80" align="center">
<template slot-scope="scope">
<el-button
type="primary"
v-if="classinfoId == scope.row.id"
style="width: 15px; height: 15px"
circle
@click="classinfoclick(scope.row)"
></el-button>
<el-button
v-else
style="width: 15px; height: 15px"
circle
@click="classinfoclick(scope.row)"
></el-button>
</template>
</el-table-column>
<el-table-column
property="className"
label="班级名称"
width="195"
align="center"
>
</el-table-column>
<el-table-column
property="classType"
label="班级类型"
width="195"
align="center"
>
<template slot-scope="scope">
{{ scope.row.classType == dictValue1 ? "大班" : "" }}
{{ scope.row.classType == dictValue2 ? "中班" : "" }}
{{ scope.row.classType == dictValue3 ? "小班" : "" }}
{{ scope.row.classType == dictValue4 ? "毕业" : "" }}
</template>
</el-table-column>
<el-table-column
property="classTeacher"
label="班主任姓名"
width="195"
align="center"
>
</el-table-column>
<el-table-column
property="phone"
label="联系电话"
width="300"
align="center"
>
</el-table-column>
</el-table>
<pagination
v-show="total2 > 0"
:total="total2"
:page.sync="classinfoList2.pageNum"
:limit.sync="classinfoList2.pageSize"
@pagination="getList"
/>
</el-dialog>
<!-- 修改家长信息对话框 -->
<el-dialog
title="新增家长"
:visible.sync="innerVisible3"
width="500px"
append-to-body
:before-close="cancel2"
>
<el-form
ref="form"
:model="addparentlist"
:rules="rules"
label-width="80px"
>
<el-form-item label="家长姓名" prop="parentName">
<el-input
v-model="addparentlist.parentName"
placeholder="请输入家长姓名"
/>
</el-form-item>
<el-form-item label="家长性别" prop="parentSex">
<el-radio-group v-model="addparentlist.parentSex">
<el-radio :label="male"></el-radio>
<el-radio :label="female"></el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="联系电话" prop="phone">
<el-input
maxlength="13"
v-model="addparentlist.phone"
placeholder="请输入联系电话"
/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="addparent"> </el-button>
<el-button @click="cancel2"> </el-button>
</div>
</el-dialog>
<!-- 查看学生父母 -->
<el-dialog
title="查看学生父母"
@ -753,7 +889,10 @@ import {
addparentInfo,
} from "@/api/system/studentInfo";
import { tKindergartenInfo } from "@/api/system/kindergartenInfo";
import {
tKindergartenInfo,
listKindergartenInfo,
} from "@/api/system/kindergartenInfo";
import { listClassinfo } from "@/api/system/classinfo";
@ -827,6 +966,7 @@ export default {
innerVisible2: false,
innerVisible3: false,
innerVisible4: false,
kininnerVisible: false,
//
ids: [],
//
@ -839,6 +979,18 @@ export default {
total: 0,
total2: 0,
total3: 0,
kintotal: 0,
//youery
kindergartenInfoList: [],
kindergartenid: "",
kindergartenName: "请选择所在幼儿园",
kinqueryParams: {
pageNum: 1,
pageSize: 10,
kindergartenId: null,
className: null,
classType: null,
},
//
studentInfoList: [],
//
@ -922,6 +1074,9 @@ export default {
form2: {},
//
rules: {
kindergartenId: [
{ required: true, message: "所属幼儿园不能为空", trigger: "blur" },
],
studentNumber: [
{ required: true, message: "请输入学生编号", trigger: "blur" },
],
@ -955,6 +1110,29 @@ export default {
},
filters: {},
methods: {
kincancel() {
this.kininnerVisible = false;
},
classclick() {
listClassinfo(this.classinfoList2).then((response) => {
this.classinfoList = response.rows;
this.total2 = response.total;
this.innerVisible = true;
// console.log(this.classinfoList);
});
},
kindergartenNameclick(row) {
this.form.kindergartenId = row.id;
this.kindergartenid = row.id;
this.kindergartenName = row.kindergartenName;
this.classinfoList2.kindergartenId = row.id;
this.kininnerVisible = false;
this.classinfoName = "请选择所属班级";
this.classinfoId = "";
// this.getclassinfo();
console.log(this.form);
},
cancel2() {
this.innerVisible3 = false;
this.addparentlist = {
@ -1378,6 +1556,8 @@ export default {
this.parent2 = "";
this.classinfoName = "请选择所属班级";
this.classinfoId = "";
this.kindergartenid = "";
this.kindergartenName = "请选择所在幼儿园";
this.tags = [];
console.log(this.tags);
},
@ -1408,6 +1588,7 @@ export default {
cardNumber: null,
onceName: null,
homeAddress: null,
kindergartenId: null,
};
this.resetForm("form");
},
@ -1460,6 +1641,12 @@ export default {
};
this.handleQuery3();
},
kininfolist() {
listKindergartenInfo(this.kinqueryParams).then((response) => {
this.kindergartenInfoList = response.rows;
this.kintotal = response.total;
});
},
/** 查询学生信息列表 */
getList() {
@ -1469,6 +1656,7 @@ export default {
this.total2 = response.total;
// console.log(this.classinfoList);
});
this.kininfolist();
tKindergartenInfo(this.nationType).then((res) => {
this.nactionlist = res.data;
// console.log(this.nactionlist);
@ -1500,7 +1688,6 @@ export default {
/** 提交按钮 */
submitForm() {
console.log(this.form);
console.log(this.form2);
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.form.id != null) {

View File

@ -9,7 +9,13 @@
label-width="68px"
>
<el-form-item label="所属幼儿园" prop="kindergartenId" label-width="85px">
<el-select
<el-input
v-model="queryParams.kindergartenName"
placeholder="请输入幼儿园名称"
clearable
@keyup.enter.native="handleQuery"
/>
<!-- <el-select
v-model="queryParams.kindergartenId"
clearable
placeholder="所属幼儿园"
@ -22,7 +28,7 @@
:value="item.id"
>
</el-option>
</el-select>
</el-select> -->
</el-form-item>
<el-form-item label="教师名称" prop="teacherName">
<el-input
@ -713,6 +719,7 @@ export default {
cardNo: "",
teacherPhone: "",
teacherSex: "",
kindergartenName: "",
},
queryParams2: {
pageNum: 1,
@ -935,6 +942,16 @@ export default {
},
resetQuery1() {
this.resetForm("queryForm");
this.queryParams = {
pageNum: 1,
pageSize: 10,
kindergartenId: "", //id
teacherName: "",
cardNo: "",
teacherPhone: "",
teacherSex: "",
kindergartenName: "",
};
this.handleQuery();
},