Skip to content

D
dd_school
Commit bb263e2c by zhaopanyu
Options

zpy 学生违纪bug修改

parent b9afd099
Showing with 58 additions and 23 deletions
ruoyi-ui/src/api/smartSchool/electronicArchives/teamAward.js
...@@ -9,6 +9,15 @@ export function listAward(query) { ...@@ -9,6 +9,15 @@ export function listAward(query) {
}); });
} }
//查询个人获奖列表
export function listAwardgr(query) {
return request({
url: "/school/award/personlist",
method: "get",
params: query,
});
}
// 查询团队获奖详细 // 查询团队获奖详细
export function getAward(id) { export function getAward(id) {
return request({ return request({
......
ruoyi-ui/src/views/smartSchool/electronicArchives/basicInformation/index.vue
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
:cell-style="{ padding: '3px' }"> :cell-style="{ padding: '3px' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" fixed="left" /> <el-table-column type="index" label="序号" width="55" align="center" fixed="left" />
<el-table-column label="姓名" align="center" prop="name" sortable fixed="left" width="100" <el-table-column label="姓名" align="center" prop="name" sortable fixed="left" width="150"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="性别" align="center" prop="sex" sortable fixed="left" width="80" show-overflow-tooltip> <el-table-column label="性别" align="center" prop="sex" sortable fixed="left" width="80" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -236,9 +236,8 @@ ...@@ -236,9 +236,8 @@
</el-col> </el-col>
<el-col :span="12" class="custom-margin"> <el-col :span="12" class="custom-margin">
<el-form-item label="档案出生日期" prop="fileBirthDate"> <el-form-item label="档案出生日期" prop="fileBirthDate">
<el-date-picker v-model="form.fileBirthDate" type="date" placeholder="选择日期" <el-date-picker v-model="form.fileBirthDate" placeholder="选择日期" style="width: 100%;"
:default-value="form.fileBirthDate" style="width: 100%;" clearable clearable type="month" value-format="yyyy-MM"></el-date-picker>
value-format=" yyyy-MM-dd"></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="custom-margin"> <el-col :span="12" class="custom-margin">
...@@ -571,9 +570,8 @@ ...@@ -571,9 +570,8 @@
<el-col :span="12" class="custom-margin"> <el-col :span="12" class="custom-margin">
<el-form-item label="档案出生日期" prop="fileBirthDate"> <el-form-item label="档案出生日期" prop="fileBirthDate">
<el-date-picker v-model="form.fileBirthDate" type="date" placeholder="请选择" <el-date-picker v-model="form.fileBirthDate" placeholder="请选择" style="width: 100%"
:default-value="form.fileBirthDate" style="width: 100%" type="month" value-format="yyyy-MM"></el-date-picker>
value-format="yyyy-MM-dd"></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="custom-margin"> <el-col :span="12" class="custom-margin">
...@@ -908,6 +906,7 @@ export default { ...@@ -908,6 +906,7 @@ export default {
data() { data() {
return { return {
importing: false, importing: false,
isEditing: false, // 默认为查看模式 isEditing: false, // 默认为查看模式
// 导出选项 // 导出选项
...@@ -1369,7 +1368,7 @@ export default { ...@@ -1369,7 +1368,7 @@ export default {
handleExport() { handleExport() {
this.download('teacher/basiclnformation/export', { this.download('teacher/basiclnformation/export', {
...this.queryParams ...this.queryParams
}, `data_${Date.now()}.xlsx`) }, `教师基础信息_${Date.now()}.xlsx`)
// this.exportOptions.open = true; // this.exportOptions.open = true;
// this.download('/teacher/basiclnformation/export', { // this.download('/teacher/basiclnformation/export', {
// ...this.queryParams // ...this.queryParams
......
ruoyi-ui/src/views/smartSchool/electronicArchives/personalInformation/index.vue
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<el-input v-model="queryParams.name" placeholder="请输入教师姓名" clearable style="width: 250px;" /> <el-input v-model="queryParams.name" placeholder="请输入教师姓名" clearable style="width: 250px;" />
</el-form-item> </el-form-item>
<el-form-item label="身份证号" prop="idCard"> <el-form-item label="身份证号" prop="idCard">
<el-input v-model="queryParams.idCard" placeholder="请输入身份证号" clearable style="width: 250px;" /> <el-input v-model="queryParams.idCard" placeholder="请输入完整身份证号" clearable style="width: 250px;" />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="getList">查询</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="getList">查询</el-button>
...@@ -525,7 +525,7 @@ ...@@ -525,7 +525,7 @@
<div class="card_title">工作量信息</div> <div class="card_title">工作量信息</div>
<div style="margin: 3px 10px 15px;"> <div style="margin: 3px 10px 15px;">
<el-table :data="schoolAworkload" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }"> <el-table :data="schoolAworkload" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
<el-table-column label="学年" align="center" prop="schoolYear" width="90px" fixed="left" <el-table-column label="学年" align="center" prop="schoolYear" width="120px" fixed="left"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="学期" align="center" prop="semester" fixed="left" show-overflow-tooltip> <el-table-column label="学期" align="center" prop="semester" fixed="left" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -945,6 +945,16 @@ export default { ...@@ -945,6 +945,16 @@ export default {
this.form.onDutySituation = item.label this.form.onDutySituation = item.label
} }
}) })
this.dict.type.current_position.find(item => {
if (item.value == response.data.basicInformation.currentPosition) {
this.form.currentPosition = item.label
}
})
this.dict.type.current_situation.find(item => {
if (item.value == response.data.basicInformation.currentSituation) {
this.form.currentSituation = item.label
}
})
}); });
}, },
resetQuery() { resetQuery() {
...@@ -1103,4 +1113,5 @@ export default { ...@@ -1103,4 +1113,5 @@ export default {
.background { .background {
background-color: #eff8fc; background-color: #eff8fc;
}</style> }
\ No newline at end of file </style>
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/annualAssessment/index.vue
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"
class="search">
<el-form-item label="年度" prop="year"> <el-form-item label="年度" prop="year">
<el-select v-model="queryParams.year" clearable placeholder="请选择" style="width: 100%;"> <el-select v-model="queryParams.year" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.rankda" :key="dict.value" :label="dict.label" :value="dict.value"> <el-option v-for="dict in dict.type.rankda" :key="dict.value" :label="dict.label" :value="dict.value">
...@@ -52,14 +53,14 @@ ...@@ -52,14 +53,14 @@
:cell-style="{ padding: '3px' }"> :cell-style="{ padding: '3px' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" width="55" label="序号" align="center" /> <el-table-column type="index" width="55" label="序号" align="center" />
<el-table-column label="姓名" align="center" prop="name" /> <el-table-column label="姓名" align="center" prop="name" show-overflow-tooltip />
<el-table-column label="年度" align="center" prop="year" /> <el-table-column label="年度" align="center" prop="year" show-overflow-tooltip />
<el-table-column label="考核结果" align="center" prop="checkResult"> <el-table-column label="考核结果" align="center" prop="checkResult" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.check_result" :value="scope.row.checkResult" /> <dict-tag :options="dict.type.check_result" :value="scope.row.checkResult" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
...@@ -392,4 +393,8 @@ export default { ...@@ -392,4 +393,8 @@ export default {
color: #1a74be; color: #1a74be;
font-size: 16px; font-size: 16px;
} }
.search ::v-deep .el-form-item__content {
width: 200px
}
</style> </style>
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/personWork/personalInformation/index.vue
...@@ -513,7 +513,7 @@ ...@@ -513,7 +513,7 @@
<div class="card_title">工作量信息</div> <div class="card_title">工作量信息</div>
<div style="margin: 3px 10px 15px;"> <div style="margin: 3px 10px 15px;">
<el-table :data="schoolAworkload" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }"> <el-table :data="schoolAworkload" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
<el-table-column label="学年" align="center" prop="schoolYear" width="90px" fixed="left" <el-table-column label="学年" align="center" prop="schoolYear" width="120px" fixed="left"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="学期" align="center" prop="semester" fixed="left" show-overflow-tooltip> <el-table-column label="学期" align="center" prop="semester" fixed="left" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -550,7 +550,7 @@ ...@@ -550,7 +550,7 @@
</el-table-column> </el-table-column>
<el-table-column label="早读" align="center" prop="earlyReading" show-overflow-tooltip /> <el-table-column label="早读" align="center" prop="earlyReading" show-overflow-tooltip />
<el-table-column label="正课" align="center" prop="requiredCourses" show-overflow-tooltip /> <el-table-column label="正课" align="center" prop="requiredCourses" show-overflow-tooltip />
<el-table-column label="晚自习" align="center" prop="eveningSelfStudy" width="120px" <el-table-column label="晚自习" align="center" prop="eveningSelfStudy" width="100px"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="合计" align="center" prop="amountTo" show-overflow-tooltip /> <el-table-column label="合计" align="center" prop="amountTo" show-overflow-tooltip />
<el-table-column label="证明人" align="center" prop="userName" width="120px" fixed="right" <el-table-column label="证明人" align="center" prop="userName" width="120px" fixed="right"
...@@ -935,6 +935,16 @@ export default { ...@@ -935,6 +935,16 @@ export default {
this.form.onDutySituation = item.label this.form.onDutySituation = item.label
} }
}) })
this.dict.type.current_position.find(item => {
if (item.value == response.data.basicInformation.currentPosition) {
this.form.currentPosition = item.label
}
})
this.dict.type.current_situation.find(item => {
if (item.value == response.data.basicInformation.currentSituation) {
this.form.currentSituation = item.label
}
})
}); });
}, },
resetQuery() { resetQuery() {
......
ruoyi-ui/src/views/smartSchool/personWork/teamAward/index.vue
...@@ -222,7 +222,7 @@ ...@@ -222,7 +222,7 @@
</template> </template>
<script> <script>
import { listAward, getAward, delAward, addAward, updateAward, audit } from "@/api/smartSchool/electronicArchives/teamAward"; import { listAward, listAwardgr, getAward, delAward, addAward, updateAward, audit } from "@/api/smartSchool/electronicArchives/teamAward";
export default { export default {
name: "Award", name: "Award",
dicts: ["teaching_subjects", 'semester_jsdzda', 'exam_typeda', 'grade_da', 'class_type', 'yearda', 'rankda', 'audit_states'], dicts: ["teaching_subjects", 'semester_jsdzda', 'exam_typeda', 'grade_da', 'class_type', 'yearda', 'rankda', 'audit_states'],
...@@ -296,9 +296,9 @@ export default { ...@@ -296,9 +296,9 @@ export default {
/** 查询团队获奖列表 */ /** 查询团队获奖列表 */
getList() { getList() {
this.loading = true; this.loading = true;
const userId = this.$store.state.user.userId; const createBy = this.$store.state.user.userId;
const params = Object.assign({}, this.queryParams, { userId }); // 将 userId 添加到 queryParams 中 const params = Object.assign({}, this.queryParams, { createBy }); // 将 userId 添加到 queryParams 中
listAward(params).then(response => { listAwardgr(params).then(response => {
this.awardList = response.rows; this.awardList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
......
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