Commit 65e99e18 by zhaopanyu

zpy

parent f01d5e4f
<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="98px"> <el-dialog title="查询" :visible.sync="query" width="50%" append-to-body>
<el-form ref="queryParams" :model="queryParams" label-width="96px">
<el-row>
<el-col :span="12">
<el-form-item label="姓名" prop="teacherName"> <el-form-item label="姓名" prop="teacherName">
<el-input v-model="queryParams.teacherName" placeholder="请输入" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.teacherName" placeholder="请输入" clearable
@keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">>
<el-form-item label="学年" prop="schoolYear"> <el-form-item label="学年" prop="schoolYear">
<el-select v-model="queryParams.schoolYear" placeholder="请选择" style="width: 190px;"> <el-select v-model="queryParams.schoolYear" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.yearda" :key="dict.value" :label="dict.label" :value="dict.value"> <el-option v-for="dict in dict.type.yearda" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="届别" prop="year"> <el-form-item label="届别" prop="year">
<el-select v-model="queryParams.year" placeholder="请选择"> <el-select v-model="queryParams.year" placeholder="请选择">
<el-option v-for="dict in dict.type.rankda" :key="dict.value" :label="dict.label" :value="dict.value"> <el-option v-for="dict in dict.type.rankda" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item></el-col>
<el-col :span="12">
<el-form-item label="学期" prop="semester"> <el-form-item label="学期" prop="semester">
<el-select v-model="queryParams.semester" placeholder="请选择"> <el-select v-model="queryParams.semester" placeholder="请选择">
<el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label"
...@@ -23,12 +36,19 @@ ...@@ -23,12 +36,19 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="年级" prop="grade"> <el-form-item label="年级" prop="grade">
<el-select v-model="queryParams.grade" placeholder="请选择" style="width: 100%;"> <el-select v-model="queryParams.grade" 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 v-for="dict in dict.type.grade_da" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="学科" prop="sub"> <el-form-item label="学科" prop="sub">
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%"> <el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
...@@ -36,6 +56,10 @@ ...@@ -36,6 +56,10 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="班级类型" prop="classType"> <el-form-item label="班级类型" prop="classType">
<el-select v-model="queryParams.classType" placeholder="请选择" style="width: 100%"> <el-select v-model="queryParams.classType" 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" :key="dict.value" :label="dict.label"
...@@ -43,24 +67,39 @@ ...@@ -43,24 +67,39 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="班级" prop="className"> <el-form-item label="班级" prop="className">
<el-input v-model="queryParams.className" placeholder="请输入" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.className" placeholder="请输入" clearable
@keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="德育考核成绩" prop="moralEduCheckAchievement"> <el-form-item label="德育考核成绩" prop="moralEduCheckAchievement">
<el-input v-model="queryParams.moralEduCheckAchievement" placeholder="请输入" clearable <el-input v-model="queryParams.moralEduCheckAchievement" placeholder="请输入" clearable
@keyup.enter.native="handleQuery" /> @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="智育考核成绩" prop="intellEduCheckAchievement"> <el-form-item label="智育考核成绩" prop="intellEduCheckAchievement">
<el-input v-model="queryParams.intellEduCheckAchievement" placeholder="请输入" clearable <el-input v-model="queryParams.intellEduCheckAchievement" placeholder="请输入" clearable
@keyup.enter.native="handleQuery" /> @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <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-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </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-search" size="mini" @click="handleQuerycx">查询</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:assessment:add']">新增</el-button> v-hasPermi="['system:assessment:add']">新增</el-button>
</el-col> </el-col>
...@@ -84,7 +123,8 @@ ...@@ -84,7 +123,8 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table :data="assessmentList" @selection-change="handleSelectionChange" <el-table :data="assessmentList" @selection-change="handleSelectionChange"
:default-sort="{ prop: 'schoolYear', order: 'descending' }"> :default-sort="{ prop: 'schoolYear', order: 'descending' }" :row-style="{ height: '0' }"
:cell-style="{ padding: '3px' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" /> <el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" />
<el-table-column label="学年" align="center" prop="schoolYear" sortable fixed="left" /> <el-table-column label="学年" align="center" prop="schoolYear" sortable fixed="left" />
...@@ -99,8 +139,8 @@ ...@@ -99,8 +139,8 @@
<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" sortable /> <el-table-column label="班级" align="center" prop="className" sortable show-overflow-tooltip />
<el-table-column label="班级类型" align="center" prop="classType" sortable width="180px"> <el-table-column label="班级类型" align="center" prop="classType" sortable width="180px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="getSelectedTypes(scope.row.classType).length > 0"> <span v-if="getSelectedTypes(scope.row.classType).length > 0">
<span v-for="(option, index) in getSelectedTypes(scope.row.classType)" :key="index"> <span v-for="(option, index) in getSelectedTypes(scope.row.classType)" :key="index">
...@@ -320,6 +360,7 @@ export default { ...@@ -320,6 +360,7 @@ export default {
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
query: false,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
...@@ -397,6 +438,11 @@ export default { ...@@ -397,6 +438,11 @@ export default {
getSelectedTypes(classType) { getSelectedTypes(classType) {
return this.dict.type.class_type.filter(option => classType.split(',').includes(option.value.toString())); return this.dict.type.class_type.filter(option => classType.split(',').includes(option.value.toString()));
}, },
/** 搜索按钮操作 */
handleQuerycx() {
this.query = true;
this.resetcx();
},
// 取消按钮 // 取消按钮
cancel() { cancel() {
this.open = false; this.open = false;
......
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