见习之星考核-校级区级审核

This commit is contained in:
paidaxing444
2020-09-02 17:28:23 +08:00
parent 5faade9386
commit 9aab741c49
5 changed files with 92 additions and 102 deletions

View File

@ -103,18 +103,12 @@ public class TsbzJxzxkhshController extends BaseController {
if(!schoolCommonController.isStringEmpty(tsbzJxzxkhsh.getXjshyj())&&tsbzJxzxkhsh.getXjshyj().equals("1")) { if(!schoolCommonController.isStringEmpty(tsbzJxzxkhsh.getXjshyj())&&tsbzJxzxkhsh.getXjshyj().equals("1")) {
tsbzJxzxkhsh.setXjshr(SecurityUtils.getLoginUser().getUser().getUserId()); tsbzJxzxkhsh.setXjshr(SecurityUtils.getLoginUser().getUser().getUserId());
tsbzJxzxkhsh.setStatus("2"); tsbzJxzxkhsh.setStatus("2");
}else if (!schoolCommonController.isStringEmpty(tsbzJxzxkhsh.getXjshyj())&&tsbzJxzxkhsh.getXjshyj().equals("0")) {
tsbzJxzxkhsh.setXjshr(SecurityUtils.getLoginUser().getUser().getUserId());
tsbzJxzxkhsh.setStatus("8");
} }
//区级 //区级
if(!schoolCommonController.isStringEmpty(tsbzJxzxkhsh.getQjshyj())&&tsbzJxzxkhsh.getQjshyj().equals("1")) { if(!schoolCommonController.isStringEmpty(tsbzJxzxkhsh.getQjshyj())&&tsbzJxzxkhsh.getQjshyj().equals("1")) {
tsbzJxzxkhsh.setQjshr(SecurityUtils.getLoginUser().getUser().getUserId()); tsbzJxzxkhsh.setQjshr(SecurityUtils.getLoginUser().getUser().getUserId());
tsbzJxzxkhsh.setStatus("9"); tsbzJxzxkhsh.setStatus("9");
}else if (!schoolCommonController.isStringEmpty(tsbzJxzxkhsh.getQjshyj())&&tsbzJxzxkhsh.getQjshyj().equals("0")) {
tsbzJxzxkhsh.setQjshr(SecurityUtils.getLoginUser().getUser().getUserId());
tsbzJxzxkhsh.setStatus("8");
} }
return toAjax(tsbzJxzxkhshService.updateTsbzJxzxkhsh(tsbzJxzxkhsh)); return toAjax(tsbzJxzxkhshService.updateTsbzJxzxkhsh(tsbzJxzxkhsh));
@ -133,6 +127,19 @@ public class TsbzJxzxkhshController extends BaseController {
/** /**
* 新增考核审核过程 * 新增考核审核过程
*/ */
@PreAuthorize("@ss.hasPermi('jxzxkhgl:jxzxkhsh:edit')")
@Log(title = "考核审核过程", businessType = BusinessType.UPDATE)
@PostMapping("/back/{id}/{status}")
public AjaxResult back(@PathVariable Long id,@PathVariable String status) {
TsbzJxzxkhsh tsbzJxzxkhsh = new TsbzJxzxkhsh();
tsbzJxzxkhsh.setId(id);
tsbzJxzxkhsh.setStatus(status);
return toAjax(tsbzJxzxkhshService.updateTsbzJxzxkhsh(tsbzJxzxkhsh));
}
/**
* 回退考核审核过程
*/
@PreAuthorize("@ss.hasPermi('jxzxkhgl:jxzxkhsh:add')" + "||@ss.hasPermi('jxzxkhgl:jxzxkhgcsj:edit')") @PreAuthorize("@ss.hasPermi('jxzxkhgl:jxzxkhsh:add')" + "||@ss.hasPermi('jxzxkhgl:jxzxkhgcsj:edit')")
@Log(title = "考核审核过程", businessType = BusinessType.INSERT) @Log(title = "考核审核过程", businessType = BusinessType.INSERT)
@PostMapping("/check/{id}") @PostMapping("/check/{id}")

View File

@ -47,7 +47,7 @@
</resultMap> </resultMap>
<sql id="selectTsbzJxzxkhshVo"> <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,b.prdwmc from tsbz_jxzxmd a select d.id,d.faid,d.jsid,ifnull(d.status,0) status,d.xjshr,d.xjshyj,d.xjshjy,d.qjshr,d.qjshjy,d.qjshyj,d.createuseird,a.create_time,b.name,b.prdwmc from tsbz_jxzxmd a
left join tsbz_jxjsjbxx b on b.id=a.jsid left join tsbz_jxjsjbxx b on b.id=a.jsid
left join sys_dept c on b.prdwid=c.schoolid left join sys_dept c on b.prdwid=c.schoolid
left join tsbz_jxzxkhsh d on a.jsid=d.jsid left join tsbz_jxzxkhsh d on a.jsid=d.jsid

View File

@ -69,3 +69,11 @@ export function checkJzxzkhsh(id) {
method: 'post' method: 'post'
}) })
} }
// 删除考核审核过程
export function backJzxzkhsh(id, status) {
return request({
url: '/jxzxkhgl/jxzxkhsh/back/' + id + '/' + status,
method: 'post'
})
}

