Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
dd_school
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangqi
dd_school
Commits
26879d26
Commit
26879d26
authored
Jan 05, 2024
by
zhaopanyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
zpy 1.5
parent
6ea477f4
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
304 additions
and
207 deletions
+304
-207
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentViolation/ViolationDiscipline/index.vue
+62
-40
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentViolation/disciplinaryManagemen/index.vue
+113
-71
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentViolation/violationDisciplineentry/index.vue
+129
-96
No files found.
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentViolation/ViolationDiscipline/index.vue
View file @
26879d26
...
@@ -3,34 +3,41 @@
...
@@ -3,34 +3,41 @@
<el-dialog
title=
"查询"
:visible
.
sync=
"query"
width=
"50%"
append-to-body
>
<el-dialog
title=
"查询"
:visible
.
sync=
"query"
width=
"50%"
append-to-body
>
<el-form
:model=
"queryForm"
ref=
"queryForm"
size=
"small"
:inline=
"true"
label-width=
"68px"
class=
"search"
>
<el-form
:model=
"queryForm"
ref=
"queryForm"
size=
"small"
:inline=
"true"
label-width=
"68px"
class=
"search"
>
<el-form-item
label=
"学年"
>
<el-form-item
label=
"学年"
>
<el-input
v-model=
"queryForm.schoolYear"
placeholder=
"请输入"
clearable
></el-input>
<el-select
v-model=
"queryForm.schoolYear"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-option
v-for=
"dict in dict.type.yearda"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
>
</el-option>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"学期"
>
<el-form-item
label=
"学期"
>
<el-select
v-model=
"queryForm.semester"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
<el-select
v-model=
"queryForm.semester"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-option
v-for=
"dict in dict.type.semester"
:key=
"dict.value"
:label=
"dict.label"
<el-option
v-for=
"dict in dict.type.semester_jsdzda"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
/>
:value=
"dict.value"
>
</el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"届别"
prop=
"gradeYear"
>
<el-form-item
label=
"届别"
prop=
"gradeYear"
>
<el-input
v-model=
"queryForm.gradeYear"
placeholder=
"请输入"
clearable
></el-input>
<el-select
v-model=
"queryForm.gradeYear"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
</el-form-item>
<el-option
v-for=
"dict in dict.type.rankda"
:key=
"dict.value"
:label=
"dict.label"
<el-form-item
label=
"年级"
prop=
"gradeId"
>
:value=
"dict.value"
>
<el-select
v-model=
"form.gradeId"
placeholder=
"请选择"
clearable
:style=
"
{ width: '100%' }"
</el-option>
@change="getClasslist(form.gradeId)">
<el-option
v-for=
"(item, index) in gradeList"
:key=
"index"
:label=
"item.gradeName"
:value=
"item.gradeId"
></el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"班级"
prop=
"classId"
>
<el-form-item
label=
"年级"
prop=
"gradeName"
>
<el-select
v-model=
"queryForm.classId"
placeholder=
"请选择级部"
clearable
:style=
"
{ width: '100%' }">
<el-select
v-model=
"queryForm.gradeName"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-option
v-for=
"(item, index) in classList"
:key=
"index"
:label=
"item.classValue"
<el-option
v-for=
"dict in dict.type.grade_da"
:key=
"dict.value"
:label=
"dict.label"
:value=
"item.classId"
></el-option>
:value=
"dict.value"
>
</el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"班级"
prop=
"className"
>
<el-input
v-model=
"queryForm.className"
placeholder=
"请输入"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"班级类型"
>
<el-form-item
label=
"班级类型"
>
<el-select
v-model=
"queryForm.classType"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
<el-select
v-model=
"queryForm.classType"
clearable
placeholder=
"请选择"
style=
"width: 100%"
>
<el-option
v-for=
"dict in dict.type.grade_type"
:key=
"dict.value"
:label=
"dict.label"
<el-option
v-for=
"dict in dict.type.class_type"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
/>
:value=
"dict.value"
>
</el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"姓名"
>
<el-form-item
label=
"姓名"
>
...
@@ -89,14 +96,18 @@
...
@@ -89,14 +96,18 @@
<el-table
:row-style=
"
{ height: '0' }" :cell-style="{ padding: '3px' }" :data="tableData"
<el-table
:row-style=
"
{ height: '0' }" :cell-style="{ padding: '3px' }" :data="tableData"
:default-sort="{ prop: 'punishTime', order: 'descending' }" border style="width: 100%">
:default-sort="{ prop: 'punishTime', order: 'descending' }" border style="width: 100%">
<el-table-column
align=
"center"
type=
"index"
label=
"序号"
width=
"55"
/>
<el-table-column
align=
"center"
type=
"index"
label=
"序号"
width=
"55"
/>
<el-table-column
align=
"center"
prop=
"schoolYear"
sortable
label=
"学年"
show-overflow-tooltip
/>
<el-table-column
align=
"center"
prop=
"schoolYear"
sortable
label=
"学年"
width=
"110"
show-overflow-tooltip
/>
<el-table-column
align=
"center"
prop=
"semester"
sortable
label=
"学期"
show-overflow-tooltip
>
<el-table-column
align=
"center"
prop=
"semester"
sortable
label=
"学期"
show-overflow-tooltip
>
<template
slot-scope=
"
{ row }">
<template
slot-scope=
"
{ row }">
<div>
{{
selectDictLabel
(
dict
.
type
.
semester
,
row
.
semester
)
}}
</div>
<div>
{{
selectDictLabel
(
dict
.
type
.
semester
,
row
.
semester
)
}}
</div>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
align=
"center"
prop=
"gradeYear"
sortable
label=
"届别"
show-overflow-tooltip
/>
<el-table-column
align=
"center"
prop=
"gradeYear"
sortable
label=
"届别"
show-overflow-tooltip
/>
<el-table-column
align=
"center"
prop=
"gradeName"
sortable
label=
"年级"
width=
"100"
show-overflow-tooltip
/>
<el-table-column
align=
"center"
prop=
"gradeName"
sortable
label=
"年级"
width=
"100"
show-overflow-tooltip
>
<
template
slot-scope=
"scope"
>
<dict-tag
:options=
"dict.type.grade_da"
:value=
"scope.row.gradeName"
/>
</
template
>
</el-table-column>
<el-table-column
align=
"center"
prop=
"className"
sortable
label=
"班级"
show-overflow-tooltip
/>
<el-table-column
align=
"center"
prop=
"className"
sortable
label=
"班级"
show-overflow-tooltip
/>
<el-table-column
align=
"center"
prop=
"classType"
sortable
label=
"班级类型"
width=
"100"
show-overflow-tooltip
>
<el-table-column
align=
"center"
prop=
"classType"
sortable
label=
"班级类型"
width=
"100"
show-overflow-tooltip
>
<
template
slot-scope=
"{ row }"
>
<
template
slot-scope=
"{ row }"
>
...
@@ -150,20 +161,29 @@
...
@@ -150,20 +161,29 @@
<el-row>
<el-row>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"学年"
prop=
"schoolYear"
>
<el-form-item
label=
"学年"
prop=
"schoolYear"
>
<el-input
v-model=
"form.schoolYear"
placeholder=
"请输入"
clearable
></el-input>
<el-select
v-model=
"form.schoolYear"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-option
v-for=
"dict in dict.type.yearda"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
>
</el-option>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"学期"
prop=
"semester"
>
<el-form-item
label=
"学期"
prop=
"semester"
>
<el-select
v-model=
"form.semester"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
<el-select
v-model=
"form.semester"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-option
v-for=
"dict in dict.type.semester"
:key=
"dict.value"
:label=
"dict.label"
<el-option
v-for=
"dict in dict.type.semester_jsdzda"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
/>
:value=
"dict.value"
>
</el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"届别"
prop=
"gradeYear"
>
<el-form-item
label=
"届别"
prop=
"gradeYear"
>
<el-input
v-model=
"form.gradeYear"
placeholder=
"请输入"
clearable
></el-input>
<el-select
v-model=
"form.gradeYear"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-option
v-for=
"dict in dict.type.rankda"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
>
</el-option>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
</el-row>
</el-row>
...
@@ -172,27 +192,29 @@
...
@@ -172,27 +192,29 @@
</el-row>
</el-row>
<el-row>
<el-row>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"年级"
prop=
"grade
Id
"
>
<el-form-item
label=
"年级"
prop=
"grade
Name
"
>
<el-select
v-model=
"form.grade
Id"
placeholder=
"请选择"
clearable
:style=
"{ width: '100%' }"
<el-select
v-model=
"form.grade
Name"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
@
change=
"getClasslist(form.gradeId)"
>
<el-option
v-for=
"dict in dict.type.grade_da"
:key=
"dict.value"
:label=
"dict.label"
<el-option
v-for=
"(item, index) in gradeList"
:key=
"index"
:label=
"item.gradeName"
:value=
"dict.value"
>
:value=
"item.gradeId"
>
</el-option>
</el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"班级"
prop=
"classId"
>
<el-form-item
label=
"班级"
prop=
"className"
>
<el-select
v-model=
"form.classId"
placeholder=
"请选择级部"
clearable
:style=
"{ width: '100%' }"
>
<el-select
v-model=
"form.className"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-option
v-for=
"(item, index) in classList"
:key=
"index"
:label=
"item.classValue"
<el-option
v-for=
"dict in dict.type.class_num"
:key=
"dict.value"
:label=
"dict.label"
:value=
"item.classId"
></el-option>
:value=
"dict.value"
>
</el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"班级类型"
prop=
"classType"
>
<el-form-item
label=
"班级类型"
prop=
"classType"
>
<el-select
v-model=
"form.classType"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
<el-select
v-model=
"form.classType"
placeholder=
"请选择"
clearable
style=
"width: 100%"
>
<el-option
v-for=
"dict in dict.type.grade_type"
:key=
"dict.value"
:label=
"dict.label"
<el-option
v-for=
"dict in dict.type.class_type"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
/>
:value=
"dict.value"
>
</el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
...
@@ -315,7 +337,7 @@ import {
...
@@ -315,7 +337,7 @@ import {
import
{
checkIdcard
}
from
'@/utils/utilLibrary/validate'
import
{
checkIdcard
}
from
'@/utils/utilLibrary/validate'
export
default
{
export
default
{
name
:
'index'
,
name
:
'index'
,
dicts
:
[
'violate_type'
,
'violate_num'
,
'punish_result'
,
'sys_user_sex'
,
'grade_type'
,
'semester'
,
'audit_state1'
],
dicts
:
[
'violate_type'
,
'violate_num'
,
'punish_result'
,
'sys_user_sex'
,
'grade_type'
,
'semester'
,
'audit_state1'
,
'semester_jsdzda'
,
'exam_typeda'
,
'grade_da'
,
'class_type'
,
'yearda'
,
'rankda'
,
'appointment_situation'
,
'appointment_positions'
,
'class_num'
,
'audit_states'
],
data
()
{
data
()
{
return
{
return
{
queryForm
:
{
queryForm
:
{
...
@@ -387,10 +409,10 @@ export default {
...
@@ -387,10 +409,10 @@ export default {
sex
:
[
sex
:
[
{
required
:
true
,
message
:
"性别不能为空"
,
trigger
:
"change"
}
{
required
:
true
,
message
:
"性别不能为空"
,
trigger
:
"change"
}
],
],
grade
Id
:
[
grade
Name
:
[
{
required
:
true
,
message
:
"年级不能为空"
,
trigger
:
"change"
}
{
required
:
true
,
message
:
"年级不能为空"
,
trigger
:
"change"
}
],
],
classId
:
[
gradeName
:
[
{
required
:
true
,
message
:
"班级不能为空"
,
trigger
:
"change"
}
{
required
:
true
,
message
:
"班级不能为空"
,
trigger
:
"change"
}
],
],
name
:
[
name
:
[
...
...
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentViolation/disciplinaryManagemen/index.vue
View file @
26879d26
...
@@ -3,34 +3,41 @@
...
@@ -3,34 +3,41 @@
<el-dialog
title=
"查询"
:visible
.
sync=
"query"
width=
"50%"
append-to-body
>
<el-dialog
title=
"查询"
:visible
.
sync=
"query"
width=
"50%"
append-to-body
>
<el-form
:model=
"queryForm"
ref=
"queryForm"
size=
"small"
:inline=
"true"
label-width=
"68px"
class=
"search"
>
<el-form
:model=
"queryForm"
ref=
"queryForm"
size=
"small"
:inline=
"true"
label-width=
"68px"
class=
"search"
>
<el-form-item
label=
"学年"
>
<el-form-item
label=
"学年"
>
<el-input
v-model=
"queryForm.schoolYear"
placeholder=
"请输入"
clearable
></el-input>
<el-select
v-model=
"queryForm.schoolYear"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-option
v-for=
"dict in dict.type.yearda"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
>
</el-option>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"学期"
>
<el-form-item
label=
"学期"
>
<el-select
v-model=
"queryForm.semester"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
<el-select
v-model=
"queryForm.semester"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-option
v-for=
"dict in dict.type.semester"
:key=
"dict.value"
:label=
"dict.label"
<el-option
v-for=
"dict in dict.type.semester_jsdzda"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
/>
:value=
"dict.value"
>
</el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"届别"
prop=
"gradeYear"
>
<el-form-item
label=
"届别"
prop=
"gradeYear"
>
<el-input
v-model=
"queryForm.gradeYear"
placeholder=
"请输入"
clearable
></el-input>
<el-select
v-model=
"queryForm.gradeYear"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-option
v-for=
"dict in dict.type.rankda"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
>
</el-option>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"年级"
prop=
"gradeId"
>
<el-form-item
label=
"年级"
prop=
"gradeId"
>
<el-select
v-model=
"queryForm.gradeId"
placeholder=
"请选择"
clearable
:style=
"
{ width: '100%' }"
<el-select
v-model=
"queryForm.gradeId"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
@change="handleChange">
<el-option
v-for=
"dict in dict.type.grade_da"
:key=
"dict.value"
:label=
"dict.label"
<el-option
v-for=
"(item, index) in gradeList"
:key=
"index"
:label=
"item.gradeName"
:value=
"dict.value"
>
:value=
"item.gradeId"
>
</el-option>
</el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"班级"
prop=
"classId"
>
<el-form-item
label=
"班级"
prop=
"className"
>
<el-select
v-model=
"queryForm.classId"
placeholder=
"请选择级部"
clearable
:style=
"
{ width: '100%' }">
<el-input
v-model=
"queryForm.className"
placeholder=
"请输入"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
<el-option
v-for=
"(item, index) in classList"
:key=
"index"
:label=
"item.classValue"
:value=
"item.classId"
></el-option>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"班级类型"
>
<el-form-item
label=
"班级类型"
>
<el-select
v-model=
"queryForm.classType"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
<el-select
v-model=
"queryForm.classType"
clearable
placeholder=
"请选择"
style=
"width: 100%"
>
<el-option
v-for=
"dict in dict.type.grade_type"
:key=
"dict.value"
:label=
"dict.label"
<el-option
v-for=
"dict in dict.type.class_type"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
/>
:value=
"dict.value"
>
</el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"姓名"
>
<el-form-item
label=
"姓名"
>
...
@@ -101,14 +108,18 @@
...
@@ -101,14 +108,18 @@
<el-table
:row-style=
"
{ height: '0' }" :cell-style="{ padding: '3px' }" :data="tableData"
<el-table
:row-style=
"
{ height: '0' }" :cell-style="{ padding: '3px' }" :data="tableData"
:default-sort="{ prop: 'punishTime', order: 'descending' }" border style="width: 100%">
:default-sort="{ prop: 'punishTime', order: 'descending' }" border style="width: 100%">
<el-table-column
align=
"center"
type=
"index"
label=
"序号"
width=
"55"
/>
<el-table-column
align=
"center"
type=
"index"
label=
"序号"
width=
"55"
/>
<el-table-column
align=
"center"
prop=
"schoolYear"
sortable
label=
"学年"
show-overflow-tooltip
/>
<el-table-column
align=
"center"
prop=
"schoolYear"
sortable
label=
"学年"
width=
"100px"
show-overflow-tooltip
/>
<el-table-column
align=
"center"
prop=
"semester"
sortable
label=
"学期"
show-overflow-tooltip
>
<el-table-column
align=
"center"
prop=
"semester"
sortable
label=
"学期"
show-overflow-tooltip
>
<template
slot-scope=
"
{ row }">
<template
slot-scope=
"
{ row }">
<div>
{{
selectDictLabel
(
dict
.
type
.
semester
,
row
.
semester
)
}}
</div>
<div>
{{
selectDictLabel
(
dict
.
type
.
semester
,
row
.
semester
)
}}
</div>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
align=
"center"
prop=
"gradeYear"
sortable
label=
"届别"
width=
"90px"
show-overflow-tooltip
/>
<el-table-column
align=
"center"
prop=
"gradeYear"
sortable
label=
"届别"
width=
"90px"
show-overflow-tooltip
/>
<el-table-column
align=
"center"
prop=
"gradeName"
sortable
label=
"年级"
width=
"120px"
show-overflow-tooltip
/>
<el-table-column
align=
"center"
prop=
"gradeName"
sortable
label=
"年级"
width=
"120px"
show-overflow-tooltip
>
<
template
slot-scope=
"scope"
>
<dict-tag
:options=
"dict.type.grade_da"
:value=
"scope.row.gradeName"
/>
</
template
>
</el-table-column>
<el-table-column
align=
"center"
prop=
"className"
sortable
label=
"班级"
show-overflow-tooltip
/>
<el-table-column
align=
"center"
prop=
"className"
sortable
label=
"班级"
show-overflow-tooltip
/>
<el-table-column
align=
"center"
prop=
"classType"
sortable
label=
"班级类型"
width=
"100"
show-overflow-tooltip
>
<el-table-column
align=
"center"
prop=
"classType"
sortable
label=
"班级类型"
width=
"100"
show-overflow-tooltip
>
<
template
slot-scope=
"{ row }"
>
<
template
slot-scope=
"{ row }"
>
...
@@ -208,20 +219,29 @@
...
@@ -208,20 +219,29 @@
<el-row>
<el-row>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"学年"
prop=
"schoolYear"
>
<el-form-item
label=
"学年"
prop=
"schoolYear"
>
<el-input
v-model=
"form.schoolYear"
placeholder=
"请输入"
clearable
></el-input>
<el-select
v-model=
"form.schoolYear"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-option
v-for=
"dict in dict.type.yearda"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
>
</el-option>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"学期"
prop=
"semester"
>
<el-form-item
label=
"学期"
prop=
"semester"
>
<el-select
v-model=
"form.semester"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
<el-select
v-model=
"form.semester"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-option
v-for=
"dict in dict.type.semester"
:key=
"dict.value"
:label=
"dict.label"
<el-option
v-for=
"dict in dict.type.semester_jsdzda"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
/>
:value=
"dict.value"
>
</el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"届别"
prop=
"gradeYear"
>
<el-form-item
label=
"届别"
prop=
"gradeYear"
>
<el-input
v-model=
"form.gradeYear"
placeholder=
"请输入"
clearable
></el-input>
<el-select
v-model=
"form.gradeYear"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-option
v-for=
"dict in dict.type.rankda"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
>
</el-option>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
</el-row>
</el-row>
...
@@ -230,27 +250,29 @@
...
@@ -230,27 +250,29 @@
</el-row>
</el-row>
<el-row>
<el-row>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"年级"
prop=
"grade
Id
"
>
<el-form-item
label=
"年级"
prop=
"grade
Name
"
>
<el-select
v-model=
"form.grade
Id"
placeholder=
"请选择"
clearable
:style=
"{ width: '100%' }"
<el-select
v-model=
"form.grade
Name"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
@
change=
"getClasslist(form.gradeId)"
>
<el-option
v-for=
"dict in dict.type.grade_da"
:key=
"dict.value"
:label=
"dict.label"
<el-option
v-for=
"(item, index) in gradeList"
:key=
"index"
:label=
"item.gradeName"
:value=
"dict.value"
>
:value=
"item.gradeId"
>
</el-option>
</el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"班级"
prop=
"classId"
>
<el-form-item
label=
"班级"
prop=
"className"
>
<el-select
v-model=
"form.classId"
placeholder=
"请选择级部"
clearable
:style=
"{ width: '100%' }"
>
<el-select
v-model=
"form.className"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-option
v-for=
"(item, index) in classList"
:key=
"index"
:label=
"item.classValue"
<el-option
v-for=
"dict in dict.type.class_num"
:key=
"dict.value"
:label=
"dict.label"
:value=
"item.classId"
></el-option>
:value=
"dict.value"
>
</el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"班级类型"
prop=
"classType"
>
<el-form-item
label=
"班级类型"
prop=
"classType"
>
<el-select
v-model=
"form.classType"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
<el-select
v-model=
"form.classType"
placeholder=
"请选择"
clearable
style=
"width: 100%"
>
<el-option
v-for=
"dict in dict.type.grade_type"
:key=
"dict.value"
:label=
"dict.label"
<el-option
v-for=
"dict in dict.type.class_type"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
/>
:value=
"dict.value"
>
</el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
...
@@ -357,20 +379,29 @@
...
@@ -357,20 +379,29 @@
<el-row>
<el-row>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"学年"
prop=
"schoolYear"
>
<el-form-item
label=
"学年"
prop=
"schoolYear"
>
<el-input
v-model=
"form.schoolYear"
placeholder=
"请输入"
clearable
></el-input>
<el-select
v-model=
"form.schoolYear"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-option
v-for=
"dict in dict.type.yearda"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
>
</el-option>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"学期"
prop=
"semester"
>
<el-form-item
label=
"学期"
prop=
"semester"
>
<el-select
v-model=
"form.semester"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
<el-select
v-model=
"form.semester"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-option
v-for=
"dict in dict.type.semester"
:key=
"dict.value"
:label=
"dict.label"
<el-option
v-for=
"dict in dict.type.semester_jsdzda"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
/>
:value=
"dict.value"
>
</el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"届别"
prop=
"gradeYear"
>
<el-form-item
label=
"届别"
prop=
"gradeYear"
>
<el-input
v-model=
"form.gradeYear"
placeholder=
"请输入"
clearable
></el-input>
<el-select
v-model=
"form.gradeYear"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-option
v-for=
"dict in dict.type.rankda"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
>
</el-option>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
</el-row>
</el-row>
...
@@ -379,19 +410,20 @@
...
@@ -379,19 +410,20 @@
</el-row>
</el-row>
<el-row>
<el-row>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"年级"
prop=
"grade
Id
"
>
<el-form-item
label=
"年级"
prop=
"grade
Name
"
>
<el-select
v-model=
"form.grade
Id"
placeholder=
"请选择"
clearable
:style=
"{ width: '100%' }"
<el-select
v-model=
"form.grade
Name"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
@
change=
"getClasslist(form.gradeId)"
>
<el-option
v-for=
"dict in dict.type.grade_da"
:key=
"dict.value"
:label=
"dict.label"
<el-option
v-for=
"(item, index) in gradeList"
:key=
"index"
:label=
"item.gradeName"
:value=
"dict.value"
>
:value=
"item.gradeId"
>
</el-option>
</el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"班级"
prop=
"classId"
>
<el-form-item
label=
"班级"
prop=
"className"
>
<el-select
v-model=
"form.classId"
placeholder=
"请选择级部"
clearable
:style=
"{ width: '100%' }"
>
<el-select
v-model=
"form.className"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-option
v-for=
"(item, index) in classList"
:key=
"index"
:label=
"item.classValue"
<el-option
v-for=
"dict in dict.type.class_num"
:key=
"dict.value"
:label=
"dict.label"
:value=
"item.classId"
></el-option>
:value=
"dict.value"
>
</el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
...
@@ -509,7 +541,11 @@
...
@@ -509,7 +541,11 @@
<el-row>
<el-row>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"学年"
prop=
"schoolYear"
>
<el-form-item
label=
"学年"
prop=
"schoolYear"
>
<el-input
v-model=
"form.schoolYear"
placeholder=
"请输入"
clearable
></el-input>
<el-select
v-model=
"form.schoolYear"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-option
v-for=
"dict in dict.type.yearda"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
>
</el-option>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
...
@@ -522,7 +558,11 @@
...
@@ -522,7 +558,11 @@
</el-col>
</el-col>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"届别"
prop=
"gradeYear"
>
<el-form-item
label=
"届别"
prop=
"gradeYear"
>
<el-input
v-model=
"form.gradeYear"
placeholder=
"请输入"
clearable
></el-input>
<el-select
v-model=
"form.gradeYear"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-option
v-for=
"dict in dict.type.rankda"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
>
</el-option>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
</el-row>
</el-row>
...
@@ -531,27 +571,29 @@
...
@@ -531,27 +571,29 @@
</el-row>
</el-row>
<el-row>
<el-row>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"年级"
prop=
"grade
Id
"
>
<el-form-item
label=
"年级"
prop=
"grade
Name
"
>
<el-select
v-model=
"form.grade
Id"
placeholder=
"请选择"
clearable
:style=
"{ width: '100%' }"
<el-select
v-model=
"form.grade
Name"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
@
change=
"getClasslist(form.gradeId)"
>
<el-option
v-for=
"dict in dict.type.grade_da"
:key=
"dict.value"
:label=
"dict.label"
<el-option
v-for=
"(item, index) in gradeList"
:key=
"index"
:label=
"item.gradeName"
:value=
"dict.value"
>
:value=
"item.gradeId"
>
</el-option>
</el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"班级"
prop=
"classId"
>
<el-form-item
label=
"班级"
prop=
"className"
>
<el-select
v-model=
"form.classId"
placeholder=
"请选择级部"
clearable
:style=
"{ width: '100%' }"
>
<el-select
v-model=
"form.className"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-option
v-for=
"(item, index) in classList"
:key=
"index"
:label=
"item.classValue"
<el-option
v-for=
"dict in dict.type.class_num"
:key=
"dict.value"
:label=
"dict.label"
:value=
"item.classId"
></el-option>
:value=
"dict.value"
>
</el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"班级类型"
prop=
"classType"
>
<el-form-item
label=
"班级类型"
prop=
"classType"
>
<el-select
v-model=
"form.classType"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
<el-select
v-model=
"form.classType"
placeholder=
"请选择"
clearable
style=
"width: 100%"
>
<el-option
v-for=
"dict in dict.type.grade_type"
:key=
"dict.value"
:label=
"dict.label"
<el-option
v-for=
"dict in dict.type.class_type"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
/>
:value=
"dict.value"
>
</el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
...
@@ -671,7 +713,7 @@ export default {
...
@@ -671,7 +713,7 @@ export default {
components
:
{
components
:
{
fileUploadn
,
fileUploadn
,
},
},
dicts
:
[
'violate_type'
,
'violate_num'
,
'punish_result'
,
'sys_user_sex'
,
'grade_type'
,
'semester'
,
'audit_state1'
],
dicts
:
[
'violate_type'
,
'violate_num'
,
'punish_result'
,
'sys_user_sex'
,
'grade_type'
,
'semester'
,
'audit_state1'
,
'semester_jsdzda'
,
'exam_typeda'
,
'grade_da'
,
'class_type'
,
'yearda'
,
'rankda'
,
'appointment_situation'
,
'appointment_positions'
,
'class_num'
,
'audit_states'
],
data
()
{
data
()
{
return
{
return
{
title
:
""
,
title
:
""
,
...
@@ -769,10 +811,10 @@ export default {
...
@@ -769,10 +811,10 @@ export default {
sex
:
[
sex
:
[
{
required
:
true
,
message
:
"性别不能为空"
,
trigger
:
"change"
}
{
required
:
true
,
message
:
"性别不能为空"
,
trigger
:
"change"
}
],
],
grade
Id
:
[
grade
Name
:
[
{
required
:
true
,
message
:
"年级不能为空"
,
trigger
:
"change"
}
{
required
:
true
,
message
:
"年级不能为空"
,
trigger
:
"change"
}
],
],
classId
:
[
gradeName
:
[
{
required
:
true
,
message
:
"班级不能为空"
,
trigger
:
"change"
}
{
required
:
true
,
message
:
"班级不能为空"
,
trigger
:
"change"
}
],
],
name
:
[
name
:
[
...
@@ -1071,8 +1113,8 @@ export default {
...
@@ -1071,8 +1113,8 @@ export default {
schoolYear
:
this
.
form
.
schoolYear
,
schoolYear
:
this
.
form
.
schoolYear
,
semester
:
this
.
form
.
semester
,
semester
:
this
.
form
.
semester
,
gradeYear
:
this
.
form
.
gradeYear
,
gradeYear
:
this
.
form
.
gradeYear
,
grade
Id
:
this
.
form
.
gradeId
,
grade
Name
:
this
.
form
.
gradeName
,
class
Id
:
this
.
form
.
classId
,
class
Name
:
this
.
form
.
className
,
classType
:
this
.
form
.
classType
,
classType
:
this
.
form
.
classType
,
name
:
this
.
form
.
name
,
name
:
this
.
form
.
name
,
sex
:
this
.
form
.
sex
,
sex
:
this
.
form
.
sex
,
...
@@ -1104,8 +1146,8 @@ export default {
...
@@ -1104,8 +1146,8 @@ export default {
schoolYear
:
this
.
form
.
schoolYear
,
schoolYear
:
this
.
form
.
schoolYear
,
semester
:
this
.
form
.
semester
,
semester
:
this
.
form
.
semester
,
gradeYear
:
this
.
form
.
gradeYear
,
gradeYear
:
this
.
form
.
gradeYear
,
grade
Id
:
this
.
form
.
gradeId
,
grade
Name
:
this
.
form
.
gradeName
,
class
Id
:
this
.
form
.
classId
,
class
Name
:
this
.
form
.
className
,
classType
:
this
.
form
.
classType
,
classType
:
this
.
form
.
classType
,
name
:
this
.
form
.
name
,
name
:
this
.
form
.
name
,
sex
:
this
.
form
.
sex
,
sex
:
this
.
form
.
sex
,
...
...
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentViolation/violationDisciplineentry/index.vue
View file @
26879d26
...
@@ -3,34 +3,41 @@
...
@@ -3,34 +3,41 @@
<el-dialog
title=
"查询"
:visible
.
sync=
"query"
width=
"50%"
append-to-body
>
<el-dialog
title=
"查询"
:visible
.
sync=
"query"
width=
"50%"
append-to-body
>
<el-form
:model=
"queryForm"
ref=
"queryForm"
size=
"small"
:inline=
"true"
label-width=
"68px"
class=
"search"
>
<el-form
:model=
"queryForm"
ref=
"queryForm"
size=
"small"
:inline=
"true"
label-width=
"68px"
class=
"search"
>
<el-form-item
label=
"学年"
>
<el-form-item
label=
"学年"
>
<el-input
v-model=
"queryForm.schoolYear"
placeholder=
"请输入"
clearable
></el-input>
<el-select
v-model=
"queryForm.schoolYear"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-option
v-for=
"dict in dict.type.yearda"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
>
</el-option>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"学期"
>
<el-form-item
label=
"学期"
>
<el-select
v-model=
"queryForm.semester"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
<el-select
v-model=
"queryForm.semester"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-option
v-for=
"dict in dict.type.semester"
:key=
"dict.value"
:label=
"dict.label"
<el-option
v-for=
"dict in dict.type.semester_jsdzda"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
/>
:value=
"dict.value"
>
</el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"届别"
prop=
"gradeYear"
>
<el-form-item
label=
"届别"
prop=
"gradeYear"
>
<el-input
v-model=
"queryForm.gradeYear"
placeholder=
"请输入"
clearable
></el-input>
<el-select
v-model=
"queryForm.gradeYear"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
</el-form-item>
<el-option
v-for=
"dict in dict.type.rankda"
:key=
"dict.value"
:label=
"dict.label"
<el-form-item
label=
"年级"
prop=
"gradeId"
>
:value=
"dict.value"
>
<el-select
v-model=
"queryForm.gradeId"
placeholder=
"请选择"
clearable
:style=
"
{ width: '100%' }"
</el-option>
@change="handleChange">
<el-option
v-for=
"(item, index) in gradeList"
:key=
"index"
:label=
"item.gradeName"
:value=
"item.gradeId"
></el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"班级"
prop=
"classId"
>
<el-form-item
label=
"年级"
prop=
"gradeName"
>
<el-select
v-model=
"queryForm.classId"
placeholder=
"请选择级部"
clearable
:style=
"
{ width: '100%' }">
<el-select
v-model=
"queryForm.gradeName"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-option
v-for=
"(item, index) in classList"
:key=
"index"
:label=
"item.classValue"
<el-option
v-for=
"dict in dict.type.grade_da"
:key=
"dict.value"
:label=
"dict.label"
:value=
"item.classId"
></el-option>
:value=
"dict.value"
>
</el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"班级"
prop=
"className"
>
<el-input
v-model=
"queryForm.className"
placeholder=
"请输入"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"班级类型"
>
<el-form-item
label=
"班级类型"
>
<el-select
v-model=
"queryForm.classType"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
<el-select
v-model=
"queryForm.classType"
clearable
placeholder=
"请选择"
style=
"width: 100%"
>
<el-option
v-for=
"dict in dict.type.grade_type"
:key=
"dict.value"
:label=
"dict.label"
<el-option
v-for=
"dict in dict.type.class_type"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
/>
:value=
"dict.value"
>
</el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"姓名"
>
<el-form-item
label=
"姓名"
>
...
@@ -102,14 +109,18 @@
...
@@ -102,14 +109,18 @@
<el-table
:row-style=
"
{ height: '0' }" :cell-style="{ padding: '3px' }" :data="tableData"
<el-table
:row-style=
"
{ height: '0' }" :cell-style="{ padding: '3px' }" :data="tableData"
:default-sort="{ prop: 'punishTime', order: 'descending' }" border style="width: 100%">
:default-sort="{ prop: 'punishTime', order: 'descending' }" border style="width: 100%">
<el-table-column
align=
"center"
type=
"index"
label=
"序号"
width=
"55"
/>
<el-table-column
align=
"center"
type=
"index"
label=
"序号"
width=
"55"
/>
<el-table-column
align=
"center"
prop=
"schoolYear"
sortable
label=
"学年"
show-overflow-tooltip
/>
<el-table-column
align=
"center"
prop=
"schoolYear"
sortable
label=
"学年"
width=
"100px"
show-overflow-tooltip
/>
<el-table-column
align=
"center"
prop=
"semester"
sortable
label=
"学期"
show-overflow-tooltip
>
<el-table-column
align=
"center"
prop=
"semester"
sortable
label=
"学期"
show-overflow-tooltip
>
<template
slot-scope=
"
{ row }">
<template
slot-scope=
"
{ row }">
<div>
{{
selectDictLabel
(
dict
.
type
.
semester
,
row
.
semester
)
}}
</div>
<div>
{{
selectDictLabel
(
dict
.
type
.
semester
,
row
.
semester
)
}}
</div>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
align=
"center"
prop=
"gradeYear"
sortable
label=
"届别"
show-overflow-tooltip
/>
<el-table-column
align=
"center"
prop=
"gradeYear"
sortable
label=
"届别"
show-overflow-tooltip
/>
<el-table-column
align=
"center"
prop=
"gradeName"
sortable
label=
"年级"
width=
"120px"
show-overflow-tooltip
/>
<el-table-column
align=
"center"
prop=
"gradeName"
sortable
label=
"年级"
width=
"120px"
show-overflow-tooltip
>
<
template
slot-scope=
"scope"
>
<dict-tag
:options=
"dict.type.grade_da"
:value=
"scope.row.gradeName"
/>
</
template
>
</el-table-column>
<el-table-column
align=
"center"
prop=
"className"
sortable
label=
"班级"
show-overflow-tooltip
/>
<el-table-column
align=
"center"
prop=
"className"
sortable
label=
"班级"
show-overflow-tooltip
/>
<el-table-column
align=
"center"
prop=
"classType"
sortable
label=
"班级类型"
width=
"100"
show-overflow-tooltip
>
<el-table-column
align=
"center"
prop=
"classType"
sortable
label=
"班级类型"
width=
"100"
show-overflow-tooltip
>
<
template
slot-scope=
"{ row }"
>
<
template
slot-scope=
"{ row }"
>
...
@@ -170,20 +181,29 @@
...
@@ -170,20 +181,29 @@
<el-row>
<el-row>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"学年"
prop=
"schoolYear"
>
<el-form-item
label=
"学年"
prop=
"schoolYear"
>
<el-input
v-model=
"form.schoolYear"
placeholder=
"请输入"
clearable
></el-input>
<el-select
v-model=
"form.schoolYear"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-option
v-for=
"dict in dict.type.yearda"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
>
</el-option>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"学期"
prop=
"semester"
>
<el-form-item
label=
"学期"
prop=
"semester"
>
<el-select
v-model=
"form.semester"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
<el-select
v-model=
"form.semester"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-option
v-for=
"dict in dict.type.semester"
:key=
"dict.value"
:label=
"dict.label"
<el-option
v-for=
"dict in dict.type.semester_jsdzda"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
/>
:value=
"dict.value"
>
</el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"届别"
prop=
"gradeYear"
>
<el-form-item
label=
"届别"
prop=
"gradeYear"
>
<el-input
v-model=
"form.gradeYear"
placeholder=
"请输入"
clearable
></el-input>
<el-select
v-model=
"form.gradeYear"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-option
v-for=
"dict in dict.type.rankda"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
>
</el-option>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
</el-row>
</el-row>
...
@@ -192,27 +212,29 @@
...
@@ -192,27 +212,29 @@
</el-row>
</el-row>
<el-row>
<el-row>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"年级"
prop=
"grade
Id
"
>
<el-form-item
label=
"年级"
prop=
"grade
Name
"
>
<el-select
v-model=
"form.grade
Id"
placeholder=
"请选择"
clearable
:style=
"{ width: '100%' }"
<el-select
v-model=
"form.grade
Name"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
@
change=
"getClasslist(form.gradeId)"
>
<el-option
v-for=
"dict in dict.type.grade_da"
:key=
"dict.value"
:label=
"dict.label"
<el-option
v-for=
"(item, index) in gradeList"
:key=
"index"
:label=
"item.gradeName"
:value=
"dict.value"
>
:value=
"item.gradeId"
>
</el-option>
</el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"班级"
prop=
"classId"
>
<el-form-item
label=
"班级"
prop=
"className"
>
<el-select
v-model=
"form.classId"
placeholder=
"请选择级部"
clearable
:style=
"{ width: '100%' }"
>
<el-select
v-model=
"form.className"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-option
v-for=
"(item, index) in classList"
:key=
"index"
:label=
"item.classValue"
<el-option
v-for=
"dict in dict.type.class_num"
:key=
"dict.value"
:label=
"dict.label"
:value=
"item.classId"
></el-option>
:value=
"dict.value"
>
</el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"班级类型"
prop=
"classType"
>
<el-form-item
label=
"班级类型"
prop=
"classType"
>
<el-select
v-model=
"form.classType"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
<el-select
v-model=
"form.classType"
placeholder=
"请选择"
clearable
style=
"width: 100%"
>
<el-option
v-for=
"dict in dict.type.grade_type"
:key=
"dict.value"
:label=
"dict.label"
<el-option
v-for=
"dict in dict.type.class_type"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
/>
:value=
"dict.value"
>
</el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
...
@@ -317,20 +339,29 @@
...
@@ -317,20 +339,29 @@
<el-row>
<el-row>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"学年"
prop=
"schoolYear"
>
<el-form-item
label=
"学年"
prop=
"schoolYear"
>
<el-input
v-model=
"form.schoolYear"
placeholder=
"请输入"
clearable
></el-input>
<el-select
v-model=
"form.schoolYear"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-option
v-for=
"dict in dict.type.yearda"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
>
</el-option>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"学期"
prop=
"semester"
>
<el-form-item
label=
"学期"
prop=
"semester"
>
<el-select
v-model=
"form.semester"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
<el-select
v-model=
"form.semester"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-option
v-for=
"dict in dict.type.semester"
:key=
"dict.value"
:label=
"dict.label"
<el-option
v-for=
"dict in dict.type.semester_jsdzda"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
/>
:value=
"dict.value"
>
</el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"届别"
prop=
"gradeYear"
>
<el-form-item
label=
"届别"
prop=
"gradeYear"
>
<el-input
v-model=
"form.gradeYear"
placeholder=
"请输入"
clearable
></el-input>
<el-select
v-model=
"form.gradeYear"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-option
v-for=
"dict in dict.type.rankda"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
>
</el-option>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
</el-row>
</el-row>
...
@@ -339,27 +370,29 @@
...
@@ -339,27 +370,29 @@
</el-row>
</el-row>
<el-row>
<el-row>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"年级"
prop=
"grade
Id
"
>
<el-form-item
label=
"年级"
prop=
"grade
Name
"
>
<el-select
v-model=
"form.grade
Id"
placeholder=
"请选择"
clearable
:style=
"{ width: '100%' }"
<el-select
v-model=
"form.grade
Name"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
@
change=
"getClasslist(form.gradeId)"
>
<el-option
v-for=
"dict in dict.type.grade_da"
:key=
"dict.value"
:label=
"dict.label"
<el-option
v-for=
"(item, index) in gradeList"
:key=
"index"
:label=
"item.gradeName"
:value=
"dict.value"
>
:value=
"item.gradeId"
>
</el-option>
</el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"班级"
prop=
"classId"
>
<el-form-item
label=
"班级"
prop=
"className"
>
<el-select
v-model=
"form.classId"
placeholder=
"请选择级部"
clearable
:style=
"{ width: '100%' }"
>
<el-select
v-model=
"form.className"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-option
v-for=
"(item, index) in classList"
:key=
"index"
:label=
"item.classValue"
<el-option
v-for=
"dict in dict.type.class_num"
:key=
"dict.value"
:label=
"dict.label"
:value=
"item.classId"
></el-option>
:value=
"dict.value"
>
</el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"班级类型"
prop=
"classType"
>
<el-form-item
label=
"班级类型"
prop=
"classType"
>
<el-select
v-model=
"form.classType"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
<el-select
v-model=
"form.classType"
placeholder=
"请选择"
clearable
style=
"width: 100%"
>
<el-option
v-for=
"dict in dict.type.grade_type"
:key=
"dict.value"
:label=
"dict.label"
<el-option
v-for=
"dict in dict.type.class_type"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
/>
:value=
"dict.value"
>
</el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
...
@@ -489,7 +522,7 @@ export default {
...
@@ -489,7 +522,7 @@ export default {
components
:
{
components
:
{
FilepersonUploadNew
,
FilepersonUploadNew
,
},
},
dicts
:
[
'violate_type'
,
'violate_num'
,
'punish_result'
,
'sys_user_sex'
,
'grade_type'
,
'semester'
,
'audit_state1'
],
dicts
:
[
'violate_type'
,
'violate_num'
,
'punish_result'
,
'sys_user_sex'
,
'grade_type'
,
'semester'
,
'audit_state1'
,
'semester_jsdzda'
,
'exam_typeda'
,
'grade_da'
,
'class_type'
,
'yearda'
,
'rankda'
,
'appointment_situation'
,
'appointment_positions'
,
'class_num'
,
'audit_states'
],
data
()
{
data
()
{
return
{
return
{
title
:
""
,
title
:
""
,
...
@@ -521,8 +554,8 @@ export default {
...
@@ -521,8 +554,8 @@ export default {
schoolYear
:
""
,
schoolYear
:
""
,
semester
:
""
,
semester
:
""
,
gradeYear
:
""
,
gradeYear
:
""
,
grade
Id
:
""
,
grade
Name
:
""
,
class
Id
:
""
,
class
Name
:
""
,
classType
:
""
,
classType
:
""
,
name
:
""
,
name
:
""
,
sex
:
""
,
sex
:
""
,
...
@@ -550,8 +583,8 @@ export default {
...
@@ -550,8 +583,8 @@ export default {
schoolYear
:
""
,
schoolYear
:
""
,
semester
:
""
,
semester
:
""
,
gradeYear
:
""
,
gradeYear
:
""
,
grade
Id
:
""
,
grade
Name
:
""
,
class
Id
:
""
,
class
Name
:
""
,
classType
:
""
,
classType
:
""
,
name
:
""
,
name
:
""
,
sex
:
""
,
sex
:
""
,
...
@@ -585,10 +618,10 @@ export default {
...
@@ -585,10 +618,10 @@ export default {
sex
:
[
sex
:
[
{
required
:
true
,
message
:
"性别不能为空"
,
trigger
:
"change"
}
{
required
:
true
,
message
:
"性别不能为空"
,
trigger
:
"change"
}
],
],
grade
Id
:
[
grade
Name
:
[
{
required
:
true
,
message
:
"年级不能为空"
,
trigger
:
"change"
}
{
required
:
true
,
message
:
"年级不能为空"
,
trigger
:
"change"
}
],
],
class
Id
:
[
class
Name
:
[
{
required
:
true
,
message
:
"班级不能为空"
,
trigger
:
"change"
}
{
required
:
true
,
message
:
"班级不能为空"
,
trigger
:
"change"
}
],
],
name
:
[
name
:
[
...
@@ -648,13 +681,13 @@ export default {
...
@@ -648,13 +681,13 @@ export default {
this
.
look
=
true
;
this
.
look
=
true
;
this
.
fileList
=
response
.
data
.
schoolAccessoryList
;
this
.
fileList
=
response
.
data
.
schoolAccessoryList
;
console
.
log
(
this
.
fileList
,
'this.fileList'
);
console
.
log
(
this
.
fileList
,
'this.fileList'
);
this
.
form
.
gradeId
=
response
.
data
.
gradeId
;
// this.form.gradeName = response.data.gradeName
;
const
params
=
{
gradeId
:
this
.
form
.
gradeId
};
// const params = { gradeName: this.form.gradeName
};
getClassList
(
params
).
then
(
response
=>
{
//
getClassList(params).then(response => {
this
.
loading
=
false
;
//
this.loading = false;
this
.
classList
=
response
.
data
;
//
this.classList = response.data;
console
.
log
(
"this.classList"
,
this
.
classList
);
//
console.log("this.classList", this.classList);
});
//
});
}).
catch
(
error
=>
{
}).
catch
(
error
=>
{
})
})
...
@@ -714,13 +747,13 @@ export default {
...
@@ -714,13 +747,13 @@ export default {
const
id
=
row
.
id
||
this
.
ids
;
const
id
=
row
.
id
||
this
.
ids
;
getDiscipline
(
id
).
then
((
response
)
=>
{
getDiscipline
(
id
).
then
((
response
)
=>
{
this
.
form
=
response
.
data
;
this
.
form
=
response
.
data
;
this
.
form
.
gradeId
=
response
.
data
.
gradeId
;
// this.form.gradeName = response.data.gradeName
;
const
params
=
{
gradeId
:
this
.
form
.
gradeId
};
// const params = { gradeName: this.form.gradeName
};
getClassList
(
params
).
then
(
response
=>
{
//
getClassList(params).then(response => {
this
.
loading
=
false
;
//
this.loading = false;
this
.
classList
=
response
.
data
;
//
this.classList = response.data;
console
.
log
(
"this.classList"
,
this
.
classList
);
//
console.log("this.classList", this.classList);
});
//
});
this
.
isEdit
=
false
;
this
.
isEdit
=
false
;
this
.
dialogTableVisible
=
true
;
this
.
dialogTableVisible
=
true
;
...
@@ -741,8 +774,8 @@ export default {
...
@@ -741,8 +774,8 @@ export default {
schoolYear
:
""
,
schoolYear
:
""
,
semester
:
""
,
semester
:
""
,
gradeYear
:
""
,
gradeYear
:
""
,
grade
Id
:
""
,
grade
Name
:
""
,
class
Id
:
""
,
class
Name
:
""
,
classType
:
""
,
classType
:
""
,
name
:
""
,
name
:
""
,
sex
:
""
,
sex
:
""
,
...
@@ -845,27 +878,27 @@ export default {
...
@@ -845,27 +878,27 @@ export default {
},
},
// 获取最新三个年级
// 获取最新三个年级
getGradelist
()
{
//
getGradelist() {
getGrade
().
then
(
response
=>
{
//
getGrade().then(response => {
this
.
loading
=
false
;
//
this.loading = false;
this
.
gradeList
=
response
.
data
;
//
this.gradeList = response.data;
this
.
getClasslist
()
//
this.getClasslist()
console
.
log
(
"this.gradeList"
,
this
.
gradeList
);
//
console.log("this.gradeList", this.gradeList);
});
//
});
},
//
},
handleChange
(
selectedGrade
)
{
handleChange
(
selectedGrade
)
{
console
.
log
(
selectedGrade
,
'selectedGrade'
);
console
.
log
(
selectedGrade
,
'selectedGrade'
);
this
.
getClasslist
(
selectedGrade
);
// 传递选择的年级id作为参数
this
.
getClasslist
(
selectedGrade
);
// 传递选择的年级id作为参数
},
},
// 根据年级获取班级
//
//
根据年级获取班级
getClasslist
(
selectedGrade
)
{
//
getClasslist(selectedGrade) {
const
query
=
{
gradeId
:
selectedGrade
};
// 创建包含gradeId
的对象
// const query = { gradeName: selectedGrade }; // 创建包含gradeName
的对象
getClassList
(
query
).
then
(
response
=>
{
//
getClassList(query).then(response => {
this
.
loading
=
false
;
//
this.loading = false;
this
.
classList
=
response
.
data
;
//
this.classList = response.data;
console
.
log
(
"this.classList"
,
this
.
classList
);
//
console.log("this.classList", this.classList);
});
//
});
},
//
},
resetQuery
()
{
resetQuery
()
{
...
@@ -875,8 +908,8 @@ export default {
...
@@ -875,8 +908,8 @@ export default {
schoolYear
:
""
,
schoolYear
:
""
,
semester
:
""
,
semester
:
""
,
gradeYear
:
""
,
gradeYear
:
""
,
grade
Id
:
""
,
grade
Name
:
""
,
class
Id
:
""
,
class
Name
:
""
,
classType
:
""
,
classType
:
""
,
name
:
""
,
name
:
""
,
sex
:
""
,
sex
:
""
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment