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 14:35:29 +08:00
parent 9665304862
commit e23d9b74a9
1 changed files with 85 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,24 +1,29 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px"> <el-form
:model="queryParams"
ref="queryForm"
:inline="true"
v-show="showSearch"
label-width="102px"
>
<el-form-item label="考核方案" prop="faid"> <el-form-item label="考核方案" prop="faid">
<el-input <el-select v-model="form.faid" placeholder="请选择方案">
v-model="queryParams.faid" <el-option
placeholder="请输入考核方案" v-for="dict in faOptions"
clearable :key="dict.id"
size="small" :label="dict.name" :value="dict.id"></el-option>
@keyup.enter.native="handleQuery" </el-select>
/>
</el-form-item>
<el-form-item label="教师" prop="jsid">
<el-input
v-model="queryParams.jsid"
placeholder="请输入教师"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<!-- <el-form-item label="教师" prop="jsid">
<el-select v-model="form.jsid" placeholder="请选择教师" >
<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="queryParams.status" placeholder="请选择状态" clearable size="small"> <el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small">
<el-option <el-option
@ -46,16 +51,6 @@
</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"
@ -66,7 +61,7 @@
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">
@ -75,7 +70,6 @@
<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" />
<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="xjshyj" :formatter="xjshyjFormat" />
<el-table-column label="校级审核建议" align="center" prop="xjshjy" /> <el-table-column label="校级审核建议" align="center" prop="xjshjy" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@ -83,9 +77,10 @@
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-check"
@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"
@ -97,7 +92,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
@ -108,27 +103,22 @@
<!-- 添加或修改考核审核过程对话框 --> <!-- 添加或修改考核审核过程对话框 -->
<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="80px"> <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="请选择方案">
<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-select v-model="form.jsid" placeholder="请选择教师" :disabled="true">
<el-option <el-option
v-for="dict in faOptions" v-for="dict in JssOptions"
:key="dict.id" :key="dict.id"
:label="dict.name" :label="dict.name"
:value="dict.id" :value="dict.id"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<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-select v-model="form.status" placeholder="请选择状态">
<el-option <el-option
@ -138,7 +128,7 @@
:value="dict.dictValue" :value="dict.dictValue"
></el-option> ></el-option>
</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="form.xjshyj" placeholder="请选择校级审核意见"> <el-select v-model="form.xjshyj" placeholder="请选择校级审核意见">
<el-option <el-option
@ -162,7 +152,14 @@
</template> </template>
<script> <script>
import { listJzxzkhsh, getJzxzkhsh, delJzxzkhsh, addJzxzkhsh, updateJzxzkhsh, exportJzxzkhsh } from "@/api/jxzxkhgl/jxzxkhsh"; import {
listJzxzkhsh,
getJzxzkhsh,
delJzxzkhsh,
addJzxzkhsh,
updateJzxzkhsh,
exportJzxzkhsh
} from "@/api/jxzxkhgl/jxzxkhsh";
import { listJxzxkhfa } from "@/api/jxzxkhgl/jxzxkhfa"; import { listJxzxkhfa } from "@/api/jxzxkhgl/jxzxkhfa";
import { listJxjsjbxx } from "@/api/jxjs/jxjsjbxx"; import { listJxjsjbxx } from "@/api/jxjs/jxjsjbxx";
@ -170,7 +167,6 @@ export default {
name: "Jzxzkhsh", name: "Jzxzkhsh",
data() { data() {
return { return {
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组 // 选中数组
@ -212,20 +208,29 @@ 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: null
}, },
// 查询参数 // 查询参数
queryParams_Jss: { queryParams_Jss: {
jsid: null, jsid: null
}, },
// 表单参数 // 表单参数
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
faid: [
{ required: true, message: "方案编号不能为空", trigger: "blur" },
],
xjshyj: [
{ required: true, message: "方案编号不能为空", trigger: "blur" },
],
xjshjy: [
{ required: true, message: "方案编号不能为空", trigger: "blur" },
],
} }
}; };
}, },
@ -248,18 +253,26 @@ export default {
getList() { getList() {
this.loading = true; this.loading = true;
listJzxzkhsh(this.queryParams).then(response => { listJzxzkhsh(this.queryParams).then(response => {
console.log(response.rows);
this.jzxzkhshList = response.rows; this.jzxzkhshList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
}); });
}, },
// 是否显示按钮
isShow(row) {
//console.log(row.status);
if (row.xjshyj == "0" || row.xjshyj == "1") {
return false;
} else {
return true;
}
},
// 方案字典翻译 // 方案字典翻译
faFormat(row, column) { faFormat(row, column) {
// 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;
@ -270,23 +283,24 @@ export default {
// 获取方案信息 // 获取方案信息
getFaList() { getFaList() {
this.queryParams_fa.status = "1"; 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;
}); });
}, },
// 获取教师信息 // 获取教师信息
getJssList() { getJssList() {
this.queryParams_Jss.jsid = this.queryParams.jsid; this.queryParams_Jss.jsid = this.queryParams.jsid;
listJxjsjbxx(this.queryParams_Jss).then((response) => { listJxjsjbxx(this.queryParams_Jss).then(response => {
this.JssOptions = response.rows; this.JssOptions = response.rows;
//console.log(this.JssOptions);
}); });
}, },
jsFormat(row, column) { jsFormat(row, column) {
// return this.selectDictLabel(this.classOptions, row.classid); // return this.selectDictLabel(this.classOptions, row.classid);
var actions = []; var actions = [];
var datas = this.JssOptions; var datas = this.JssOptions;
Object.keys(datas).map((key) => { Object.keys(datas).map(key => {
if (datas[key].id == "" + row.jsid) { if (datas[key].id == "" + row.jsid) {
actions.push(datas[key].name); actions.push(datas[key].name);
return false; return false;
@ -341,9 +355,9 @@ export default {
}, },
// 多选框选中数据 // 多选框选中数据
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() { handleAdd() {
@ -355,7 +369,7 @@ export default {
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
const id = row.id || this.ids const id = row.id || this.ids;
getJzxzkhsh(id).then(response => { getJzxzkhsh(id).then(response => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
@ -389,17 +403,24 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const ids = row.id || this.ids; const ids = row.id || this.ids;
this.$confirm('是否确认删除考核审核过程编号为"' + ids + '"的数据项?', "警告", { this.$confirm(
'是否确认删除考核审核过程编号为"' + ids + '"的数据项?',
"警告",
{
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning"
}).then(function() { }
)
.then(function() {
return delJzxzkhsh(ids); return delJzxzkhsh(ids);
}).then(() => { })
.then(() => {
this.getList(); this.getList();
this.msgSuccess("删除成功"); this.msgSuccess("删除成功");
}).catch(function() {}); })
}, .catch(function() {});
}
/** 导出按钮操作 */ /** 导出按钮操作 */
// handleExport() { // handleExport() {
// const queryParams = this.queryParams; // const queryParams = this.queryParams;