Skip to content

D
dd_school
Commit 10b0e16a by zhaopanyu
Options

zpy 修改bug

parent 267e75f3
Showing with 721 additions and 388 deletions
ruoyi-ui/src/views/smartSchool/electronicArchives/basicInformation/index.vue
......@@ -5,7 +5,8 @@
<el-row>
<el-col :span="12">
<el-form-item label="任教学科" prop="teachingSubject">
<el-select v-model="queryParams.teachingSubject" placeholder="请选择" style="width: 100%">
<el-select v-model="queryParams.teachingSubject" clearable placeholder="请选择"
style="width: 100%">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -39,7 +40,8 @@
<el-row>
<el-col :span="12">
<el-form-item label="政治面貌" prop="politicalLandscape">
<el-select v-model="queryParams.politicalLandscape" placeholder="请选择政治面貌" style="width: 100%">
<el-select v-model="queryParams.politicalLandscape" clearable placeholder="请选择政治面貌"
style="width: 100%">
<el-option v-for="dict in dict.type.politics_tatusls" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -57,7 +59,8 @@
<el-row>
<el-col :span="12">
<el-form-item label="现职称" prop="currentProfessionalTitle">
<el-select v-model="queryParams.currentProfessionalTitle" placeholder="请选择" style="width: 100%">
<el-select v-model="queryParams.currentProfessionalTitle" clearable placeholder="请选择"
style="width: 100%">
<el-option v-for="dict in dict.type.current_professional" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
......@@ -66,7 +69,8 @@
</el-col>
<el-col :span="12">
<el-form-item label="在岗情况" prop="onDutySituation">
<el-select v-model="queryParams.onDutySituation" placeholder="请选择" style="width: 100%">
<el-select v-model="queryParams.onDutySituation" clearable placeholder="请选择"
style="width: 100%">
<el-option v-for="dict in dict.type.duty_situation" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -209,13 +213,13 @@
</div>
</el-dialog>
<!-- 添加对话框 -->
<el-dialog class="addForm" title="详细信息" :visible.sync="open" width="80%">
<el-dialog class="addForm" :title="title" :visible.sync="open" width="80%">
<el-form ref="form" :model="form" :rules="rules" label-width="138px">
<el-row type="flex" justify="space-between">
<el-col :span="16">
<el-col :span="12" class="custom-margin">
<el-form-item label="姓名" prop="name">
<el-input v-model="form.name" placeholder="请输入姓名"></el-input>
<el-input v-model="form.name" placeholder="请输入姓名" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="12" class="custom-margin">
......@@ -227,13 +231,14 @@
<el-col :span="12" class="custom-margin">
<el-form-item label="档案出生日期" prop="fileBirthDate">
<el-date-picker v-model="form.fileBirthDate" type="date" placeholder="选择日期"
:default-value="form.fileBirthDate" style="width: 100%;"
:default-value="form.fileBirthDate" style="width: 100%;" clearable
value-format=" yyyy-MM-dd"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12" class="custom-margin">
<el-form-item label="籍贯" prop="hometown">
<el-input v-model="form.hometown" placeholder="请输入籍贯" style="width: 190px;"></el-input>
<el-input v-model="form.hometown" placeholder="请输入籍贯" clearable
style="width: 190px;"></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span=" 12" class="custom-margin"> -->
......@@ -245,13 +250,13 @@
<!-- </el-col> -->
<el-col :span="12" class="custom-margin">
<el-form-item label="民族" prop="nation">
<el-input v-model="form.nation" placeholder="请输入民族"></el-input>
<el-input v-model="form.nation" placeholder="请输入民族" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="12" class="custom-margin">
<el-form-item label="政治面貌" prop="politicalLandscape">
<el-select v-model="form.politicalLandscape" style="width: 190px;" placeholder="请选择">
<el-option v-for="dict in dict.type.politics_tatusls" :key="dict.value"
<el-option v-for="dict in dict.type.politics_tatusls" clearable :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
</el-select>
......@@ -266,7 +271,7 @@
</el-col>
<el-col :span="12" class="custom-margin">
<el-form-item label="任教学科" prop="teachingSubject">
<el-select v-model="form.teachingSubject" style="width: 190px;" placeholder="请选择">
<el-select v-model="form.teachingSubject" style="width: 190px;" placeholder="请选择" clearable>
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
......@@ -274,7 +279,8 @@
</el-form-item>
</el-col><el-col :span="12" class="custom-margin">
<el-form-item label="现职称" prop="currentProfessionalTitle">
<el-select v-model="form.currentProfessionalTitle" style="width: 100%" placeholder="请选择">
<el-select v-model="form.currentProfessionalTitle" style="width: 100%" placeholder="请选择"
clearable>
<el-option v-for="dict in dict.type.current_professional" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
......@@ -311,7 +317,8 @@
<el-row :gutter="6" type="flex" justify="space-between">
<el-col :span="8" class="custom-margin">
<el-form-item label="现聘职称" prop="currentHiringProfessionalTitle">
<el-select v-model="form.currentHiringProfessionalTitle" style="width: 100%" placeholder="请选择">
<el-select clearable v-model="form.currentHiringProfessionalTitle" style="width: 100%"
placeholder="请选择">
<el-option v-for="dict in dict.type.current_professional" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
......@@ -332,7 +339,7 @@
<el-row :gutter="6" type="flex" justify="space-between">
<el-col :span="8" class="custom-margin">
<el-form-item label="现聘岗位" prop="currentPosition">
<el-select v-model="form.currentPosition" style="width:100%;" placeholder="请选择">
<el-select v-model="form.currentPosition" style="width:100%;" placeholder="请选择" clearable>
<el-option v-for="dict in dict.type.current_position" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -341,7 +348,7 @@
</el-col>
<el-col :span="8" class="custom-margin">
<el-form-item label="现岗位等级" prop="currentJobLevel">
<el-select v-model="form.currentJobLevel" style="width: 190px;" placeholder="请选择">
<el-select v-model="form.currentJobLevel" style="width: 190px;" placeholder="请选择" clearable>
<el-option v-for="level in filteredJobLevels" :key="level.value" :label="level.label"
:value="level.value">
</el-option>
......@@ -359,17 +366,18 @@
<el-row :gutter="6" type="flex" justify="space-between">
<el-col :span="8" class="custom-margin">
<el-form-item label="职务" prop="duties">
<el-input v-model="form.duties" placeholder="请输入" style="width: 100%;" />
<el-input v-model="form.duties" clearable placeholder="请输入" style="width: 100%;" />
</el-form-item>
</el-col>
<el-col :span="8" class="custom-margin">
<el-form-item label="教师资格种类" prop="teacherQualificationType">
<el-input v-model="form.teacherQualificationType" placeholder="请输入" style="width: 190px;" />
<el-input v-model="form.teacherQualificationType" clearable placeholder="请输入"
style="width: 190px;" />
</el-form-item>
</el-col>
<el-col :span="8" class="custom-margin">
<el-form-item label="教师资格证号码" prop="teacherQualificationCertificateNum">
<el-input v-model="form.teacherQualificationCertificateNum" placeholder="请输入" />
<el-input v-model="form.teacherQualificationCertificateNum" clearable placeholder="请输入" />
</el-form-item>
</el-col>
</el-row>
......@@ -406,7 +414,7 @@
</el-col>
<el-col :span="8" class="custom-margin">
<el-form-item label="在岗情况" prop="onDutySituation">
<el-select v-model="form.onDutySituation" style="width: 190px;" placeholder="请选择">
<el-select v-model="form.onDutySituation" clearable style="width: 190px;" placeholder="请选择">
<el-option v-for="dict in dict.type.duty_situation" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -415,7 +423,7 @@
</el-col>
<el-col :span="8" class="custom-margin">
<el-form-item label="在编情况" prop="currentSituation">
<el-select v-model="form.currentSituation" style="width: 100%" placeholder="请选择">
<el-select v-model="form.currentSituation" clearable style="width: 100%" placeholder="请选择">
<el-option v-for="dict in dict.type.current_situation" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -426,12 +434,13 @@
<el-row :gutter="2" type="flex" justify="space-between">
<el-col :span="8" class="custom-margin">
<el-form-item label="毕业院校1" prop="graduationInstitution1">
<el-input v-model="form.graduationInstitution1" placeholder="请输入" style="width: 100%;" />
<el-input v-model="form.graduationInstitution1" clearable placeholder="请输入"
style="width: 100%;" />
</el-form-item>
</el-col>
<el-col :span="8" class="custom-margin">
<el-form-item label="专业1" prop="major1">
<el-input v-model="form.major1" placeholder="请输入" style="width: 190px;" />
<el-input v-model="form.major1" placeholder="请输入" clearable style="width: 190px;" />
</el-form-item>
</el-col>
<el-col :span="8" class="custom-margin">
......@@ -445,12 +454,13 @@
<el-row :gutter="2" type="flex" justify="space-between">
<el-col :span="8" class="custom-margin">
<el-form-item label="毕业院校2" prop="graduationInstitution2">
<el-input v-model="form.graduationInstitution2" placeholder="请输入" style="width: 100%;" />
<el-input v-model="form.graduationInstitution2" placeholder="请输入" clearable
style="width: 100%;" />
</el-form-item>
</el-col>
<el-col :span="8" class="custom-margin">
<el-form-item label="专业2" prop="major2">
<el-input v-model="form.major2" placeholder="请输入" style="width: 190px;" />
<el-input v-model="form.major2" placeholder="请输入" clearable style="width: 190px;" />
</el-form-item>
</el-col>
<el-col :span="8" class="custom-margin">
......@@ -464,12 +474,13 @@
<el-row :gutter="2" type="flex" justify="space-between">
<el-col :span="8" class="custom-margin">
<el-form-item label="毕业院校3" prop="graduationInstitution3">
<el-input v-model="form.graduationInstitution3" placeholder="请输入" style="width: 100%;" />
<el-input v-model="form.graduationInstitution3" placeholder="请输入" clearable
style="width: 100%;" />
</el-form-item>
</el-col>
<el-col :span="8" class="custom-margin">
<el-form-item label="专业3" prop="major3">
<el-input v-model="form.major3" placeholder="请输入" style="width: 190px;" />
<el-input v-model="form.major3" placeholder="请输入" clearable style="width: 190px;" />
</el-form-item>
</el-col>
<el-col :span="8" class="custom-margin">
......@@ -483,36 +494,36 @@
<el-row :gutter="2" type="flex" justify="space-between">
<el-col :span="8" class="custom-margin">
<el-form-item label="第一学历" prop="firstDegree">
<el-input v-model="form.firstDegree" placeholder="请输入" style="width: 100%;" />
<el-input v-model="form.firstDegree" placeholder="请输入" clearable style="width: 100%;" />
</el-form-item>
</el-col>
<el-col :span="8" class="custom-margin">
<el-form-item label="最后学历" prop="lastDegree">
<el-input v-model="form.lastDegree" placeholder="请输入" style="width: 190px;" />
<el-input v-model="form.lastDegree" placeholder="请输入" clearable style="width: 190px;" />
</el-form-item>
</el-col>
<el-col :span="8" class="custom-margin">
<el-form-item label="学位" prop="degree">
<el-input v-model="form.degree" placeholder="请输入" />
<el-input v-model="form.degree" placeholder="请输入" clearable />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="2" type="flex" justify="space-between">
<el-col :span="8" class="custom-margin">
<el-form-item label="工作经历" prop="workExperience">
<el-input v-model="form.workExperience" placeholder="请输入" style="width: 100%" />
<el-input v-model="form.workExperience" placeholder="请输入" clearable style="width: 100%" />
</el-form-item>
</el-col>
<el-col :span="8" class="custom-margin">
<el-form-item label="钉钉手机号" prop="ddPhone">
<el-input v-model="form.ddPhone" placeholder="请输入" />
<el-input v-model="form.ddPhone" placeholder="请输入" clearable />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="2" type="flex" justify="space-between">
<el-col :span="24" class="custom-margin">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入" />
<el-input v-model="form.remark" placeholder="请输入" clearable />
</el-form-item>
</el-col>
</el-row>
......@@ -1087,16 +1098,17 @@ export default {
},
// 文件压缩包上传前格式限制
beforeFileUpload(file) {
console.log(file, 1148);
const type = file.type === "application/x-zip-compressed";
// const isLt2M = file.size / 1024 / 1024 < 2
if (!type) {
this.$message.error("文件格式不正确!(只能上传zip文件)");
const fileName = file.name;
const extension = fileName.substring(fileName.lastIndexOf('.') + 1).toLowerCase();
const allowedExtensions = ['zip']; // 允许的文件后缀列表
if (allowedExtensions.includes(extension)) {
// 文件类型正确，允许上传
return true;
} else {
// 文件类型不正确，给出错误提示并阻止上传
this.$message.error('文件格式不正确！只能上传zip文件');
return false;
}
// if (!isLt2M) {
// this.$message.error('上传图片大小不能超过 2MB!')
// }
return type;
},
// 上传照片压缩包文件
uploadFiles(file) {
......@@ -1227,7 +1239,7 @@ export default {
/** 搜索按钮操作 */
handleQuerycx() {
this.query = true;
this.resetcx();
},
handleQuery() {
this.query = true;
......
ruoyi-ui/src/views/smartSchool/electronicArchives/examinationScore/components/SelectUser.vue 0 → 100644
<template>
<el-dialog :visible.sync="openDialog" :title="title" :width="width" @close="dialogClose">
<!-- 模糊查询-->
<el-form :model="form" ref="form" size="small" inline>
<el-form-item prop="userName" label="姓名">
<el-input v-model.trim="form.userName" placeholder="请输入姓名" clearable
@keyup.enter.native="search"></el-input>
</el-form-item>
<el-form-item prop="phone" label="联系电话">
<el-input v-model.trim="form.phone" placeholder="请输入联系电话" clearable @keyup.enter.native="search"></el-input>
</el-form-item>
<el-form-item>
<el-button @click="search" type="primary" icon="el-icon-search" size="mini">搜索</el-button>
<el-button @click="reset" icon="el-icon-refresh" size="mini">重置</el-button>
</el-form-item>
</el-form>
<!-- 列表数据-->
<el-table ref="tableList" v-loading="loading" :data="userList" @selection-change="selectionChange"
@row-click="rowClick">
<el-table-column type="selection" align="center"></el-table-column>
<el-table-column key="userName" prop="userName" label="姓名" align="center"></el-table-column>
<el-table-column key="phone" prop="phone" label="联系电话" align="center"></el-table-column>
</el-table>
<!-- 分页-->
<pagination v-show="total > 0" :total="total" :limit.sync="form.pageSize" :page.sync="form.pageNum"
@pagination="search"></pagination>
<!-- 底部-->
<div slot="footer">
<el-button :disabled="!selectUser" @click="submit" type="primary" size="small">确 定</el-button>
<el-button @click="quit" size="small">取 消</el-button>
</div>
</el-dialog>
</template>
<script>
import { getUserList } from "@/api/smartSchool/electronicArchives/professionalDevelopment/comprehensiveHonors";
export default {
name: "SelectUser",
dicts: ['sys_user_sex'],
props: {
open: {
type: Boolean,
require: true
},
title: {
type: String,
default: ''
},
width: {
type: [Number, String],
default: '50%'
},
execute: {
type: [String]
},
// 选择级部、处室主任
id: {
type: [Number, String]
}
},
data() {
return {
baseURL: process.env.VUE_APP_BASE_API,
form: {
userName: '',
phone: '',
pageNum: 1,
pageSize: 10
},
total: 0,
loading: false,
userList: [],
selectUser: null
}
},
computed: {
openDialog: {
get() {
return this.open;
},
set(value) {
this.$emit('update:open', value);
}
}
},
watch: {
open(value) {
if (value) {
this.$nextTick(() => {
this.reset();
})
}
}
},
methods: {
/** 搜索（交给子组件维护，当然也可以把接口交给父组件处理） */
async search() {
if (isNaN(Number(this.id))) {
console.error('Invalid ID');
return;
}
try {
this.loading = true;
const response = await this[this.execute]({ applyOrgid: this.id, ...this.form });
this.userList = response.rows || [];
this.total = response.total;
this.loading = false;
} catch (exception) {
this.loading = false;
throw new Error(exception);
}
},
/** 重置表单 */
reset() {
this.form = {
teacherName: '',
teacherTel: '',
pageNum: 1,
pageSize: 10
};
this.resetForm('form');
this.search();
},
/** 选项选中发生变化 */
selectionChange(selections) {
this.selectUser = selections[0];
},
/** 点击选中、取消 */
rowClick(row, column) {
console.log('row', row);
this.$refs['tableList'].clearSelection();
this.$refs['tableList'].toggleRowSelection(row, true);
},
/** 提交选中 */
submit() {
this.$emit('select', {
id: this.selectUser.userId,
name: this.selectUser.userName,
tel: this.selectUser.phone
});
this.quit();
},
/** 取消 */
quit() {
this.openDialog = false;
},
/** 分管领导、主要领导 */
leaderList(form) {
return getUserList(form);
},
dialogClose() {
this.userList = []
}
}
}
</script>
<style scoped>
.footer {
display: flex;
justify-content: center;
margin-top: 30px;
}
.radius-image {
border-radius: 40px;
}
</style>
ruoyi-ui/src/views/smartSchool/electronicArchives/examinationScore/index.vue
......@@ -5,7 +5,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="届别" prop="year">
<el-select v-model="queryParams.year" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.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>
......@@ -14,7 +14,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -31,7 +31,8 @@
</el-col>
<el-col :span="12">
<el-form-item label="授课班级" prop="teachingClassName">
<el-select v-model="queryParams.teachingClassName" placeholder="请选择" style="width: 100%">
<el-select v-model="queryParams.teachingClassName" 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>
......@@ -42,7 +43,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="班级类型" prop="classType">
<el-select v-model="queryParams.classType" placeholder="请选择" style="width: 100%">
<el-select v-model="queryParams.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>
......@@ -51,7 +52,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="高考评优" prop="gkAppraising">
<el-select v-model="queryParams.gkAppraising" placeholder="请选择" style="width: 100%">
<el-select v-model="queryParams.gkAppraising" clearable placeholder="请选择" style="width: 100%">
<el-option v-for="dict in dict.type.gk_appraising" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -99,28 +100,37 @@
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template>
</el-table-column>
<el-table-column label="教师姓名" align="center" prop="teacherName" sortable width="160" />
<el-table-column label="授课班级" align="center" prop="teachingClassName" sortable width="150" />
<el-table-column label="教师姓名" align="center" prop="teacherName" sortable width="150" show-overflow-tooltip />
<el-table-column label="授课班级" align="center" prop="teachingClassName" sortable width="150"
show-overflow-tooltip />
<el-table-column label="班级类型" align="center" prop="classType" sortable show-overflow-tooltip width="200">
<template slot-scope="scope">
<!-- <template slot-scope="scope">
<span v-if="getSelectedTypes(scope.row.classType).length > 0">
<span v-for="(option, index) in getSelectedTypes(scope.row.classType)" :key="index">
{{ option.label }}
<span v-if="index !== getSelectedTypes(scope.row.classType).length - 1">, </span>
</span>
</span>
</template>
</template> -->
</el-table-column>
<el-table-column label="高考评优" align="center" prop="gkAppraising" sortable width="150">
<el-table-column label="高考评优" align="center" prop="gkAppraising" sortable width="150" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.gk_appraising" :value="scope.row.gkAppraising" />
</template>
</el-table-column>
<el-table-column label="尖子生培养" align="center" prop="topStudentsCulture" sortable width="150" />
<el-table-column label="增量情况" align="center" prop="incrementSituation" sortable width="150" />
<el-table-column label="有效数情况" align="center" prop="effectiveNumSituation" sortable width="150" />
<el-table-column label="其他情况" align="center" prop="other" sortable width="150" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
<el-table-column label="尖子生培养" align="center" prop="topStudentsCulture" sortable width="150"
show-overflow-tooltip />
<el-table-column label="增量情况" align="center" prop="incrementSituation" sortable width="150"
show-overflow-tooltip />
<el-table-column label="有效数情况" align="center" prop="effectiveNumSituation" sortable width="150"
show-overflow-tooltip />
<el-table-column label="其他情况" align="center" prop="other" sortable width="150" show-overflow-tooltip />
<el-table-column label="审核状态" align="center" prop="auditState" sortable width="120">
<template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150" fixed="right">
<template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:honors:edit']"
v-if="scope.row.auditState === '1' || scope.row.auditState === '2' || scope.row.auditState === '3'">修改</el-button>
......@@ -138,7 +148,7 @@
<!-- 添加或修改高考成绩对话框 -->
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="92px">
<el-form ref="form" :model="form" :rules="rules" label-width="92px" class="add">
<el-row>
<el-col :span="12">
<el-form-item label="学科" prop="sub">
......@@ -151,7 +161,9 @@
</el-col>
<el-col :span="12">
<el-form-item label="教师姓名" prop="teacherName">
<el-input v-model="form.teacherName" placeholder="请输入教师姓名" />
<el-input v-model="form.teacherName" placeholder="请选择"
@input="openSelect('选择分管领导', 'leaderList', 2)"
@focus="openSelect('选择分管领导', 'leaderList', 2)"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -178,7 +190,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="班级类型" prop="classType">
<el-select v-model="form.classType" multiple placeholder="请选择" style="width: 100%">
<el-select v-model="form.classType" 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>
......@@ -198,24 +210,24 @@
<el-row>
<el-col :span="12">
<el-form-item label="尖子生培养" prop="topStudentsCulture">
<el-input v-model="form.topStudentsCulture" placeholder="请输入内容" />
<el-input v-model="form.topStudentsCulture" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="增量情况" prop="incrementSituation">
<el-input v-model="form.incrementSituation" placeholder="请输入内容" />
<el-input v-model="form.incrementSituation" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="有效数情况" prop="effectiveNumSituation">
<el-input v-model="form.effectiveNumSituation" placeholder="请输入有效数情况" />
<el-input v-model="form.effectiveNumSituation" type="textarea" placeholder="请输入有效数情况" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="其他" prop="other">
<el-input v-model="form.other" placeholder="请输入内容" />
<el-input v-model="form.other" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-col>
</el-row>
......@@ -227,7 +239,7 @@
</el-dialog>
<!--审核对话框 -->
<el-dialog :title="title" :visible.sync="look" width="800px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="92px" :disabled="isEdit">
<el-form ref="form" :model="form" :rules="rules" label-width="92px" :disabled="isEdit" class="add">
<el-row>
<el-col :span="12">
<el-form-item label="学科" prop="sub">
......@@ -287,24 +299,24 @@
<el-row>
<el-col :span="12">
<el-form-item label="尖子生培养" prop="topStudentsCulture">
<el-input v-model="form.topStudentsCulture" placeholder="请输入内容" />
<el-input v-model="form.topStudentsCulture" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="增量情况" prop="incrementSituation">
<el-input v-model="form.incrementSituation" placeholder="请输入内容" />
<el-input v-model="form.incrementSituation" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="有效数情况" prop="effectiveNumSituation">
<el-input v-model="form.effectiveNumSituation" placeholder="请输入有效数情况" />
<el-input v-model="form.effectiveNumSituation" type="textarea" placeholder="请输入有效数情况" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="其他" prop="other">
<el-input v-model="form.other" placeholder="请输入内容" />
<el-input v-model="form.other" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-col>
</el-row>
......@@ -314,18 +326,31 @@
<el-button @click="handleDisagree" type="danger" size="small">不同意</el-button>
</div>
</el-dialog>
<SelectUser :id="selectHandles.id" :open.sync="selectHandles.open" :title="selectHandles.title"
:width="selectHandles.width" :execute="selectHandles.method" @select="selectUser"></SelectUser>
</div>
</template>
<script>
import { listAchievement, getAchievement, delAchievement, addAchievement, updateAchievement, audit, listAchievementgr } from "@/api/smartSchool/electronicArchives/examinationScore";;
import SelectUser from "./components/SelectUser";
export default {
name: "Achievement",
dicts: ["teaching_subjects", 'class_type', 'rankda', 'gk_appraising', 'class_num'],
dicts: ["teaching_subjects", 'class_type', 'rankda', 'gk_appraising', 'class_num', 'audit_states'],
components: {
SelectUser,
},
data() {
return {
// 选择对应处理人
selectHandles: {
id: null,
open: false,
title: '',
width: '50%',
method: null,
type: null // 处理类型： 1 级部/处室； 2 分管； 3 主管
},
// 遮罩层
loading: true,
// 选中数组
......@@ -408,10 +433,10 @@ export default {
this.loading = false;
});
},
getSelectedTypes(classType) {
const selectedTypes = classType.split(','); // 将逗号分隔的字符串转换为数组
return this.dict.type.class_type.filter(option => selectedTypes.includes(option.value.toString()));
},
// getSelectedTypes(classType) {
// const selectedTypes = classType.split(','); // 将逗号分隔的字符串转换为数组
// return this.dict.type.class_type.filter(option => selectedTypes.includes(option.value.toString()));
// },
//审核
handleExamine(row) {
const id = row.id || this.ids;
......@@ -504,6 +529,36 @@ export default {
this.single = selection.length !== 1
this.multiple = !selection.length
},
// 选择处理人:打开对话框
openSelect(title, method, type) {
console.log('form.teacherName', this.form.teacherName);
if (this.form.teacherName) {
console.log('有值', this.form.teacherName == "");
} else {
console.log('没值', this.form.teacherName);
this.selectHandles.open = true;
this.selectHandles.title = title;
this.selectHandles.method = method;
this.selectHandles.type = type;
}
},
// 选择处理人
selectUser(select) {
this.$set(this.form, `teacherName${this.selectHandles.type}`, select.name);
console.log(select.name);
this.$set(this.form, `userId${this.selectHandles.type}`, select.id);
console.log(select.id);
// 设置顶层的 userName 和 userId 字段
this.form.teacherName = select.name;
console.log(124, this.form.teacherName);
console.log(select);
this.form.userId = select.id;
console.log(this.form.userId, 'this.form.userId');
// 重新赋值选中的 id
this.selectUser.id = select.id;
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
......@@ -518,7 +573,7 @@ export default {
this.isEdit = false,
getAchievement(id).then(response => {
this.form = response.data;
this.form.classType = this.form.classType.split(',');
// this.form.classType = this.form.classType.split(',');
this.open = true;
this.title = "修改高考成绩";
});
......@@ -538,17 +593,17 @@ export default {
submitForm() {
this.form.auditState = '2';
this.$refs["form"].validate(valid => {
const classTypeStr = this.form.classType.join(',');
console.log(classTypeStr); // 输出转换后的字符串
// const classTypeStr = this.form.classType.join(',');
// console.log(classTypeStr); // 输出转换后的字符串
if (valid) {
if (this.form.id != null) {
updateAchievement({ ...this.form, classType: classTypeStr }).then(response => {
updateAchievement({ ...this.form }).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addAchievement({ ...this.form, classType: classTypeStr }).then(response => {
addAchievement({ ...this.form }).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
......@@ -594,7 +649,11 @@ export default {
margin-top: 4vh !important;
}
.add ::v-deep .el-textarea__inner {
margin-bottom: 10px;
}
.search ::v-deep .el-form-item__content {
width: 200px
width: 200px;
}
</style>
ruoyi-ui/src/views/smartSchool/electronicArchives/personalInformation/index.vue
......@@ -525,44 +525,49 @@
<div class="card_title">工作量信息</div>
<div style="margin: 3px 10px 15px;">
<el-table :data="schoolAworkload" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
<el-table-column label="学年" align="center" prop="schoolYear" width="90px" fixed="left" />
<el-table-column label="学期" align="center" prop="semester" fixed="left">
<el-table-column label="学年" align="center" prop="schoolYear" width="90px" fixed="left"
show-overflow-tooltip />
<el-table-column label="学期" align="center" prop="semester" fixed="left" 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" fixed="left" />
<el-table-column label="年级" align="center" prop="grade" fixed="left">
<el-table-column label="届别" align="center" prop="year" fixed="left" show-overflow-tooltip />
<el-table-column label="年级" align="center" prop="grade" fixed="left" show-overflow-tooltip>
<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="name" />
<el-table-column label="学科" align="center" prop="sub">
<el-table-column label="姓名" align="center" prop="name" show-overflow-tooltip />
<el-table-column label="学科" align="center" prop="sub" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template>
</el-table-column>
<el-table-column label="聘任岗位" align="center" prop="appointmentPost" width="120px">
<el-table-column label="聘任岗位" align="center" prop="appointmentPost" width="120px" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.appointment_positions" :value="scope.row.appointmentPost" />
</template>
</el-table-column>
<el-table-column label="聘任职务" align="center" prop="appointmentPosition" width="120px" />
<el-table-column label="聘任情况" align="center" prop="appointmentSituation" width="120px">
<el-table-column label="聘任职务" align="center" prop="appointmentPosition" width="120px"
show-overflow-tooltip />
<el-table-column label="聘任情况" align="center" prop="appointmentSituation" width="120px"
show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.appointment_situation" :value="scope.row.appointmentSituation" />
</template>
</el-table-column>
<el-table-column label="班级" align="center" prop="className" />
<el-table-column label="班级类型" align="center" prop="classType">
<el-table-column label="班级" align="center" prop="className" show-overflow-tooltip />
<el-table-column label="班级类型" align="center" prop="classType" show-overflow-tooltip>
</el-table-column>
<el-table-column label="早读" align="center" prop="earlyReading" />
<el-table-column label="正课" align="center" prop="requiredCourses" />
<el-table-column label="晚自习" align="center" prop="eveningSelfStudy" width="120px" />
<el-table-column label="合计" align="center" prop="amountTo" />
<el-table-column label="证明人" align="center" prop="userName" width="120px" fixed="right" />
<el-table-column label="备注" align="center" prop="remark" fixed="right" />
<el-table-column label="早读" align="center" prop="earlyReading" show-overflow-tooltip />
<el-table-column label="正课" align="center" prop="requiredCourses" show-overflow-tooltip />
<el-table-column label="晚自习" align="center" prop="eveningSelfStudy" width="120px"
show-overflow-tooltip />
<el-table-column label="合计" align="center" prop="amountTo" show-overflow-tooltip />
<el-table-column label="证明人" align="center" prop="userName" width="120px" fixed="right"
show-overflow-tooltip />
<el-table-column label="备注" align="center" prop="remark" fixed="right" show-overflow-tooltip />
</el-table>
</div>
</div>
......@@ -572,30 +577,32 @@
<div style="margin: 3px 10px 15px;">
<el-table :data="schoolAclassTeacherAssessments" :row-style="{ height: '0' }"
:cell-style="{ padding: '3px' }">
<el-table-column label="学年" align="center" prop="schoolYear" />
<el-table-column label="学期" align="center" prop="semester">
<el-table-column label="学年" align="center" prop="schoolYear" show-overflow-tooltip />
<el-table-column label="学期" align="center" prop="semester" 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" show-overflow-tooltip />
<el-table-column label="年级" align="center" prop="grade" show-overflow-tooltip>
<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="classType" width="180px">
<el-table-column label="班级" align="center" prop="className" show-overflow-tooltip />
<el-table-column label="班级类型" align="center" prop="classType" width="180px" show-overflow-tooltip>
</el-table-column>
<el-table-column label="姓名" align="center" prop="teacherName" />
<el-table-column label="学科" align="center" prop="sub">
<el-table-column label="姓名" align="center" prop="teacherName" show-overflow-tooltip />
<el-table-column label="学科" align="center" prop="sub" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template>
</el-table-column>
<el-table-column label="德育考核成绩" align="center" prop="moralEduCheckAchievement" width="130px" />
<el-table-column label="智育考核成绩" align="center" prop="intellEduCheckAchievement" width="130px" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="德育考核成绩" align="center" prop="moralEduCheckAchievement" width="130px"
show-overflow-tooltip />
<el-table-column label="智育考核成绩" align="center" prop="intellEduCheckAchievement" width="130px"
show-overflow-tooltip />
<el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
</el-table>
</div>
</div>
......@@ -606,31 +613,31 @@
<el-table :data="specialityVos" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
<el-table-column label="成长类型" align="center" prop="growthType">
</el-table-column>
<el-table-column label="学科" align="center" prop="sub">
<el-table-column label="学科" align="center" prop="sub" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template>
</el-table-column>
<el-table-column label="获奖类别" align="center" prop="awardtype">
<el-table-column label="获奖类别" align="center" prop="awardtype" show-overflow-tooltip>
<template slot-scope="scope">
<span v-if="scope.row.growthType == '综合荣誉'">{{ scope.row.awardtype }}</span>
<dict-tag v-else :options="getDictionaryByGrowthType(scope.row)" :value="scope.row.awardtype" />
</template>
</el-table-column>
<el-table-column label="获奖等级" align="center" prop="awardlevel">
<el-table-column label="获奖等级" align="center" prop="awardlevel" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.award_rank" :value="scope.row.awardlevel" />
</template>
</el-table-column>
<el-table-column label="获奖级别" align="center" prop="awardrank">
<el-table-column label="获奖级别" align="center" prop="awardrank" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardrank" />
</template>
</el-table-column>
<el-table-column label="成果名称" align="center" prop="resultName" />
<el-table-column label="获奖人" align="center" prop="userName" />
<el-table-column label="主办单位" align="center" prop="org" />
<el-table-column label="获奖时间" align="center" prop="awardTime" width="180">
<el-table-column label="成果名称" align="center" prop="resultName" show-overflow-tooltip />
<el-table-column label="获奖人" align="center" prop="userName" show-overflow-tooltip />
<el-table-column label="主办单位" align="center" prop="org" show-overflow-tooltip />
<el-table-column label="获奖时间" align="center" prop="awardTime" width="180" show-overflow-tooltip>
</el-table-column>
</el-table>
</div>
......@@ -640,25 +647,25 @@
<div class="card_title">高考成绩 </div>
<div style="margin: 3px 10px 15px;">
<el-table :data="schoolGkAchievement" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
<el-table-column label="届别" align="center" prop="year" />
<el-table-column label="学科" align="center" prop="sub">
<el-table-column label="届别" align="center" prop="year" show-overflow-tooltip />
<el-table-column label="学科" align="center" prop="sub" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template>
</el-table-column>
<el-table-column label="教师姓名" align="center" prop="teacherName" />
<el-table-column label="授课班级" align="center" prop="teachingClassName" />
<el-table-column label="班级类型" align="center" prop="classType">
<el-table-column label="教师姓名" align="center" prop="teacherName" show-overflow-tooltip />
<el-table-column label="授课班级" align="center" prop="teachingClassName" show-overflow-tooltip />
<el-table-column label="班级类型" align="center" prop="classType" show-overflow-tooltip>
</el-table-column>
<el-table-column label="高考评优" align="center" prop="gkAppraising">
<el-table-column label="高考评优" align="center" prop="gkAppraising" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.gk_appraising" :value="scope.row.sub" />
</template>
</el-table-column>
<el-table-column label="尖子生培养" align="center" prop="topStudentsCulture" />
<el-table-column label="增量情况" align="center" prop="incrementSituation" />
<el-table-column label="有效数情况" align="center" prop="effectiveNumSituation" />
<el-table-column label="其他" align="center" prop="other" />
<el-table-column label="尖子生培养" align="center" prop="topStudentsCulture" show-overflow-tooltip />
<el-table-column label="增量情况" align="center" prop="incrementSituation" show-overflow-tooltip />
<el-table-column label="有效数情况" align="center" prop="effectiveNumSituation" show-overflow-tooltip />
<el-table-column label="其他" align="center" prop="other" show-overflow-tooltip />
</el-table>
</div>
</div>
......@@ -667,39 +674,39 @@
<div class="card_title">教学成绩</div>
<div style="margin: 3px 10px 15px;">
<el-table :data="schoolXteachingAchievements" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
<el-table-column label="学年" align="center" prop="schoolYear" />
<el-table-column label="学期" align="center" prop="semester">
<el-table-column label="学年" align="center" prop="schoolYear" show-overflow-tooltip />
<el-table-column label="学期" align="center" prop="semester" 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="examTime" width="180">
<el-table-column label="考试时间" align="center" prop="examTime" width="180" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.examTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="考试类型" align="center" prop="examType">
<el-table-column label="考试类型" align="center" prop="examType" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.exam_typeda" :value="scope.row.examType" />
</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" show-overflow-tooltip />
<el-table-column label="年级" align="center" prop="grade" show-overflow-tooltip>
<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="userName" />
<el-table-column label="学科" align="center" prop="sub">
<el-table-column label="姓名" align="center" prop="userName" show-overflow-tooltip />
<el-table-column label="学科" align="center" prop="sub" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template>
</el-table-column>
<el-table-column label="班级" align="center" prop="className">
<el-table-column label="班级" align="center" prop="className" show-overflow-tooltip>
</el-table-column>
<el-table-column label="班级类型" align="center" prop="classType">
<el-table-column label="班级类型" align="center" prop="classType" show-overflow-tooltip>
</el-table-column>
<el-table-column label="考核分" align="center" prop="assessmentScore" />
<el-table-column label="考核分" align="center" prop="assessmentScore" show-overflow-tooltip />
</el-table>
</div>
</div>
......@@ -713,36 +720,36 @@
<span>辅导老师获奖</span>
</template>
</el-table-column>
<el-table-column label="学科" align="center" prop="sub">
<el-table-column label="学科" align="center" prop="sub" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template>
</el-table-column>
<el-table-column label="获奖类别" align="center" prop="awardtype">
<el-table-column label="获奖类别" align="center" prop="awardtype" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.award_type_fdjs" :value="scope.row.awardtype" />
</template>
</el-table-column>
<el-table-column label="获奖等级" align="center" prop="awardlevel">
<el-table-column label="获奖等级" align="center" prop="awardlevel" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.award_rank" :value="scope.row.awardlevel" />
</template>
</el-table-column>
<el-table-column label="获奖级别" align="center" prop="awardrank">
<el-table-column label="获奖级别" align="center" prop="awardrank" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardrank" />
</template>
</el-table-column>
<el-table-column label="比赛名称" align="center" prop="competitionname" />
<el-table-column label="获奖人" align="center" prop="username" />
<el-table-column label="指导教师" align="center" prop="guidanceteacher" />
<el-table-column label="辅导职责" align="center" prop="coachingr">
<el-table-column label="比赛名称" align="center" prop="competitionname" show-overflow-tooltip />
<el-table-column label="获奖人" align="center" prop="username" show-overflow-tooltip />
<el-table-column label="指导教师" align="center" prop="guidanceteacher" show-overflow-tooltip />
<el-table-column label="辅导职责" align="center" prop="coachingr" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.coachingr" :value="scope.row.coachingr" />
</template>
</el-table-column>
<el-table-column label="主办单位" align="center" prop="org" />
<el-table-column label="获奖时间" align="center" prop="awardtime" width="180">
<el-table-column label="主办单位" align="center" prop="org" show-overflow-tooltip />
<el-table-column label="获奖时间" align="center" prop="awardtime" width="180" show-overflow-tooltip>
<!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> -->
......@@ -760,31 +767,31 @@
<span>辅导学生获奖</span>
</template>
</el-table-column>
<el-table-column label="学科" align="center" prop="sub">
<el-table-column label="学科" align="center" prop="sub" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template>
</el-table-column>
<el-table-column label="获奖类别" align="center" prop="awardtype">
<el-table-column label="获奖类别" align="center" prop="awardtype" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.award_type_fdxs" :value="scope.row.awardtype" />
</template>
</el-table-column>
<el-table-column label="获奖等级" align="center" prop="awardlevel">
<el-table-column label="获奖等级" align="center" prop="awardlevel" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.award_rank" :value="scope.row.awardlevel" />
</template>
</el-table-column>
<el-table-column label="获奖级别" align="center" prop="awardrank">
<el-table-column label="获奖级别" align="center" prop="awardrank" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardrank" />
</template>
</el-table-column>
<el-table-column label="比赛名称" align="center" prop="resultname" />
<el-table-column label="获奖人" align="center" prop="username" />
<el-table-column label="指导教师" align="center" prop="guidanceteacher" />
<el-table-column label="主办单位" align="center" prop="org" />
<el-table-column label="获奖时间" align="center" prop="awardtime" width="180">
<el-table-column label="比赛名称" align="center" prop="resultname" show-overflow-tooltip />
<el-table-column label="获奖人" align="center" prop="username" show-overflow-tooltip />
<el-table-column label="指导教师" align="center" prop="guidanceteacher" show-overflow-tooltip />
<el-table-column label="主办单位" align="center" prop="org" show-overflow-tooltip />
<el-table-column label="获奖时间" align="center" prop="awardtime" width="180" show-overflow-tooltip>
<!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> -->
......@@ -797,14 +804,15 @@
<div class="card_title">年度考核</div>
<div style="margin: 3px 10px 15px;">
<el-table :data="schoolAnnualAssessment" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
<el-table-column label="姓名" align="center" prop="name" />
<el-table-column label="年度" align="center" prop="year" />
<el-table-column label="考核结果" align="center" prop="checkResult">
<el-table-column label="姓名" align="center" prop="name" show-overflow-tooltip />
<el-table-column label="年度" align="center" prop="year" show-overflow-tooltip />
<el-table-column label="考核结果" align="center" prop="checkResult" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.check_result" :value="scope.row.checkResult" />
<dict-tag :options="dict.type.check_result" :value="scope.row.checkResult"
show-overflow-tooltip />
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
</el-table>
</div>
</div>
......@@ -1095,5 +1103,4 @@ export default {
.background {
background-color: #eff8fc;
}
</style>
\ No newline at end of file
}</style>
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/annualAssessment/index.vue
......@@ -2,13 +2,13 @@
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="年度" prop="year">
<el-select v-model="queryParams.year" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.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-form-item label="考核结果" prop="checkResult">
<el-select v-model="queryParams.checkResult" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.checkResult" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.check_result" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -48,7 +48,8 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table :data="assessmentList" @selection-change="handleSelectionChange">
<el-table :data="assessmentList" @selection-change="handleSelectionChange" :row-style="{ height: '0' }"
:cell-style="{ padding: '3px' }">
<el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" width="55" label="序号" align="center" />
<el-table-column label="姓名" align="center" prop="name" />
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/awardTutoringstu/index.vue
......@@ -5,7 +5,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -14,7 +14,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖类别" prop="awardtype">
<el-select v-model="queryParams.awardtype" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.awardtype" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.award_type_fdxs" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -25,7 +25,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="获奖级别" prop="awardrank">
<el-select v-model="queryParams.awardrank" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.awardrank" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.awards_level" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -34,7 +34,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖等级" prop="awardlevel">
<el-select v-model="queryParams.awardlevel" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.awardlevel" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -51,7 +51,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="指导教师" prop="guidanceteacher">
<el-input v-model="queryParams.guidanceteacher" placeholder="请输入内容" />
<el-input v-model="queryParams.guidanceteacher" clearable placeholder="请输入内容" />
</el-form-item>
</el-col>
</el-row>
......@@ -138,6 +138,11 @@
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> -->
</el-table-column>
<el-table-column label="审核状态" align="center" prop="auditstate" sortable width="120">
<template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditstate" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
......@@ -376,7 +381,7 @@ import { uploadImage as commonUpload } from "@/api/common";
import SelectUser from "./components/SelectUser";
export default {
name: "tutorAward",
dicts: ["teaching_subjects", 'award_type_fdxs', 'awards_level', 'award_rank', 'coachingr'],
dicts: ["teaching_subjects", 'award_type_fdxs', 'awards_level', 'award_rank', 'coachingr', 'audit_states'],
components: {
SelectUser,
},
......@@ -683,7 +688,7 @@ export default {
},
/** 提交按钮 */
submitForm() {
this.form.auditState = '2';
this.form.auditstate = '2';
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/comprehensiveHonors/index.vue
......@@ -5,7 +5,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -22,7 +22,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="获奖级别" prop="awardRank">
<el-select v-model="queryParams.awardRank" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.awardRank" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.awards_level" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -31,7 +31,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖等级" prop="awardLevel">
<el-select v-model="queryParams.awardLevel" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.awardLevel" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -126,6 +126,11 @@
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="审核状态" align="center" prop="auditState" sortable width="120">
<template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="180px">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
......@@ -348,7 +353,7 @@ export default {
components: {
SelectUser,
},
dicts: ["teaching_subjects", 'award_categories', 'awards_level', 'award_rank'],
dicts: ["teaching_subjects", 'award_categories', 'awards_level', 'award_rank', 'audit_states'],
data() {
return {
// 选择对应处理人
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/essaysWritings/index.vue
......@@ -6,7 +6,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -15,7 +15,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖类别" prop="awardType">
<el-select v-model="queryParams.awardType" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.awardType" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.award_categoriesjk" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
......@@ -26,7 +26,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="获奖级别" prop="awardRank">
<el-select v-model="queryParams.awardRank" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.awardRank" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.awards_level" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -35,7 +35,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖等级" prop="awardLevel">
<el-select v-model="queryParams.awardLevel" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.awardLevel" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -133,6 +133,11 @@
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="审核状态" align="center" prop="auditState" sortable width="120">
<template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="180px">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
......@@ -360,7 +365,7 @@ export default {
components: {
SelectUser,
},
dicts: ["teaching_subjects", 'award_categories', 'awards_level', 'award_rank'],
dicts: ["teaching_subjects", 'award_categories', 'awards_level', 'award_rank', 'audit_states'],
data() {
return {
// 选择对应处理人
......@@ -456,9 +461,9 @@ export default {
pictureUrl: [
{ required: true, message: "证书图片地址不能为空", trigger: "blur" }
],
delFlag: [
{ required: true, message: "删除状态不能为空", trigger: "blur" }
]
// delFlag: [
// { required: true, message: "删除状态不能为空", trigger: "blur" }
// ]
}
};
},
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/lectureAwards/index.vue
......@@ -5,7 +5,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -14,7 +14,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖类别" prop="awardType">
<el-select v-model="queryParams.awardType" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.awardType" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.award_categoriesjk" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
......@@ -25,7 +25,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="获奖级别" prop="awardRank">
<el-select v-model="queryParams.awardRank" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.awardRank" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.awards_level" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -34,7 +34,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖等级" prop="awardLevel">
<el-select v-model="queryParams.awardLevel" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.awardLevel" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -131,6 +131,11 @@
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="审核状态" align="center" prop="auditState" sortable width="120">
<template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
</template>
</el-table-column>
<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)"
......@@ -357,7 +362,7 @@ export default {
components: {
SelectUser,
},
dicts: ["teaching_subjects", 'award_categoriesjk', 'awards_level', 'award_rank'],
dicts: ["teaching_subjects", 'award_categoriesjk', 'awards_level', 'award_rank', 'audit_states'],
data() {
return {
// 选择对应处理人
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/projectResearch/index.vue
......@@ -6,7 +6,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -15,7 +15,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖类别" prop="awardType">
<el-select v-model="queryParams.awardType" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.awardType" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.award_categoriesjk" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
......@@ -26,7 +26,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="获奖级别" prop="awardRank">
<el-select v-model="queryParams.awardRank" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.awardRank" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.awards_level" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -35,7 +35,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖等级" prop="awardLevel">
<el-select v-model="queryParams.awardLevel" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.awardLevel" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -130,6 +130,11 @@
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="审核状态" align="center" prop="auditState" sortable width="120">
<template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150px" fixed="right">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
......@@ -361,7 +366,7 @@ export default {
components: {
SelectUser,
},
dicts: ["teaching_subjects", 'project_research', 'awards_level', 'award_rank'],
dicts: ["teaching_subjects", 'project_research', 'awards_level', 'award_rank', 'audit_states'],
data() {
return {
// 选择对应处理人
......@@ -457,9 +462,9 @@ export default {
pictureUrl: [
{ required: true, message: "证书图片地址不能为空", trigger: "blur" }
],
delFlag: [
{ required: true, message: "删除状态不能为空", trigger: "blur" }
]
// delFlag: [
// { required: true, message: "删除状态不能为空", trigger: "blur" }
// ]
}
};
},
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/teacherAwards/index.vue
......@@ -5,7 +5,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -14,7 +14,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖级别" prop="awardRank">
<el-select v-model="queryParams.awardRank" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.awardRank" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.awards_level" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -25,7 +25,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="获奖类别" prop="awardType">
<el-select v-model="queryParams.awardType" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.awardType" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.award_categoriesjs" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
......@@ -34,7 +34,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖等级" prop="awardLevel">
<el-select v-model="queryParams.awardLevel" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.awardLevel" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -133,6 +133,11 @@
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="审核状态" align="center" prop="auditState" sortable width="120">
<template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="180px
">
<template slot-scope="scope">
......@@ -358,7 +363,7 @@ export default {
components: {
SelectUser,
},
dicts: ["teaching_subjects", 'award_categoriesjs', 'awards_level', 'award_rank'],
dicts: ["teaching_subjects", 'award_categoriesjs', 'awards_level', 'award_rank', 'audit_states'],
data() {
return {
// 选择对应处理人
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/teachingAchievements/index.vue
......@@ -11,7 +11,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="学年" prop="schoolYear">
<el-select v-model="queryParams.schoolYear" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.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>
......@@ -22,7 +22,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="学期" prop="semester">
<el-select v-model="queryParams.semester" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.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>
......@@ -31,7 +31,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="届别" prop="year">
<el-select v-model="queryParams.year" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.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>
......@@ -42,7 +42,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="年级" prop="grade">
<el-select v-model="queryParams.grade" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.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>
......@@ -51,7 +51,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -346,7 +346,7 @@ import { getToken } from '@/utils/auth'
export default {
name: "Achievements",
dicts: ["teaching_subjects", 'semester_jsdzda', 'exam_typeda', 'grade_da', 'class_type', 'yearda', 'rankda'],
dicts: ["teaching_subjects", 'semester_jsdzda', 'exam_typeda', 'grade_da', 'class_type', 'yearda', 'rankda', 'audit_states'],
data() {
return {
uploadOpen: false,
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/teamAward/index.vue
......@@ -5,7 +5,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="学年" prop="schoolYear">
<el-select v-model="queryParams.schoolYear" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.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>
......@@ -14,7 +14,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="学期" prop="semester">
<el-select v-model="queryParams.semester" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.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>
......@@ -25,7 +25,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="届别" prop="year">
<el-select v-model="queryParams.year" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.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>
......@@ -34,7 +34,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="年级" prop="grade">
<el-select v-model="queryParams.grade" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.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>
......@@ -45,7 +45,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -111,7 +111,7 @@
width="180px" />
<el-table-column label="团队成员贡献情况" align="center" prop="teamMembersContribution" sortable width="200"
show-overflow-tooltip />
<el-table-column label="备注" align="center" prop="remark" sortable />
<el-table-column label="备注" align="center" prop="remark" sortable show-overflow-tooltip />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
<template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:honors:edit']"
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/tutorAward/index.vue
......@@ -5,7 +5,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -14,7 +14,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖类别" prop="awardtype">
<el-select v-model="queryParams.awardtype" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.awardtype" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.award_type_fdjs" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -25,7 +25,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="获奖级别" prop="awardrank">
<el-select v-model="queryParams.awardrank" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.awardrank" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.awards_level" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -34,7 +34,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖等级" prop="awardlevel">
<el-select v-model="queryParams.awardlevel" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.awardlevel" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -51,14 +51,14 @@
</el-col>
<el-col :span="12">
<el-form-item label="指导教师" prop="guidanceteacher">
<el-input v-model="queryParams.guidanceteacher" placeholder="请输入内容" />
<el-input v-model="queryParams.guidanceteacher" clearable placeholder="请输入内容" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="辅导职责" prop="coachingr">
<el-select v-model="queryParams.coachingr" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.coachingr" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.coachingr" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -155,6 +155,11 @@
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> -->
</el-table-column>
<el-table-column label="审核状态" align="center" prop="auditstate" sortable width="120">
<template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditstate" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180px" fixed="right">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
......@@ -413,7 +418,7 @@ import { uploadImage as commonUpload } from "@/api/common";
import SelectUser from "./components/SelectUser";
export default {
name: "tutorAward",
dicts: ["teaching_subjects", 'award_type_fdjs', 'awards_level', 'award_rank', 'coachingr'],
dicts: ["teaching_subjects", 'award_type_fdjs', 'awards_level', 'award_rank', 'coachingr', 'audit_states'],
components: {
SelectUser,
},
......
ruoyi-ui/src/views/smartSchool/electronicArchives/teacherAssessment/index.vue
......@@ -11,7 +11,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="学年" prop="schoolYear">
<el-select v-model="queryParams.schoolYear" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.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>
......@@ -22,7 +22,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="届别" prop="year">
<el-select v-model="queryParams.year" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.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>
......@@ -30,7 +30,7 @@
</el-form-item></el-col>
<el-col :span="12">
<el-form-item label="学期" prop="semester">
<el-select v-model="queryParams.semester" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.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>
......@@ -41,7 +41,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="年级" prop="grade">
<el-select v-model="queryParams.grade" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.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>
......@@ -50,7 +50,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%">
<el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -61,7 +61,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="班级类型" prop="classType">
<el-select v-model="queryParams.classType" placeholder="请选择" style="width: 100%">
<el-select v-model="queryParams.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>
......@@ -128,13 +128,14 @@
<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 label="学年" align="center" prop="schoolYear" sortable fixed="left" width="130px
" />
<el-table-column label="学期" align="center" prop="semester" sortable fixed="left" width="130px">
" show-overflow-tooltip />
<el-table-column label="学期" align="center" prop="semester" sortable fixed="left" width="130px"
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" sortable fixed="left" />
<el-table-column label="届别" align="center" prop="year" sortable fixed="left" show-overflow-tooltip />
<el-table-column label="年级" align="center" prop="grade" sortable show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.grade_da" :value="scope.row.grade" />
......@@ -161,6 +162,7 @@
width="130px" show-overflow-tooltip />
<el-table-column label="智育考核成绩" align="center" prop="intellEduCheckAchievement" sortable fixed="right"
width="130px" show-overflow-tooltip />
<!-- <el-table-column label="总考核成绩" align="center" prop="totalCheckAchievement" sortable fixed="right"
width="130px" /> -->
<el-table-column label="备注" align="center" prop="remark" sortable fixed="right" />
......@@ -329,7 +331,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'],
dicts: ["teaching_subjects", 'semester_jsdzda', 'exam_typeda', 'grade_da', 'class_type', 'yearda', 'rankda', 'appointment_situation', 'appointment_positions', 'class_num', 'audit_states'],
data() {
return {
uploadOpen: false,
......
ruoyi-ui/src/views/smartSchool/electronicArchives/workloadInformation/index.vue
......@@ -11,7 +11,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="学年" prop="schoolYear">
<el-select v-model="queryParams.schoolYear" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.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>
......@@ -22,7 +22,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="学期" prop="semester">
<el-select v-model="queryParams.semster" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.semster" 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>
......@@ -31,7 +31,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="届别" prop="year">
<el-select v-model="queryParams.year" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.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>
......@@ -42,7 +42,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="年级" prop="grade">
<el-select v-model="queryParams.grade" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.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>
......@@ -51,7 +51,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%">
<el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -62,7 +62,8 @@
<el-row>
<el-col :span="12">
<el-form-item label="聘任岗位" prop="appointmentPost">
<el-select v-model="queryParams.appointmentPost" placeholder="请选择" style="width: 100%">
<el-select v-model="queryParams.appointmentPost" clearable placeholder="请选择"
style="width: 100%">
<el-option v-for="dict in dict.type.appointment_positions" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
......@@ -85,7 +86,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="班级类型" prop="classType">
<el-select v-model="queryParams.classType" placeholder="请选择" style="width: 100%">
<el-select v-model="queryParams.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>
......@@ -102,7 +103,8 @@
</el-col>
<el-col :span="12">
<el-form-item label="聘任情况" prop="appointmentSituation">
<el-select v-model="queryParams.appointmentSituation" placeholder="请选择" style="width: 100%">
<el-select v-model="queryParams.appointmentSituation" clearable placeholder="请选择"
style="width: 100%">
<el-option v-for="dict in dict.type.appointment_situation" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
......@@ -197,10 +199,8 @@
<el-table-column label="晚自习" align="center" prop="eveningSelfStudy" sortable width="90px"
show-overflow-tooltip />
<el-table-column label="合计" align="center" prop="amountTo" sortable show-overflow-tooltip />
<el-table-column label="证明人" align="center" prop="userName" width="120px" fixed="right" sortable
show-overflow-tooltip />
<el-table-column label="备注" align="center" prop="remark" fixed="right" sortable width="150px"
show-overflow-tooltip />
<el-table-column label="证明人" align="center" prop="userName" width="120px" sortable show-overflow-tooltip />
<el-table-column label="备注" align="center" prop="remark" sortable width="150px" show-overflow-tooltip />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150px" fixed="right">
<template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)"
......
ruoyi-ui/src/views/smartSchool/personWork/awardTutoringstu/index.vue
......@@ -5,7 +5,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -14,7 +14,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖类别" prop="awardtype">
<el-select v-model="queryParams.awardtype" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.awardtype" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.award_type_fdxs" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -138,6 +138,11 @@
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> -->
</el-table-column>
<el-table-column label="审核状态" align="center" prop="auditstate" sortable width="120">
<template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditstate" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150" fixed="right">
<template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)"
......@@ -270,7 +275,7 @@ import { uploadImage as commonUpload } from "@/api/common";
export default {
name: "tutorAward",
dicts: ["teaching_subjects", 'award_type_fdxs', 'awards_level', 'award_rank', 'coachingr'],
dicts: ["teaching_subjects", 'award_type_fdxs', 'awards_level', 'award_rank', 'coachingr', 'audit_states'],
data() {
return {
......@@ -396,7 +401,7 @@ export default {
getAward(id).then(response => {
this.form = response.data;
this.pictureUrl = this.pev + this.form.pictureUrl
this.title = "查看综合荣誉";
this.title = "查看辅导学生获奖";
});
},
//提交
......@@ -516,7 +521,7 @@ export default {
this.isEdit = false;
this.form.username = this.$store.state.user.name;
this.form.userid = this.$store.state.user.userId;
this.title = "添加教师获奖";
this.title = "添加辅导学生获奖";
},
/** 修改按钮操作 */
handleUpdate(row) {
......@@ -526,12 +531,12 @@ export default {
const id = row.id || this.ids
getAward(id).then(response => {
this.form = response.data;
this.title = "修改教师获奖";
this.title = "修改辅导学生获奖";
});
},
/** 提交按钮 */
submitForm() {
this.form.auditState = '0';
this.form.auditstate = '0';
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
......
ruoyi-ui/src/views/smartSchool/personWork/comprehensiveHonors/index.vue
......@@ -122,6 +122,11 @@
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="审核状态" align="center" prop="auditState" sortable width="120">
<template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
</template>
</el-table-column>
<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" @click="handleUpdate(scope.row)" v-hasPermi="['system:honors:edit']"
......@@ -142,7 +147,7 @@
@pagination="getList" />
<!-- 添加或修改综合荣誉对话框 -->
<el-dialog title="详细信息" :visible.sync="open" width="1000px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px" :disabled="isEdit">
<el-row>
<el-col :span="12">
......@@ -253,7 +258,7 @@ export default {
components: {
SelectUser,
},
dicts: ["teaching_subjects", 'award_categories', 'awards_level', 'award_rank'],
dicts: ["teaching_subjects", 'award_categories', 'awards_level', 'award_rank', 'audit_states'],
data() {
return {
isEdit: false,
......
ruoyi-ui/src/views/smartSchool/personWork/essaysWritings/index.vue
......@@ -345,18 +345,18 @@ export default {
awardTime: [
{ required: true, message: "获奖时间不能为空", trigger: "blur" }
],
remark: [
{ required: true, message: "备注不能为空", trigger: "blur" }
],
// remark: [
// { required: true, message: "备注不能为空", trigger: "blur" }
// ],
pictureName: [
{ required: true, message: "证书图片名称不能为空", trigger: "blur" }
],
pictureUrl: [
{ required: true, message: "证书图片地址不能为空", trigger: "blur" }
],
delFlag: [
{ required: true, message: "删除状态不能为空", trigger: "blur" }
]
// delFlag: [
// { required: true, message: "删除状态不能为空", trigger: "blur" }
// ]
}
};
},
......@@ -382,7 +382,7 @@ export default {
getWorks(id).then(response => {
this.form = response.data;
this.pictureUrl = this.pev + this.form.pictureUrl
this.title = "查看综合荣誉";
this.title = "查看论文论著";
});
},
// 选择处理人:打开对话框
......
ruoyi-ui/src/views/smartSchool/personWork/examinationScore/index.vue
......@@ -103,14 +103,14 @@
<el-table-column label="教师姓名" align="center" prop="teacherName" sortable width="150" />
<el-table-column label="授课班级" align="center" prop="teachingClassName" sortable width="130" />
<el-table-column label="班级类型" align="center" prop="classType" sortable show-overflow-tooltip width="180">
<template slot-scope="scope">
<!-- <template slot-scope="scope">
<span v-if="getSelectedTypes(scope.row.classType).length > 0">
<span v-for="(option, index) in getSelectedTypes(scope.row.classType)" :key="index">
{{ option.label }}
<span v-if="index !== getSelectedTypes(scope.row.classType).length - 1">, </span>
</span>
</span>
</template>
</template> -->
</el-table-column>
<el-table-column label="高考评优" align="center" prop="gkAppraising" sortable width="180">
<template slot-scope="scope">
......@@ -121,7 +121,13 @@
<el-table-column label="增量情况" align="center" prop="incrementSituation" sortable width="150" />
<el-table-column label="有效数情况" align="center" prop="effectiveNumSituation" sortable width="180" />
<el-table-column label="其他情况" align="center" prop="other" sortable width="150" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
<el-table-column label="审核状态" align="center" prop="auditState" sortable width="120">
<template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
<template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)"
v-hasPermi="['system:achievement:edit']"
......@@ -144,7 +150,7 @@
<!-- 添加或修改高考成绩对话框 -->
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="92px" :disabled="isEdit">
<el-form ref="form" :model="form" :rules="rules" label-width="92px" :disabled="isEdit" class="add">
<el-row>
<el-col :span="12">
<el-form-item label="学科" prop="sub">
......@@ -184,7 +190,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="班级类型" prop="classType">
<el-select v-model="form.classType" multiple placeholder="请选择" style="width: 100%">
<el-select v-model="form.classType" 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>
......@@ -204,24 +210,24 @@
<el-row>
<el-col :span="12">
<el-form-item label="尖子生培养" prop="topStudentsCulture">
<el-input v-model="form.topStudentsCulture" placeholder="请输入内容" />
<el-input v-model="form.topStudentsCulture" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="增量情况" prop="incrementSituation">
<el-input v-model="form.incrementSituation" placeholder="请输入内容" />
<el-input v-model="form.incrementSituation" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="有效数情况" prop="effectiveNumSituation">
<el-input v-model="form.effectiveNumSituation" placeholder="请输入有效数情况" />
<el-input v-model="form.effectiveNumSituation" type="textarea" placeholder="请输入有效数情况" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="其他" prop="other">
<el-input v-model="form.other" placeholder="请输入内容" />
<el-input v-model="form.other" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-col>
</el-row>
......@@ -239,7 +245,7 @@ import { listAchievement, getAchievement, delAchievement, addAchievement, update
export default {
name: "Achievement",
dicts: ["teaching_subjects", 'class_type', 'rankda', 'gk_appraising', 'class_num'],
dicts: ["teaching_subjects", 'class_type', 'rankda', 'gk_appraising', 'class_num', 'audit_states'],
data() {
return {
......@@ -328,10 +334,10 @@ export default {
});
},
getSelectedTypes(classType) {
const selectedTypes = classType.split(','); // 将逗号分隔的字符串转换为数组
return this.dict.type.class_type.filter(option => selectedTypes.includes(option.value.toString()));
},
// getSelectedTypes(classType) {
// const selectedTypes = classType.split(','); // 将逗号分隔的字符串转换为数组
// return this.dict.type.class_type.filter(option => selectedTypes.includes(option.value.toString()));
// },
handleExamine(row) {
const ids = row.id || this.ids;
this.$modal
......@@ -406,6 +412,7 @@ export default {
this.reset();
this.open = true;
this.isEdit = false;
this.form.teacherName = this.$store.state.user.name;
this.form.userId = this.$store.state.user.userId;
this.title = "添加高考成绩";
},
......@@ -416,7 +423,7 @@ export default {
const id = row.id || this.ids
getAchievement(id).then(response => {
this.form = response.data;
this.form.classType = this.form.classType.split(',');
// this.form.classType = this.form.classType.split(',');
this.open = true;
this.title = "修改高考成绩";
});
......@@ -429,7 +436,7 @@ export default {
const id = row.id || this.ids
getAchievement(id).then(response => {
this.form = response.data;
this.form.classType = this.form.classType.split(',');
// this.form.classType = this.form.classType.split(',');
this.title = "查看";
});
},
......@@ -437,17 +444,17 @@ export default {
submitForm() {
this.form.auditState = '0';
this.$refs["form"].validate(valid => {
const classTypeStr = this.form.classType.join(',');
console.log(classTypeStr); // 输出转换后的字符串
// const classTypeStr = this.form.classType.join(',');
// console.log(classTypeStr); // 输出转换后的字符串
if (valid) {
if (this.form.id != null) {
updateAchievement({ ...this.form, classType: classTypeStr }).then(response => {
updateAchievement({ ...this.form }).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addAchievement({ ...this.form, classType: classTypeStr }).then(response => {
addAchievement({ ...this.form }).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
......@@ -496,6 +503,10 @@ export default {
margin-top: 4vh !important;
}
.add ::v-deep .el-textarea__inner {
margin-bottom: 10px;
}
.search ::v-deep .el-form-item__content {
width: 200px
}
......
ruoyi-ui/src/views/smartSchool/personWork/personalInformation/index.vue
......@@ -513,44 +513,49 @@
<div class="card_title">工作量信息</div>
<div style="margin: 3px 10px 15px;">
<el-table :data="schoolAworkload" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
<el-table-column label="学年" align="center" prop="schoolYear" width="90px" fixed="left" />
<el-table-column label="学期" align="center" prop="semester" fixed="left">
<el-table-column label="学年" align="center" prop="schoolYear" width="90px" fixed="left"
show-overflow-tooltip />
<el-table-column label="学期" align="center" prop="semester" fixed="left" 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" fixed="left" />
<el-table-column label="年级" align="center" prop="grade" fixed="left">
<el-table-column label="届别" align="center" prop="year" fixed="left" show-overflow-tooltip />
<el-table-column label="年级" align="center" prop="grade" fixed="left" show-overflow-tooltip>
<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="name" />
<el-table-column label="学科" align="center" prop="sub">
<el-table-column label="姓名" align="center" prop="name" show-overflow-tooltip />
<el-table-column label="学科" align="center" prop="sub" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template>
</el-table-column>
<el-table-column label="聘任岗位" align="center" prop="appointmentPost" width="120px">
<el-table-column label="聘任岗位" align="center" prop="appointmentPost" width="120px" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.appointment_positions" :value="scope.row.appointmentPost" />
</template>
</el-table-column>
<el-table-column label="聘任职务" align="center" prop="appointmentPosition" width="120px" />
<el-table-column label="聘任情况" align="center" prop="appointmentSituation" width="120px">
<el-table-column label="聘任职务" align="center" prop="appointmentPosition" width="120px"
show-overflow-tooltip />
<el-table-column label="聘任情况" align="center" prop="appointmentSituation" width="120px"
show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.appointment_situation" :value="scope.row.appointmentSituation" />
</template>
</el-table-column>
<el-table-column label="班级" align="center" prop="className" />
<el-table-column label="班级类型" align="center" prop="classType">
<el-table-column label="班级" align="center" prop="className" show-overflow-tooltip />
<el-table-column label="班级类型" align="center" prop="classType" show-overflow-tooltip>
</el-table-column>
<el-table-column label="早读" align="center" prop="earlyReading" />
<el-table-column label="正课" align="center" prop="requiredCourses" />
<el-table-column label="晚自习" align="center" prop="eveningSelfStudy" width="120px" />
<el-table-column label="合计" align="center" prop="amountTo" />
<el-table-column label="证明人" align="center" prop="userName" width="120px" fixed="right" />
<el-table-column label="备注" align="center" prop="remark" fixed="right" />
<el-table-column label="早读" align="center" prop="earlyReading" show-overflow-tooltip />
<el-table-column label="正课" align="center" prop="requiredCourses" show-overflow-tooltip />
<el-table-column label="晚自习" align="center" prop="eveningSelfStudy" width="120px"
show-overflow-tooltip />
<el-table-column label="合计" align="center" prop="amountTo" show-overflow-tooltip />
<el-table-column label="证明人" align="center" prop="userName" width="120px" fixed="right"
show-overflow-tooltip />
<el-table-column label="备注" align="center" prop="remark" fixed="right" show-overflow-tooltip />
</el-table>
</div>
</div>
......@@ -560,31 +565,33 @@
<div style="margin: 3px 10px 15px;">
<el-table :data="schoolAclassTeacherAssessments" :row-style="{ height: '0' }"
:cell-style="{ padding: '3px' }">
<el-table-column label="学年" align="center" prop="schoolYear" />
<el-table-column label="学期" align="center" prop="semester">
<el-table-column label="学年" align="center" prop="schoolYear" show-overflow-tooltip />
<el-table-column label="学期" align="center" prop="semester" 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" show-overflow-tooltip />
<el-table-column label="年级" align="center" prop="grade" show-overflow-tooltip>
<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="classType" width="180px">
<el-table-column label="班级" align="center" prop="className" show-overflow-tooltip />
<el-table-column label="班级类型" align="center" prop="classType" width="180px" show-overflow-tooltip>
</el-table-column>
<el-table-column label="姓名" align="center" prop="teacherName" />
<el-table-column label="学科" align="center" prop="sub">
<el-table-column label="姓名" align="center" prop="teacherName" show-overflow-tooltip />
<el-table-column label="学科" align="center" prop="sub" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template>
</el-table-column>
<el-table-column label="德育考核成绩" align="center" prop="moralEduCheckAchievement" width="130px" />
<el-table-column label="智育考核成绩" align="center" prop="intellEduCheckAchievement" width="130px" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="德育考核成绩" align="center" prop="moralEduCheckAchievement" width="130px"
show-overflow-tooltip />
<el-table-column label="智育考核成绩" align="center" prop="intellEduCheckAchievement" width="130px"
show-overflow-tooltip />
<el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
</el-table>
</div>
</div>
......@@ -593,33 +600,33 @@
<div class="card_title">专业成长</div>
<div style="margin: 3px 10px 15px;">
<el-table :data="specialityVos" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
<el-table-column label="成长类型" align="center" prop="growthType">
<el-table-column label="成长类型" align="center" prop="growthType" show-overflow-tooltip>
</el-table-column>
<el-table-column label="学科" align="center" prop="sub">
<el-table-column label="学科" align="center" prop="sub" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template>
</el-table-column>
<el-table-column label="获奖类别" align="center" prop="awardtype">
<el-table-column label="获奖类别" align="center" prop="awardtype" show-overflow-tooltip>
<template slot-scope="scope">
<span v-if="scope.row.growthType == '综合荣誉'">{{ scope.row.awardtype }}</span>
<dict-tag v-else :options="getDictionaryByGrowthType(scope.row)" :value="scope.row.awardtype" />
</template>
</el-table-column>
<el-table-column label="获奖等级" align="center" prop="awardlevel">
<el-table-column label="获奖等级" align="center" prop="awardlevel" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.award_rank" :value="scope.row.awardlevel" />
</template>
</el-table-column>
<el-table-column label="获奖级别" align="center" prop="awardrank">
<el-table-column label="获奖级别" align="center" prop="awardrank" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardrank" />
</template>
</el-table-column>
<el-table-column label="成果名称" align="center" prop="resultName" />
<el-table-column label="获奖人" align="center" prop="userName" />
<el-table-column label="主办单位" align="center" prop="org" />
<el-table-column label="获奖时间" align="center" prop="awardTime" width="180">
<el-table-column label="成果名称" align="center" prop="resultName" show-overflow-tooltip />
<el-table-column label="获奖人" align="center" prop="userName" show-overflow-tooltip />
<el-table-column label="主办单位" align="center" prop="org" show-overflow-tooltip />
<el-table-column label="获奖时间" align="center" prop="awardTime" width="180" show-overflow-tooltip>
</el-table-column>
</el-table>
</div>
......@@ -629,25 +636,25 @@
<div class="card_title">高考成绩 </div>
<div style="margin: 3px 10px 15px;">
<el-table :data="schoolGkAchievement" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
<el-table-column label="届别" align="center" prop="year" />
<el-table-column label="学科" align="center" prop="sub">
<el-table-column label="届别" align="center" prop="year" show-overflow-tooltip />
<el-table-column label="学科" align="center" prop="sub" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template>
</el-table-column>
<el-table-column label="教师姓名" align="center" prop="teacherName" />
<el-table-column label="授课班级" align="center" prop="teachingClassName" />
<el-table-column label="班级类型" align="center" prop="classType">
<el-table-column label="教师姓名" align="center" prop="teacherName" show-overflow-tooltip />
<el-table-column label="授课班级" align="center" prop="teachingClassName" show-overflow-tooltip />
<el-table-column label="班级类型" align="center" prop="classType" show-overflow-tooltip>
</el-table-column>
<el-table-column label="高考评优" align="center" prop="gkAppraising">
<el-table-column label="高考评优" align="center" prop="gkAppraising" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.gk_appraising" :value="scope.row.sub" />
</template>
</el-table-column>
<el-table-column label="尖子生培养" align="center" prop="topStudentsCulture" />
<el-table-column label="增量情况" align="center" prop="incrementSituation" />
<el-table-column label="有效数情况" align="center" prop="effectiveNumSituation" />
<el-table-column label="其他" align="center" prop="other" />
<el-table-column label="尖子生培养" align="center" prop="topStudentsCulture" show-overflow-tooltip />
<el-table-column label="增量情况" align="center" prop="incrementSituation" show-overflow-tooltip />
<el-table-column label="有效数情况" align="center" prop="effectiveNumSituation" show-overflow-tooltip />
<el-table-column label="其他" align="center" prop="other" show-overflow-tooltip />
</el-table>
</div>
</div>
......@@ -656,39 +663,39 @@
<div class="card_title">教学成绩</div>
<div style="margin: 3px 10px 15px;">
<el-table :data="schoolXteachingAchievements" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
<el-table-column label="学年" align="center" prop="schoolYear" />
<el-table-column label="学期" align="center" prop="semester">
<el-table-column label="学年" align="center" prop="schoolYear" show-overflow-tooltip />
<el-table-column label="学期" align="center" prop="semester" 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="examTime" width="180">
<el-table-column label="考试时间" align="center" prop="examTime" width="180" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.examTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="考试类型" align="center" prop="examType">
<el-table-column label="考试类型" align="center" prop="examType" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.exam_typeda" :value="scope.row.examType" />
</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" show-overflow-tooltip />
<el-table-column label="年级" align="center" prop="grade" show-overflow-tooltip>
<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="userName" />
<el-table-column label="学科" align="center" prop="sub">
<el-table-column label="姓名" align="center" prop="userName" show-overflow-tooltip />
<el-table-column label="学科" align="center" prop="sub" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template>
</el-table-column>
<el-table-column label="班级" align="center" prop="className">
<el-table-column label="班级" align="center" prop="className" show-overflow-tooltip>
</el-table-column>
<el-table-column label="班级类型" align="center" prop="classType">
<el-table-column label="班级类型" align="center" prop="classType" show-overflow-tooltip>
</el-table-column>
<el-table-column label="考核分" align="center" prop="assessmentScore" />
<el-table-column label="考核分" align="center" prop="assessmentScore" show-overflow-tooltip />
</el-table>
</div>
</div>
......@@ -697,41 +704,41 @@
<div class="card_title">辅导老师获奖</div>
<div style="margin: 3px 10px 15px;">
<el-table :data="fudaoTeacher" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
<el-table-column label="成长类型" align="center">
<el-table-column label="成长类型" align="center" show-overflow-tooltip width="120px">
<template>
<span>辅导老师获奖</span>
</template>
</el-table-column>
<el-table-column label="学科" align="center" prop="sub">
<el-table-column label="学科" align="center" prop="sub" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template>
</el-table-column>
<el-table-column label="获奖类别" align="center" prop="awardtype">
<el-table-column label="获奖类别" align="center" prop="awardtype" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.award_type_fdjs" :value="scope.row.awardtype" />
</template>
</el-table-column>
<el-table-column label="获奖等级" align="center" prop="awardlevel">
<el-table-column label="获奖等级" align="center" prop="awardlevel" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.award_rank" :value="scope.row.awardlevel" />
</template>
</el-table-column>
<el-table-column label="获奖级别" align="center" prop="awardrank">
<el-table-column label="获奖级别" align="center" prop="awardrank" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardrank" />
</template>
</el-table-column>
<el-table-column label="比赛名称" align="center" prop="competitionname" />
<el-table-column label="获奖人" align="center" prop="username" />
<el-table-column label="指导教师" align="center" prop="guidanceteacher" />
<el-table-column label="辅导职责" align="center" prop="coachingr">
<el-table-column label="比赛名称" align="center" prop="competitionname" show-overflow-tooltip />
<el-table-column label="获奖人" align="center" prop="username" show-overflow-tooltip />
<el-table-column label="指导教师" align="center" prop="guidanceteacher" show-overflow-tooltip />
<el-table-column label="辅导职责" align="center" prop="coachingr" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.coachingr" :value="scope.row.coachingr" />
</template>
</el-table-column>
<el-table-column label="主办单位" align="center" prop="org" />
<el-table-column label="获奖时间" align="center" prop="awardtime" width="180">
<el-table-column label="主办单位" align="center" prop="org" show-overflow-tooltip />
<el-table-column label="获奖时间" align="center" prop="awardtime" width="180" show-overflow-tooltip>
<!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> -->
......@@ -744,36 +751,36 @@
<div class="card_title">辅导学生获奖</div>
<div style="margin: 3px 10px 15px;">
<el-table :data="fudaoStudent" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
<el-table-column label="成长类型" align="center">
<el-table-column label="成长类型" align="center" show-overflow-tooltip>
<template>
<span>辅导学生获奖</span>
</template>
</el-table-column>
<el-table-column label="学科" align="center" prop="sub">
<el-table-column label="学科" align="center" prop="sub" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template>
</el-table-column>
<el-table-column label="获奖类别" align="center" prop="awardtype">
<el-table-column label="获奖类别" align="center" prop="awardtype" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.award_type_fdxs" :value="scope.row.awardtype" />
</template>
</el-table-column>
<el-table-column label="获奖等级" align="center" prop="awardlevel">
<el-table-column label="获奖等级" align="center" prop="awardlevel" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.award_rank" :value="scope.row.awardlevel" />
</template>
</el-table-column>
<el-table-column label="获奖级别" align="center" prop="awardrank">
<el-table-column label="获奖级别" align="center" prop="awardrank" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardrank" />
</template>
</el-table-column>
<el-table-column label="比赛名称" align="center" prop="resultname" />
<el-table-column label="获奖人" align="center" prop="username" />
<el-table-column label="指导教师" align="center" prop="guidanceteacher" />
<el-table-column label="主办单位" align="center" prop="org" />
<el-table-column label="获奖时间" align="center" prop="awardtime" width="180">
<el-table-column label="比赛名称" align="center" prop="resultname" show-overflow-tooltip />
<el-table-column label="获奖人" align="center" prop="username" show-overflow-tooltip />
<el-table-column label="指导教师" align="center" prop="guidanceteacher" show-overflow-tooltip />
<el-table-column label="主办单位" align="center" prop="org" show-overflow-tooltip />
<el-table-column label="获奖时间" align="center" prop="awardtime" width="180" show-overflow-tooltip>
<!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> -->
......@@ -786,14 +793,14 @@
<div class="card_title">年度考核</div>
<div style="margin: 3px 10px 15px;">
<el-table :data="schoolAnnualAssessment" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
<el-table-column label="姓名" align="center" prop="name" />
<el-table-column label="年度" align="center" prop="year" />
<el-table-column label="考核结果" align="center" prop="checkResult">
<el-table-column label="姓名" align="center" prop="name" show-overflow-tooltip />
<el-table-column label="年度" align="center" prop="year" show-overflow-tooltip />
<el-table-column label="考核结果" align="center" prop="checkResult" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.check_result" :value="scope.row.checkResult" />
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
</el-table>
</div>
</div>
......
ruoyi-ui/src/views/smartSchool/personWork/projectResearch/index.vue
......@@ -131,6 +131,11 @@
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="审核状态" align="center" prop="auditState" sortable width="120">
<template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150px" fixed="right">
<template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)"
......@@ -266,7 +271,7 @@ export default {
components: {
SelectUser,
},
dicts: ["teaching_subjects", 'project_research', 'awards_level', 'award_rank'],
dicts: ["teaching_subjects", 'project_research', 'awards_level', 'award_rank', 'audit_states'],
data() {
return {
// 选择对应处理人
......@@ -352,9 +357,9 @@ export default {
awardTime: [
{ required: true, message: "获奖时间不能为空", trigger: "blur" }
],
remark: [
{ required: true, message: "备注不能为空", trigger: "blur" }
],
// remark: [
// { required: true, message: "备注不能为空", trigger: "blur" }
// ],
pictureName: [
{ required: true, message: "证书图片名称不能为空", trigger: "blur" }
],
......@@ -389,7 +394,7 @@ export default {
getResearch(id).then(response => {
this.form = response.data;
this.pictureUrl = this.pev + this.form.pictureUrl
this.title = "查看综合荣誉";
this.title = "查看课题研究";
});
},
//提交
......
ruoyi-ui/src/views/smartSchool/personWork/teamAward/index.vue
......@@ -112,6 +112,11 @@
width="180px" />
<el-table-column label="团队成员贡献情况" align="center" prop="teamMembersContribution" sortable width="200"
show-overflow-tooltip />
<el-table-column label="审核状态" align="center" prop="auditState" sortable width="120">
<template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" sortable />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150" fixed="right">
<template slot-scope="scope">
......@@ -217,7 +222,7 @@
import { listAward, getAward, delAward, addAward, updateAward, audit } from "@/api/smartSchool/electronicArchives/teamAward";
export default {
name: "Award",
dicts: ["teaching_subjects", 'semester_jsdzda', 'exam_typeda', 'grade_da', 'class_type', 'yearda', 'rankda'],
dicts: ["teaching_subjects", 'semester_jsdzda', 'exam_typeda', 'grade_da', 'class_type', 'yearda', 'rankda', 'audit_states'],
data() {
return {
// 遮罩层
......@@ -298,14 +303,13 @@ export default {
},
// 查看按钮操作
handleLook(row) {
this.reset();
this.open = true;
this.isEdit = true;
const id = row.id || this.ids
getAward(id).then(response => {
this.form = response.data;
this.form.classType = this.form.classType.split(',');
this.title = "查看";
// this.form.classType = this.form.classType.split(',');
this.title = "查看团队获奖";
});
},
handleExamine(row) {
......
ruoyi-ui/src/views/smartSchool/personWork/tutorAward/index.vue
......@@ -155,6 +155,11 @@
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> -->
</el-table-column>
<el-table-column label="审核状态" align="center" prop="auditstate" sortable width="120">
<template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditstate" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180px" fixed="right">
<template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)"
......@@ -303,7 +308,7 @@ import { uploadImage as commonUpload } from "@/api/common";
import SelectUser from "./components/SelectUser";
export default {
name: "tutorAward",
dicts: ["teaching_subjects", 'award_type_fdjs', 'awards_level', 'award_rank', 'coachingr'],
dicts: ["teaching_subjects", 'award_type_fdjs', 'awards_level', 'award_rank', 'coachingr', 'audit_states'],
components: {
SelectUser,
},
......@@ -440,7 +445,7 @@ export default {
getAward(id).then(response => {
this.form = response.data;
this.pictureUrl = this.pev + this.form.pictureUrl
this.title = "查看综合荣誉";
this.title = "查看辅导老师获奖";
});
},
//提交
......@@ -589,7 +594,7 @@ export default {
this.isEdit = false;
this.form.username = this.$store.state.user.name;
this.form.userid = this.$store.state.user.userId;
this.title = "添加教师获奖";
this.title = "添加辅导教师获奖";
},
/** 修改按钮操作 */
handleUpdate(row) {
......@@ -599,7 +604,7 @@ export default {
const id = row.id || this.ids
getAward(id).then(response => {
this.form = response.data;
this.title = "修改教师获奖";
this.title = "修改辅导教师获奖";
});
},
/** 提交按钮 */
......
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/affairStudentManage/index.vue
......@@ -1226,16 +1226,17 @@ export default {
},
// 文件压缩包上传前格式限制
beforeFileUpload(file) {
console.log(file, 1148)
const type = file.type === 'application/x-zip-compressed'
// const isLt2M = file.size / 1024 / 1024 < 2
if (!type) {
this.$message.error('文件格式不正确!(只能上传zip文件)')
const fileName = file.name;
const extension = fileName.substring(fileName.lastIndexOf('.') + 1).toLowerCase();
const allowedExtensions = ['zip']; // 允许的文件后缀列表
if (allowedExtensions.includes(extension)) {
// 文件类型正确，允许上传
return true;
} else {
// 文件类型不正确，给出错误提示并阻止上传
this.$message.error('文件格式不正确！只能上传zip文件');
return false;
}
// if (!isLt2M) {
// this.$message.error('上传图片大小不能超过 2MB!')
// }
return type
},
// 上传学生照片压缩包文件
uploadFiles(file) {
......
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