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

!2 开发分支合并到主分支

Browse Source 
Merge pull request !2 from 派大星/xinbo
This commit is contained in:
派大星
2020-11-16 08:30:17 +08:00
committed by Gitee
parent d7f8394f71 60335056df
commit 60209b9b88
33 changed files with 2803 additions and 1824 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-ui/package.json
View File

@@ -101,6 +101,7 @@
"husky": "1.3.1", "husky": "1.3.1",
"lint-staged": "8.1.5", "lint-staged": "8.1.5",
"mockjs": "1.0.1-beta3", "mockjs": "1.0.1-beta3",
"mux.js": "^5.6.7",
"plop": "2.3.0", "plop": "2.3.0",
"runjs": "^4.3.2", "runjs": "^4.3.2",
"sass-loader": "^7.1.0", "sass-loader": "^7.1.0",

192
ruoyi-ui/src/assets/styles/element-ui.scss
View File

@@ -1,84 +1,108 @@
// cover some element-ui styles // cover some element-ui styles
.el-breadcrumb__inner, .el-breadcrumb__inner,
.el-breadcrumb__inner a { .el-breadcrumb__inner a {
font-weight: 400 !important; font-weight: 400 !important;
} }
.el-upload { .el-upload {
input[type="file"] { input[type="file"] {
display: none !important; display: none !important;
} }
} }
.el-upload__input { .el-upload__input {
display: none; display: none;
} }
.cell { .cell {
.el-tag { .el-tag {
margin-right: 0px; margin-right: 0px;
} }
} }
.small-padding { .small-padding {
.cell { .cell {
padding-left: 5px; padding-left: 5px;
padding-right: 5px; padding-right: 5px;
} }
} }
.fixed-width { .fixed-width {
.el-button--mini { .el-button--mini {
padding: 7px 10px; padding: 7px 10px;
width: 60px; width: 60px;
} }
} }
.status-col { .status-col {
.cell { .cell {
padding: 0 10px; padding: 0 10px;
text-align: center; text-align: center;
.el-tag { .el-tag {
margin-right: 0px; margin-right: 0px;
} }
} }
} }
// to fixed https://github.com/ElemeFE/element/issues/2461 // to fixed https://github.com/ElemeFE/element/issues/2461
.el-dialog { .el-dialog {
transform: none; transform: none;
left: 0; left: 0;
position: relative; position: relative;
margin: 0 auto; margin: 0 auto;
} }
// refine element ui upload // refine element ui upload
.upload-container { .upload-container {
.el-upload { .el-upload {
width: 100%; width: 100%;
.el-upload-dragger { .el-upload-dragger {
width: 100%; width: 100%;
height: 200px; height: 200px;
} }
} }
} }
// dropdown // dropdown
.el-dropdown-menu { .el-dropdown-menu {
a { a {
display: block display: block
} }
} }
// fix date-picker ui bug in filter-item // fix date-picker ui bug in filter-item
.el-range-editor.el-input__inner { .el-range-editor.el-input__inner {
display: inline-flex !important; display: inline-flex !important;
} }
// to fix el-date-picker css style // to fix el-date-picker css style
.el-range-separator { .el-range-separator {
box-sizing: content-box; box-sizing: content-box;
} }
.v-dialog .el-dialog {
width: 500px;
}
.big-dialog .el-dialog {
width: 800px;
}
@media (max-width: 768.98px) {
.v-dialog .el-dialog, .big-dialog .el-dialog {
width: 96%;
.el-dialog__body {
max-height: 68vh;
overflow-y: auto;
}
}
.el-card {
.el-card__body {
padding: 10px;
}
}
.el-form-item {
margin-bottom: 10px;
}
}

21
ruoyi-ui/src/assets/styles/index.scss
View File

@@ -122,6 +122,9 @@ aside {
//main-container全局样式 //main-container全局样式
.app-container { .app-container {
padding: 20px; padding: 20px;
@media (max-width: 768.98px) {
padding: 10px;
}
} }
.components-container { .components-container {
@@ -230,4 +233,20 @@ p {
ul, ul,
li { li {
list-style: none; list-style: none;
} }
@media (max-width: 768.98px) {
.btn-list {
.el-button--mini {
padding: 4px 7px;
margin-bottom: 5px;
margin-left: 5px;
&:nth-of-type(1) {
margin-left: 0;
}
&:nth-of-type(5) {
margin-left: 0;
}
}
}
}

398
ruoyi-ui/src/assets/styles/ruoyi.scss
View File

@@ -1,197 +1,201 @@
/** /**
* 通用css样式布局处理 * 通用css样式布局处理
* Copyright (c) 2019 ruoyi * Copyright (c) 2019 ruoyi
*/ */
/** 基础通用 **/ /** 基础通用 **/
.pt5 { .pt5 {
padding-top: 5px; padding-top: 5px;
} }
.pr5 { .pr5 {
padding-right: 5px; padding-right: 5px;
} }
.pb5 { .pb5 {
padding-bottom: 5px; padding-bottom: 5px;
} }
.mt5 { .mt5 {
margin-top: 5px; margin-top: 5px;
} }
.mr5 { .mr5 {
margin-right: 5px; margin-right: 5px;
} }
.mb5 { .mb5 {
margin-bottom: 5px; margin-bottom: 5px;
} }
.mb8 { .mb8 {
margin-bottom: 8px; margin-bottom: 8px;
} }
.ml5 { .ml5 {
margin-left: 5px; margin-left: 5px;
} }
.mt10 { .mt10 {
margin-top: 10px; margin-top: 10px;
} }
.mr10 { .mr10 {
margin-right: 10px; margin-right: 10px;
} }
.mb10 { .mb10 {
margin-bottom: 10px; margin-bottom: 10px;
} }
.ml0 { .ml0 {
margin-left: 10px; margin-left: 10px;
} }
.mt20 { .mt20 {
margin-top: 20px; margin-top: 20px;
} }
.mr20 { .mr20 {
margin-right: 20px; margin-right: 20px;
} }
.mb20 { .mb20 {
margin-bottom: 20px; margin-bottom: 20px;
} }
.m20 { .m20 {
margin-left: 20px; margin-left: 20px;
} }
.el-dialog { .el-dialog {
margin-top: 6vh !important; margin-top: 6vh !important;
} }
.el-table .el-table__header-wrapper th { .el-table .el-table__header-wrapper th {
word-break: break-word; word-break: break-word;
background-color: #f8f8f9; background-color: #f8f8f9;
color: #515a6e; color: #515a6e;
height: 40px; height: 40px;
font-size: 13px; font-size: 13px;
} }
/** 表单布局 **/ /** 表单布局 **/
.form-header { .form-header {
font-size:15px; font-size:15px;
color:#6379bb; color:#6379bb;
border-bottom:1px solid #ddd; border-bottom:1px solid #ddd;
margin:8px 10px 25px 10px; margin:8px 10px 25px 10px;
padding-bottom:5px padding-bottom:5px
} }
/** 表格布局 **/ /** 表格布局 **/
.pagination-container { .pagination-container {
position: relative; position: relative;
height: 25px; margin: 0;
margin-bottom: 10px; background: #fff;
margin-top: 15px; padding: 10px 0;
padding: 10px 20px !important; display: flex;
} justify-content: flex-end;
@media (max-width: 768.98px) {
.pagination-container .el-pagination { .el-pagination__sizes, .el-pagination__total {
right: 0; display: none !important;
position: absolute; }
} .el-pagination__jump {
margin-left: 5px;
.el-table .fixed-width .el-button--mini { }
color: #409EFF; }
padding-left: 0; }
padding-right: 0;
width: inherit; .el-table .fixed-width .el-button--mini {
} color: #409EFF;
padding-left: 0;
.el-tree-node__content > .el-checkbox { padding-right: 0;
margin-right: 8px; width: inherit;
} }
.list-group-striped > .list-group-item { .el-tree-node__content > .el-checkbox {
border-left: 0; margin-right: 8px;
border-right: 0; }
border-radius: 0;
padding-left: 0; .list-group-striped > .list-group-item {
padding-right: 0; border-left: 0;
} border-right: 0;
border-radius: 0;
.list-group { padding-left: 0;
padding-left: 0px; padding-right: 0;
list-style: none; }
}
.list-group {
.list-group-item { padding-left: 0px;
border-bottom: 1px solid #e7eaec; list-style: none;
border-top: 1px solid #e7eaec; }
margin-bottom: -1px;
padding: 11px 0px; .list-group-item {
font-size: 13px; border-bottom: 1px solid #e7eaec;
} border-top: 1px solid #e7eaec;
margin-bottom: -1px;
.pull-right { padding: 11px 0px;
float: right !important; font-size: 13px;
} }
.el-card__header { .pull-right {
padding: 14px 15px 7px; float: right !important;
min-height: 40px; }
}
.el-card__header {
.el-card__body { padding: 14px 15px 7px;
padding: 15px 20px 20px 20px; min-height: 40px;
} }
.card-box { .el-card__body {
padding-right: 15px; padding: 15px 20px 20px 20px;
padding-left: 15px; }
margin-bottom: 10px;
} .card-box {
padding-right: 15px;
/* text color */ padding-left: 15px;
.text-navy { margin-bottom: 10px;
color: #1ab394; }
}
/* text color */
.text-primary { .text-navy {
color: inherit; color: #1ab394;
} }
.text-success { .text-primary {
color: #1c84c6; color: inherit;
} }
.text-info { .text-success {
color: #23c6c8; color: #1c84c6;
} }
.text-warning { .text-info {
color: #f8ac59; color: #23c6c8;
} }
.text-danger { .text-warning {
color: #ed5565; color: #f8ac59;
} }
.text-muted { .text-danger {
color: #888888; color: #ed5565;
} }
/* image */ .text-muted {
.img-circle { color: #888888;
border-radius: 50%; }
}
/* image */
.img-lg { .img-circle {
width: 120px; border-radius: 50%;
height: 120px; }
}
.img-lg {
.avatar-upload-preview { width: 120px;
position: absolute; height: 120px;
top: 50%; }
transform: translate(50%, -50%);
width: 180px; .avatar-upload-preview {
height: 180px; position: absolute;
border-radius: 50%; top: 50%;
box-shadow: 0 0 4px #ccc; transform: translate(50%, -50%);
overflow: hidden; width: 180px;
} height: 180px;
border-radius: 50%;
/* 拖拽列样式 */ box-shadow: 0 0 4px #ccc;
.sortable-ghost{ overflow: hidden;
opacity: .8; }
color: #fff!important;
background: #42b983!important; /* 拖拽列样式 */
} .sortable-ghost{
opacity: .8;
color: #fff!important;
background: #42b983!important;
}

198
ruoyi-ui/src/components/Pagination/index.vue
View File

@@ -1,101 +1,97 @@
<template> <template>
<div :class="{'hidden':hidden}" class="pagination-container"> <div :class="{'hidden':hidden}" class="pagination-container">
<el-pagination <el-pagination
:background="background" :background="background"
:current-page.sync="currentPage" :current-page.sync="currentPage"
:page-size.sync="pageSize" :page-size.sync="pageSize"
:layout="layout" :layout="layout"
:page-sizes="pageSizes" :page-sizes="pageSizes"
:total="total" :total="total"
v-bind="$attrs" v-bind="$attrs"
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
/> />
</div> </div>
</template> </template>
<script> <script>
import { scrollTo } from '@/utils/scroll-to' import { scrollTo } from '@/utils/scroll-to'
export default { export default {
name: 'Pagination', name: 'Pagination',
props: { props: {
total: { total: {
required: true, required: true,
type: Number type: Number
}, },
page: { page: {
type: Number, type: Number,
default: 1 default: 1
}, },
limit: { limit: {
type: Number, type: Number,
default: 20 default: 20
}, },
pageSizes: { pageSizes: {
type: Array, type: Array,
default() { default() {
return [10, 20, 30, 50] return [10, 20, 30, 50]
} }
}, },
layout: { layout: {
type: String, type: String,
default: 'total, sizes, prev, pager, next, jumper' default: 'total, sizes, prev, pager, next, jumper'
}, },
background: { background: {
type: Boolean, type: Boolean,
default: true default: true
}, },
autoScroll: { autoScroll: {
type: Boolean, type: Boolean,
default: true default: true
}, },
hidden: { hidden: {
type: Boolean, type: Boolean,
default: false default: false
} }
}, },
computed: { computed: {
currentPage: { currentPage: {
get() { get() {
return this.page return this.page
}, },
set(val) { set(val) {
this.$emit('update:page', val) this.$emit('update:page', val)
} }
}, },
pageSize: { pageSize: {
get() { get() {
return this.limit return this.limit
}, },
set(val) { set(val) {
this.$emit('update:limit', val) this.$emit('update:limit', val)
} }
} }
}, },
methods: { methods: {
handleSizeChange(val) { handleSizeChange(val) {
this.$emit('pagination', { page: this.currentPage, limit: val }) this.$emit('pagination', { page: this.currentPage, limit: val })
if (this.autoScroll) { if (this.autoScroll) {
scrollTo(0, 800) scrollTo(0, 800)
} }
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
this.$emit('pagination', { page: val, limit: this.pageSize }) this.$emit('pagination', { page: val, limit: this.pageSize })
if (this.autoScroll) { if (this.autoScroll) {
scrollTo(0, 800) scrollTo(0, 800)
} }
} }
} }
} }
</script> </script>
<style scoped> <style scoped>
.pagination-container { .pagination-container.hidden {
background: #fff; display: none;
padding: 32px 16px; }
} </style>
.pagination-container.hidden {
display: none;
}
</style>

17
ruoyi-ui/src/views/benyi/activity/index.vue
View File

@@ -52,8 +52,8 @@
<p class="text"><b>入场券：</b>一个家庭一张票，所有家庭持票入场，允许一个家长带领一名幼儿，摊主家庭的另外一位家长需要出示摊位号。</p> <p class="text"><b>入场券：</b>一个家庭一张票，所有家庭持票入场，允许一个家长带领一名幼儿，摊主家庭的另外一位家长需要出示摊位号。</p>
<p class="text">入场券可以做成正副联、也可以做成单张。如图：</p> <p class="text">入场券可以做成正副联、也可以做成单张。如图：</p>
<p class="imgs"> <p class="imgs">
<img src="../../../assets/image/activity/1.png" alt=""> <img class="img2" src="../../../assets/image/activity/1.png" alt="">
<img src="../../../assets/image/activity/2.png" alt=""> <img class="img2" src="../../../assets/image/activity/2.png" alt="">
</p> </p>
<p class="text">入场券幼儿园可以自己设计制作，正面背景是幼儿园图片，写上活动名称及时间、地点。入场券的背面写上注意事项和活动规则。</p> <p class="text">入场券幼儿园可以自己设计制作，正面背景是幼儿园图片，写上活动名称及时间、地点。入场券的背面写上注意事项和活动规则。</p>
<p class="text"><b>摊位号：</b>需要准备2套摊位号。1套在交摊位费报名时发给摊主，方便摊主在活动当天直接按号就位。另1套放在抽奖箱中用于抽奖时使用。</p> <p class="text"><b>摊位号：</b>需要准备2套摊位号。1套在交摊位费报名时发给摊主，方便摊主在活动当天直接按号就位。另1套放在抽奖箱中用于抽奖时使用。</p>
@@ -65,8 +65,8 @@
<p class="text">另一种是不同面值的人民币若干，1元、5元和10元。方便活动结束后家长用剩余的游戏币兑换人民币。</p> <p class="text">另一种是不同面值的人民币若干，1元、5元和10元。方便活动结束后家长用剩余的游戏币兑换人民币。</p>
<p class="text"><b>管理员和摊主挂牌：</b>可制作袖章或颈挂牌明确身份。</p> <p class="text"><b>管理员和摊主挂牌：</b>可制作袖章或颈挂牌明确身份。</p>
<p class="imgs"> <p class="imgs">
<img src="../../../assets/image/activity/4.png" alt=""> <img class="img2" src="../../../assets/image/activity/4.png" alt="">
<img src="../../../assets/image/activity/5.png" alt=""> <img class="img2" src="../../../assets/image/activity/5.png" alt="">
</p> </p>
<p class="text"><b>奖品：</b>摊主可凭摊位号参与抽奖活动，根据摊主人数合理安排奖品的等级和每个等级的人数。如：一等奖5名、二等奖10名、三等奖15名。</p> <p class="text"><b>奖品：</b>摊主可凭摊位号参与抽奖活动，根据摊主人数合理安排奖品的等级和每个等级的人数。如：一等奖5名、二等奖10名、三等奖15名。</p>
<p class="text">其他人员可凭入场券每个孩子均可获得一份参与奖品。</p> <p class="text">其他人员可凭入场券每个孩子均可获得一份参与奖品。</p>
@@ -241,6 +241,9 @@ export default {
margin: 0 auto; margin: 0 auto;
color: #333; color: #333;
height: 100%; height: 100%;
@media (max-width: 768.98px) {
padding: 0 3%;
}
::v-deep .el-tabs__item { ::v-deep .el-tabs__item {
font-weight: bold; font-weight: bold;
} }
@@ -295,6 +298,10 @@ export default {
img { img {
flex: 1; flex: 1;
padding: 5px; padding: 5px;
width: 100%;
&.img2 {
width: 50%;
}
} }
} }
.row-item { .row-item {
@@ -304,4 +311,4 @@ export default {
} }
} }
} }
</style> </style>

13
ruoyi-ui/src/views/benyi/calendarshow/index.vue
View File

@@ -166,6 +166,11 @@ export default {
} }
.btn { .btn {
width: 96px; width: 96px;
@media (max-width: 768.98px) {
width: auto;
padding: 6px 7px;
font-size: 12px;
}
} }
.no-border-btn { .no-border-btn {
border: none; border: none;
@@ -177,4 +182,12 @@ export default {
} }
} }
} }
@media (max-width: 768.98px) {
.fc button {
height: 30px;
}
.fc-toolbar h2 {
font-size: 16px;
}
}
</style> </style>

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

