Skip to content

D
dd_school
Commit 33cd6591 by zhaopanyu
Options

zpy 12.22

parent 2f6018ae
Showing with 329 additions and 317 deletions
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/awardTutoringstu/index.vue
......@@ -104,36 +104,37 @@
@selection-change="handleSelectionChange" :default-sort="{ prop: 'awardtime', order: 'descending' }">
<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" fixed="left" width="120px">
<el-table-column label="成长类型" align="center" fixed="left" width="120px" show-overflow-tooltip>
<template>
<span>辅导学生获奖</span>
</template>
</el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="120px">
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="120px" 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" sortable width="120px">
<el-table-column label="获奖类别" align="center" prop="awardtype" sortable width="120px" 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" sortable width="120px">
<el-table-column label="获奖等级" align="center" prop="awardlevel" sortable width="120px" 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" sortable width="120px">
<el-table-column label="获奖级别" align="center" prop="awardrank" sortable width="120px" 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" sortable width="180px" />
<el-table-column label="获奖人" align="center" prop="username" sortable width="120px" />
<el-table-column label="指导教师" align="center" prop="guidanceteacher" sortable width="120px" />
<el-table-column label="主办单位" align="center" prop="org" sortable width="180px" />
<el-table-column label="获奖时间" align="center" prop="awardtime" width="180" sortable>
<el-table-column label="比赛名称" align="center" prop="resultname" sortable width="180px" show-overflow-tooltip />
<el-table-column label="获奖人" align="center" prop="username" sortable width="120px" show-overflow-tooltip />
<el-table-column label="指导教师" align="center" prop="guidanceteacher" sortable width="120px"
show-overflow-tooltip />
<el-table-column label="主办单位" align="center" prop="org" sortable width="180px" show-overflow-tooltip />
<el-table-column label="获奖时间" align="center" prop="awardtime" width="180" sortable show-overflow-tooltip>
<!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> -->
......@@ -165,7 +166,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="form.sub" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -174,7 +175,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖类别" prop="awardtype">
<el-select v-model="form.awardtype" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -185,7 +186,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="获奖级别" prop="awardrank">
<el-select v-model="form.awardrank" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -194,7 +195,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖等级" prop="awardlevel">
<el-select v-model="form.awardlevel" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -205,12 +206,12 @@
<el-row>
<el-col :span="12">
<el-form-item label="成果名称" prop="resultname">
<el-input v-model="form.resultname" placeholder="请输入成果名称" />
<el-input v-model="form.resultname" placeholder="请输入成果名称" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="指导教师" prop="guidanceteacher">
<el-input v-model="form.guidanceteacher" placeholder="请输入内容" />
<el-input v-model="form.guidanceteacher" placeholder="请输入内容" clearable />
</el-form-item>
</el-col>
</el-row>
......@@ -218,14 +219,14 @@
<el-col :span="12">
<el-form-item label="获奖人" prop="username">
<el-input v-model="form.username" placeholder="请选择分管领导"
<el-input v-model="form.username" placeholder="请选择分管领导" clearable
@input="openSelect('选择分管领导', 'leaderList', 2)"
@focus="openSelect('选择分管领导', 'leaderList', 2)"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="主办单位" prop="org">
<el-input v-model="form.org" placeholder="请输入主办单位" />
<el-input v-model="form.org" placeholder="请输入主办单位" clearable />
</el-form-item>
</el-col>
</el-row>
......@@ -239,7 +240,7 @@
</el-col>
<el-col :span="12">
<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>
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/comprehensiveHonors/index.vue
......@@ -155,7 +155,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="form.sub" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -172,7 +172,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="获奖级别" prop="awardRank">
<el-select v-model="form.awardRank" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -181,7 +181,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖等级" prop="awardLevel">
<el-select v-model="form.awardLevel" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -192,12 +192,12 @@
<el-row>
<el-col :span="12">
<el-form-item label="成果名称" prop="resultName">
<el-input v-model="form.resultName" placeholder="请输入" />
<el-input v-model="form.resultName" placeholder="请输入" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="获奖人" prop="userName">
<el-input v-model="form.userName" placeholder="请选择"
<el-input v-model="form.userName" placeholder="请选择" clearable
@input="openSelect('选择分管领导', 'leaderList', 2)"
@focus="openSelect('选择分管领导', 'leaderList', 2)"></el-input>
</el-form-item>
......@@ -206,7 +206,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="主办单位" prop="org">
<el-input v-model="form.org" placeholder="请输入" />
<el-input v-model="form.org" placeholder="请输入" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -220,7 +220,7 @@
<el-row>
<el-col :span="12">
<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>
......@@ -244,7 +244,7 @@
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<!-- 审核综合荣誉对话框 -->
<!-- 审核 -->
<el-dialog title="详细信息" :visible.sync="look" width="1000px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px" :disabled="isEdit">
<el-row>
......@@ -458,7 +458,6 @@ export default {
this.isEdit = true,
this.form = response.data;
this.pictureUrl = this.baseUrl + this.form.pictureUrl
this.title = "修改综合荣誉";
});
},
// 同意
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/essaysWritings/index.vue
......@@ -99,36 +99,36 @@
@selection-change="handleSelectionChange" :default-sort="{ prop: 'awardTime', order: 'descending' }">
<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" fixed="left" width="120px">
<el-table-column label="成长类型" align="center" fixed="left" width="120px" show-overflow-tooltip>
<template>
<span>论文论著</span>
</template>
</el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="120px">
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="120px" 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" sortable width="180px">
<el-table-column label="获奖类别" align="center" prop="awardType" sortable width="180px" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.award_categories" :value="scope.row.awardType" />
</template>
</el-table-column>
<el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="130px">
<el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="130px" 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" sortable width="130px">
<el-table-column label="获奖级别" align="center" prop="awardRank" sortable width="130px" 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" sortable width="180px"
show-overflow-tooltip />
<el-table-column label="获奖人" align="center" prop="userName" sortable width="130px" />
<el-table-column label="获奖人" align="center" prop="userName" sortable width="130px" show-overflow-tooltip />
<el-table-column label="主办单位" align="center" prop="org" sortable width="180px" show-overflow-tooltip />
<el-table-column label="获奖时间" align="center" prop="awardTime" width="180" sortable>
<el-table-column label="获奖时间" align="center" prop="awardTime" width="180" sortable show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template>
......@@ -161,7 +161,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="form.sub" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -170,7 +170,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖类别" prop="awardType">
<el-select v-model="form.awardType" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.awardType" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.award_categories" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -181,7 +181,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="获奖级别" prop="awardRank">
<el-select v-model="form.awardRank" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -190,7 +190,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖等级" prop="awardLevel">
<el-select v-model="form.awardLevel" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -201,12 +201,12 @@
<el-row>
<el-col :span="12">
<el-form-item label="成果名称" prop="resultName">
<el-input v-model="form.resultName" placeholder="请输入" />
<el-input v-model="form.resultName" placeholder="请输入" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="获奖人" prop="userName">
<el-input v-model="form.userName" placeholder="请选择"
<el-input v-model="form.userName" placeholder="请选择" clearable
@input="openSelect('选择分管领导', 'leaderList', 2)"
@focus="openSelect('选择分管领导', 'leaderList', 2)"></el-input>
</el-form-item>
......@@ -215,7 +215,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="主办单位" prop="org">
<el-input v-model="form.org" placeholder="请输入" />
<el-input v-model="form.org" placeholder="请输入" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -229,7 +229,7 @@
<el-row>
<el-col :span="12">
<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>
......@@ -254,7 +254,7 @@
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<!-- 审核综合荣誉对话框 -->
<!-- 审核对话框 -->
<el-dialog title="详细信息" :visible.sync="look" width="1000px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px" :disabled="isEdit">
<el-row>
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/lectureAwards/index.vue
......@@ -97,36 +97,36 @@
@selection-change="handleSelectionChange" :default-sort="{ prop: 'awardTime', order: 'descending' }">
<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" fixed="left" width="130px">
<el-table-column label="成长类型" align="center" fixed="left" width="130px" show-overflow-tooltip>
<template>
<span>讲课获奖</span>
</template>
</el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left">
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" 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" sortable width="130px">
<el-table-column label="获奖类别" align="center" prop="awardType" sortable width="130px" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.award_categoriesjk" :value="scope.row.awardType" />
</template>
</el-table-column>
<el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="130px">
<el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="130px" 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" sortable width="130px">
<el-table-column label="获奖级别" align="center" prop="awardRank" sortable width="130px" 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" sortable width="180px"
show-overflow-tooltip />
<el-table-column label="获奖人" align="center" prop="userName" sortable width="130px" />
<el-table-column label="获奖人" align="center" prop="userName" sortable width="130px" show-overflow-tooltip />
<el-table-column label="主办单位" align="center" prop="org" sortable width="150px" show-overflow-tooltip />
<el-table-column label="获奖时间" align="center" prop="awardTime" width="180" sortable>
<el-table-column label="获奖时间" align="center" prop="awardTime" width="180" sortable show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template>
......@@ -159,7 +159,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="form.sub" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -168,7 +168,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖类别" prop="awardType">
<el-select v-model="form.awardType" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -180,7 +180,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="获奖级别" prop="awardRank">
<el-select v-model="form.awardRank" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -190,7 +190,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖等级" prop="awardLevel">
<el-select v-model="form.awardLevel" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -201,12 +201,12 @@
<el-row>
<el-col :span="12">
<el-form-item label="成果名称" prop="resultName">
<el-input v-model="form.resultName" placeholder="请输入" />
<el-input v-model="form.resultName" placeholder="请输入" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="获奖人" prop="userName">
<el-input v-model="form.userName" placeholder="请选择"
<el-input v-model="form.userName" placeholder="请选择" clearable
@input="openSelect('选择分管领导', 'leaderList', 2)"
@focus="openSelect('选择分管领导', 'leaderList', 2)"></el-input>
</el-form-item>
......@@ -215,7 +215,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="主办单位" prop="org">
<el-input v-model="form.org" placeholder="请输入" />
<el-input v-model="form.org" placeholder="请输入" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -229,7 +229,7 @@
<el-row>
<el-col :span="12">
<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>
......@@ -253,7 +253,7 @@
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<!-- 审核综合荣誉对话框 -->
<!-- 审核 -->
<el-dialog title="详细信息" :visible.sync="look" width="1000px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px" :disabled="isEdit">
<el-row>
......@@ -481,7 +481,6 @@ export default {
this.isEdit = true,
this.form = response.data;
this.pictureUrl = this.pev + this.form.pictureUrl
this.title = "修改综合荣誉";
});
},
// 同意
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/projectResearch/index.vue
......@@ -99,33 +99,34 @@
@selection-change="handleSelectionChange" :default-sort="{ prop: 'awardTime', order: 'descending' }">
<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" sortable fixed="left" width="130px">
<el-table-column label="成长类型" align="center" sortable fixed="left" width="130px" show-overflow-tooltip>
<span>课题研究</span>
</el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="130px">
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="130px" 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" sortable width="130px">
<el-table-column label="获奖类别" align="center" prop="awardType" sortable width="130px" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.project_research" :value="scope.row.awardType" />
</template>
</el-table-column>
<el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="120px">
<el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="120px" 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" sortable width="120px">
<el-table-column label="获奖级别" align="center" prop="awardRank" sortable width="120px" 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" sortable width="180px" />
<el-table-column label="获奖人" align="center" prop="userName" sortable width="120px" />
<el-table-column label="主办单位" align="center" prop="org" sortable width="180px" />
<el-table-column label="获奖时间" align="center" prop="awardTime" width="180" sortable>
<el-table-column label="课题研究-成果名称" align="center" prop="resultName" sortable width="180px"
show-overflow-tooltip />
<el-table-column label="获奖人" align="center" prop="userName" sortable width="120px" show-overflow-tooltip />
<el-table-column label="主办单位" align="center" prop="org" sortable width="180px" show-overflow-tooltip />
<el-table-column label="获奖时间" align="center" prop="awardTime" width="180" sortable show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template>
......@@ -158,7 +159,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="form.sub" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -167,7 +168,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖类别" prop="awardType">
<el-select v-model="form.awardType" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.awardType" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.project_research" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -178,7 +179,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="获奖级别" prop="awardRank">
<el-select v-model="form.awardRank" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -187,7 +188,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖等级" prop="awardLevel">
<el-select v-model="form.awardLevel" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -198,12 +199,12 @@
<el-row>
<el-col :span="12">
<el-form-item label="成果名称" prop="resultName">
<el-input v-model="form.resultName" placeholder="请输入" />
<el-input v-model="form.resultName" placeholder="请输入" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="获奖人" prop="userName">
<el-input v-model="form.userName" placeholder="请选择"
<el-input v-model="form.userName" placeholder="请选择" clearable
@input="openSelect('选择分管领导', 'leaderList', 2)"
@focus="openSelect('选择分管领导', 'leaderList', 2)"></el-input>
</el-form-item>
......@@ -212,7 +213,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="主办单位" prop="org">
<el-input v-model="form.org" placeholder="请输入" />
<el-input v-model="form.org" placeholder="请输入" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -226,7 +227,7 @@
<el-row>
<el-col :span="12">
<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>
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/teacherAwards/index.vue
......@@ -99,36 +99,36 @@
@selection-change="handleSelectionChange" :default-sort="{ prop: 'awardTime', order: 'descending' }">
<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" fixed="left" width="130px">
<el-table-column label="成长类型" align="center" fixed="left" width="130px" show-overflow-tooltip>
<template>
<span>教学获奖</span>
</template>
</el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left">
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" 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" sortable width="130px">
<el-table-column label="获奖类别" align="center" prop="awardType" sortable width="130px" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.award_categoriesjs" :value="scope.row.awardType" />
</template>
</el-table-column>
<el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="130px">
<el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="130px" 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" sortable width="130px">
<el-table-column label="获奖级别" align="center" prop="awardRank" sortable width="130px" 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" sortable width="190px"
show-overflow-tooltip />
<el-table-column label="获奖人" align="center" prop="userName" sortable width="130px" />
<el-table-column label="获奖人" align="center" prop="userName" sortable width="130px" show-overflow-tooltip />
<el-table-column label="主办单位" align="center" prop="org" sortable width="130px" show-overflow-tooltip />
<el-table-column label="获奖时间" align="center" prop="awardTime" width="180" sortable>
<el-table-column label="获奖时间" align="center" prop="awardTime" width="180" sortable show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template>
......@@ -138,8 +138,7 @@
<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">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['school:teacherAwards:edit']"
......@@ -162,7 +161,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="form.sub" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -171,7 +170,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖类别" prop="awardType">
<el-select v-model="form.awardType" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -182,7 +181,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="获奖级别" prop="awardRank">
<el-select v-model="form.awardRank" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -191,7 +190,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖等级" prop="awardLevel">
<el-select v-model="form.awardLevel" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -202,12 +201,12 @@
<el-row>
<el-col :span="12">
<el-form-item label="成果名称" prop="resultName">
<el-input v-model="form.resultName" placeholder="请输入" />
<el-input v-model="form.resultName" placeholder="请输入" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="获奖人" prop="userName">
<el-input v-model="form.userName" placeholder="请选择"
<el-input v-model="form.userName" placeholder="请选择" clearable
@input="openSelect('选择分管领导', 'leaderList', 2)"
@focus="openSelect('选择分管领导', 'leaderList', 2)"></el-input>
</el-form-item>
......@@ -216,7 +215,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="主办单位" prop="org">
<el-input v-model="form.org" placeholder="请输入" />
<el-input v-model="form.org" placeholder="请输入" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -230,7 +229,7 @@
<el-row>
<el-col :span="12">
<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>
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/teamAward/index.vue
......@@ -86,23 +86,25 @@
@selection-change="handleSelectionChange" :default-sort="{ prop: 'schoolYear', order: 'descending' }">
<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="120px" />
<el-table-column label="学期" align="center" prop="semester" sortable fixed="left" width="120px">
<el-table-column label="学年" align="center" prop="schoolYear" sortable fixed="left" width="120px"
show-overflow-tooltip />
<el-table-column label="学期" align="center" prop="semester" sortable fixed="left" width="120px"
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>
<el-table-column label="届别" align="center" prop="year" sortable show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.rankda" :value="scope.row.year" />
</template>
</el-table-column>
<el-table-column label="年级" align="center" prop="grade" sortable>
<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" />
</template>
</el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable>
<el-table-column label="学科" align="center" prop="sub" sortable show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template>
......@@ -139,7 +141,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="学年" prop="schoolYear">
<el-select v-model="form.schoolYear" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.schoolYear" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.yearda" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -148,7 +150,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="学期" prop="semester">
<el-select v-model="form.semester" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.semester" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -159,7 +161,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="届别" prop="year">
<el-select v-model="form.year" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.year" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.rankda" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -168,7 +170,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="年级" prop="grade">
<el-select v-model="form.grade" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.grade" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.grade_da" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -179,7 +181,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="form.sub" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -188,19 +190,20 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖情况" prop="awardSituation">
<el-input v-model="form.awardSituation" placeholder="请输入获奖情况" />
<el-input v-model="form.awardSituation" placeholder="请输入获奖情况" clearable />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="团队成员贡献情况" prop="teamMembersContribution">
<el-input v-model="form.teamMembersContribution" type="textarea" placeholder="请输入内容" />
<el-input v-model="form.teamMembersContribution" type="textarea" placeholder="请输入内容"
clearable />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" clearable />
</el-form-item>
</el-col>
</el-row>
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/tutorAward/index.vue
......@@ -115,42 +115,43 @@
@selection-change="handleSelectionChange" :default-sort="{ prop: 'awardtime', order: 'descending' }">
<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" fixed="left" width="120px">
<el-table-column label="成长类型" align="center" fixed="left" width="120px" show-overflow-tooltip>
<template>
<span>辅导老师获奖</span>
</template>
</el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="100px">
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="100px" 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" sortable width="130px">
<el-table-column label="获奖类别" align="center" prop="awardtype" sortable width="130px" 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" sortable width="130px">
<el-table-column label="获奖等级" align="center" prop="awardlevel" sortable width="130px" 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" sortable width="130px">
<el-table-column label="获奖级别" align="center" prop="awardrank" sortable width="130px" 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" sortable width="130px"
show-overflow-tooltip />
<el-table-column label="获奖人" align="center" prop="username" sortable width="130px" />
<el-table-column label="指导教师" align="center" prop="guidanceteacher" sortable width="130px" />
<el-table-column label="辅导职责" align="center" prop="coachingr" sortable width="130px">
<el-table-column label="获奖人" align="center" prop="username" sortable width="130px" show-overflow-tooltip />
<el-table-column label="指导教师" align="center" prop="guidanceteacher" sortable width="130px"
show-overflow-tooltip />
<el-table-column label="辅导职责" align="center" prop="coachingr" sortable width="130px" 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" sortable width="180px" show-overflow-tooltip />
<el-table-column label="获奖时间" align="center" prop="awardtime" width="180" sortable>
<el-table-column label="获奖时间" align="center" prop="awardtime" width="180" sortable show-overflow-tooltip>
<!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> -->
......@@ -182,7 +183,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="form.sub" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -191,7 +192,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖类别" prop="awardtype">
<el-select v-model="form.awardtype" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -202,7 +203,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="获奖级别" prop="awardrank">
<el-select v-model="form.awardrank" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -211,7 +212,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖等级" prop="awardlevel">
<el-select v-model="form.awardlevel" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -222,7 +223,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="辅导职责" prop="coachingr">
<el-select v-model="form.coachingr" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -231,7 +232,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="比赛名称" prop="competitionname">
<el-input v-model="form.competitionname" placeholder="请输入" />
<el-input v-model="form.competitionname" placeholder="请输入" clearable />
</el-form-item>
</el-col>
......@@ -239,12 +240,12 @@
<el-row>
<el-col :span="12">
<el-form-item label="指导教师" prop="guidanceteacher">
<el-input v-model="form.guidanceteacher" placeholder="请输入" />
<el-input v-model="form.guidanceteacher" placeholder="请输入" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="获奖人" prop="username">
<el-input v-model="form.username" placeholder="请选择"
<el-input v-model="form.username" placeholder="请选择" clearable
@input="openSelect('选择分管领导', 'leaderList', 2)"
@focus="openSelect('选择分管领导', 'leaderList', 2)"></el-input>
</el-form-item>
......@@ -253,7 +254,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="主办单位" prop="org">
<el-input v-model="form.org" placeholder="请输入" />
<el-input v-model="form.org" placeholder="请输入" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -267,7 +268,7 @@
<el-row>
<el-col :span="12">
<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>
......
ruoyi-ui/src/views/smartSchool/personWork/awardTutoringstu/index.vue
......@@ -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" placeholder="请输入内容" clearable />
</el-form-item>
</el-col>
</el-row>
......@@ -104,36 +104,37 @@
@selection-change="handleSelectionChange" :default-sort="{ prop: 'awardtime', order: 'descending' }">
<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" fixed="left" width="120px">
<el-table-column label="成长类型" align="center" fixed="left" width="120px" show-overflow-tooltip>
<template>
<span>辅导学生获奖</span>
</template>
</el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="120px">
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="120px" 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" sortable width="120px">
<el-table-column label="获奖类别" align="center" prop="awardtype" sortable width="120px" 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" sortable width="120px">
<el-table-column label="获奖等级" align="center" prop="awardlevel" sortable width="120px" 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" sortable width="120px">
<el-table-column label="获奖级别" align="center" prop="awardrank" sortable width="120px" 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" sortable width="180px" />
<el-table-column label="获奖人" align="center" prop="username" sortable width="120px" />
<el-table-column label="指导教师" align="center" prop="guidanceteacher" sortable width="120px" />
<el-table-column label="主办单位" align="center" prop="org" sortable width="180px" />
<el-table-column label="获奖时间" align="center" prop="awardtime" width="180" sortable>
<el-table-column label="比赛名称" align="center" prop="resultname" sortable width="180px" show-overflow-tooltip />
<el-table-column label="获奖人" align="center" prop="username" sortable width="120px" show-overflow-tooltip />
<el-table-column label="指导教师" align="center" prop="guidanceteacher" sortable width="120px"
show-overflow-tooltip />
<el-table-column label="主办单位" align="center" prop="org" sortable width="180px" show-overflow-tooltip />
<el-table-column label="获奖时间" align="center" prop="awardtime" width="180" sortable show-overflow-tooltip>
<!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> -->
......@@ -169,7 +170,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="form.sub" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -178,7 +179,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖类别" prop="awardtype">
<el-select v-model="form.awardtype" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.awardtype" placeholder="请选择" clearable 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>
......@@ -189,7 +190,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="获奖级别" prop="awardrank">
<el-select v-model="form.awardrank" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -198,7 +199,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖等级" prop="awardlevel">
<el-select v-model="form.awardlevel" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -209,24 +210,24 @@
<el-row>
<el-col :span="12">
<el-form-item label="成果名称" prop="resultname">
<el-input v-model="form.resultname" placeholder="请输入成果名称" />
<el-input v-model="form.resultname" placeholder="请输入成果名称" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="指导教师" prop="guidanceteacher">
<el-input v-model="form.guidanceteacher" placeholder="请输入内容" />
<el-input v-model="form.guidanceteacher" placeholder="请输入内容" clearable />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="获奖人" prop="username">
<el-input v-model="form.username" placeholder="请输入"></el-input>
<el-input v-model="form.username" placeholder="请输入" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="主办单位" prop="org">
<el-input v-model="form.org" placeholder="请输入主办单位" />
<el-input v-model="form.org" placeholder="请输入主办单位" clearable />
</el-form-item>
</el-col>
</el-row>
......@@ -240,7 +241,7 @@
</el-col>
<el-col :span="12">
<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>
......
ruoyi-ui/src/views/smartSchool/personWork/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>
......@@ -92,32 +92,33 @@
@selection-change="handleSelectionChange" :default-sort="{ prop: 'awardTime', order: 'descending' }">
<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="type" sortable width="120px" fixed="left">
<el-table-column label="成长类型" align="center" prop="type" sortable width="120px" fixed="left"
show-overflow-tooltip>
<template>
<span>综合荣誉</span>
</template>
</el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left">
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" 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" sortable width="120px" />
<el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="120px">
<el-table-column label="获奖类别" align="center" prop="awardType" sortable width="120px" show-overflow-tooltip />
<el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="120px" 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" sortable width="120px">
<el-table-column label="获奖级别" align="center" prop="awardRank" sortable width="120px" 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" sortable width="180px"
show-overflow-tooltip />
<el-table-column label="获奖人" align="center" prop="userName" sortable width="120px" />
<el-table-column label="获奖人" align="center" prop="userName" sortable width="120px" show-overflow-tooltip />
<el-table-column label="主办单位" align="center" prop="org" sortable width="150px" show-overflow-tooltip />
<el-table-column label="获奖时间" align="center" prop="awardTime" width="180" sortable>
<el-table-column label="获奖时间" align="center" prop="awardTime" width="180" sortable show-overflow-tooltips>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template>
......@@ -152,7 +153,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="form.sub" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -169,7 +170,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="获奖级别" prop="awardRank">
<el-select v-model="form.awardRank" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -178,7 +179,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖等级" prop="awardLevel">
<el-select v-model="form.awardLevel" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -189,19 +190,19 @@
<el-row>
<el-col :span="12">
<el-form-item label="成果名称" prop="resultName">
<el-input v-model="form.resultName" placeholder="请输入" />
<el-input v-model="form.resultName" placeholder="请输入" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="获奖人" prop="userName">
<el-input v-model="form.userName" placeholder="请输入"></el-input>
<el-input v-model="form.userName" placeholder="请输入" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="主办单位" prop="org">
<el-input v-model="form.org" placeholder="请输入" />
<el-input v-model="form.org" placeholder="请输入" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -215,7 +216,7 @@
<el-row>
<el-col :span="12">
<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>
......
ruoyi-ui/src/views/smartSchool/personWork/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>
......@@ -98,36 +98,36 @@
@selection-change="handleSelectionChange" :default-sort="{ prop: 'awardTime', order: 'descending' }">
<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" fixed="left" width="120px">
<el-table-column label="成长类型" align="center" fixed="left" width="120px" show-overflow-tooltip>
<template>
<span>论文论著</span>
</template>
</el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="120px">
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="120px" 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" sortable width="180px">
<el-table-column label="获奖类别" align="center" prop="awardType" sortable width="180px" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.award_categories" :value="scope.row.awardType" />
</template>
</el-table-column>
<el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="130px">
<el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="130px" 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" sortable width="130px">
<el-table-column label="获奖级别" align="center" prop="awardRank" sortable width="130px" 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" sortable width="180px"
show-overflow-tooltip />
<el-table-column label="获奖人" align="center" prop="userName" sortable width="130px" />
<el-table-column label="获奖人" align="center" prop="userName" sortable width="130px" show-overflow-tooltip />
<el-table-column label="主办单位" align="center" prop="org" sortable width="180px" show-overflow-tooltip />
<el-table-column label="获奖时间" align="center" prop="awardTime" width="180" sortable>
<el-table-column label="获奖时间" align="center" prop="awardTime" width="180" sortable show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template>
......@@ -162,7 +162,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="form.sub" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.sub" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -171,7 +171,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖类别" prop="awardType">
<el-select v-model="form.awardType" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.awardType" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.award_categories" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -182,7 +182,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="获奖级别" prop="awardRank">
<el-select v-model="form.awardRank" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -191,7 +191,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖等级" prop="awardLevel">
<el-select v-model="form.awardLevel" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -202,19 +202,19 @@
<el-row>
<el-col :span="12">
<el-form-item label="成果名称" prop="resultName">
<el-input v-model="form.resultName" placeholder="请输入成果名称" />
<el-input v-model="form.resultName" placeholder="请输入成果名称" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="获奖人" prop="userName">
<el-input v-model="form.userName" placeholder="请输入"></el-input>
<el-input v-model="form.userName" placeholder="请输入" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="主办单位" prop="org">
<el-input v-model="form.org" placeholder="请输入主办单位" />
<el-input v-model="form.org" placeholder="请输入主办单位" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -228,7 +228,7 @@
<el-row>
<el-col :span="12">
<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>
......
ruoyi-ui/src/views/smartSchool/personWork/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="请选择">
<el-select v-model="queryParams.year" clearable placeholder="请选择">
<el-option v-for="dict in dict.type.rankda" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -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>
......@@ -94,15 +95,16 @@
@selection-change="handleSelectionChange" :default-sort="{ prop: 'year', order: 'descending' }">
<el-table-column type="selection" width="55" align="center" sortable />
<el-table-column type="index" label="序号" width="55" align="center" sortable />
<el-table-column label="届别" align="center" prop="year" sortable width="80" />
<el-table-column label="学科" align="center" prop="sub" sortable width="80">
<el-table-column label="届别" align="center" prop="year" sortable width="80" show-overflow-tooltip />
<el-table-column label="学科" align="center" prop="sub" sortable width="80" 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" 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">
<el-table-column label="教师姓名" align="center" prop="teacherName" sortable width="120" show-overflow-tooltip />
<el-table-column label="授课班级" align="center" prop="teachingClassName" sortable width="120"
show-overflow-tooltip />
<el-table-column label="班级类型" align="center" prop="classType" sortable show-overflow-tooltip width="150">
<!-- <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">
......@@ -112,21 +114,23 @@
</span>
</template> -->
</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" 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="180" />
<el-table-column label="其他情况" align="center" prop="other" sortable width="150" />
<el-table-column label="尖子生培养" align="center" prop="topStudentsCulture" sortable width="180"
show-overflow-tooltip />
<el-table-column label="增量情况" align="center" prop="incrementSituation" sortable width="180"
show-overflow-tooltip />
<el-table-column label="有效数情况" align="center" prop="effectiveNumSituation" sortable width="180"
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" fixed="right">
<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)"
......@@ -154,7 +158,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="form.sub" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -163,14 +167,14 @@
</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="请输入教师姓名" clearable />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="届别" prop="year">
<el-select v-model="form.year" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.year" placeholder="请选择" style="width: 100%;" clearable>
<el-option v-for="dict in dict.type.rankda" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -179,7 +183,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="授课班级" prop="teachingClassName">
<el-select v-model="form.teachingClassName" placeholder="请选择" style="width: 100%">
<el-select v-model="form.teachingClassName" placeholder="请选择" style="width: 100%" clearable>
<el-option v-for="dict in dict.type.class_num" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -190,7 +194,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="班级类型" prop="classType">
<el-select v-model="form.classType" placeholder="请选择" style="width: 100%">
<el-select v-model="form.classType" placeholder="请选择" clearable style="width: 100%">
<el-option v-for="dict in dict.type.class_type" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -199,7 +203,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="高考评优" prop="gkAppraising">
<el-select v-model="form.gkAppraising" placeholder="请选择" style="width: 100%">
<el-select v-model="form.gkAppraising" placeholder="请选择" clearable style="width: 100%">
<el-option v-for="dict in dict.type.gk_appraising" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -210,24 +214,25 @@
<el-row>
<el-col :span="12">
<el-form-item label="尖子生培养" prop="topStudentsCulture">
<el-input v-model="form.topStudentsCulture" type="textarea" placeholder="请输入内容" />
<el-input v-model="form.topStudentsCulture" type="textarea" placeholder="请输入内容" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="增量情况" prop="incrementSituation">
<el-input v-model="form.incrementSituation" type="textarea" placeholder="请输入内容" />
<el-input v-model="form.incrementSituation" type="textarea" placeholder="请输入内容" clearable />
</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" type="textarea" placeholder="请输入有效数情况" />
<el-input v-model="form.effectiveNumSituation" clearable type="textarea"
placeholder="请输入有效数情况" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="其他" prop="other">
<el-input v-model="form.other" type="textarea" placeholder="请输入内容" />
<el-input v-model="form.other" type="textarea" placeholder="请输入内容" clearable />
</el-form-item>
</el-col>
</el-row>
......
ruoyi-ui/src/views/smartSchool/personWork/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>
......@@ -98,36 +98,36 @@
@selection-change="handleSelectionChange" :default-sort="{ prop: 'awardTime', order: 'descending' }">
<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" fixed="left" width="130px">
<el-table-column label="成长类型" align="center" fixed="left" width="130px" show-overflow-tooltip>
<template>
<span>讲课获奖</span>
</template>
</el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left">
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" 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" sortable width="130px">
<el-table-column label="获奖类别" align="center" prop="awardType" sortable width="130px" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.award_categoriesjk" :value="scope.row.awardType" />
</template>
</el-table-column>
<el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="130px">
<el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="130px" 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" sortable width="130px">
<el-table-column label="获奖级别" align="center" prop="awardRank" sortable width="130px" 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" sortable width="180px"
show-overflow-tooltip />
<el-table-column label="获奖人" align="center" prop="userName" sortable width="130px" />
<el-table-column label="获奖人" align="center" prop="userName" sortable width="130px" show-overflow-tooltip />
<el-table-column label="主办单位" align="center" prop="org" sortable width="150px" show-overflow-tooltip />
<el-table-column label="获奖时间" align="center" prop="awardTime" width="180" sortable>
<el-table-column label="获奖时间" align="center" prop="awardTime" width="180" sortable show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template>
......@@ -163,7 +163,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="form.sub" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -172,7 +172,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖类别" prop="awardType">
<el-select v-model="form.awardType" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -184,7 +184,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="获奖级别" prop="awardRank">
<el-select v-model="form.awardRank" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -194,7 +194,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖等级" prop="awardLevel">
<el-select v-model="form.awardLevel" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -205,19 +205,19 @@
<el-row>
<el-col :span="12">
<el-form-item label="成果名称" prop="resultName">
<el-input v-model="form.resultName" placeholder="请输入成果名称" />
<el-input v-model="form.resultName" placeholder="请输入成果名称" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="获奖人" prop="userName">
<el-input v-model="form.userName" placeholder="请输入"></el-input>
<el-input v-model="form.userName" placeholder="请输入" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="主办单位" prop="org">
<el-input v-model="form.org" placeholder="请输入主办单位" />
<el-input v-model="form.org" placeholder="请输入主办单位" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -231,7 +231,7 @@
<el-row>
<el-col :span="12">
<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>
......@@ -254,9 +254,7 @@
<el-button v-if="isEdit === false" type="primary" @click="submitForm">确定</el-button>
<el-button @click="cancel">{{ isEdit ? '取消' : '关闭' }}</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>
......
ruoyi-ui/src/views/smartSchool/personWork/personalInformation/index.vue
......@@ -579,9 +579,8 @@
</el-table-column>
<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" show-overflow-tooltip />
<el-table-column label="姓名" align="center" prop="teacherName" show-overflow-tooltip width="180px" />
<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" />
......
ruoyi-ui/src/views/smartSchool/personWork/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>
......@@ -100,33 +100,34 @@
@selection-change="handleSelectionChange" :default-sort="{ prop: 'awardTime', order: 'descending' }">
<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" sortable fixed="left" width="130px">
<el-table-column label="成长类型" align="center" sortable fixed="left" width="130px" show-overflow-tooltip>
<span>课题研究</span>
</el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="130px">
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="130px" 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" sortable width="130px">
<el-table-column label="获奖类别" align="center" prop="awardType" sortable width="130px" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.project_research" :value="scope.row.awardType" />
</template>
</el-table-column>
<el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="120px">
<el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="120px" 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" sortable width="120px">
<el-table-column label="获奖级别" align="center" prop="awardRank" sortable width="120px" 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" sortable width="180px" />
<el-table-column label="获奖人" align="center" prop="userName" sortable width="120px" />
<el-table-column label="主办单位" align="center" prop="org" sortable width="180px" />
<el-table-column label="获奖时间" align="center" prop="awardTime" width="180" sortable>
<el-table-column label="课题研究-成果名称" align="center" prop="resultName" sortable width="180px"
show-overflow-tooltip />
<el-table-column label="获奖人" align="center" prop="userName" sortable width="120px" show-overflow-tooltip />
<el-table-column label="主办单位" align="center" prop="org" sortable width="180px" show-overflow-tooltip />
<el-table-column label="获奖时间" align="center" prop="awardTime" width="180" sortable show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template>
......@@ -162,7 +163,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="form.sub" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -171,7 +172,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖类别" prop="awardType">
<el-select v-model="form.awardType" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.awardType" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.project_research" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -182,7 +183,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="获奖级别" prop="awardRank">
<el-select v-model="form.awardRank" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -191,7 +192,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖等级" prop="awardLevel">
<el-select v-model="form.awardLevel" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -202,19 +203,19 @@
<el-row>
<el-col :span="12">
<el-form-item label="成果名称" prop="resultName">
<el-input v-model="form.resultName" placeholder="请输入成果名称" />
<el-input v-model="form.resultName" placeholder="请输入成果名称" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="获奖人" prop="userName">
<el-input v-model="form.userName" placeholder="请输入"></el-input>
<el-input v-model="form.userName" placeholder="请输入" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="主办单位" prop="org">
<el-input v-model="form.org" placeholder="请输入主办单位" />
<el-input v-model="form.org" placeholder="请输入主办单位" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -228,7 +229,7 @@
<el-row>
<el-col :span="12">
<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>
......
ruoyi-ui/src/views/smartSchool/personWork/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>
......@@ -99,36 +99,36 @@
@selection-change="handleSelectionChange" :default-sort="{ prop: 'awardTime', order: 'descending' }">
<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" fixed="left" width="130px">
<el-table-column label="成长类型" align="center" fixed="left" width="130px" show-overflow-tooltip>
<template>
<span>教学获奖</span>
</template>
</el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left">
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" 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" sortable width="130px">
<el-table-column label="获奖类别" align="center" prop="awardType" sortable width="130px" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.award_categoriesjs" :value="scope.row.awardType" />
</template>
</el-table-column>
<el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="130px">
<el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="130px" 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" sortable width="130px">
<el-table-column label="获奖级别" align="center" prop="awardRank" sortable width="130px" 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" sortable width="190px"
show-overflow-tooltip />
<el-table-column label="获奖人" align="center" prop="userName" sortable width="130px" />
<el-table-column label="获奖人" align="center" prop="userName" sortable width="130px" show-overflow-tooltip />
<el-table-column label="主办单位" align="center" prop="org" sortable width="130px" show-overflow-tooltip />
<el-table-column label="获奖时间" align="center" prop="awardTime" width="180" sortable>
<el-table-column label="获奖时间" align="center" prop="awardTime" width="180" sortable show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template>
......@@ -164,7 +164,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="form.sub" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -173,7 +173,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖类别" prop="awardType">
<el-select v-model="form.awardType" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -184,7 +184,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="获奖级别" prop="awardRank">
<el-select v-model="form.awardRank" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -193,7 +193,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖等级" prop="awardLevel">
<el-select v-model="form.awardLevel" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -204,19 +204,19 @@
<el-row>
<el-col :span="12">
<el-form-item label="成果名称" prop="resultName">
<el-input v-model="form.resultName" placeholder="请输入成果名称" />
<el-input v-model="form.resultName" placeholder="请输入成果名称" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="获奖人" prop="userName">
<el-input v-model="form.userName" placeholder="请输入"></el-input>
<el-input v-model="form.userName" placeholder="请输入" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="主办单位" prop="org">
<el-input v-model="form.org" placeholder="请输入主办单位" />
<el-input v-model="form.org" placeholder="请输入主办单位" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -230,7 +230,7 @@
<el-row>
<el-col :span="12">
<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>
......
ruoyi-ui/src/views/smartSchool/personWork/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>
......@@ -87,23 +87,25 @@
@selection-change="handleSelectionChange" :default-sort="{ prop: 'schoolYear', order: 'descending' }">
<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="120px" />
<el-table-column label="学期" align="center" prop="semester" sortable fixed="left" width="120px">
<el-table-column label="学年" align="center" prop="schoolYear" sortable fixed="left" width="120px"
show-overflow-tooltip />
<el-table-column label="学期" align="center" prop="semester" sortable fixed="left" width="120px"
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>
<el-table-column label="届别" align="center" prop="year" sortable show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.rankda" :value="scope.row.year" />
</template>
</el-table-column>
<el-table-column label="年级" align="center" prop="grade" sortable>
<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" />
</template>
</el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable>
<el-table-column label="学科" align="center" prop="sub" sortable show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template>
......@@ -144,7 +146,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="学年" prop="schoolYear">
<el-select v-model="form.schoolYear" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.schoolYear" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.yearda" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -153,7 +155,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="学期" prop="semester">
<el-select v-model="form.semester" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.semester" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -164,7 +166,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="届别" prop="year">
<el-select v-model="form.year" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.year" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.rankda" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -173,7 +175,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="年级" prop="grade">
<el-select v-model="form.grade" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.grade" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.grade_da" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -184,7 +186,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="form.sub" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -193,19 +195,20 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖情况" prop="awardSituation">
<el-input v-model="form.awardSituation" placeholder="请输入获奖情况" />
<el-input v-model="form.awardSituation" placeholder="请输入获奖情况" clearable />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="团队成员贡献情况" prop="teamMembersContribution">
<el-input v-model="form.teamMembersContribution" type="textarea" placeholder="请输入内容" />
<el-input v-model="form.teamMembersContribution" type="textarea" placeholder="请输入内容"
clearable />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" clearable />
</el-form-item>
</el-col>
</el-row>
......
ruoyi-ui/src/views/smartSchool/personWork/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" placeholder="请输入内容" clearable />
</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>
......@@ -115,42 +115,43 @@
@selection-change="handleSelectionChange" :default-sort="{ prop: 'awardtime', order: 'descending' }">
<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" fixed="left" width="120px">
<el-table-column label="成长类型" align="center" fixed="left" width="120px" show-overflow-tooltip>
<template>
<span>辅导老师获奖</span>
</template>
</el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="100px">
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="100px" 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" sortable width="130px">
<el-table-column label="获奖类别" align="center" prop="awardtype" sortable width="130px" 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" sortable width="130px">
<el-table-column label="获奖等级" align="center" prop="awardlevel" sortable width="130px" 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" sortable width="130px">
<el-table-column label="获奖级别" align="center" prop="awardrank" sortable width="130px" 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" sortable width="130px"
show-overflow-tooltip />
<el-table-column label="获奖人" align="center" prop="username" sortable width="130px" />
<el-table-column label="指导教师" align="center" prop="guidanceteacher" sortable width="130px" />
<el-table-column label="辅导职责" align="center" prop="coachingr" sortable width="130px">
<el-table-column label="获奖人" align="center" prop="username" sortable width="130px" show-overflow-tooltip />
<el-table-column label="指导教师" align="center" prop="guidanceteacher" sortable width="130px"
show-overflow-tooltip />
<el-table-column label="辅导职责" align="center" prop="coachingr" sortable width="130px" 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" sortable width="180px" show-overflow-tooltip />
<el-table-column label="获奖时间" align="center" prop="awardtime" width="180" sortable>
<el-table-column label="获奖时间" align="center" prop="awardtime" width="180" sortable show-overflow-tooltip>
<!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> -->
......@@ -186,7 +187,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="form.sub" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -195,7 +196,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖类别" prop="awardtype">
<el-select v-model="form.awardtype" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -206,7 +207,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="获奖级别" prop="awardrank">
<el-select v-model="form.awardrank" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -215,7 +216,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="获奖等级" prop="awardlevel">
<el-select v-model="form.awardlevel" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -226,7 +227,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="辅导职责" prop="coachingr">
<el-select v-model="form.coachingr" placeholder="请选择" style="width: 100%;">
<el-select v-model="form.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>
......@@ -235,7 +236,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="比赛名称" prop="competitionname">
<el-input v-model="form.competitionname" placeholder="请输入成果名称" />
<el-input v-model="form.competitionname" placeholder="请输入成果名称" clearable />
</el-form-item>
</el-col>
......@@ -243,19 +244,19 @@
<el-row>
<el-col :span="12">
<el-form-item label="指导教师" prop="guidanceteacher">
<el-input v-model="form.guidanceteacher" placeholder="请输入内容" />
<el-input v-model="form.guidanceteacher" placeholder="请输入内容" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="获奖人" prop="username">
<el-input v-model="form.username" placeholder="请输入"></el-input>
<el-input v-model="form.username" placeholder="请输入" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="主办单位" prop="org">
<el-input v-model="form.org" placeholder="请输入主办单位" />
<el-input v-model="form.org" placeholder="请输入主办单位" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -269,7 +270,7 @@
<el-row>
<el-col :span="12">
<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>
......
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