Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

优化页面-手机端响应式

Browse Source
This commit is contained in:
zhanglipeng 2020-11-19 10:25:11 +08:00
parent 9221a1a547
commit 10c309fcd2
17 changed files with 1637 additions and 1176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ruoyi-ui/src/views/benyi/assessment/index.vue
View File

@ -1,11 +1,8 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form <el-form :model="queryParams" ref="queryForm" label-width="70px">
:model="queryParams" <el-row :gutter="10">
ref="queryForm" <el-col :xs="24" :ms="12" :md="5">
:inline="true"
label-width="68px"
>
<el-form-item label="幼儿姓名" prop="name"> <el-form-item label="幼儿姓名" prop="name">
<el-input <el-input
v-model="queryParams.name" v-model="queryParams.name"
@ -15,7 +12,9 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item> </el-col>
<el-col :xs="24" :ms="12" :md="5">
<el-form-item class="no-margin">
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
@ -27,6 +26,8 @@
>重置</el-button >重置</el-button
> >
</el-form-item> </el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<el-table <el-table
@ -210,3 +211,20 @@ export default {
}, },
}; };
</script> </script>
<style lang="scss" scoped>
.el-select {
width: 100%;
}
.my-date-picker {
width: 100%;
}
.edit-btns {
.el-button {
display: block;
margin: 0 auto;
}
}
.no-margin ::v-deep.el-form-item__content {
margin: 0 !important;
}
</style>

162
ruoyi-ui/src/views/benyi/calendar/index.vue
View File