@@ -1,6 +1,11 @@
<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"
:inline="true"
label-width="68px"
>
<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
@@ -21,7 +26,12 @@
/> />
</el-form-item> </el-form-item>
<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 checkinOptions" v-for="dict in checkinOptions"
:key="dict.dictValue" :key="dict.dictValue"
@@ -30,8 +40,8 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="考勤时间" prop="createTime"> <el-form-item label="考勤时间" prop="createTime">
<el-date-picker <el-date-picker
clearable clearable
size="small" size="small"
style="width: 200px" style="width: 200px"
@@ -42,67 +52,99 @@
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <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:checkindetail:add']"
v-hasPermi="['benyi:checkindetail:add']" >新增</el-button
>新增</el-button> >
</el-col> <!-- <el-button
<el-col :span="1.5">
<el-button
type="success" type="success"
icon="el-icon-edit" icon="el-icon-edit"
size="mini" size="mini"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['benyi:checkindetail:edit']" v-hasPermi="['benyi:checkindetail:edit']"
>修改</el-button> >修改</el-button> -->
</el-col> <el-button
<el-col :span="1.5"> type="danger"
<el-button icon="el-icon-delete"
type="danger" size="mini"
icon="el-icon-delete" :disabled="multiple"
size="mini" @click="handleDelete"
:disabled="multiple" v-hasPermi="['benyi:checkindetail:remove']"
@click="handleDelete" >删除</el-button
v-hasPermi="['benyi:checkindetail:remove']" >
>删除</el-button> <el-button
</el-col> type="warning"
<el-col :span="1.5"> icon="el-icon-download"
<el-button size="mini"
type="warning" @click="handleExport"
icon="el-icon-download" v-hasPermi="['benyi:checkindetail:export']"
size="mini" >导出</el-button
@click="handleExport" >
v-hasPermi="['benyi:checkindetail:export']" </div>
>导出</el-button>
</el-col>
</el-row>
<el-table v-loading="loading" :data="detailList" @selection-change="handleSelectionChange"> <el-table
<el-table-column type="selection" width="55" align="center" :selectable="checkSelectable" /> v-loading="loading"
:data="detailList"
@selection-change="handleSelectionChange"
>
<el-table-column
type="selection"
width="55"
align="center"
:selectable="checkSelectable"
/>
<!-- <el-table-column label="编号" align="center" prop="id" /> --> <!-- <el-table-column label="编号" align="center" prop="id" /> -->
<!-- <el-table-column label="学校编码" align="center" prop="schoolid" /> --> <!-- <el-table-column label="学校编码" align="center" prop="schoolid" /> -->
<el-table-column label="班级名称" align="center" prop="classid" :formatter="classFormat" /> <el-table-column
label="班级名称"
align="center"
prop="classid"
:formatter="classFormat"
/>
<!-- <el-table-column label="幼儿编码" align="center" prop="childid" /> --> <!-- <el-table-column label="幼儿编码" align="center" prop="childid" /> -->
<el-table-column label="幼儿姓名" align="center" prop="childname" /> <el-table-column label="幼儿姓名" align="center" prop="childname" />
<el-table-column label="出勤类型" align="center" prop="type" :formatter="typeFormat" /> <el-table-column
<el-table-column label="考勤时间" align="center" prop="createTime" width="180"> label="出勤类型"
align="center"
prop="type"
:formatter="typeFormat"
/>
<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" prop="createuserid" /> --> <!-- <el-table-column label="创建人" align="center" prop="createuserid" /> -->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column
label="操作"
align="center"
width="100"
class-name="small-padding fixed-width"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@@ -111,7 +153,8 @@
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['benyi:checkindetail:edit']" v-hasPermi="['benyi:checkindetail:edit']"
:disabled="!checkSelectable(scope.row)" :disabled="!checkSelectable(scope.row)"
>修改</el-button> >修改</el-button
>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
@@ -119,13 +162,14 @@
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['benyi:checkindetail:remove']" v-hasPermi="['benyi:checkindetail:remove']"
:disabled="!checkSelectable(scope.row)" :disabled="!checkSelectable(scope.row)"
>删除</el-button> >删除</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total > 0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@@ -133,7 +177,7 @@
/> />
<!-- 添加或修改幼儿考勤对话框 --> <!-- 添加或修改幼儿考勤对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" class="v-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="childname"> <el-form-item label="选择幼儿" prop="childname">
<el-checkbox <el-checkbox
@@ -141,15 +185,20 @@
v-model="checkAll" v-model="checkAll"
@change="handleCheckAllChange" @change="handleCheckAllChange"
:disabled="isable" :disabled="isable"
>全选</el-checkbox> >全选</el-checkbox
>
<div style="margin: 15px 0;"></div> <div style="margin: 15px 0;"></div>
<el-checkbox-group v-model="checkedChilds" @change="handlecheckedChildsChange"> <el-checkbox-group
v-model="checkedChilds"
@change="handlecheckedChildsChange"
>
<el-checkbox <el-checkbox
v-for="child in childs" v-for="child in childs"
:label="child.id" :label="child.id"
:key="child.id" :key="child.id"
:disabled="isable" :disabled="isable"
>{{child.name}}</el-checkbox> >{{ child.name }}</el-checkbox
>
</el-checkbox-group> </el-checkbox-group>
<el-input v-model="form.childname" v-if="false" /> <el-input v-model="form.childname" v-if="false" />
</el-form-item> </el-form-item>
@@ -460,4 +509,4 @@ export default {
} }
} }
}; };
</script> </script>

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

@@ -40,10 +40,10 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div ref="printMe"> <div ref="printMe" class="print-me">
<h2 style="text-align: center">{{ this.deptName }}班级儿童考勤表</h2> <h2 style="text-align: center">{{ this.deptName }}班级儿童考勤表</h2>
<h4 style="text-align: left"> <h4 style="text-align: left">
考勤月份：{{ this.month }} ------ 班级总数：{{ this.classcount }} ------ 考勤月份：{{ this.month }} ---- 班级总数：{{ this.classcount }} ----
幼儿总数：{{ this.chilidcount }} 幼儿总数：{{ this.chilidcount }}
</h4> </h4>
<el-table <el-table
@@ -398,4 +398,16 @@ export default {
}, },
}, },
}; };
</script> </script>
<style lang="scss" scoped>
.print-me {
@media (max-width: 768.98px) {
h2 {
font-size: 14px;
}
h4 {
font-size: 12px;
}
}
}
</style>

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

@@ -61,19 +61,16 @@
</el-form-item> </el-form-item>
</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:child:add']"
v-hasPermi="['benyi:child:add']" >新增</el-button
>新增</el-button >
> <!-- <el-button
</el-col>
<el-col :span="1.5">
<el-button
type="success" type="success"
icon="el-icon-edit" icon="el-icon-edit"
size="mini" size="mini"
@@ -81,57 +78,48 @@
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['benyi:child:edit']" v-hasPermi="['benyi:child:edit']"
>修改</el-button >修改</el-button
> > -->
</el-col> <el-button
<el-col :span="1.5"> type="danger"
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['benyi:child:remove']"
>删除</el-button
>
<el-button
type="warning"
icon="el-icon-download"
size="mini"
:disabled="multiple"
@click="handleTiaoban"
v-hasPermi="['benyi:child:edit']"
>调班</el-button
>
<el-button
type="info"
icon="el-icon-upload2"
size="mini"
@click="handleImport"
v-hasPermi="['benyi:child:import']"
>导入</el-button
>
<el-tooltip
effect="dark"
content="点我，可以复制链接发送给所有家长补填幼儿信息呦"
placement="top-start"
>
<el-button <el-button
type="danger" type="primary"
icon="el-icon-delete" icon="el-icon-document-copy"
size="mini" size="mini"
:disabled="multiple" @click="copy($event, inviteCode)"
@click="handleDelete" v-hasPermi="['benyi:child:add']"
v-hasPermi="['benyi:child:remove']" >家长填报链接</el-button
>删除</el-button
> >
</el-col> </el-tooltip>
<el-col :span="1.5"> </div>
<el-button
type="warning"
icon="el-icon-download"
size="mini"
:disabled="multiple"
@click="handleTiaoban"
v-hasPermi="['benyi:child:edit']"
>调班</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
type="info"
icon="el-icon-upload2"
size="mini"
@click="handleImport"
v-hasPermi="['benyi:child:import']"
>导入</el-button
>
</el-col>
<el-col :span="1.5">
<el-tooltip
effect="dark"
content="点我，可以复制链接发送给所有家长补填幼儿信息呦"
placement="top-start"
>
<el-button
type="primary"
icon="el-icon-document-copy"
size="mini"
@click="copy($event, inviteCode)"
v-hasPermi="['benyi:child:add']"
>家长填报链接</el-button
>
</el-tooltip>
</el-col>
</el-row>
<el-table <el-table
v-loading="loading" v-loading="loading"
@@ -148,7 +136,7 @@
:formatter="classFormat" :formatter="classFormat"
/> />
<el-table-column label="姓名" align="center" prop="name" /> <el-table-column label="姓名" align="center" prop="name" />
<el-table-column label="家长手机号码" align="center" prop="phone" /> <el-table-column label="家长手机号码" width="120" align="center" prop="phone" />
<el-table-column <el-table-column
label="性别" label="性别"
align="center" align="center"
@@ -193,6 +181,7 @@
<el-table-column <el-table-column
label="操作" label="操作"
align="center" align="center"
width="100"
class-name="small-padding fixed-width" class-name="small-padding fixed-width"
> >
<template slot-scope="scope"> <template slot-scope="scope">
@@ -225,7 +214,7 @@
/> />
<!-- 添加或修改幼儿信息对话框 --> <!-- 添加或修改幼儿信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body> <el-dialog :title="title" :visible.sync="open" class="big-dialog" append-to-body>
<el-tabs type="border-card"> <el-tabs type="border-card">
<el-tab-pane label="幼儿基础信息"> <el-tab-pane label="幼儿基础信息">
<el-row :gutter="15"> <el-row :gutter="15">
@@ -670,7 +659,7 @@ import {
addChild, addChild,
updateChild, updateChild,
updateChild_tb, updateChild_tb,
importTemplate, importTemplate
} from "@/api/benyi/child"; } from "@/api/benyi/child";
import { import {
listContactpeople, listContactpeople,
@@ -678,7 +667,7 @@ import {
getContactpeopleByChildId, getContactpeopleByChildId,
delContactpeople, delContactpeople,
addContactpeople, addContactpeople,
updateContactpeople, updateContactpeople
} from "@/api/benyi/contactpeople"; } from "@/api/benyi/contactpeople";
import { listClass } from "@/api/system/class"; import { listClass } from "@/api/system/class";
@@ -698,22 +687,22 @@ export default {
placeholders: { placeholders: {
province: "请选择省", province: "请选择省",
city: "请选择市", city: "请选择市",
area: "请选择区", area: "请选择区"
}, },
diglogForm: { diglogForm: {
province: null, province: null,
city: null, city: null,
area: null, area: null
}, },
diglogForm1: { diglogForm1: {
province: null, province: null,
city: null, city: null,
area: null, area: null
}, },
diglogForm2: { diglogForm2: {
province: null, province: null,
city: null, city: null,
area: null, area: null
}, },
// 连接内容 // 连接内容
inviteCode: "", inviteCode: "",
@@ -761,7 +750,7 @@ export default {
// 设置上传的请求头部 // 设置上传的请求头部
headers: { Authorization: "Bearer " + getToken() }, headers: { Authorization: "Bearer " + getToken() },
// 上传的地址 // 上传的地址
url: process.env.VUE_APP_BASE_API + "/benyi/child/importData", url: process.env.VUE_APP_BASE_API + "/benyi/child/importData"
}, },
// 查询参数 // 查询参数
queryParams: { queryParams: {
@@ -805,7 +794,7 @@ export default {
firstLanguage: undefined, firstLanguage: undefined,
seconderLanguage: undefined, seconderLanguage: undefined,
otherLanguage: undefined, otherLanguage: undefined,
createuserid: undefined, createuserid: undefined
}, },
// 表单参数 // 表单参数
form: {}, form: {},
@@ -816,44 +805,44 @@ export default {
// 表单校验 // 表单校验
rules: { rules: {
name: [ name: [
{ required: true, message: "幼儿姓名不能为空", trigger: "blur" }, { required: true, message: "幼儿姓名不能为空", trigger: "blur" }
], ],
phone: [ phone: [
{ required: true, message: "家长手机号码不能为空", trigger: "blur" }, { required: true, message: "家长手机号码不能为空", trigger: "blur" }
], ],
classid: [{ required: true, message: "班级不能为空", trigger: "blur" }], classid: [{ required: true, message: "班级不能为空", trigger: "blur" }]
}, },
rules_tb: { rules_tb: {
classid: [{ required: true, message: "班级不能为空", trigger: "blur" }], classid: [{ required: true, message: "班级不能为空", trigger: "blur" }]
}, }
}; };
}, },
created() { created() {
this.getList(); this.getList();
this.getClassList(); this.getClassList();
this.getDicts("sys_user_sex").then((response) => { this.getDicts("sys_user_sex").then(response => {
this.sexOptions = response.data; this.sexOptions = response.data;
}); });
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_dm_mz").then((response) => { this.getDicts("sys_dm_mz").then(response => {
this.mzOptions = response.data; this.mzOptions = 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_ryqd").then((response) => { this.getDicts("sys_dm_ryqd").then(response => {
this.sourceOptions = response.data; this.sourceOptions = response.data;
}); });
this.getDicts("sys_dm_jtgx").then((response) => { this.getDicts("sys_dm_jtgx").then(response => {
this.jtgxOptions = response.data; this.jtgxOptions = response.data;
}); });
this.getLink(); this.getLink();
}, },
components: { components: {
//省市区三级联动全局组件 //省市区三级联动全局组件
VDistpicker, VDistpicker
}, },
methods: { methods: {
/** 导入按钮操作 */ /** 导入按钮操作 */
@@ -863,27 +852,24 @@ export default {
}, },
// 链接内容 // 链接内容
getLink() { getLink() {
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;
this.inviteCode = this.inviteCode = "http://" + domain + "/benyi_child/child_preserve";
"http://" +
domain +
"/benyi_child/child_preserve";
}); });
}, },
// 给家长发送链接 // 给家长发送链接
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("手机权限不支持复制功能");
// 释放内存 // 释放内存
@@ -918,7 +904,7 @@ export default {
// return this.selectDictLabel(this.classOptions, row.classid); // return this.selectDictLabel(this.classOptions, row.classid);
var actions = []; var actions = [];
var datas = this.classOptions; var datas = this.classOptions;
Object.keys(datas).map((key) => { Object.keys(datas).map(key => {
if (datas[key].bjbh == "" + row.classid) { if (datas[key].bjbh == "" + row.classid) {
actions.push(datas[key].bjmc); actions.push(datas[key].bjmc);
return false; return false;
@@ -927,14 +913,14 @@ export default {
return actions.join(""); return actions.join("");
}, },
getClassList() { getClassList() {
listClass(null).then((response) => { listClass(null).then(response => {
this.classOptions = response.rows; this.classOptions = response.rows;
}); });
}, },
/** 查询幼儿信息列表 */ /** 查询幼儿信息列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listChild(this.queryParams).then((response) => { listChild(this.queryParams).then(response => {
this.childList = response.rows; this.childList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
@@ -993,7 +979,7 @@ export default {
seconderLanguage: undefined, seconderLanguage: undefined,
otherLanguage: undefined, otherLanguage: undefined,
createuserid: undefined, createuserid: undefined,
createTime: undefined, createTime: undefined
}; };
this.diglogForm.province = ""; this.diglogForm.province = "";
@@ -1029,7 +1015,7 @@ export default {
gmphone: undefined, gmphone: undefined,
gmaddress: undefined, gmaddress: undefined,
gmoffphone: undefined, gmoffphone: undefined,
createTime: undefined, createTime: undefined
}; };
this.resetForm("form_jhr"); this.resetForm("form_jhr");
}, },
@@ -1045,7 +1031,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;
}, },
@@ -1059,7 +1045,7 @@ export default {
async handleUpdate(row) { async handleUpdate(row) {
this.reset(); this.reset();
const id = row.id || this.ids; const id = row.id || this.ids;
await getChild(id).then((response) => { await getChild(id).then(response => {
this.form = response.data; this.form = response.data;
this.diglogForm.province = response.data.birthProvincename; this.diglogForm.province = response.data.birthProvincename;
@@ -1078,20 +1064,20 @@ export default {
this.title = "修改幼儿信息"; this.title = "修改幼儿信息";
//根据幼儿id获取监护人信息 //根据幼儿id获取监护人信息
getContactpeopleByChildId(this.form.id).then((res) => { getContactpeopleByChildId(this.form.id).then(res => {
// console.log("childid:" + this.form.id + ";jhr:" + res.data); // console.log("childid:" + this.form.id + ";jhr:" + res.data);
this.form_jhr = res.data; this.form_jhr = res.data;
}); });
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
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) {
updateChild(this.form).then((response) => { updateChild(this.form).then(response => {
if (response.code === 200) { if (response.code === 200) {
updateContactpeople(this.form_jhr).then((res) => { updateContactpeople(this.form_jhr).then(res => {
if (res.code === 200) { if (res.code === 200) {
this.msgSuccess("修改成功"); this.msgSuccess("修改成功");
this.open = false; this.open = false;
@@ -1101,11 +1087,11 @@ export default {
} }
}); });
} else { } else {
addChild(this.form).then((response) => { addChild(this.form).then(response => {
// console.log(response); // console.log(response);
if (response.code === 200) { if (response.code === 200) {
this.form_jhr.childid = response.data; this.form_jhr.childid = response.data;
addContactpeople(this.form_jhr).then((res) => { addContactpeople(this.form_jhr).then(res => {
this.msgSuccess("新增成功"); this.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
@@ -1117,11 +1103,11 @@ 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("调班成功");
this.open_tb = false; this.open_tb = false;
@@ -1147,17 +1133,17 @@ export default {
{ {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning"
} }
) )
.then(function () { .then(function() {
return delChild(ids); return delChild(ids);
}) })
.then(() => { .then(() => {
this.getList(); this.getList();
this.msgSuccess("删除成功"); this.msgSuccess("删除成功");
}) })
.catch(function () {}); .catch(function() {});
}, },
//所在省市区触发联动方法 //所在省市区触发联动方法
onSelected_brith(data) { onSelected_brith(data) {
@@ -1215,7 +1201,7 @@ export default {
}, },
/** 下载模板操作 */ /** 下载模板操作 */
importTemplate() { importTemplate() {
importTemplate().then((response) => { importTemplate().then(response => {
this.download(response.msg); this.download(response.msg);
}); });
}, },
@@ -1234,7 +1220,7 @@ export default {
// 提交上传文件 // 提交上传文件
submitFileForm() { submitFileForm() {
this.$refs.upload.submit(); this.$refs.upload.submit();
}, }
}, }
}; };
</script> </script>

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

@@ -1,6 +1,11 @@
<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"
:inline="true"
label-width="68px"
>
<el-form-item label="选择幼儿" prop="childid"> <el-form-item label="选择幼儿" prop="childid">
<el-select <el-select
v-model="queryParams.childid" v-model="queryParams.childid"
@@ -36,12 +41,20 @@
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <div class="mb8 btn-list">
<!-- <el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="primary" type="primary"
@@ -52,27 +65,25 @@
v-hasPermi="['benyi:contactpeople:add']" v-hasPermi="['benyi:contactpeople:add']"
>新增</el-button> >新增</el-button>
</el-col> --> </el-col> -->
<el-col :span="1.5"> <!-- <el-button
<el-button type="success"
type="success" icon="el-icon-edit"
icon="el-icon-edit" size="mini"
size="mini" :disabled="single"
:disabled="single" @click="handleUpdate"
@click="handleUpdate" v-hasPermi="['benyi:contactpeople:edit']"
v-hasPermi="['benyi:contactpeople:edit']" >修改</el-button
>修改</el-button> > -->
</el-col> <el-button
<el-col :span="1.5"> type="danger"
<el-button icon="el-icon-delete"
type="danger" size="mini"
icon="el-icon-delete" :disabled="multiple"
size="mini" @click="handleDelete"
:disabled="multiple" v-hasPermi="['benyi:contactpeople:remove']"
@click="handleDelete" >删除</el-button
v-hasPermi="['benyi:contactpeople:remove']" >
>删除</el-button> </div>
</el-col>
</el-row>
<el-table <el-table
v-loading="loading" v-loading="loading"
@@ -81,14 +92,24 @@
> >
<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="childid" :formatter="childFormat" /> <el-table-column
label="幼儿"
align="center"
prop="childid"
:formatter="childFormat"
/>
<el-table-column label="父亲姓名" align="center" prop="fathername" /> <el-table-column label="父亲姓名" align="center" prop="fathername" />
<el-table-column label="父亲联系电话" align="center" prop="fphone" /> <el-table-column label="父亲联系电话" width="120" align="center" prop="fphone" />
<el-table-column label="父亲办公电话" align="center" prop="foffphone" /> <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="母亲联系电话" align="center" prop="mphone" /> <el-table-column label="母亲联系电话" width="120" align="center" prop="mphone" />
<el-table-column label="母亲办公电话" align="center" prop="moffphone" /> <el-table-column label="母亲办公电话" width="120" align="center" prop="moffphone" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column
label="操作"
align="center"
width="100"
class-name="small-padding fixed-width"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@@ -96,20 +117,22 @@
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['benyi:contactpeople:edit']" v-hasPermi="['benyi:contactpeople: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:contactpeople:remove']" v-hasPermi="['benyi:contactpeople:remove']"
>删除</el-button> >删除</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total > 0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@@ -117,12 +140,16 @@
/> />
<!-- 添加或修改幼儿紧急情况联系人对话框 --> <!-- 添加或修改幼儿紧急情况联系人对话框 -->
<el-dialog :title="title" :visible.sync="open" width="800px" 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">
<el-form-item label="选择幼儿" prop="childid"> <el-form-item label="选择幼儿" prop="childid">
<el-select v-model="form.childid" placeholder="请输入选择幼儿" :disabled="true"> <el-select
v-model="form.childid"
placeholder="请输入选择幼儿"
:disabled="true"
>
<el-option <el-option
v-for="dict in childOptions" v-for="dict in childOptions"
:key="dict.id" :key="dict.id"
@@ -134,41 +161,62 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="父亲姓名" prop="fathername"> <el-form-item label="父亲姓名" prop="fathername">
<el-input v-model="form.fathername" placeholder="请输入父亲姓名" /> <el-input
v-model="form.fathername"
placeholder="请输入父亲姓名"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="联系电话" prop="fphone"> <el-form-item label="联系电话" prop="fphone">
<el-input v-model="form.fphone" placeholder="请输入父亲联系电话" /> <el-input
v-model="form.fphone"
placeholder="请输入父亲联系电话"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="办公电话" prop="foffphone"> <el-form-item label="办公电话" prop="foffphone">
<el-input v-model="form.foffphone" placeholder="请输入父亲办公电话" /> <el-input
v-model="form.foffphone"
placeholder="请输入父亲办公电话"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="15"> <el-row :gutter="15">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="母亲姓名" prop="mothername"> <el-form-item label="母亲姓名" prop="mothername">
<el-input v-model="form.mothername" placeholder="请输入母亲姓名" /> <el-input
v-model="form.mothername"
placeholder="请输入母亲姓名"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="联系电话" prop="mphone"> <el-form-item label="联系电话" prop="mphone">
<el-input v-model="form.mphone" placeholder="请输入母亲联系电话" /> <el-input
v-model="form.mphone"
placeholder="请输入母亲联系电话"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="办公电话" prop="moffphone"> <el-form-item label="办公电话" prop="moffphone">
<el-input v-model="form.moffphone" placeholder="请输入母亲办公电话" /> <el-input
v-model="form.moffphone"
placeholder="请输入母亲办公电话"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="15"> <el-row :gutter="15">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="其他联系人姓名" prop="grandfathername"> <el-form-item label="其他联系人姓名" prop="grandfathername">
<el-input v-model="form.grandfathername" placeholder="请输入其他联系人姓名" /> <el-input
v-model="form.grandfathername"
placeholder="请输入其他联系人姓名"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@@ -190,7 +238,10 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="办公电话" prop="gfoffphone"> <el-form-item label="办公电话" prop="gfoffphone">
<el-input v-model="form.gfoffphone" placeholder="请输入办公电话" /> <el-input
v-model="form.gfoffphone"
placeholder="请输入办公电话"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
@@ -202,7 +253,10 @@
<el-row :gutter="15"> <el-row :gutter="15">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="其他联系人姓名" prop="grandmothername"> <el-form-item label="其他联系人姓名" prop="grandmothername">
<el-input v-model="form.grandmothername" placeholder="请输入其他联系人姓名" /> <el-input
v-model="form.grandmothername"
placeholder="请输入其他联系人姓名"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@@ -224,7 +278,10 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="办公电话" prop="gmoffphone"> <el-form-item label="办公电话" prop="gmoffphone">
<el-input v-model="form.gmoffphone" placeholder="请输入办公电话" /> <el-input
v-model="form.gmoffphone"
placeholder="请输入办公电话"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
@@ -248,7 +305,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";
@@ -297,20 +354,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;
}); });
}, },
@@ -320,7 +377,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;
@@ -330,14 +387,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;
@@ -369,7 +426,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");
}, },
@@ -385,7 +442,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;
}, },
@@ -399,18 +456,18 @@ 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 = "修改幼儿紧急情况联系人";
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
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;
@@ -418,7 +475,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;
@@ -432,24 +489,20 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const ids = row.id || this.ids; const ids = row.id || this.ids;
this.$confirm( this.$confirm("是否确认删除幼儿紧急情况联系人数据项?", "警告", {
'是否确认删除幼儿紧急情况联系人数据项?', confirmButtonText: "确定",
"警告", cancelButtonText: "取消",
{ type: "warning"
confirmButtonText: "确定", })
cancelButtonText: "取消", .then(function() {
type: "warning",
}
)
.then(function () {
return delContactpeople(ids); return delContactpeople(ids);
}) })
.then(() => { .then(() => {
this.getList(); this.getList();
this.msgSuccess("删除成功"); this.msgSuccess("删除成功");
}) })
.catch(function () {}); .catch(function() {});
}, }
}, }
}; };
</script> </script>

