Commit 4dd2a35c by zhaopanyu

zpy 2.26

parent c8821ee6
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</el-form-item> </el-form-item>
<el-form-item label="班级类型"> <el-form-item label="班级类型">
<el-select v-model="queryForm.classType" clearable placeholder="请选择" style="width: 100%"> <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"> :value="dict.value">
</el-option> </el-option>
</el-select> </el-select>
...@@ -119,9 +119,9 @@ ...@@ -119,9 +119,9 @@
</el-table-column> </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 }">
<div>{{ selectDictLabel(dict.type.grade_type, row.classType) }}</div> <div>{{ selectDictLabel(dict.type.class_type_wj, row.classType) }}</div>
</template> </template> -->
</el-table-column> </el-table-column>
<el-table-column align="center" prop="name" sortable label="姓名" show-overflow-tooltip /> <el-table-column align="center" prop="name" sortable label="姓名" show-overflow-tooltip />
<el-table-column align="center" prop="sex" sortable label="性别"> <el-table-column align="center" prop="sex" sortable label="性别">
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,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="120"> <el-table-column align="center" prop="violateType" sortable label="违纪行为" width="180" 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> -->
...@@ -267,7 +267,7 @@ ...@@ -267,7 +267,7 @@
<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.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"> :value="dict.value">
</el-option> </el-option>
</el-select> </el-select>
...@@ -435,7 +435,7 @@ ...@@ -435,7 +435,7 @@
<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_wj" :key="dict.value" :label="dict.label"
:value="dict.value" /> :value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -598,7 +598,7 @@ ...@@ -598,7 +598,7 @@
<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.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"> :value="dict.value">
</el-option> </el-option>
</el-select> </el-select>
...@@ -722,7 +722,7 @@ export default { ...@@ -722,7 +722,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', '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() { data() {
return { return {
title: "", title: "",
......
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