Skip to content

D
dd_school
Commit 0c3b67fb by Cat
Options

Merge branch 'master' of http://49.232.152.146:6688/qangqi/dd_school

parents 0d8d87b8 cabd0cad
Showing with 55 additions and 21 deletions
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/schoolAwards/awardEntry/index.vue
......@@ -60,11 +60,16 @@
</el-carousel>
</template>
</el-table-column>
<el-table-column align="center" prop="auditState" label="审核状态">
<template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.audit_state1, row.auditState) }}</div>
</template>
</el-table-column>
<el-table-column align="center" prop="remark" label="备注" />
<el-table-column align="center" fixed="right" label="操作" width="150">
<template slot-scope="scope">
<div>
<div v-if="scope.row.auditState === '0'">
<div v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">
<el-button @click="handleExamine(scope.row)" type="text" size="small">提交</el-button>
<el-button @click="handleEdit(scope.row)" type="text" size="small">编辑</el-button>
<el-button @click="handleDelete(scope.row)" type="text" size="small">删除</el-button>
......@@ -210,11 +215,13 @@ import picAvatar from '@/views/smartSchool/schoolManage/introduce/schoolInfo/pro
export default {
name: 'index',
components: { Treeselect, picAvatar },
dicts: ['awards_type', 'awards_level'],
dicts: ['awards_type', 'awards_level', 'audit_state1'],
data() {
return {
uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
queryForm: {
pageNum: 1,
pageSize: 10,
awardsLevel: "",
awardsType: "",
startTime: "",
......@@ -287,7 +294,6 @@ export default {
},
methods: {
handleAdd() {
this.reset();
this.dialogTableVisible = true;
......@@ -341,7 +347,7 @@ export default {
handleExamine(row) {
const ids = row.id || this.ids;
this.$modal
.confirm("是否提交该活动？")
.confirm("是否提交该信息？")
.then(function () {
const params = {
id: row.id,
......@@ -442,6 +448,8 @@ export default {
resetQuery() {
this.queryForm = {
pageNum: 1,
pageSize: 10,
awardsLevel: "",
awardsType: "",
startTime: "",
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/schoolAwards/awardReview/index.vue
......@@ -58,6 +58,11 @@
</el-carousel>
</template>
</el-table-column>
<el-table-column align="center" prop="auditState" label="审核状态">
<template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.audit_state1, row.auditState) }}</div>
</template>
</el-table-column>
<el-table-column align="center" prop="remark" label="备注" />
<el-table-column align="center" fixed="right" label="操作" width="150">
<template slot-scope="scope">
......@@ -162,7 +167,7 @@
</div>
</div>
</el-upload>
<i class="el-icon-delete" @click="handleRemove(index)"></i>
</el-form-item>
</el-col>
</el-row>
......@@ -195,7 +200,7 @@ import { InsertDropdownListsHeaders } from '@alicloud/dingtalk/dist/doc_1_0/clie
export default {
name: 'index',
components: { Treeselect, picAvatar },
dicts: ['awards_type', 'awards_level'],
dicts: ['awards_type', 'awards_level', 'audit_state1'],
data() {
return {
uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentViolation/ViolationDiscipline/index.vue
......@@ -14,8 +14,8 @@
<el-input v-model="queryForm.gradeYear" placeholder="请输入" clearable></el-input>
</el-form-item>
<el-form-item label="年级" prop="gradeId">
<el-select v-model="queryForm.gradeId" placeholder="请选择" clearable :style="{ width: '100%' }"
@change="handleChange">
<el-select v-model="form.gradeId" placeholder="请选择" clearable :style="{ width: '100%' }"
@change="getClasslist(form.gradeId)">
<el-option v-for="(item, index) in gradeList" :key="index" :label="item.gradeName"
:value="item.gradeId"></el-option>
</el-select>
......@@ -77,11 +77,9 @@
<el-button type="primary" icon="el-icon-search" size="mini" @click="getList">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
<el-row :gutter="10" class="mb8">
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
</el-row>
</el-form>
<el-table :data="tableData" :default-sort="{ prop: 'time', order: 'ascending' }" border style="width: 100%">
<el-table :data="tableData" :default-sort="{ prop: 'punishTime', order: 'descending' }" border style="width: 100%">
<el-table-column align="center" type="index" label="序号" width="55" />
<el-table-column align="center" prop="schoolYear" sortable label="学年" />
<el-table-column align="center" prop="semester" sortable label="学期">
......@@ -122,8 +120,13 @@
</template>
</el-table-column>
<el-table-column align="center" prop="punishTime" sortable label="处分时间" width="100" />
<el-table-column align="center" prop="auditState" label="审核状态">
<template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.audit_state1, row.auditState) }}</div>
</template>
</el-table-column>
<el-table-column align="center" prop="remark" sortable label="备注" />
<el-table-column align="center" fixed="right" label="操作" width="200">
<el-table-column align="center" fixed="right" label="操作" width="180">
<template slot-scope="scope">
<el-button @click="handleLook(scope.row)" type="text" size="small">查看</el-button>
</template>
......@@ -294,10 +297,12 @@ import {
import { checkIdcard } from '@/utils/utilLibrary/validate'
export default {
name: 'index',
dicts: ['violate_type', 'violate_num', 'punish_result', 'sys_user_sex', 'grade_type', 'semester'],
dicts: ['violate_type', 'violate_num', 'punish_result', 'sys_user_sex', 'grade_type', 'semester', 'audit_state1'],
data() {
return {
queryForm: {
pageNum: 1,
pageSize: 10,
schoolYear: "",
semester: "",
gradeYear: "",
......@@ -610,6 +615,8 @@ export default {
resetQuery() {
this.queryForm = {
pageNum: 1,
pageSize: 10,
schoolYear: "",
semester: "",
gradeYear: "",
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentViolation/violationDisciplineentry/index.vue
......@@ -81,7 +81,7 @@
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
</el-row>
</el-form>
<el-table :data="tableData" :default-sort="{ prop: 'time', order: 'ascending' }" border style="width: 100%">
<el-table :data="tableData" :default-sort="{ prop: 'punishTime', order: 'descending' }" border style="width: 100%">
<el-table-column align="center" type="index" label="序号" width="55" />
<el-table-column align="center" prop="schoolYear" sortable label="学年" />
<el-table-column align="center" prop="semester" sortable label="学期">
......@@ -122,10 +122,15 @@
</template>
</el-table-column>
<el-table-column align="center" prop="punishTime" sortable label="处分时间" width="100" />
<el-table-column align="center" prop="auditState" label="审核状态">
<template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.audit_state1, row.auditState) }}</div>
</template>
</el-table-column>
<el-table-column align="center" prop="remark" sortable label="备注" />
<el-table-column align="center" fixed="right" label="操作" width="200">
<template slot-scope="scope">
<div v-if="scope.row.auditState === '0'">
<div v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">
<el-button @click="handleExamine(scope.row)" type="text" size="small">提交</el-button>
<el-button @click="handleEdit(scope.row)" type="text" size="small">编辑</el-button>
<el-button @click="handleLook(scope.row)" type="text" size="small">查看</el-button>
......@@ -140,7 +145,7 @@
<pagination v-show="total > 0" :total="total" :page.sync="queryForm.pageNum" :limit.sync="queryForm.pageSize"
@pagination="getList" />
<!-- 新增/编辑弹框 -->
<!-- 新增/编辑/查看弹框 -->
<el-dialog title="详细信息" :visible.sync="dialogTableVisible" width="1100px">
<el-form :model="form" ref="form" size="small" label-width="120px" :disabled="isEdit" :rules="rules">
<el-row>
......@@ -303,10 +308,12 @@ import {
import { checkIdcard } from '@/utils/utilLibrary/validate'
export default {
name: 'index',
dicts: ['violate_type', 'violate_num', 'punish_result', 'sys_user_sex', 'grade_type', 'semester'],
dicts: ['violate_type', 'violate_num', 'punish_result', 'sys_user_sex', 'grade_type', 'semester', 'audit_state1'],
data() {
return {
queryForm: {
pageNum: 1,
pageSize: 10,
schoolYear: "",
semester: "",
gradeYear: "",
......@@ -321,7 +328,6 @@ export default {
violateNum: "",
punishResult: "",
punishTime: "",
},
isEdit: false,
gradeLists: [],
......@@ -330,6 +336,7 @@ export default {
],
open: false,
//查看弹窗表格
ExperimentalData: [],
form: {
......@@ -441,7 +448,7 @@ export default {
console.log("this.classList", this.classList);
});
}).catch(error => {
this.$modal.closeLoading();
})
},
......@@ -512,7 +519,7 @@ export default {
handleExamine(row) {
const ids = row.id || this.ids;
this.$modal
.confirm("是否提交该活动？")
.confirm("是否提交该信息？")
.then(function () {
const params = {
id: row.id,
......@@ -528,6 +535,7 @@ export default {
console.error(err);
});
},
// 删除
handleDelete(row) {
this.$modal.confirm(`是否确认删除此数据？`).then(() => {
......@@ -618,6 +626,8 @@ export default {
resetQuery() {
this.queryForm = {
pageNum: 1,
pageSize: 10,
schoolYear: "",
semester: "",
gradeYear: "",
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/organization/SchoolOrganizationMemberController.java
......@@ -83,6 +83,7 @@ public class SchoolOrganizationMemberController extends BaseController
wrapper1.eq(SchoolStudentClassRelation::getStudentId,userId);
SchoolStudentClassRelation one = schoolStudentClassRelationService.getOne(wrapper1);
if(StringUtils.isNotNull(one)){
LambdaQueryWrapper<SchoolClass> wrapper2 = Wrappers.lambdaQuery();
wrapper2.eq(SchoolClass::getId,one.getClassId());
SchoolClass res = schoolClassService.getOne(wrapper2);
......@@ -90,6 +91,7 @@ public class SchoolOrganizationMemberController extends BaseController
list.get(i).setClasses(res.getClassName());
}
}
}
return getDataTable(list);
}
......
smart-campus/src/main/resources/mapper/schoolRewardsPunishments/SchoolScAwardsMapper.xml
......@@ -67,6 +67,7 @@
<if test="applyId != null "> and apply_id = #{applyId}</if>
<if test="startTime != null and endTime != null and startTime != '' and endTime != ''">and DATE_FORMAT(awards_time,'%Y-%m-%d') between #{startTime} and #{endTime}</if>
</where>
order by create_time DESC
</select>
<select id="selectSchoolScAwardsListTg" parameterType="SchoolScAwardsVo" resultMap="SchoolScAwardsVoResult">
......@@ -86,6 +87,7 @@
<if test="applyId != null "> and apply_id = #{applyId}</if>
<if test="startTime != null and endTime != null and startTime != '' and endTime != ''">and DATE_FORMAT(awards_time,'%Y-%m-%d') between #{startTime} and #{endTime}</if>
</where>
order by create_time DESC
</select>
<select id="selectSchoolScAwardsById" parameterType="Long" resultMap="SchoolScAwardsSchoolAccessoryResult">
......
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