133
ruoyi-ui/src/views/benyi/dayflow/task.vue
View File

@@ -1,6 +1,11 @@
<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"
:inline="true"
label-width="68px"
>
<el-form-item label="流程名称" prop="detailId"> <el-form-item label="流程名称" prop="detailId">
<el-select v-model="queryParams.detailId" size="small"> <el-select v-model="queryParams.detailId" size="small">
<el-option <el-option
@@ -21,49 +26,64 @@
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <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:dayflowtask:add']"
v-hasPermi="['benyi:dayflowtask:add']" >新增</el-button
>新增</el-button> >
</el-col> <el-button
<el-col :span="1.5"> type="success"
<el-button icon="el-icon-edit"
type="success" size="mini"
icon="el-icon-edit" :disabled="single"
size="mini" @click="handleUpdate"
:disabled="single" v-hasPermi="['benyi:dayflowtask:edit']"
@click="handleUpdate" >修改</el-button
v-hasPermi="['benyi:dayflowtask:edit']" >
>修改</el-button> <el-button
</el-col> type="danger"
<el-col :span="1.5"> icon="el-icon-delete"
<el-button size="mini"
type="danger" :disabled="multiple"
icon="el-icon-delete" @click="handleDelete"
size="mini" v-hasPermi="['benyi:dayflowtask:remove']"
:disabled="multiple" >删除</el-button
@click="handleDelete" >
v-hasPermi="['benyi:dayflowtask:remove']" </div>
>删除</el-button>
</el-col>
</el-row>
<el-table v-loading="loading" :data="dayflowtaskList" @selection-change="handleSelectionChange"> <el-table
v-loading="loading"
:data="dayflowtaskList"
@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" :show-overflow-tooltip="true"> <el-table-column
label="任务名称"
align="center"
:show-overflow-tooltip="true"
>
<template slot-scope="scope"> <template slot-scope="scope">
<router-link <router-link
:to="'/dayflow/dayflowmanger/dayflowtask/standard/' + scope.row.code" :to="
'/dayflow/dayflowmanger/dayflowtask/standard/' + scope.row.code
"
class="link-dayflow" class="link-dayflow"
> >
<span>{{ scope.row.taskLable }}</span> <span>{{ scope.row.taskLable }}</span>
@@ -77,10 +97,19 @@
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column label="任务排序" align="center" prop="taskSort" /> <el-table-column label="任务排序" align="center" prop="taskSort" />
<el-table-column label="标准数量" align="center" prop="standardCount" /> <el-table-column label="标准数量" align="center" prop="standardCount" />
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="创建时间" align="center" prop="createtime" /> <el-table-column
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> label="创建时间"
align="center"
prop="createtime"
width="160"
/>
<el-table-column
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"
@@ -88,20 +117,22 @@
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['benyi:dayflowtask:edit']" v-hasPermi="['benyi:dayflowtask: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:dayflowtask:remove']" v-hasPermi="['benyi:dayflowtask:remove']"
>删除</el-button> >删除</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total > 0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@@ -125,10 +156,18 @@
<el-input v-model="form.taskLable" placeholder="请输入任务名称" /> <el-input v-model="form.taskLable" placeholder="请输入任务名称" />
</el-form-item> </el-form-item>
<el-form-item label="任务解读" prop="taskContent"> <el-form-item label="任务解读" prop="taskContent">
<el-input v-model="form.taskContent" type="textarea" placeholder="请输入内容" /> <el-input
v-model="form.taskContent"
type="textarea"
placeholder="请输入内容"
/>
</el-form-item> </el-form-item>
<el-form-item label="任务排序" prop="taskSort"> <el-form-item label="任务排序" prop="taskSort">
<el-input-number v-model="form.taskSort" controls-position="right" :min="0" /> <el-input-number
v-model="form.taskSort"
controls-position="right"
:min="0"
/>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" /> <el-input v-model="form.remark" placeholder="请输入备注" />
@@ -195,7 +234,7 @@ export default {
{ required: true, message: "任务名称(标签)不能为空", trigger: "blur" } { required: true, message: "任务名称(标签)不能为空", trigger: "blur" }
], ],
taskSort: [ taskSort: [
{ required: true, message: "任务排序不能为空", trigger: "blur" } { required: true, message: "任务排序不能为空", trigger: "blur" }
] ]
} }
}; };
@@ -339,4 +378,4 @@ export default {
} }
} }
}; };
</script> </script>

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

@@ -47,46 +47,40 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <div class="mb8 btn-list">
<el-col :span="1.5"> <el-tooltip
<el-tooltip effect="dark"
effect="dark" content="点我，可以复制内容发送给家长填报《入园体验申请》呦"
content="点我，可以复制内容发送给家长填报《入园体验申请》呦" placement="top-start"
placement="top-start" >
>
<el-button
type="primary"
icon="el-icon-plus"
size="mini"
@click="copy($event, inviteCode)"
v-hasPermi="['benyi:experience:add']"
>一键复制</el-button
>
</el-tooltip>
</el-col>
<el-col :span="1.5">
<el-button <el-button
type="success" type="primary"
icon="el-icon-edit" icon="el-icon-plus"
size="mini" size="mini"
:disabled="single" @click="copy($event, inviteCode)"
@click="handleUpdate" v-hasPermi="['benyi:experience:add']"
v-hasPermi="['benyi:experience:edit']" >一键复制</el-button
>回复</el-button
> >
</el-col> </el-tooltip>
<el-col :span="1.5"> <el-button
<el-button type="success"
type="danger" icon="el-icon-edit"
icon="el-icon-delete" size="mini"
size="mini" :disabled="single"
:disabled="multiple" @click="handleUpdate"
@click="handleDelete" v-hasPermi="['benyi:experience:edit']"
v-hasPermi="['benyi:experience:remove']" >回复</el-button
>删除</el-button >
> <el-button
</el-col> type="danger"
</el-row> icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['benyi:experience:remove']"
>删除</el-button
>
</div>
<el-table <el-table
v-loading="loading" v-loading="loading"
@@ -171,7 +165,7 @@
/> />
<!-- 添加或修改入班体验申请对话框 --> <!-- 添加或修改入班体验申请对话框 -->
<el-dialog :title="title" :visible.sync="open" width="800px" 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">
@@ -344,7 +338,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";
@@ -398,73 +392,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;
@@ -481,7 +475,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;
@@ -500,7 +494,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;
@@ -531,7 +525,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");
}, },
@@ -547,7 +541,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;
}, },
@@ -559,14 +553,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("手机权限不支持复制功能");
// 释放内存 // 释放内存
@@ -580,7 +574,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 = "修改入班体验申请";
@@ -596,11 +590,11 @@ 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;
@@ -608,7 +602,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;
@@ -628,18 +622,18 @@ export default {
{ {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning"
} }
) )
.then(function () { .then(function() {
return delExperience(ids); return delExperience(ids);
}) })
.then(() => { .then(() => {
this.getList(); this.getList();
this.msgSuccess("删除成功"); this.msgSuccess("删除成功");
}) })
.catch(function () {}); .catch(function() {});
}, }
}, }
}; };
</script> </script>

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

@@ -1,6 +1,11 @@
<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"
: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"
@@ -11,29 +16,49 @@
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <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:halfdayplan:add']"
v-hasPermi="['benyi:halfdayplan:add']" >新增</el-button
>新增</el-button> >
</el-col> </div>
</el-row>
<el-table v-loading="loading" :data="halfdayplanList" @selection-change="handleSelectionChange"> <el-table
v-loading="loading"
:data="halfdayplanList"
@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 label="标题" align="center" prop="title" />
<el-table-column label="类型" align="center" prop="type" :formatter="typeFormat" /> <el-table-column
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> label="类型"
align="center"
prop="type"
:formatter="typeFormat"
/>
<el-table-column
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"
@@ -42,7 +67,8 @@
@click="handleCopy(scope.row)" @click="handleCopy(scope.row)"
v-hasPermi="['benyi:halfdayplan:edit']" v-hasPermi="['benyi:halfdayplan:edit']"
v-show="!selectable(scope.row)" v-show="!selectable(scope.row)"
>复制</el-button> >复制</el-button
>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
@@ -50,7 +76,8 @@
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['benyi:halfdayplan:edit']" v-hasPermi="['benyi:halfdayplan:edit']"
v-show="selectable(scope.row)" v-show="selectable(scope.row)"
>修改</el-button> >修改</el-button
>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
@@ -58,20 +85,22 @@
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['benyi:halfdayplan:remove']" v-hasPermi="['benyi:halfdayplan:remove']"
v-show="selectable(scope.row)" v-show="selectable(scope.row)"
>删除</el-button> >删除</el-button
>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-view" icon="el-icon-view"
@click="handleView(scope.row,scope.index)" @click="handleView(scope.row, scope.index)"
v-hasPermi="['benyi:halfdayplan:query']" v-hasPermi="['benyi:halfdayplan:query']"
>详细</el-button> >详细</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total > 0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@@ -79,7 +108,7 @@
/> />
<!-- 添加或修改入园半日体验计划对话框 --> <!-- 添加或修改入园半日体验计划对话框 -->
<el-dialog :title="title" :visible.sync="open" width="800px" 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="请输入标题" />
@@ -89,7 +118,9 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" v-show="isshow" @click="submitForm">确 定</el-button> <el-button type="primary" v-show="isshow" @click="submitForm"
>确 定</el-button
>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
@@ -103,7 +134,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";
@@ -111,7 +142,7 @@ import Editor from "@/components/Editor";
export default { export default {
name: "Halfdayplan", name: "Halfdayplan",
components: { components: {
Editor, Editor
}, },
data() { data() {
return { return {
@@ -141,20 +172,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;
}); });
}, },
@@ -174,7 +205,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;
@@ -193,7 +224,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");
}, },
@@ -209,7 +240,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;
}, },
@@ -217,7 +248,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 = "入园半日体验计划详情";
@@ -235,7 +266,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 = "修改入园半日体验计划";
@@ -243,11 +274,11 @@ 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;
@@ -255,7 +286,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;
@@ -275,17 +306,17 @@ export default {
{ {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning"
} }
) )
.then(function () { .then(function() {
return delHalfdayplan(ids); return delHalfdayplan(ids);
}) })
.then(() => { .then(() => {
this.getList(); this.getList();
this.msgSuccess("删除成功"); this.msgSuccess("删除成功");
}) })
.catch(function () {}); .catch(function() {});
}, },
/** 复制按钮操作 */ /** 复制按钮操作 */
handleCopy(row) { handleCopy(row) {
@@ -296,18 +327,18 @@ export default {
{ {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning"
} }
) )
.then(function () { .then(function() {
return copyHalfdayplan(id); return copyHalfdayplan(id);
}) })
.then(() => { .then(() => {
this.getList(); this.getList();
this.msgSuccess("复制成功"); this.msgSuccess("复制成功");
}) })
.catch(function () {}); .catch(function() {});
}, }
}, }
}; };
</script> </script>

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

@@ -26,7 +26,7 @@
<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"
@@ -94,19 +94,16 @@
</el-form-item> </el-form-item>
</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:healthcheck:add']"
v-hasPermi="['benyi:healthcheck:add']" >新增</el-button
>新增</el-button >
> <!-- <el-button
</el-col>
<el-col :span="1.5">
<el-button
type="success" type="success"
icon="el-icon-edit" icon="el-icon-edit"
size="mini" size="mini"
@@ -114,19 +111,16 @@
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['benyi:healthcheck:edit']" v-hasPermi="['benyi:healthcheck:edit']"
>修改</el-button >修改</el-button
> > -->
</el-col> <el-button
<el-col :span="1.5"> type="danger"
<el-button icon="el-icon-delete"
type="danger" size="mini"
icon="el-icon-delete" :disabled="multiple"
size="mini" @click="handleDelete"
:disabled="multiple" v-hasPermi="['benyi:healthcheck:remove']"
@click="handleDelete" >删除</el-button
v-hasPermi="['benyi:healthcheck:remove']" >
>删除</el-button
>
</el-col>
<!-- <el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"
@@ -137,7 +131,7 @@
>导出</el-button >导出</el-button
> >
</el-col> --> </el-col> -->
</el-row> </div>
<el-table <el-table
v-loading="loading" v-loading="loading"
@@ -198,6 +192,7 @@
<el-table-column <el-table-column
label="操作" label="操作"
align="center" align="center"
width="100"
class-name="small-padding fixed-width" class-name="small-padding fixed-width"
> >
<template slot-scope="scope"> <template slot-scope="scope">
@@ -230,7 +225,7 @@
/> />
<!-- 添加或修改儿童常规体检记录对话框 --> <!-- 添加或修改儿童常规体检记录对话框 -->
<el-dialog :title="title" :visible.sync="open" width="800px" 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">
@@ -254,7 +249,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"
@@ -410,7 +405,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";
@@ -469,7 +464,7 @@ export default {
heightAssessment: undefined, heightAssessment: undefined,
totalAssessment: undefined, totalAssessment: undefined,
createtime: undefined, createtime: undefined,
createuser: undefined, createuser: undefined
}, },
// 表单参数 // 表单参数
form: {}, form: {},
@@ -477,47 +472,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;
}); });
}, },
@@ -525,14 +520,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;
@@ -540,7 +535,7 @@ export default {
}, },
// 查询所有班级信息 // 查询所有班级信息
getclassinfo() { getclassinfo() {
listClass(null).then((response) => { listClass(null).then(response => {
this.classInfoOptions = response.rows; this.classInfoOptions = response.rows;
}); });
}, },
@@ -600,7 +595,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");
}, },
@@ -616,7 +611,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;
}, },
@@ -630,18 +625,18 @@ 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 = "修改儿童常规体检记录";
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
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;
@@ -649,7 +644,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;
@@ -666,17 +661,17 @@ export default {
this.$confirm("是否确认删除儿童常规体检记录数据项?", "警告", { this.$confirm("是否确认删除儿童常规体检记录数据项?", "警告", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning"
}) })
.then(function () { .then(function() {
return delHealthcheck(ids); return delHealthcheck(ids);
}) })
.then(() => { .then(() => {
this.getList(); this.getList();
this.msgSuccess("删除成功"); this.msgSuccess("删除成功");
}) })
.catch(function () {}); .catch(function() {});
}, }
// /** 导出按钮操作 */ // /** 导出按钮操作 */
// handleExport() { // handleExport() {
// const queryParams = this.queryParams; // const queryParams = this.queryParams;
@@ -693,6 +688,6 @@ export default {
// }) // })
// .catch(function () {}); // .catch(function () {});
// }, // },
}, }
}; };
</script> </script>

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

