Skip to content

D
dd_school
Commit 10b0e16a by zhaopanyu
Options

zpy 修改bug

parent 267e75f3
Showing with 387 additions and 139 deletions
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/professionalDevelopment/annualAssessment/index.vue
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="年度" prop="year"> <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 v-for="dict in dict.type.rankda" :key="dict.value" :label="dict.label" :value="dict.value">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="考核结果" prop="checkResult"> <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" <el-option v-for="dict in dict.type.check_result" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -48,7 +48,8 @@ ...@@ -48,7 +48,8 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table :data="assessmentList" @selection-change="handleSelectionChange"> <el-table :data="assessmentList" @selection-change="handleSelectionChange" :row-style="{ height: '0' }"
:cell-style="{ padding: '3px' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" width="55" label="序号" align="center" /> <el-table-column type="index" width="55" label="序号" align="center" />
<el-table-column label="姓名" align="center" prop="name" /> <el-table-column label="姓名" align="center" prop="name" />
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/awardTutoringstu/index.vue
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="学科" prop="sub"> <el-form-item label="学科" prop="sub">
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;"> <el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="获奖类别" prop="awardtype"> <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" <el-option v-for="dict in dict.type.award_type_fdxs" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="获奖级别" prop="awardrank"> <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" <el-option v-for="dict in dict.type.awards_level" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="获奖等级" prop="awardlevel"> <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" <el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="指导教师" prop="guidanceteacher"> <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-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -138,6 +138,11 @@ ...@@ -138,6 +138,11 @@
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> --> </template> -->
</el-table-column> </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"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <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"; ...@@ -376,7 +381,7 @@ import { uploadImage as commonUpload } from "@/api/common";
import SelectUser from "./components/SelectUser"; import SelectUser from "./components/SelectUser";
export default { export default {
name: "tutorAward", 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: { components: {
SelectUser, SelectUser,
}, },
...@@ -683,7 +688,7 @@ export default { ...@@ -683,7 +688,7 @@ export default {
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.form.auditState = '2'; this.form.auditstate = '2';
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
if (this.form.id != null) { if (this.form.id != null) {
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/comprehensiveHonors/index.vue
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="学科" prop="sub"> <el-form-item label="学科" prop="sub">
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;"> <el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="获奖级别" prop="awardRank"> <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" <el-option v-for="dict in dict.type.awards_level" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="获奖等级" prop="awardLevel"> <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" <el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -126,6 +126,11 @@ ...@@ -126,6 +126,11 @@
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </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"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="180px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
...@@ -348,7 +353,7 @@ export default { ...@@ -348,7 +353,7 @@ export default {
components: { components: {
SelectUser, SelectUser,
}, },
dicts: ["teaching_subjects", 'award_categories', 'awards_level', 'award_rank'], dicts: ["teaching_subjects", 'award_categories', 'awards_level', 'award_rank', 'audit_states'],
data() { data() {
return { return {
// 选择对应处理人 // 选择对应处理人
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/essaysWritings/index.vue
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="学科" prop="sub"> <el-form-item label="学科" prop="sub">
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;"> <el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="获奖类别" prop="awardType"> <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" <el-option v-for="dict in dict.type.award_categoriesjk" :key="dict.value"
:label="dict.label" :value="dict.value"> :label="dict.label" :value="dict.value">
</el-option> </el-option>
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="获奖级别" prop="awardRank"> <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" <el-option v-for="dict in dict.type.awards_level" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="获奖等级" prop="awardLevel"> <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" <el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -133,6 +133,11 @@ ...@@ -133,6 +133,11 @@
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </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"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="180px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
...@@ -360,7 +365,7 @@ export default { ...@@ -360,7 +365,7 @@ export default {
components: { components: {
SelectUser, SelectUser,
}, },
dicts: ["teaching_subjects", 'award_categories', 'awards_level', 'award_rank'], dicts: ["teaching_subjects", 'award_categories', 'awards_level', 'award_rank', 'audit_states'],
data() { data() {
return { return {
// 选择对应处理人 // 选择对应处理人
...@@ -456,9 +461,9 @@ export default { ...@@ -456,9 +461,9 @@ export default {
pictureUrl: [ pictureUrl: [
{ required: true, message: "证书图片地址不能为空", trigger: "blur" } { required: true, message: "证书图片地址不能为空", trigger: "blur" }
], ],
delFlag: [ // delFlag: [
{ required: true, message: "删除状态不能为空", trigger: "blur" } // { required: true, message: "删除状态不能为空", trigger: "blur" }
] // ]
} }
}; };
}, },
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/lectureAwards/index.vue
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="学科" prop="sub"> <el-form-item label="学科" prop="sub">
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;"> <el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="获奖类别" prop="awardType"> <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" <el-option v-for="dict in dict.type.award_categoriesjk" :key="dict.value"
:label="dict.label" :value="dict.value"> :label="dict.label" :value="dict.value">
</el-option> </el-option>
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="获奖级别" prop="awardRank"> <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" <el-option v-for="dict in dict.type.awards_level" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="获奖等级" prop="awardLevel"> <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" <el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -131,6 +131,11 @@ ...@@ -131,6 +131,11 @@
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </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"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
...@@ -357,7 +362,7 @@ export default { ...@@ -357,7 +362,7 @@ export default {
components: { components: {
SelectUser, SelectUser,
}, },
dicts: ["teaching_subjects", 'award_categoriesjk', 'awards_level', 'award_rank'], dicts: ["teaching_subjects", 'award_categoriesjk', 'awards_level', 'award_rank', 'audit_states'],
data() { data() {
return { return {
// 选择对应处理人 // 选择对应处理人
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/projectResearch/index.vue
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="学科" prop="sub"> <el-form-item label="学科" prop="sub">
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;"> <el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="获奖类别" prop="awardType"> <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" <el-option v-for="dict in dict.type.award_categoriesjk" :key="dict.value"
:label="dict.label" :value="dict.value"> :label="dict.label" :value="dict.value">
</el-option> </el-option>
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="获奖级别" prop="awardRank"> <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" <el-option v-for="dict in dict.type.awards_level" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="获奖等级" prop="awardLevel"> <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" <el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -130,6 +130,11 @@ ...@@ -130,6 +130,11 @@
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </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"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150px" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
...@@ -361,7 +366,7 @@ export default { ...@@ -361,7 +366,7 @@ export default {
components: { components: {
SelectUser, SelectUser,
}, },
dicts: ["teaching_subjects", 'project_research', 'awards_level', 'award_rank'], dicts: ["teaching_subjects", 'project_research', 'awards_level', 'award_rank', 'audit_states'],
data() { data() {
return { return {
// 选择对应处理人 // 选择对应处理人
...@@ -457,9 +462,9 @@ export default { ...@@ -457,9 +462,9 @@ export default {
pictureUrl: [ pictureUrl: [
{ required: true, message: "证书图片地址不能为空", trigger: "blur" } { required: true, message: "证书图片地址不能为空", trigger: "blur" }
], ],
delFlag: [ // delFlag: [
{ required: true, message: "删除状态不能为空", trigger: "blur" } // { required: true, message: "删除状态不能为空", trigger: "blur" }
] // ]
} }
}; };
}, },
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/teacherAwards/index.vue
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="学科" prop="sub"> <el-form-item label="学科" prop="sub">
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;"> <el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="获奖级别" prop="awardRank"> <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" <el-option v-for="dict in dict.type.awards_level" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="获奖类别" prop="awardType"> <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" <el-option v-for="dict in dict.type.award_categoriesjs" :key="dict.value"
:label="dict.label" :value="dict.value"> :label="dict.label" :value="dict.value">
</el-option> </el-option>
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="获奖等级" prop="awardLevel"> <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" <el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -133,6 +133,11 @@ ...@@ -133,6 +133,11 @@
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </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 <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="180px
"> ">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -358,7 +363,7 @@ export default { ...@@ -358,7 +363,7 @@ export default {
components: { components: {
SelectUser, SelectUser,
}, },
dicts: ["teaching_subjects", 'award_categoriesjs', 'awards_level', 'award_rank'], dicts: ["teaching_subjects", 'award_categoriesjs', 'awards_level', 'award_rank', 'audit_states'],
data() { data() {
return { return {
// 选择对应处理人 // 选择对应处理人
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/teachingAchievements/index.vue
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="学年" prop="schoolYear"> <el-form-item label="学年" prop="schoolYear">
<el-select v-model="queryParams.schoolYear" placeholder="请选择" style="width: 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" <el-option v-for="dict in dict.type.yearda" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="学期" prop="semester"> <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" <el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="届别" prop="year"> <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" <el-option v-for="dict in dict.type.rankda" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="年级" prop="grade"> <el-form-item label="年级" prop="grade">
<el-select v-model="queryParams.grade" placeholder="请选择" style="width: 100%;"> <el-select v-model="queryParams.grade" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.grade_da" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.grade_da" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="学科" prop="sub"> <el-form-item label="学科" prop="sub">
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;"> <el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -346,7 +346,7 @@ import { getToken } from '@/utils/auth' ...@@ -346,7 +346,7 @@ import { getToken } from '@/utils/auth'
export default { export default {
name: "Achievements", 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() { data() {
return { return {
uploadOpen: false, uploadOpen: false,
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/teamAward/index.vue
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="学年" prop="schoolYear"> <el-form-item label="学年" prop="schoolYear">
<el-select v-model="queryParams.schoolYear" placeholder="请选择" style="width: 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" <el-option v-for=" dict in dict.type.yearda" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="学期" prop="semester"> <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" <el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="届别" prop="year"> <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" <el-option v-for="dict in dict.type.rankda" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="年级" prop="grade"> <el-form-item label="年级" prop="grade">
<el-select v-model="queryParams.grade" placeholder="请选择" style="width: 100%;"> <el-select v-model="queryParams.grade" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.grade_da" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.grade_da" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="学科" prop="sub"> <el-form-item label="学科" prop="sub">
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;"> <el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
width="180px" /> width="180px" />
<el-table-column label="团队成员贡献情况" align="center" prop="teamMembersContribution" sortable width="200" <el-table-column label="团队成员贡献情况" align="center" prop="teamMembersContribution" sortable width="200"
show-overflow-tooltip /> 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"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:honors:edit']" <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 @@ ...@@ -5,7 +5,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="学科" prop="sub"> <el-form-item label="学科" prop="sub">
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;"> <el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="获奖类别" prop="awardtype"> <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" <el-option v-for="dict in dict.type.award_type_fdjs" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="获奖级别" prop="awardrank"> <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" <el-option v-for="dict in dict.type.awards_level" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="获奖等级" prop="awardlevel"> <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" <el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -51,14 +51,14 @@ ...@@ -51,14 +51,14 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="指导教师" prop="guidanceteacher"> <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-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="辅导职责" prop="coachingr"> <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" <el-option v-for="dict in dict.type.coachingr" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -155,6 +155,11 @@ ...@@ -155,6 +155,11 @@
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> --> </template> -->
</el-table-column> </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"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180px" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <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"; ...@@ -413,7 +418,7 @@ import { uploadImage as commonUpload } from "@/api/common";
import SelectUser from "./components/SelectUser"; import SelectUser from "./components/SelectUser";
export default { export default {
name: "tutorAward", 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: { components: {
SelectUser, SelectUser,
}, },
......
ruoyi-ui/src/views/smartSchool/electronicArchives/teacherAssessment/index.vue
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="学年" prop="schoolYear"> <el-form-item label="学年" prop="schoolYear">
<el-select v-model="queryParams.schoolYear" placeholder="请选择" style="width: 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" <el-option v-for="dict in dict.type.yearda" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="届别" prop="year"> <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" <el-option v-for="dict in dict.type.rankda" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
</el-form-item></el-col> </el-form-item></el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="学期" prop="semester"> <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" <el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="年级" prop="grade"> <el-form-item label="年级" prop="grade">
<el-select v-model="queryParams.grade" placeholder="请选择" style="width: 100%;"> <el-select v-model="queryParams.grade" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.grade_da" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.grade_da" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="学科" prop="sub"> <el-form-item label="学科" prop="sub">
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%"> <el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="班级类型" prop="classType"> <el-form-item label="班级类型" prop="classType">
<el-select v-model="queryParams.classType" placeholder="请选择" style="width: 100%"> <el-select v-model="queryParams.classType" clearable placeholder="请选择" style="width: 100%">
<el-option v-for="dict in dict.type.class_type" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.class_type" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -128,13 +128,14 @@ ...@@ -128,13 +128,14 @@
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" /> <el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" />
<el-table-column label="学年" align="center" prop="schoolYear" sortable fixed="left" width="130px <el-table-column label="学年" align="center" prop="schoolYear" sortable fixed="left" width="130px
" /> " show-overflow-tooltip />
<el-table-column label="学期" align="center" prop="semester" sortable fixed="left" width="130px"> <el-table-column label="学期" align="center" prop="semester" sortable fixed="left" width="130px"
show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.semester_jsdzda" :value="scope.row.semester" /> <dict-tag :options="dict.type.semester_jsdzda" :value="scope.row.semester" />
</template> </template>
</el-table-column> </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> <el-table-column label="年级" align="center" prop="grade" sortable show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.grade_da" :value="scope.row.grade" /> <dict-tag :options="dict.type.grade_da" :value="scope.row.grade" />
...@@ -161,6 +162,7 @@ ...@@ -161,6 +162,7 @@
width="130px" show-overflow-tooltip /> width="130px" show-overflow-tooltip />
<el-table-column label="智育考核成绩" align="center" prop="intellEduCheckAchievement" sortable fixed="right" <el-table-column label="智育考核成绩" align="center" prop="intellEduCheckAchievement" sortable fixed="right"
width="130px" show-overflow-tooltip /> width="130px" show-overflow-tooltip />
<!-- <el-table-column label="总考核成绩" align="center" prop="totalCheckAchievement" sortable fixed="right" <!-- <el-table-column label="总考核成绩" align="center" prop="totalCheckAchievement" sortable fixed="right"
width="130px" /> --> width="130px" /> -->
<el-table-column label="备注" align="center" prop="remark" sortable fixed="right" /> <el-table-column label="备注" align="center" prop="remark" sortable fixed="right" />
...@@ -329,7 +331,7 @@ import { listAssessment, getAssessment, delAssessment, addAssessment, updateAsse ...@@ -329,7 +331,7 @@ import { listAssessment, getAssessment, delAssessment, addAssessment, updateAsse
import { getToken } from "@/utils/auth"; import { getToken } from "@/utils/auth";
export default { export default {
name: "Assessment", 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() { data() {
return { return {
uploadOpen: false, uploadOpen: false,
......
ruoyi-ui/src/views/smartSchool/electronicArchives/workloadInformation/index.vue
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="学年" prop="schoolYear"> <el-form-item label="学年" prop="schoolYear">
<el-select v-model="queryParams.schoolYear" placeholder="请选择" style="width: 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" <el-option v-for="dict in dict.type.yearda" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="学期" prop="semester"> <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" <el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="届别" prop="year"> <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" <el-option v-for="dict in dict.type.rankda" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="年级" prop="grade"> <el-form-item label="年级" prop="grade">
<el-select v-model="queryParams.grade" placeholder="请选择" style="width: 100%;"> <el-select v-model="queryParams.grade" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.grade_da" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.grade_da" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="学科" prop="sub"> <el-form-item label="学科" prop="sub">
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%"> <el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -62,7 +62,8 @@ ...@@ -62,7 +62,8 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="聘任岗位" prop="appointmentPost"> <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" <el-option v-for="dict in dict.type.appointment_positions" :key="dict.value"
:label="dict.label" :value="dict.value"> :label="dict.label" :value="dict.value">
</el-option> </el-option>
...@@ -85,7 +86,7 @@ ...@@ -85,7 +86,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="班级类型" prop="classType"> <el-form-item label="班级类型" prop="classType">
<el-select v-model="queryParams.classType" placeholder="请选择" style="width: 100%"> <el-select v-model="queryParams.classType" clearable placeholder="请选择" style="width: 100%">
<el-option v-for="dict in dict.type.class_type" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.class_type" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -102,7 +103,8 @@ ...@@ -102,7 +103,8 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="聘任情况" prop="appointmentSituation"> <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" <el-option v-for="dict in dict.type.appointment_situation" :key="dict.value"
:label="dict.label" :value="dict.value"> :label="dict.label" :value="dict.value">
</el-option> </el-option>
...@@ -197,10 +199,8 @@ ...@@ -197,10 +199,8 @@
<el-table-column label="晚自习" align="center" prop="eveningSelfStudy" sortable width="90px" <el-table-column label="晚自习" align="center" prop="eveningSelfStudy" sortable width="90px"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="合计" align="center" prop="amountTo" sortable 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 <el-table-column label="证明人" align="center" prop="userName" width="120px" sortable show-overflow-tooltip />
show-overflow-tooltip /> <el-table-column label="备注" align="center" prop="remark" sortable width="150px" 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" class-name="small-padding fixed-width" width="150px" fixed="right"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150px" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
......
ruoyi-ui/src/views/smartSchool/personWork/awardTutoringstu/index.vue
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="学科" prop="sub"> <el-form-item label="学科" prop="sub">
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;"> <el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="获奖类别" prop="awardtype"> <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" <el-option v-for="dict in dict.type.award_type_fdxs" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -138,6 +138,11 @@ ...@@ -138,6 +138,11 @@
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> --> </template> -->
</el-table-column> </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"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
...@@ -270,7 +275,7 @@ import { uploadImage as commonUpload } from "@/api/common"; ...@@ -270,7 +275,7 @@ import { uploadImage as commonUpload } from "@/api/common";
export default { export default {
name: "tutorAward", 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() { data() {
return { return {
...@@ -396,7 +401,7 @@ export default { ...@@ -396,7 +401,7 @@ export default {
getAward(id).then(response => { getAward(id).then(response => {
this.form = response.data; this.form = response.data;
this.pictureUrl = this.pev + this.form.pictureUrl this.pictureUrl = this.pev + this.form.pictureUrl
this.title = "查看综合荣誉"; this.title = "查看辅导学生获奖";
}); });
}, },
//提交 //提交
...@@ -516,7 +521,7 @@ export default { ...@@ -516,7 +521,7 @@ export default {
this.isEdit = false; this.isEdit = false;
this.form.username = this.$store.state.user.name; this.form.username = this.$store.state.user.name;
this.form.userid = this.$store.state.user.userId; this.form.userid = this.$store.state.user.userId;
this.title = "添加教师获奖"; this.title = "添加辅导学生获奖";
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
...@@ -526,12 +531,12 @@ export default { ...@@ -526,12 +531,12 @@ export default {
const id = row.id || this.ids const id = row.id || this.ids
getAward(id).then(response => { getAward(id).then(response => {
this.form = response.data; this.form = response.data;
this.title = "修改教师获奖"; this.title = "修改辅导学生获奖";
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.form.auditState = '0'; this.form.auditstate = '0';
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
if (this.form.id != null) { if (this.form.id != null) {
......
ruoyi-ui/src/views/smartSchool/personWork/comprehensiveHonors/index.vue
...@@ -122,6 +122,11 @@ ...@@ -122,6 +122,11 @@
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </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"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:honors:edit']" <el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:honors:edit']"
...@@ -142,7 +147,7 @@ ...@@ -142,7 +147,7 @@
@pagination="getList" /> @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-form ref="form" :model="form" :rules="rules" label-width="80px" :disabled="isEdit">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
...@@ -253,7 +258,7 @@ export default { ...@@ -253,7 +258,7 @@ export default {
components: { components: {
SelectUser, SelectUser,
}, },
dicts: ["teaching_subjects", 'award_categories', 'awards_level', 'award_rank'], dicts: ["teaching_subjects", 'award_categories', 'awards_level', 'award_rank', 'audit_states'],
data() { data() {
return { return {
isEdit: false, isEdit: false,
......
ruoyi-ui/src/views/smartSchool/personWork/essaysWritings/index.vue
...@@ -345,18 +345,18 @@ export default { ...@@ -345,18 +345,18 @@ export default {
awardTime: [ awardTime: [
{ required: true, message: "获奖时间不能为空", trigger: "blur" } { required: true, message: "获奖时间不能为空", trigger: "blur" }
], ],
remark: [ // remark: [
{ required: true, message: "备注不能为空", trigger: "blur" } // { required: true, message: "备注不能为空", trigger: "blur" }
], // ],
pictureName: [ pictureName: [
{ required: true, message: "证书图片名称不能为空", trigger: "blur" } { required: true, message: "证书图片名称不能为空", trigger: "blur" }
], ],
pictureUrl: [ pictureUrl: [
{ required: true, message: "证书图片地址不能为空", trigger: "blur" } { required: true, message: "证书图片地址不能为空", trigger: "blur" }
], ],
delFlag: [ // delFlag: [
{ required: true, message: "删除状态不能为空", trigger: "blur" } // { required: true, message: "删除状态不能为空", trigger: "blur" }
] // ]
} }
}; };
}, },
...@@ -382,7 +382,7 @@ export default { ...@@ -382,7 +382,7 @@ export default {
getWorks(id).then(response => { getWorks(id).then(response => {
this.form = response.data; this.form = response.data;
this.pictureUrl = this.pev + this.form.pictureUrl this.pictureUrl = this.pev + this.form.pictureUrl
this.title = "查看综合荣誉"; this.title = "查看论文论著";
}); });
}, },
// 选择处理人:打开对话框 // 选择处理人:打开对话框
......
ruoyi-ui/src/views/smartSchool/personWork/examinationScore/index.vue
...@@ -103,14 +103,14 @@ ...@@ -103,14 +103,14 @@
<el-table-column label="教师姓名" align="center" prop="teacherName" sortable width="150" /> <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="teachingClassName" sortable width="130" />
<el-table-column label="班级类型" align="center" prop="classType" sortable show-overflow-tooltip width="180"> <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-if="getSelectedTypes(scope.row.classType).length > 0">
<span v-for="(option, index) in getSelectedTypes(scope.row.classType)" :key="index"> <span v-for="(option, index) in getSelectedTypes(scope.row.classType)" :key="index">
{{ option.label }} {{ option.label }}
<span v-if="index !== getSelectedTypes(scope.row.classType).length - 1">, </span> <span v-if="index !== getSelectedTypes(scope.row.classType).length - 1">, </span>
</span> </span>
</span> </span>
</template> </template> -->
</el-table-column> </el-table-column>
<el-table-column label="高考评优" align="center" prop="gkAppraising" sortable width="180"> <el-table-column label="高考评优" align="center" prop="gkAppraising" sortable width="180">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -121,7 +121,13 @@ ...@@ -121,7 +121,13 @@
<el-table-column label="增量情况" align="center" prop="incrementSituation" sortable width="150" /> <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="effectiveNumSituation" sortable width="180" />
<el-table-column label="其他情况" align="center" prop="other" 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="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"> <template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
v-hasPermi="['system:achievement:edit']" v-hasPermi="['system:achievement:edit']"
...@@ -144,7 +150,7 @@ ...@@ -144,7 +150,7 @@
<!-- 添加或修改高考成绩对话框 --> <!-- 添加或修改高考成绩对话框 -->
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body> <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-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="学科" prop="sub"> <el-form-item label="学科" prop="sub">
...@@ -184,7 +190,7 @@ ...@@ -184,7 +190,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="班级类型" prop="classType"> <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" <el-option v-for="dict in dict.type.class_type" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -204,24 +210,24 @@ ...@@ -204,24 +210,24 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="尖子生培养" prop="topStudentsCulture"> <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-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="增量情况" prop="incrementSituation"> <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-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="有效数情况" prop="effectiveNumSituation"> <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-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="其他" prop="other"> <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-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -239,7 +245,7 @@ import { listAchievement, getAchievement, delAchievement, addAchievement, update ...@@ -239,7 +245,7 @@ import { listAchievement, getAchievement, delAchievement, addAchievement, update
export default { export default {
name: "Achievement", 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() { data() {
return { return {
...@@ -328,10 +334,10 @@ export default { ...@@ -328,10 +334,10 @@ export default {
}); });
}, },
getSelectedTypes(classType) { // getSelectedTypes(classType) {
const selectedTypes = classType.split(','); // 将逗号分隔的字符串转换为数组 // const selectedTypes = classType.split(','); // 将逗号分隔的字符串转换为数组
return this.dict.type.class_type.filter(option => selectedTypes.includes(option.value.toString())); // return this.dict.type.class_type.filter(option => selectedTypes.includes(option.value.toString()));
}, // },
handleExamine(row) { handleExamine(row) {
const ids = row.id || this.ids; const ids = row.id || this.ids;
this.$modal this.$modal
...@@ -406,6 +412,7 @@ export default { ...@@ -406,6 +412,7 @@ export default {
this.reset(); this.reset();
this.open = true; this.open = true;
this.isEdit = false; this.isEdit = false;
this.form.teacherName = this.$store.state.user.name;
this.form.userId = this.$store.state.user.userId; this.form.userId = this.$store.state.user.userId;
this.title = "添加高考成绩"; this.title = "添加高考成绩";
}, },
...@@ -416,7 +423,7 @@ export default { ...@@ -416,7 +423,7 @@ export default {
const id = row.id || this.ids const id = row.id || this.ids
getAchievement(id).then(response => { getAchievement(id).then(response => {
this.form = response.data; this.form = response.data;
this.form.classType = this.form.classType.split(','); // this.form.classType = this.form.classType.split(',');
this.open = true; this.open = true;
this.title = "修改高考成绩"; this.title = "修改高考成绩";
}); });
...@@ -429,7 +436,7 @@ export default { ...@@ -429,7 +436,7 @@ export default {
const id = row.id || this.ids const id = row.id || this.ids
getAchievement(id).then(response => { getAchievement(id).then(response => {
this.form = response.data; this.form = response.data;
this.form.classType = this.form.classType.split(','); // this.form.classType = this.form.classType.split(',');
this.title = "查看"; this.title = "查看";
}); });
}, },
...@@ -437,17 +444,17 @@ export default { ...@@ -437,17 +444,17 @@ export default {
submitForm() { submitForm() {
this.form.auditState = '0'; this.form.auditState = '0';
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
const classTypeStr = this.form.classType.join(','); // const classTypeStr = this.form.classType.join(',');
console.log(classTypeStr); // 输出转换后的字符串 // console.log(classTypeStr); // 输出转换后的字符串
if (valid) { if (valid) {
if (this.form.id != null) { if (this.form.id != null) {
updateAchievement({ ...this.form, classType: classTypeStr }).then(response => { updateAchievement({ ...this.form }).then(response => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
} else { } else {
addAchievement({ ...this.form, classType: classTypeStr }).then(response => { addAchievement({ ...this.form }).then(response => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
...@@ -496,6 +503,10 @@ export default { ...@@ -496,6 +503,10 @@ export default {
margin-top: 4vh !important; margin-top: 4vh !important;
} }
.add ::v-deep .el-textarea__inner {
margin-bottom: 10px;
}
.search ::v-deep .el-form-item__content { .search ::v-deep .el-form-item__content {
width: 200px width: 200px
} }
......
ruoyi-ui/src/views/smartSchool/personWork/projectResearch/index.vue
...@@ -131,6 +131,11 @@ ...@@ -131,6 +131,11 @@
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </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"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150px" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
...@@ -266,7 +271,7 @@ export default { ...@@ -266,7 +271,7 @@ export default {
components: { components: {
SelectUser, SelectUser,
}, },
dicts: ["teaching_subjects", 'project_research', 'awards_level', 'award_rank'], dicts: ["teaching_subjects", 'project_research', 'awards_level', 'award_rank', 'audit_states'],
data() { data() {
return { return {
// 选择对应处理人 // 选择对应处理人
...@@ -352,9 +357,9 @@ export default { ...@@ -352,9 +357,9 @@ export default {
awardTime: [ awardTime: [
{ required: true, message: "获奖时间不能为空", trigger: "blur" } { required: true, message: "获奖时间不能为空", trigger: "blur" }
], ],
remark: [ // remark: [
{ required: true, message: "备注不能为空", trigger: "blur" } // { required: true, message: "备注不能为空", trigger: "blur" }
], // ],
pictureName: [ pictureName: [
{ required: true, message: "证书图片名称不能为空", trigger: "blur" } { required: true, message: "证书图片名称不能为空", trigger: "blur" }
], ],
...@@ -389,7 +394,7 @@ export default { ...@@ -389,7 +394,7 @@ export default {
getResearch(id).then(response => { getResearch(id).then(response => {
this.form = response.data; this.form = response.data;
this.pictureUrl = this.pev + this.form.pictureUrl this.pictureUrl = this.pev + this.form.pictureUrl
this.title = "查看综合荣誉"; this.title = "查看课题研究";
}); });
}, },
//提交 //提交
......
ruoyi-ui/src/views/smartSchool/personWork/teamAward/index.vue
...@@ -112,6 +112,11 @@ ...@@ -112,6 +112,11 @@
width="180px" /> width="180px" />
<el-table-column label="团队成员贡献情况" align="center" prop="teamMembersContribution" sortable width="200" <el-table-column label="团队成员贡献情况" align="center" prop="teamMembersContribution" sortable width="200"
show-overflow-tooltip /> 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" prop="remark" sortable />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150" fixed="right"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -217,7 +222,7 @@ ...@@ -217,7 +222,7 @@
import { listAward, getAward, delAward, addAward, updateAward, audit } from "@/api/smartSchool/electronicArchives/teamAward"; import { listAward, getAward, delAward, addAward, updateAward, audit } from "@/api/smartSchool/electronicArchives/teamAward";
export default { export default {
name: "Award", 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() { data() {
return { return {
// 遮罩层 // 遮罩层
...@@ -298,14 +303,13 @@ export default { ...@@ -298,14 +303,13 @@ export default {
}, },
// 查看按钮操作 // 查看按钮操作
handleLook(row) { handleLook(row) {
this.reset();
this.open = true; this.open = true;
this.isEdit = true; this.isEdit = true;
const id = row.id || this.ids const id = row.id || this.ids
getAward(id).then(response => { getAward(id).then(response => {
this.form = response.data; this.form = response.data;
this.form.classType = this.form.classType.split(','); // this.form.classType = this.form.classType.split(',');
this.title = "查看"; this.title = "查看团队获奖";
}); });
}, },
handleExamine(row) { handleExamine(row) {
......
ruoyi-ui/src/views/smartSchool/personWork/tutorAward/index.vue
...@@ -155,6 +155,11 @@ ...@@ -155,6 +155,11 @@
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> --> </template> -->
</el-table-column> </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"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180px" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
...@@ -303,7 +308,7 @@ import { uploadImage as commonUpload } from "@/api/common"; ...@@ -303,7 +308,7 @@ import { uploadImage as commonUpload } from "@/api/common";
import SelectUser from "./components/SelectUser"; import SelectUser from "./components/SelectUser";
export default { export default {
name: "tutorAward", 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: { components: {
SelectUser, SelectUser,
}, },
...@@ -440,7 +445,7 @@ export default { ...@@ -440,7 +445,7 @@ export default {
getAward(id).then(response => { getAward(id).then(response => {
this.form = response.data; this.form = response.data;
this.pictureUrl = this.pev + this.form.pictureUrl this.pictureUrl = this.pev + this.form.pictureUrl
this.title = "查看综合荣誉"; this.title = "查看辅导老师获奖";
}); });
}, },
//提交 //提交
...@@ -589,7 +594,7 @@ export default { ...@@ -589,7 +594,7 @@ export default {
this.isEdit = false; this.isEdit = false;
this.form.username = this.$store.state.user.name; this.form.username = this.$store.state.user.name;
this.form.userid = this.$store.state.user.userId; this.form.userid = this.$store.state.user.userId;
this.title = "添加教师获奖"; this.title = "添加辅导教师获奖";
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
...@@ -599,7 +604,7 @@ export default { ...@@ -599,7 +604,7 @@ export default {
const id = row.id || this.ids const id = row.id || this.ids
getAward(id).then(response => { getAward(id).then(response => {
this.form = response.data; this.form = response.data;
this.title = "修改教师获奖"; this.title = "修改辅导教师获奖";
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
......
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/affairStudentManage/index.vue
...@@ -1226,16 +1226,17 @@ export default { ...@@ -1226,16 +1226,17 @@ export default {
}, },
// 文件压缩包上传前格式限制 // 文件压缩包上传前格式限制
beforeFileUpload(file) { beforeFileUpload(file) {
console.log(file, 1148) const fileName = file.name;
const type = file.type === 'application/x-zip-compressed' const extension = fileName.substring(fileName.lastIndexOf('.') + 1).toLowerCase();
// const isLt2M = file.size / 1024 / 1024 < 2 const allowedExtensions = ['zip']; // 允许的文件后缀列表
if (!type) { if (allowedExtensions.includes(extension)) {
this.$message.error('文件格式不正确!(只能上传zip文件)') // 文件类型正确，允许上传
return true;
} else {
// 文件类型不正确，给出错误提示并阻止上传
this.$message.error('文件格式不正确！只能上传zip文件');
return false;
} }
// if (!isLt2M) {
// this.$message.error('上传图片大小不能超过 2MB!')
// }
return type
}, },
// 上传学生照片压缩包文件 // 上传学生照片压缩包文件
uploadFiles(file) { 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