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
025e7abb
Commit
025e7abb
authored
Jan 17, 2024
by
zhaopanyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
zpy 1.17
parent
6eebec73
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
73 additions
and
199 deletions
+73
-199
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentCommendation/awardEntry/index.vue
+1
-123
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentCommendation/rewardManagement/index.vue
+1
-1
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentViolation/ViolationDiscipline/index.vue
+14
-16
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentViolation/disciplinaryManagemen/index.vue
+25
-31
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentViolation/violationDisciplineentry/index.vue
+28
-25
ruoyi-ui/src/views/smartSchool/electronicArchives/basicInformation/index.vue
+4
-3
No files found.
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentCommendation/awardEntry/index.vue
View file @
025e7abb
...
@@ -264,129 +264,7 @@
...
@@ -264,129 +264,7 @@
<
el
-
button
@
click
=
"cancel"
>
{{
isEdit
?
'取 消'
:
'取 消'
}}
<
/el-button
>
<
el
-
button
@
click
=
"cancel"
>
{{
isEdit
?
'取 消'
:
'取 消'
}}
<
/el-button
>
<
/div
>
<
/div
>
<
/el-dialog
>
<
/el-dialog
>
<!--
审核对话框
-->
<
el
-
dialog
:
title
=
"title"
:
visible
.
sync
=
"look"
width
=
"800px"
append
-
to
-
body
>
<
el
-
form
ref
=
"form"
:
model
=
"form"
label
-
width
=
"90px"
>
<
el
-
row
>
<
el
-
col
:
span
=
"12"
>
<
el
-
form
-
item
label
=
"学年"
prop
=
"schoolYear"
>
<
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-col
>
<
el
-
col
:
span
=
"12"
>
<
el
-
form
-
item
label
=
"学期"
prop
=
"semester"
>
<
el
-
select
v
-
model
=
"form.semester"
clearable
placeholder
=
"请选择"
style
=
"width: 100%;"
>
<
el
-
option
v
-
for
=
"dict in dict.type.semester_jsdzda"
:
key
=
"dict.value"
:
label
=
"dict.label"
:
value
=
"dict.value"
>
<
/el-option
>
<
/el-select
>
<
/el-form-item
>
<
/el-col
>
<
/el-row
>
<
el
-
row
>
<
el
-
col
:
span
=
"12"
>
<
el
-
form
-
item
label
=
"届别"
prop
=
"year"
>
<
el
-
select
v
-
model
=
"form.year"
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-col
>
<
el
-
col
:
span
=
"12"
>
<
el
-
form
-
item
label
=
"年级"
prop
=
"grade"
>
<
el
-
select
v
-
model
=
"form.grade"
clearable
placeholder
=
"请选择"
style
=
"width: 100%;"
>
<
el
-
option
v
-
for
=
"dict in dict.type.grade_da"
:
key
=
"dict.value"
:
label
=
"dict.label"
:
value
=
"dict.value"
>
<
/el-option
>
<
/el-select
>
<
/el-form-item
>
<
/el-col
>
<
/el-row
>
<
el
-
row
>
<
el
-
col
:
span
=
"12"
>
<
el
-
form
-
item
label
=
"班级"
prop
=
"className"
>
<
el
-
select
v
-
model
=
"form.className"
clearable
placeholder
=
"请选择"
style
=
"width: 100%;"
>
<
el
-
option
v
-
for
=
"dict in dict.type.class_num"
:
key
=
"dict.value"
:
label
=
"dict.label"
:
value
=
"dict.value"
>
<
/el-option
>
<
/el-select
>
<
/el-form-item
>
<
/el-col
>
<
el
-
col
:
span
=
"12"
>
<
el
-
form
-
item
label
=
"班级类型"
prop
=
"classType"
>
<
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-col
>
<
/el-row
>
<
el
-
row
>
<
el
-
col
:
span
=
"12"
>
<
el
-
form
-
item
label
=
"姓名"
prop
=
"name"
>
<
el
-
input
v
-
model
=
"form.name"
placeholder
=
"请输入姓名"
/>
<
/el-form-item
>
<
/el-col
>
<
el
-
col
:
span
=
"12"
>
<
el
-
form
-
item
label
=
"身份证号"
prop
=
"idCard"
>
<
el
-
input
v
-
model
=
"form.idCard"
placeholder
=
"请输入身份证号"
/>
<
/el-form-item
>
<
/el-col
>
<
/el-row
>
<
el
-
row
>
<
el
-
col
:
span
=
"12"
>
<
el
-
form
-
item
label
=
"班主任"
prop
=
"classTeacher"
>
<
el
-
input
v
-
model
=
"form.classTeacher"
placeholder
=
"请输入班主任"
/>
<
/el-form-item
>
<
/el-col
>
<
el
-
col
:
span
=
"12"
>
<
el
-
form
-
item
label
=
"级部主任"
prop
=
"departmentDirector"
>
<
el
-
input
v
-
model
=
"form.departmentDirector"
placeholder
=
"请输入级部主任"
/>
<
/el-form-item
>
<
/el-col
>
<
/el-row
>
<
el
-
row
>
<
el
-
col
:
span
=
"12"
>
<
el
-
form
-
item
label
=
"嘉奖类别"
prop
=
"awardType"
>
<
el
-
input
v
-
model
=
"form.awardType"
placeholder
=
"请输入嘉奖类别"
/>
<
/el-form-item
>
<
/el-col
>
<
el
-
col
:
span
=
"12"
>
<
el
-
form
-
item
label
=
"嘉奖级别"
prop
=
"awardRank"
>
<
el
-
select
v
-
model
=
"form.awardRank"
clearable
placeholder
=
"请选择"
>
<
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-col
>
<
/el-row
>
<
el
-
row
>
<
el
-
col
:
span
=
"12"
>
<
el
-
form
-
item
label
=
"嘉奖时间"
prop
=
"awardTime"
>
<
el
-
date
-
picker
clearable
v
-
model
=
"form.awardTime"
type
=
"date"
value
-
format
=
"yyyy-MM-dd"
placeholder
=
"请选择嘉奖时间"
style
=
"width: 100%;"
>
<
/el-date-picker
>
<
/el-form-item
>
<
/el-col
>
<
el
-
col
:
span
=
"12"
>
<
el
-
form
-
item
label
=
"备注"
prop
=
"remark"
>
<
el
-
input
v
-
model
=
"form.remark"
type
=
"textarea"
placeholder
=
"请输入内容"
/>
<
/el-form-item
>
<
/el-col
>
<
/el-row
>
<
/el-form
>
<
div
slot
=
"footer"
class
=
"dialog-footer"
style
=
"text-align: center;"
>
<
el
-
button
@
click
=
"handleAgree"
type
=
"primary"
size
=
"small"
>
同意
<
/el-button
>
<
el
-
button
@
click
=
"handleDisagree"
type
=
"danger"
size
=
"small"
>
不同意
<
/el-button
>
<
/div
>
<
/el-dialog
>
<!--
导入对话框
-->
<!--
导入对话框
-->
<
el
-
dialog
:
title
=
"title"
:
visible
.
sync
=
"uploadOpen"
width
=
"520px"
append
-
to
-
body
inline
>
<
el
-
dialog
:
title
=
"title"
:
visible
.
sync
=
"uploadOpen"
width
=
"520px"
append
-
to
-
body
inline
>
<
el
-
form
ref
=
"uploadForm"
:
model
=
"uploadForm"
:
rules
=
"rules"
label
-
width
=
"70px"
>
<
el
-
form
ref
=
"uploadForm"
:
model
=
"uploadForm"
:
rules
=
"rules"
label
-
width
=
"70px"
>
...
...
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentCommendation/rewardManagement/index.vue
View file @
025e7abb
...
@@ -457,7 +457,7 @@ export default {
...
@@ -457,7 +457,7 @@ export default {
process
.
env
.
VUE_APP_BASE_API
+
"/school/studentAward/importData"
,
process
.
env
.
VUE_APP_BASE_API
+
"/school/studentAward/importData"
,
}
,
}
,
uploadForm
:
{
}
,
uploadForm
:
{
}
,
baseUrl
:
[
process
.
env
.
VUE_APP_BASE_API
],
//
baseUrl: [process.env.VUE_APP_BASE_API],
uploadLoading
:
false
,
uploadLoading
:
false
,
uploadFileLoading
:
false
,
uploadFileLoading
:
false
,
// 遮罩层
// 遮罩层
...
...
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentViolation/ViolationDiscipline/index.vue
View file @
025e7abb
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
</el-form-item>
</el-form-item>
<el-form-item
label=
"届别"
prop=
"gradeYear"
>
<el-form-item
label=
"届别"
prop=
"gradeYear"
>
<el-select
v-model=
"queryForm.gradeYear"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-select
v-model=
"queryForm.gradeYear"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-option
v-for=
"dict in dict.type.rank
da
"
:key=
"dict.value"
:label=
"dict.label"
<el-option
v-for=
"dict in dict.type.rank
wj
"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
>
:value=
"dict.value"
>
</el-option>
</el-option>
</el-select>
</el-select>
...
@@ -58,12 +58,12 @@
...
@@ -58,12 +58,12 @@
:value=
"item.userId"
></el-option>
:value=
"item.userId"
></el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"违纪类别"
>
<
!--
<
el-form-item
label=
"违纪类别"
>
<el-select
v-model=
"queryForm.violateType"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
<el-select
v-model=
"queryForm.violateType"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
<el-option
v-for=
"dict in dict.type.violate_type"
:key=
"dict.value"
:label=
"dict.label"
<el-option
v-for=
"dict in dict.type.violate_type"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
/>
:value=
"dict.value"
/>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
-->
<el-form-item
label=
"违纪次数"
>
<el-form-item
label=
"违纪次数"
>
<el-select
v-model=
"queryForm.violateNum"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
<el-select
v-model=
"queryForm.violateNum"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
<el-option
v-for=
"dict in dict.type.violate_num"
:key=
"dict.value"
:label=
"dict.label"
<el-option
v-for=
"dict in dict.type.violate_num"
:key=
"dict.value"
:label=
"dict.label"
...
@@ -126,11 +126,11 @@
...
@@ -126,11 +126,11 @@
<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=
"120"
show-overflow-tooltip
>
<
!-- <
el-table-column align="center" prop="violateType" sortable label="违纪类别" width="120" 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>
</el-table-column>
</el-table-column>
-->
<el-table-column
align=
"center"
prop=
"violateNum"
sortable
label=
"违纪次数"
width=
"100"
show-overflow-tooltip
>
<el-table-column
align=
"center"
prop=
"violateNum"
sortable
label=
"违纪次数"
width=
"100"
show-overflow-tooltip
>
<
template
slot-scope=
"{ row }"
>
<
template
slot-scope=
"{ row }"
>
<div>
{{
selectDictLabel
(
dict
.
type
.
violate_num
,
row
.
violateNum
)
}}
</div>
<div>
{{
selectDictLabel
(
dict
.
type
.
violate_num
,
row
.
violateNum
)
}}
</div>
...
@@ -182,7 +182,7 @@
...
@@ -182,7 +182,7 @@
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"届别"
prop=
"gradeYear"
>
<el-form-item
label=
"届别"
prop=
"gradeYear"
>
<el-select
v-model=
"form.gradeYear"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-select
v-model=
"form.gradeYear"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-option
v-for=
"dict in dict.type.rank
da
"
:key=
"dict.value"
:label=
"dict.label"
<el-option
v-for=
"dict in dict.type.rank
wj
"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
>
:value=
"dict.value"
>
</el-option>
</el-option>
</el-select>
</el-select>
...
@@ -261,16 +261,12 @@
...
@@ -261,16 +261,12 @@
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"违纪类别"
prop=
"violateType"
>
<
!-- <
el-form-item label="违纪类别" prop="violateType">
<el-select v-model="form.violateType" placeholder="请选择" clearable style="width: 100%;">
<el-select v-model="form.violateType" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for="dict in dict.type.violate_type" :key="dict.value" :label="dict.label"
<el-option v-for="dict in dict.type.violate_type" :key="dict.value" :label="dict.label"
:value="dict.value" />
:value="dict.value" />
</el-select>
</el-select>
</el-form-item>
</el-form-item> -->
</el-col>
</el-row>
<el-row>
<el-col
:span=
"8"
>
<el-form-item
label=
"违纪次数"
prop=
"violateNum"
>
<el-form-item
label=
"违纪次数"
prop=
"violateNum"
>
<el-select
v-model=
"form.violateNum"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
<el-select
v-model=
"form.violateNum"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
<el-option
v-for=
"dict in dict.type.violate_num"
:key=
"dict.value"
:label=
"dict.label"
<el-option
v-for=
"dict in dict.type.violate_num"
:key=
"dict.value"
:label=
"dict.label"
...
@@ -278,6 +274,8 @@
...
@@ -278,6 +274,8 @@
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
</el-row>
<el-row>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"处分结果"
prop=
"punishResult"
>
<el-form-item
label=
"处分结果"
prop=
"punishResult"
>
<el-select
v-model=
"form.punishResult"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
<el-select
v-model=
"form.punishResult"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
...
@@ -340,7 +338,7 @@ import {
...
@@ -340,7 +338,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_state'
,
'semester_jsdzda'
,
'exam_typeda'
,
'grade_da'
,
'class_type'
,
'yearda'
,
'rank
da
'
,
'appointment_situation'
,
'appointment_positions'
,
'class_num'
,
'audit_states'
],
dicts
:
[
'violate_type'
,
'violate_num'
,
'punish_result'
,
'sys_user_sex'
,
'grade_type'
,
'semester'
,
'audit_state'
,
'semester_jsdzda'
,
'exam_typeda'
,
'grade_da'
,
'class_type'
,
'yearda'
,
'rank
wj
'
,
'appointment_situation'
,
'appointment_positions'
,
'class_num'
,
'audit_states'
],
data
()
{
data
()
{
return
{
return
{
queryForm
:
{
queryForm
:
{
...
@@ -432,9 +430,9 @@ export default {
...
@@ -432,9 +430,9 @@ export default {
violateNum
:
[
violateNum
:
[
{
required
:
true
,
message
:
"违纪次数不能为空"
,
trigger
:
"change"
}
{
required
:
true
,
message
:
"违纪次数不能为空"
,
trigger
:
"change"
}
],
],
violateType
:
[
//
violateType: [
{
required
:
true
,
message
:
"违纪类别不能为空"
,
trigger
:
"change"
}
//
{ required: true, message: "违纪类别不能为空", trigger: "change" }
],
//
],
punishResult
:
[
punishResult
:
[
{
required
:
true
,
message
:
"处分结果不能为空"
,
trigger
:
"change"
}
{
required
:
true
,
message
:
"处分结果不能为空"
,
trigger
:
"change"
}
],
],
...
...
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentViolation/disciplinaryManagemen/index.vue
View file @
025e7abb
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
</el-form-item>
</el-form-item>
<el-form-item
label=
"届别"
prop=
"gradeYear"
>
<el-form-item
label=
"届别"
prop=
"gradeYear"
>
<el-select
v-model=
"queryForm.gradeYear"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-select
v-model=
"queryForm.gradeYear"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-option
v-for=
"dict in dict.type.rank
da
"
:key=
"dict.value"
:label=
"dict.label"
<el-option
v-for=
"dict in dict.type.rank
wj
"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
>
:value=
"dict.value"
>
</el-option>
</el-option>
</el-select>
</el-select>
...
@@ -58,12 +58,12 @@
...
@@ -58,12 +58,12 @@
:value=
"item.userId"
></el-option>
:value=
"item.userId"
></el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"违纪类别"
>
<
!--
<
el-form-item
label=
"违纪类别"
>
<el-select
v-model=
"queryForm.violateType"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
<el-select
v-model=
"queryForm.violateType"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
<el-option
v-for=
"dict in dict.type.violate_type"
:key=
"dict.value"
:label=
"dict.label"
<el-option
v-for=
"dict in dict.type.violate_type"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
/>
:value=
"dict.value"
/>
</el-select>
</el-select>
-->
<
/el-form-item
>
<
!--
</el-form-item>
--
>
<el-form-item
label=
"违纪次数"
>
<el-form-item
label=
"违纪次数"
>
<el-select
v-model=
"queryForm.violateNum"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
<el-select
v-model=
"queryForm.violateNum"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
<el-option
v-for=
"dict in dict.type.violate_num"
:key=
"dict.value"
:label=
"dict.label"
<el-option
v-for=
"dict in dict.type.violate_num"
:key=
"dict.value"
:label=
"dict.label"
...
@@ -135,11 +135,11 @@
...
@@ -135,11 +135,11 @@
<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=
"120"
>
<
!-- <
el-table-column align="center" prop="violateType" sortable label="违纪类别" width="120">
<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>
</el-table-column>
</el-table-column>
-->
<el-table-column
align=
"center"
prop=
"violateNum"
sortable
label=
"违纪次数"
width=
"100"
>
<el-table-column
align=
"center"
prop=
"violateNum"
sortable
label=
"违纪次数"
width=
"100"
>
<
template
slot-scope=
"{ row }"
>
<
template
slot-scope=
"{ row }"
>
<div>
{{
selectDictLabel
(
dict
.
type
.
violate_num
,
row
.
violateNum
)
}}
</div>
<div>
{{
selectDictLabel
(
dict
.
type
.
violate_num
,
row
.
violateNum
)
}}
</div>
...
@@ -238,7 +238,7 @@
...
@@ -238,7 +238,7 @@
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"届别"
prop=
"gradeYear"
>
<el-form-item
label=
"届别"
prop=
"gradeYear"
>
<el-select
v-model=
"form.gradeYear"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-select
v-model=
"form.gradeYear"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-option
v-for=
"dict in dict.type.rank
da
"
:key=
"dict.value"
:label=
"dict.label"
<el-option
v-for=
"dict in dict.type.rank
wj
"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
>
:value=
"dict.value"
>
</el-option>
</el-option>
</el-select>
</el-select>
...
@@ -318,16 +318,12 @@
...
@@ -318,16 +318,12 @@
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"违纪类别"
prop=
"violateType"
>
<
!-- <
el-form-item label="违纪类别" prop="violateType">
<el-select v-model="form.violateType" placeholder="请选择" clearable style="width: 100%;">
<el-select v-model="form.violateType" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for="dict in dict.type.violate_type" :key="dict.value" :label="dict.label"
<el-option v-for="dict in dict.type.violate_type" :key="dict.value" :label="dict.label"
:value="dict.value" />
:value="dict.value" />
</el-select>
</el-select>
</el-form-item>
</el-form-item> -->
</el-col>
</el-row>
<el-row>
<el-col
:span=
"8"
>
<el-form-item
label=
"违纪次数"
prop=
"violateNum"
>
<el-form-item
label=
"违纪次数"
prop=
"violateNum"
>
<el-select
v-model=
"form.violateNum"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
<el-select
v-model=
"form.violateNum"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
<el-option
v-for=
"dict in dict.type.violate_num"
:key=
"dict.value"
:label=
"dict.label"
<el-option
v-for=
"dict in dict.type.violate_num"
:key=
"dict.value"
:label=
"dict.label"
...
@@ -335,6 +331,8 @@
...
@@ -335,6 +331,8 @@
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
</el-row>
<el-row>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"处分结果"
prop=
"punishResult"
>
<el-form-item
label=
"处分结果"
prop=
"punishResult"
>
<el-select
v-model=
"form.punishResult"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
<el-select
v-model=
"form.punishResult"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
...
@@ -398,7 +396,7 @@
...
@@ -398,7 +396,7 @@
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"届别"
prop=
"gradeYear"
>
<el-form-item
label=
"届别"
prop=
"gradeYear"
>
<el-select
v-model=
"form.gradeYear"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-select
v-model=
"form.gradeYear"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-option
v-for=
"dict in dict.type.rank
da
"
:key=
"dict.value"
:label=
"dict.label"
<el-option
v-for=
"dict in dict.type.rank
wj
"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
>
:value=
"dict.value"
>
</el-option>
</el-option>
</el-select>
</el-select>
...
@@ -477,16 +475,12 @@
...
@@ -477,16 +475,12 @@
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"违纪类别"
prop=
"violateType"
>
<
!-- <
el-form-item label="违纪类别" prop="violateType">
<el-select v-model="form.violateType" placeholder="请选择" clearable style="width: 100%;">
<el-select v-model="form.violateType" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for="dict in dict.type.violate_type" :key="dict.value" :label="dict.label"
<el-option v-for="dict in dict.type.violate_type" :key="dict.value" :label="dict.label"
:value="dict.value" />
:value="dict.value" />
</el-select>
</el-select>
</el-form-item>
</el-form-item> -->
</el-col>
</el-row>
<el-row>
<el-col
:span=
"8"
>
<el-form-item
label=
"违纪次数"
prop=
"violateNum"
>
<el-form-item
label=
"违纪次数"
prop=
"violateNum"
>
<el-select
v-model=
"form.violateNum"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
<el-select
v-model=
"form.violateNum"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
<el-option
v-for=
"dict in dict.type.violate_num"
:key=
"dict.value"
:label=
"dict.label"
<el-option
v-for=
"dict in dict.type.violate_num"
:key=
"dict.value"
:label=
"dict.label"
...
@@ -494,6 +488,8 @@
...
@@ -494,6 +488,8 @@
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
</el-row>
<el-row>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"处分结果"
prop=
"punishResult"
>
<el-form-item
label=
"处分结果"
prop=
"punishResult"
>
<el-select
v-model=
"form.punishResult"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
<el-select
v-model=
"form.punishResult"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
...
@@ -559,7 +555,7 @@
...
@@ -559,7 +555,7 @@
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"届别"
prop=
"gradeYear"
>
<el-form-item
label=
"届别"
prop=
"gradeYear"
>
<el-select
v-model=
"form.gradeYear"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-select
v-model=
"form.gradeYear"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-option
v-for=
"dict in dict.type.rank
da
"
:key=
"dict.value"
:label=
"dict.label"
<el-option
v-for=
"dict in dict.type.rank
wj
"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
>
:value=
"dict.value"
>
</el-option>
</el-option>
</el-select>
</el-select>
...
@@ -637,16 +633,12 @@
...
@@ -637,16 +633,12 @@
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"违纪类别"
prop=
"violateType"
>
<
!-- <
el-form-item label="违纪类别" prop="violateType">
<el-select v-model="form.violateType" placeholder="请选择" clearable style="width: 100%;">
<el-select v-model="form.violateType" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for="dict in dict.type.violate_type" :key="dict.value" :label="dict.label"
<el-option v-for="dict in dict.type.violate_type" :key="dict.value" :label="dict.label"
:value="dict.value" />
:value="dict.value" />
</el-select>
</el-select>
</el-form-item>
</el-form-item> -->
</el-col>
</el-row>
<el-row>
<el-col
:span=
"8"
>
<el-form-item
label=
"违纪次数"
prop=
"violateNum"
>
<el-form-item
label=
"违纪次数"
prop=
"violateNum"
>
<el-select
v-model=
"form.violateNum"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
<el-select
v-model=
"form.violateNum"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
<el-option
v-for=
"dict in dict.type.violate_num"
:key=
"dict.value"
:label=
"dict.label"
<el-option
v-for=
"dict in dict.type.violate_num"
:key=
"dict.value"
:label=
"dict.label"
...
@@ -654,6 +646,8 @@
...
@@ -654,6 +646,8 @@
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
</el-row>
<el-row>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"处分结果"
prop=
"punishResult"
>
<el-form-item
label=
"处分结果"
prop=
"punishResult"
>
<el-select
v-model=
"form.punishResult"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
<el-select
v-model=
"form.punishResult"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
...
@@ -713,7 +707,7 @@ export default {
...
@@ -713,7 +707,7 @@ export default {
components
:
{
components
:
{
fileUploadn
,
fileUploadn
,
},
},
dicts
:
[
'violate_type'
,
'violate_num'
,
'punish_result'
,
'sys_user_sex'
,
'grade_type'
,
'semester'
,
'audit_state'
,
'semester_jsdzda'
,
'exam_typeda'
,
'grade_da'
,
'class_type'
,
'yearda'
,
'rankda'
,
'appointment_situation'
,
'appointment_positions'
,
'class_num'
,
'audit_states'
],
dicts
:
[
'violate_type'
,
'violate_num'
,
'punish_result'
,
'sys_user_sex'
,
'grade_type'
,
'semester'
,
'audit_state'
,
'semester_jsdzda'
,
'exam_typeda'
,
'grade_da'
,
'class_type'
,
'yearda'
,
'rankda'
,
'appointment_situation'
,
'appointment_positions'
,
'class_num'
,
'audit_states'
,
'rankwj'
],
data
()
{
data
()
{
return
{
return
{
title
:
""
,
title
:
""
,
...
@@ -830,9 +824,9 @@ export default {
...
@@ -830,9 +824,9 @@ export default {
violateNum
:
[
violateNum
:
[
{
required
:
true
,
message
:
"违纪次数不能为空"
,
trigger
:
"change"
}
{
required
:
true
,
message
:
"违纪次数不能为空"
,
trigger
:
"change"
}
],
],
violateType
:
[
//
violateType: [
{
required
:
true
,
message
:
"违纪类别不能为空"
,
trigger
:
"change"
}
//
{ required: true, message: "违纪类别不能为空", trigger: "change" }
],
//
],
punishResult
:
[
punishResult
:
[
{
required
:
true
,
message
:
"处分结果不能为空"
,
trigger
:
"change"
}
{
required
:
true
,
message
:
"处分结果不能为空"
,
trigger
:
"change"
}
],
],
...
...
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentViolation/violationDisciplineentry/index.vue
View file @
025e7abb
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
</el-form-item>
</el-form-item>
<el-form-item
label=
"届别"
prop=
"gradeYear"
>
<el-form-item
label=
"届别"
prop=
"gradeYear"
>
<el-select
v-model=
"queryForm.gradeYear"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-select
v-model=
"queryForm.gradeYear"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-option
v-for=
"dict in dict.type.rank
da
"
:key=
"dict.value"
:label=
"dict.label"
<el-option
v-for=
"dict in dict.type.rank
wj
"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
>
:value=
"dict.value"
>
</el-option>
</el-option>
</el-select>
</el-select>
...
@@ -58,12 +58,12 @@
...
@@ -58,12 +58,12 @@
:value=
"item.userId"
></el-option>
:value=
"item.userId"
></el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"违纪类别"
>
<
!--
<
el-form-item
label=
"违纪类别"
>
<el-select
v-model=
"queryForm.violateType"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
<el-select
v-model=
"queryForm.violateType"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
<el-option
v-for=
"dict in dict.type.violate_type"
:key=
"dict.value"
:label=
"dict.label"
<el-option
v-for=
"dict in dict.type.violate_type"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
/>
:value=
"dict.value"
/>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
-->
<el-form-item
label=
"违纪次数"
>
<el-form-item
label=
"违纪次数"
>
<el-select
v-model=
"queryForm.violateNum"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
<el-select
v-model=
"queryForm.violateNum"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
<el-option
v-for=
"dict in dict.type.violate_num"
:key=
"dict.value"
:label=
"dict.label"
<el-option
v-for=
"dict in dict.type.violate_num"
:key=
"dict.value"
:label=
"dict.label"
...
@@ -136,11 +136,11 @@
...
@@ -136,11 +136,11 @@
<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=
"120"
show-overflow-tooltip
>
<
!-- <
el-table-column align="center" prop="violateType" sortable label="违纪类别" width="120" 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>
</el-table-column>
</el-table-column>
-->
<el-table-column
align=
"center"
prop=
"violateNum"
sortable
label=
"违纪次数"
width=
"100"
show-overflow-tooltip
>
<el-table-column
align=
"center"
prop=
"violateNum"
sortable
label=
"违纪次数"
width=
"100"
show-overflow-tooltip
>
<
template
slot-scope=
"{ row }"
>
<
template
slot-scope=
"{ row }"
>
<div>
{{
selectDictLabel
(
dict
.
type
.
violate_num
,
row
.
violateNum
)
}}
</div>
<div>
{{
selectDictLabel
(
dict
.
type
.
violate_num
,
row
.
violateNum
)
}}
</div>
...
@@ -200,7 +200,7 @@
...
@@ -200,7 +200,7 @@
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"届别"
prop=
"gradeYear"
>
<el-form-item
label=
"届别"
prop=
"gradeYear"
>
<el-select
v-model=
"form.gradeYear"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-select
v-model=
"form.gradeYear"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-option
v-for=
"dict in dict.type.rank
da
"
:key=
"dict.value"
:label=
"dict.label"
<el-option
v-for=
"dict in dict.type.rank
wj
"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
>
:value=
"dict.value"
>
</el-option>
</el-option>
</el-select>
</el-select>
...
@@ -280,16 +280,12 @@
...
@@ -280,16 +280,12 @@
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"违纪类别"
prop=
"violateType"
>
<
!-- <
el-form-item label="违纪类别" prop="violateType">
<el-select v-model="form.violateType" placeholder="请选择" clearable style="width: 100%;">
<el-select v-model="form.violateType" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for="dict in dict.type.violate_type" :key="dict.value" :label="dict.label"
<el-option v-for="dict in dict.type.violate_type" :key="dict.value" :label="dict.label"
:value="dict.value" />
:value="dict.value" />
</el-select>
</el-select>
</el-form-item>
</el-form-item> -->
</el-col>
</el-row>
<el-row>
<el-col
:span=
"8"
>
<el-form-item
label=
"违纪次数"
prop=
"violateNum"
>
<el-form-item
label=
"违纪次数"
prop=
"violateNum"
>
<el-select
v-model=
"form.violateNum"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
<el-select
v-model=
"form.violateNum"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
<el-option
v-for=
"dict in dict.type.violate_num"
:key=
"dict.value"
:label=
"dict.label"
<el-option
v-for=
"dict in dict.type.violate_num"
:key=
"dict.value"
:label=
"dict.label"
...
@@ -297,6 +293,8 @@
...
@@ -297,6 +293,8 @@
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
</el-row>
<el-row>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"处分结果"
prop=
"punishResult"
>
<el-form-item
label=
"处分结果"
prop=
"punishResult"
>
<el-select
v-model=
"form.punishResult"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
<el-select
v-model=
"form.punishResult"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
...
@@ -358,7 +356,7 @@
...
@@ -358,7 +356,7 @@
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"届别"
prop=
"gradeYear"
>
<el-form-item
label=
"届别"
prop=
"gradeYear"
>
<el-select
v-model=
"form.gradeYear"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-select
v-model=
"form.gradeYear"
clearable
placeholder=
"请选择"
style=
"width: 100%;"
>
<el-option
v-for=
"dict in dict.type.rank
da
"
:key=
"dict.value"
:label=
"dict.label"
<el-option
v-for=
"dict in dict.type.rank
wj
"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
>
:value=
"dict.value"
>
</el-option>
</el-option>
</el-select>
</el-select>
...
@@ -438,16 +436,12 @@
...
@@ -438,16 +436,12 @@
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"违纪类别"
prop=
"violateType"
>
<
!-- <
el-form-item label="违纪类别" prop="violateType">
<el-select v-model="form.violateType" placeholder="请选择" clearable style="width: 100%;">
<el-select v-model="form.violateType" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for="dict in dict.type.violate_type" :key="dict.value" :label="dict.label"
<el-option v-for="dict in dict.type.violate_type" :key="dict.value" :label="dict.label"
:value="dict.value" />
:value="dict.value" />
</el-select>
</el-select>
</el-form-item>
</el-form-item> -->
</el-col>
</el-row>
<el-row>
<el-col
:span=
"8"
>
<el-form-item
label=
"违纪次数"
prop=
"violateNum"
>
<el-form-item
label=
"违纪次数"
prop=
"violateNum"
>
<el-select
v-model=
"form.violateNum"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
<el-select
v-model=
"form.violateNum"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
<el-option
v-for=
"dict in dict.type.violate_num"
:key=
"dict.value"
:label=
"dict.label"
<el-option
v-for=
"dict in dict.type.violate_num"
:key=
"dict.value"
:label=
"dict.label"
...
@@ -455,6 +449,8 @@
...
@@ -455,6 +449,8 @@
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
</el-row>
<el-row>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"处分结果"
prop=
"punishResult"
>
<el-form-item
label=
"处分结果"
prop=
"punishResult"
>
<el-select
v-model=
"form.punishResult"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
<el-select
v-model=
"form.punishResult"
placeholder=
"请选择"
clearable
style=
"width: 100%;"
>
...
@@ -553,7 +549,7 @@ export default {
...
@@ -553,7 +549,7 @@ export default {
components
:
{
components
:
{
FilepersonUploadNew
,
FilepersonUploadNew
,
},
},
dicts
:
[
'violate_type'
,
'violate_num'
,
'punish_result'
,
'sys_user_sex'
,
'grade_type'
,
'semester'
,
'audit_state'
,
'semester_jsdzda'
,
'exam_typeda'
,
'grade_da'
,
'class_type'
,
'yearda'
,
'rank
da
'
,
'appointment_situation'
,
'appointment_positions'
,
'class_num'
,
'audit_states'
],
dicts
:
[
'violate_type'
,
'violate_num'
,
'punish_result'
,
'sys_user_sex'
,
'grade_type'
,
'semester'
,
'audit_state'
,
'semester_jsdzda'
,
'exam_typeda'
,
'grade_da'
,
'class_type'
,
'yearda'
,
'rank
wj
'
,
'appointment_situation'
,
'appointment_positions'
,
'class_num'
,
'audit_states'
],
data
()
{
data
()
{
return
{
return
{
title
:
""
,
title
:
""
,
...
@@ -668,9 +664,9 @@ export default {
...
@@ -668,9 +664,9 @@ export default {
violateNum
:
[
violateNum
:
[
{
required
:
true
,
message
:
"违纪次数不能为空"
,
trigger
:
"change"
}
{
required
:
true
,
message
:
"违纪次数不能为空"
,
trigger
:
"change"
}
],
],
violateType
:
[
//
violateType: [
{
required
:
true
,
message
:
"违纪类别不能为空"
,
trigger
:
"change"
}
//
{ required: true, message: "违纪类别不能为空", trigger: "change" }
],
//
],
punishResult
:
[
punishResult
:
[
{
required
:
true
,
message
:
"处分结果不能为空"
,
trigger
:
"change"
}
{
required
:
true
,
message
:
"处分结果不能为空"
,
trigger
:
"change"
}
],
],
...
@@ -684,11 +680,10 @@ export default {
...
@@ -684,11 +680,10 @@ export default {
},
},
created
()
{
created
()
{
this
.
getList
();
this
.
getList
();
this
.
getGradelist
();
//
this.getGradelist();
this
.
getTeacher
();
this
.
getTeacher
();
},
},
methods
:
{
methods
:
{
handleAdd
()
{
handleAdd
()
{
this
.
reset
();
this
.
reset
();
...
@@ -746,6 +741,14 @@ export default {
...
@@ -746,6 +741,14 @@ export default {
this
.
importing
=
true
;
this
.
importing
=
true
;
},
},
//下载模版
importTemplate
()
{
this
.
download
(
"/school/discipline/importTemplate"
,
{},
`违纪管理_
${
Date
.
now
()}
.xlsx`
);
},
// 提交上传文件
// 提交上传文件
submitFileForm
()
{
submitFileForm
()
{
this
.
$refs
.
upload
.
submit
();
this
.
$refs
.
upload
.
submit
();
...
...
ruoyi-ui/src/views/smartSchool/electronicArchives/basicInformation/index.vue
View file @
025e7abb
...
@@ -134,14 +134,15 @@
...
@@ -134,14 +134,15 @@
:cell-style="{ padding: '0px' }" :header-cell-style="{ height: '0px', fontSize: '12px', padding: '0 0' }">
:cell-style="{ padding: '0px' }" :header-cell-style="{ height: '0px', fontSize: '12px', padding: '0 0' }">
<el-table-column
type=
"selection"
width=
"30"
align=
"center"
/>
<el-table-column
type=
"selection"
width=
"30"
align=
"center"
/>
<el-table-column
type=
"index"
label=
"序号"
width=
"30"
align=
"center"
fixed=
"left"
/>
<el-table-column
type=
"index"
label=
"序号"
width=
"30"
align=
"center"
fixed=
"left"
/>
<el-table-column
label=
"姓名"
align=
"center"
prop=
"name"
sortable
fixed=
"left"
show-overflow-tooltip
/>
<el-table-column
label=
"姓名"
align=
"center"
prop=
"name"
width=
"100"
sortable
fixed=
"left"
show-overflow-tooltip
/>
<el-table-column
label=
"性别"
width=
"55"
align=
"center"
prop=
"sex"
sortable
fixed=
"left"
show-overflow-tooltip
>
<el-table-column
label=
"性别"
width=
"55"
align=
"center"
prop=
"sex"
sortable
fixed=
"left"
show-overflow-tooltip
>
<template
slot-scope=
"scope"
>
<template
slot-scope=
"scope"
>
<dict-tag
:options=
"dict.type.sys_user_sex"
:value=
"scope.row.sex"
/>
<dict-tag
:options=
"dict.type.sys_user_sex"
:value=
"scope.row.sex"
/>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"年龄"
width=
"55"
align=
"center"
prop=
"age"
sortable
fixed=
"left"
show-overflow-tooltip
/>
<el-table-column
label=
"年龄"
width=
"55"
align=
"center"
prop=
"age"
sortable
fixed=
"left"
show-overflow-tooltip
/>
<el-table-column
label=
"档案年龄"
align=
"center"
prop=
"fileAge"
sortable
show-overflow-tooltip
/>
<el-table-column
label=
"档案年龄"
align=
"center"
prop=
"fileAge"
sortable
/>
<el-table-column
label=
"政治面貌"
align=
"center"
prop=
"politicalLandscape"
sortable
show-overflow-tooltip
>
<el-table-column
label=
"政治面貌"
align=
"center"
prop=
"politicalLandscape"
sortable
show-overflow-tooltip
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<dict-tag
:options=
"dict.type.politics_tatusls"
:value=
"scope.row.politicalLandscape"
/>
<dict-tag
:options=
"dict.type.politics_tatusls"
:value=
"scope.row.politicalLandscape"
/>
...
@@ -152,7 +153,7 @@
...
@@ -152,7 +153,7 @@
<span>
{{
parseTime
(
scope
.
row
.
fileBirthDate
,
"{y
}
-{m
}
-{d
}
"
)
}}
<
/span
>
<span>
{{
parseTime
(
scope
.
row
.
fileBirthDate
,
"{y
}
-{m
}
-{d
}
"
)
}}
<
/span
>
<
/template
>
<
/template
>
<
/el-table-column
>
<
/el-table-column
>
<
el
-
table
-
column
label
=
"到市二中工作时间"
width
=
"
7
0"
align
=
"center"
prop
=
"toSecondMiddleSchoolTime"
sortable
<
el
-
table
-
column
label
=
"到市二中工作时间"
width
=
"
8
0"
align
=
"center"
prop
=
"toSecondMiddleSchoolTime"
sortable
show
-
overflow
-
tooltip
/>
show
-
overflow
-
tooltip
/>
<
el
-
table
-
column
label
=
"到市二中工作年限"
width
=
"70"
align
=
"center"
prop
=
"toSecondAge"
sortable
show
-
overflow
-
tooltip
/>
<
el
-
table
-
column
label
=
"到市二中工作年限"
width
=
"70"
align
=
"center"
prop
=
"toSecondAge"
sortable
show
-
overflow
-
tooltip
/>
<
el
-
table
-
column
label
=
"现职称"
align
=
"center"
prop
=
"currentHiringProfessionalTitle"
sortable
<
el
-
table
-
column
label
=
"现职称"
align
=
"center"
prop
=
"currentHiringProfessionalTitle"
sortable
...
...
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