@@ -1,6 +1,11 @@
<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"
:inline="true"
label-width="68px"
>
<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
@@ -22,48 +27,67 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <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:learndevelopmentfamily:add']"
v-hasPermi="['benyi:learndevelopmentfamily:add']" >新增</el-button
>新增</el-button> >
</el-col> <!-- <el-button
<el-col :span="1.5"> type="success"
<el-button icon="el-icon-edit"
type="success" size="mini"
icon="el-icon-edit" :disabled="single"
size="mini" @click="handleUpdate"
:disabled="single" v-hasPermi="['benyi:learndevelopmentfamily:edit']"
@click="handleUpdate" >修改</el-button
v-hasPermi="['benyi:learndevelopmentfamily:edit']" > -->
>修改</el-button> <el-button
</el-col> type="danger"
<el-col :span="1.5"> icon="el-icon-delete"
<el-button size="mini"
type="danger" :disabled="multiple"
icon="el-icon-delete" @click="handleDelete"
size="mini" v-hasPermi="['benyi:learndevelopmentfamily:remove']"
:disabled="multiple" >删除</el-button
@click="handleDelete" >
v-hasPermi="['benyi:learndevelopmentfamily:remove']" </div>
>删除</el-button>
</el-col>
</el-row>
<el-table v-loading="loading" :data="familyList" @selection-change="handleSelectionChange"> <el-table
v-loading="loading"
:data="familyList"
@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="childid" :formatter="childFormat" /> <el-table-column
<el-table-column label="学年学期" align="center" prop="xnxq" :formatter="xnxqFormat" /> label="幼儿"
align="center"
prop="childid"
:formatter="childFormat"
/>
<el-table-column
label="学年学期"
align="center"
prop="xnxq"
:formatter="xnxqFormat"
/>
<!-- <el-table-column label="作品照片" align="center" prop="zpimgs" /> <!-- <el-table-column label="作品照片" align="center" prop="zpimgs" />
<el-table-column label="作品照片备注" align="center" prop="zpimgremarks" /> <el-table-column label="作品照片备注" align="center" prop="zpimgremarks" />
<el-table-column label="生活照片" align="center" prop="shimgs" /> <el-table-column label="生活照片" align="center" prop="shimgs" />
@@ -73,7 +97,12 @@
<el-table-column label="教师评语" align="center" prop="jspy" /> <el-table-column label="教师评语" align="center" prop="jspy" />
<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 label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column
label="操作"
align="center"
width="100"
class-name="small-padding fixed-width"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@@ -81,20 +110,22 @@
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['benyi:learndevelopmentfamily:edit']" v-hasPermi="['benyi:learndevelopmentfamily: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:learndevelopmentfamily:remove']" v-hasPermi="['benyi:learndevelopmentfamily:remove']"
>删除</el-button> >删除</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total > 0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@@ -102,7 +133,7 @@
/> />
<!-- 添加或修改儿童学习与发展档案（家长）对话框 --> <!-- 添加或修改儿童学习与发展档案（家长）对话框 -->
<el-dialog :title="title" :visible.sync="open" width="800px" 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">
@@ -136,7 +167,11 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注" prop="zpimgremarks"> <el-form-item label="备注" prop="zpimgremarks">
<el-input v-model="form.zpimgremarks" type="textarea" placeholder="请输入作品照片备注" /> <el-input
v-model="form.zpimgremarks"
type="textarea"
placeholder="请输入作品照片备注"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
@@ -146,7 +181,11 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注" prop="shimgsremarks"> <el-form-item label="备注" prop="shimgsremarks">
<el-input v-model="form.shimgsremarks" type="textarea" placeholder="请输入生活照片备注" /> <el-input
v-model="form.shimgsremarks"
type="textarea"
placeholder="请输入生活照片备注"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
@@ -156,7 +195,11 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注" prop="yqsjremarks"> <el-form-item label="备注" prop="yqsjremarks">
<el-input v-model="form.yqsjremarks" type="textarea" placeholder="请输入有趣事件备注" /> <el-input
v-model="form.yqsjremarks"
type="textarea"
placeholder="请输入有趣事件备注"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
@@ -166,7 +209,11 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注" prop="jspyremarks"> <el-form-item label="备注" prop="jspyremarks">
<el-input v-model="form.jspyremarks" type="textarea" placeholder="请输入教师评语备注" /> <el-input
v-model="form.jspyremarks"
type="textarea"
placeholder="请输入教师评语备注"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-form> </el-form>
@@ -185,7 +232,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";
@@ -195,7 +242,7 @@ import Editor from "@/components/Editor";
export default { export default {
name: "Family", name: "Family",
components: { components: {
Editor, Editor
}, },
data() { data() {
return { return {
@@ -233,23 +280,21 @@ 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: [ xnxq: [{ required: true, message: "学年学期不能为空", trigger: "blur" }]
{ 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;
}); });
}, },
@@ -259,7 +304,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;
@@ -273,14 +318,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;
@@ -306,7 +351,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");
}, },
@@ -322,7 +367,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;
}, },
@@ -336,18 +381,18 @@ 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 = "修改儿童学习与发展档案（家长）";
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
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;
@@ -355,7 +400,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;
@@ -375,18 +420,18 @@ export default {
{ {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning"
} }
) )
.then(function () { .then(function() {
return delFamily(ids); return delFamily(ids);
}) })
.then(() => { .then(() => {
this.getList(); this.getList();
this.msgSuccess("删除成功"); this.msgSuccess("删除成功");
}) })
.catch(function () {}); .catch(function() {});
}, }
}, }
}; };
</script> </script>

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

@@ -1,6 +1,11 @@
<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"
:inline="true"
label-width="68px"
>
<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
@@ -22,48 +27,66 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <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:learndevelopmentteacher:add']"
v-hasPermi="['benyi:learndevelopmentteacher:add']" >新增</el-button
>新增</el-button> >
</el-col> <!-- <el-button
<el-col :span="1.5">
<el-button
type="success" type="success"
icon="el-icon-edit" icon="el-icon-edit"
size="mini" size="mini"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['benyi:learndevelopmentteacher:edit']" v-hasPermi="['benyi:learndevelopmentteacher:edit']"
>修改</el-button> >修改</el-button> -->
</el-col> <el-button
<el-col :span="1.5"> type="danger"
<el-button icon="el-icon-delete"
type="danger" size="mini"
icon="el-icon-delete" :disabled="multiple"
size="mini" @click="handleDelete"
:disabled="multiple" v-hasPermi="['benyi:learndevelopmentteacher:remove']"
@click="handleDelete" >删除</el-button
v-hasPermi="['benyi:learndevelopmentteacher:remove']" >
>删除</el-button> </div>
</el-col>
</el-row>
<el-table v-loading="loading" :data="teacherList" @selection-change="handleSelectionChange"> <el-table
v-loading="loading"
:data="teacherList"
@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="childid" :formatter="childFormat" /> <el-table-column
<el-table-column label="学年学期" align="center" prop="xnxq" :formatter="xnxqFormat" /> label="幼儿"
align="center"
prop="childid"
:formatter="childFormat"
/>
<el-table-column
label="学年学期"
align="center"
prop="xnxq"
:formatter="xnxqFormat"
/>
<!-- <el-table-column label="观察记录" align="center" prop="gcjl" /> <!-- <el-table-column label="观察记录" align="center" prop="gcjl" />
<el-table-column label="观察记录备注" align="center" prop="gcjlremarks" /> <el-table-column label="观察记录备注" align="center" prop="gcjlremarks" />
<el-table-column label="问题与方案" align="center" prop="wtyfa" /> <el-table-column label="问题与方案" align="center" prop="wtyfa" />
@@ -73,7 +96,12 @@
<el-table-column label="教育计划" align="center" prop="jyjh" /> <el-table-column label="教育计划" align="center" prop="jyjh" />
<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 label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column
label="操作"
align="center"
width="100"
class-name="small-padding fixed-width"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@@ -81,20 +109,22 @@
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['benyi:learndevelopmentteacher:edit']" v-hasPermi="['benyi:learndevelopmentteacher: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:learndevelopmentteacher:remove']" v-hasPermi="['benyi:learndevelopmentteacher:remove']"
>删除</el-button> >删除</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total > 0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@@ -102,7 +132,7 @@
/> />
<!-- 添加或修改儿童学习与发展档案（教师）对话框 --> <!-- 添加或修改儿童学习与发展档案（教师）对话框 -->
<el-dialog :title="title" :visible.sync="open" width="800px" 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">
@@ -136,7 +166,11 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注" prop="gcjlremarks"> <el-form-item label="备注" prop="gcjlremarks">
<el-input v-model="form.gcjlremarks" type="textarea" placeholder="请输入观察记录备注" /> <el-input
v-model="form.gcjlremarks"
type="textarea"
placeholder="请输入观察记录备注"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
@@ -146,7 +180,11 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注" prop="wtyfaremarks"> <el-form-item label="备注" prop="wtyfaremarks">
<el-input v-model="form.wtyfaremarks" type="textarea" placeholder="请输入问题与方案备注" /> <el-input
v-model="form.wtyfaremarks"
type="textarea"
placeholder="请输入问题与方案备注"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
@@ -156,7 +194,11 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注" prop="pgjgremarks"> <el-form-item label="备注" prop="pgjgremarks">
<el-input v-model="form.pgjgremarks" type="textarea" placeholder="请输入评估结果备注" /> <el-input
v-model="form.pgjgremarks"
type="textarea"
placeholder="请输入评估结果备注"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
@@ -166,7 +208,11 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注" prop="jyjhremarks"> <el-form-item label="备注" prop="jyjhremarks">
<el-input v-model="form.jyjhremarks" type="textarea" placeholder="请输入教育计划备注" /> <el-input
v-model="form.jyjhremarks"
type="textarea"
placeholder="请输入教育计划备注"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-form> </el-form>
@@ -185,7 +231,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";
@@ -195,7 +241,7 @@ import Editor from "@/components/Editor";
export default { export default {
name: "Teacher", name: "Teacher",
components: { components: {
Editor, Editor
}, },
data() { data() {
return { return {
@@ -233,23 +279,21 @@ 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: [ xnxq: [{ required: true, message: "学年学期不能为空", trigger: "blur" }]
{ 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;
}); });
}, },
@@ -259,7 +303,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;
@@ -273,14 +317,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;
@@ -306,7 +350,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");
}, },
@@ -322,7 +366,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;
}, },
@@ -336,18 +380,18 @@ 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 = "修改儿童学习与发展档案（教师）";
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
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;
@@ -355,7 +399,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;
@@ -375,18 +419,18 @@ export default {
{ {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning"
} }
) )
.then(function () { .then(function() {
return delTeacher(ids); return delTeacher(ids);
}) })
.then(() => { .then(() => {
this.getList(); this.getList();
this.msgSuccess("删除成功"); this.msgSuccess("删除成功");
}) })
.catch(function () {}); .catch(function() {});
}, }
}, }
}; };
</script> </script>

127
ruoyi-ui/src/views/benyi/mathtermplanapproval/index.vue
View File

@@ -60,26 +60,35 @@
</el-form-item> </el-form-item>
</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="success"
type="success" icon="el-icon-edit"
icon="el-icon-edit" size="mini"
size="mini" :disabled="single"
:disabled="single" @click="handleUpdate"
@click="handleUpdate" v-hasPermi="['benyi:mathtermplan:edit']"
v-hasPermi="['benyi:mathtermplan:edit']" >审批</el-button
>审批</el-button> >
</el-col> </div>
</el-row>
<el-table <el-table
v-loading="loading" v-loading="loading"
:data="mathtermplanList" :data="mathtermplanList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" :selectable="isShow" /> <el-table-column
<el-table-column label="班级名称" align="center" prop="classid" :formatter="classFormat"/> type="selection"
width="55"
align="center"
:selectable="isShow"
/>
<el-table-column
label="班级名称"
align="center"
prop="classid"
:formatter="classFormat"
/>
<el-table-column <el-table-column
label="计划名称" label="计划名称"
align="center" align="center"
@@ -141,14 +150,16 @@
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['benyi:mathtermplan:edit']" v-hasPermi="['benyi:mathtermplan:edit']"
v-show="isShow(scope.row)" v-show="isShow(scope.row)"
>审批</el-button> >审批</el-button
>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-view" icon="el-icon-view"
@click="handleView(scope.row)" @click="handleView(scope.row)"
v-hasPermi="['benyi:mathtermplan:query']" v-hasPermi="['benyi:mathtermplan:query']"
>预览</el-button> >预览</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -162,7 +173,7 @@
/> />
<!-- 添加或修改游戏数学学期计划对话框 --> <!-- 添加或修改游戏数学学期计划对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" class="v-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="startmonth"> <el-form-item label="月份" prop="startmonth">
<el-date-picker <el-date-picker
@@ -176,7 +187,11 @@
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="学年学期" prop="xnxq"> <el-form-item label="学年学期" prop="xnxq">
<el-select v-model="form.xnxq" placeholder="请选择学年学期" :disabled="true"> <el-select
v-model="form.xnxq"
placeholder="请选择学年学期"
:disabled="true"
>
<el-option <el-option
v-for="dict in xnxqOptions" v-for="dict in xnxqOptions"
:key="dict.dictValue" :key="dict.dictValue"
@@ -186,7 +201,12 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入备注" :disabled="true" /> <el-input
v-model="form.remark"
type="textarea"
placeholder="请输入备注"
:disabled="true"
/>
</el-form-item> </el-form-item>
<el-form-item label="审批意见" prop="status"> <el-form-item label="审批意见" prop="status">
<el-radio-group v-model="form.status"> <el-radio-group v-model="form.status">
@@ -195,7 +215,11 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="审批建议" prop="spyj"> <el-form-item label="审批建议" prop="spyj">
<el-input v-model="form.spyj" type="textarea" placeholder="请输入审核建议" /> <el-input
v-model="form.spyj"
type="textarea"
placeholder="请输入审核建议"
/>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@@ -213,7 +237,7 @@ import {
delMathtermplan, delMathtermplan,
addMathtermplan, addMathtermplan,
updateMathtermplan, updateMathtermplan,
checkTermplan, checkTermplan
} from "@/api/benyi/mathtermplan"; } from "@/api/benyi/mathtermplan";
import { listClass } from "@/api/system/class"; import { listClass } from "@/api/system/class";
@@ -257,25 +281,23 @@ export default {
status: "1", status: "1",
spr: undefined, spr: undefined,
sptime: undefined, sptime: undefined,
createuserid: undefined, createuserid: undefined
}, },
// 表单参数 // 表单参数
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
status: [ status: [{ required: true, message: "状态不能为空", trigger: "blur" }]
{ required: true, message: "状态不能为空", trigger: "blur" }, }
],
},
}; };
}, },
created() { created() {
this.getClassList(); this.getClassList();
this.getList(); this.getList();
this.getDicts("sys_xnxq").then((response) => { this.getDicts("sys_xnxq").then(response => {
this.xnxqOptions = response.data; this.xnxqOptions = response.data;
}); });
this.getDicts("sys_dm_planweekstatus").then((response) => { this.getDicts("sys_dm_planweekstatus").then(response => {
this.statusOptions = response.data; this.statusOptions = response.data;
}); });
}, },
@@ -290,14 +312,14 @@ export default {
}, },
// 查询班级列表 // 查询班级列表
getClassList() { getClassList() {
listClass(null).then((response) => { listClass(null).then(response => {
this.classOptions = response.rows; this.classOptions = response.rows;
}); });
}, },
/** 查询游戏数学学期计划列表 */ /** 查询游戏数学学期计划列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listMathtermplan(this.queryParams).then((response) => { listMathtermplan(this.queryParams).then(response => {
this.mathtermplanList = response.rows; this.mathtermplanList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
@@ -307,7 +329,7 @@ export default {
classFormat(row, column) { classFormat(row, column) {
var actions = []; var actions = [];
var datas = this.classOptions; var datas = this.classOptions;
Object.keys(datas).map((key) => { Object.keys(datas).map(key => {
if (datas[key].bjbh == "" + row.classid) { if (datas[key].bjbh == "" + row.classid) {
actions.push(datas[key].bjmc); actions.push(datas[key].bjmc);
return false; return false;
@@ -343,7 +365,7 @@ export default {
sptime: undefined, sptime: undefined,
remark: undefined, remark: undefined,
createuserid: undefined, createuserid: undefined,
createTime: undefined, createTime: undefined
}; };
this.resetForm("form"); this.resetForm("form");
}, },
@@ -359,16 +381,16 @@ 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;
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
const id = row.id || this.ids; const id = row.id || this.ids;
getMathtermplan(id).then((response) => { getMathtermplan(id).then(response => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改游戏数学学期计划"; this.title = "修改游戏数学学期计划";
@@ -379,53 +401,48 @@ export default {
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm: function () { submitForm: function() {
this.$refs["form"].validate((valid) => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
const time = this.form.startmonth; const time = this.form.startmonth;
this.form.startmonth = time[0]; this.form.startmonth = time[0];
this.form.endmonth = time[1]; this.form.endmonth = time[1];
if (this.form.id != undefined) { if (this.form.id != undefined) {
updateMathtermplan(this.form).then((response) => { updateMathtermplan(this.form).then(response => {
if (response.code === 200) { if (response.code === 200) {
this.msgSuccess("审批成功"); this.msgSuccess("审批成功");
this.open = false; this.open = false;
this.getList(); this.getList();
} }
}); });
} }
} }
}); });
}, },
/** 提交按钮操作 */ /** 提交按钮操作 */
handleCheck(row) { handleCheck(row) {
const id = row.id; const id = row.id;
this.$confirm( this.$confirm("是否确认提交游戏数学学期计划?提交后数据无法维护", "警告", {
"是否确认提交游戏数学学期计划?提交后数据无法维护", confirmButtonText: "确定",
"警告", cancelButtonText: "取消",
{ type: "warning"
confirmButtonText: "确定", })
cancelButtonText: "取消", .then(function() {
type: "warning",
}
)
.then(function () {
return checkTermplan(id); return checkTermplan(id);
}) })
.then(() => { .then(() => {
this.getList(); this.getList();
this.msgSuccess("提交成功"); this.msgSuccess("提交成功");
}) })
.catch(function () {}); .catch(function() {});
}, },
/** 预览按钮操作 */ /** 预览按钮操作 */
handleView(row) { handleView(row) {
const id = row.id; const id = row.id;
this.$router.push({ this.$router.push({
path: "/benyi_course/mathtermplanprint/table/"+id, path: "/benyi_course/mathtermplanprint/table/" + id
}); });
}, }
}
},
}; };
</script> </script>

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

