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
6eebec73
Commit
6eebec73
authored
Jan 12, 2024
by
zhaopanyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
zpy 1.12
parent
bab149c7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
278 additions
and
112 deletions
+278
-112
ruoyi-ui/src/api/smartSchool/classAdviser/studentCommendation.js
+16
-0
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentViolation/ViolationDiscipline/index.vue
+1
-0
ruoyi-ui/src/views/smartSchool/classAdviser/studentManage/discipline/index.vue
+16
-8
ruoyi-ui/src/views/smartSchool/classAdviser/studentManage/index.vue
+1
-1
ruoyi-ui/src/views/smartSchool/classAdviser/studentManage/studentCommendation/index.vue
+242
-103
ruoyi-ui/src/views/smartSchool/studentAchievements/scoreEntry/index.vue
+1
-0
ruoyi-ui/src/views/smartSchool/studentAchievements/scoreViewing/index.vue
+1
-0
No files found.
ruoyi-ui/src/api/smartSchool/classAdviser/studentCommendation.js
View file @
6eebec73
...
@@ -72,3 +72,19 @@ export function reviewStudentAward(data) {
...
@@ -72,3 +72,19 @@ export function reviewStudentAward(data) {
data
:
data
,
data
:
data
,
});
});
}
}
//班主任管理--学生嘉奖查看
export
function
listStudent
(
query
)
{
return
request
({
url
:
"/school/studentAward/getStudentAwardList"
,
method
:
"get"
,
params
:
query
,
});
}
//班主任管理--学生违纪查看
export
function
listStudentwj
(
query
)
{
return
request
({
url
:
"/school/discipline/getDisciplineList"
,
method
:
"get"
,
params
:
query
,
});
}
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentViolation/ViolationDiscipline/index.vue
View file @
6eebec73
...
@@ -365,6 +365,7 @@ export default {
...
@@ -365,6 +365,7 @@ export default {
query
:
false
,
query
:
false
,
isEdit
:
false
,
isEdit
:
false
,
gradeLists
:
[],
gradeLists
:
[],
fileList
:
[],
//表格数据
//表格数据
tableData
:
[
tableData
:
[
...
...
ruoyi-ui/src/views/smartSchool/classAdviser/studentManage/discipline/index.vue
View file @
6eebec73
...
@@ -91,6 +91,9 @@
...
@@ -91,6 +91,9 @@
<el-col
:span=
"1.5"
>
<el-col
:span=
"1.5"
>
<el-button
type=
"primary"
plain
icon=
"el-icon-search"
size=
"mini"
@
click=
"handleQuerycx"
>
查询
</el-button>
<el-button
type=
"primary"
plain
icon=
"el-icon-search"
size=
"mini"
@
click=
"handleQuerycx"
>
查询
</el-button>
</el-col>
</el-col>
<!--
<el-col
:span=
"1.5"
>
<el-button
plain
type=
"warning"
icon=
"el-icon-upload2"
size=
"mini"
@
click=
"handleExport"
>
导出
</el-button>
</el-col>
-->
</el-row>
</el-row>
<el-table
:row-style=
"
{ height: '0' }" :cell-style="{ padding: '3px' }" :data="tableData"
<el-table
:row-style=
"
{ height: '0' }" :cell-style="{ padding: '3px' }" :data="tableData"
...
@@ -123,7 +126,7 @@
...
@@ -123,7 +126,7 @@
<el-table-column
align=
"center"
prop=
"idCard"
sortable
label=
"身份证号"
width=
"180"
show-overflow-tooltip
/>
<el-table-column
align=
"center"
prop=
"idCard"
sortable
label=
"身份证号"
width=
"180"
show-overflow-tooltip
/>
<el-table-column
align=
"center"
prop=
"classTeacher"
sortable
label=
"班主任"
width=
"100"
show-overflow-tooltip
/>
<el-table-column
align=
"center"
prop=
"classTeacher"
sortable
label=
"班主任"
width=
"100"
show-overflow-tooltip
/>
<el-table-column
align=
"center"
prop=
"gradeDirector"
sortable
label=
"级部主任"
width=
"100"
show-overflow-tooltip
/>
<el-table-column
align=
"center"
prop=
"gradeDirector"
sortable
label=
"级部主任"
width=
"100"
show-overflow-tooltip
/>
<el-table-column
align=
"center"
prop=
"violateType"
sortable
label=
"违纪类别"
width=
"1
0
0"
show-overflow-tooltip
>
<el-table-column
align=
"center"
prop=
"violateType"
sortable
label=
"违纪类别"
width=
"1
2
0"
show-overflow-tooltip
>
<
template
slot-scope=
"{ row }"
>
<
template
slot-scope=
"{ row }"
>
<div>
{{
selectDictLabel
(
dict
.
type
.
violate_type
,
row
.
violateType
)
}}
</div>
<div>
{{
selectDictLabel
(
dict
.
type
.
violate_type
,
row
.
violateType
)
}}
</div>
</
template
>
</
template
>
...
@@ -145,8 +148,7 @@
...
@@ -145,8 +148,7 @@
<div>
{{
selectDictLabel
(
dict
.
type
.
audit_state
,
row
.
auditState
)
}}
</div>
<div>
{{
selectDictLabel
(
dict
.
type
.
audit_state
,
row
.
auditState
)
}}
</div>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
align=
"center"
fixed=
"right"
label=
"操作"
width=
"110"
>
<el-table-column
align=
"center"
fixed=
"right"
label=
"操作"
width=
"180"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<el-button
@
click=
"handleLook(scope.row)"
type=
"text"
size=
"small"
>
查看
</el-button>
<el-button
@
click=
"handleLook(scope.row)"
type=
"text"
size=
"small"
>
查看
</el-button>
</
template
>
</
template
>
...
@@ -156,7 +158,7 @@
...
@@ -156,7 +158,7 @@
@
pagination=
"getList"
/>
@
pagination=
"getList"
/>
<!-- 查看-->
<!-- 查看-->
<el-dialog
title=
"详细信息"
:visible
.
sync=
"dialogTableVisible"
width=
"1
1
00px"
>
<el-dialog
title=
"详细信息"
:visible
.
sync=
"dialogTableVisible"
width=
"1
2
00px"
>
<el-form
:model=
"form"
ref=
"form"
size=
"small"
label-width=
"120px"
:disabled=
"isEdit"
:rules=
"rules"
>
<el-form
:model=
"form"
ref=
"form"
size=
"small"
label-width=
"120px"
:disabled=
"isEdit"
:rules=
"rules"
>
<el-row>
<el-row>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
...
@@ -226,7 +228,8 @@
...
@@ -226,7 +228,8 @@
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"身份证号"
prop=
"idCard"
>
<el-form-item
label=
"
号"
prop=
"idCard"
>
<el-input
v-model=
"form.idCard"
@
blur=
"handleIdCardBlur"
maxlength=
"18"
placeholder=
"请输入"
<el-input
v-model=
"form.idCard"
@
blur=
"handleIdCardBlur"
maxlength=
"18"
placeholder=
"请输入"
clearable
></el-input>
clearable
></el-input>
</el-form-item>
</el-form-item>
...
@@ -331,9 +334,9 @@ import {
...
@@ -331,9 +334,9 @@ import {
subApply
,
//提交
subApply
,
//提交
getGrade
,
// 获取最新三个年级
getGrade
,
// 获取最新三个年级
getClassList
,
// 根据年级获取班级,
getClassList
,
// 根据年级获取班级,
listDisciplinetg
,
//查看已通过
getTeacher
,
//获取教师
getTeacher
,
//获取教师
}
from
'@/api/smartSchool/awardsDisciplinary/studentViolation/disciplinaryManagemen'
}
from
'@/api/smartSchool/awardsDisciplinary/studentViolation/disciplinaryManagemen'
import
{
listStudentwj
}
from
"@/api/smartSchool/classAdviser/studentCommendation"
;
import
{
checkIdcard
}
from
'@/utils/utilLibrary/validate'
import
{
checkIdcard
}
from
'@/utils/utilLibrary/validate'
export
default
{
export
default
{
name
:
'index'
,
name
:
'index'
,
...
@@ -393,6 +396,7 @@ export default {
...
@@ -393,6 +396,7 @@ export default {
//弹窗
//弹窗
dialogTableVisible
:
false
,
dialogTableVisible
:
false
,
total
:
0
,
total
:
0
,
fileList
:
[],
gradeList
:
[],
gradeList
:
[],
classList
:
[],
classList
:
[],
deptOptions
:
[],
deptOptions
:
[],
...
@@ -584,7 +588,7 @@ export default {
...
@@ -584,7 +588,7 @@ export default {
getList
()
{
getList
()
{
list
Disciplinetg
(
this
.
queryForm
)
list
Studentwj
(
this
.
queryForm
)
.
then
(
response
=>
{
.
then
(
response
=>
{
this
.
tableData
=
response
.
rows
;
this
.
tableData
=
response
.
rows
;
console
.
log
(
'response'
,
response
);
console
.
log
(
'response'
,
response
);
...
@@ -685,7 +689,11 @@ export default {
...
@@ -685,7 +689,11 @@ export default {
this
.
getList
();
this
.
getList
();
this
.
query
=
false
;
this
.
query
=
false
;
},
},
handleExport
()
{
this
.
download
(
'/school/discipline/exportYtg'
,
{
...
this
.
queryParams
},
`学生违纪_
${
new
Date
().
getTime
()}
.xlsx`
)
}
},
},
}
}
</
script
>
</
script
>
...
...
ruoyi-ui/src/views/smartSchool/classAdviser/studentManage/index.vue
View file @
6eebec73
...
@@ -149,7 +149,7 @@
...
@@ -149,7 +149,7 @@
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
key=
"support"
width=
"150"
align=
"center"
prop=
"support"
label=
"接收资助情况"
></el-table-column>
<el-table-column
key=
"support"
width=
"150"
align=
"center"
prop=
"support"
label=
"接收资助情况"
></el-table-column>
<el-table-column
label=
"操作"
align=
"center"
min-width=
"2
2
0px"
fixed=
"right"
>
<el-table-column
label=
"操作"
align=
"center"
min-width=
"2
5
0px"
fixed=
"right"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<el-button
size=
"mini"
type=
"text"
@
click=
"handleUpdate(scope.row)"
>
编辑
<el-button
size=
"mini"
type=
"text"
@
click=
"handleUpdate(scope.row)"
>
编辑
</el-button>
</el-button>
...
...
ruoyi-ui/src/views/smartSchool/classAdviser/studentManage/studentCommendation/index.vue
View file @
6eebec73
<
template
>
<
template
>
<div
class=
"app-container"
>
<div
class=
"app-container"
>
<el-form
:model=
"queryParams"
ref=
"queryForm"
size=
"small"
:inline=
"true"
v-show=
"showSearch"
label-width=
"68px"
>
<el-dialog
title=
"查询"
:visible
.
sync=
"query"
width=
"60%"
append-to-body
>
<el-form-item
label=
"学年"
prop=
"schoolYear"
>
<el-form
:model=
"queryParams"
ref=
"queryForm"
size=
"small"
:inline=
"true"
v-show=
"showSearch"
<el-select
v-model=
"queryParams.schoolYear"
clearable
placeholder=
"请选择"
>
label-width=
"68px"
>
<el-option
v-for=
"dict in dict.type.yearda"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
>
<el-form-item
label=
"学年"
prop=
"schoolYear"
>
</el-option>
<el-select
v-model=
"queryParams.schoolYear"
clearable
placeholder=
"请选择"
>
</el-select>
<el-option
v-for=
"dict in dict.type.yearda"
:key=
"dict.value"
:label=
"dict.label"
</el-form-item>
:value=
"dict.value"
>
<el-form-item
label=
"学期"
prop=
"semester"
>
</el-option>
<el-select
v-model=
"queryParams.semester"
clearable
placeholder=
"请选择"
>
</el-select>
<el-option
v-for=
"dict in dict.type.semester_jsdzda"
:key=
"dict.value"
:label=
"dict.label"
</el-form-item>
:value=
"dict.value"
>
<el-form-item
label=
"学期"
prop=
"semester"
>
</el-option>
<el-select
v-model=
"queryParams.semester"
clearable
placeholder=
"请选择"
>
</el-select>
<el-option
v-for=
"dict in dict.type.semester_jsdzda"
:key=
"dict.value"
:label=
"dict.label"
</el-form-item>
:value=
"dict.value"
>
<el-form-item
label=
"届别"
prop=
"year"
>
</el-option>
<el-select
v-model=
"queryParams.year"
clearable
placeholder=
"请选择"
>
</el-select>
<el-option
v-for=
"dict in dict.type.rankda"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
>
</el-form-item>
</el-option>
<el-form-item
label=
"届别"
prop=
"year"
>
</el-select>
<el-select
v-model=
"queryParams.year"
clearable
placeholder=
"请选择"
>
</el-form-item>
<el-option
v-for=
"dict in dict.type.rankda"
:key=
"dict.value"
:label=
"dict.label"
<el-form-item
label=
"年级"
prop=
"grade"
>
:value=
"dict.value"
>
<el-select
v-model=
"queryParams.grade"
clearable
placeholder=
"请选择"
>
</el-option>
<el-option
v-for=
"dict in dict.type.grade_da"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
>
</el-select>
</el-option>
</el-form-item>
</el-select>
<el-form-item
label=
"年级"
prop=
"grade"
>
</el-form-item>
<el-select
v-model=
"queryParams.grade"
clearable
placeholder=
"请选择"
>
<el-form-item
label=
"班级"
prop=
"className"
>
<el-option
v-for=
"dict in dict.type.grade_da"
:key=
"dict.value"
:label=
"dict.label"
<el-input
v-model=
"queryParams.className"
placeholder=
"请输入班级"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
:value=
"dict.value"
>
</el-form-item>
</el-option>
<el-form-item
label=
"姓名"
prop=
"name"
>
</el-select>
<el-input
v-model=
"queryParams.name"
placeholder=
"请输入姓名"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
</el-form-item>
<el-form-item
label=
"班级"
prop=
"className"
>
<el-form-item
label=
"嘉奖类别"
prop=
"awardType"
>
<el-input
v-model=
"queryParams.className"
placeholder=
"请输入班级"
clearable
<el-input
v-model=
"queryParams.awardType"
placeholder=
"请输入嘉奖级别"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
</el-form-item>
<el-form-item
label=
"姓名"
prop=
"name"
>
<el-form-item
label=
"嘉奖级别"
prop=
"awardRank"
>
<el-input
v-model=
"queryParams.name"
placeholder=
"请输入姓名"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
<el-select
v-model=
"queryParams.awardRank"
clearable
placeholder=
"请选择"
>
</el-form-item>
<el-option
v-for=
"dict in dict.type.student_award_rank"
:key=
"dict.value"
:label=
"dict.label"
<el-form-item
label=
"嘉奖类别"
prop=
"awardType"
>
:value=
"dict.value"
>
<el-input
v-model=
"queryParams.awardType"
placeholder=
"请输入嘉奖级别"
clearable
</el-option>
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"嘉奖级别"
prop=
"awardRank"
>
<el-form-item
label=
"嘉奖时间"
prop=
"awardTime"
>
<el-select
v-model=
"queryParams.awardRank"
clearable
placeholder=
"请选择"
>
<el-date-picker
clearable
v-model=
"queryParams.awardTime"
type=
"date"
value-format=
"yyyy-MM-dd"
<el-option
v-for=
"dict in dict.type.student_award_rank"
:key=
"dict.value"
:label=
"dict.label"
placeholder=
"请选择嘉奖时间"
>
:value=
"dict.value"
>
</el-date-picker>
</el-option>
</el-form-item>
</el-select>
<el-form-item>
</el-form-item>
<el-button
type=
"primary"
icon=
"el-icon-search"
size=
"mini"
@
click=
"handleQuery"
>
搜索
</el-button>
<el-form-item
label=
"嘉奖时间"
prop=
"awardTime"
>
<el-button
icon=
"el-icon-refresh"
size=
"mini"
@
click=
"resetQuery"
>
重置
</el-button>
<el-date-picker
clearable
v-model=
"queryParams.awardTime"
type=
"date"
value-format=
"yyyy-MM-dd"
</el-form-item>
placeholder=
"请选择嘉奖时间"
style=
"width: 192px;"
>
</el-form>
</el-date-picker>
</el-form-item>
<el-form-item
class=
"dialog-footer"
style=
"display: flex; justify-content: center; align-items: center"
>
<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-dialog>
<el-row
:gutter=
"10"
class=
"mb8"
>
<el-row
:gutter=
"10"
class=
"mb8"
>
<el-col
:span=
"1.5"
>
<el-col
:span=
"1.5"
>
<el-button
type=
"primary"
plain
icon=
"el-icon-plus"
size=
"mini"
@
click=
"handleAdd"
<el-button
type=
"success"
plain
icon=
"el-icon-search"
size=
"mini"
@
click=
"handleQuerycx"
>
查询
</el-button>
v-hasPermi=
"['school:studentAward:add']"
>
新增
</el-button>
</el-col>
<el-col
:span=
"1.5"
>
<el-button
type=
"success"
plain
icon=
"el-icon-edit"
size=
"mini"
:disabled=
"single"
@
click=
"handleUpdate"
v-hasPermi=
"['school:studentAward:edit']"
>
修改
</el-button>
</el-col>
<el-col
:span=
"1.5"
>
<el-button
type=
"danger"
plain
icon=
"el-icon-delete"
size=
"mini"
:disabled=
"multiple"
@
click=
"handleDelete"
v-hasPermi=
"['school:studentAward:remove']"
>
删除
</el-button>
</el-col>
</el-col>
<el-col
:span=
"1.5"
>
<el-button
type=
"primary"
plain
icon=
"el-icon-upload"
size=
"mini"
@
click=
"handleImport"
v-hasPermi=
"['school:studentAward:import']"
>
导入
</el-button>
</el-col>
<el-col
:span=
"1.5"
>
<el-button
type=
"warning"
plain
icon=
"el-icon-download"
size=
"mini"
@
click=
"handleExport"
v-hasPermi=
"['school:studentAward:export']"
>
导出
</el-button>
</el-col>
<right-toolbar
:showSearch
.
sync=
"showSearch"
@
queryTable=
"getList"
></right-toolbar>
</el-row>
</el-row>
<el-table
:data=
"studentAwardList"
@
selection-change=
"handleSelectionChange"
>
<el-table
:row-style=
"
{ height: '0' }" :cell-style="{ padding: '3px' }" :data="studentAwardList"
@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=
"schoolYear"
/>
<el-table-column
label=
"学年"
align=
"center"
prop=
"schoolYear"
width=
"100px"
show-overflow-tooltip
/>
<el-table-column
label=
"学期"
align=
"center"
prop=
"semester"
>
<el-table-column
label=
"学期"
align=
"center"
prop=
"semester"
width=
"80px"
show-overflow-tooltip
>
<template
slot-scope=
"scope"
>
<template
slot-scope=
"scope"
>
<dict-tag
:options=
"dict.type.semester_jsdzda"
:value=
"scope.row.semester"
/>
<dict-tag
:options=
"dict.type.semester_jsdzda"
:value=
"scope.row.semester"
/>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"届别"
align=
"center"
prop=
"year"
/>
<el-table-column
label=
"届别"
align=
"center"
prop=
"year"
width=
"60px"
/>
<el-table-column
label=
"年级"
align=
"center"
prop=
"grade"
>
<el-table-column
label=
"年级"
align=
"center"
prop=
"grade"
width=
"60px"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<dict-tag
:options=
"dict.type.grade_da"
:value=
"scope.row.grade"
/>
<dict-tag
:options=
"dict.type.grade_da"
:value=
"scope.row.grade"
/>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"班级"
align=
"center"
prop=
"className"
/>
<el-table-column
label=
"班级"
align=
"center"
prop=
"className"
width=
"60px"
/>
<el-table-column
label=
"姓名"
align=
"center"
prop=
"name"
/>
<el-table-column
label=
"班级类型"
align=
"center"
prop=
"classType"
width=
"80px"
/>
<el-table-column
label=
"班主任"
align=
"center"
prop=
"classTeacher"
/>
<el-table-column
label=
"姓名"
align=
"center"
prop=
"name"
width=
"80px"
show-overflow-tooltip
/>
<el-table-column
label=
"嘉奖级别"
align=
"center"
prop=
"awardRank"
/>
<el-table-column
label=
"班主任"
align=
"center"
prop=
"classTeacher"
width=
"80px"
show-overflow-tooltip
/>
<el-table-column
label=
"嘉奖类别"
align=
"center"
prop=
"awardType"
/>
<el-table-column
label=
"嘉奖级别"
align=
"center"
prop=
"awardRank"
width=
"80px"
>
<el-table-column
label=
"嘉奖时间"
align=
"center"
prop=
"awardTime"
width=
"180"
>
<
template
slot-scope=
"scope"
>
<dict-tag
:options=
"dict.type.student_award_rank"
:value=
"scope.row.awardRank"
/>
</
template
>
</el-table-column>
<el-table-column
label=
"嘉奖类别"
align=
"center"
prop=
"awardType"
width=
"80px"
show-overflow-tooltip
/>
<el-table-column
label=
"嘉奖时间"
align=
"center"
prop=
"awardTime"
width=
"160"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<span>
{{
parseTime
(
scope
.
row
.
awardTime
,
'{y
}
-{m
}
-{d
}
'
)
}}
<
/span
>
<span>
{{
parseTime
(
scope
.
row
.
awardTime
,
'{y
}
-{m
}
-{d
}
'
)
}}
<
/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"
prop
=
"auditState"
fixed
=
"right"
>
<
template
slot
-
scope
=
"scope"
>
<
dict
-
tag
:
options
=
"dict.type.audit_states"
:
value
=
"scope.row.auditState"
/>
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
align
=
"center"
fixed
=
"right"
label
=
"操作"
width
=
"120"
>
<
template
slot
-
scope
=
"scope"
>
<
template
slot
-
scope
=
"scope"
>
<
el
-
button
size
=
"mini"
type
=
"text"
icon
=
"el-icon-edit"
@
click
=
"handleUpdate(scope.row)"
<
el
-
button
@
click
=
"handleLook(scope.row)"
type
=
"text"
size
=
"small"
>
查看
<
/el-button
>
v
-
hasPermi
=
"['school:studentAward:edit']"
>
修改
<
/el-button
>
<
el
-
button
size
=
"mini"
type
=
"text"
icon
=
"el-icon-delete"
@
click
=
"handleDelete(scope.row)"
v
-
hasPermi
=
"['school:studentAward:remove']"
>
删除
<
/el-button
>
<
/template
>
<
/template
>
<
/el-table-column
>
<
/el-table-column
>
<
/el-table
>
<
/el-table
>
...
@@ -117,7 +115,7 @@
...
@@ -117,7 +115,7 @@
<!--
添加或修改学生嘉奖对话框
-->
<!--
添加或修改学生嘉奖对话框
-->
<
el
-
dialog
:
title
=
"title"
:
visible
.
sync
=
"open"
width
=
"800px"
append
-
to
-
body
>
<
el
-
dialog
:
title
=
"title"
:
visible
.
sync
=
"open"
width
=
"800px"
append
-
to
-
body
>
<
el
-
form
ref
=
"form"
:
model
=
"form"
:
rules
=
"rules"
label
-
width
=
"90px"
>
<
el
-
form
ref
=
"form"
:
model
=
"form"
:
rules
=
"rules"
label
-
width
=
"90px"
:
disabled
=
"isEdit"
>
<
el
-
row
>
<
el
-
row
>
<
el
-
col
:
span
=
"12"
>
<
el
-
col
:
span
=
"12"
>
<
el
-
form
-
item
label
=
"学年"
prop
=
"schoolYear"
>
<
el
-
form
-
item
label
=
"学年"
prop
=
"schoolYear"
>
...
@@ -170,7 +168,11 @@
...
@@ -170,7 +168,11 @@
<
/el-col
>
<
/el-col
>
<
el
-
col
:
span
=
"12"
>
<
el
-
col
:
span
=
"12"
>
<
el
-
form
-
item
label
=
"班级类型"
prop
=
"classType"
>
<
el
-
form
-
item
label
=
"班级类型"
prop
=
"classType"
>
<
el
-
input
v
-
model
=
"form.classType"
placeholder
=
"请输入班级类型"
/>
<
el
-
select
v
-
model
=
"form.classType"
clearable
placeholder
=
"请选择"
style
=
"width: 100%"
>
<
el
-
option
v
-
for
=
"dict in dict.type.class_type"
:
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
>
...
@@ -206,7 +208,11 @@
...
@@ -206,7 +208,11 @@
<
/el-col
>
<
/el-col
>
<
el
-
col
:
span
=
"12"
>
<
el
-
col
:
span
=
"12"
>
<
el
-
form
-
item
label
=
"嘉奖级别"
prop
=
"awardRank"
>
<
el
-
form
-
item
label
=
"嘉奖级别"
prop
=
"awardRank"
>
<
el
-
input
v
-
model
=
"form.awardRank"
placeholder
=
"请输入嘉奖级别"
/>
<
el
-
select
v
-
model
=
"form.awardRank"
clearable
placeholder
=
"请选择"
style
=
"width: 100%;"
>
<
el
-
option
v
-
for
=
"dict in dict.type.student_award_rank"
:
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
>
...
@@ -225,16 +231,18 @@
...
@@ -225,16 +231,18 @@
<
/el-col
>
<
/el-col
>
<
/el-row
>
<
/el-row
>
<
/el-form
>
<
/el-form
>
<
div
slot
=
"footer"
class
=
"dialog-footer"
>
<
div
slot
=
"footer"
>
<
el
-
button
type
=
"primary"
@
click
=
"submitForm"
>
确
定
<
/el-button
>
<
el
-
button
v
-
if
=
"!isEdit"
type
=
"primary"
@
click
=
"submitForm"
>
确
定
<
/el-button
>
<
el
-
button
@
click
=
"cancel"
>
取
消
<
/el-button
>
<
el
-
button
@
click
=
"cancel"
>
{{
isEdit
?
'取 消'
:
'取 消'
}}
<
/el-button
>
<
/div
>
<
/div
>
<
/el-dialog
>
<
/el-dialog
>
<
/div
>
<
/div
>
<
/template
>
<
/template
>
<
script
>
<
script
>
import
{
listStudentAward
,
listStudentAwardgr
,
getStudentAward
,
delStudentAward
,
addStudentAward
,
addStudentAwardgr
,
updateStudentAward
,
reviewStudentAward
}
from
"@/api/smartSchool/classAdviser/studentCommendation"
;
import
{
checkIdcard
}
from
'@/utils/utilLibrary/validate'
import
{
listStudentAward
,
listStudentAwardgr
,
getStudentAward
,
delStudentAward
,
addStudentAward
,
addStudentAwardgr
,
updateStudentAward
,
reviewStudentAward
,
listStudent
}
from
"@/api/smartSchool/classAdviser/studentCommendation"
;
export
default
{
export
default
{
name
:
"StudentAward"
,
name
:
"StudentAward"
,
dicts
:
[
'semester_jsdzda'
,
'exam_typeda'
,
'grade_da'
,
'class_type'
,
'yearda'
,
'rankda'
,
'appointment_situation'
,
'appointment_positions'
,
'class_num'
,
'audit_states'
,
'student_award_rank'
],
dicts
:
[
'semester_jsdzda'
,
'exam_typeda'
,
'grade_da'
,
'class_type'
,
'yearda'
,
'rankda'
,
'appointment_situation'
,
'appointment_positions'
,
'class_num'
,
'audit_states'
,
'student_award_rank'
],
...
@@ -258,6 +266,9 @@ export default {
...
@@ -258,6 +266,9 @@ export default {
title
:
""
,
title
:
""
,
// 是否显示弹出层
// 是否显示弹出层
open
:
false
,
open
:
false
,
isEdit
:
false
,
query
:
false
,
look
:
false
,
// 查询参数
// 查询参数
queryParams
:
{
queryParams
:
{
pageNum
:
1
,
pageNum
:
1
,
...
@@ -286,9 +297,46 @@ export default {
...
@@ -286,9 +297,46 @@ export default {
form
:
{
}
,
form
:
{
}
,
// 表单校验
// 表单校验
rules
:
{
rules
:
{
delFlag
:
[
schoolYear
:
[
{
required
:
true
,
message
:
"删除状态不能为空"
,
trigger
:
"blur"
}
{
required
:
true
,
message
:
"学年不能为空"
,
trigger
:
"blur"
}
]
],
semester
:
[
{
required
:
true
,
message
:
"学期不能为空"
,
trigger
:
"blur"
}
],
year
:
[
{
required
:
true
,
message
:
"界别不能为空"
,
trigger
:
"blur"
}
],
grade
:
[
{
required
:
true
,
message
:
"年级不能为空"
,
trigger
:
"blur"
}
],
className
:
[
{
required
:
true
,
message
:
"班级不能为空"
,
trigger
:
"blur"
}
],
classType
:
[
{
required
:
true
,
message
:
"班级类型不能为空"
,
trigger
:
"blur"
}
],
name
:
[
{
required
:
true
,
message
:
"姓名不能为空"
,
trigger
:
"blur"
}
],
idCard
:
[{
required
:
true
,
validator
:
checkIdcard
,
trigger
:
'blur'
}
],
sex
:
[
{
required
:
true
,
message
:
"性别不能为空"
,
trigger
:
"blur"
}
],
classTeacher
:
[
{
required
:
true
,
message
:
"班主任不能为空"
,
trigger
:
"blur"
}
],
departmentDirector
:
[
{
required
:
true
,
message
:
"级部主任不能为空"
,
trigger
:
"blur"
}
],
awardType
:
[
{
required
:
true
,
message
:
"嘉奖类别不能为空"
,
trigger
:
"blur"
}
],
awardRank
:
[
{
required
:
true
,
message
:
"嘉奖级别不能为空"
,
trigger
:
"blur"
}
],
awardTime
:
[
{
required
:
true
,
message
:
"嘉奖时间不能为空"
,
trigger
:
"blur"
}
],
}
}
}
;
}
;
}
,
}
,
...
@@ -299,7 +347,7 @@ export default {
...
@@ -299,7 +347,7 @@ export default {
/** 查询学生嘉奖列表 */
/** 查询学生嘉奖列表 */
getList
()
{
getList
()
{
this
.
loading
=
true
;
this
.
loading
=
true
;
listStudent
Award
(
this
.
queryParams
).
then
(
response
=>
{
listStudent
(
this
.
queryParams
).
then
(
response
=>
{
this
.
studentAwardList
=
response
.
rows
;
this
.
studentAwardList
=
response
.
rows
;
this
.
total
=
response
.
total
;
this
.
total
=
response
.
total
;
this
.
loading
=
false
;
this
.
loading
=
false
;
...
@@ -310,6 +358,69 @@ export default {
...
@@ -310,6 +358,69 @@ export default {
this
.
open
=
false
;
this
.
open
=
false
;
this
.
reset
();
this
.
reset
();
}
,
}
,
handleQuerycx
()
{
this
.
query
=
true
;
}
,
handleQuery
()
{
this
.
getList
();
this
.
query
=
false
;
}
,
//查看
handleLook
(
row
)
{
console
.
log
(
row
);
const
id
=
row
.
id
||
this
.
ids
;
getStudentAward
(
id
).
then
((
response
)
=>
{
this
.
form
=
response
.
data
;
this
.
isEdit
=
true
;
this
.
open
=
true
;
this
.
title
=
"查看学生嘉奖"
;
}
).
catch
(
error
=>
{
this
.
$modal
.
closeLoading
();
}
)
}
,
//审核
handleExamine
(
row
)
{
const
id
=
row
.
id
||
this
.
ids
;
getStudentAward
(
id
).
then
((
response
)
=>
{
this
.
form
=
response
.
data
;
this
.
isEdit
=
true
;
this
.
look
=
true
;
}
).
catch
(
error
=>
{
this
.
$modal
.
closeLoading
();
}
)
}
,
// 同意
handleAgree
()
{
const
params
=
{
id
:
this
.
form
.
id
,
auditState
:
'2'
// 表示同意
}
;
reviewStudentAward
(
params
).
then
(({
code
}
)
=>
{
console
.
log
(
this
.
form
,
'this.form'
);
if
(
code
==
200
)
{
this
.
$modal
.
msgSuccess
(
'操作成功'
)
this
.
open
=
false
;
this
.
getList
()
}
}
)
}
,
// 不同意
handleDisagree
()
{
const
params
=
{
id
:
this
.
form
.
id
,
auditState
:
'3'
// 表示不同意
}
;
reviewStudentAward
(
params
).
then
(({
code
}
)
=>
{
console
.
log
(
this
.
form
,
'this.form'
);
if
(
code
==
200
)
{
this
.
$modal
.
msgSuccess
(
'操作成功'
)
this
.
open
=
false
this
.
getList
()
}
}
)
}
,
// 表单重置
// 表单重置
reset
()
{
reset
()
{
this
.
form
=
{
this
.
form
=
{
...
@@ -342,11 +453,15 @@ export default {
...
@@ -342,11 +453,15 @@ export default {
}
;
}
;
this
.
resetForm
(
"form"
);
this
.
resetForm
(
"form"
);
}
,
}
,
/** 搜索按钮操作 */
handleQuerycx
()
{
this
.
query
=
true
;
}
,
handleQuery
()
{
handleQuery
()
{
this
.
queryParams
.
pageNum
=
1
;
this
.
getList
();
this
.
getList
();
this
.
query
=
false
;
}
,
}
,
/** 重置按钮操作 */
/** 重置按钮操作 */
resetQuery
()
{
resetQuery
()
{
this
.
resetForm
(
"queryForm"
);
this
.
resetForm
(
"queryForm"
);
...
@@ -406,10 +521,33 @@ export default {
...
@@ -406,10 +521,33 @@ export default {
}
,
}
,
/** 导出按钮操作 */
/** 导出按钮操作 */
handleExport
()
{
handleExport
()
{
this
.
download
(
'
school/studentAward/export
'
,
{
this
.
download
(
'
/school/studentAward/exportYtg
'
,
{
...
this
.
queryParams
...
this
.
queryParams
}
,
`学生嘉奖_${new Date().getTime()
}
.xlsx`
)
}
,
`学生嘉奖_${new Date().getTime()
}
.xlsx`
)
}
}
}
}
}
;
}
;
<
/script
>
<
/script
>
<
style
scoped
lang
=
"scss"
>
::
v
-
deep
.
el
-
form
-
item
{
margin
-
bottom
:
12
px
;
}
::
v
-
deep
.
el
-
input
--
medium
.
el
-
input__inner
{
height
:
26
px
;
line
-
height
:
26
px
;
}
::
v
-
deep
.
el
-
dialog__body
{
padding
:
10
px
20
px
}
::
v
-
deep
.
el
-
dialog
:
not
(.
is
-
fullscreen
)
{
margin
-
top
:
4
vh
!
important
;
}
.
search
::
v
-
deep
.
el
-
form
-
item__content
{
width
:
200
px
}
<
/style>
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/studentAchievements/scoreEntry/index.vue
View file @
6eebec73
...
@@ -504,6 +504,7 @@ export default {
...
@@ -504,6 +504,7 @@ export default {
this
.
form
=
response
.
data
;
this
.
form
=
response
.
data
;
this
.
isEdit
=
true
;
this
.
isEdit
=
true
;
this
.
open
=
true
;
this
.
open
=
true
;
this
.
title
=
"查看学生成绩"
;
}
).
catch
(
error
=>
{
}
).
catch
(
error
=>
{
this
.
$modal
.
closeLoading
();
this
.
$modal
.
closeLoading
();
}
)
}
)
...
...
ruoyi-ui/src/views/smartSchool/studentAchievements/scoreViewing/index.vue
View file @
6eebec73
...
@@ -485,6 +485,7 @@ export default {
...
@@ -485,6 +485,7 @@ export default {
this
.
form
=
response
.
data
;
this
.
form
=
response
.
data
;
this
.
isEdit
=
true
;
this
.
isEdit
=
true
;
this
.
open
=
true
;
this
.
open
=
true
;
this
.
title
=
"查看学生成绩"
;
}
).
catch
(
error
=>
{
}
).
catch
(
error
=>
{
this
.
$modal
.
closeLoading
();
this
.
$modal
.
closeLoading
();
}
)
}
)
...
...
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