View File

@ -35,7 +35,7 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="status"> <el-form-item label="当前状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small"> <el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small">
<el-option <el-option
v-for="dict in statusOptions" v-for="dict in statusOptions"
@ -86,7 +86,7 @@
</el-row> </el-row>
<el-table v-loading="loading" :data="jzxzkhshList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="jzxzkhshList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" :selectable="isShow" />
<!-- <el-table-column label="编号" align="center" prop="id" /> --> <!-- <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="faid" :formatter="faFormat" />
<el-table-column label="聘任校" align="center" prop="tsbzJxjsjbxx.prdwmc" /> <el-table-column label="聘任校" align="center" prop="tsbzJxjsjbxx.prdwmc" />
@ -104,6 +104,7 @@
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['jxzxkhgl:jxzxkhsh:edit']" v-hasPermi="['jxzxkhgl:jxzxkhsh:edit']"
v-show="isShow(scope.row)"
>审核</el-button> >审核</el-button>
<el-button <el-button
size="mini" size="mini"
@ -111,6 +112,7 @@
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['jxzxkhgl:jxzxkhsh:remove']" v-hasPermi="['jxzxkhgl:jxzxkhsh:remove']"
v-show="isShow(scope.row)"
>退回</el-button> >退回</el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -167,7 +169,7 @@
import { import {
listJzxzkhsh, listJzxzkhsh,
getJzxzkhsh, getJzxzkhsh,
delJzxzkhsh, backJzxzkhsh,
addJzxzkhsh, addJzxzkhsh,
updateJzxzkhsh, updateJzxzkhsh,
} from "@/api/jxzxkhgl/jxzxkhsh"; } from "@/api/jxzxkhgl/jxzxkhsh";
@ -250,6 +252,13 @@ export default {
}); });
}, },
methods: { methods: {
//设置是否可用
isShow(row) {
if (row.status == "9") {
return false;
}
return true;
},
/** 查询考核审核过程列表 */ /** 查询考核审核过程列表 */
getList() { getList() {
this.loading = true; this.loading = true;
@ -368,11 +377,11 @@ export default {
type: "warning", type: "warning",
}) })
.then(function () { .then(function () {
return delJzxzkhsh(ids); return backJzxzkhsh(ids, "1");
}) })
.then(() => { .then(() => {
this.getList(); this.getList();
this.msgSuccess("删除成功"); this.msgSuccess("回退成功");
}) })
.catch(function () {}); .catch(function () {});
}, },

View File