@@ -1,6 +1,11 @@
<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"
: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"
@@ -21,21 +26,28 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <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:recruitstudentsnotice:add']"
v-hasPermi="['benyi:recruitstudentsnotice:add']" >新增</el-button
>新增</el-button> >
</el-col>
<!-- <el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="success" type="success"
@@ -56,14 +68,27 @@
v-hasPermi="['benyi:recruitstudentsnotice:remove']" v-hasPermi="['benyi:recruitstudentsnotice:remove']"
>删除</el-button> >删除</el-button>
</el-col>--> </el-col>-->
</el-row> </div>
<el-table v-loading="loading" :data="noticeList" @selection-change="handleSelectionChange"> <el-table
v-loading="loading"
:data="noticeList"
@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 label="标题" align="center" prop="title" />
<el-table-column label="类型" align="center" prop="type" :formatter="typeFormat" /> <el-table-column
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> label="类型"
align="center"
prop="type"
:formatter="typeFormat"
/>
<el-table-column
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"
@@ -72,7 +97,8 @@
@click="handleCopy(scope.row)" @click="handleCopy(scope.row)"
v-hasPermi="['benyi:recruitstudentsnotice:edit']" v-hasPermi="['benyi:recruitstudentsnotice:edit']"
v-show="!selectable(scope.row)" v-show="!selectable(scope.row)"
>复制</el-button> >复制</el-button
>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
@@ -80,7 +106,8 @@
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['benyi:recruitstudentsnotice:edit']" v-hasPermi="['benyi:recruitstudentsnotice:edit']"
v-show="selectable(scope.row)" v-show="selectable(scope.row)"
>修改</el-button> >修改</el-button
>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
@@ -88,20 +115,22 @@
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['benyi:recruitstudentsnotice:remove']" v-hasPermi="['benyi:recruitstudentsnotice:remove']"
v-show="selectable(scope.row)" v-show="selectable(scope.row)"
>删除</el-button> >删除</el-button
>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-view" icon="el-icon-view"
@click="handleView(scope.row,scope.index)" @click="handleView(scope.row, scope.index)"
v-hasPermi="['benyi:recruitstudentsnotice:query']" v-hasPermi="['benyi:recruitstudentsnotice:query']"
>详细</el-button> >详细</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total > 0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@@ -109,7 +138,7 @@
/> />
<!-- 添加或修改入园通知书对话框 --> <!-- 添加或修改入园通知书对话框 -->
<el-dialog :title="title" :visible.sync="open" width="800px" 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="请输入标题" />
@@ -119,7 +148,9 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" v-show="isshow" @click="submitForm">确 定</el-button> <el-button type="primary" v-show="isshow" @click="submitForm"
>确 定</el-button
>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
@@ -133,7 +164,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";
@@ -141,7 +172,7 @@ import Editor from "@/components/Editor";
export default { export default {
name: "Notice", name: "Notice",
components: { components: {
Editor, Editor
}, },
data() { data() {
return { return {
@@ -171,17 +202,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;
}); });
}, },
@@ -201,7 +232,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;
@@ -220,7 +251,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");
}, },
@@ -236,7 +267,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;
}, },
@@ -244,7 +275,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 = "入园通知书详情";
@@ -262,7 +293,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 = "修改入园通知书";
@@ -270,11 +301,11 @@ 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;
@@ -282,7 +313,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;
@@ -302,17 +333,17 @@ export default {
{ {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning"
} }
) )
.then(function () { .then(function() {
return delNotice(ids); return delNotice(ids);
}) })
.then(() => { .then(() => {
this.getList(); this.getList();
this.msgSuccess("删除成功"); this.msgSuccess("删除成功");
}) })
.catch(function () {}); .catch(function() {});
}, },
/** 复制按钮操作 */ /** 复制按钮操作 */
handleCopy(row) { handleCopy(row) {
@@ -320,17 +351,17 @@ 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);
}) })
.then(() => { .then(() => {
this.getList(); this.getList();
this.msgSuccess("复制成功"); this.msgSuccess("复制成功");
}) })
.catch(function () {}); .catch(function() {});
}, }
}, }
}; };
</script> </script>

189
ruoyi-ui/src/views/benyi/schoolcalendar/index.vue
View File

@@ -1,8 +1,18 @@
<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"
:inline="true"
label-width="68px"
>
<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 schoolcalendartypeOptions" v-for="dict in schoolcalendartypeOptions"
:key="dict.dictValue" :key="dict.dictValue"
@@ -12,7 +22,12 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="适用范围" prop="scope"> <el-form-item label="适用范围" prop="scope">
<el-select v-model="queryParams.scope" placeholder="请选择适用范围" clearable size="small"> <el-select
v-model="queryParams.scope"
placeholder="请选择适用范围"
clearable
size="small"
>
<el-option <el-option
v-for="dict in scopeOptions" v-for="dict in scopeOptions"
:key="dict.dictValue" :key="dict.dictValue"
@@ -22,7 +37,12 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="学年学期" prop="xnxq"> <el-form-item label="学年学期" prop="xnxq">
<el-select v-model="queryParams.xnxq" placeholder="请选择学年学期" clearable size="small"> <el-select
v-model="queryParams.xnxq"
placeholder="请选择学年学期"
clearable
size="small"
>
<el-option <el-option
v-for="dict in xnxqOptions" v-for="dict in xnxqOptions"
:key="dict.dictValue" :key="dict.dictValue"
@@ -44,58 +64,66 @@
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <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:schoolcalendar:add']"
v-hasPermi="['benyi:schoolcalendar:add']" >新增</el-button
>新增</el-button> >
</el-col> <!-- <el-button
<el-col :span="1.5">
<el-button
type="success" type="success"
icon="el-icon-edit" icon="el-icon-edit"
size="mini" size="mini"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['benyi:schoolcalendar:edit']" v-hasPermi="['benyi:schoolcalendar:edit']"
>修改</el-button> >修改</el-button> -->
</el-col> <el-button
<el-col :span="1.5"> type="danger"
<el-button icon="el-icon-delete"
type="danger" size="mini"
icon="el-icon-delete" :disabled="multiple"
size="mini" @click="handleDelete"
:disabled="multiple" v-hasPermi="['benyi:schoolcalendar:remove']"
@click="handleDelete" >删除</el-button
v-hasPermi="['benyi:schoolcalendar:remove']" >
>删除</el-button> <el-button
</el-col> type="warning"
<el-col :span="1.5"> icon="el-icon-download"
<el-button size="mini"
type="warning" @click="handleExport"
icon="el-icon-download" v-hasPermi="['benyi:schoolcalendar:export']"
size="mini" >导出</el-button
@click="handleExport" >
v-hasPermi="['benyi:schoolcalendar:export']" </div>
>导出</el-button>
</el-col>
</el-row>
<el-table <el-table
v-loading="loading" v-loading="loading"
:data="schoolcalendarList" :data="schoolcalendarList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" :selectable="checkSelectable" /> <el-table-column
type="selection"
width="55"
align="center"
:selectable="checkSelectable"
/>
<!-- <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 label="名称" align="center" prop="name" />
<el-table-column <el-table-column
@@ -104,16 +132,46 @@
:formatter="schoolcalendartypeFormat" :formatter="schoolcalendartypeFormat"
prop="type" prop="type"
/> />
<el-table-column label="适用范围" align="center" :formatter="scopeFormat" prop="scope" /> <el-table-column
<el-table-column label="学年学期" align="center" :formatter="xnxqFormat" prop="xnxq" /> label="适用范围"
<el-table-column label="活动开始时间" align="center" prop="activitytime" width="180" /> align="center"
<el-table-column label="活动截止时间" align="center" prop="activityendtime" width="180" /> :formatter="scopeFormat"
<el-table-column label="创建时间" align="center" prop="createtime" width="180"> prop="scope"
/>
<el-table-column
label="学年学期"
align="center"
:formatter="xnxqFormat"
prop="xnxq"
/>
<el-table-column
label="活动开始时间"
align="center"
prop="activitytime"
width="180"
/>
<el-table-column
label="活动截止时间"
align="center"
prop="activityendtime"
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
label="操作"
align="center"
width="120"
class-name="small-padding fixed-width"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@@ -122,7 +180,8 @@
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['benyi:schoolcalendar:edit']" v-hasPermi="['benyi:schoolcalendar:edit']"
:disabled="!checkSelectable(scope.row)" :disabled="!checkSelectable(scope.row)"
>修改</el-button> >修改</el-button
>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
@@ -130,13 +189,14 @@
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['benyi:schoolcalendar:remove']" v-hasPermi="['benyi:schoolcalendar:remove']"
:disabled="!checkSelectable(scope.row)" :disabled="!checkSelectable(scope.row)"
>删除</el-button> >删除</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total > 0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@@ -147,10 +207,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="活动类型" prop="type"> <el-form-item label="活动类型" prop="type">
<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 schoolcalendartypeOptions" v-for="dict in schoolcalendartypeOptions"
:key="dict.dictValue" :key="dict.dictValue"
@@ -160,7 +229,13 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="适用范围" prop="scope"> <el-form-item label="适用范围" prop="scope">
<el-select v-model="form.scope" multiple placeholder="请选择适用范围" clearable size="small"> <el-select
v-model="form.scope"
multiple
placeholder="请选择适用范围"
clearable
size="small"
>
<el-option <el-option
v-for="dict in scopeOptions" v-for="dict in scopeOptions"
:key="dict.dictValue" :key="dict.dictValue"
@@ -368,11 +443,11 @@ export default {
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
const id = row.id || this.ids; const id = row.id || this.ids;
var myArray=new Array(2); var myArray = new Array(2);
getSchoolcalendar(id).then(response => { getSchoolcalendar(id).then(response => {
this.form = response.data; this.form = response.data;
myArray[0]=response.data.activitytime; myArray[0] = response.data.activitytime;
myArray[1]=response.data.activityendtime; myArray[1] = response.data.activityendtime;
//console.log(myArray); //console.log(myArray);
this.form.activitytime = myArray; this.form.activitytime = myArray;
this.scopeOptions = response.scopes; this.scopeOptions = response.scopes;
@@ -457,4 +532,4 @@ export default {
} }
} }
}; };
</script> </script>

194
ruoyi-ui/src/views/benyi/thememonthplanapproval/index.vue
View File