@ -1,8 +1,15 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px"> <el-form :model="queryParams" ref="queryForm" label-width="70px">
<el-row :gutter="10">
<el-col :xs="24" :ms="12" :md="5">
<el-form-item label="活动类型" prop="type"> <el-form-item label="活动类型" prop="type">
<el-select v-model="queryParams.type" placeholder="请选择活动类型" clearable size="small"> <el-select
v-model="queryParams.type"
placeholder="请选择活动类型"
clearable
size="small"
>
<el-option <el-option
v-for="dict in calendartypeOptions" v-for="dict in calendartypeOptions"
:key="dict.dictValue" :key="dict.dictValue"
@ -11,34 +18,46 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :xs="24" :ms="12" :md="5">
<el-form-item label="活动时间" prop="activitytime"> <el-form-item label="活动时间" prop="activitytime">
<el-date-picker <el-date-picker
class="my-date-picker"
clearable clearable
size="small" size="small"
style="width: 200px"
v-model="queryParams.activitytime" v-model="queryParams.activitytime"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="选择活动时间" placeholder="选择活动时间"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> </el-col>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-col :xs="24" :ms="12" :md="4">
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-form-item class="no-margin">
<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-col>
</el-row>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <div class="mb8 btn-list">
<el-col :span="1.5">
<el-button <el-button
type="primary" type="primary"
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['benyi:calendar:add']" v-hasPermi="['benyi:calendar:add']"
>新增</el-button> >新增</el-button
</el-col> >
<el-col :span="1.5">
<el-button <el-button
type="success" type="success"
icon="el-icon-edit" icon="el-icon-edit"
@ -46,9 +65,8 @@
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['benyi:calendar:edit']" v-hasPermi="['benyi:calendar:edit']"
>修改</el-button> >修改</el-button
</el-col> >
<el-col :span="1.5">
<el-button <el-button
type="danger" type="danger"
icon="el-icon-delete" icon="el-icon-delete"
@ -56,38 +74,62 @@
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['benyi:calendar:remove']" v-hasPermi="['benyi:calendar:remove']"
>删除</el-button> >删除</el-button
</el-col> >
<el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"
icon="el-icon-download" icon="el-icon-download"
size="mini" size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['benyi:calendar:export']" v-hasPermi="['benyi:calendar:export']"
>导出</el-button> >导出</el-button
</el-col> >
</el-row> </div>
<el-table v-loading="loading" :data="calendarList" @selection-change="handleSelectionChange"> <el-table
border
v-loading="loading"
:data="calendarList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="标识" align="center" prop="id" /> --> <!-- <el-table-column label="标识" align="center" prop="id" /> -->
<el-table-column label="名称" align="center" prop="name" /> <el-table-column fixed label="名称" align="center" prop="name" />
<el-table-column <el-table-column
label="活动类型" label="活动类型"
align="center" align="center"
:formatter="calendartypeFormat" :formatter="calendartypeFormat"
prop="type" prop="type"
/> />
<el-table-column label="活动开始时间" align="center" prop="activitytime" width="180"></el-table-column> <el-table-column
<el-table-column label="活动结束时间" align="center" prop="activityendtime" width="180"></el-table-column> label="活动开始时间"
align="center"
prop="activitytime"
width="180"
></el-table-column>
<el-table-column
label="活动结束时间"
align="center"
prop="activityendtime"
width="180"
></el-table-column>
<el-table-column label="活动样式颜色" align="center" prop="stylecolor" /> <el-table-column label="活动样式颜色" align="center" prop="stylecolor" />
<el-table-column label="创建时间" align="center" prop="createtime" width="180"> <el-table-column
label="创建时间"
align="center"
prop="createtime"
width="180"
>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createtime) }}</span> <span>{{ parseTime(scope.row.createtime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column
fixed="right"
label="操作"
align="center"
class-name="small-padding fixed-width"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@ -95,14 +137,16 @@
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['benyi:calendar:edit']" v-hasPermi="['benyi:calendar:edit']"
>修改</el-button> >修改</el-button
>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['benyi:calendar:remove']" v-hasPermi="['benyi:calendar:remove']"
>删除</el-button> >删除</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -119,10 +163,19 @@
<el-dialog :title="title" :visible.sync="open" width="500px"> <el-dialog :title="title" :visible.sync="open" width="500px">
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="名称" prop="name"> <el-form-item label="名称" prop="name">
<el-input v-model="form.name" type="textarea" placeholder="请输入内容" /> <el-input
v-model="form.name"
type="textarea"
placeholder="请输入内容"
/>
</el-form-item> </el-form-item>
<el-form-item label="活动类型"> <el-form-item label="活动类型">
<el-select v-model="form.type" placeholder="请选择活动类型" clearable size="small"> <el-select
v-model="form.type"
placeholder="请选择活动类型"
clearable
size="small"
>
<el-option <el-option
v-for="dict in calendartypeOptions" v-for="dict in calendartypeOptions"
:key="dict.dictValue" :key="dict.dictValue"
@ -169,7 +222,7 @@ import {
delCalendar, delCalendar,
addCalendar, addCalendar,
updateCalendar, updateCalendar,
exportCalendar exportCalendar,
} from "@/api/benyi/calendar"; } from "@/api/benyi/calendar";
export default { export default {
@ -204,17 +257,17 @@ export default {
activityendtime: undefined, activityendtime: undefined,
stylecolor: undefined, stylecolor: undefined,
createuserid: undefined, createuserid: undefined,
createtime: undefined createtime: undefined,
}, },
// 表单参数 // 表单参数
form: {}, form: {},
// 表单校验 // 表单校验
rules: {} rules: {},
}; };
}, },
created() { created() {
this.getList(); this.getList();
this.getDicts("sys_schoolcalendartype").then(response => { this.getDicts("sys_schoolcalendartype").then((response) => {
this.calendartypeOptions = response.data; this.calendartypeOptions = response.data;
}); });
}, },
@ -226,7 +279,7 @@ export default {
/** 查询园历管理(本一)列表 */ /** 查询园历管理(本一)列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listCalendar(this.queryParams).then(response => { listCalendar(this.queryParams).then((response) => {
this.calendarList = response.rows; this.calendarList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
@ -247,7 +300,7 @@ export default {
activityendtime: undefined, activityendtime: undefined,
stylecolor: undefined, stylecolor: undefined,
createuserid: undefined, createuserid: undefined,
createtime: undefined createtime: undefined,
}; };
this.resetForm("form"); this.resetForm("form");
}, },
@ -263,7 +316,7 @@ export default {
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.id); this.ids = selection.map((item) => item.id);
this.single = selection.length != 1; this.single = selection.length != 1;
this.multiple = !selection.length; this.multiple = !selection.length;
}, },
@ -277,7 +330,7 @@ export default {
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
const id = row.id || this.ids; const id = row.id || this.ids;
getCalendar(id).then(response => { getCalendar(id).then((response) => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改园历管理(本一)"; this.title = "修改园历管理(本一)";
@ -285,10 +338,10 @@ export default {
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm: function () { submitForm: function () {
this.$refs["form"].validate(valid => { this.$refs["form"].validate((valid) => {
if (valid) { if (valid) {
if (this.form.id != undefined) { if (this.form.id != undefined) {
updateCalendar(this.form).then(response => { updateCalendar(this.form).then((response) => {
if (response.code === 200) { if (response.code === 200) {
this.msgSuccess("修改成功"); this.msgSuccess("修改成功");
this.open = false; this.open = false;
@ -298,7 +351,7 @@ export default {
} }
}); });
} else { } else {
addCalendar(this.form).then(response => { addCalendar(this.form).then((response) => {
if (response.code === 200) { if (response.code === 200) {
this.msgSuccess("新增成功"); this.msgSuccess("新增成功");
this.open = false; this.open = false;
@ -320,7 +373,7 @@ export default {
{ {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning",
} }
) )
.then(function () { .then(function () {
@ -338,16 +391,33 @@ export default {
this.$confirm("是否确认导出所有园历管理(本一)数据项?", "警告", { this.$confirm("是否确认导出所有园历管理(本一)数据项?", "警告", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning",
}) })
.then(function () { .then(function () {
return exportCalendar(queryParams); return exportCalendar(queryParams);
}) })
.then(response => { .then((response) => {
this.download(response.msg); this.download(response.msg);
}) })
.catch(function () {}); .catch(function () {});
} },
} },
}; };
</script> </script>
<style lang="scss" scoped>
.el-select {
width: 100%;
}
.my-date-picker {
width: 100%;
}
.edit-btns {
.el-button {
display: block;
margin: 0 auto;
}
}
.no-margin ::v-deep.el-form-item__content {
margin: 0 !important;
}
</style>

46
ruoyi-ui/src/views/benyi/checkindetail/index.vue
View File

@ -1,12 +1,9 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form <el-form :model="queryParams" ref="queryForm" label-width="70px">
:model="queryParams" <el-row :gutter="10">
ref="queryForm" <el-col :xs="24" :ms="12" :md="5">
:inline="true" <el-form-item label="班级名称" prop="classid">
label-width="68px"
>
<el-form-item label="班级编码" prop="classid">
<el-select v-model="queryParams.classid" placeholder="请选择班级"> <el-select v-model="queryParams.classid" placeholder="请选择班级">
<el-option <el-option
v-for="dict in classOptions" v-for="dict in classOptions"
@ -16,6 +13,8 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :xs="24" :ms="12" :md="5">
<el-form-item label="幼儿姓名" prop="childname"> <el-form-item label="幼儿姓名" prop="childname">
<el-input <el-input
v-model="queryParams.childname" v-model="queryParams.childname"
@ -25,6 +24,8 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
</el-col>
<el-col :xs="24" :ms="12" :md="5">
<el-form-item label="出勤类型" prop="type"> <el-form-item label="出勤类型" prop="type">
<el-select <el-select
v-model="queryParams.type" v-model="queryParams.type"
@ -40,18 +41,22 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :xs="24" :ms="12" :md="5">
<el-form-item label="考勤时间" prop="createTime"> <el-form-item label="考勤时间" prop="createTime">
<el-date-picker <el-date-picker
class="my-date-picker"
clearable clearable
size="small" size="small"
style="width: 200px"
v-model="queryParams.createTime" v-model="queryParams.createTime"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="选择考勤时间" placeholder="选择考勤时间"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> </el-col>
<el-col :xs="24" :ms="12" :md="4">
<el-form-item class="no-margin">
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
@ -63,6 +68,8 @@
>重置</el-button >重置</el-button
> >
</el-form-item> </el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<div class="mb8 btn-list"> <div class="mb8 btn-list">
@ -499,7 +506,7 @@ export default {
//当全选被选中的时候，循环遍历源数据，把数据的每一项加入到默认选中的数组去 //当全选被选中的时候，循环遍历源数据，把数据的每一项加入到默认选中的数组去
cids = cids + item + ","; cids = cids + item + ",";
}); });
console.log(cids); // console.log(cids);
this.form.childname = cids; this.form.childname = cids;
}, },
handlecheckedChildsChange(value) { handlecheckedChildsChange(value) {
@ -514,9 +521,26 @@ export default {
//当全选被选中的时候，循环遍历源数据，把数据的每一项加入到默认选中的数组去 //当全选被选中的时候，循环遍历源数据，把数据的每一项加入到默认选中的数组去
cids = cids + item + ","; cids = cids + item + ",";
}); });
console.log(cids); // console.log(cids);
this.form.childname = cids; this.form.childname = cids;
}, },
}, },
}; };
</script> </script>
<style lang="scss" scoped>
.el-select {
width: 100%;
}
.my-date-picker {
width: 100%;
}
.edit-btns {
.el-button {
display: block;
margin: 0 auto;
}
}
.no-margin ::v-deep.el-form-item__content {
margin: 0 !important;
}
</style>

26
ruoyi-ui/src/views/benyi/checkinstatisticsschool/index.vue
View File

@ -1,16 +1,13 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form <el-form :model="queryParams" ref="queryForm" label-width="70px">
:model="queryParams" <el-row :gutter="10">
ref="queryForm" <el-col :xs="24" :ms="12" :md="5">
:inline="true"
label-width="68px"
>
<el-form-item label="选择月份" prop="month"> <el-form-item label="选择月份" prop="month">
<el-date-picker <el-date-picker
class="my-date-picker"
clearable clearable
size="small" size="small"
style="width: 200px"
v-model="queryParams.month" v-model="queryParams.month"
type="month" type="month"
value-format="yyyy-MM" value-format="yyyy-MM"
@ -18,7 +15,9 @@
placeholder="选择计划月份" placeholder="选择计划月份"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> </el-col>
<el-col :xs="24" :ms="12" :md="6">
<el-form-item class="no-margin">
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
@ -38,6 +37,8 @@
>打印</el-button >打印</el-button
> >
</el-form-item> </el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<div ref="printMe" class="print-me"> <div ref="printMe" class="print-me">
@ -410,4 +411,13 @@ export default {
} }
} }
} }
.el-select {
width: 100%;
}
.my-date-picker {
width: 100%;
}
.no-margin ::v-deep.el-form-item__content {
margin: 0 !important;
}
</style> </style>

40
ruoyi-ui/src/views/benyi/child/index.vue
View File

@ -1,11 +1,8 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form <el-form :model="queryParams" ref="queryForm" label-width="70px">
:model="queryParams" <el-row :gutter="10">
ref="queryForm" <el-col :xs="24" :ms="12" :md="5">
:inline="true"
label-width="68px"
>
<el-form-item label="幼儿姓名" prop="name"> <el-form-item label="幼儿姓名" prop="name">
<el-input <el-input
v-model="queryParams.name" v-model="queryParams.name"
@ -15,13 +12,14 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
</el-col>
<el-col :xs="24" :ms="12" :md="5">
<el-form-item label="幼儿性别" prop="xb"> <el-form-item label="幼儿性别" prop="xb">
<el-select <el-select
v-model="queryParams.xb" v-model="queryParams.xb"
placeholder="请选择幼儿性别" placeholder="请选择幼儿性别"
clearable clearable
size="small" size="small"
style="width: 240px"
> >
<el-option <el-option
v-for="dict in sexOptions" v-for="dict in sexOptions"
@ -31,13 +29,14 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :xs="24" :ms="12" :md="5">
<el-form-item label="当前状态" prop="status"> <el-form-item label="当前状态" prop="status">
<el-select <el-select
v-model="queryParams.status" v-model="queryParams.status"
placeholder="请选择当前状态" placeholder="请选择当前状态"
clearable clearable
size="small" size="small"
style="width: 240px"
> >
<el-option <el-option
v-for="dict in statusOptions" v-for="dict in statusOptions"
@ -47,7 +46,9 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> </el-col>
<el-col :xs="24" :ms="12" :md="4">
<el-form-item class="no-margin">
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
@ -59,6 +60,8 @@
>重置</el-button >重置</el-button
> >
</el-form-item> </el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<div class="mb8 btn-list"> <div class="mb8 btn-list">
@ -1118,7 +1121,7 @@ export default {
submitForm_tb: function () { submitForm_tb: function () {
this.$refs["form"].validate((valid) => { this.$refs["form"].validate((valid) => {
if (valid) { if (valid) {
console.log(this.ids + "---" + this.form.classid); // console.log(this.ids + "---" + this.form.classid);
updateChild_tb(this.form, this.ids).then((response) => { updateChild_tb(this.form, this.ids).then((response) => {
if (response.code === 200) { if (response.code === 200) {
this.msgSuccess("调班成功"); this.msgSuccess("调班成功");
@ -1232,3 +1235,20 @@ export default {
}, },
}; };
</script> </script>
<style lang="scss" scoped>
.el-select {
width: 100%;
}
.my-date-picker {
width: 100%;
}
.edit-btns {
.el-button {
display: block;
margin: 0 auto;
}
}
.no-margin ::v-deep.el-form-item__content {
margin: 0 !important;
}
</style>

109
ruoyi-ui/src/views/benyi/contactpeople/index.vue
View File

@ -1,18 +1,14 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form <el-form :model="queryParams" ref="queryForm" label-width="70px">
:model="queryParams" <el-row :gutter="10">
ref="queryForm" <el-col :xs="24" :ms="12" :md="5">
:inline="true" <el-form-item label="幼儿姓名" prop="childid">
label-width="68px"
>
<el-form-item label="选择幼儿" prop="childid">
<el-select <el-select
v-model="queryParams.childid" v-model="queryParams.childid"
placeholder="请输入选择幼儿" placeholder="请输入选择幼儿"
clearable clearable
size="small" size="small"
style="width: 240px"
> >
<el-option <el-option
v-for="dict in childOptions" v-for="dict in childOptions"
@ -22,6 +18,8 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :xs="24" :ms="12" :md="5">
<el-form-item label="父亲姓名" prop="fathername"> <el-form-item label="父亲姓名" prop="fathername">
<el-input <el-input
v-model="queryParams.fathername" v-model="queryParams.fathername"
@ -31,6 +29,8 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
</el-col>
<el-col :xs="24" :ms="12" :md="5">
<el-form-item label="母亲姓名" prop="mothername"> <el-form-item label="母亲姓名" prop="mothername">
<el-input <el-input
v-model="queryParams.mothername" v-model="queryParams.mothername"
@ -40,7 +40,9 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item> </el-col>
<el-col :xs="24" :ms="12" :md="4">
<el-form-item class="no-margin">
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
@ -52,6 +54,8 @@
>重置</el-button >重置</el-button
> >
</el-form-item> </el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<div class="mb8 btn-list"> <div class="mb8 btn-list">
@ -100,11 +104,31 @@
:formatter="childFormat" :formatter="childFormat"
/> />
<el-table-column label="父亲姓名" align="center" prop="fathername" /> <el-table-column label="父亲姓名" align="center" prop="fathername" />
<el-table-column label="父亲联系电话" width="120" align="center" prop="fphone" /> <el-table-column
<el-table-column label="父亲办公电话" width="120" align="center" prop="foffphone" /> label="父亲联系电话"
width="120"
align="center"
prop="fphone"
/>
<el-table-column
label="父亲办公电话"
width="120"
align="center"
prop="foffphone"
/>
<el-table-column label="母亲姓名" align="center" prop="mothername" /> <el-table-column label="母亲姓名" align="center" prop="mothername" />
<el-table-column label="母亲联系电话" width="120" align="center" prop="mphone" /> <el-table-column
<el-table-column label="母亲办公电话" width="120" align="center" prop="moffphone" /> label="母亲联系电话"
width="120"
align="center"
prop="mphone"
/>
<el-table-column
label="母亲办公电话"
width="120"
align="center"
prop="moffphone"
/>
<el-table-column <el-table-column
label="操作" label="操作"
align="center" align="center"
@ -141,7 +165,12 @@
/> />
<!-- 添加或修改幼儿紧急情况联系人对话框 --> <!-- 添加或修改幼儿紧急情况联系人对话框 -->
<el-dialog :title="title" :visible.sync="open" class="big-dialog" append-to-body> <el-dialog
:title="title"
:visible.sync="open"
class="big-dialog"
append-to-body
>
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row :gutter="15"> <el-row :gutter="15">
<el-col :span="24"> <el-col :span="24">
@ -306,7 +335,7 @@ import {
getContactpeople, getContactpeople,
delContactpeople, delContactpeople,
addContactpeople, addContactpeople,
updateContactpeople updateContactpeople,
} from "@/api/benyi/contactpeople"; } from "@/api/benyi/contactpeople";
import { listChild } from "@/api/benyi/child"; import { listChild } from "@/api/benyi/child";
@ -355,20 +384,20 @@ export default {
gmgx: undefined, gmgx: undefined,
gmphone: undefined, gmphone: undefined,
gmaddress: undefined, gmaddress: undefined,
gmoffphone: undefined gmoffphone: undefined,
}, },
// 表单参数 // 表单参数
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
childid: [{ required: true, message: "请选择幼儿", trigger: "blur" }] childid: [{ required: true, message: "请选择幼儿", trigger: "blur" }],
} },
}; };
}, },
created() { created() {
this.getList(); this.getList();
this.getChildList(); this.getChildList();
this.getDicts("sys_dm_jtgx").then(response => { this.getDicts("sys_dm_jtgx").then((response) => {
this.jtgxOptions = response.data; this.jtgxOptions = response.data;
}); });
}, },
@ -378,7 +407,7 @@ export default {
// return this.selectDictLabel(this.classOptions, row.classid); // return this.selectDictLabel(this.classOptions, row.classid);
var actions = []; var actions = [];
var datas = this.childOptions; var datas = this.childOptions;
Object.keys(datas).map(key => { Object.keys(datas).map((key) => {
if (datas[key].id == "" + row.childid) { if (datas[key].id == "" + row.childid) {
actions.push(datas[key].name); actions.push(datas[key].name);
return false; return false;
@ -388,14 +417,14 @@ export default {
}, },
/** 查询幼儿信息列表 */ /** 查询幼儿信息列表 */
getChildList() { getChildList() {
listChild(null).then(response => { listChild(null).then((response) => {
this.childOptions = response.rows; this.childOptions = response.rows;
}); });
}, },
/** 查询幼儿紧急情况联系人列表 */ /** 查询幼儿紧急情况联系人列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listContactpeople(this.queryParams).then(response => { listContactpeople(this.queryParams).then((response) => {
this.contactpeopleList = response.rows; this.contactpeopleList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
@ -427,7 +456,7 @@ export default {
gmphone: undefined, gmphone: undefined,
gmaddress: undefined, gmaddress: undefined,
gmoffphone: undefined, gmoffphone: undefined,
createTime: undefined createTime: undefined,
}; };
this.resetForm("form"); this.resetForm("form");
}, },
@ -443,7 +472,7 @@ export default {
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.id); this.ids = selection.map((item) => item.id);
this.single = selection.length != 1; this.single = selection.length != 1;
this.multiple = !selection.length; this.multiple = !selection.length;
}, },
@ -457,7 +486,7 @@ export default {
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
const id = row.id || this.ids; const id = row.id || this.ids;
getContactpeople(id).then(response => { getContactpeople(id).then((response) => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改幼儿紧急情况联系人"; this.title = "修改幼儿紧急情况联系人";
@ -465,10 +494,10 @@ export default {
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm: function () { submitForm: function () {
this.$refs["form"].validate(valid => { this.$refs["form"].validate((valid) => {
if (valid) { if (valid) {
if (this.form.id != undefined) { if (this.form.id != undefined) {
updateContactpeople(this.form).then(response => { updateContactpeople(this.form).then((response) => {
if (response.code === 200) { if (response.code === 200) {
this.msgSuccess("修改成功"); this.msgSuccess("修改成功");
this.open = false; this.open = false;
@ -476,7 +505,7 @@ export default {
} }
}); });
} else { } else {
addContactpeople(this.form).then(response => { addContactpeople(this.form).then((response) => {
if (response.code === 200) { if (response.code === 200) {
this.msgSuccess("新增成功"); this.msgSuccess("新增成功");
this.open = false; this.open = false;
@ -493,7 +522,7 @@ export default {
this.$confirm("是否确认删除幼儿紧急情况联系人数据项?", "警告", { this.$confirm("是否确认删除幼儿紧急情况联系人数据项?", "警告", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning",
}) })
.then(function () { .then(function () {
return delContactpeople(ids); return delContactpeople(ids);
@ -503,7 +532,25 @@ export default {
this.msgSuccess("删除成功"); this.msgSuccess("删除成功");
}) })
.catch(function () {}); .catch(function () {});
} },
} },
}; };
</script> </script>
<style lang="scss" scoped>
.el-select {
width: 100%;
}
.my-date-picker {
width: 100%;
}
.edit-btns {
.el-button {
display: block;
margin: 0 auto;
}
}
.no-margin ::v-deep.el-form-item__content {
margin: 0 !important;
}
</style>

116
ruoyi-ui/src/views/benyi/experience/index.vue
View File

@ -1,11 +1,8 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form <el-form :model="queryParams" ref="queryForm" label-width="70px">
:model="queryParams" <el-row :gutter="10">
ref="queryForm" <el-col :xs="24" :ms="12" :md="5">
:inline="true"
label-width="68px"
>
<el-form-item label="家长姓名" prop="jzxm"> <el-form-item label="家长姓名" prop="jzxm">
<el-input <el-input
v-model="queryParams.jzxm" v-model="queryParams.jzxm"
@ -15,6 +12,8 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
</el-col>
<el-col :xs="24" :ms="12" :md="5">
<el-form-item label="幼儿姓名" prop="yexm"> <el-form-item label="幼儿姓名" prop="yexm">
<el-input <el-input
v-model="queryParams.yexm" v-model="queryParams.yexm"
@ -24,6 +23,8 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
</el-col>
<el-col :xs="24" :ms="12" :md="5">
<el-form-item label="联系方式" prop="lxfs"> <el-form-item label="联系方式" prop="lxfs">
<el-input <el-input
v-model="queryParams.lxfs" v-model="queryParams.lxfs"
@ -33,7 +34,9 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item> </el-col>
<el-col :xs="24" :ms="12" :md="4">
<el-form-item class="no-margin">
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
@ -45,6 +48,8 @@
>重置</el-button >重置</el-button
> >
</el-form-item> </el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<div class="mb8 btn-list"> <div class="mb8 btn-list">
@ -83,13 +88,14 @@
</div> </div>
<el-table <el-table
border
v-loading="loading" v-loading="loading"
:data="experienceList" :data="experienceList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="编号" align="center" prop="id" /> --> <!-- <el-table-column label="编号" align="center" prop="id" /> -->
<el-table-column label="幼儿姓名" align="center" prop="yexm" /> <el-table-column fixed label="幼儿姓名" align="center" prop="yexm" />
<el-table-column label="家长姓名" align="center" prop="jzxm" /> <el-table-column label="家长姓名" align="center" prop="jzxm" />
<el-table-column <el-table-column
label="幼儿出生日期" label="幼儿出生日期"
@ -131,9 +137,11 @@
:formatter="tynrFormat" :formatter="tynrFormat"
/> />
<el-table-column <el-table-column
fixed="right"
label="操作" label="操作"
align="center" align="center"
class-name="small-padding fixed-width" width="60"
class-name="small-padding fixed-width edit-btns"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -165,7 +173,12 @@
/> />
<!-- 添加或修改入班体验申请对话框 --> <!-- 添加或修改入班体验申请对话框 -->
<el-dialog :title="title" :visible.sync="open" class="big-dialog" append-to-body> <el-dialog
:title="title"
:visible.sync="open"
class="big-dialog"
append-to-body
>
<el-row :gutter="15"> <el-row :gutter="15">
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-col :span="12"> <el-col :span="12">
@ -338,7 +351,7 @@ import {
delExperience, delExperience,
addExperience, addExperience,
updateExperience, updateExperience,
exportExperience exportExperience,
} from "@/api/benyi/experience"; } from "@/api/benyi/experience";
import { listHalfdayplan } from "@/api/benyi/halfdayplan"; import { listHalfdayplan } from "@/api/benyi/halfdayplan";
@ -392,73 +405,73 @@ export default {
yzzs: undefined, yzzs: undefined,
tyjg: undefined, tyjg: undefined,
rysj: undefined, rysj: undefined,
tynrid: undefined tynrid: undefined,
}, },
// 表单参数 // 表单参数
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
jzxm: [ jzxm: [
{ required: true, message: "家长姓名不能为空", trigger: "blur" } { required: true, message: "家长姓名不能为空", trigger: "blur" },
], ],
yexm: [ yexm: [
{ required: true, message: "幼儿姓名不能为空", trigger: "blur" } { required: true, message: "幼儿姓名不能为空", trigger: "blur" },
], ],
csrq: [ csrq: [
{ required: true, message: "幼儿出生日期不能为空", trigger: "blur" } { required: true, message: "幼儿出生日期不能为空", trigger: "blur" },
], ],
lxfs: [ lxfs: [
{ {
required: true, required: true,
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
message: "请输入正确的手机号码", message: "请输入正确的手机号码",
trigger: "blur" trigger: "blur",
} },
], ],
nrysj: [ nrysj: [
{ required: true, message: "拟入园时间不能为空", trigger: "blur" } { required: true, message: "拟入园时间不能为空", trigger: "blur" },
], ],
sqtysj: [ sqtysj: [
{ required: true, message: "申请体验时间不能为空", trigger: "blur" } { required: true, message: "申请体验时间不能为空", trigger: "blur" },
], ],
swxw: [ swxw: [
{ required: true, message: "下午或下午不能为空", trigger: "blur" } { required: true, message: "下午或下午不能为空", trigger: "blur" },
], ],
hfrn: [ hfrn: [
{ required: true, message: "回复内容不能为空", trigger: "blur" } { required: true, message: "回复内容不能为空", trigger: "blur" },
], ],
yzzs: [ yzzs: [
{ required: true, message: "园长指示不能为空", trigger: "blur" } { required: true, message: "园长指示不能为空", trigger: "blur" },
], ],
tynrid: [ tynrid: [
{ required: true, message: "体验内容不能为空", trigger: "blur" } { required: true, message: "体验内容不能为空", trigger: "blur" },
] ],
} },
}; };
}, },
created() { created() {
this.getList(); this.getList();
this.getUser(); this.getUser();
this.getTynr(); this.getTynr();
this.getDicts("sys_dm_swxw").then(response => { this.getDicts("sys_dm_swxw").then((response) => {
this.swxwOptions = response.data; this.swxwOptions = response.data;
}); });
this.getDicts("sys_yes_no").then(response => { this.getDicts("sys_yes_no").then((response) => {
this.ynOptions = response.data; this.ynOptions = response.data;
}); });
this.getDicts("sys_dm_tyjg").then(response => { this.getDicts("sys_dm_tyjg").then((response) => {
this.tyjgOptions = response.data; this.tyjgOptions = response.data;
}); });
}, },
methods: { methods: {
getTynr() { getTynr() {
listHalfdayplan(null).then(response => { listHalfdayplan(null).then((response) => {
//console.log(response.rows); //console.log(response.rows);
this.tynrOptions = response.rows; this.tynrOptions = response.rows;
}); });
}, },
getUser() { getUser() {
getUserProfile().then(response => { getUserProfile().then((response) => {
var domain = window.location.host; var domain = window.location.host;
//console.log(domain); //console.log(domain);
//this.user = response.data; //this.user = response.data;
@ -475,7 +488,7 @@ export default {
tynrFormat(row, column) { tynrFormat(row, column) {
var actions = []; var actions = [];
var datas = this.tynrOptions; var datas = this.tynrOptions;
Object.keys(datas).map(key => { Object.keys(datas).map((key) => {
if (datas[key].id == row.tynrid) { if (datas[key].id == row.tynrid) {
actions.push(datas[key].title); actions.push(datas[key].title);
return false; return false;
@ -494,7 +507,7 @@ export default {
/** 查询入班体验申请列表 */ /** 查询入班体验申请列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listExperience(this.queryParams).then(response => { listExperience(this.queryParams).then((response) => {
this.experienceList = response.rows; this.experienceList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
@ -525,7 +538,7 @@ export default {
tyjg: undefined, tyjg: undefined,
rysj: undefined, rysj: undefined,
tynrid: undefined, tynrid: undefined,
createTime: undefined createTime: undefined,
}; };
this.resetForm("form"); this.resetForm("form");
}, },
@ -541,7 +554,7 @@ export default {
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.id); this.ids = selection.map((item) => item.id);
this.single = selection.length != 1; this.single = selection.length != 1;
this.multiple = !selection.length; this.multiple = !selection.length;
}, },
@ -553,14 +566,14 @@ export default {
}, },
copy(e, text) { copy(e, text) {
const clipboard = new Clipboard(e.target, { text: () => text }); const clipboard = new Clipboard(e.target, { text: () => text });
clipboard.on("success", e => { clipboard.on("success", (e) => {
this.msgSuccess("复制成功"); this.msgSuccess("复制成功");
// 释放内存 // 释放内存
clipboard.off("error"); clipboard.off("error");
clipboard.off("success"); clipboard.off("success");
clipboard.destroy(); clipboard.destroy();
}); });
clipboard.on("error", e => { clipboard.on("error", (e) => {
// 不支持复制 // 不支持复制
this.msgError("手机权限不支持复制功能"); this.msgError("手机权限不支持复制功能");
// 释放内存 // 释放内存
@ -574,7 +587,7 @@ export default {
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
const id = row.id || this.ids; const id = row.id || this.ids;
getExperience(id).then(response => { getExperience(id).then((response) => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改入班体验申请"; this.title = "修改入班体验申请";
@ -591,10 +604,10 @@ export default {
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm: function () { submitForm: function () {
this.$refs["form"].validate(valid => { this.$refs["form"].validate((valid) => {
if (valid) { if (valid) {
if (this.form.id != undefined) { if (this.form.id != undefined) {
updateExperience(this.form).then(response => { updateExperience(this.form).then((response) => {
if (response.code === 200) { if (response.code === 200) {
this.msgSuccess("修改成功"); this.msgSuccess("修改成功");
this.open = false; this.open = false;
@ -602,7 +615,7 @@ export default {
} }
}); });
} else { } else {
addExperience(this.form).then(response => { addExperience(this.form).then((response) => {
if (response.code === 200) { if (response.code === 200) {
this.msgSuccess("新增成功"); this.msgSuccess("新增成功");
this.open = false; this.open = false;
@ -622,7 +635,7 @@ export default {
{ {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning",
} }
) )
.then(function () { .then(function () {
@ -633,7 +646,24 @@ export default {
this.msgSuccess("删除成功"); this.msgSuccess("删除成功");
}) })
.catch(function () {}); .catch(function () {});
} },
} },
}; };
</script> </script>
<style lang="scss" scoped>
.el-select {
width: 100%;
}
.my-date-picker {
width: 100%;
}
.edit-btns {
.el-button {
display: block;
margin: 0 auto;
}
}
.no-margin ::v-deep.el-form-item__content {
margin: 0 !important;
}
</style>

80
ruoyi-ui/src/views/benyi/halfdayplan/index.vue
View File

@ -1,11 +1,8 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form <el-form :model="queryParams" ref="queryForm" label-width="70px">
:model="queryParams" <el-row :gutter="10">
ref="queryForm" <el-col :xs="24" :ms="12" :md="5">
:inline="true"
label-width="68px"
>
<el-form-item label="体验标题" prop="title"> <el-form-item label="体验标题" prop="title">
<el-input <el-input
v-model="queryParams.title" v-model="queryParams.title"
@ -15,7 +12,9 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item> </el-col>
<el-col :xs="24" :ms="12" :md="5">
<el-form-item class="no-margin">
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
@ -27,6 +26,8 @@
>重置</el-button >重置</el-button
> >
</el-form-item> </el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<div class="mb8 btn-list"> <div class="mb8 btn-list">
@ -41,13 +42,14 @@
</div> </div>
<el-table <el-table
border
v-loading="loading" v-loading="loading"
:data="halfdayplanList" :data="halfdayplanList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="编号" align="center" prop="id" /> --> <!-- <el-table-column label="编号" align="center" prop="id" /> -->
<el-table-column label="标题" align="center" prop="title" /> <el-table-column fixed label="标题" align="center" prop="title" />
<el-table-column <el-table-column
label="类型" label="类型"
align="center" align="center"
@ -55,8 +57,10 @@
:formatter="typeFormat" :formatter="typeFormat"
/> />
<el-table-column <el-table-column
fixed="right"
label="操作" label="操作"
align="center" align="center"
width="180"
class-name="small-padding fixed-width" class-name="small-padding fixed-width"
> >
<template slot-scope="scope"> <template slot-scope="scope">
@ -108,7 +112,12 @@
/> />
<!-- 添加或修改入园半日体验计划对话框 --> <!-- 添加或修改入园半日体验计划对话框 -->
<el-dialog :title="title" :visible.sync="open" class="big-dialog" append-to-body> <el-dialog
:title="title"
:visible.sync="open"
class="big-dialog"
append-to-body
>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="标题" prop="title"> <el-form-item label="标题" prop="title">
<el-input v-model="form.title" placeholder="请输入标题" /> <el-input v-model="form.title" placeholder="请输入标题" />
@ -134,7 +143,7 @@ import {
delHalfdayplan, delHalfdayplan,
addHalfdayplan, addHalfdayplan,
updateHalfdayplan, updateHalfdayplan,
copyHalfdayplan copyHalfdayplan,
} from "@/api/benyi/halfdayplan"; } from "@/api/benyi/halfdayplan";
import Editor from "@/components/Editor"; import Editor from "@/components/Editor";
@ -142,7 +151,7 @@ import Editor from "@/components/Editor";
export default { export default {
name: "Halfdayplan", name: "Halfdayplan",
components: { components: {
Editor Editor,
}, },
data() { data() {
return { return {
@ -172,20 +181,20 @@ export default {
schoolid: undefined, schoolid: undefined,
classid: undefined, classid: undefined,
title: undefined, title: undefined,
content: undefined content: undefined,
}, },
// 表单参数 // 表单参数
form: { name: "", phone: "" }, form: { name: "", phone: "" },
// 表单校验 // 表单校验
rules: { rules: {
title: [{ required: true, message: "标题不能为空", trigger: "blur" }], title: [{ required: true, message: "标题不能为空", trigger: "blur" }],
content: [{ required: true, message: "内容不能为空", trigger: "blur" }] content: [{ required: true, message: "内容不能为空", trigger: "blur" }],
} },
}; };
}, },
created() { created() {
this.getList(); this.getList();
this.getDicts("sys_dm_noticetype").then(response => { this.getDicts("sys_dm_noticetype").then((response) => {
this.typeOptions = response.data; this.typeOptions = response.data;
}); });
}, },
@ -205,7 +214,7 @@ export default {
/** 查询入园半日体验计划列表 */ /** 查询入园半日体验计划列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listHalfdayplan(this.queryParams).then(response => { listHalfdayplan(this.queryParams).then((response) => {
this.halfdayplanList = response.rows; this.halfdayplanList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
@ -224,7 +233,7 @@ export default {
classid: undefined, classid: undefined,
title: undefined, title: undefined,
content: undefined, content: undefined,
createTime: undefined createTime: undefined,
}; };
this.resetForm("form"); this.resetForm("form");
}, },
@ -240,7 +249,7 @@ export default {
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.id); this.ids = selection.map((item) => item.id);
this.single = selection.length != 1; this.single = selection.length != 1;
this.multiple = !selection.length; this.multiple = !selection.length;
}, },
@ -248,7 +257,7 @@ export default {
handleView(row) { handleView(row) {
this.reset(); this.reset();
const id = row.id || this.ids; const id = row.id || this.ids;
getHalfdayplan(id).then(response => { getHalfdayplan(id).then((response) => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "入园半日体验计划详情"; this.title = "入园半日体验计划详情";
@ -266,7 +275,7 @@ export default {
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
const id = row.id || this.ids; const id = row.id || this.ids;
getHalfdayplan(id).then(response => { getHalfdayplan(id).then((response) => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改入园半日体验计划"; this.title = "修改入园半日体验计划";
@ -275,10 +284,10 @@ export default {
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm: function () { submitForm: function () {
this.$refs["form"].validate(valid => { this.$refs["form"].validate((valid) => {
if (valid) { if (valid) {
if (this.form.id != undefined) { if (this.form.id != undefined) {
updateHalfdayplan(this.form).then(response => { updateHalfdayplan(this.form).then((response) => {
if (response.code === 200) { if (response.code === 200) {
this.msgSuccess("修改成功"); this.msgSuccess("修改成功");
this.open = false; this.open = false;
@ -286,7 +295,7 @@ export default {
} }
}); });
} else { } else {
addHalfdayplan(this.form).then(response => { addHalfdayplan(this.form).then((response) => {
if (response.code === 200) { if (response.code === 200) {
this.msgSuccess("新增成功"); this.msgSuccess("新增成功");
this.open = false; this.open = false;
@ -306,7 +315,7 @@ export default {
{ {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning",
} }
) )
.then(function () { .then(function () {
@ -327,7 +336,7 @@ export default {
{ {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning",
} }
) )
.then(function () { .then(function () {
@ -338,7 +347,24 @@ export default {
this.msgSuccess("复制成功"); this.msgSuccess("复制成功");
}) })
.catch(function () {}); .catch(function () {});
} },
} },
}; };
</script> </script>
<style lang="scss" scoped>
.el-select {
width: 100%;
}
.my-date-picker {
width: 100%;
}
.edit-btns {
.el-button {
display: block;
margin: 0 auto;
}
}
.no-margin ::v-deep.el-form-item__content {
margin: 0 !important;
}
</style>

115
ruoyi-ui/src/views/benyi/healthcheck/index.vue
View File

@ -3,11 +3,12 @@
<el-form <el-form
:model="queryParams" :model="queryParams"
ref="queryForm" ref="queryForm"
:inline="true" label-width="70px"
label-width="68px"
clearable clearable
size="small" size="small"
> >
<el-row :gutter="10">
<el-col :xs="24" :ms="12" :md="5">
<el-form-item label="班级信息" prop="classInfo"> <el-form-item label="班级信息" prop="classInfo">
<el-select <el-select
v-model="queryParams.classInfo" v-model="queryParams.classInfo"
@ -22,11 +23,13 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :xs="24" :ms="12" :md="5">
<el-form-item label="幼儿姓名" prop="childId"> <el-form-item label="幼儿姓名" prop="childId">
<el-select v-model="queryParams.childId" placeholder="请选择幼儿"> <el-select v-model="queryParams.childId" placeholder="请选择幼儿">
<el-option <el-option
v-for="dict in childInfoOptions.filter( v-for="dict in childInfoOptions.filter(
c => c.classid == this.queryParams.classInfo (c) => c.classid == this.queryParams.classInfo
)" )"
:key="dict.id" :key="dict.id"
:label="dict.name" :label="dict.name"
@ -34,17 +37,21 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :xs="24" :ms="12" :md="5">
<el-form-item label="检查日期" prop="checkTime"> <el-form-item label="检查日期" prop="checkTime">
<el-date-picker <el-date-picker
class="my-date-picker"
clearable clearable
size="small" size="small"
style="width: 200px"
v-model="queryParams.checkTime" v-model="queryParams.checkTime"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="选择检查日期" placeholder="选择检查日期"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</el-col>
<el-col :xs="24" :ms="12" :md="5">
<el-form-item label="保健师" prop="doctorName"> <el-form-item label="保健师" prop="doctorName">
<el-input <el-input
v-model="queryParams.doctorName" v-model="queryParams.doctorName"
@ -54,6 +61,8 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
</el-col>
<el-col :xs="24" :ms="12" :md="5">
<el-form-item label="总评价" prop="totalAssessment"> <el-form-item label="总评价" prop="totalAssessment">
<el-select <el-select
v-model="queryParams.totalAssessment" v-model="queryParams.totalAssessment"
@ -69,6 +78,8 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :xs="24" :ms="12" :md="4">
<!-- <el-form-item label="创建时间" prop="createtime"> <!-- <el-form-item label="创建时间" prop="createtime">
<el-date-picker <el-date-picker
clearable clearable
@ -80,7 +91,7 @@
placeholder="选择创建时间" placeholder="选择创建时间"
></el-date-picker> ></el-date-picker>
</el-form-item>--> </el-form-item>-->
<el-form-item> <el-form-item class="no-margin">
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
@ -92,6 +103,8 @@
>重置</el-button >重置</el-button
> >
</el-form-item> </el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<div class="mb8 btn-list"> <div class="mb8 btn-list">
@ -134,14 +147,20 @@
</div> </div>
<el-table <el-table
border
v-loading="loading" v-loading="loading"
:data="healthcheckList" :data="healthcheckList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="体检表编号" align="center" prop="id" /> --> <!-- <el-table-column label="体检表编号" align="center" prop="id" /> -->
<el-table-column
fixed
label="幼儿姓名"
align="center"
prop="byChild.name"
/>
<el-table-column label="班级信息" align="center" prop="byClass.bjmc" /> <el-table-column label="班级信息" align="center" prop="byClass.bjmc" />
<el-table-column label="幼儿姓名" align="center" prop="byChild.name" />
<el-table-column <el-table-column
label="检查日期" label="检查日期"
align="center" align="center"
@ -190,6 +209,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
fixed="right"
label="操作" label="操作"
align="center" align="center"
width="100" width="100"
@ -225,7 +245,12 @@
/> />
<!-- 添加或修改儿童常规体检记录对话框 --> <!-- 添加或修改儿童常规体检记录对话框 -->
<el-dialog :title="title" :visible.sync="open" class="big-dialog" append-to-body> <el-dialog
:title="title"
:visible.sync="open"
class="big-dialog"
append-to-body
>
<el-row :gutter="15"> <el-row :gutter="15">
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-col :span="12"> <el-col :span="12">
@ -249,7 +274,7 @@
<el-select v-model="form.childId" placeholder="请选择幼儿"> <el-select v-model="form.childId" placeholder="请选择幼儿">
<el-option <el-option
v-for="dict in childInfoOptions.filter( v-for="dict in childInfoOptions.filter(
c => c.classid == this.form.classInfo (c) => c.classid == this.form.classInfo
)" )"
:key="dict.id" :key="dict.id"
:label="dict.name" :label="dict.name"
@ -405,7 +430,7 @@ import {
delHealthcheck, delHealthcheck,
addHealthcheck, addHealthcheck,
updateHealthcheck, updateHealthcheck,
exportHealthcheck exportHealthcheck,
} from "@/api/benyi/healthcheck"; } from "@/api/benyi/healthcheck";
import { listClass } from "@/api/system/class"; import { listClass } from "@/api/system/class";
import { listChild } from "@/api/benyi/child"; import { listChild } from "@/api/benyi/child";
@ -464,7 +489,7 @@ export default {
heightAssessment: undefined, heightAssessment: undefined,
totalAssessment: undefined, totalAssessment: undefined,
createtime: undefined, createtime: undefined,
createuser: undefined createuser: undefined,
}, },
// 表单参数 // 表单参数
form: {}, form: {},
@ -472,47 +497,47 @@ export default {
// 表单校验 // 表单校验
rules: { rules: {
classInfo: [ classInfo: [
{ required: true, message: "班级信息不能为空", trigger: "blur" } { required: true, message: "班级信息不能为空", trigger: "blur" },
], ],
childId: [ childId: [
{ required: true, message: "幼儿姓名不能为空", trigger: "blur" } { required: true, message: "幼儿姓名不能为空", trigger: "blur" },
], ],
checkTime: [ checkTime: [
{ required: true, message: "检查时间不能为空", trigger: "blur" } { required: true, message: "检查时间不能为空", trigger: "blur" },
], ],
doctorName: [ doctorName: [
{ required: true, message: "保健医不能为空", trigger: "blur" } { required: true, message: "保健医不能为空", trigger: "blur" },
], ],
totalAssessment: [ totalAssessment: [
{ required: true, message: "总评价不能为空", trigger: "blur" } { required: true, message: "总评价不能为空", trigger: "blur" },
], ],
weight: [ weight: [
{ {
required: true, required: true,
message: "输入内容必须是数字,且不能超过六位数", message: "输入内容必须是数字,且不能超过六位数",
trigger: "blur" trigger: "blur",
} },
] ],
} },
}; };
}, },
created() { created() {
this.getList(); this.getList();
this.getclassinfo(); this.getclassinfo();
this.getDicts("sys_vision_assessment").then(response => { this.getDicts("sys_vision_assessment").then((response) => {
this.visionAssessmentOptions = response.data; this.visionAssessmentOptions = response.data;
}); });
this.getDicts("sys_decayed_tooth").then(response => { this.getDicts("sys_decayed_tooth").then((response) => {
this.decayedToothOptions = response.data; this.decayedToothOptions = response.data;
}); });
this.getDicts("sys_weight_assessment").then(response => { this.getDicts("sys_weight_assessment").then((response) => {
this.weightAssessmentOptions = response.data; this.weightAssessmentOptions = response.data;
}); });
this.getDicts("sys_height_assessment").then(response => { this.getDicts("sys_height_assessment").then((response) => {
this.heightAssessmentOptions = response.data; this.heightAssessmentOptions = response.data;
}); });
this.getDicts("sys_dm_tyjg").then(response => { this.getDicts("sys_dm_tyjg").then((response) => {
this.totalAssessmentOptions = response.data; this.totalAssessmentOptions = response.data;
}); });
}, },
@ -520,14 +545,14 @@ export default {
// 班级选择框变化后触发 // 班级选择框变化后触发
classInfoChange() { classInfoChange() {
this.queryParams.childId = null; this.queryParams.childId = null;
listChild(null).then(response => { listChild(null).then((response) => {
this.childInfoOptions = response.rows; this.childInfoOptions = response.rows;
}); });
}, },
/** 查询儿童常规体检记录列表 */ /** 查询儿童常规体检记录列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listHealthcheck(this.queryParams).then(response => { listHealthcheck(this.queryParams).then((response) => {
this.healthcheckList = response.rows; this.healthcheckList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
@ -535,7 +560,7 @@ export default {
}, },
// 查询所有班级信息 // 查询所有班级信息
getclassinfo() { getclassinfo() {
listClass(null).then(response => { listClass(null).then((response) => {
this.classInfoOptions = response.rows; this.classInfoOptions = response.rows;
}); });
}, },
@ -595,7 +620,7 @@ export default {
heightAssessment: undefined, heightAssessment: undefined,
totalAssessment: undefined, totalAssessment: undefined,
createtime: undefined, createtime: undefined,
createuser: undefined createuser: undefined,
}; };
this.resetForm("form"); this.resetForm("form");
}, },
@ -611,7 +636,7 @@ export default {
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.id); this.ids = selection.map((item) => item.id);
this.single = selection.length != 1; this.single = selection.length != 1;
this.multiple = !selection.length; this.multiple = !selection.length;
}, },
@ -625,7 +650,7 @@ export default {
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
const id = row.id || this.ids; const id = row.id || this.ids;
getHealthcheck(id).then(response => { getHealthcheck(id).then((response) => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改儿童常规体检记录"; this.title = "修改儿童常规体检记录";
@ -633,10 +658,10 @@ export default {
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm: function () { submitForm: function () {
this.$refs["form"].validate(valid => { this.$refs["form"].validate((valid) => {
if (valid) { if (valid) {
if (this.form.id != undefined) { if (this.form.id != undefined) {
updateHealthcheck(this.form).then(response => { updateHealthcheck(this.form).then((response) => {
if (response.code === 200) { if (response.code === 200) {
this.msgSuccess("修改成功"); this.msgSuccess("修改成功");
this.open = false; this.open = false;
@ -644,7 +669,7 @@ export default {
} }
}); });
} else { } else {
addHealthcheck(this.form).then(response => { addHealthcheck(this.form).then((response) => {
if (response.code === 200) { if (response.code === 200) {
this.msgSuccess("新增成功"); this.msgSuccess("新增成功");
this.open = false; this.open = false;
@ -661,7 +686,7 @@ export default {
this.$confirm("是否确认删除儿童常规体检记录数据项?", "警告", { this.$confirm("是否确认删除儿童常规体检记录数据项?", "警告", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning",
}) })
.then(function () { .then(function () {
return delHealthcheck(ids); return delHealthcheck(ids);
@ -671,7 +696,7 @@ export default {
this.msgSuccess("删除成功"); this.msgSuccess("删除成功");
}) })
.catch(function () {}); .catch(function () {});
} },
// /** 导出按钮操作 */ // /** 导出按钮操作 */
// handleExport() { // handleExport() {
// const queryParams = this.queryParams; // const queryParams = this.queryParams;
@ -688,6 +713,24 @@ export default {
// }) // })
// .catch(function () {}); // .catch(function () {});
// }, // },
} },
}; };
</script> </script>
<style lang="scss" scoped>
.el-select {
width: 100%;
}
.my-date-picker {
width: 100%;
}
.edit-btns {
.el-button {
display: block;
margin: 0 auto;
}
}
.no-margin ::v-deep.el-form-item__content {
margin: 0 !important;
}
</style>

