Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

优化考核审核

Browse Source
This commit is contained in:
sk1551 2020-09-02 08:44:13 +08:00
parent 3de15681dc
commit 079fe43c2d
4 changed files with 104 additions and 218 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxzxkhgl/TsbzJxzxkhshController.java
View File

@ -96,6 +96,8 @@ public class TsbzJxzxkhshController extends BaseController {
@Log(title = "考核审核过程", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody TsbzJxzxkhsh tsbzJxzxkhsh) {
tsbzJxzxkhsh.setXjshr(SecurityUtils.getLoginUser().getUser().getUserId());
tsbzJxzxkhsh.setStatus("2");
return toAjax(tsbzJxzxkhshService.updateTsbzJxzxkhsh(tsbzJxzxkhsh));
}

6
ruoyi-system/src/main/resources/mapper/jxzxkhgl/TsbzJxzxkhshMapper.xml
View File

@ -47,10 +47,8 @@
</resultMap>
<sql id="selectTsbzJxzxkhshVo">
select d.id,d.faid,d.jsid,d.status,d.xjshr,d.xjshyj,d.xjshjy,d.qjshr,d.qjshjy,d.qjshyj,d.createuseird,d.create_time,b.name from tsbz_jxzxmd a
left join tsbz_jxjsjbxx b on b.id=a.jsid
left join sys_dept c on b.prdwid=c.schoolid
left join tsbz_jxzxkhsh d on a.jsid=d.jsid
select d.id,d.faid,d.jsid,d.status,d.xjshr,d.xjshyj,d.xjshjy,d.qjshr,d.qjshjy,d.qjshyj,d.createuseird,d.create_time,b.name from tsbz_jxzxkhsh d
left join tsbz_jxjsjbxx b on b.id=d.jsid
</sql>
<select id="selectTsbzJxzxkhshList" parameterType="TsbzJxzxkhsh" resultMap="TsbzJxzxkhshResult">

119
ruoyi-ui/src/views/jxjs/jdcx/index.vue
View File

@ -61,32 +61,6 @@
<el-table-column label="基地校审核意见" align="center" prop="jdxshzt" :formatter="jdxshztFormat" />
<el-table-column label="区级审核状态" align="center" prop="qjshzt" :formatter="qjshztFormat" />
<el-table-column label="区级审核建议" align="center" prop="qjshyj" />
<!-- <el-table-column label="综合得分2" align="center" prop="zhdf2" />
<el-table-column label="编号" align="center" prop="id" />
<el-table-column label="综合得分" align="center" prop="zhdf" />
<el-table-column label="方案名称" align="center" prop="faid" :formatter="faFormat" />-->
<!-- <el-table-column label="创建人" align="center" prop="createuserid" />
<el-table-column label="基地校审核人" align="center" prop="jdxshr" />
<el-table-column label="上报理由" align="center" prop="sbly" />
<el-table-column label="区级审核人" align="center" prop="qjshr" />
<el-table-column label="基地排序" align="center" prop="jdpx" />
<el-table-column label="案例分析得分" align="center" prop="alfxdf" />
<el-table-column label="教案设计得分" align="center" prop="jasjdf" />
<el-table-column label="钢笔字得分" align="center" prop="gbzdf" />
<el-table-column label="成绩导入创建时间" align="center" prop="cjdrcreateTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.cjdrcreateTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="面试确认" align="center" prop="msqr" />
<el-table-column label="面试确认时间" align="center" prop="msqrcreateTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.msqrcreateTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="面试结果模拟课堂教学" align="center" prop="msjgmnktjxdf" />
<el-table-column label="演讲得分" align="center" prop="yjdf" />-->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@ -123,9 +97,14 @@
<el-option v-for="dict in faOptions" :key="dict.id" :label="dict.name" :value="dict.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="教师名称" prop="jsid" :formatter="jsFormat">
<el-form-item label="教师名称" prop="tsbzJxjsjbxx.name" :formatter="jsFormat">
<el-select v-model="form.jsid" placeholder="请选择教师" :disabled="true">
<el-option v-for="dict in jsOptions" :key="dict.id" :label="dict.name" :value="dict.id" ></el-option>
<el-option
v-for="dict in jsOptions"
:key="dict.id"
:label="dict.name"
:value="dict.id" >
</el-option>
</el-select>
</el-form-item>
<el-form-item label="区级审核状态" prop="qjshzt">
@ -141,90 +120,6 @@
<el-form-item label="区级审核建议" prop="qjshyj">
<el-input v-model="form.qjshyj" placeholder="请输入审核建议" />
</el-form-item>
<!-- <el-form-item label="基地排序" prop="jdpx">
<el-input v-model="form.jdpx" placeholder="请输入基地排序" />
</el-form-item>
<el-form-item label="案例分析得分" prop="alfxdf">
<el-input v-model="form.alfxdf" placeholder="请输入案例分析得分" />
</el-form-item>
<el-form-item label="教案设计得分" prop="jasjdf">
<el-input v-model="form.jasjdf" placeholder="请输入教案设计得分" />
</el-form-item>
<el-form-item label="钢笔字得分" prop="gbzdf">
<el-input v-model="form.gbzdf" placeholder="请输入钢笔字得分" />
</el-form-item>
<el-form-item label="综合得分" prop="zhdf">
<el-input v-model="form.zhdf" placeholder="请输入综合得分" />
</el-form-item>
<el-form-item label="上报理由" prop="sbly">
<el-input v-model="form.sbly" placeholder="请输入上报理由" />
</el-form-item>
<el-form-item label="区级审核人" prop="qjshr">
<el-input v-model="form.qjshr" placeholder="请输入区级审核人" />
</el-form-item>
<el-form-item label="成绩导入创建时间" prop="cjdrcreateTime">
<el-date-picker
clearable
size="small"
style="width: 200px"
v-model="form.cjdrcreateTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择成绩导入创建时间"
></el-date-picker>
</el-form-item>
<el-form-item label="面试确认" prop="msqr">
<el-input v-model="form.msqr" placeholder="请输入面试确认" />
</el-form-item>
<el-form-item label="面试确认时间" prop="msqrcreateTime">
<el-date-picker
clearable
size="small"
style="width: 200px"
v-model="form.msqrcreateTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择面试确认时间"
></el-date-picker>
</el-form-item>
<el-form-item label="面试结果模拟课堂教学" prop="msjgmnktjxdf">
<el-input v-model="form.msjgmnktjxdf" placeholder="请输入面试结果模拟课堂教学" />
</el-form-item>
<el-form-item label="演讲得分" prop="yjdf">
<el-input v-model="form.yjdf" placeholder="请输入演讲得分" />
</el-form-item>
<el-form-item label="综合得分2" prop="zhdf2">
<el-input v-model="form.zhdf2" placeholder="请输入综合得分2" />
</el-form-item>
<el-form-item label="教师编号" prop="jsid">
<el-input v-model="form.jsid" placeholder="请输入教师编号" />
</el-form-item>
<el-form-item label="基地校审核人" prop="jdxshr">
<el-input v-model="form.jdxshr" placeholder="请输入基地校审核人" />
</el-form-item>
<el-form-item label="基地校审核状态" prop="jdxshzt">
<el-select v-model="form.jdxshzt" placeholder="请选择基地校审核状态">
<el-option
v-for="dict in jdxshztOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="当前状态" prop="dqzt">
<el-select v-model="form.dqzt" placeholder="请选择当前状态">
<el-option
v-for="dict in dqztOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="创建人" prop="createuserid">
<el-input v-model="form.createuserid" placeholder="请输入创建人" />
</el-form-item> -->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>

195
ruoyi-ui/src/views/jxzxkhgl/jxzxxxsh/index.vue
View File

@ -29,15 +29,6 @@
/>
</el-select>
</el-form-item>
<el-form-item label="校级审核人" prop="xjshr">
<el-input
v-model="queryParams.xjshr"
placeholder="请输入校级审核人"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="校级审核意见" prop="xjshyj">
<el-select v-model="queryParams.xjshyj" placeholder="请选择校级审核意见" clearable size="small">
<el-option
@ -48,34 +39,6 @@
/>
</el-select>
</el-form-item>
<el-form-item label="区级审核人" prop="qjshr">
<el-input
v-model="queryParams.qjshr"
placeholder="请输入区级审核人"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="区级审核意见" prop="qjshyj">
<el-select v-model="queryParams.qjshyj" placeholder="请选择区级审核意见" clearable size="small">
<el-option
v-for="dict in qjshyjOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item label="创建人" prop="createuseird">
<el-input
v-model="queryParams.createuseird"
placeholder="请输入创建人"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -83,15 +46,6 @@
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['jxzxkhgl:jxzxkhsh:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
@ -100,7 +54,7 @@
:disabled="single"
@click="handleUpdate"
v-hasPermi="['jxzxkhgl:jxzxkhsh:edit']"
>修改</el-button>
>审核</el-button>
</el-col>
<el-col :span="1.5">
<el-button
@ -111,32 +65,19 @@
@click="handleDelete"
v-hasPermi="['jxzxkhgl:jxzxkhsh:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['jxzxkhgl:jxzxkhsh:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="jzxzkhshList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="编号" align="center" prop="id" /> -->
<el-table-column label="考核方案" align="center" prop="faid" />
<el-table-column label="编号" align="center" prop="id" />
<el-table-column label="考核方案" align="center" prop="faid" :formatter="faFormat" />
<el-table-column label="教师" align="center" prop="tsbzJxjsjbxx.name" />
<el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" />
<el-table-column label="校级审核人" align="center" prop="xjshr" />
<el-table-column label="校级审核意见" align="center" prop="xjshyj" :formatter="xjshyjFormat" />
<el-table-column label="校级审核建议" align="center" prop="xjshjy" />
<el-table-column label="区级审核人" align="center" prop="qjshr" />
<el-table-column label="区级审核意见" align="center" prop="qjshyj" :formatter="qjshyjFormat" />
<el-table-column label="区级审核建议" align="center" prop="qjshjy" />
<el-table-column label="创建人" align="center" prop="createuseird" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@ -145,7 +86,7 @@
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['jxzxkhgl:jxzxkhsh:edit']"
>修改</el-button>
>审核</el-button>
<el-button
size="mini"
type="text"
@ -169,12 +110,26 @@
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="考核方案" prop="faid">
<el-input v-model="form.faid" placeholder="请输入考核方案" />
<el-select v-model="form.faid" placeholder="请选择方案">
<el-option
v-for="dict in faOptions"
:key="dict.id"
:label="dict.name"
:value="dict.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="教师" prop="jsid">
<el-input v-model="form.jsid" placeholder="请输入教师" />
<el-form-item label="教师" prop="jsid" :formatter="jsFormat">
<el-select v-model="form.jsid" placeholder="请选择教师" :disabled="true">
<el-option
v-for="dict in JssOptions"
:key="dict.id"
:label="dict.name"
:value="dict.id" >
</el-option>
</el-select>
</el-form-item>
<el-form-item label="状态" prop="status">
<!-- <el-form-item label="状态" prop="status">
<el-select v-model="form.status" placeholder="请选择状态">
<el-option
v-for="dict in statusOptions"
@ -183,10 +138,7 @@
:value="dict.dictValue"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="校级审核人" prop="xjshr">
<el-input v-model="form.xjshr" placeholder="请输入校级审核人" />
</el-form-item>
</el-form-item> -->
<el-form-item label="校级审核意见" prop="xjshyj">
<el-select v-model="form.xjshyj" placeholder="请选择校级审核意见">
<el-option
@ -200,25 +152,6 @@
<el-form-item label="校级审核建议" prop="xjshjy">
<el-input v-model="form.xjshjy" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="区级审核人" prop="qjshr">
<el-input v-model="form.qjshr" placeholder="请输入区级审核人" />
</el-form-item>
<el-form-item label="区级审核意见" prop="qjshyj">
<el-select v-model="form.qjshyj" placeholder="请选择区级审核意见">
<el-option
v-for="dict in qjshyjOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="区级审核建议" prop="qjshjy">
<el-input v-model="form.qjshjy" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="创建人" prop="createuseird">
<el-input v-model="form.createuseird" placeholder="请输入创建人" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
@ -230,11 +163,14 @@
<script>
import { listJzxzkhsh, getJzxzkhsh, delJzxzkhsh, addJzxzkhsh, updateJzxzkhsh, exportJzxzkhsh } from "@/api/jxzxkhgl/jxzxkhsh";
import { listJxzxkhfa } from "@/api/jxzxkhgl/jxzxkhfa";
import { listJxjsjbxx } from "@/api/jxjs/jxjsjbxx";
export default {
name: "Jzxzkhsh",
data() {
return {
// 遮罩层
loading: true,
// 选中数组
@ -259,6 +195,10 @@ export default {
xjshyjOptions: [],
// 区级审核意见字典
qjshyjOptions: [],
//方案
faOptions: [],
// 教师列表
JssOptions: [],
// 查询参数
queryParams: {
pageNum: 1,
@ -274,6 +214,14 @@ export default {
qjshjy: null,
createuseird: null,
},
// 查询参数
queryParams_fa: {
status: null,
},
// 查询参数
queryParams_Jss: {
jsid: null,
},
// 表单参数
form: {},
// 表单校验
@ -282,6 +230,8 @@ export default {
};
},
created() {
this.getJssList();
this.getFaList();
this.getList();
this.getDicts("sys_dm_khshgczt").then(response => {
this.statusOptions = response.data;
@ -304,6 +254,46 @@ export default {
this.loading = false;
});
},
// 方案字典翻译
faFormat(row, column) {
// return this.selectDictLabel(this.classOptions, row.classid);
var actions = [];
var datas = this.faOptions;
Object.keys(datas).map((key) => {
if (datas[key].id == "" + row.faid) {
actions.push(datas[key].name);
return false;
}
});
return actions.join("");
},
// 获取方案信息
getFaList() {
this.queryParams_fa.status = "1";
listJxzxkhfa(this.queryParams_fa).then((response) => {
this.faOptions = response.rows;
});
},
// 获取教师信息
getJssList() {
this.queryParams_Jss.jsid = this.queryParams.jsid;
listJxjsjbxx(this.queryParams_Jss).then((response) => {
this.JssOptions = response.rows;
});
},
jsFormat(row, column) {
// return this.selectDictLabel(this.classOptions, row.classid);
var actions = [];
var datas = this.JssOptions;
Object.keys(datas).map((key) => {
if (datas[key].id == "" + row.jsid) {
actions.push(datas[key].name);
return false;
}
});
return actions.join("");
},
// 状态字典翻译
statusFormat(row, column) {
return this.selectDictLabel(this.statusOptions, row.status);
@ -358,6 +348,7 @@ export default {
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.isable = false;
this.open = true;
this.title = "添加考核审核过程";
},
@ -410,18 +401,18 @@ export default {
}).catch(function() {});
},
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;
this.$confirm('是否确认导出所有考核审核过程数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(function() {
return exportJzxzkhsh(queryParams);
}).then(response => {
this.download(response.msg);
}).catch(function() {});
}
// handleExport() {
// const queryParams = this.queryParams;
// this.$confirm('是否确认导出所有考核审核过程数据项?', "警告", {
// confirmButtonText: "确定",
// cancelButtonText: "取消",
// type: "warning"
// }).then(function() {
// return exportJzxzkhsh(queryParams);
// }).then(response => {
// this.download(response.msg);
// }).catch(function() {});
// }
}
};
</script>