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

见习之星考核方案优化

Browse Source
This commit is contained in:
paidaxing444
2020-09-04 10:46:30 +08:00
parent 5520d5e218
commit d0c0116e6f
11 changed files with 420 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

200
ruoyi-ui/src/views/jxzxkhgl/jxzxkhfa/data.vue
View File

@ -1,6 +1,12 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="102px">
<el-form
:model="queryParams"
ref="queryForm"
:inline="true"
v-show="showSearch"
label-width="102px"
>
<el-form-item label="所属考核方案" prop="faid">
<el-select v-model="queryParams.faid" placeholder="请选择考核模块" clearable size="small">
<el-option
@ -21,7 +27,25 @@
/>
</el-select>
</el-form-item>
<el-form-item label="同步来源" prop="tbly">
<el-form-item label="考核内容" prop="khnr">
<el-input
v-model="queryParams.khnr"
placeholder="请输入考核内容"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="提交数量" prop="tjsl">
<el-input-number
v-model="queryParams.tjsl"
placeholder="数量"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="同步来源" prop="tbly">
<el-select v-model="queryParams.tbly" placeholder="请选择同步来源" clearable size="small">
<el-option
v-for="dict in tblyOptions"
@ -32,21 +56,27 @@
</el-select>
</el-form-item>
<el-form-item label="执行开始时间" prop="starttime">
<el-date-picker clearable size="small" style="width: 200px"
<el-date-picker
clearable
size="small"
style="width: 200px"
v-model="queryParams.starttime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择执行开始时间">
</el-date-picker>
placeholder="选择执行开始时间"
></el-date-picker>
</el-form-item>
<el-form-item label="执行截止时间" prop="endtime">
<el-date-picker clearable size="small" style="width: 200px"
<el-date-picker
clearable
size="small"
style="width: 200px"
v-model="queryParams.endtime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择执行截止时间">
</el-date-picker>
</el-form-item>
placeholder="选择执行截止时间"
></el-date-picker>
</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>
@ -60,7 +90,7 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['jxzxkhgl:jxzxkhzbx:add']"
v-hasPermi="['jxzxkhgl:jxzxkhfa:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
@ -70,7 +100,7 @@
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['jxzxkhgl:jxzxkhzbx:edit']"
v-hasPermi="['jxzxkhgl:jxzxkhfa:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
@ -80,27 +110,21 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['jxzxkhgl:jxzxkhzbx:remove']"
v-hasPermi="['jxzxkhgl:jxzxkhfa: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:jxzxkhzbx:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="jxzxkhzbxList" @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="id" /> -->
<el-table-column label="所属考核方案" align="center" prop="faid" :formatter="khfaFormat" />
<el-table-column label="考核模块" align="center" prop="khmk" :formatter="khmkFormat" />
<el-table-column label="同步来源" align="center" prop="tbly" :formatter="tblyFormat" />
<el-table-column label="考核内容" align="center" prop="khnr" />
<el-table-column label="关键字段" align="center" prop="gjzd" :show-overflow-tooltip="true" />
<el-table-column label="提交文件数量" align="center" prop="tjsl" />
<!-- <el-table-column label="同步来源" align="center" prop="tbly" :formatter="tblyFormat" />
<el-table-column label="执行开始时间" align="center" prop="starttime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.starttime, '{y}-{m}-{d}') }}</span>
@ -110,7 +134,7 @@
<template slot-scope="scope">
<span>{{ parseTime(scope.row.endtime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@ -118,19 +142,19 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['jxzxkhgl:jxzxkhzbx:edit']"
v-hasPermi="['jxzxkhgl:jxzxkhfa:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['jxzxkhgl:jxzxkhzbx:remove']"
v-hasPermi="['jxzxkhgl:jxzxkhfa:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -142,8 +166,14 @@
<!-- 添加或修改考核指标项对话框 -->
<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-select v-model="queryParams.faid" placeholder="请选择考核模块" clearable size="small" :disabled="true">
<el-form-item label="考核方案" prop="faid">
<el-select
v-model="queryParams.faid"
placeholder="请选择考核模块"
clearable
size="small"
:disabled="true"
>
<el-option
v-for="dict in khfaOptions"
:key="dict.id"
@ -166,12 +196,12 @@
<el-input v-model="form.khnr" placeholder="请输入考核内容" />
</el-form-item>
<el-form-item label="提交数量" prop="tjsl">
<el-input v-model="form.tjsl" placeholder="请输入提交数量" />
<el-input-number v-model="form.tjsl" placeholder="请输入提交数量" />
</el-form-item>
<el-form-item label="关键字段" prop="gjzd">
<el-input v-model="form.gjzd" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="同步来源" prop="tbly">
<!-- <el-form-item label="同步来源" prop="tbly">
<el-select v-model="form.tbly" placeholder="请选择同步来源">
<el-option
v-for="dict in tblyOptions"
@ -180,26 +210,32 @@
:value="dict.dictValue"
></el-option>
</el-select>
</el-form-item>
</el-form-item>-->
<!-- <el-form-item label="接口标记预留" prop="jkbj">
<el-input v-model="form.jkbj" type="textarea" placeholder="请输入内容" />
</el-form-item> -->
<el-form-item label="执行开始时间" prop="starttime">
<el-date-picker clearable size="small" style="width: 200px"
</el-form-item>-->
<!-- <el-form-item label="执行开始时间" prop="starttime">
<el-date-picker
clearable
size="small"
style="width: 200px"
v-model="form.starttime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择执行开始时间">
</el-date-picker>
placeholder="选择执行开始时间"
></el-date-picker>
</el-form-item>
<el-form-item label="执行截止时间" prop="endtime">
<el-date-picker clearable size="small" style="width: 200px"
<el-date-picker
clearable
size="small"
style="width: 200px"
v-model="form.endtime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择执行截止时间">
</el-date-picker>
</el-form-item>
placeholder="选择执行截止时间"
></el-date-picker>
</el-form-item>-->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
@ -210,7 +246,13 @@
</template>
<script>
import { listJxzxkhzbx, getJxzxkhzbx, delJxzxkhzbx, addJxzxkhzbx, updateJxzxkhzbx, exportJxzxkhzbx } from "@/api/jxzxkhgl/jxzxkhzbx";
import {
listJxzxkhzbx,
getJxzxkhzbx,
delJxzxkhzbx,
addJxzxkhzbx,
updateJxzxkhzbx,
} from "@/api/jxzxkhgl/jxzxkhzbx";
import { listJxzxkhfa, getJxzxkhfa } from "@/api/jxzxkhgl/jxzxkhfa";
export default {
@ -250,7 +292,7 @@ export default {
faid: null,
khmk: null,
khnr: null,
tjsl: null,
tjsl: undefined,
gjzd: null,
tbly: null,
jkbj: null,
@ -259,7 +301,7 @@ export default {
zxrw: null,
createuserid: null,
yly: null,
yle: null
yle: null,
},
// 表单参数
form: {},
@ -272,24 +314,24 @@ export default {
tbly: [{ required: true, message: "不能为空", trigger: "blur" }],
starttime: [{ required: true, message: "不能为空", trigger: "blur" }],
endtime: [{ required: true, message: "不能为空", trigger: "blur" }],
}
},
};
},
created() {
const khfaid = this.$route.params && this.$route.params.id;
const khfaid = this.$route.params && this.$route.params.id;
this.getkhfa2(khfaid);
this.getJxzxkhfaList();
this.getDicts("sys_dm_khmk").then(response => {
this.getDicts("sys_dm_khmk").then((response) => {
this.khmkOptions = response.data;
});
this.getDicts("sys_dm_tbly").then(response => {
this.getDicts("sys_dm_tbly").then((response) => {
this.tblyOptions = response.data;
});
},
methods: {
// 考核方案列表
getkhfa2(khfaid) {
getJxzxkhfa(khfaid).then(response => {
getJxzxkhfa(khfaid).then((response) => {
this.queryParams.faid = response.data.id;
this.defaultFa = response.data.id;
this.getList();
@ -298,7 +340,7 @@ export default {
/** 查询考核指标项列表 */
getList() {
this.loading = true;
listJxzxkhzbx(this.queryParams).then(response => {
listJxzxkhzbx(this.queryParams).then((response) => {
this.jxzxkhzbxList = response.rows;
this.total = response.total;
this.loading = false;
@ -306,7 +348,7 @@ export default {
},
// 查询考核方案选项
getJxzxkhfaList() {
listJxzxkhfa().then(response => {
listJxzxkhfa().then((response) => {
this.khfaOptions = response.rows;
});
},
@ -314,7 +356,7 @@ export default {
khfaFormat(row, column) {
var actions = [];
var datas = this.khfaOptions;
Object.keys(datas).map(key => {
Object.keys(datas).map((key) => {
if (datas[key].id == "" + row.faid) {
actions.push(datas[key].name);
return false;
@ -342,7 +384,7 @@ export default {
faid: null,
khmk: null,
khnr: null,
tjsl: null,
tjsl: 0,
gjzd: null,
tbly: null,
jkbj: null,
@ -352,7 +394,7 @@ export default {
createuserid: null,
createTime: null,
yly: null,
yle: null
yle: null,
};
this.resetForm("form");
},
@ -369,9 +411,9 @@ export default {
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
this.ids = selection.map((item) => item.id);
this.single = selection.length !== 1;
this.multiple = !selection.length;
},
/** 新增按钮操作 */
handleAdd() {
@ -383,8 +425,8 @@ export default {
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
getJxzxkhzbx(id).then(response => {
const id = row.id || this.ids;
getJxzxkhzbx(id).then((response) => {
this.form = response.data;
this.open = true;
this.title = "修改考核指标项";
@ -392,10 +434,10 @@ export default {
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.form.id != null) {
updateJxzxkhzbx(this.form).then(response => {
updateJxzxkhzbx(this.form).then((response) => {
if (response.code === 200) {
this.msgSuccess("修改成功");
this.open = false;
@ -403,7 +445,7 @@ export default {
}
});
} else {
addJxzxkhzbx(this.form).then(response => {
addJxzxkhzbx(this.form).then((response) => {
if (response.code === 200) {
this.msgSuccess("新增成功");
this.open = false;
@ -417,30 +459,24 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$confirm('是否确认删除考核指标项编号为"' + ids + '"的数据项?', "警告", {
this.$confirm(
'是否确认删除考核指标项数据项?',
"警告",
{
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(function() {
type: "warning",
}
)
.then(function () {
return delJxzxkhzbx(ids);
}).then(() => {
})
.then(() => {
this.getList();
this.msgSuccess("删除成功");
}).catch(function() {});
})
.catch(function () {});
},
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;
this.$confirm('是否确认导出所有考核指标项数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(function() {
return exportJxzxkhzbx(queryParams);
}).then(response => {
this.download(response.msg);
}).catch(function() {});
}
}
},
};
</script>

53
ruoyi-ui/src/views/jxzxkhgl/jxzxkhfa/index.vue
View File

@ -26,26 +26,15 @@
/>
</el-select>
</el-form-item>
<el-form-item label="考核开始时间" prop="starttime">
<el-form-item label="考核方案年份" prop="khnf">
<el-date-picker
clearable
size="small"
style="width: 200px"
v-model="queryParams.starttime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择考核开始时间"
></el-date-picker>
</el-form-item>
<el-form-item label="考核结束时间" prop="endtime">
<el-date-picker
clearable
size="small"
style="width: 200px"
v-model="queryParams.endtime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择考核结束时间"
v-model="queryParams.khnf"
type="year"
value-format="yyyy"
placeholder="选择考核方案年份"
></el-date-picker>
</el-form-item>
<!-- <el-form-item label="考核年份" prop="khnf">
@ -97,7 +86,7 @@
<el-table v-loading="loading" :data="jxzxkhfaList" @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="id" /> -->
<el-table-column label="考核方案名称" align="center" prop="name" :show-overflow-tooltip="true">
<template slot-scope="scope">
<router-link :to="'/jxzxkhgl/jxzxkhfa/data/' + scope.row.id" class="link-type">
@ -106,6 +95,7 @@
</template>
</el-table-column>
<el-table-column label="考核方案状态" align="center" prop="status" :formatter="statusFormat" />
<el-table-column label="考核方案年份" align="center" prop="khnf" />
<el-table-column label="考核开始时间" align="center" prop="starttime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.starttime, '{y}-{m}-{d}') }}</span>
@ -116,6 +106,7 @@
<span>{{ parseTime(scope.row.endtime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="考核文件" align="center" prop="filename" />
<!-- <el-table-column label="考核文件名称" align="center" prop="filename" />
<el-table-column label="文件路径" align="center" prop="filepath" />
<el-table-column label="考核年份" align="center" prop="khnf" width="180">
@ -177,6 +168,7 @@
type="year"
value-format="yyyy"
placeholder="选择考核年份"
:disabled="isEdit"
></el-date-picker>
</el-form-item>
<el-form-item label="考核开始时间" prop="starttime">
@ -201,10 +193,11 @@
placeholder="选择考核结束时间"
></el-date-picker>
</el-form-item>
<el-form-item label="考核文件名称" prop="filename">
<!-- <el-form-item label="考核文件名称" prop="filename">
<el-input v-model="form.filename" placeholder="请输入考核文件名称" />
</el-form-item>
</el-form-item>-->
<el-form-item label="考核文件" prop="filepath">
<el-input v-model="form.filename" v-if="false" />
<el-input v-model="form.filepath" v-if="false" />
<el-upload
class="upload-demo"
@ -221,6 +214,9 @@
<el-button size="small" type="primary">选择文件</el-button>
</el-upload>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
@ -244,6 +240,8 @@ export default {
name: "Jxzxkhfa",
data() {
return {
//是否可以修改
isEdit: false,
// 遮罩层
loading: true,
// 选中数组
@ -383,6 +381,7 @@ export default {
khnf: null,
createuserid: null,
createTime: null,
remark: null,
};
this.resetForm("form");
this.fileList = [];
@ -408,12 +407,14 @@ export default {
this.reset();
this.open = true;
this.title = "添加见习之星考核方案";
this.isEdit = false;
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids;
getJxzxkhfa(id).then((response) => {
this.isEdit = true;
this.form = response.data;
this.open = true;
this.title = "修改见习之星考核方案";
@ -450,15 +451,11 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$confirm(
'是否确认删除见习之星考核方案编号为"' + ids + '"的数据项?',
"警告",
{
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}
)
this.$confirm("是否确认删除见习之星考核方案数据项?", "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(function () {
return delJxzxkhfa(ids);
})

61
ruoyi-ui/src/views/jxzxkhgl/statistics/index.vue
View File

@ -17,18 +17,19 @@
/>
</el-select>
</el-form-item>
<el-form-item label="选择学校" prop="prdwid">
<el-input
v-model="queryParams.prdwid"
placeholder="请选择学校"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
<el-form-item label="基地学校" prop="jdxid">
<el-select v-model="queryParams.jdxid" size="small">
<el-option
v-for="item in jdxOptions"
:key="item.id"
:label="item.jdxmc"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="选择教师" prop="jsid">
<el-form-item label="见习教师" prop="name">
<el-input
v-model="queryParams.jsid"
v-model="queryParams.name"
placeholder="请输入教师"
clearable
size="small"
@ -44,10 +45,19 @@
<el-table v-loading="loading" :data="jzxzkhjdList">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="编号" align="center" prop="id" /> -->
<el-table-column label="基地校" align="center" prop="tsbzJxjsjbxx.jdxid" :formatter="jdxFormat"/>
<el-table-column label="聘任校" align="center" prop="tsbzJxjsjbxx.prdwmc" />
<el-table-column label="姓名" align="center" prop="tsbzJxjsjbxx.name" />
<el-table-column label="任教学科" align="center" prop="tsbzJxjsjbxx.rjxk" />
<el-table-column label="任教学段" align="center" prop="tsbzJxjsjbxx.rjxd" />
<el-table-column prop="bfb" label="完成进度">
<template slot-scope="scope">
<el-progress :text-inside="true" :stroke-width="24" :percentage="scope.row.bfb*100" status="success"></el-progress>
<el-progress
:text-inside="true"
:stroke-width="24"
:percentage="scope.row.bfb*100"
status="success"
></el-progress>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@ -56,8 +66,8 @@
size="mini"
type="text"
icon="el-icon-view"
@click="handleUpdate(scope.row)"
v-hasPermi="['jxzxkhgl:statistics:edit']"
@click="handleView(scope.row)"
v-hasPermi="['jxzxkhgl:statistics:query']"
>详情</el-button>
</template>
</el-table-column>
@ -83,6 +93,7 @@
<script>
import { listJxzxKhjd, getJxzxKhjd } from "@/api/jxzxkhgl/statistics";
import { listJxzxkhfa, getJxzxkhfa } from "@/api/jxzxkhgl/jxzxkhfa";
import { listJdx } from "@/api/jxjs/jdx";
export default {
name: "Jzxzkhjd",
@ -108,6 +119,8 @@ export default {
jzxzkhjdList: [],
//考核方案
jxzxkhfaOptions: [],
//基地校列表
jdxOptions: [],
// 弹出层标题
title: "",
// 是否显示弹出层
@ -116,8 +129,10 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
jdxid: null,
faid: null,
nf: null,
name: null,
},
// 查询参数
queryParams_fa: {
@ -130,9 +145,29 @@ export default {
};
},
created() {
this.getJdxList();
this.getKhfa();
},
methods: {
//翻译基地校
jdxFormat(row, column) {
// return this.selectDictLabel(this.classOptions, row.classid);
var actions = [];
var datas = this.jdxOptions;
Object.keys(datas).map((key) => {
if (datas[key].id == "" + row.tsbzJxjsjbxx.jdxid) {
actions.push(datas[key].jdxmc);
return false;
}
});
return actions.join("");
},
//获取基地校列表
getJdxList() {
listJdx(null).then((response) => {
this.jdxOptions = response.rows;
});
},
/** 查询考核审核过程列表 */
getList() {
this.loading = true;