@@ -1,6 +1,11 @@
<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"
: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"
@@ -11,7 +16,12 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="学年学期" prop="xnxq"> <el-form-item label="学年学期" prop="xnxq">
<el-select v-model="queryParams.xnxq" placeholder="请选择学年学期" clearable size="small"> <el-select
v-model="queryParams.xnxq"
placeholder="请选择学年学期"
clearable
size="small"
>
<el-option <el-option
v-for="dict in xnxqOptions" v-for="dict in xnxqOptions"
:key="dict.dictValue" :key="dict.dictValue"
@@ -42,7 +52,12 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="当前状态" prop="status"> <el-form-item label="当前状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small"> <el-select
v-model="queryParams.status"
placeholder="请选择状态"
clearable
size="small"
>
<el-option <el-option
v-for="dict in statusOptions" v-for="dict in statusOptions"
:key="dict.dictValue" :key="dict.dictValue"
@@ -52,41 +67,80 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <div class="mb8 btn-list">
<el-col :span="1.5"> <el-button
<el-button type="success"
type="success" icon="el-icon-edit"
icon="el-icon-edit" size="mini"
size="mini" :disabled="single"
:disabled="single" @click="handleUpdate"
@click="handleUpdate" v-hasPermi="['benyi:thememonthplan:edit']"
v-hasPermi="['benyi:thememonthplan:edit']" >审批</el-button
>审批</el-button> >
</el-col> </div>
</el-row>
<el-table v-loading="loading" :data="monthplanList" @selection-change="handleSelectionChange"> <el-table
<el-table-column type="selection" width="55" align="center" :selectable="isShow" /> v-loading="loading"
<el-table-column label="计划名称" align="center" prop="name" :show-overflow-tooltip="true"> :data="monthplanList"
@selection-change="handleSelectionChange"
>
<el-table-column
type="selection"
width="55"
align="center"
:selectable="isShow"
/>
<el-table-column
label="计划名称"
align="center"
prop="name"
:show-overflow-tooltip="true"
>
<template slot-scope="scope"> <template slot-scope="scope">
<router-link :to="'/benyi_course/thememonthplan/data/' + scope.row.id" class="link-type"> <router-link
:to="'/benyi_course/thememonthplan/data/' + scope.row.id"
class="link-type"
>
<span>{{ scope.row.name }}</span> <span>{{ scope.row.name }}</span>
</router-link> </router-link>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="班级名称" align="center" prop="classid" :formatter="classFormat" /> <el-table-column
<el-table-column label="学年学期" align="center" prop="xnxq" :formatter="xnxqFormat" /> label="班级名称"
align="center"
prop="classid"
:formatter="classFormat"
/>
<el-table-column
label="学年学期"
align="center"
prop="xnxq"
:formatter="xnxqFormat"
/>
<el-table-column label="计划月份" align="center" prop="month" width="180"> <el-table-column label="计划月份" align="center" prop="month" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.month, '{y}-{m}') }}</span> <span>{{ parseTime(scope.row.month, "{y}-{m}") }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="本月主题" align="center" prop="themes" :formatter="themeFormat" /> <el-table-column
label="本月主题"
align="center"
prop="themes"
:formatter="themeFormat"
/>
<el-table-column prop="wxkc" label="微型课程"> <el-table-column prop="wxkc" label="微型课程">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-html="scope.row.wxkc"></div> <div v-html="scope.row.wxkc"></div>
@@ -94,8 +148,17 @@
</el-table-column> </el-table-column>
<!-- <el-table-column label="家长支持" align="center" prop="support" /> <!-- <el-table-column label="家长支持" align="center" prop="support" />
<el-table-column label="备注" align="center" prop="remarks" />--> <el-table-column label="备注" align="center" prop="remarks" />-->
<el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" /> <el-table-column
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> label="状态"
align="center"
prop="status"
:formatter="statusFormat"
/>
<el-table-column
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"
@@ -104,20 +167,22 @@
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['benyi:thememonthplan:edit']" v-hasPermi="['benyi:thememonthplan:edit']"
v-show="isShow(scope.row)" v-show="isShow(scope.row)"
>审批</el-button> >审批</el-button
<el-button >
<el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-view" icon="el-icon-view"
@click="handleView(scope.row)" @click="handleView(scope.row)"
v-hasPermi="['benyi:themetermplan:query']" v-hasPermi="['benyi:themetermplan:query']"
>预览</el-button> >预览</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total > 0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@@ -125,7 +190,7 @@
/> />
<!-- 添加或修改主题整合月计划对话框 --> <!-- 添加或修改主题整合月计划对话框 -->
<el-dialog :title="title" :visible.sync="open" width="800px" 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="month"> <el-form-item label="计划月份" prop="month">
<el-date-picker <el-date-picker
@@ -140,7 +205,11 @@
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="学年学期" prop="xnxq"> <el-form-item label="学年学期" prop="xnxq">
<el-select v-model="form.xnxq" placeholder="请选择学年学期" :disabled="disable"> <el-select
v-model="form.xnxq"
placeholder="请选择学年学期"
:disabled="disable"
>
<el-option <el-option
v-for="dict in xnxqOptions" v-for="dict in xnxqOptions"
:key="dict.dictValue" :key="dict.dictValue"
@@ -153,7 +222,12 @@
<Editor v-model="form.wxkc" placeholder="请输入微型课程" /> <Editor v-model="form.wxkc" placeholder="请输入微型课程" />
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remarks"> <el-form-item label="备注" prop="remarks">
<el-input v-model="form.remarks" type="textarea" placeholder="请输入内容" :disabled="true" /> <el-input
v-model="form.remarks"
type="textarea"
placeholder="请输入内容"
:disabled="true"
/>
</el-form-item> </el-form-item>
<el-form-item label="审批意见" prop="status"> <el-form-item label="审批意见" prop="status">
<el-radio-group v-model="form.status"> <el-radio-group v-model="form.status">
@@ -162,7 +236,11 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="审批建议" prop="shyj"> <el-form-item label="审批建议" prop="shyj">
<el-input v-model="form.shyj" type="textarea" placeholder="请输入审核建议" /> <el-input
v-model="form.shyj"
type="textarea"
placeholder="请输入审核建议"
/>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@@ -177,7 +255,7 @@
import { import {
listMonthplan, listMonthplan,
getMonthplan, getMonthplan,
updateMonthplan, updateMonthplan
} from "@/api/benyi/thememonthplan"; } from "@/api/benyi/thememonthplan";
import Editor from "@/components/Editor"; import Editor from "@/components/Editor";
import { listClass } from "@/api/system/class"; import { listClass } from "@/api/system/class";
@@ -186,7 +264,7 @@ import { listTheme } from "@/api/benyi/theme";
export default { export default {
name: "Monthplan", name: "Monthplan",
components: { components: {
Editor, Editor
}, },
data() { data() {
return { return {
@@ -233,26 +311,26 @@ export default {
spr: undefined, spr: undefined,
sptime: undefined, sptime: undefined,
spyj: undefined, spyj: undefined,
status: "1", status: "1"
}, },
// 表单参数 // 表单参数
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
status: [ status: [
{ required: true, message: "审批意见不能为空", trigger: "blur" }, { required: true, message: "审批意见不能为空", trigger: "blur" }
], ]
}, }
}; };
}, },
created() { created() {
this.getClassList(); this.getClassList();
this.getThemeList(); this.getThemeList();
this.getList(); this.getList();
this.getDicts("sys_xnxq").then((response) => { this.getDicts("sys_xnxq").then(response => {
this.xnxqOptions = response.data; this.xnxqOptions = response.data;
}); });
this.getDicts("sys_dm_planweekstatus").then((response) => { this.getDicts("sys_dm_planweekstatus").then(response => {
this.statusOptions = response.data; this.statusOptions = response.data;
}); });
}, },
@@ -289,7 +367,7 @@ export default {
}, },
//主题 //主题
getThemeList() { getThemeList() {
listTheme(null).then((response) => { listTheme(null).then(response => {
//console.log(response.rows); //console.log(response.rows);
this.themeOptions = response.rows; this.themeOptions = response.rows;
}); });
@@ -299,7 +377,7 @@ export default {
// return this.selectDictLabel(this.classOptions, row.classid); // return this.selectDictLabel(this.classOptions, row.classid);
var actions = []; var actions = [];
var datas = this.classOptions; var datas = this.classOptions;
Object.keys(datas).map((key) => { Object.keys(datas).map(key => {
if (datas[key].bjbh == "" + row.classid) { if (datas[key].bjbh == "" + row.classid) {
actions.push(datas[key].bjmc); actions.push(datas[key].bjmc);
return false; return false;
@@ -313,14 +391,14 @@ export default {
}, },
//班级列表 //班级列表
getClassList() { getClassList() {
listClass(null).then((response) => { listClass(null).then(response => {
this.classOptions = response.rows; this.classOptions = response.rows;
}); });
}, },
/** 查询主题整合月计划列表 */ /** 查询主题整合月计划列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listMonthplan(this.queryParams).then((response) => { listMonthplan(this.queryParams).then(response => {
this.monthplanList = response.rows; this.monthplanList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
@@ -350,7 +428,7 @@ export default {
spr: undefined, spr: undefined,
sptime: undefined, sptime: undefined,
spyj: undefined, spyj: undefined,
status: "2", status: "2"
}; };
this.resetForm("form"); this.resetForm("form");
}, },
@@ -366,7 +444,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;
}, },
@@ -374,7 +452,7 @@ export default {
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
const id = row.id || this.ids; const id = row.id || this.ids;
getMonthplan(id).then((response) => { getMonthplan(id).then(response => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "审批主题整合月计划"; this.title = "审批主题整合月计划";
@@ -382,11 +460,11 @@ 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) {
updateMonthplan(this.form).then((response) => { updateMonthplan(this.form).then(response => {
if (response.code === 200) { if (response.code === 200) {
this.msgSuccess("审批成功"); this.msgSuccess("审批成功");
this.open = false; this.open = false;
@@ -397,13 +475,13 @@ export default {
} }
}); });
}, },
/** 预览按钮操作 */ /** 预览按钮操作 */
handleView(row) { handleView(row) {
const id = row.id; const id = row.id;
this.$router.push({ this.$router.push({
path: "/benyi_course/thememonthplanprint/table/"+id, path: "/benyi_course/thememonthplanprint/table/" + id
}); });
}, }
}, }
}; };
</script> </script>

195
ruoyi-ui/src/views/benyi/themetermplanapproval/index.vue
View File

@@ -1,6 +1,11 @@
<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"
:inline="true"
label-width="68px"
>
<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
@@ -12,7 +17,12 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="学年学期" prop="xnxq"> <el-form-item label="学年学期" prop="xnxq">
<el-select v-model="queryParams.xnxq" placeholder="请选择学年学期" clearable size="small"> <el-select
v-model="queryParams.xnxq"
placeholder="请选择学年学期"
clearable
size="small"
>
<el-option <el-option
v-for="dict in xnxqOptions" v-for="dict in xnxqOptions"
:key="dict.dictValue" :key="dict.dictValue"
@@ -22,7 +32,12 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="当前状态" prop="status"> <el-form-item label="当前状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small"> <el-select
v-model="queryParams.status"
placeholder="请选择状态"
clearable
size="small"
>
<el-option <el-option
v-for="dict in statusOptions" v-for="dict in statusOptions"
:key="dict.dictValue" :key="dict.dictValue"
@@ -32,48 +47,101 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <div class="mb8 btn-list">
<el-col :span="1.5"> <el-button
<el-button type="success"
type="success" icon="el-icon-edit"
icon="el-icon-edit" size="mini"
size="mini" :disabled="single"
:disabled="single" @click="handleUpdate"
@click="handleUpdate" v-hasPermi="['benyi:themetermplan:edit']"
v-hasPermi="['benyi:themetermplan:edit']" >审批</el-button
>审批</el-button> >
</el-col> </div>
</el-row>
<el-table v-loading="loading" :data="termplanList" @selection-change="handleSelectionChange"> <el-table
<el-table-column type="selection" width="55" align="center" :selectable="isShow" /> v-loading="loading"
<el-table-column label="班级名称" align="center" prop="classid" :formatter="classFormat" /> :data="termplanList"
<el-table-column label="计划名称" align="center" prop="name" :show-overflow-tooltip="true"> @selection-change="handleSelectionChange"
>
<el-table-column
type="selection"
width="55"
align="center"
:selectable="isShow"
/>
<el-table-column
label="班级名称"
align="center"
prop="classid"
:formatter="classFormat"
/>
<el-table-column
label="计划名称"
align="center"
prop="name"
:show-overflow-tooltip="true"
>
<template slot-scope="scope"> <template slot-scope="scope">
<router-link :to="'/benyi_course/themetermplan/data/' + scope.row.id" class="link-type"> <router-link
:to="'/benyi_course/themetermplan/data/' + scope.row.id"
class="link-type"
>
<span>{{ scope.row.name }}</span> <span>{{ scope.row.name }}</span>
</router-link> </router-link>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="开始月份" align="center" prop="startmonth" width="180"> <el-table-column
label="开始月份"
align="center"
prop="startmonth"
width="180"
>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.startmonth, '{y}-{m}') }}</span> <span>{{ parseTime(scope.row.startmonth, "{y}-{m}") }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="结束月份" align="center" prop="endmonth" width="180"> <el-table-column
label="结束月份"
align="center"
prop="endmonth"
width="180"
>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.endmonth, '{y}-{m}') }}</span> <span>{{ parseTime(scope.row.endmonth, "{y}-{m}") }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="学年学期" align="center" prop="xnxq" :formatter="xnxqFormat" /> <el-table-column
label="学年学期"
align="center"
prop="xnxq"
:formatter="xnxqFormat"
/>
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" /> <el-table-column
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> label="状态"
align="center"
prop="status"
:formatter="statusFormat"
/>
<el-table-column
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"
@@ -82,20 +150,22 @@
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['benyi:themetermplan:edit']" v-hasPermi="['benyi:themetermplan:edit']"
v-show="isShow(scope.row)" v-show="isShow(scope.row)"
>审批</el-button> >审批</el-button
>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-view" icon="el-icon-view"
@click="handleView(scope.row)" @click="handleView(scope.row)"
v-hasPermi="['benyi:themetermplan:query']" v-hasPermi="['benyi:themetermplan:query']"
>预览</el-button> >预览</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total > 0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@@ -103,7 +173,7 @@
/> />
<!-- 添加或修改主题整合学期计划对话框 --> <!-- 添加或修改主题整合学期计划对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" class="v-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="startmonth"> <el-form-item label="月份" prop="startmonth">
<el-date-picker <el-date-picker
@@ -117,7 +187,11 @@
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="学年学期" prop="xnxq"> <el-form-item label="学年学期" prop="xnxq">
<el-select v-model="form.xnxq" placeholder="请选择学年学期" :disabled="true"> <el-select
v-model="form.xnxq"
placeholder="请选择学年学期"
:disabled="true"
>
<el-option <el-option
v-for="dict in xnxqOptions" v-for="dict in xnxqOptions"
:key="dict.dictValue" :key="dict.dictValue"
@@ -127,7 +201,12 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入备注" :disabled="true" /> <el-input
v-model="form.remark"
type="textarea"
placeholder="请输入备注"
:disabled="true"
/>
</el-form-item> </el-form-item>
<el-form-item label="审批意见" prop="status"> <el-form-item label="审批意见" prop="status">
<el-radio-group v-model="form.status"> <el-radio-group v-model="form.status">
@@ -136,7 +215,11 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="审批建议" prop="shyj"> <el-form-item label="审批建议" prop="shyj">
<el-input v-model="form.shyj" type="textarea" placeholder="请输入审核建议" /> <el-input
v-model="form.shyj"
type="textarea"
placeholder="请输入审核建议"
/>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@@ -151,7 +234,7 @@
import { import {
listTermplan, listTermplan,
getTermplan, getTermplan,
updateTermplan, updateTermplan
} from "@/api/benyi/themetermplan"; } from "@/api/benyi/themetermplan";
import { listClass } from "@/api/system/class"; import { listClass } from "@/api/system/class";
@@ -194,25 +277,25 @@ export default {
createuserid: undefined, createuserid: undefined,
status: "1", status: "1",
spr: undefined, spr: undefined,
sptime: undefined, sptime: undefined
}, },
// 表单参数 // 表单参数
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
status: [ status: [
{ required: true, message: "审批意见不能为空", trigger: "blur" }, { required: true, message: "审批意见不能为空", trigger: "blur" }
], ]
}, }
}; };
}, },
created() { created() {
this.getClassList(); this.getClassList();
this.getList(); this.getList();
this.getDicts("sys_xnxq").then((response) => { this.getDicts("sys_xnxq").then(response => {
this.xnxqOptions = response.data; this.xnxqOptions = response.data;
}); });
this.getDicts("sys_dm_planweekstatus").then((response) => { this.getDicts("sys_dm_planweekstatus").then(response => {
this.statusOptions = response.data; this.statusOptions = response.data;
}); });
}, },
@@ -230,7 +313,7 @@ export default {
// return this.selectDictLabel(this.classOptions, row.classid); // return this.selectDictLabel(this.classOptions, row.classid);
var actions = []; var actions = [];
var datas = this.classOptions; var datas = this.classOptions;
Object.keys(datas).map((key) => { Object.keys(datas).map(key => {
if (datas[key].bjbh == "" + row.classid) { if (datas[key].bjbh == "" + row.classid) {
actions.push(datas[key].bjmc); actions.push(datas[key].bjmc);
return false; return false;
@@ -248,14 +331,14 @@ export default {
}, },
//班级列表 //班级列表
getClassList() { getClassList() {
listClass(null).then((response) => { listClass(null).then(response => {
this.classOptions = response.rows; this.classOptions = response.rows;
}); });
}, },
/** 查询主题整合学期计划列表 */ /** 查询主题整合学期计划列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listTermplan(this.queryParams).then((response) => { listTermplan(this.queryParams).then(response => {
this.termplanList = response.rows; this.termplanList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
@@ -281,7 +364,7 @@ export default {
createTime: undefined, createTime: undefined,
spr: undefined, spr: undefined,
sptime: undefined, sptime: undefined,
status: "2", status: "2"
}; };
this.resetForm("form"); this.resetForm("form");
}, },
@@ -297,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;
}, },
@@ -305,7 +388,7 @@ export default {
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
const id = row.id || this.ids; const id = row.id || this.ids;
getTermplan(id).then((response) => { getTermplan(id).then(response => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "审批主题整合学期计划"; this.title = "审批主题整合学期计划";
@@ -316,14 +399,14 @@ export default {
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm: function () { submitForm: function() {
this.$refs["form"].validate((valid) => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
const time = this.form.startmonth; const time = this.form.startmonth;
this.form.startmonth = time[0]; this.form.startmonth = time[0];
this.form.endmonth = time[1]; this.form.endmonth = time[1];
if (this.form.id != undefined) { if (this.form.id != undefined) {
updateTermplan(this.form).then((response) => { updateTermplan(this.form).then(response => {
if (response.code === 200) { if (response.code === 200) {
this.msgSuccess("审批成功"); this.msgSuccess("审批成功");
this.open = false; this.open = false;
@@ -338,9 +421,9 @@ export default {
handleView(row) { handleView(row) {
const id = row.id; const id = row.id;
this.$router.push({ this.$router.push({
path: "/benyi_course/themetermplanprint/table/" + id, path: "/benyi_course/themetermplanprint/table/" + id
}); });
}, }
}, }
}; };
</script> </script>

185
ruoyi-ui/src/views/benyi/themeweekplanapproval/index.vue
View File

@@ -1,6 +1,11 @@
<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"
: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"
@@ -11,7 +16,12 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="学年学期" prop="xnxq"> <el-form-item label="学年学期" prop="xnxq">
<el-select v-model="queryParams.xnxq" placeholder="请选择学年学期" clearable size="small"> <el-select
v-model="queryParams.xnxq"
placeholder="请选择学年学期"
clearable
size="small"
>
<el-option <el-option
v-for="dict in xnxqOptions" v-for="dict in xnxqOptions"
:key="dict.dictValue" :key="dict.dictValue"
@@ -41,7 +51,12 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="status"> <el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small"> <el-select
v-model="queryParams.status"
placeholder="请选择状态"
clearable
size="small"
>
<el-option <el-option
v-for="dict in statusOptions" v-for="dict in statusOptions"
:key="dict.dictValue" :key="dict.dictValue"
@@ -51,45 +66,88 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <div class="mb8 btn-list">
<el-col :span="1.5"> <el-button
<el-button type="success"
type="success" icon="el-icon-edit"
icon="el-icon-edit" size="mini"
size="mini" :disabled="single"
:disabled="single" @click="handleUpdate"
@click="handleUpdate" v-hasPermi="['benyi:themeweekplan:edit']"
v-hasPermi="['benyi:themeweekplan:edit']" >审批</el-button
>审批</el-button> >
</el-col> </div>
</el-row>
<el-table v-loading="loading" :data="weekplanList" @selection-change="handleSelectionChange"> <el-table
<el-table-column type="selection" width="55" align="center" :selectable="isShow" /> v-loading="loading"
:data="weekplanList"
@selection-change="handleSelectionChange"
>
<el-table-column
type="selection"
width="55"
align="center"
:selectable="isShow"
/>
<!-- <el-table-column label="编号" align="center" prop="id" /> --> <!-- <el-table-column label="编号" align="center" prop="id" /> -->
<el-table-column label="计划名称" align="center" prop="name" :show-overflow-tooltip="true"> <el-table-column
label="计划名称"
align="center"
prop="name"
:show-overflow-tooltip="true"
>
<template slot-scope="scope"> <template slot-scope="scope">
<router-link :to="'/benyi_course/themeweekplan/data/' + scope.row.id" class="link-type"> <router-link
:to="'/benyi_course/themeweekplan/data/' + scope.row.id"
class="link-type"
>
<span>{{ scope.row.name }}</span> <span>{{ scope.row.name }}</span>
</router-link> </router-link>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="班级名称" align="center" prop="classid" :formatter="classFormat" /> <el-table-column
label="班级名称"
align="center"
prop="classid"
:formatter="classFormat"
/>
<el-table-column label="所属月份" align="center" prop="month" width="180"> <el-table-column label="所属月份" align="center" prop="month" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.month, '{y}-{m}') }}</span> <span>{{ parseTime(scope.row.month, "{y}-{m}") }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="所属周次" align="center" prop="zc" /> <el-table-column label="所属周次" align="center" prop="zc" />
<el-table-column label="学年学期" align="center" prop="xnxq" :formatter="xnxqFormat" /> <el-table-column
label="学年学期"
align="center"
prop="xnxq"
:formatter="xnxqFormat"
/>
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" /> <el-table-column
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> label="状态"
align="center"
prop="status"
:formatter="statusFormat"
/>
<el-table-column
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"
@@ -98,20 +156,22 @@
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['benyi:themeweekplan:edit']" v-hasPermi="['benyi:themeweekplan:edit']"
v-show="isShow(scope.row)" v-show="isShow(scope.row)"
>审批</el-button> >审批</el-button
>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-view" icon="el-icon-view"
@click="handleView(scope.row)" @click="handleView(scope.row)"
v-hasPermi="['benyi:themeweekplan:query']" v-hasPermi="['benyi:themeweekplan:query']"
>预览</el-button> >预览</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total > 0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@@ -119,10 +179,14 @@
/> />
<!-- 添加或修改主题整合周计划（根据月计划明细）对话框 --> <!-- 添加或修改主题整合周计划（根据月计划明细）对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" class="v-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="xnxq"> <el-form-item label="学年学期" prop="xnxq">
<el-select v-model="form.xnxq" placeholder="请选择学年学期" :disabled="disable"> <el-select
v-model="form.xnxq"
placeholder="请选择学年学期"
:disabled="disable"
>
<el-option <el-option
v-for="dict in xnxqOptions" v-for="dict in xnxqOptions"
:key="dict.dictValue" :key="dict.dictValue"
@@ -144,10 +208,19 @@
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="所属周次" prop="zc"> <el-form-item label="所属周次" prop="zc">
<el-input-number v-model="form.zc" placeholder="周次" :disabled="disable" /> <el-input-number
v-model="form.zc"
placeholder="周次"
:disabled="disable"
/>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remar"> <el-form-item label="备注" prop="remar">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" :disabled="true" /> <el-input
v-model="form.remark"
type="textarea"
placeholder="请输入内容"
:disabled="true"
/>
</el-form-item> </el-form-item>
<el-form-item label="审批意见" prop="status"> <el-form-item label="审批意见" prop="status">
<el-radio-group v-model="form.status"> <el-radio-group v-model="form.status">
@@ -156,7 +229,11 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="审批建议" prop="shyj"> <el-form-item label="审批建议" prop="shyj">
<el-input v-model="form.shyj" type="textarea" placeholder="请输入审核建议" /> <el-input
v-model="form.shyj"
type="textarea"
placeholder="请输入审核建议"
/>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@@ -171,7 +248,7 @@
import { import {
listWeekplan, listWeekplan,
getWeekplan, getWeekplan,
updateWeekplan, updateWeekplan
} from "@/api/benyi/themeweekplan"; } from "@/api/benyi/themeweekplan";
import { listClass } from "@/api/system/class"; import { listClass } from "@/api/system/class";
@@ -216,25 +293,25 @@ export default {
sptime: undefined, sptime: undefined,
shyj: undefined, shyj: undefined,
createuserid: undefined, createuserid: undefined,
xnxq: undefined, xnxq: undefined
}, },
// 表单参数 // 表单参数
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
status: [ status: [
{ required: true, message: "审批意见不能为空", trigger: "blur" }, { required: true, message: "审批意见不能为空", trigger: "blur" }
], ]
}, }
}; };
}, },
created() { created() {
this.getList(); this.getList();
this.getClassList(); this.getClassList();
this.getDicts("sys_xnxq").then((response) => { this.getDicts("sys_xnxq").then(response => {
this.xnxqOptions = response.data; this.xnxqOptions = response.data;
}); });
this.getDicts("sys_dm_planweekstatus").then((response) => { this.getDicts("sys_dm_planweekstatus").then(response => {
this.statusOptions = response.data; this.statusOptions = response.data;
}); });
}, },
@@ -248,7 +325,7 @@ export default {
}, },
//班级列表 //班级列表
getClassList() { getClassList() {
listClass(null).then((response) => { listClass(null).then(response => {
this.classOptions = response.rows; this.classOptions = response.rows;
}); });
}, },
@@ -265,7 +342,7 @@ export default {
// return this.selectDictLabel(this.classOptions, row.classid); // return this.selectDictLabel(this.classOptions, row.classid);
var actions = []; var actions = [];
var datas = this.classOptions; var datas = this.classOptions;
Object.keys(datas).map((key) => { Object.keys(datas).map(key => {
if (datas[key].bjbh == "" + row.classid) { if (datas[key].bjbh == "" + row.classid) {
actions.push(datas[key].bjmc); actions.push(datas[key].bjmc);
return false; return false;
@@ -276,7 +353,7 @@ export default {
/** 查询主题整合周计划（根据月计划明细）列表 */ /** 查询主题整合周计划（根据月计划明细）列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listWeekplan(this.queryParams).then((response) => { listWeekplan(this.queryParams).then(response => {
this.weekplanList = response.rows; this.weekplanList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
@@ -303,7 +380,7 @@ export default {
shyj: undefined, shyj: undefined,
createuserid: undefined, createuserid: undefined,
createTime: undefined, createTime: undefined,
xnxq: undefined, xnxq: undefined
}; };
this.resetForm("form"); this.resetForm("form");
}, },
@@ -319,7 +396,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;
}, },
@@ -327,7 +404,7 @@ export default {
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
const id = row.id || this.ids; const id = row.id || this.ids;
getWeekplan(id).then((response) => { getWeekplan(id).then(response => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "审批主题整合周计划"; this.title = "审批主题整合周计划";
@@ -335,11 +412,11 @@ 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) {
updateWeekplan(this.form).then((response) => { updateWeekplan(this.form).then(response => {
if (response.code === 200) { if (response.code === 200) {
this.msgSuccess("审批成功"); this.msgSuccess("审批成功");
this.open = false; this.open = false;
@@ -354,9 +431,9 @@ export default {
handleView(row) { handleView(row) {
const id = row.id; const id = row.id;
this.$router.push({ this.$router.push({
path: "/benyi_course/themeweekplanprint/table/" + id, path: "/benyi_course/themeweekplanprint/table/" + id
}); });
}, }
}, }
}; };
</script> </script>

141
ruoyi-ui/src/views/benyi_train/lecturer/index.vue
View File

@@ -1,6 +1,11 @@
<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"
: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"
@@ -11,63 +16,81 @@
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <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:lecturer:add']"
v-hasPermi="['benyi:lecturer:add']" >新增</el-button
>新增</el-button> >
</el-col> <!-- <el-button
<el-col :span="1.5"> type="success"
<el-button icon="el-icon-edit"
type="success" size="mini"
icon="el-icon-edit" :disabled="single"
size="mini" @click="handleUpdate"
:disabled="single" v-hasPermi="['benyi:lecturer:edit']"
@click="handleUpdate" >修改</el-button
v-hasPermi="['benyi:lecturer:edit']" > -->
>修改</el-button> <el-button
</el-col> type="danger"
<el-col :span="1.5"> icon="el-icon-delete"
<el-button size="mini"
type="danger" :disabled="multiple"
icon="el-icon-delete" @click="handleDelete"
size="mini" v-hasPermi="['benyi:lecturer:remove']"
:disabled="multiple" >删除</el-button
@click="handleDelete" >
v-hasPermi="['benyi:lecturer:remove']" <el-button
>删除</el-button> type="warning"
</el-col> icon="el-icon-download"
<el-col :span="1.5"> size="mini"
<el-button @click="handleExport"
type="warning" v-hasPermi="['benyi:lecturer:export']"
icon="el-icon-download" >导出</el-button
size="mini" >
@click="handleExport" </div>
v-hasPermi="['benyi:lecturer:export']"
>导出</el-button>
</el-col>
</el-row>
<el-table v-loading="loading" :data="lecturerList" @selection-change="handleSelectionChange"> <el-table
v-loading="loading"
:data="lecturerList"
@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="编号" width="80" align="center" prop="id" />
<el-table-column label="讲师姓名" align="center" prop="name" /> <el-table-column label="讲师姓名" align="center" prop="name" />
<el-table-column label="讲师简介" align="center" prop="information" /> <el-table-column label="讲师简介" align="center" prop="information" />
<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
label="操作"
align="center"
width="150"
class-name="small-padding fixed-width"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@@ -75,20 +98,22 @@
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['benyi:lecturer:edit']" v-hasPermi="['benyi:lecturer: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:lecturer:remove']" v-hasPermi="['benyi:lecturer:remove']"
>删除</el-button> >删除</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total > 0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@@ -96,13 +121,17 @@
/> />
<!-- 添加或修改讲师对话框 --> <!-- 添加或修改讲师对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px"> <el-dialog :title="title" :visible.sync="open" class="v-dialog">
<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" placeholder="请输入姓名" /> <el-input v-model="form.name" placeholder="请输入姓名" />
</el-form-item> </el-form-item>
<el-form-item label="讲师简介" prop="information"> <el-form-item label="讲师简介" prop="information">
<el-input v-model="form.information" type="textarea" placeholder="请输入内容" /> <el-input
v-model="form.information"
type="textarea"
placeholder="请输入内容"
/>
<el-input v-model="form.imgurl" v-if="false" /> <el-input v-model="form.imgurl" v-if="false" />
</el-form-item> </el-form-item>
<el-form-item label="选择照片" prop="imgurl"> <el-form-item label="选择照片" prop="imgurl">
@@ -344,15 +373,15 @@ export default {
}; };
</script> </script>
<style> <style lang="scss" scoped>
.avatar-uploader .el-upload { .avatar-uploader ::v-deep.el-upload {
border: 1px dashed #d9d9d9; border: 1px dashed #d9d9d9;
border-radius: 6px; border-radius: 6px;
cursor: pointer; cursor: pointer;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
} }
.avatar-uploader .el-upload:hover { .avatar-uploader ::v-deep.el-upload:hover {
border-color: #409eff; border-color: #409eff;
} }
.avatar-uploader-icon { .avatar-uploader-icon {
@@ -368,4 +397,4 @@ export default {
height: 178px; height: 178px;
display: block; display: block;
} }
</style> </style>

161
ruoyi-ui/src/views/benyi_train/video/index.vue
View File

@@ -1,6 +1,11 @@
<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"
:inline="true"
label-width="68px"
>
<el-form-item label="所属类别" prop="type"> <el-form-item label="所属类别" prop="type">
<el-cascader <el-cascader
placeholder="请选择所属类别" placeholder="请选择所属类别"
@@ -11,7 +16,11 @@
></el-cascader> ></el-cascader>
</el-form-item> </el-form-item>
<el-form-item label="讲师姓名" prop="lecturer"> <el-form-item label="讲师姓名" prop="lecturer">
<el-select v-model="queryParams.lecturer" filterable placeholder="请选择讲师"> <el-select
v-model="queryParams.lecturer"
filterable
placeholder="请选择讲师"
>
<el-option <el-option
v-for="item in lecturerOptions" v-for="item in lecturerOptions"
:key="item.id" :key="item.id"
@@ -30,47 +39,61 @@
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <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:video:add']"
v-hasPermi="['benyi:video:add']" >新增</el-button
>新增</el-button> >
</el-col> <!-- <el-button
<el-col :span="1.5"> type="success"
<el-button icon="el-icon-edit"
type="success" size="mini"
icon="el-icon-edit" :disabled="single"
size="mini" @click="handleUpdate"
:disabled="single" v-hasPermi="['benyi:video:edit']"
@click="handleUpdate" >修改</el-button
v-hasPermi="['benyi:video:edit']" > -->
>修改</el-button> <el-button
</el-col> type="danger"
<el-col :span="1.5"> icon="el-icon-delete"
<el-button size="mini"
type="danger" :disabled="multiple"
icon="el-icon-delete" @click="handleDelete"
size="mini" v-hasPermi="['benyi:video:remove']"
:disabled="multiple" >删除</el-button
@click="handleDelete" >
v-hasPermi="['benyi:video:remove']" </div>
>删除</el-button>
</el-col>
</el-row>
<el-table v-loading="loading" :data="videoList" @selection-change="handleSelectionChange"> <el-table
v-loading="loading"
:data="videoList"
@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" :show-overflow-tooltip="true" /> <el-table-column
label="培训视频标题"
align="center"
prop="title"
:show-overflow-tooltip="true"
/>
<el-table-column <el-table-column
label="视频简介" label="视频简介"
align="center" align="center"
@@ -92,15 +115,26 @@
size="mini" size="mini"
type="text" type="text"
@click="lookDetails(scope.row)" @click="lookDetails(scope.row)"
>{{ scope.row.avgscore }}</el-button> >{{ scope.row.avgscore }}</el-button
>
</template> </template>
</el-table-column> </el-table-column>
<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
label="操作"
align="center"
width="160"
class-name="small-padding fixed-width"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@@ -108,20 +142,22 @@
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['benyi:video:edit']" v-hasPermi="['benyi:video: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:video:remove']" v-hasPermi="['benyi:video:remove']"
>删除</el-button> >删除</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total > 0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@@ -129,7 +165,7 @@
/> />
<!-- 添加或修改培训对话框 --> <!-- 添加或修改培训对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px"> <el-dialog :title="title" :visible.sync="open" class="v-dialog">
<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="type"> <el-form-item label="所属类别" prop="type">
<el-cascader <el-cascader
@@ -143,10 +179,18 @@
></el-cascader> ></el-cascader>
</el-form-item> </el-form-item>
<el-form-item label="视频标题" prop="title"> <el-form-item label="视频标题" prop="title">
<el-input v-model="form.title" type="textarea" placeholder="请输入内容" /> <el-input
v-model="form.title"
type="textarea"
placeholder="请输入内容"
/>
</el-form-item> </el-form-item>
<el-form-item label="视频简介" prop="information"> <el-form-item label="视频简介" prop="information">
<el-input v-model="form.information" type="textarea" placeholder="请输入内容" /> <el-input
v-model="form.information"
type="textarea"
placeholder="请输入内容"
/>
</el-form-item> </el-form-item>
<el-form-item label="培训讲师" prop="lecturer"> <el-form-item label="培训讲师" prop="lecturer">
<el-select v-model="form.lecturer" placeholder="请选择讲师"> <el-select v-model="form.lecturer" placeholder="请选择讲师">
@@ -183,7 +227,11 @@
v-else-if="imageUrl.length < 1 && imgFlag == false" v-else-if="imageUrl.length < 1 && imgFlag == false"
class="el-icon-plus avatar-uploader-icon" class="el-icon-plus avatar-uploader-icon"
></i> ></i>
<el-progress v-if="imgFlag == true" type="circle" :percentage="percent"></el-progress> <el-progress
v-if="imgFlag == true"
type="circle"
:percentage="percent"
></el-progress>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
</el-form> </el-form>
@@ -194,14 +242,23 @@
</el-dialog> </el-dialog>
<!-- 添加或修改培训对话框 --> <!-- 添加或修改培训对话框 -->
<el-dialog title="查看分数和评价详情页" :visible.sync="opendetail" width="800px"> <el-dialog
title="查看分数和评价详情页"
:visible.sync="opendetail"
class="big-dialog"
>
<el-table v-loading="loading" :data="scoreandfreeList"> <el-table v-loading="loading" :data="scoreandfreeList">
<el-table-column label="分数" align="center" prop="score" /> <el-table-column label="分数" align="center" prop="score" />
<el-table-column label="评价" align="center" prop="content" :show-overflow-tooltip="true" /> <el-table-column
label="评价"
align="center"
prop="content"
:show-overflow-tooltip="true"
/>
</el-table> </el-table>
<pagination <pagination
v-show="detailtotal>0" v-show="detailtotal > 0"
:total="detailtotal" :total="detailtotal"
:page.sync="queryParams.pageNum" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@@ -576,7 +633,7 @@ export default {
}; };
</script> </script>
<style scoped> <style lang="scss" scoped>
.avatar-uploader ::v-deep .el-upload { .avatar-uploader ::v-deep .el-upload {
border: 1px dashed #d9d9d9; border: 1px dashed #d9d9d9;
border-radius: 6px; border-radius: 6px;
@@ -648,4 +705,4 @@ export default {
.image-preview:hover .image-preview-action { .image-preview:hover .image-preview-action {
opacity: 1; opacity: 1;
} }
</style> </style>

36
ruoyi-ui/src/views/benyi_train/video_study/detail.vue
View File

@@ -1,7 +1,7 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-row> <el-row :gutter="10">
<el-col :xs="24" :sm="12" style="padding: 10px;"> <el-col :xs="24" :sm="12">
<el-card> <el-card>
<video-player <video-player
class="vjs-custom-skin" class="vjs-custom-skin"
@@ -11,7 +11,7 @@
></video-player> ></video-player>
</el-card> </el-card>
</el-col> </el-col>
<el-col :xs="24" :sm="12" style="padding: 10px;"> <el-col :xs="24" :sm="12">
<el-card> <el-card>
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span>内容介绍</span> <span>内容介绍</span>
@@ -44,13 +44,18 @@
/> />
</el-form-item> </el-form-item>
</div> </div>
<div class="item">
<el-form-item label="">
<el-button
class="sub-btn"
type="primary"
:disabled="dis"
@click="submitForm"
v-hasPermi="['benyi:feedback_score:add']"
>提交</el-button>
</el-form-item>
</div>
</el-form> </el-form>
<el-button
type="primary"
:disabled="dis"
@click="submitForm"
v-hasPermi="['benyi:feedback_score:add']"
>提交</el-button>
</el-card> </el-card>
</el-col> </el-col>
</el-row> </el-row>
@@ -176,3 +181,16 @@ export default {
} }
}; };
</script> </script>
<style lang="scss" scoped>
.sub-btn {
margin-top: 5px;
}
.el-rate {
margin-top: 8px;
}
.item {
::v-deep.el-form-item {
margin-bottom: 5px;
}
}
</style>

5
ruoyi-ui/src/views/benyi_train/video_study/index.vue
View File

@@ -36,7 +36,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row v-loading="loading"> <el-row v-loading="loading">
<el-col :xs="12" :sm="6" v-for="(o, index) in videoList" :key="index" style="padding: 10px;"> <el-col :xs="24" :sm="8" :md="6" v-for="(o, index) in videoList" :key="index" style="padding: 10px;">
<el-card :body-style="{ padding: '2px' }"> <el-card :body-style="{ padding: '2px' }">
<video-player <video-player
class="vjs-custom-skin" class="vjs-custom-skin"
@@ -214,6 +214,7 @@ export default {
} }
.info-title-name { .info-title-name {
padding-top: 5px;
font-size: 12px; font-size: 12px;
} }
</style> </style>

27
ruoyi-ui/src/views/index.vue
View File

@@ -1,6 +1,6 @@
<template> <template>
<div class="dashboard-editor-container"> <div class="dashboard-editor-container">
<el-row :gutter="32"> <el-row :gutter="30">
<el-col :xs="24" :sm="24" :lg="8"> <el-col :xs="24" :sm="24" :lg="8">
<div class="chart-wrapper"> <div class="chart-wrapper">
<raddar-chart /> <raddar-chart />
@@ -19,10 +19,10 @@
</el-row> </el-row>
<el-row :gutter="32"> <el-row :gutter="32">
<!-- <el-calendar v-model="value" id="calendar">--> <!-- <el-calendar v-model="value" id="calendar">-->
<!-- 这里使用的是 2.5 slot 语法，对于新项目请使用 2.6 slot 语法--> <!-- 这里使用的是 2.5 slot 语法，对于新项目请使用 2.6 slot 语法-->
<!--<template slot="dateCell" slot-scope="{date, data}">--> <!--<template slot="dateCell" slot-scope="{date, data}">-->
<!--自定义内容--> <!--自定义内容-->
<!--<div> <!--<div>
<div class="calendar-day">{{ data.day.split('-').slice(2).join('-') }}</div> <div class="calendar-day">{{ data.day.split('-').slice(2).join('-') }}</div>
<div v-for="(item,index) in calendarData" :key="index"> <div v-for="(item,index) in calendarData" :key="index">
<div v-if="(item.years).indexOf(data.day.split('-').slice(0)[0])!=-1"> <div v-if="(item.years).indexOf(data.day.split('-').slice(0)[0])!=-1">
@@ -88,6 +88,11 @@ export default {
background-color: rgb(240, 242, 245); background-color: rgb(240, 242, 245);
position: relative; position: relative;
.el-card.is-always-shadow {
box-shadow: none;
border: 0;
}
.chart-wrapper { .chart-wrapper {
background: #fff; background: #fff;
padding: 16px 16px 0; padding: 16px 16px 0;
@@ -95,6 +100,18 @@ export default {
} }
} }
@media (max-width: 1366.98px) {
.chart-wrapper {
::v-deep.fc-toolbar h2 {
font-size: 1.2em;
}
::v-deep.chart {
overflow: hidden;
overflow-y: auto;
}
}
}
@media (max-width: 1024px) { @media (max-width: 1024px) {
.chart-wrapper { .chart-wrapper {
padding: 8px; padding: 8px;

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

@@ -1,8 +1,18 @@
<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"
:inline="true"
label-width="68px"
>
<el-form-item label="班级类型" prop="bjtype"> <el-form-item label="班级类型" prop="bjtype">
<el-select v-model="queryParams.bjtype" placeholder="请选择班级类型" clearable size="small"> <el-select
v-model="queryParams.bjtype"
placeholder="请选择班级类型"
clearable
size="small"
>
<el-option <el-option
v-for="dict in bjtypeOptions" v-for="dict in bjtypeOptions"
:key="dict.dictValue" :key="dict.dictValue"
@@ -21,7 +31,11 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="主班教师" prop="zbjs"> <el-form-item label="主班教师" prop="zbjs">
<el-select v-model="queryParams.zbjs" filterable placeholder="请选择主班教师"> <el-select
v-model="queryParams.zbjs"
filterable
placeholder="请选择主班教师"
>
<el-option <el-option
v-for="item in zbjsOptions" v-for="item in zbjsOptions"
:key="item.userId" :key="item.userId"
@@ -32,7 +46,11 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="配班教师" prop="pbjs"> <el-form-item label="配班教师" prop="pbjs">
<el-select v-model="queryParams.pbjs" filterable placeholder="请选择配班教师"> <el-select
v-model="queryParams.pbjs"
filterable
placeholder="请选择配班教师"
>
<el-option <el-option
v-for="item in pbjsOptions" v-for="item in pbjsOptions"
:key="item.userId" :key="item.userId"
@@ -43,7 +61,11 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="助理教师" prop="zljs"> <el-form-item label="助理教师" prop="zljs">
<el-select v-model="queryParams.zljs" filterable placeholder="请选择助理教师"> <el-select
v-model="queryParams.zljs"
filterable
placeholder="请选择助理教师"
>
<el-option <el-option
v-for="item in zljsOptions" v-for="item in zljsOptions"
:key="item.userId" :key="item.userId"
@@ -54,66 +76,94 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <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="['system:class:add']"
v-hasPermi="['system:class:add']" >新增</el-button
>新增</el-button> >
</el-col> <!-- <el-button
<el-col :span="1.5"> type="success"
<el-button icon="el-icon-edit"
type="success" size="mini"
icon="el-icon-edit" :disabled="single"
size="mini" @click="handleUpdate"
:disabled="single" v-hasPermi="['system:class:edit']"
@click="handleUpdate" >修改</el-button
v-hasPermi="['system:class:edit']" > -->
>修改</el-button> <el-button
</el-col> type="danger"
<el-col :span="1.5"> icon="el-icon-delete"
<el-button size="mini"
type="danger" :disabled="multiple"
icon="el-icon-delete" @click="handleDelete"
size="mini" v-hasPermi="['system:class:remove']"
:disabled="multiple" >删除</el-button
@click="handleDelete" >
v-hasPermi="['system:class:remove']" <el-button
>删除</el-button> type="warning"
</el-col> icon="el-icon-download"
<el-col :span="1.5"> size="mini"
<el-button @click="handleExport"
type="warning" v-hasPermi="['system:class:export']"
icon="el-icon-download" >导出</el-button
size="mini" >
@click="handleExport" </div>
v-hasPermi="['system:class:export']"
>导出</el-button>
</el-col>
</el-row>
<el-table v-loading="loading" :data="classList" @selection-change="handleSelectionChange"> <el-table
v-loading="loading"
:data="classList"
@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="bjbh" v-if="false" />> <el-table-column
<el-table-column label="班级类型" align="center" :formatter="bjtypeFormat" prop="bjtype" /> label="班级编号"
align="center"
prop="bjbh"
v-if="false"
/>>
<el-table-column
label="班级类型"
align="center"
:formatter="bjtypeFormat"
prop="bjtype"
/>
<el-table-column label="班级名称" align="center" prop="bjmc" /> <el-table-column label="班级名称" align="center" prop="bjmc" />
<el-table-column label="主班教师" align="center" prop="zbjsxm" /> <el-table-column label="主班教师" align="center" prop="zbjsxm" />
<el-table-column label="配班教师" align="center" prop="pbjsxm" /> <el-table-column label="配班教师" align="center" prop="pbjsxm" />
<el-table-column label="助理教师" align="center" prop="zljsxm" /> <el-table-column label="助理教师" align="center" prop="zljsxm" />
<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
label="操作"
width="220"
align="center"
class-name="small-padding fixed-width"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@@ -121,27 +171,30 @@
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['system:class:edit']" v-hasPermi="['system:class: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="['system:class:remove']" v-hasPermi="['system:class:remove']"
>删除班级</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="handleEditJs(scope.row)" @click="handleEditJs(scope.row)"
v-hasPermi="['system:class:edit']" v-hasPermi="['system:class:edit']"
>清空教师</el-button> >清空教师</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total > 0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@@ -149,7 +202,7 @@
/> />
<!-- 添加或修改班级信息对话框 --> <!-- 添加或修改班级信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px"> <el-dialog :title="title" :visible.sync="open" class="v-dialog">
<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="bjtype"> <el-form-item label="班级类型" prop="bjtype">
<el-select v-model="form.bjtype" placeholder="请选择班级类型"> <el-select v-model="form.bjtype" placeholder="请选择班级类型">
@@ -442,4 +495,4 @@ export default {
} }
} }
}; };
</script> </script>

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

@@ -1,8 +1,17 @@
<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"
:inline="true"
label-width="68px"
>
<el-form-item label="用户名称" prop="userid"> <el-form-item label="用户名称" prop="userid">
<el-select v-model="queryParams.userid" filterable placeholder="请选择用户" > <el-select
v-model="queryParams.userid"
filterable
placeholder="请选择用户"
>
<el-option <el-option
v-for="item in teacherListAll" v-for="item in teacherListAll"
:key="item.userid" :key="item.userid"
@@ -21,7 +30,12 @@
/> />
</el-form-item>--> </el-form-item>-->
<el-form-item label="学历" prop="xl"> <el-form-item label="学历" prop="xl">
<el-select v-model="queryParams.xl" placeholder="请选择学历" clearable size="small"> <el-select
v-model="queryParams.xl"
placeholder="请选择学历"
clearable
size="small"
>
<el-option <el-option
v-for="dict in xlOptions" v-for="dict in xlOptions"
:key="dict.dictValue" :key="dict.dictValue"
@@ -31,51 +45,80 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <div class="mb8 btn-list">
<el-col :span="1.5"> <!-- <el-button
<el-button type="success"
type="success" icon="el-icon-edit"
icon="el-icon-edit" size="mini"
size="mini" :disabled="single"
:disabled="single" @click="handleUpdate"
@click="handleUpdate" v-hasPermi="['system:teacher:edit']"
v-hasPermi="['system:teacher:edit']" >修改</el-button
>修改</el-button> > -->
</el-col> <el-button
<el-col :span="1.5"> type="danger"
<el-button icon="el-icon-delete"
type="danger" size="mini"
icon="el-icon-delete" :disabled="multiple"
size="mini" @click="handleDelete"
:disabled="multiple" v-hasPermi="['system:teacher:remove']"
@click="handleDelete" >清空</el-button
v-hasPermi="['system:teacher:remove']" >
>清空</el-button> <el-button
</el-col> type="warning"
<el-col :span="1.5"> icon="el-icon-download"
<el-button size="mini"
type="warning" @click="handleExport"
icon="el-icon-download" v-hasPermi="['system:teacher:export']"
size="mini" >导出</el-button
@click="handleExport" >
v-hasPermi="['system:teacher:export']" </div>
>导出</el-button>
</el-col>
</el-row>
<el-table v-loading="loading" :data="teacherList" @selection-change="handleSelectionChange"> <el-table
v-loading="loading"
:data="teacherList"
@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="user.nickName" /> <el-table-column label="用户名称" align="center" prop="user.nickName" />
<el-table-column label="出生日期" align="center" prop="csrq" width="180"></el-table-column> <el-table-column
label="出生日期"
align="center"
prop="csrq"
width="180"
></el-table-column>
<el-table-column label="毕业院校" align="center" prop="byyx" /> <el-table-column label="毕业院校" align="center" prop="byyx" />
<el-table-column label="学历" align="center" prop="xl" :formatter="xlFormat" /> <el-table-column
<el-table-column label="参加工作日期" align="center" prop="cjgzrq" width="180"></el-table-column> label="学历"
<el-table-column label="创建时间" align="center" prop="createtime" width="180"> align="center"
prop="xl"
:formatter="xlFormat"
/>
<el-table-column
label="参加工作日期"
align="center"
prop="cjgzrq"
width="180"
></el-table-column>
<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>
@@ -86,7 +129,12 @@
<el-table-column label="学位" align="center" prop="xw" :formatter="xwFormat" /> <el-table-column label="学位" align="center" prop="xw" :formatter="xwFormat" />
<el-table-column label="资格证书" align="center" prop="zgzs" :formatter="zgzsFormat" /> <el-table-column label="资格证书" align="center" prop="zgzs" :formatter="zgzsFormat" />
<el-table-column label="创建人" align="center" prop="createuserid" />--> <el-table-column label="创建人" align="center" prop="createuserid" />-->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column
label="操作"
align="center"
width="200"
class-name="small-padding fixed-width"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@@ -94,27 +142,30 @@
icon="el-icon-edit" icon="el-icon-edit"
@click="handleDetail(scope.row)" @click="handleDetail(scope.row)"
v-hasPermi="['system:teacher:edit']" v-hasPermi="['system:teacher:edit']"
>详情</el-button> >详情</el-button
>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['system:teacher:edit']" v-hasPermi="['system:teacher: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="['system:teacher:remove']" v-hasPermi="['system:teacher:remove']"
>清空</el-button> >清空</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total > 0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@@ -122,16 +173,26 @@
/> />
<!-- 添加或修改教师基本信息对话框 --> <!-- 添加或修改教师基本信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px"> <el-dialog :title="title" :visible.sync="open" class="v-dialog">
<el-form ref="form" :model="form" :rules="rules" label-width="100px" :disabled="flag"> <el-form
ref="form"
:model="form"
:rules="rules"
label-width="100px"
:disabled="flag"
>
<el-form-item label="id" prop="id" v-show="false"> <el-form-item label="id" prop="id" v-show="false">
<el-input v-model="form.id" /> <el-input v-model="form.id" />
</el-form-item> </el-form-item>
<el-form-item label="用户名称" prop="teacherMingCheng" > <el-form-item label="用户名称" prop="teacherMingCheng">
<el-input v-model="teacherMingCheng" :disabled="true"/> <el-input v-model="teacherMingCheng" :disabled="true" />
</el-form-item> </el-form-item>
<el-form-item label="证件号码" prop="zjhm"> <el-form-item label="证件号码" prop="zjhm">
<el-input v-model="form.zjhm" placeholder="请输入证件号码" maxlength="18" /> <el-input
v-model="form.zjhm"
placeholder="请输入证件号码"
maxlength="18"
/>
</el-form-item> </el-form-item>
<el-form-item label="出生日期" prop="csrq"> <el-form-item label="出生日期" prop="csrq">
<el-date-picker <el-date-picker
@@ -271,7 +332,7 @@ export default {
message: "请输入正确的身份证号", message: "请输入正确的身份证号",
trigger: "blur" trigger: "blur"
} }
], ]
} }
}; };
}, },
@@ -386,7 +447,7 @@ export default {
this.flag = true; this.flag = true;
this.title = "教师基本信息详情"; this.title = "教师基本信息详情";
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm: function() { submitForm: function() {
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
@@ -454,4 +515,4 @@ export default {
} }
} }
}; };
</script> </script>

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

@@ -10,11 +10,11 @@
clearable clearable
size="small" size="small"
prefix-icon="el-icon-search" prefix-icon="el-icon-search"
style="margin-bottom: 20px"
/> />
</div>
<div class="head-container">
<el-tree <el-tree
v-if="
deptOptions && deptOptions.length >= 1 && deptOptions[0].children
"
:data="deptOptions" :data="deptOptions"
:props="defaultProps" :props="defaultProps"
:expand-on-click-node="false" :expand-on-click-node="false"
@@ -23,76 +23,90 @@
default-expand-all default-expand-all
@node-click="handleNodeClick" @node-click="handleNodeClick"
/> />
<h3 class="one-user" v-else>
{{ deptOptions[0] && deptOptions[0].label }}
</h3>
</div> </div>
</el-col> </el-col>
<!--用户数据--> <!--用户数据-->
<el-col :span="20" :xs="24"> <el-col :span="20" :xs="24">
<el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px"> <div class="box-shadow">
<el-form-item label="登录账号" prop="userName"> <el-form
<el-input :model="queryParams"
v-model="queryParams.userName" ref="queryForm"
placeholder="请输入用户名称" :inline="true"
clearable label-width="68px"
size="small" >
style="width: 240px" <el-form-item label="登录账号" prop="userName">
@keyup.enter.native="handleQuery" <el-input
/> v-model="queryParams.userName"
</el-form-item> placeholder="请输入用户名称"
<el-form-item label="状态" prop="status"> clearable
<el-select size="small"
v-model="queryParams.status" style="width: 240px"
placeholder="用户状态" @keyup.enter.native="handleQuery"
clearable
size="small"
style="width: 240px"
>
<el-option
v-for="dict in statusOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/> />
</el-select> </el-form-item>
</el-form-item> <el-form-item label="状态" prop="status">
<el-form-item label="创建时间"> <el-select
<el-date-picker v-model="queryParams.status"
v-model="dateRange" placeholder="用户状态"
size="small" clearable
style="width: 240px" size="small"
value-format="yyyy-MM-dd" style="width: 240px"
type="daterange" >
range-separator="-" <el-option
start-placeholder="开始日期" v-for="dict in statusOptions"
end-placeholder="结束日期" :key="dict.dictValue"
></el-date-picker> :label="dict.dictLabel"
</el-form-item> :value="dict.dictValue"
<el-form-item> />
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> </el-select>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> </el-form-item>
</el-form-item> <el-form-item label="创建时间">
</el-form> <el-date-picker
v-model="dateRange"
size="small"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item>
<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>
<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="['system:user:add']" v-hasPermi="['system:user: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" size="mini"
size="mini" :disabled="single"
:disabled="single" @click="handleUpdate"
@click="handleUpdate" v-hasPermi="['system:user:edit']"
v-hasPermi="['system:user: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"
@@ -100,109 +114,120 @@
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['system:user:remove']" v-hasPermi="['system:user:remove']"
>删除</el-button> >删除</el-button
</el-col> >
<el-col :span="1.5">
<el-button <el-button
type="info" type="info"
icon="el-icon-upload2" icon="el-icon-upload2"
size="mini" size="mini"
@click="handleImport" @click="handleImport"
v-hasPermi="['system:user:import']" v-hasPermi="['system:user:import']"
>导入</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="['system:user:export']" v-hasPermi="['system:user:export']"
>导出</el-button> >导出</el-button
</el-col> >
</el-row> </div>
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange"> <el-table
<el-table-column type="selection" width="40" align="center" /> v-loading="loading"
<el-table-column label="用户编号" align="center" prop="userId" /> :data="userList"
<el-table-column @selection-change="handleSelectionChange"
label="登录账号"
align="center"
prop="userName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="用户姓名"
align="center"
prop="nickName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="部门"
align="center"
prop="dept.deptName"
:show-overflow-tooltip="true"
/>
<el-table-column label="状态" align="center">
<template slot-scope="scope">
<el-switch
v-model="scope.row.status"
active-value="0"
inactive-value="1"
@change="handleStatusChange(scope.row)"
></el-switch>
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="160">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column
label="操作"
align="center"
width="180"
class-name="small-padding fixed-width"
> >
<template slot-scope="scope"> <el-table-column type="selection" width="40" align="center" />
<el-button <el-table-column label="用户编号" align="center" prop="userId" />
size="mini" <el-table-column
type="text" label="登录账号"
icon="el-icon-edit" align="center"
@click="handleUpdate(scope.row)" prop="userName"
v-hasPermi="['system:user:edit']" :show-overflow-tooltip="true"
>修改</el-button> />
<el-button <el-table-column
v-if="scope.row.userId !== 1" label="用户姓名"
size="mini" align="center"
type="text" prop="nickName"
icon="el-icon-delete" :show-overflow-tooltip="true"
@click="handleDelete(scope.row)" />
v-hasPermi="['system:user:remove']" <el-table-column
>删除</el-button> label="部门"
<el-button align="center"
size="mini" prop="dept.deptName"
type="text" :show-overflow-tooltip="true"
icon="el-icon-key" />
@click="handleResetPwd(scope.row)" <el-table-column label="状态" align="center">
v-hasPermi="['system:user:resetPwd']" <template slot-scope="scope">
>重置</el-button> <el-switch
</template> v-model="scope.row.status"
</el-table-column> active-value="0"
</el-table> inactive-value="1"
@change="handleStatusChange(scope.row)"
></el-switch>
</template>
</el-table-column>
<el-table-column
label="创建时间"
align="center"
prop="createTime"
width="160"
>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column
label="操作"
align="center"
width="180"
class-name="small-padding fixed-width"
>
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:user:edit']"
>修改</el-button
>
<el-button
v-if="scope.row.userId !== 1"
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:user:remove']"
>删除</el-button
>
<el-button
size="mini"
type="text"
icon="el-icon-key"
@click="handleResetPwd(scope.row)"
v-hasPermi="['system:user:resetPwd']"
>重置</el-button
>
</template>
</el-table-column>
</el-table>
<pagination <pagination
v-show="total>0" v-show="total > 0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@pagination="getList" @pagination="getList"
/> />
</div>
</el-col> </el-col>
</el-row> </el-row>
<!-- 添加或修改参数配置对话框 --> <!-- 添加或修改参数配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="600px"> <el-dialog :title="title" :visible.sync="open" class="v-dialog">
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
@@ -212,17 +237,33 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="归属部门" prop="deptId"> <el-form-item label="归属部门" prop="deptId">
<treeselect v-model="form.deptId" :options="deptOptions" placeholder="请选择归属部门" /> <treeselect
v-model="form.deptId"
:options="deptOptions"
placeholder="请选择归属部门"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="登录账号" prop="userName"> <el-form-item label="登录账号" prop="userName">
<el-input v-model="form.userName" placeholder="请输入手机号码" maxlength="11" /> <el-input
v-model="form.userName"
placeholder="请输入手机号码"
maxlength="11"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item v-if="form.userId == undefined" label="用户密码" prop="password"> <el-form-item
<el-input v-model="form.password" placeholder="请输入用户密码" type="password" /> v-if="form.userId == undefined"
label="用户密码"
prop="password"
>
<el-input
v-model="form.password"
placeholder="请输入用户密码"
type="password"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@@ -244,7 +285,8 @@
v-for="dict in statusOptions" v-for="dict in statusOptions"
:key="dict.dictValue" :key="dict.dictValue"
:label="dict.dictValue" :label="dict.dictValue"
>{{dict.dictLabel}}</el-radio> >{{ dict.dictLabel }}</el-radio
>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -289,7 +331,11 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注"> <el-form-item label="备注">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input> <el-input
v-model="form.remark"
type="textarea"
placeholder="请输入内容"
></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@@ -320,10 +366,16 @@
<em>点击上传</em> <em>点击上传</em>
</div> </div>
<div class="el-upload__tip" slot="tip"> <div class="el-upload__tip" slot="tip">
<el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据 <el-checkbox
<el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link> v-model="upload.updateSupport"
/>是否更新已经存在的用户数据
<el-link type="info" style="font-size:12px" @click="importTemplate"
>下载模板</el-link
>
</div>
<div class="el-upload__tip" style="color:red" slot="tip">
提示：仅允许导入“xls”或“xlsx”格式文件！
</div> </div>
<div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
</el-upload> </el-upload>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitFileForm">确 定</el-button> <el-button type="primary" @click="submitFileForm">确 定</el-button>
@@ -370,7 +422,7 @@ export default {
// 弹出层标题 // 弹出层标题
title: "", title: "",
// 部门树选项 // 部门树选项
deptOptions: undefined, deptOptions: [],
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
// 部门名称 // 部门名称
@@ -390,7 +442,7 @@ export default {
//多幼儿园选项 //多幼儿园选项
kindergartenOptions: [], kindergartenOptions: [],
//是否幼儿园 //是否幼儿园
isSchool:undefined, isSchool: undefined,
// 表单参数 // 表单参数
form: {}, form: {},
defaultProps: { defaultProps: {
@@ -558,11 +610,11 @@ export default {
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);
if (response.isSchool=="0") { if (response.isSchool == "0") {
this.isSchool=true; this.isSchool = true;
this.kindergartenOptions = response.kindergartens; this.kindergartenOptions = response.kindergartens;
}else{ } else {
this.isSchool=false; this.isSchool = false;
} }
this.open = true; this.open = true;
this.title = "添加用户"; this.title = "添加用户";
@@ -580,13 +632,13 @@ export default {
this.roleOptions = response.roles; this.roleOptions = response.roles;
this.form.postIds = response.postIds; this.form.postIds = response.postIds;
this.form.roleIds = response.roleIds; this.form.roleIds = response.roleIds;
this.form.deptIds=response.kindergartenIds; this.form.deptIds = response.kindergartenIds;
//console.log("school="+response.isSchool); //console.log("school="+response.isSchool);
if (response.isSchool=="0") { if (response.isSchool == "0") {
this.isSchool=true; this.isSchool = true;
this.kindergartenOptions = response.kindergartens; this.kindergartenOptions = response.kindergartens;
}else{ } else {
this.isSchool=false; this.isSchool = false;
} }
this.open = true; this.open = true;
this.title = "修改用户"; this.title = "修改用户";
@@ -704,4 +756,22 @@ export default {
} }
} }
}; };
</script> </script>
<style lang="scss" scoped>
.head-container {
.el-input {
margin-bottom: 10px;
}
}
.one-user {
margin: 0;
font-size: 16px;
padding: 5px;
margin-bottom: 10px;
}
.box-shadow {
border-radius: 5px;
padding: 10px 15px;
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
}
</style>

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

@@ -1,91 +1,91 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="6" :xs="24"> <el-col :xs="24" :sm="12" :md="8">
<el-card class="box-card"> <el-card class="box-card">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span>个人信息</span> <span>个人信息</span>
</div> </div>
<div> <div>
<div class="text-center"> <div class="text-center">
<userAvatar :user="user" /> <userAvatar :user="user" />
</div> </div>
<ul class="list-group list-group-striped"> <ul class="list-group list-group-striped">
<li class="list-group-item"> <li class="list-group-item">
<svg-icon icon-class="user" />用户名称 <svg-icon icon-class="user" />用户名称
<div class="pull-right">{{ user.userName }}</div> <div class="pull-right">{{ user.userName }}</div>
</li> </li>
<li class="list-group-item"> <li class="list-group-item">
<svg-icon icon-class="phone" />手机号码 <svg-icon icon-class="phone" />手机号码
<div class="pull-right">{{ user.phonenumber }}</div> <div class="pull-right">{{ user.phonenumber }}</div>
</li> </li>
<li class="list-group-item"> <li class="list-group-item">
<svg-icon icon-class="email" />用户邮箱 <svg-icon icon-class="email" />用户邮箱
<div class="pull-right">{{ user.email }}</div> <div class="pull-right">{{ user.email }}</div>
</li> </li>
<li class="list-group-item"> <li class="list-group-item">
<svg-icon icon-class="tree" />所属部门 <svg-icon icon-class="tree" />所属部门
<div class="pull-right" v-if="user.dept">{{ user.dept.deptName }} / {{ postGroup }}</div> <div class="pull-right" v-if="user.dept">{{ user.dept.deptName }} / {{ postGroup }}</div>
</li> </li>
<li class="list-group-item"> <li class="list-group-item">
<svg-icon icon-class="peoples" />所属角色 <svg-icon icon-class="peoples" />所属角色
<div class="pull-right">{{ roleGroup }}</div> <div class="pull-right">{{ roleGroup }}</div>
</li> </li>
<li class="list-group-item"> <li class="list-group-item">
<svg-icon icon-class="date" />创建日期 <svg-icon icon-class="date" />创建日期
<div class="pull-right">{{ user.createTime }}</div> <div class="pull-right">{{ user.createTime }}</div>
</li> </li>
</ul> </ul>
</div> </div>
</el-card> </el-card>
</el-col> </el-col>
<el-col :span="18" :xs="24"> <el-col :xs="24" :sm="12" :md="16">
<el-card> <el-card>
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span>基本资料</span> <span>基本资料</span>
</div> </div>
<el-tabs v-model="activeTab"> <el-tabs v-model="activeTab">
<el-tab-pane label="基本资料" name="userinfo"> <el-tab-pane label="基本资料" name="userinfo">
<userInfo :user="user" /> <userInfo :user="user" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="修改密码" name="resetPwd"> <el-tab-pane label="修改密码" name="resetPwd">
<resetPwd :user="user" /> <resetPwd :user="user" />
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</el-card> </el-card>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
</template> </template>
<script> <script>
import userAvatar from "./userAvatar"; import userAvatar from "./userAvatar";
import userInfo from "./userInfo"; import userInfo from "./userInfo";
import resetPwd from "./resetPwd"; import resetPwd from "./resetPwd";
import { getUserProfile } from "@/api/system/user"; import { getUserProfile } from "@/api/system/user";
export default { export default {
name: "Profile", name: "Profile",
components: { userAvatar, userInfo, resetPwd }, components: { userAvatar, userInfo, resetPwd },
data() { data() {
return { return {
user: {}, user: {},
roleGroup: {}, roleGroup: {},
postGroup: {}, postGroup: {},
activeTab: "userinfo" activeTab: "userinfo"
}; };
}, },
created() { created() {
this.getUser(); this.getUser();
}, },
methods: { methods: {
getUser() { getUser() {
getUserProfile().then(response => { getUserProfile().then(response => {
this.user = response.data; this.user = response.data;
this.roleGroup = response.roleGroup; this.roleGroup = response.roleGroup;
this.postGroup = response.postGroup; this.postGroup = response.postGroup;
}); });
} }
} }
}; };
</script> </script>

4
ruoyi-ui/vue.config.js
View File

@@ -33,8 +33,8 @@ module.exports = {
proxy: { proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy // detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
target: `http://localhost:8083`, // target: `http://localhost:8083`,
// target: `http://120.53.14.147:9995`, target: `http://120.53.14.147:9990/`,
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: '' ['^' + process.env.VUE_APP_BASE_API]: ''