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 426 additions and 108 deletions
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/schoolAwards/awardEntry/index.vue
...@@ -60,11 +60,16 @@ ...@@ -60,11 +60,16 @@
</el-carousel> </el-carousel>
</template> </template>
</el-table-column> </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" prop="remark" label="备注" />
<el-table-column align="center" fixed="right" label="操作" width="150"> <el-table-column align="center" fixed="right" label="操作" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<div> <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="handleExamine(scope.row)" type="text" size="small">提交</el-button>
<el-button @click="handleEdit(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> <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 ...@@ -210,11 +215,13 @@ import picAvatar from '@/views/smartSchool/schoolManage/introduce/schoolInfo/pro
export default { export default {
name: 'index', name: 'index',
components: { Treeselect, picAvatar }, components: { Treeselect, picAvatar },
dicts: ['awards_type', 'awards_level'], dicts: ['awards_type', 'awards_level', 'audit_state1'],
data() { data() {
return { return {
uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址 uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
queryForm: { queryForm: {
pageNum: 1,
pageSize: 10,
awardsLevel: "", awardsLevel: "",
awardsType: "", awardsType: "",
startTime: "", startTime: "",
...@@ -287,7 +294,6 @@ export default { ...@@ -287,7 +294,6 @@ export default {
}, },
methods: { methods: {
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.dialogTableVisible = true; this.dialogTableVisible = true;
...@@ -341,7 +347,7 @@ export default { ...@@ -341,7 +347,7 @@ export default {
handleExamine(row) { handleExamine(row) {
const ids = row.id || this.ids; const ids = row.id || this.ids;
this.$modal this.$modal
.confirm("是否提交该活动？") .confirm("是否提交该信息？")
.then(function () { .then(function () {
const params = { const params = {
id: row.id, id: row.id,
...@@ -442,6 +448,8 @@ export default { ...@@ -442,6 +448,8 @@ export default {
resetQuery() { resetQuery() {
this.queryForm = { this.queryForm = {
pageNum: 1,
pageSize: 10,
awardsLevel: "", awardsLevel: "",
awardsType: "", awardsType: "",
startTime: "", startTime: "",
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/schoolAwards/awardManagement/index.vue
...@@ -60,6 +60,11 @@ ...@@ -60,6 +60,11 @@
</el-carousel> </el-carousel>
</template> </template>
</el-table-column> </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" prop="remark" label="备注" />
<el-table-column align="center" fixed="right" label="操作" width="150"> <el-table-column align="center" fixed="right" label="操作" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -188,7 +193,109 @@ ...@@ -188,7 +193,109 @@
<el-button @click="cancelDialog"> 取 消 </el-button> <el-button @click="cancelDialog"> 取 消 </el-button>
</div> </div>
</el-dialog> </el-dialog>
<!-- 审核弹框 -->
<el-dialog title="审核信息" :visible.sync="open" width="1100px">
<el-form :model="form" ref="form" size="small" label-width="110px" :disabled="isEdit">
<el-row>
<el-col :span="24">
<el-form-item label="比赛名称" prop="competitionName">
<el-input v-model="form.competitionName" placeholder="请输入" clearable
:style="{ width: '100%' }"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="主办单位" prop="organizer">
<el-input v-model="form.organizer" placeholder="请输入" clearable
:style="{ width: '100%' }"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="获奖名称" prop="awardsName">
<el-input v-model="form.awardsName" placeholder="请输入" clearable
:style="{ width: '100%' }"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="主管部门" prop="competentDeptId">
<Treeselect v-model="form.competentDeptId" :options="deptOptions" :show-count="true"
placeholder="请选择" :default-expand-level=1 :style="{ width: '100%' }" @select="deptIdAndName"
:disabled="isEdit" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="部门主任" prop="deptDirectorId">
<el-select v-model="form.deptDirectorId" placeholder="请选择" :style="{ width: '100%' }">
<el-option v-for="item in getDeptLeaders" :key="item.id" :label="item.teacherName"
:value="item.id"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="获奖时间" prop="awardsTime">
<el-date-picker v-model="form.awardsTime" type="date" placeholder="选择" value-format="yyyy-MM-dd"
:style="{ width: '100%' }">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="获奖等级" prop="awardsLevel">
<el-select v-model="form.awardsLevel" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for="dict in dict.type.awards_level" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="获奖类型" prop="awardsType">
<el-select v-model="form.awardsType" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for="dict in dict.type.awards_type" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入" clearable type="textarea" :rows="2"
:style="{ width: '100%' }"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="证书图片" prop="schoolAccessoryList">
<el-upload v-loading="uploadLoading" class="avatar-uploader" :action="uploadFileUrl"
accept="image/*" :show-file-list="false" :on-success="handleAvatarSuccess"
:before-upload="beforeAvatarUpload" :on-remove="handleRemove">
<div v-if="form.schoolAccessoryList.length === 0">
<i class="el-icon-plus avatar-uploader-icon"></i>
</div>
<div v-else>
<div v-for="(item, index) in form.schoolAccessoryList" :key="index">
<img :src="pev + item.accessoryUrl" class="avatar" />
</div>
</div>
</el-upload>
<i class="el-icon-delete" @click="handleRemove(index)"></i>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer" style="text-align: center;">
<el-button @click="handleAgree" type="primary" size="small">同意</el-button>
<el-button @click="handleDisagree" type="danger" size="small">不同意</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
...@@ -213,11 +320,13 @@ import picAvatar from '@/views/smartSchool/schoolManage/introduce/schoolInfo/pro ...@@ -213,11 +320,13 @@ import picAvatar from '@/views/smartSchool/schoolManage/introduce/schoolInfo/pro
export default { export default {
name: 'index', name: 'index',
components: { Treeselect, picAvatar }, components: { Treeselect, picAvatar },
dicts: ['awards_type', 'awards_level'], dicts: ['awards_type', 'awards_level', 'audit_state1'],
data() { data() {
return { return {
uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址 uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
queryForm: { queryForm: {
pageNum: 1,
pageSize: 10,
awardsLevel: "", awardsLevel: "",
awardsType: "", awardsType: "",
startTime: "", startTime: "",
...@@ -281,6 +390,8 @@ export default { ...@@ -281,6 +390,8 @@ export default {
}, },
//弹窗 //弹窗
dialogTableVisible: false, dialogTableVisible: false,
open: false,
isEdit: false,
total: 0, total: 0,
} }
}, },
...@@ -340,49 +451,63 @@ export default { ...@@ -340,49 +451,63 @@ export default {
this.schoolAccessoryList = [], this.schoolAccessoryList = [],
this.resetForm('form') this.resetForm('form')
}, },
//审核
handleExamine(row) { handleExamine(row) {
console.log(row, 'row'); this.open = true;
this.$confirm('确认要提交申请?', '提示', { const id = row.id || this.ids;
confirmButtonText: '同意', getAwards(id).then((response) => {
cancelButtonText: '不同意', this.form = response.data;
confirmButtonClass: 'custom-blue-button', this.form.id = response.data.id;
cancelButtonClass: 'custom-blue-button' console.log(this.form.id, ' this.form.id ');
this.isEdit = true,
this.accessoryUrl = this.pev + this.picUrl
this.form.competentDeptId = response.data.competentDeptId;
const params = {
competentDeptId: this.form.competentDeptId
}
getDeptLeader(params).then(response => {
this.getDeptLeaders = response.rows;
}).catch(error => {
this.$modal.closeLoading();
});
}
).catch(error => {
this.$modal.closeLoading();
})
},
// 同意
handleAgree() {
const params = {
id: this.form.id,
auditState: '2' // 表示同意
};
subApply(params).then(({ code }) => {
console.log(this.form, 'this.form');
if (code == 200) {
this.$modal.msgSuccess('操作成功')
this.open = false;
this.getList()
}
}) })
},
.then(() => { // 不同意
// 弹出确认框，用户点击同意后执行的逻辑 handleDisagree() {
const params = { const params = {
id: row.id, id: this.form.id,
auditState: '2' // 表示同意 auditState: '3' // 表示不同意
}; };
subApply(params).then(res => { subApply(params).then(({ code }) => {
if (res.code == 200) { console.log(this.form, 'this.form');
this.$message({ if (code == 200) {
type: 'success', this.$modal.msgSuccess('操作成功')
message: '提交成功!' this.open = false
}); this.getList()
this.getList(); }
} })
});
})
.catch(() => {
// 用户点击不同意或者取消后执行的逻辑
const params = {
id: row.id,
auditState: '3' // 表示不同意
};
subApply(params).then(res => {
if (res.code == 200) {
this.$message({
type: 'info',
message: '已取消审核'
});
}
});
});
}, },
// 删除 // 删除
handleDelete(row) { handleDelete(row) {
this.$modal.confirm(`是否确认删除此数据？`).then(() => { this.$modal.confirm(`是否确认删除此数据？`).then(() => {
...@@ -467,6 +592,8 @@ export default { ...@@ -467,6 +592,8 @@ export default {
resetQuery() { resetQuery() {
this.queryForm = { this.queryForm = {
pageNum: 1,
pageSize: 10,
awardsLevel: "", awardsLevel: "",
awardsType: "", awardsType: "",
startTime: "", startTime: "",
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/schoolAwards/awardReview/index.vue
...@@ -58,6 +58,11 @@ ...@@ -58,6 +58,11 @@
</el-carousel> </el-carousel>
</template> </template>
</el-table-column> </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" prop="remark" label="备注" />
<el-table-column align="center" fixed="right" label="操作" width="150"> <el-table-column align="center" fixed="right" label="操作" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -162,7 +167,7 @@ ...@@ -162,7 +167,7 @@
</div> </div>
</div> </div>
</el-upload> </el-upload>
<i class="el-icon-delete" @click="handleRemove(index)"></i>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -195,7 +200,7 @@ import { InsertDropdownListsHeaders } from '@alicloud/dingtalk/dist/doc_1_0/clie ...@@ -195,7 +200,7 @@ import { InsertDropdownListsHeaders } from '@alicloud/dingtalk/dist/doc_1_0/clie
export default { export default {
name: 'index', name: 'index',
components: { Treeselect, picAvatar }, components: { Treeselect, picAvatar },
dicts: ['awards_type', 'awards_level'], dicts: ['awards_type', 'awards_level', 'audit_state1'],
data() { data() {
return { return {
uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址 uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentViolation/ViolationDiscipline/index.vue
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
<el-input v-model="queryForm.gradeYear" placeholder="请输入" clearable></el-input> <el-input v-model="queryForm.gradeYear" placeholder="请输入" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="年级" prop="gradeId"> <el-form-item label="年级" prop="gradeId">
<el-select v-model="queryForm.gradeId" placeholder="请选择" clearable :style="{ width: '100%' }" <el-select v-model="form.gradeId" placeholder="请选择" clearable :style="{ width: '100%' }"
@change="handleChange"> @change="getClasslist(form.gradeId)">
<el-option v-for="(item, index) in gradeList" :key="index" :label="item.gradeName" <el-option v-for="(item, index) in gradeList" :key="index" :label="item.gradeName"
:value="item.gradeId"></el-option> :value="item.gradeId"></el-option>
</el-select> </el-select>
...@@ -77,11 +77,9 @@ ...@@ -77,11 +77,9 @@
<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>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item> </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-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" type="index" label="序号" width="55" />
<el-table-column align="center" prop="schoolYear" sortable label="学年" /> <el-table-column align="center" prop="schoolYear" sortable label="学年" />
<el-table-column align="center" prop="semester" sortable label="学期"> <el-table-column align="center" prop="semester" sortable label="学期">
...@@ -122,8 +120,13 @@ ...@@ -122,8 +120,13 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" prop="punishTime" sortable label="处分时间" width="100" /> <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" 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"> <template slot-scope="scope">
<el-button @click="handleLook(scope.row)" type="text" size="small">查看</el-button> <el-button @click="handleLook(scope.row)" type="text" size="small">查看</el-button>
</template> </template>
...@@ -294,10 +297,12 @@ import { ...@@ -294,10 +297,12 @@ import {
import { checkIdcard } from '@/utils/utilLibrary/validate' import { checkIdcard } from '@/utils/utilLibrary/validate'
export default { export default {
name: 'index', 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() { data() {
return { return {
queryForm: { queryForm: {
pageNum: 1,
pageSize: 10,
schoolYear: "", schoolYear: "",
semester: "", semester: "",
gradeYear: "", gradeYear: "",
...@@ -610,6 +615,8 @@ export default { ...@@ -610,6 +615,8 @@ export default {
resetQuery() { resetQuery() {
this.queryForm = { this.queryForm = {
pageNum: 1,
pageSize: 10,
schoolYear: "", schoolYear: "",
semester: "", semester: "",
gradeYear: "", gradeYear: "",
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentViolation/disciplinaryManagemen/index.vue
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button> <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
</el-row> </el-row>
</el-form> </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" type="index" label="序号" width="55" />
<el-table-column align="center" prop="schoolYear" sortable label="学年" /> <el-table-column align="center" prop="schoolYear" sortable label="学年" />
<el-table-column align="center" prop="semester" sortable label="学期"> <el-table-column align="center" prop="semester" sortable label="学期">
...@@ -122,6 +122,11 @@ ...@@ -122,6 +122,11 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" prop="punishTime" sortable label="处分时间" width="100" /> <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" prop="remark" sortable label="备注" />
<el-table-column align="center" fixed="right" label="操作" width="200"> <el-table-column align="center" fixed="right" label="操作" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -289,6 +294,146 @@ ...@@ -289,6 +294,146 @@
<el-button @click="cancelDialog">取 消</el-button> <el-button @click="cancelDialog">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!-- 审核弹框 -->
<el-dialog title="审核信息" :visible.sync="open" width="1100px">
<el-form :model="form" ref="form" size="small" label-width="120px" :disabled="isEdit" :rules="rules">
<el-row>
<el-col :span="8">
<el-form-item label="学年" prop="schoolYear">
<el-input v-model="form.schoolYear" placeholder="请输入" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="学期" prop="semester">
<el-select v-model="form.semester" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for="dict in dict.type.semester" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="届别" prop="gradeYear">
<el-input v-model="form.gradeYear" placeholder="请输入" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="年级" prop="gradeId">
<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>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="班级" prop="classId">
<el-select v-model="form.classId" placeholder="请选择级部" clearable :style="{ width: '100%' }">
<el-option v-for="(item, index) in classList" :key="index" :label="item.classValue"
:value="item.classId"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="班级类型" prop="classType">
<el-select v-model="form.classType" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for="dict in dict.type.grade_type" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="姓名" prop="name">
<el-input v-model="form.name" placeholder="请输入" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="身份证号" prop="idCard">
<el-input v-model="form.idCard" @blur="handleIdCardBlur" maxlength="18" placeholder="请输入"
clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="性别" prop="sex">
<el-select v-model="form.sex" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="班主任" prop="classTeacherId">
<el-select v-model="form.classTeacherId" placeholder="请选择" :style="{ width: '100%' }">
<el-option v-for="item in deptOptions" :key="item.userId" :label="item.userName"
:value="item.userId"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="级部主任" prop="gradeDirectorId">
<el-select v-model="form.gradeDirectorId" placeholder="请选择" :style="{ width: '100%' }">
<el-option v-for="item in deptOptions" :key="item.userId" :label="item.userName"
:value="item.userId"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="违纪类别" prop="violateType">
<el-select v-model="form.violateType" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for="dict in dict.type.violate_type" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="违纪次数" prop="violateNum">
<el-select v-model="form.violateNum" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for="dict in dict.type.violate_num" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="处分结果" prop="punishResult">
<el-select v-model="form.punishResult" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for="dict in dict.type.punish_result" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="处分时间" prop="punishTime">
<el-date-picker v-model="form.punishTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择" clearable :style="{ width: '100%' }">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入" clearable type="textarea"
:rows="2"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer" style="text-align: center;">
<el-button @click="handleAgree" type="primary" size="small">同意</el-button>
<el-button @click="handleDisagree" type="danger" size="small">不同意</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
...@@ -312,10 +457,12 @@ import { ...@@ -312,10 +457,12 @@ import {
import { checkIdcard } from '@/utils/utilLibrary/validate' import { checkIdcard } from '@/utils/utilLibrary/validate'
export default { export default {
name: 'index', 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() { data() {
return { return {
queryForm: { queryForm: {
pageNum: 1,
pageSize: 10,
schoolYear: "", schoolYear: "",
semester: "", semester: "",
gradeYear: "", gradeYear: "",
...@@ -360,10 +507,10 @@ export default { ...@@ -360,10 +507,10 @@ export default {
punishResult: "", punishResult: "",
punishTime: "", punishTime: "",
remark: "", remark: "",
}, },
//弹窗 //弹窗
dialogTableVisible: false, dialogTableVisible: false,
open: false,
total: 0, total: 0,
gradeList: [], gradeList: [],
classList: [], classList: [],
...@@ -409,8 +556,6 @@ export default { ...@@ -409,8 +556,6 @@ export default {
punishTime: [ punishTime: [
{ required: true, message: "处分时间不能为空", trigger: "change" } { required: true, message: "处分时间不能为空", trigger: "change" }
], ],
}, },
} }
}, },
...@@ -506,45 +651,55 @@ export default { ...@@ -506,45 +651,55 @@ export default {
}, },
//审核 //审核
handleExamine(row) { handleExamine(row) {
console.log(row, 'row'); const id = row.id || this.ids;
this.$confirm('确认要提交申请?', '提示', { getDiscipline(id).then((response) => {
confirmButtonText: '同意', this.form = response.data;
cancelButtonText: '不同意', this.form.id = response.data.id;
confirmButtonClass: 'custom-blue-button', this.isEdit = true;
cancelButtonClass: 'custom-blue-button' this.open = true;
this.form.gradeId = response.data.gradeId;
const params = { gradeId: this.form.gradeId };
getClassList(params).then(response => {
this.loading = false;
this.classList = response.data;
console.log("this.classList", this.classList);
}).catch(error => {
this.$modal.closeLoading();
});
}).catch(error => {
this.$modal.closeLoading();
}) })
},
// 同意
handleAgree() {
const params = {
id: this.form.id,
auditState: '2' // 表示同意
};
subApply(params).then(({ code }) => {
console.log(this.form, 'this.form');
if (code == 200) {
this.$modal.msgSuccess('操作成功')
this.open = false;
this.getList()
}
})
},
.then(() => { // 不同意
// 弹出确认框，用户点击同意后执行的逻辑 handleDisagree() {
const params = { const params = {
id: row.id, id: this.form.id,
auditState: '2' // 表示同意 auditState: '3' // 表示不同意
}; };
subApply(params).then(res => { subApply(params).then(({ code }) => {
if (res.code == 200) { console.log(this.form, 'this.form');
this.$message({ if (code == 200) {
type: 'success', this.$modal.msgSuccess('操作成功')
message: '提交成功!' this.open = false
}); this.getList()
this.getList(); }
} })
});
})
.catch(() => {
// 用户点击不同意或者取消后执行的逻辑
const params = {
id: row.id,
auditState: '3' // 表示不同意
};
subApply(params).then(res => {
if (res.code == 200) {
this.$message({
type: 'info',
message: '已取消审核'
});
}
});
});
}, },
// 删除 // 删除
handleDelete(row) { handleDelete(row) {
...@@ -637,6 +792,8 @@ export default { ...@@ -637,6 +792,8 @@ export default {
resetQuery() { resetQuery() {
this.queryForm = { this.queryForm = {
pageNum: 1,
pageSize: 10,
schoolYear: "", schoolYear: "",
semester: "", semester: "",
gradeYear: "", gradeYear: "",
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentViolation/violationDisciplineentry/index.vue
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button> <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
</el-row> </el-row>
</el-form> </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" type="index" label="序号" width="55" />
<el-table-column align="center" prop="schoolYear" sortable label="学年" /> <el-table-column align="center" prop="schoolYear" sortable label="学年" />
<el-table-column align="center" prop="semester" sortable label="学期"> <el-table-column align="center" prop="semester" sortable label="学期">
...@@ -122,10 +122,15 @@ ...@@ -122,10 +122,15 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" prop="punishTime" sortable label="处分时间" width="100" /> <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" prop="remark" sortable label="备注" />
<el-table-column align="center" fixed="right" label="操作" width="200"> <el-table-column align="center" fixed="right" label="操作" width="200">
<template slot-scope="scope"> <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="handleExamine(scope.row)" type="text" size="small">提交</el-button>
<el-button @click="handleEdit(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> <el-button @click="handleLook(scope.row)" type="text" size="small">查看</el-button>
...@@ -140,7 +145,7 @@ ...@@ -140,7 +145,7 @@
<pagination v-show="total > 0" :total="total" :page.sync="queryForm.pageNum" :limit.sync="queryForm.pageSize" <pagination v-show="total > 0" :total="total" :page.sync="queryForm.pageNum" :limit.sync="queryForm.pageSize"
@pagination="getList" /> @pagination="getList" />
<!-- 新增/编辑弹框 --> <!-- 新增/编辑/查看弹框 -->
<el-dialog title="详细信息" :visible.sync="dialogTableVisible" width="1100px"> <el-dialog title="详细信息" :visible.sync="dialogTableVisible" width="1100px">
<el-form :model="form" ref="form" size="small" label-width="120px" :disabled="isEdit" :rules="rules"> <el-form :model="form" ref="form" size="small" label-width="120px" :disabled="isEdit" :rules="rules">
<el-row> <el-row>
...@@ -303,10 +308,12 @@ import { ...@@ -303,10 +308,12 @@ import {
import { checkIdcard } from '@/utils/utilLibrary/validate' import { checkIdcard } from '@/utils/utilLibrary/validate'
export default { export default {
name: 'index', 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() { data() {
return { return {
queryForm: { queryForm: {
pageNum: 1,
pageSize: 10,
schoolYear: "", schoolYear: "",
semester: "", semester: "",
gradeYear: "", gradeYear: "",
...@@ -321,7 +328,6 @@ export default { ...@@ -321,7 +328,6 @@ export default {
violateNum: "", violateNum: "",
punishResult: "", punishResult: "",
punishTime: "", punishTime: "",
}, },
isEdit: false, isEdit: false,
gradeLists: [], gradeLists: [],
...@@ -330,6 +336,7 @@ export default { ...@@ -330,6 +336,7 @@ export default {
], ],
open: false,
//查看弹窗表格 //查看弹窗表格
ExperimentalData: [], ExperimentalData: [],
form: { form: {
...@@ -441,7 +448,7 @@ export default { ...@@ -441,7 +448,7 @@ export default {
console.log("this.classList", this.classList); console.log("this.classList", this.classList);
}); });
}).catch(error => { }).catch(error => {
this.$modal.closeLoading();
}) })
}, },
...@@ -512,7 +519,7 @@ export default { ...@@ -512,7 +519,7 @@ export default {
handleExamine(row) { handleExamine(row) {
const ids = row.id || this.ids; const ids = row.id || this.ids;
this.$modal this.$modal
.confirm("是否提交该活动？") .confirm("是否提交该信息？")
.then(function () { .then(function () {
const params = { const params = {
id: row.id, id: row.id,
...@@ -528,6 +535,7 @@ export default { ...@@ -528,6 +535,7 @@ export default {
console.error(err); console.error(err);
}); });
}, },
// 删除 // 删除
handleDelete(row) { handleDelete(row) {
this.$modal.confirm(`是否确认删除此数据？`).then(() => { this.$modal.confirm(`是否确认删除此数据？`).then(() => {
...@@ -618,6 +626,8 @@ export default { ...@@ -618,6 +626,8 @@ export default {
resetQuery() { resetQuery() {
this.queryForm = { this.queryForm = {
pageNum: 1,
pageSize: 10,
schoolYear: "", schoolYear: "",
semester: "", semester: "",
gradeYear: "", gradeYear: "",
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/organization/SchoolOrganizationMemberController.java
...@@ -38,7 +38,7 @@ import java.util.List; ...@@ -38,7 +38,7 @@ import java.util.List;
/** /**
* 社团成员Controller * 社团成员Controller
* *
* @author liul * @author liul
* @date 2023-09-06 * @date 2023-09-06
*/ */
...@@ -83,11 +83,13 @@ public class SchoolOrganizationMemberController extends BaseController ...@@ -83,11 +83,13 @@ public class SchoolOrganizationMemberController extends BaseController
wrapper1.eq(SchoolStudentClassRelation::getStudentId,userId); wrapper1.eq(SchoolStudentClassRelation::getStudentId,userId);
SchoolStudentClassRelation one = schoolStudentClassRelationService.getOne(wrapper1); SchoolStudentClassRelation one = schoolStudentClassRelationService.getOne(wrapper1);
LambdaQueryWrapper<SchoolClass> wrapper2 = Wrappers.lambdaQuery(); if(StringUtils.isNotNull(one)){
wrapper2.eq(SchoolClass::getId,one.getClassId()); LambdaQueryWrapper<SchoolClass> wrapper2 = Wrappers.lambdaQuery();
SchoolClass res = schoolClassService.getOne(wrapper2); wrapper2.eq(SchoolClass::getId,one.getClassId());
list.get(i).setGrade(res.getGradeName()); SchoolClass res = schoolClassService.getOne(wrapper2);
list.get(i).setClasses(res.getClassName()); list.get(i).setGrade(res.getGradeName());
list.get(i).setClasses(res.getClassName());
}
} }
} }
return getDataTable(list); return getDataTable(list);
......
smart-campus/src/main/resources/mapper/schoolRewardsPunishments/SchoolScAwardsMapper.xml
...@@ -67,6 +67,7 @@ ...@@ -67,6 +67,7 @@
<if test="applyId != null "> and apply_id = #{applyId}</if> <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> <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> </where>
order by create_time DESC
</select> </select>
<select id="selectSchoolScAwardsListTg" parameterType="SchoolScAwardsVo" resultMap="SchoolScAwardsVoResult"> <select id="selectSchoolScAwardsListTg" parameterType="SchoolScAwardsVo" resultMap="SchoolScAwardsVoResult">
...@@ -86,6 +87,7 @@ ...@@ -86,6 +87,7 @@
<if test="applyId != null "> and apply_id = #{applyId}</if> <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> <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> </where>
order by create_time DESC
</select> </select>
<select id="selectSchoolScAwardsById" parameterType="Long" resultMap="SchoolScAwardsSchoolAccessoryResult"> <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