Skip to content

D
dd_school
Commit 025e7abb by zhaopanyu
Options

zpy 1.17

parent 6eebec73
Showing with 48 additions and 168 deletions
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentCommendation/awardEntry/index.vue
......@@ -264,129 +264,7 @@
<el-button @click="cancel">{{ isEdit ? '取 消' : '取 消' }}</el-button>
</div>
</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-form ref="uploadForm" :model="uploadForm" :rules="rules" label-width="70px">
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentCommendation/rewardManagement/index.vue
......@@ -457,7 +457,7 @@ export default {
process.env.VUE_APP_BASE_API + "/school/studentAward/importData",
},
uploadForm: {},
baseUrl: [process.env.VUE_APP_BASE_API],
// baseUrl: [process.env.VUE_APP_BASE_API],
uploadLoading: false,
uploadFileLoading: false,
// 遮罩层
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentViolation/ViolationDiscipline/index.vue
......@@ -18,7 +18,7 @@
</el-form-item>
<el-form-item label="届别" prop="gradeYear">
<el-select v-model="queryForm.gradeYear" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.rankda" :key="dict.value" :label="dict.label"
<el-option v-for="dict in dict.type.rankwj" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
</el-select>
......@@ -58,12 +58,12 @@
:value="item.userId"></el-option>
</el-select>
</el-form-item>
<el-form-item label="违纪类别">
<!-- <el-form-item label="违纪类别">
<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"
:value="dict.value" />
</el-select>
</el-form-item>
</el-form-item> -->
<el-form-item label="违纪次数">
<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"
......@@ -126,11 +126,11 @@
<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" 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>
</el-table-column>
</el-table-column> -->
<el-table-column align="center" prop="violateNum" sortable label="违纪次数" width="100" show-overflow-tooltip>
<template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.violate_num, row.violateNum) }}</div>
......@@ -182,7 +182,7 @@
<el-col :span="8">
<el-form-item label="届别" prop="gradeYear">
<el-select v-model="form.gradeYear" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.rankda" :key="dict.value" :label="dict.label"
<el-option v-for="dict in dict.type.rankwj" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
</el-select>
......@@ -261,16 +261,12 @@
</el-form-item>
</el-col>
<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-option v-for="dict in dict.type.violate_type" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
</el-form-item> -->
<el-form-item label="违纪次数" prop="violateNum">
<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"
......@@ -278,6 +274,8 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="处分结果" prop="punishResult">
<el-select v-model="form.punishResult" placeholder="请选择" clearable style="width: 100%;">
......@@ -340,7 +338,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', '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', 'rankwj', 'appointment_situation', 'appointment_positions', 'class_num', 'audit_states'],
data() {
return {
queryForm: {
......@@ -432,9 +430,9 @@ export default {
violateNum: [
{ required: true, message: "违纪次数不能为空", trigger: "change" }
],
violateType: [
{ required: true, message: "违纪类别不能为空", trigger: "change" }
],
// violateType: [
// { required: true, message: "违纪类别不能为空", trigger: "change" }
// ],
punishResult: [
{ required: true, message: "处分结果不能为空", trigger: "change" }
],
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentViolation/violationDisciplineentry/index.vue
......@@ -18,7 +18,7 @@
</el-form-item>
<el-form-item label="届别" prop="gradeYear">
<el-select v-model="queryForm.gradeYear" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.rankda" :key="dict.value" :label="dict.label"
<el-option v-for="dict in dict.type.rankwj" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
</el-select>
......@@ -58,12 +58,12 @@
:value="item.userId"></el-option>
</el-select>
</el-form-item>
<el-form-item label="违纪类别">
<!-- <el-form-item label="违纪类别">
<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"
:value="dict.value" />
</el-select>
</el-form-item>
</el-form-item> -->
<el-form-item label="违纪次数">
<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"
......@@ -136,11 +136,11 @@
<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" 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>
</el-table-column>
</el-table-column> -->
<el-table-column align="center" prop="violateNum" sortable label="违纪次数" width="100" show-overflow-tooltip>
<template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.violate_num, row.violateNum) }}</div>
......@@ -200,7 +200,7 @@
<el-col :span="8">
<el-form-item label="届别" prop="gradeYear">
<el-select v-model="form.gradeYear" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.rankda" :key="dict.value" :label="dict.label"
<el-option v-for="dict in dict.type.rankwj" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
</el-select>
......@@ -280,16 +280,12 @@
</el-form-item>
</el-col>
<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-option v-for="dict in dict.type.violate_type" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
</el-form-item> -->
<el-form-item label="违纪次数" prop="violateNum">
<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"
......@@ -297,6 +293,8 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="处分结果" prop="punishResult">
<el-select v-model="form.punishResult" placeholder="请选择" clearable style="width: 100%;">
......@@ -358,7 +356,7 @@
<el-col :span="8">
<el-form-item label="届别" prop="gradeYear">
<el-select v-model="form.gradeYear" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.rankda" :key="dict.value" :label="dict.label"
<el-option v-for="dict in dict.type.rankwj" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
</el-select>
......@@ -438,16 +436,12 @@
</el-form-item>
</el-col>
<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-option v-for="dict in dict.type.violate_type" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
</el-form-item> -->
<el-form-item label="违纪次数" prop="violateNum">
<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"
......@@ -455,6 +449,8 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="处分结果" prop="punishResult">
<el-select v-model="form.punishResult" placeholder="请选择" clearable style="width: 100%;">
......@@ -553,7 +549,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', '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', 'rankwj', 'appointment_situation', 'appointment_positions', 'class_num', 'audit_states'],
data() {
return {
title: "",
......@@ -668,9 +664,9 @@ export default {
violateNum: [
{ required: true, message: "违纪次数不能为空", trigger: "change" }
],
violateType: [
{ required: true, message: "违纪类别不能为空", trigger: "change" }
],
// violateType: [
// { required: true, message: "违纪类别不能为空", trigger: "change" }
// ],
punishResult: [
{ required: true, message: "处分结果不能为空", trigger: "change" }
],
......@@ -684,11 +680,10 @@ export default {
},
created() {
this.getList();
this.getGradelist();
// this.getGradelist();
this.getTeacher();
},
methods: {
handleAdd() {
this.reset();
......@@ -746,6 +741,14 @@ export default {
this.importing = true;
},
//下载模版
importTemplate() {
this.download(
"/school/discipline/importTemplate",
{},
`违纪管理_${Date.now()}.xlsx`
);
},
// 提交上传文件
submitFileForm() {
this.$refs.upload.submit();
......
ruoyi-ui/src/views/smartSchool/electronicArchives/basicInformation/index.vue
......@@ -134,14 +134,15 @@
: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="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>
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex" />
</template>
</el-table-column>
<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>
<template slot-scope="scope">
<dict-tag :options="dict.type.politics_tatusls" :value="scope.row.politicalLandscape" />
......@@ -152,7 +153,7 @@
<span>{{ parseTime(scope.row.fileBirthDate, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
<el-table-column label="到市二中工作时间" width="70" align="center" prop="toSecondMiddleSchoolTime" sortable
<el-table-column label="到市二中工作时间" width="80" align="center" prop="toSecondMiddleSchoolTime" 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
......
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