@ -5,14 +5,11 @@
ref="queryForm" ref="queryForm"
:inline="true" :inline="true"
v-show="showSearch" v-show="showSearch"
label-width="102px" label-width="68px"
> >
<el-form-item label="考核方案" prop="faid"> <el-form-item label="考核方案" prop="faid">
<el-select v-model="form.faid" placeholder="请选择方案"> <el-select v-model="queryParams.faid" size="small">
<el-option <el-option v-for="dict in faOptions" :key="dict.id" :label="dict.name" :value="dict.id"></el-option>
v-for="dict in faOptions"
:key="dict.id"
:label="dict.name" :value="dict.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="教师" prop="jsid"> <!-- <el-form-item label="教师" prop="jsid">
@ -23,8 +20,8 @@
:label="dict.name" :label="dict.name"
:value="dict.id"></el-option> :value="dict.id"></el-option>
</el-select> </el-select>
</el-form-item> --> </el-form-item>-->
<el-form-item label="状态" prop="status"> <el-form-item label="当前状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small"> <el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small">
<el-option <el-option
v-for="dict in statusOptions" v-for="dict in statusOptions"
@ -34,7 +31,7 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="校级审核意见" prop="xjshyj"> <el-form-item label="校级意见" prop="xjshyj">
<el-select v-model="queryParams.xjshyj" placeholder="请选择校级审核意见" clearable size="small"> <el-select v-model="queryParams.xjshyj" placeholder="请选择校级审核意见" clearable size="small">
<el-option <el-option
v-for="dict in xjshyjOptions" v-for="dict in xjshyjOptions"
@ -51,6 +48,16 @@
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="success"
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['jxzxkhgl:jxzxkhsh:edit']"
>审核</el-button>
</el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="danger" type="danger"
@ -59,14 +66,14 @@
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['jxzxkhgl:jxzxkhsh:remove']" v-hasPermi="['jxzxkhgl:jxzxkhsh:remove']"
>删除</el-button> >退回</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="jzxzkhshList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="jzxzkhshList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" :selectable="isShow" />
<el-table-column label="聘任校" align="center" prop="tsbzJxjsjbxx.prdwmc" /> <!-- <el-table-column label="聘任校" align="center" prop="tsbzJxjsjbxx.prdwmc" /> -->
<el-table-column label="考核方案" align="center" prop="faid" :formatter="faFormat" /> <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="tsbzJxjsjbxx.name" />
<el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" /> <el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" />
@ -88,6 +95,7 @@
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['jxzxkhgl:jxzxkhsh:remove']" v-hasPermi="['jxzxkhgl:jxzxkhsh:remove']"
v-show="isShow(scope.row)"
>退回</el-button> >退回</el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -105,19 +113,13 @@
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="考核方案" prop="faid"> <el-form-item label="考核方案" prop="faid">
<el-select v-model="form.faid" placeholder="请选择方案"> <el-select v-model="form.faid" placeholder="请选择方案" :disabled="true">
<el-option v-for="dict in faOptions" :key="dict.id" :label="dict.name" :value="dict.id"></el-option> <el-option v-for="dict in faOptions" :key="dict.id" :label="dict.name" :value="dict.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="教师" prop="jsid" :formatter="jsFormat"> <el-form-item label="教师" prop="jsid">
<el-select v-model="form.jsid" placeholder="请选择教师" :disabled="true"> <el-input v-model="jsxm" :disabled="true" />
<el-option <el-input v-model="form.jsid" v-if="false" />
v-for="dict in JssOptions"
:key="dict.id"
:label="dict.name"
:value="dict.id"
></el-option>
</el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="状态" prop="status"> <!-- <el-form-item label="状态" prop="status">
<el-select v-model="form.status" placeholder="请选择状态"> <el-select v-model="form.status" placeholder="请选择状态">
@ -158,15 +160,17 @@ import {
delJzxzkhsh, delJzxzkhsh,
addJzxzkhsh, addJzxzkhsh,
updateJzxzkhsh, updateJzxzkhsh,
exportJzxzkhsh
} from "@/api/jxzxkhgl/jxzxkhsh"; } from "@/api/jxzxkhgl/jxzxkhsh";
import { listJxzxkhfa } from "@/api/jxzxkhgl/jxzxkhfa"; import { listJxzxkhfa } from "@/api/jxzxkhgl/jxzxkhfa";
import { listJxjsjbxx } from "@/api/jxjs/jxjsjbxx";
export default { export default {
name: "Jzxzkhsh", name: "Jzxzkhsh",
data() { data() {
return { return {
//教师姓名
jsxm: "",
//默认方案id
defaultFaid: "",
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组 // 选中数组
@ -193,8 +197,6 @@ export default {
qjshyjOptions: [], qjshyjOptions: [],
//方案 //方案
faOptions: [], faOptions: [],
// 教师列表
JssOptions: [],
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
@ -208,15 +210,15 @@ export default {
qjshr: null, qjshr: null,
qjshyj: null, qjshyj: null,
qjshjy: null, qjshjy: null,
createuseird: null createuseird: null,
}, },
// 查询参数 // 查询参数
queryParams_fa: { queryParams_fa: {
status: null status: "1",
}, },
// 查询参数 // 查询参数
queryParams_Jss: { queryParams_Jss: {
jsid: null jsid: null,
}, },
// 表单参数 // 表单参数
form: {}, form: {},
@ -231,20 +233,19 @@ export default {
xjshjy: [ xjshjy: [
{ required: true, message: "方案编号不能为空", trigger: "blur" }, { required: true, message: "方案编号不能为空", trigger: "blur" },
], ],
} },
}; };
}, },
created() { created() {
this.getJssList();
this.getFaList(); this.getFaList();
this.getList(); this.getList();
this.getDicts("sys_dm_khshgczt").then(response => { this.getDicts("sys_dm_khshgczt").then((response) => {
this.statusOptions = response.data; this.statusOptions = response.data;
}); });
this.getDicts("sys_dm_shyj").then(response => { this.getDicts("sys_dm_shyj").then((response) => {
this.xjshyjOptions = response.data; this.xjshyjOptions = response.data;
}); });
this.getDicts("sys_dm_shyj").then(response => { this.getDicts("sys_dm_shyj").then((response) => {
this.qjshyjOptions = response.data; this.qjshyjOptions = response.data;
}); });
}, },
@ -252,7 +253,7 @@ export default {
/** 查询考核审核过程列表 */ /** 查询考核审核过程列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listJzxzkhsh(this.queryParams).then(response => { listJzxzkhsh(this.queryParams).then((response) => {
this.jzxzkhshList = response.rows; this.jzxzkhshList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
@ -261,7 +262,7 @@ export default {
// 是否显示按钮 // 是否显示按钮
isShow(row) { isShow(row) {
//console.log(row.status); //console.log(row.status);
if (row.xjshyj == "0" || row.xjshyj == "1") { if (row.status == "0" || row.status == "9" || row.status == "2") {
return false; return false;
} else { } else {
return true; return true;
@ -272,7 +273,7 @@ export default {
// return this.selectDictLabel(this.classOptions, row.classid); // return this.selectDictLabel(this.classOptions, row.classid);
var actions = []; var actions = [];
var datas = this.faOptions; var datas = this.faOptions;
Object.keys(datas).map(key => { Object.keys(datas).map((key) => {
if (datas[key].id == "" + row.faid) { if (datas[key].id == "" + row.faid) {
actions.push(datas[key].name); actions.push(datas[key].name);
return false; return false;
@ -282,32 +283,12 @@ export default {
}, },
// 获取方案信息 // 获取方案信息
getFaList() { getFaList() {
this.queryParams_fa.status = "1"; listJxzxkhfa(this.queryParams_fa).then((response) => {
listJxzxkhfa(this.queryParams_fa).then(response => {
this.faOptions = response.rows; this.faOptions = response.rows;
this.defaultFaid = response.rows[0].id;
this.queryParams.faid = this.defaultFaid;
}); });
}, },
// 获取教师信息
getJssList() {
this.queryParams_Jss.jsid = this.queryParams.jsid;
listJxjsjbxx(this.queryParams_Jss).then(response => {
this.JssOptions = response.rows;
//console.log(this.JssOptions);
});
},
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) { statusFormat(row, column) {
return this.selectDictLabel(this.statusOptions, row.status); return this.selectDictLabel(this.statusOptions, row.status);
@ -339,7 +320,7 @@ export default {
qjshyj: null, qjshyj: null,
qjshjy: null, qjshjy: null,
createuseird: null, createuseird: null,
createTime: null createTime: null,
}; };
this.resetForm("form"); this.resetForm("form");
}, },
@ -351,26 +332,24 @@ export default {
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.resetForm("queryForm");
this.queryParams.faid = this.defaultFaid;
this.handleQuery(); this.handleQuery();
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.id); this.ids = selection.map((item) => item.id);
this.single = selection.length !== 1; this.single = selection.length !== 1;
this.multiple = !selection.length; this.multiple = !selection.length;
}, },
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.isable = false;
this.open = true;
this.title = "添加考核审核过程";
},
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
const id = row.id || this.ids; const id = row.id || this.ids;
getJzxzkhsh(id).then(response => { if (id == null || id == "") {
return this.msgError("当前教师未提交数据,不允许审核!");
}
getJzxzkhsh(id).then((response) => {
this.jsxm = response.data.tsbzJxjsjbxx.name;
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改考核审核过程"; this.title = "修改考核审核过程";
@ -378,10 +357,10 @@ export default {
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.$refs["form"].validate(valid => { this.$refs["form"].validate((valid) => {
if (valid) { if (valid) {
if (this.form.id != null) { if (this.form.id != null) {
updateJzxzkhsh(this.form).then(response => { updateJzxzkhsh(this.form).then((response) => {
if (response.code === 200) { if (response.code === 200) {
this.msgSuccess("修改成功"); this.msgSuccess("修改成功");
this.open = false; this.open = false;
@ -389,7 +368,7 @@ export default {
} }
}); });
} else { } else {
addJzxzkhsh(this.form).then(response => { addJzxzkhsh(this.form).then((response) => {
if (response.code === 200) { if (response.code === 200) {
this.msgSuccess("新增成功"); this.msgSuccess("新增成功");
this.open = false; this.open = false;
@ -403,7 +382,7 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const ids = row.id || this.ids; const ids = row.id || this.ids;
this.$confirm("是否确认该教师考核数据回退到聘任校?", "警告", { this.$confirm("是否确认该教师考核数据回退到教师?", "警告", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning",
@ -413,23 +392,10 @@ export default {
}) })
.then(() => { .then(() => {
this.getList(); this.getList();
this.msgSuccess("删除成功"); this.msgSuccess("回退成功");
}) })
.catch(function () {}); .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> </script>