Skip to content

D
dd_school
Commit b18a0de5 by wangjian
Options

Merge remote-tracking branch 'origin/master'

parents 06ad99a5 16d364e1
Showing with 62 additions and 37 deletions
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentCommendation/awardEntry/index.vue
......@@ -197,7 +197,7 @@
<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"
<el-option v-for="dict in dict.type.class_type_wj" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
</el-select>
......@@ -305,7 +305,7 @@ import { checkIdcard } from '@/utils/utilLibrary/validate'
import { listStudentAward, listStudentAwardgr, getStudentAward, delStudentAward, addStudentAward, addStudentAwardgr, updateStudentAward, reviewStudentAward } from "@/api/smartSchool/classAdviser/studentCommendation";
export default {
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_wj', 'yearda', 'rankda', 'appointment_situation', 'appointment_positions', 'class_num', 'audit_states', 'student_award_rank'],
data() {
return {
title: "",
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentCommendation/commendationView/index.vue
......@@ -171,7 +171,7 @@
<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"
<el-option v-for="dict in dict.type.class_type_wj" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
</el-select>
......@@ -247,7 +247,7 @@ import { checkIdcard } from '@/utils/utilLibrary/validate'
import { listStudentAward, listStudentAwardgr, getStudentAward, delStudentAward, addStudentAward, addStudentAwardgr, updateStudentAward, reviewStudentAward, listStudentAwardtg } from "@/api/smartSchool/classAdviser/studentCommendation";
export default {
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_wj', 'yearda', 'rankda', 'appointment_situation', 'appointment_positions', 'class_num', 'audit_states', 'student_award_rank'],
data() {
return {
// 遮罩层
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentCommendation/rewardManagement/index.vue
......@@ -103,7 +103,8 @@
</template>
</el-table-column>
<el-table-column label="班级" align="center" prop="className" width="60px" />
<el-table-column label="班级类型" align="center" prop="classType" width="80px" />
<el-table-column label="班级类型" align="center" prop="classType" width="80px">
</el-table-column>
<el-table-column label="姓名" align="center" prop="name" width="80px" show-overflow-tooltip />
<el-table-column label="班主任" align="center" prop="classTeacher" width="80px" show-overflow-tooltip />
<el-table-column label="嘉奖级别" align="center" prop="awardRank" width="80px">
......@@ -205,7 +206,7 @@
<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"
<el-option v-for="dict in dict.type.class_type_wj" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
</el-select>
......@@ -328,7 +329,7 @@
<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"
<el-option v-for="dict in dict.type.class_type_wj" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
</el-select>
......@@ -435,7 +436,7 @@ import { checkIdcard } from '@/utils/utilLibrary/validate'
import { listStudentAward, listStudentAwardgr, getStudentAward, delStudentAward, addStudentAward, addStudentAwardgr, updateStudentAward, reviewStudentAward } from "@/api/smartSchool/classAdviser/studentCommendation";
export default {
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_wj', 'yearda', 'rankda', 'appointment_situation', 'appointment_positions', 'class_num', 'audit_states', 'student_award_rank'],
data() {
return {
title: "",
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentViolation/ViolationDiscipline/index.vue
......@@ -35,7 +35,7 @@
</el-form-item>
<el-form-item label="班级类型">
<el-select v-model="queryForm.classType" clearable placeholder="请选择" style="width: 100%">
<el-option v-for="dict in dict.type.class_type" :key="dict.value" :label="dict.label"
<el-option v-for="dict in dict.type.class_type_wj" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
</el-select>
......@@ -110,9 +110,9 @@
</el-table-column>
<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>
<template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.grade_type, row.classType) }}</div>
</template>
<!-- <template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.class_type_wj, row.classType) }}</div>
</template> -->
</el-table-column>
<el-table-column align="center" prop="name" sortable label="姓名" show-overflow-tooltip />
<el-table-column align="center" prop="sex" sortable label="性别" show-overflow-tooltip>
......@@ -211,7 +211,7 @@
<el-col :span="8">
<el-form-item label="班级类型" prop="classType">
<el-select v-model="form.classType" placeholder="请选择" clearable style="width: 100%">
<el-option v-for="dict in dict.type.class_type" :key="dict.value" :label="dict.label"
<el-option v-for="dict in dict.type.class_type_wj" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
</el-select>
......@@ -339,7 +339,7 @@ import {
import { checkIdcard } from '@/utils/utilLibrary/validate'
export default {
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', 'rankwj', 'appointment_situation', 'appointment_positions', 'class_num', 'audit_states'],
dicts: ['violate_type', 'violate_num', 'punish_result', 'sys_user_sex', 'semester', 'audit_state', 'semester_jsdzda', 'exam_typeda', 'grade_da', 'class_type_wj', 'yearda', 'rankwj', 'appointment_situation', 'appointment_positions', 'class_num', 'audit_states'],
data() {
return {
queryForm: {
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentViolation/disciplinaryManagemen/index.vue
......@@ -35,7 +35,7 @@
</el-form-item>
<el-form-item label="班级类型">
<el-select v-model="queryForm.classType" clearable placeholder="请选择" style="width: 100%">
<el-option v-for="dict in dict.type.class_type" :key="dict.value" :label="dict.label"
<el-option v-for="dict in dict.type.class_type_wj" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
</el-select>
......@@ -119,9 +119,9 @@
</el-table-column>
<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>
<template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.grade_type, row.classType) }}</div>
</template>
<!-- <template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.class_type_wj, row.classType) }}</div>
</template> -->
</el-table-column>
<el-table-column align="center" prop="name" sortable label="姓名" show-overflow-tooltip />
<el-table-column align="center" prop="sex" sortable label="性别">
......@@ -132,7 +132,7 @@
<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="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="180" show-overflow-tooltip>
<!-- <template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.violate_type, row.violateType) }}</div>
</template> -->
......@@ -267,7 +267,7 @@
<el-col :span="8">
<el-form-item label="班级类型" prop="classType">
<el-select v-model="form.classType" placeholder="请选择" clearable style="width: 100%">
<el-option v-for="dict in dict.type.class_type" :key="dict.value" :label="dict.label"
<el-option v-for="dict in dict.type.class_type_wj" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
</el-select>
......@@ -435,7 +435,7 @@
<el-col :span="8">
<el-form-item label="班级类型" prop="classType">
<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_wj" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
......@@ -598,7 +598,7 @@
<el-col :span="8">
<el-form-item label="班级类型" prop="classType">
<el-select v-model="form.classType" placeholder="请选择" clearable style="width: 100%">
<el-option v-for="dict in dict.type.class_type" :key="dict.value" :label="dict.label"
<el-option v-for="dict in dict.type.class_type_wj" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
</el-select>
......@@ -722,7 +722,7 @@ export default {
components: {
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', 'rankwj'],
dicts: ['violate_type', 'violate_num', 'punish_result', 'sys_user_sex', 'class_type_wj', 'semester', 'audit_state', 'semester_jsdzda', 'exam_typeda', 'grade_da', 'class_type_wj', 'yearda', 'rankda', 'appointment_situation', 'appointment_positions', 'class_num', 'audit_states', 'rankwj'],
data() {
return {
title: "",
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentViolation/violationDisciplineentry/index.vue
......@@ -35,7 +35,7 @@
</el-form-item>
<el-form-item label="班级类型">
<el-select v-model="queryForm.classType" clearable placeholder="请选择" style="width: 100%">
<el-option v-for="dict in dict.type.class_type" :key="dict.value" :label="dict.label"
<el-option v-for="dict in dict.type.class_type_wj" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
</el-select>
......@@ -120,9 +120,9 @@
</el-table-column>
<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>
<template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.grade_type, row.classType) }}</div>
</template>
<!-- <template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.class_type_wj, row.classType) }}</div>
</template> -->
</el-table-column>
<el-table-column align="center" prop="name" sortable label="姓名" show-overflow-tooltip />
<el-table-column align="center" prop="sex" sortable label="性别">
......@@ -229,7 +229,7 @@
<el-col :span="8">
<el-form-item label="班级类型" prop="classType">
<el-select v-model="form.classType" placeholder="请选择" clearable style="width: 100%">
<el-option v-for="dict in dict.type.class_type" :key="dict.value" :label="dict.label"
<el-option v-for="dict in dict.type.class_type_wj" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
</el-select>
......@@ -386,7 +386,7 @@
<el-col :span="8">
<el-form-item label="班级类型" prop="classType">
<el-select v-model="form.classType" placeholder="请选择" clearable style="width: 100%">
<el-option v-for="dict in dict.type.class_type" :key="dict.value" :label="dict.label"
<el-option v-for="dict in dict.type.class_type_wj" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
</el-select>
......@@ -547,7 +547,7 @@ export default {
components: {
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', 'rankwj', 'appointment_situation', 'appointment_positions', 'class_num', 'audit_states'],
dicts: ['violate_type', 'violate_num', 'punish_result', 'sys_user_sex', 'semester', 'audit_state', 'semester_jsdzda', 'exam_typeda', 'grade_da', 'class_type_wj', 'yearda', 'rankwj', 'appointment_situation', 'appointment_positions', 'class_num', 'audit_states'],
data() {
return {
title: "",
......
ruoyi-ui/src/views/smartSchool/electronicArchives/personalInformation/index.vue
......@@ -604,6 +604,11 @@
show-overflow-tooltip />
<el-table-column label="智育考核成绩" align="center" prop="intellEduCheckAchievement" width="130px"
show-overflow-tooltip />
<el-table-column label="考核结果" align="center" prop="assessmentResults" width="130px">
<template slot-scope="scope">
<dict-tag :options="dict.type.assessment_results" :value="scope.row.assessmentResults" />
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
</el-table>
</div>
......@@ -857,7 +862,7 @@ export default {
"award_type_fdjs",
"award_type_fdxs",
"award_rank",
"awards_level", 'coachingr', 'check_result', 'appointment_situation', 'award_categoriesjs', 'award_categoriesjk', 'award_categories', 'project_research'],
"awards_level", 'coachingr', 'check_result', 'appointment_situation', 'award_categoriesjs', 'award_categoriesjk', 'award_categories', 'project_research', 'assessment_results'],
data() {
return {
sex: '',
......
ruoyi-ui/src/views/smartSchool/electronicArchives/teacherAssessment/index.vue
......@@ -163,10 +163,14 @@
show-overflow-tooltip />
<el-table-column label="智育考核成绩" align="center" prop="intellEduCheckAchievement" sortable width="110px"
show-overflow-tooltip />
<el-table-column label="考核结果" align="center" prop="assessmentResults" sortable width="130px">
<template slot-scope="scope">
<dict-tag :options="dict.type.assessment_results" :value="scope.row.assessmentResults" />
</template>
</el-table-column>
<!-- <el-table-column label="总考核成绩" align="center" prop="totalCheckAchievement" sortable fixed="right"
width="130px" /> -->
<el-table-column label="备注" align="center" prop="remark" sortable show-overflow-tooltip />
<el-table-column label="备注" align="center" prop="remark" sortable show-overflow-tooltip />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="150px">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
......@@ -259,9 +263,16 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="总考核成绩" prop="totalCheckAchievement">
<el-input v-model="form.totalCheckAchievement" type="number" placeholder="请输入" clearable />
<el-form-item label="考核结果" prop="assessmentResults">
<el-select v-model="form.assessmentResults" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.assessment_results" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="总考核成绩" prop="totalCheckAchievement">
<el-input v-model="form.totalCheckAchievement" type="number" placeholder="请输入" clearable />
</el-form-item> -->
</el-col>
</el-row>
......@@ -337,7 +348,7 @@ import { listAssessment, getAssessment, delAssessment, addAssessment, updateAsse
import { getToken } from "@/utils/auth";
export default {
name: "Assessment",
dicts: ["teaching_subjects", 'semester_jsdzda', 'exam_typeda', 'grade_da', 'class_type', 'yearda', 'rankda', 'appointment_situation', 'appointment_positions', 'class_num', 'audit_states'],
dicts: ["teaching_subjects", 'semester_jsdzda', 'exam_typeda', 'grade_da', 'class_type', 'yearda', 'rankda', 'appointment_situation', 'appointment_positions', 'class_num', 'audit_states', 'assessment_results'],
data() {
return {
importing: false,
......@@ -434,6 +445,9 @@ export default {
sub: [
{ required: true, message: "学科不能为空", trigger: "blur" }
],
assessmentResults: [
{ required: true, message: "考核结果不能为空", trigger: "blur" }
],
}
};
......
ruoyi-ui/src/views/smartSchool/personWork/personalInformation/index.vue
......@@ -592,6 +592,11 @@
show-overflow-tooltip />
<el-table-column label="智育考核成绩" align="center" prop="intellEduCheckAchievement" width="130px"
show-overflow-tooltip />
<el-table-column label="考核结果" align="center" prop="assessmentResults" width="130px">
<template slot-scope="scope">
<dict-tag :options="dict.type.assessment_results" :value="scope.row.assessmentResults" />
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
</el-table>
</div>
......@@ -844,7 +849,7 @@ export default {
"award_type_fdjs",
"award_type_fdxs",
"award_rank",
"awards_level", 'coachingr', 'check_result', 'appointment_situation', 'award_categoriesjs', 'award_categoriesjk', 'award_categories', 'project_research'],
"awards_level", 'coachingr', 'check_result', 'appointment_situation', 'award_categoriesjs', 'award_categoriesjk', 'award_categories', 'project_research', 'assessment_results'],
data() {
return {
sex: '',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment