Skip to content

D
dd_school
Commit 6eebec73 by zhaopanyu
Options

zpy 1.12

parent bab149c7
Showing with 232 additions and 66 deletions
ruoyi-ui/src/api/smartSchool/classAdviser/studentCommendation.js
......@@ -72,3 +72,19 @@ export function reviewStudentAward(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
......@@ -365,6 +365,7 @@ export default {
query: false,
isEdit: false,
gradeLists: [],
fileList: [],
//表格数据
tableData: [
......
ruoyi-ui/src/views/smartSchool/classAdviser/studentManage/discipline/index.vue
......@@ -91,6 +91,9 @@
<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 plain type="warning" icon="el-icon-upload2" size="mini" @click="handleExport">导出</el-button>
</el-col> -->
</el-row>
<el-table :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }" :data="tableData"
......@@ -123,7 +126,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="100" show-overflow-tooltip>
<el-table-column align="center" prop="violateType" sortable label="违纪类别" width="120" show-overflow-tooltip>
<template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.violate_type, row.violateType) }}</div>
</template>
......@@ -145,8 +148,7 @@
<div>{{ selectDictLabel(dict.type.audit_state, row.auditState) }}</div>
</template>
</el-table-column>
<el-table-column align="center" fixed="right" label="操作" width="180">
<el-table-column align="center" fixed="right" label="操作" width="110">
<template slot-scope="scope">
<el-button @click="handleLook(scope.row)" type="text" size="small">查看</el-button>
</template>
......@@ -156,7 +158,7 @@
@pagination="getList" />
<!-- 查看-->
<el-dialog title="详细信息" :visible.sync="dialogTableVisible" width="1100px">
<el-dialog title="详细信息" :visible.sync="dialogTableVisible" width="1200px">
<el-form :model="form" ref="form" size="small" label-width="120px" :disabled="isEdit" :rules="rules">
<el-row>
<el-col :span="8">
......@@ -226,7 +228,8 @@
</el-form-item>
</el-col>
<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="请输入"
clearable></el-input>
</el-form-item>
......@@ -331,9 +334,9 @@ import {
subApply,//提交
getGrade,// 获取最新三个年级
getClassList,// 根据年级获取班级,
listDisciplinetg,//查看已通过
getTeacher,//获取教师
} from '@/api/smartSchool/awardsDisciplinary/studentViolation/disciplinaryManagemen'
import { listStudentwj } from "@/api/smartSchool/classAdviser/studentCommendation";
import { checkIdcard } from '@/utils/utilLibrary/validate'
export default {
name: 'index',
......@@ -393,6 +396,7 @@ export default {
//弹窗
dialogTableVisible: false,
total: 0,
fileList: [],
gradeList: [],
classList: [],
deptOptions: [],
......@@ -584,7 +588,7 @@ export default {
getList() {
listDisciplinetg(this.queryForm)
listStudentwj(this.queryForm)
.then(response => {
this.tableData = response.rows;
console.log('response', response);
......@@ -685,7 +689,11 @@ export default {
this.getList();
this.query = false;
},
handleExport() {
this.download('/school/discipline/exportYtg', {
...this.queryParams
}, `学生违纪_${new Date().getTime()}.xlsx`)
}
},
}
</script>
......
ruoyi-ui/src/views/smartSchool/classAdviser/studentManage/index.vue
......@@ -149,7 +149,7 @@
</template>
</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="220px" fixed="right">
<el-table-column label="操作" align="center" min-width="250px" fixed="right">
<template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)">编辑
</el-button>
......
ruoyi-ui/src/views/smartSchool/classAdviser/studentManage/studentCommendation/index.vue
<template>
<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 :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
label-width="68px">
<el-form-item label="学年" prop="schoolYear">
<el-select v-model="queryParams.schoolYear" clearable placeholder="请选择">
<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-select>
</el-form-item>
......@@ -16,18 +19,21 @@
</el-form-item>
<el-form-item label="届别" prop="year">
<el-select v-model="queryParams.year" clearable 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-select>
</el-form-item>
<el-form-item label="年级" prop="grade">
<el-select v-model="queryParams.grade" clearable placeholder="请选择">
<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-select>
</el-form-item>
<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 label="姓名" prop="name">
<el-input v-model="queryParams.name" placeholder="请输入姓名" clearable @keyup.enter.native="handleQuery" />
......@@ -45,69 +51,61 @@
</el-form-item>
<el-form-item label="嘉奖时间" prop="awardTime">
<el-date-picker clearable v-model="queryParams.awardTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择嘉奖时间">
placeholder="请选择嘉奖时间" style="width: 192px;">
</el-date-picker>
</el-form-item>
<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-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
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 :span="1.5">
<el-button type="primary" plain icon="el-icon-upload" size="mini" @click="handleImport"
v-hasPermi="['school:studentAward:import']">导入</el-button>
<el-button type="success" plain icon="el-icon-search" size="mini" @click="handleQuerycx">查询</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-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 label="学年" align="center" prop="schoolYear" />
<el-table-column label="学期" align="center" prop="semester">
<el-table-column label="学年" align="center" prop="schoolYear" width="100px" show-overflow-tooltip />
<el-table-column label="学期" align="center" prop="semester" width="80px" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.semester_jsdzda" :value="scope.row.semester" />
</template>
</el-table-column>
<el-table-column label="届别" align="center" prop="year" />
<el-table-column label="年级" align="center" prop="grade">
<el-table-column label="届别" align="center" prop="year" width="60px" />
<el-table-column label="年级" align="center" prop="grade" width="60px">
<template slot-scope="scope">
<dict-tag :options="dict.type.grade_da" :value="scope.row.grade" />
</template>
</el-table-column>
<el-table-column label="班级" align="center" prop="className" />
<el-table-column label="姓名" align="center" prop="name" />
<el-table-column label="班主任" align="center" prop="classTeacher" />
<el-table-column label="嘉奖级别" align="center" prop="awardRank" />
<el-table-column label="嘉奖类别" align="center" prop="awardType" />
<el-table-column label="嘉奖时间" align="center" prop="awardTime" width="180">
<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="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">
<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">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template>
</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">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
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>
<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">
<el-button @click="handleLook(scope.row)" type="text" size="small">查看</el-button>
</template>
</el-table-column>
</el-table>
......@@ -117,7 +115,7 @@
<!-- 添加或修改学生嘉奖对话框 -->
<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-col :span="12">
<el-form-item label="学年" prop="schoolYear">
......@@ -170,7 +168,11 @@
</el-col>
<el-col :span="12">
<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-col>
</el-row>
......@@ -206,7 +208,11 @@
</el-col>
<el-col :span="12">
<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-col>
</el-row>
......@@ -225,16 +231,18 @@
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<div slot="footer">
<el-button v-if="!isEdit" type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">{{ isEdit ? '取 消' : '取 消' }}</el-button>
</div>
</el-dialog>
</div>
</template>
<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 {
name: "StudentAward",
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 {
title: "",
// 是否显示弹出层
open: false,
isEdit: false,
query: false,
look: false,
// 查询参数
queryParams: {
pageNum: 1,
......@@ -286,9 +297,46 @@ export default {
form: {},
// 表单校验
rules: {
delFlag: [
{ required: true, message: "删除状态不能为空", trigger: "blur" }
]
schoolYear: [
{ 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 {
/** 查询学生嘉奖列表 */
getList() {
this.loading = true;
listStudentAward(this.queryParams).then(response => {
listStudent(this.queryParams).then(response => {
this.studentAwardList = response.rows;
this.total = response.total;
this.loading = false;
......@@ -310,6 +358,69 @@ export default {
this.open = false;
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() {
this.form = {
......@@ -342,11 +453,15 @@ export default {
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuerycx() {
this.query = true;
},
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
this.query = false;
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
......@@ -406,10 +521,33 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.download('school/studentAward/export', {
this.download('/school/studentAward/exportYtg', {
...this.queryParams
}, `学生嘉奖_${new Date().getTime()}.xlsx`)
}
}
};
</script>
<style scoped lang="scss" >
::v-deep .el-form-item {
margin-bottom: 12px;
}
::v-deep .el-input--medium .el-input__inner {
height: 26px;
line-height: 26px;
}
::v-deep .el-dialog__body {
padding: 10px 20px
}
::v-deep .el-dialog:not(.is-fullscreen) {
margin-top: 4vh !important;
}
.search ::v-deep .el-form-item__content {
width: 200px
}
</style>
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/studentAchievements/scoreEntry/index.vue
......@@ -504,6 +504,7 @@ export default {
this.form = response.data;
this.isEdit = true;
this.open = true;
this.title = "查看学生成绩";
}).catch(error => {
this.$modal.closeLoading();
})
......
ruoyi-ui/src/views/smartSchool/studentAchievements/scoreViewing/index.vue
......@@ -485,6 +485,7 @@ export default {
this.form = response.data;
this.isEdit = true;
this.open = true;
this.title = "查看学生成绩";
}).catch(error => {
this.$modal.closeLoading();
})
......
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