Skip to content

D
dd_school
Commit fa8c7cb3 by zhaopanyu
Options

zpy 11.9 修改

parent 67725b50
Showing with 48 additions and 22 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,7 +215,7 @@ import picAvatar from '@/views/smartSchool/schoolManage/introduce/schoolInfo/pro ...@@ -210,7 +215,7 @@ 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", // 上传的图片服务器地址
......
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">
...@@ -213,7 +218,7 @@ import picAvatar from '@/views/smartSchool/schoolManage/introduce/schoolInfo/pro ...@@ -213,7 +218,7 @@ 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", // 上传的图片服务器地址
...@@ -376,7 +381,7 @@ export default { ...@@ -376,7 +381,7 @@ export default {
if (res.code == 200) { if (res.code == 200) {
this.$message({ this.$message({
type: 'info', type: 'info',
message: '已取消审核' message: '已审核'
}); });
} }
}); });
......
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">
...@@ -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>
...@@ -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,8 +122,13 @@ ...@@ -122,8 +122,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,7 +299,7 @@ import { ...@@ -294,7 +299,7 @@ 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: {
......
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">
...@@ -312,7 +317,7 @@ import { ...@@ -312,7 +317,7 @@ 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: {
...@@ -360,7 +365,6 @@ export default { ...@@ -360,7 +365,6 @@ export default {
punishResult: "", punishResult: "",
punishTime: "", punishTime: "",
remark: "", remark: "",
}, },
//弹窗 //弹窗
dialogTableVisible: false, dialogTableVisible: false,
...@@ -409,8 +413,6 @@ export default { ...@@ -409,8 +413,6 @@ export default {
punishTime: [ punishTime: [
{ required: true, message: "处分时间不能为空", trigger: "change" } { required: true, message: "处分时间不能为空", trigger: "change" }
], ],
}, },
} }
}, },
...@@ -540,7 +542,7 @@ export default { ...@@ -540,7 +542,7 @@ export default {
if (res.code == 200) { if (res.code == 200) {
this.$message({ this.$message({
type: 'info', type: 'info',
message: '已取消审核' message: '已审核'
}); });
} }
}); });
......
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,7 +308,7 @@ import { ...@@ -303,7 +308,7 @@ 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: {
...@@ -321,7 +326,6 @@ export default { ...@@ -321,7 +326,6 @@ export default {
violateNum: "", violateNum: "",
punishResult: "", punishResult: "",
punishTime: "", punishTime: "",
}, },
isEdit: false, isEdit: false,
gradeLists: [], gradeLists: [],
...@@ -441,7 +445,7 @@ export default { ...@@ -441,7 +445,7 @@ export default {
console.log("this.classList", this.classList); console.log("this.classList", this.classList);
}); });
}).catch(error => { }).catch(error => {
this.$modal.closeLoading();
}) })
}, },
......
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