94
ruoyi-ui/src/views/benyi/learndevelopmentfamily/index.vue
View File

@ -1,13 +1,10 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form <el-form :model="queryParams" ref="queryForm" label-width="70px">
:model="queryParams" <el-row :gutter="10">
ref="queryForm" <el-col :xs="24" :ms="12" :md="5">
:inline="true" <el-form-item label="幼儿姓名" prop="childid">
label-width="68px" <el-select v-model="queryParams.childid" placeholder="请选择幼儿">
>
<el-form-item label="幼儿" prop="childid">
<el-select v-model="queryParams.childid" placeholder="请选择">
<el-option <el-option
v-for="dict in childOptions" v-for="dict in childOptions"
:key="dict.id" :key="dict.id"
@ -16,8 +13,10 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :xs="24" :ms="12" :md="5">
<el-form-item label="学年学期" prop="xnxq"> <el-form-item label="学年学期" prop="xnxq">
<el-select v-model="queryParams.xnxq" placeholder="请选择"> <el-select v-model="queryParams.xnxq" placeholder="请选择学年学期">
<el-option <el-option
v-for="dict in xnxqOptions" v-for="dict in xnxqOptions"
:key="dict.dictValue" :key="dict.dictValue"
@ -26,7 +25,9 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> </el-col>
<el-col :xs="24" :ms="12" :md="4">
<el-form-item class="no-margin">
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
@ -38,6 +39,8 @@
>重置</el-button >重置</el-button
> >
</el-form-item> </el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<div class="mb8 btn-list"> <div class="mb8 btn-list">
@ -70,6 +73,7 @@
</div> </div>
<el-table <el-table
border
v-loading="loading" v-loading="loading"
:data="familyList" :data="familyList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
@ -77,6 +81,7 @@
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="编号" align="center" prop="id" /> --> <!-- <el-table-column label="编号" align="center" prop="id" /> -->
<el-table-column <el-table-column
fixed
label="幼儿" label="幼儿"
align="center" align="center"
prop="childid" prop="childid"
@ -98,6 +103,7 @@
<el-table-column label="教师评语备注" align="center" prop="jspyremarks" /> <el-table-column label="教师评语备注" align="center" prop="jspyremarks" />
<el-table-column label="创建人" align="center" prop="createuserid" />--> <el-table-column label="创建人" align="center" prop="createuserid" />-->
<el-table-column <el-table-column
fixed="right"
label="操作" label="操作"
align="center" align="center"
width="120" width="120"
@ -133,12 +139,17 @@
/> />
<!-- 添加或修改儿童学习与发展档案（家长）对话框 --> <!-- 添加或修改儿童学习与发展档案（家长）对话框 -->
<el-dialog :title="title" :visible.sync="open" class="big-dialog" append-to-body> <el-dialog
:title="title"
:visible.sync="open"
class="big-dialog"
append-to-body
>
<el-row :gutter="15"> <el-row :gutter="15">
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="幼儿id" prop="childid"> <el-form-item label="幼儿姓名" prop="childid">
<el-select v-model="form.childid" placeholder="请选择"> <el-select v-model="form.childid" placeholder="请选择幼儿">
<el-option <el-option
v-for="dict in childOptions" v-for="dict in childOptions"
:key="dict.id" :key="dict.id"
@ -150,7 +161,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="学年学期" prop="xnxq"> <el-form-item label="学年学期" prop="xnxq">
<el-select v-model="form.xnxq" placeholder="请选择"> <el-select v-model="form.xnxq" placeholder="请选择学年学期">
<el-option <el-option
v-for="dict in xnxqOptions" v-for="dict in xnxqOptions"
:key="dict.dictValue" :key="dict.dictValue"
@ -232,7 +243,7 @@ import {
getFamily, getFamily,
delFamily, delFamily,
addFamily, addFamily,
updateFamily updateFamily,
} from "@/api/benyi/learndevelopmentfamily"; } from "@/api/benyi/learndevelopmentfamily";
import { listChild } from "@/api/benyi/child"; import { listChild } from "@/api/benyi/child";
@ -242,7 +253,7 @@ import Editor from "@/components/Editor";
export default { export default {
name: "Family", name: "Family",
components: { components: {
Editor Editor,
}, },
data() { data() {
return { return {
@ -280,21 +291,23 @@ export default {
yqsjremarks: undefined, yqsjremarks: undefined,
jspy: undefined, jspy: undefined,
jspyremarks: undefined, jspyremarks: undefined,
createuserid: undefined createuserid: undefined,
}, },
// 表单参数 // 表单参数
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
childid: [{ required: true, message: "幼儿不能为空", trigger: "blur" }], childid: [{ required: true, message: "幼儿不能为空", trigger: "blur" }],
xnxq: [{ required: true, message: "学年学期不能为空", trigger: "blur" }] xnxq: [
} { required: true, message: "学年学期不能为空", trigger: "blur" },
],
},
}; };
}, },
created() { created() {
this.getList(); this.getList();
this.getChildList(); this.getChildList();
this.getDicts("sys_xnxq").then(response => { this.getDicts("sys_xnxq").then((response) => {
this.xnxqOptions = response.data; this.xnxqOptions = response.data;
}); });
}, },
@ -304,7 +317,7 @@ export default {
// return this.selectDictLabel(this.classOptions, row.classid); // return this.selectDictLabel(this.classOptions, row.classid);
var actions = []; var actions = [];
var datas = this.childOptions; var datas = this.childOptions;
Object.keys(datas).map(key => { Object.keys(datas).map((key) => {
if (datas[key].id == "" + row.childid) { if (datas[key].id == "" + row.childid) {
actions.push(datas[key].name); actions.push(datas[key].name);
return false; return false;
@ -318,14 +331,14 @@ export default {
}, },
//获取幼儿列表 //获取幼儿列表
getChildList() { getChildList() {
listChild(null).then(response => { listChild(null).then((response) => {
this.childOptions = response.rows; this.childOptions = response.rows;
}); });
}, },
/** 查询儿童学习与发展档案（家长）列表 */ /** 查询儿童学习与发展档案（家长）列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listFamily(this.queryParams).then(response => { listFamily(this.queryParams).then((response) => {
this.familyList = response.rows; this.familyList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
@ -351,7 +364,7 @@ export default {
jspy: undefined, jspy: undefined,
jspyremarks: undefined, jspyremarks: undefined,
createuserid: undefined, createuserid: undefined,
createTime: undefined createTime: undefined,
}; };
this.resetForm("form"); this.resetForm("form");
}, },
@ -367,7 +380,7 @@ export default {
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.id); this.ids = selection.map((item) => item.id);
this.single = selection.length != 1; this.single = selection.length != 1;
this.multiple = !selection.length; this.multiple = !selection.length;
}, },
@ -381,7 +394,7 @@ export default {
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
const id = row.id || this.ids; const id = row.id || this.ids;
getFamily(id).then(response => { getFamily(id).then((response) => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改儿童学习与发展档案（家长）"; this.title = "修改儿童学习与发展档案（家长）";
@ -389,10 +402,10 @@ export default {
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm: function () { submitForm: function () {
this.$refs["form"].validate(valid => { this.$refs["form"].validate((valid) => {
if (valid) { if (valid) {
if (this.form.id != undefined) { if (this.form.id != undefined) {
updateFamily(this.form).then(response => { updateFamily(this.form).then((response) => {
if (response.code === 200) { if (response.code === 200) {
this.msgSuccess("修改成功"); this.msgSuccess("修改成功");
this.open = false; this.open = false;
@ -400,7 +413,7 @@ export default {
} }
}); });
} else { } else {
addFamily(this.form).then(response => { addFamily(this.form).then((response) => {
if (response.code === 200) { if (response.code === 200) {
this.msgSuccess("新增成功"); this.msgSuccess("新增成功");
this.open = false; this.open = false;
@ -420,7 +433,7 @@ export default {
{ {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning",
} }
) )
.then(function () { .then(function () {
@ -431,7 +444,24 @@ export default {
this.msgSuccess("删除成功"); this.msgSuccess("删除成功");
}) })
.catch(function () {}); .catch(function () {});
} },
} },
}; };
</script> </script>
<style lang="scss" scoped>
.el-select {
width: 100%;
}
.my-date-picker {
width: 100%;
}
.edit-btns {
.el-button {
display: block;
margin: 0 auto;
}
}
.no-margin ::v-deep.el-form-item__content {
margin: 0 !important;
}
</style>

95
ruoyi-ui/src/views/benyi/learndevelopmentteacher/index.vue
View File

@ -1,13 +1,10 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form <el-form :model="queryParams" ref="queryForm" label-width="70px">
:model="queryParams" <el-row :gutter="10">
ref="queryForm" <el-col :xs="24" :ms="12" :md="5">
:inline="true" <el-form-item label="幼儿姓名" prop="childid">
label-width="68px" <el-select v-model="queryParams.childid" placeholder="请选择幼儿">
>
<el-form-item label="幼儿" prop="childid">
<el-select v-model="queryParams.childid" placeholder="请选择">
<el-option <el-option
v-for="dict in childOptions" v-for="dict in childOptions"
:key="dict.id" :key="dict.id"
@ -16,6 +13,8 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :xs="24" :ms="12" :md="5">
<el-form-item label="学年学期" prop="xnxq"> <el-form-item label="学年学期" prop="xnxq">
<el-select v-model="queryParams.xnxq" placeholder="请选择"> <el-select v-model="queryParams.xnxq" placeholder="请选择">
<el-option <el-option
@ -26,7 +25,9 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> </el-col>
<el-col :xs="24" :ms="12" :md="4">
<el-form-item class="no-margin">
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
@ -38,6 +39,8 @@
>重置</el-button >重置</el-button
> >
</el-form-item> </el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<div class="mb8 btn-list"> <div class="mb8 btn-list">
@ -56,7 +59,8 @@
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['benyi:learndevelopmentteacher:edit']" v-hasPermi="['benyi:learndevelopmentteacher:edit']"
>修改</el-button> >修改</el-button
>
<el-button <el-button
type="danger" type="danger"
icon="el-icon-delete" icon="el-icon-delete"
@ -69,6 +73,7 @@
</div> </div>
<el-table <el-table
border
v-loading="loading" v-loading="loading"
:data="teacherList" :data="teacherList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
@ -76,6 +81,7 @@
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="编号" align="center" prop="id" /> --> <!-- <el-table-column label="编号" align="center" prop="id" /> -->
<el-table-column <el-table-column
fixed
label="幼儿" label="幼儿"
align="center" align="center"
prop="childid" prop="childid"
@ -97,6 +103,7 @@
<el-table-column label="教育计划备注" align="center" prop="jyjhremarks" /> <el-table-column label="教育计划备注" align="center" prop="jyjhremarks" />
<el-table-column label="创建人" align="center" prop="createuserid" />--> <el-table-column label="创建人" align="center" prop="createuserid" />-->
<el-table-column <el-table-column
fixed="right"
label="操作" label="操作"
align="center" align="center"
width="120" width="120"
@ -132,12 +139,17 @@
/> />
<!-- 添加或修改儿童学习与发展档案（教师）对话框 --> <!-- 添加或修改儿童学习与发展档案（教师）对话框 -->
<el-dialog :title="title" :visible.sync="open" class="big-dialog" append-to-body> <el-dialog
:title="title"
:visible.sync="open"
class="big-dialog"
append-to-body
>
<el-row :gutter="15"> <el-row :gutter="15">
<el-form ref="form" :model="form" :rules="rules" label-width="90px"> <el-form ref="form" :model="form" :rules="rules" label-width="90px">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="幼儿" prop="childid"> <el-form-item label="幼儿姓名" prop="childid">
<el-select v-model="form.childid" placeholder="请选择"> <el-select v-model="form.childid" placeholder="请选择幼儿">
<el-option <el-option
v-for="dict in childOptions" v-for="dict in childOptions"
:key="dict.id" :key="dict.id"
@ -149,7 +161,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="学年学期" prop="xnxq"> <el-form-item label="学年学期" prop="xnxq">
<el-select v-model="form.xnxq" placeholder="请选择"> <el-select v-model="form.xnxq" placeholder="请选择学年学期">
<el-option <el-option
v-for="dict in xnxqOptions" v-for="dict in xnxqOptions"
:key="dict.dictValue" :key="dict.dictValue"
@ -231,7 +243,7 @@ import {
getTeacher, getTeacher,
delTeacher, delTeacher,
addTeacher, addTeacher,
updateTeacher updateTeacher,
} from "@/api/benyi/learndevelopmentteacher"; } from "@/api/benyi/learndevelopmentteacher";
import { listChild } from "@/api/benyi/child"; import { listChild } from "@/api/benyi/child";
@ -241,7 +253,7 @@ import Editor from "@/components/Editor";
export default { export default {
name: "Teacher", name: "Teacher",
components: { components: {
Editor Editor,
}, },
data() { data() {
return { return {
@ -279,21 +291,23 @@ export default {
pgjgremarks: undefined, pgjgremarks: undefined,
jyjh: undefined, jyjh: undefined,
jyjhremarks: undefined, jyjhremarks: undefined,
createuserid: undefined createuserid: undefined,
}, },
// 表单参数 // 表单参数
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
childid: [{ required: true, message: "幼儿不能为空", trigger: "blur" }], childid: [{ required: true, message: "幼儿不能为空", trigger: "blur" }],
xnxq: [{ required: true, message: "学年学期不能为空", trigger: "blur" }] xnxq: [
} { required: true, message: "学年学期不能为空", trigger: "blur" },
],
},
}; };
}, },
created() { created() {
this.getList(); this.getList();
this.getChildList(); this.getChildList();
this.getDicts("sys_xnxq").then(response => { this.getDicts("sys_xnxq").then((response) => {
this.xnxqOptions = response.data; this.xnxqOptions = response.data;
}); });
}, },
@ -303,7 +317,7 @@ export default {
// return this.selectDictLabel(this.classOptions, row.classid); // return this.selectDictLabel(this.classOptions, row.classid);
var actions = []; var actions = [];
var datas = this.childOptions; var datas = this.childOptions;
Object.keys(datas).map(key => { Object.keys(datas).map((key) => {
if (datas[key].id == "" + row.childid) { if (datas[key].id == "" + row.childid) {
actions.push(datas[key].name); actions.push(datas[key].name);
return false; return false;
@ -317,14 +331,14 @@ export default {
}, },
//获取幼儿列表 //获取幼儿列表
getChildList() { getChildList() {
listChild(null).then(response => { listChild(null).then((response) => {
this.childOptions = response.rows; this.childOptions = response.rows;
}); });
}, },
/** 查询儿童学习与发展档案（教师）列表 */ /** 查询儿童学习与发展档案（教师）列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listTeacher(this.queryParams).then(response => { listTeacher(this.queryParams).then((response) => {
this.teacherList = response.rows; this.teacherList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
@ -350,7 +364,7 @@ export default {
jyjh: undefined, jyjh: undefined,
jyjhremarks: undefined, jyjhremarks: undefined,
createuserid: undefined, createuserid: undefined,
createTime: undefined createTime: undefined,
}; };
this.resetForm("form"); this.resetForm("form");
}, },
@ -366,7 +380,7 @@ export default {
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.id); this.ids = selection.map((item) => item.id);
this.single = selection.length != 1; this.single = selection.length != 1;
this.multiple = !selection.length; this.multiple = !selection.length;
}, },
@ -380,7 +394,7 @@ export default {
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
const id = row.id || this.ids; const id = row.id || this.ids;
getTeacher(id).then(response => { getTeacher(id).then((response) => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改儿童学习与发展档案（教师）"; this.title = "修改儿童学习与发展档案（教师）";
@ -388,10 +402,10 @@ export default {
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm: function () { submitForm: function () {
this.$refs["form"].validate(valid => { this.$refs["form"].validate((valid) => {
if (valid) { if (valid) {
if (this.form.id != undefined) { if (this.form.id != undefined) {
updateTeacher(this.form).then(response => { updateTeacher(this.form).then((response) => {
if (response.code === 200) { if (response.code === 200) {
this.msgSuccess("修改成功"); this.msgSuccess("修改成功");
this.open = false; this.open = false;
@ -399,7 +413,7 @@ export default {
} }
}); });
} else { } else {
addTeacher(this.form).then(response => { addTeacher(this.form).then((response) => {
if (response.code === 200) { if (response.code === 200) {
this.msgSuccess("新增成功"); this.msgSuccess("新增成功");
this.open = false; this.open = false;
@ -419,7 +433,7 @@ export default {
{ {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning",
} }
) )
.then(function () { .then(function () {
@ -430,7 +444,24 @@ export default {
this.msgSuccess("删除成功"); this.msgSuccess("删除成功");
}) })
.catch(function () {}); .catch(function () {});
} },
} },
}; };
</script> </script>
<style lang="scss" scoped>
.el-select {
width: 100%;
}
.my-date-picker {
width: 100%;
}
.edit-btns {
.el-button {
display: block;
margin: 0 auto;
}
}
.no-margin ::v-deep.el-form-item__content {
margin: 0 !important;
}
</style>

80
ruoyi-ui/src/views/benyi/recruitstudentsnotice/index.vue
View File

@ -1,11 +1,8 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form <el-form :model="queryParams" ref="queryForm" label-width="90px">
:model="queryParams" <el-row :gutter="10">
ref="queryForm" <el-col :xs="24" :ms="12" :md="5">
:inline="true"
label-width="90px"
>
<el-form-item label="通知书标题" prop="title"> <el-form-item label="通知书标题" prop="title">
<el-input <el-input
v-model="queryParams.title" v-model="queryParams.title"
@ -15,6 +12,8 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
</el-col>
<el-col :xs="24" :ms="12" :md="5">
<el-form-item label="通知书类型" prop="type"> <el-form-item label="通知书类型" prop="type">
<el-select v-model="queryParams.type" placeholder="请选择"> <el-select v-model="queryParams.type" placeholder="请选择">
<el-option <el-option
@ -25,7 +24,9 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> </el-col>
<el-col :xs="24" :ms="12" :md="4">
<el-form-item class="no-margin">
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
@ -37,6 +38,8 @@
>重置</el-button >重置</el-button
> >
</el-form-item> </el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<div class="mb8 btn-list"> <div class="mb8 btn-list">
@ -71,13 +74,14 @@
</div> </div>
<el-table <el-table
border
v-loading="loading" v-loading="loading"
:data="noticeList" :data="noticeList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="编号" align="center" prop="id" /> --> <!-- <el-table-column label="编号" align="center" prop="id" /> -->
<el-table-column label="标题" align="center" prop="title" /> <el-table-column fixed label="标题" align="center" prop="title" />
<el-table-column <el-table-column
label="类型" label="类型"
align="center" align="center"
@ -85,8 +89,10 @@
:formatter="typeFormat" :formatter="typeFormat"
/> />
<el-table-column <el-table-column
fixed="right"
label="操作" label="操作"
align="center" align="center"
width="180"
class-name="small-padding fixed-width" class-name="small-padding fixed-width"
> >
<template slot-scope="scope"> <template slot-scope="scope">
@ -138,7 +144,12 @@
/> />
<!-- 添加或修改入园通知书对话框 --> <!-- 添加或修改入园通知书对话框 -->
<el-dialog :title="title" :visible.sync="open" class="big-dialog" append-to-body> <el-dialog
:title="title"
:visible.sync="open"
class="big-dialog"
append-to-body
>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="标题" prop="title"> <el-form-item label="标题" prop="title">
<el-input v-model="form.title" placeholder="请输入标题" /> <el-input v-model="form.title" placeholder="请输入标题" />
@ -164,7 +175,7 @@ import {
delNotice, delNotice,
addNotice, addNotice,
updateNotice, updateNotice,
copyNotice copyNotice,
} from "@/api/benyi/recruitstudentsnotice"; } from "@/api/benyi/recruitstudentsnotice";
import Editor from "@/components/Editor"; import Editor from "@/components/Editor";
@ -172,7 +183,7 @@ import Editor from "@/components/Editor";
export default { export default {
name: "Notice", name: "Notice",
components: { components: {
Editor Editor,
}, },
data() { data() {
return { return {
@ -202,17 +213,17 @@ export default {
title: undefined, title: undefined,
content: undefined, content: undefined,
type: undefined, type: undefined,
schoolid: undefined schoolid: undefined,
}, },
// 表单参数 // 表单参数
form: {}, form: {},
// 表单校验 // 表单校验
rules: {} rules: {},
}; };
}, },
created() { created() {
this.getList(); this.getList();
this.getDicts("sys_dm_noticetype").then(response => { this.getDicts("sys_dm_noticetype").then((response) => {
this.typeOptions = response.data; this.typeOptions = response.data;
}); });
}, },
@ -232,7 +243,7 @@ export default {
/** 查询入园通知书列表 */ /** 查询入园通知书列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listNotice(this.queryParams).then(response => { listNotice(this.queryParams).then((response) => {
this.noticeList = response.rows; this.noticeList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
@ -251,7 +262,7 @@ export default {
content: undefined, content: undefined,
type: undefined, type: undefined,
schoolid: undefined, schoolid: undefined,
createTime: undefined createTime: undefined,
}; };
this.resetForm("form"); this.resetForm("form");
}, },
@ -267,7 +278,7 @@ export default {
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.id); this.ids = selection.map((item) => item.id);
this.single = selection.length != 1; this.single = selection.length != 1;
this.multiple = !selection.length; this.multiple = !selection.length;
}, },
@ -275,7 +286,7 @@ export default {
handleView(row) { handleView(row) {
this.reset(); this.reset();
const id = row.id || this.ids; const id = row.id || this.ids;
getNotice(id).then(response => { getNotice(id).then((response) => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "入园通知书详情"; this.title = "入园通知书详情";
@ -293,7 +304,7 @@ export default {
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
const id = row.id || this.ids; const id = row.id || this.ids;
getNotice(id).then(response => { getNotice(id).then((response) => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改入园通知书"; this.title = "修改入园通知书";
@ -302,10 +313,10 @@ export default {
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm: function () { submitForm: function () {
this.$refs["form"].validate(valid => { this.$refs["form"].validate((valid) => {
if (valid) { if (valid) {
if (this.form.id != undefined) { if (this.form.id != undefined) {
updateNotice(this.form).then(response => { updateNotice(this.form).then((response) => {
if (response.code === 200) { if (response.code === 200) {
this.msgSuccess("修改成功"); this.msgSuccess("修改成功");
this.open = false; this.open = false;
@ -313,7 +324,7 @@ export default {
} }
}); });
} else { } else {
addNotice(this.form).then(response => { addNotice(this.form).then((response) => {
if (response.code === 200) { if (response.code === 200) {
this.msgSuccess("新增成功"); this.msgSuccess("新增成功");
this.open = false; this.open = false;
@ -333,7 +344,7 @@ export default {
{ {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning",
} }
) )
.then(function () { .then(function () {
@ -351,7 +362,7 @@ export default {
this.$confirm('确认复制入园通知书编号为"' + id + '"的数据项?', "警告", { this.$confirm('确认复制入园通知书编号为"' + id + '"的数据项?', "警告", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning",
}) })
.then(function () { .then(function () {
return copyNotice(id); return copyNotice(id);
@ -361,7 +372,24 @@ export default {
this.msgSuccess("复制成功"); this.msgSuccess("复制成功");
}) })
.catch(function () {}); .catch(function () {});
} },
} },
}; };
</script> </script>
<style lang="scss" scoped>
.el-select {
width: 100%;
}
.my-date-picker {
width: 100%;
}
.edit-btns {
.el-button {
display: block;
margin: 0 auto;
}
}
.no-margin ::v-deep.el-form-item__content {
margin: 0 !important;
}
</style>

50
ruoyi-ui/src/views/benyi/schoolcalendarclass/index.vue
View File

@ -1,11 +1,8 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form <el-form :model="queryParams" ref="queryForm" label-width="70px">
:model="queryParams" <el-row :gutter="10">
ref="queryForm" <el-col :xs="24" :ms="12" :md="5">
:inline="true"
label-width="68px"
>
<el-form-item label="活动类型" prop="type"> <el-form-item label="活动类型" prop="type">
<el-select <el-select
v-model="queryParams.type" v-model="queryParams.type"
@ -21,6 +18,8 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :xs="24" :ms="12" :md="5">
<!--<el-form-item label="所属班级" prop="classid"> <!--<el-form-item label="所属班级" prop="classid">
<el-select v-model="queryParams.classid" placeholder="请选择班级" > <el-select v-model="queryParams.classid" placeholder="请选择班级" >
<el-option <el-option
@ -46,18 +45,22 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :xs="24" :ms="12" :md="5">
<el-form-item label="活动时间" prop="activitytime"> <el-form-item label="活动时间" prop="activitytime">
<el-date-picker <el-date-picker
class="my-date-picker"
clearable clearable
size="small" size="small"
style="width: 200px"
v-model="queryParams.activitytime" v-model="queryParams.activitytime"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="选择活动时间" placeholder="选择活动时间"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> </el-col>
<el-col :xs="24" :ms="12" :md="4">
<el-form-item class="no-margin">
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
@ -69,10 +72,11 @@
>重置</el-button >重置</el-button
> >
</el-form-item> </el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <div class="mb8 btn-list">
<el-col :span="1.5">
<el-button <el-button
type="primary" type="primary"
icon="el-icon-plus" icon="el-icon-plus"
@ -81,8 +85,6 @@
v-hasPermi="['benyi:schoolcalendarclass:add']" v-hasPermi="['benyi:schoolcalendarclass:add']"
>新增</el-button >新增</el-button
> >
</el-col>
<el-col :span="1.5">
<el-button <el-button
type="success" type="success"
icon="el-icon-edit" icon="el-icon-edit"
@ -92,8 +94,6 @@
v-hasPermi="['benyi:schoolcalendarclass:edit']" v-hasPermi="['benyi:schoolcalendarclass:edit']"
>修改</el-button >修改</el-button
> >
</el-col>
<el-col :span="1.5">
<el-button <el-button
type="danger" type="danger"
icon="el-icon-delete" icon="el-icon-delete"
@ -103,8 +103,6 @@
v-hasPermi="['benyi:schoolcalendarclass:remove']" v-hasPermi="['benyi:schoolcalendarclass:remove']"
>删除</el-button >删除</el-button
> >
</el-col>
<el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"
icon="el-icon-download" icon="el-icon-download"
@ -113,8 +111,7 @@
v-hasPermi="['benyi:schoolcalendarclass:export']" v-hasPermi="['benyi:schoolcalendarclass:export']"
>导出</el-button >导出</el-button
> >
</el-col> </div>
</el-row>
<el-table <el-table
border border
@ -489,3 +486,20 @@ export default {
}, },
}; };
</script> </script>
<style lang="scss" scoped>
.el-select {
width: 100%;
}
.my-date-picker {
width: 100%;
}
.edit-btns {
.el-button {
display: block;
margin: 0 auto;
}
}
.no-margin ::v-deep.el-form-item__content {
margin: 0 !important;
}
</style>

4
ruoyi-ui/src/views/dashboard/RadarChart.vue
View File

@ -63,11 +63,11 @@ export default {
async getData() { async getData() {
await getAssessmentStatistics(this.childId, this.psMsg).then( await getAssessmentStatistics(this.childId, this.psMsg).then(
(response) => { (response) => {
console.log(response); // console.log(response);
let value = []; let value = [];
let len = response.statistics; let len = response.statistics;
for (var j = 0; j < len.length; j++) { for (var j = 0; j < len.length; j++) {
console.log(len[j]); // console.log(len[j]);
if (len[j] == "NaN") { if (len[j] == "NaN") {
value.push(0); value.push(0);
} else { } else {

42
ruoyi-ui/src/views/system/class/index.vue
View File

@ -1,11 +1,8 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form <el-form :model="queryParams" ref="queryForm" label-width="70px">
:model="queryParams" <el-row :gutter="10">
ref="queryForm" <el-col :xs="24" :ms="12" :md="4">
:inline="true"
label-width="68px"
>
<el-form-item label="班级类型" prop="bjtype"> <el-form-item label="班级类型" prop="bjtype">
<el-select <el-select
v-model="queryParams.bjtype" v-model="queryParams.bjtype"
@ -21,6 +18,8 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :xs="24" :ms="12" :md="4">
<el-form-item label="班级名称" prop="bjmc"> <el-form-item label="班级名称" prop="bjmc">
<el-input <el-input
v-model="queryParams.bjmc" v-model="queryParams.bjmc"
@ -30,6 +29,8 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
</el-col>
<el-col :xs="24" :ms="12" :md="4">
<el-form-item label="主班教师" prop="zbjs"> <el-form-item label="主班教师" prop="zbjs">
<el-select <el-select
v-model="queryParams.zbjs" v-model="queryParams.zbjs"
@ -45,6 +46,8 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :xs="24" :ms="12" :md="4">
<el-form-item label="配班教师" prop="pbjs"> <el-form-item label="配班教师" prop="pbjs">
<el-select <el-select
v-model="queryParams.pbjs" v-model="queryParams.pbjs"
@ -60,6 +63,8 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :xs="24" :ms="12" :md="4">
<el-form-item label="助理教师" prop="zljs"> <el-form-item label="助理教师" prop="zljs">
<el-select <el-select
v-model="queryParams.zljs" v-model="queryParams.zljs"
@ -75,7 +80,9 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> </el-col>
<el-col :xs="24" :ms="12" :md="4">
<el-form-item class="no-margin">
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
@ -87,6 +94,8 @@
>重置</el-button >重置</el-button
> >
</el-form-item> </el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<div class="mb8 btn-list"> <div class="mb8 btn-list">
@ -347,7 +356,7 @@ export default {
this.loading = true; this.loading = true;
listClass(this.queryParams).then((response) => { listClass(this.queryParams).then((response) => {
this.classList = response.rows; this.classList = response.rows;
console.log(this.classList); // console.log(this.classList);
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
}); });
@ -500,3 +509,20 @@ export default {
}, },
}; };
</script> </script>
<style lang="scss" scoped>
.el-select {
width: 100%;
}
.my-date-picker {
width: 100%;
}
.edit-btns {
.el-button {
display: block;
margin: 0 auto;
}
}
.no-margin ::v-deep.el-form-item__content {
margin: 0 !important;
}
</style>

38
ruoyi-ui/src/views/system/teacher/index.vue
View File

@ -1,11 +1,8 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form <el-form :model="queryParams" ref="queryForm" label-width="70px">
:model="queryParams" <el-row :gutter="10">
ref="queryForm" <el-col :xs="24" :ms="12" :md="5">
:inline="true"
label-width="68px"
>
<el-form-item label="用户名称" prop="userid"> <el-form-item label="用户名称" prop="userid">
<el-select <el-select
v-model="queryParams.userid" v-model="queryParams.userid"
@ -20,6 +17,8 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :xs="24" :ms="12" :md="5">
<!--<el-form-item label="证件号码" prop="zjhm"> <!--<el-form-item label="证件号码" prop="zjhm">
<el-input <el-input
v-model="queryParams.zjhm" v-model="queryParams.zjhm"
@ -29,7 +28,7 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item>--> </el-form-item>-->
<el-form-item label="学历" prop="xl"> <el-form-item label="教师学历" prop="xl">
<el-select <el-select
v-model="queryParams.xl" v-model="queryParams.xl"
placeholder="请选择学历" placeholder="请选择学历"
@ -44,7 +43,9 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> </el-col>
<el-col :xs="24" :ms="12" :md="4">
<el-form-item class="no-margin">
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
@ -56,6 +57,8 @@
>重置</el-button >重置</el-button
> >
</el-form-item> </el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<div class="mb8 btn-list"> <div class="mb8 btn-list">
@ -364,7 +367,7 @@ export default {
this.loading = true; this.loading = true;
listTeacher(this.queryParams).then((response) => { listTeacher(this.queryParams).then((response) => {
this.teacherList = response.rows; this.teacherList = response.rows;
console.log(response); // console.log(response);
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
}); });
@ -525,3 +528,20 @@ export default {
}, },
}; };
</script> </script>
<style lang="scss" scoped>
.el-select {
width: 100%;
}
.my-date-picker {
width: 100%;
}
.edit-btns {
.el-button {
display: block;
margin: 0 auto;
}
}
.no-margin ::v-deep.el-form-item__content {
margin: 0 !important;
}
</style>

116
ruoyi-ui/src/views/system/user/index.vue
View File

@ -31,29 +31,26 @@
<!--用户数据--> <!--用户数据-->
<el-col :span="20" :xs="24"> <el-col :span="20" :xs="24">
<div class="box-shadow"> <div class="box-shadow">
<el-form <el-form :model="queryParams" ref="queryForm" label-width="70px">
:model="queryParams" <el-row :gutter="10">
ref="queryForm" <el-col :xs="24" :ms="12" :md="5">
:inline="true"
label-width="68px"
>
<el-form-item label="登录账号" prop="userName"> <el-form-item label="登录账号" prop="userName">
<el-input <el-input
v-model="queryParams.userName" v-model="queryParams.userName"
placeholder="请输入用户名称" placeholder="请输入用户名称"
clearable clearable
size="small" size="small"
style="width: 240px"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="status"> </el-col>
<el-col :xs="24" :ms="12" :md="5">
<el-form-item label="用户状态" prop="status">
<el-select <el-select
v-model="queryParams.status" v-model="queryParams.status"
placeholder="用户状态" placeholder="用户状态"
clearable clearable
size="small" size="small"
style="width: 240px"
> >
<el-option <el-option
v-for="dict in statusOptions" v-for="dict in statusOptions"
@ -63,11 +60,13 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :xs="24" :ms="12" :md="5">
<el-form-item label="创建时间"> <el-form-item label="创建时间">
<el-date-picker <el-date-picker
v-model="dateRange" v-model="dateRange"
size="small" size="small"
style="width: 240px" class="my-date-picker"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
type="daterange" type="daterange"
range-separator="-" range-separator="-"
@ -75,7 +74,9 @@
end-placeholder="结束日期" end-placeholder="结束日期"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> </el-col>
<el-col :xs="24" :ms="12" :md="4">
<el-form-item class="no-margin">
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
@ -83,10 +84,15 @@
@click="handleQuery" @click="handleQuery"
>搜索</el-button >搜索</el-button
> >
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery" <el-button
icon="el-icon-refresh"
size="mini"
@click="resetQuery"
>重置</el-button >重置</el-button
> >
</el-form-item> </el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<div class="mb8 btn-list"> <div class="mb8 btn-list">
@ -135,13 +141,15 @@
</div> </div>
<el-table <el-table
border
v-loading="loading" v-loading="loading"
:data="userList" :data="userList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="40" align="center" /> <el-table-column type="selection" width="40" align="center" />
<el-table-column label="用户编号" align="center" prop="userId" /> <!-- <el-table-column label="用户编号" align="center" prop="userId" /> -->
<el-table-column <el-table-column
fixed
label="登录账号" label="登录账号"
align="center" align="center"
prop="userName" prop="userName"
@ -180,6 +188,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
fixed="right"
label="操作" label="操作"
align="center" align="center"
width="180" width="180"
@ -395,7 +404,7 @@ import {
exportUser, exportUser,
resetUserPwd, resetUserPwd,
changeUserStatus, changeUserStatus,
importTemplate importTemplate,
} from "@/api/system/user"; } from "@/api/system/user";
import { getToken } from "@/utils/auth"; import { getToken } from "@/utils/auth";
import { treeselect } from "@/api/system/dept"; import { treeselect } from "@/api/system/dept";
@ -447,7 +456,7 @@ export default {
form: {}, form: {},
defaultProps: { defaultProps: {
children: "children", children: "children",
label: "label" label: "label",
}, },
// 用户导入参数 // 用户导入参数
upload: { upload: {
@ -462,7 +471,7 @@ export default {
// 设置上传的请求头部 // 设置上传的请求头部
headers: { Authorization: "Bearer " + getToken() }, headers: { Authorization: "Bearer " + getToken() },
// 上传的地址 // 上传的地址
url: process.env.VUE_APP_BASE_API + "/system/user/importData" url: process.env.VUE_APP_BASE_API + "/system/user/importData",
}, },
// 查询参数 // 查询参数
queryParams: { queryParams: {
@ -470,7 +479,7 @@ export default {
pageSize: 10, pageSize: 10,
userName: undefined, userName: undefined,
status: undefined, status: undefined,
deptId: undefined deptId: undefined,
}, },
// 表单校验 // 表单校验
rules: { rules: {
@ -479,37 +488,37 @@ export default {
required: true, required: true,
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
message: "请输入正确的手机号码", message: "请输入正确的手机号码",
trigger: "blur" trigger: "blur",
} },
], ],
nickName: [ nickName: [
{ required: true, message: "用户昵称不能为空", trigger: "blur" } { required: true, message: "用户昵称不能为空", trigger: "blur" },
], ],
deptId: [ deptId: [
{ required: true, message: "归属部门不能为空", trigger: "blur" } { required: true, message: "归属部门不能为空", trigger: "blur" },
], ],
password: [ password: [
{ required: true, message: "用户密码不能为空", trigger: "blur" } { required: true, message: "用户密码不能为空", trigger: "blur" },
] ],
} },
}; };
}, },
watch: { watch: {
// 根据名称筛选部门树 // 根据名称筛选部门树
deptName(val) { deptName(val) {
this.$refs.tree.filter(val); this.$refs.tree.filter(val);
} },
}, },
created() { created() {
this.getList(); this.getList();
this.getTreeselect(); this.getTreeselect();
this.getDicts("sys_normal_disable").then(response => { this.getDicts("sys_normal_disable").then((response) => {
this.statusOptions = response.data; this.statusOptions = response.data;
}); });
this.getDicts("sys_user_sex").then(response => { this.getDicts("sys_user_sex").then((response) => {
this.sexOptions = response.data; this.sexOptions = response.data;
}); });
this.getConfigKey("sys.user.initPassword").then(response => { this.getConfigKey("sys.user.initPassword").then((response) => {
this.initPassword = response.msg; this.initPassword = response.msg;
}); });
}, },
@ -518,7 +527,7 @@ export default {
getList() { getList() {
this.loading = true; this.loading = true;
listUser(this.addDateRange(this.queryParams, this.dateRange)).then( listUser(this.addDateRange(this.queryParams, this.dateRange)).then(
response => { (response) => {
this.userList = response.rows; this.userList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
@ -527,7 +536,7 @@ export default {
}, },
/** 查询部门下拉树结构 */ /** 查询部门下拉树结构 */
getTreeselect() { getTreeselect() {
treeselect().then(response => { treeselect().then((response) => {
this.deptOptions = response.data; this.deptOptions = response.data;
//console.log(this.deptOptions); //console.log(this.deptOptions);
}); });
@ -551,7 +560,7 @@ export default {
{ {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning",
} }
) )
.then(function () { .then(function () {
@ -581,7 +590,7 @@ export default {
status: "0", status: "0",
remark: undefined, remark: undefined,
postIds: [], postIds: [],
roleIds: [] roleIds: [],
}; };
this.resetForm("form"); this.resetForm("form");
}, },
@ -598,7 +607,7 @@ export default {
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.userId); this.ids = selection.map((item) => item.userId);
this.single = selection.length != 1; this.single = selection.length != 1;
this.multiple = !selection.length; this.multiple = !selection.length;
}, },
@ -606,7 +615,7 @@ export default {
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.getTreeselect(); this.getTreeselect();
getUser().then(response => { getUser().then((response) => {
this.postOptions = response.posts; this.postOptions = response.posts;
this.roleOptions = response.roles; this.roleOptions = response.roles;
//console.log("school="+response.isSchool); //console.log("school="+response.isSchool);
@ -626,7 +635,7 @@ export default {
this.reset(); this.reset();
this.getTreeselect(); this.getTreeselect();
const userId = row.userId || this.ids; const userId = row.userId || this.ids;
getUser(userId).then(response => { getUser(userId).then((response) => {
this.form = response.data; this.form = response.data;
this.postOptions = response.posts; this.postOptions = response.posts;
this.roleOptions = response.roles; this.roleOptions = response.roles;
@ -649,10 +658,10 @@ export default {
handleResetPwd(row) { handleResetPwd(row) {
this.$prompt('请输入"' + row.userName + '"的新密码', "提示", { this.$prompt('请输入"' + row.userName + '"的新密码', "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消" cancelButtonText: "取消",
}) })
.then(({ value }) => { .then(({ value }) => {
resetUserPwd(row.userId, value).then(response => { resetUserPwd(row.userId, value).then((response) => {
if (response.code === 200) { if (response.code === 200) {
this.msgSuccess("修改成功，新密码是：" + value); this.msgSuccess("修改成功，新密码是：" + value);
} else { } else {
@ -664,10 +673,10 @@ export default {
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm: function () { submitForm: function () {
this.$refs["form"].validate(valid => { this.$refs["form"].validate((valid) => {
if (valid) { if (valid) {
if (this.form.userId != undefined) { if (this.form.userId != undefined) {
updateUser(this.form).then(response => { updateUser(this.form).then((response) => {
if (response.code === 200) { if (response.code === 200) {
this.msgSuccess("修改成功"); this.msgSuccess("修改成功");
this.open = false; this.open = false;
@ -677,7 +686,7 @@ export default {
} }
}); });
} else { } else {
addUser(this.form).then(response => { addUser(this.form).then((response) => {
if (response.code === 200) { if (response.code === 200) {
this.msgSuccess("新增成功"); this.msgSuccess("新增成功");
this.open = false; this.open = false;
@ -699,7 +708,7 @@ export default {
{ {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning",
} }
) )
.then(function () { .then(function () {
@ -717,12 +726,12 @@ export default {
this.$confirm("是否确认导出所有用户数据项?", "警告", { this.$confirm("是否确认导出所有用户数据项?", "警告", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning",
}) })
.then(function () { .then(function () {
return exportUser(queryParams); return exportUser(queryParams);
}) })
.then(response => { .then((response) => {
this.download(response.msg); this.download(response.msg);
}) })
.catch(function () {}); .catch(function () {});
@ -734,7 +743,7 @@ export default {
}, },
/** 下载模板操作 */ /** 下载模板操作 */
importTemplate() { importTemplate() {
importTemplate().then(response => { importTemplate().then((response) => {
this.download(response.msg); this.download(response.msg);
}); });
}, },
@ -753,8 +762,8 @@ export default {
// 提交上传文件 // 提交上传文件
submitFileForm() { submitFileForm() {
this.$refs.upload.submit(); this.$refs.upload.submit();
} },
} },
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@ -774,4 +783,19 @@ export default {
padding: 10px 15px; padding: 10px 15px;
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
} }
.el-select {
width: 100%;
}
.my-date-picker {
width: 100%;
}
.edit-btns {
.el-button {
display: block;
margin: 0 auto;
}
}
.no-margin ::v-deep.el-form-item__content {
margin: 0 !important;
}
</style> </style>