Skip to content

D
dd_school
Commit 13469014 by zhaopanyu
Options

zpy 11.9

parent fa8c7cb3
Showing with 373 additions and 85 deletions
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/schoolAwards/awardEntry/index.vue
...@@ -220,6 +220,8 @@ export default { ...@@ -220,6 +220,8 @@ export default {
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: "",
...@@ -292,7 +294,6 @@ export default { ...@@ -292,7 +294,6 @@ export default {
}, },
methods: { methods: {
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.dialogTableVisible = true; this.dialogTableVisible = true;
...@@ -346,7 +347,7 @@ export default { ...@@ -346,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,
...@@ -447,6 +448,8 @@ export default { ...@@ -447,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
...@@ -193,7 +193,109 @@ ...@@ -193,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>
...@@ -223,6 +325,8 @@ export default { ...@@ -223,6 +325,8 @@ export default {
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: "",
...@@ -286,6 +390,8 @@ export default { ...@@ -286,6 +390,8 @@ export default {
}, },
//弹窗 //弹窗
dialogTableVisible: false, dialogTableVisible: false,
open: false,
isEdit: false,
total: 0, total: 0,
} }
}, },
...@@ -345,49 +451,63 @@ export default { ...@@ -345,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(() => {
...@@ -472,6 +592,8 @@ export default { ...@@ -472,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
...@@ -167,7 +167,7 @@ ...@@ -167,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>
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentViolation/ViolationDiscipline/index.vue
...@@ -77,9 +77,7 @@ ...@@ -77,9 +77,7 @@
<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: 'punishTime', order: 'descending' }" 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" />
...@@ -299,10 +297,12 @@ import { ...@@ -299,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','audit_state1'], 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: "",
...@@ -615,6 +615,8 @@ export default { ...@@ -615,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
...@@ -294,6 +294,146 @@ ...@@ -294,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>
...@@ -317,10 +457,12 @@ import { ...@@ -317,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','audit_state1'], 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: "",
...@@ -368,6 +510,7 @@ export default { ...@@ -368,6 +510,7 @@ export default {
}, },
//弹窗 //弹窗
dialogTableVisible: false, dialogTableVisible: false,
open: false,
total: 0, total: 0,
gradeList: [], gradeList: [],
classList: [], classList: [],
...@@ -508,45 +651,55 @@ export default { ...@@ -508,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) {
...@@ -639,6 +792,8 @@ export default { ...@@ -639,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
...@@ -308,10 +308,12 @@ import { ...@@ -308,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','audit_state1'], 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: "",
...@@ -334,6 +336,7 @@ export default { ...@@ -334,6 +336,7 @@ export default {
], ],
open: false,
//查看弹窗表格 //查看弹窗表格
ExperimentalData: [], ExperimentalData: [],
form: { form: {
...@@ -516,7 +519,7 @@ export default { ...@@ -516,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,
...@@ -532,6 +535,7 @@ export default { ...@@ -532,6 +535,7 @@ export default {
console.error(err); console.error(err);
}); });
}, },
// 删除 // 删除
handleDelete(row) { handleDelete(row) {
this.$modal.confirm(`是否确认删除此数据？`).then(() => { this.$modal.confirm(`是否确认删除此数据？`).then(() => {
...@@ -622,6 +626,8 @@ export default { ...@@ -622,6 +626,8 @@ export default {
resetQuery() { resetQuery() {
this.queryForm = { this.queryForm = {
pageNum: 1,
pageSize: 10,
schoolYear: "", schoolYear: "",
semester: "", semester: "",
gradeYear: "", gradeYear: "",
......
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