Merge remote-tracking branch 'origin/master' into master
# Conflicts: # ruoyi-system/src/main/java/com/ruoyi/jxjs/domain/TsbzJdcx.java
This commit is contained in:
@ -2,60 +2,60 @@ import request from '@/utils/request'
|
||||
|
||||
// 查询基地区级审核列表
|
||||
export function listJdcx(query) {
|
||||
return request({
|
||||
url: '/jxjs/jdcx/list',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
return request({
|
||||
url: '/jxjs/jdcx/list',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
|
||||
// 查询基地区级审核详细
|
||||
export function getJdcx(id) {
|
||||
return request({
|
||||
url: '/jxjs/jdcx/' + id,
|
||||
method: 'get'
|
||||
})
|
||||
return request({
|
||||
url: '/jxjs/jdcx/' + id,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
// 新增基地区级审核
|
||||
export function addJdcx(data) {
|
||||
return request({
|
||||
url: '/jxjs/jdcx',
|
||||
method: 'post',
|
||||
data: data
|
||||
})
|
||||
return request({
|
||||
url: '/jxjs/jdcx',
|
||||
method: 'post',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
// 修改基地区级审核
|
||||
export function updateJdcx(data) {
|
||||
return request({
|
||||
url: '/jxjs/jdcx',
|
||||
method: 'put',
|
||||
data: data
|
||||
})
|
||||
return request({
|
||||
url: '/jxjs/jdcx',
|
||||
method: 'put',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
// 删除基地区级审核
|
||||
export function delJdcx(id) {
|
||||
return request({
|
||||
url: '/jxjs/jdcx/' + id,
|
||||
method: 'delete'
|
||||
})
|
||||
return request({
|
||||
url: '/jxjs/jdcx/' + id,
|
||||
method: 'delete'
|
||||
})
|
||||
}
|
||||
|
||||
// 导出基地区级审核
|
||||
export function exportJdcx(query) {
|
||||
return request({
|
||||
url: '/jxjs/jdcx/export',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
return request({
|
||||
url: '/jxjs/jdcx/export',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
|
||||
// 删除基地区级审核
|
||||
export function checkJdcx(id) {
|
||||
return request({
|
||||
url: '/jxjs/jdcx/check/' + id,
|
||||
method: 'post'
|
||||
})
|
||||
return request({
|
||||
url: '/jxjs/jdcx/check/' + id,
|
||||
method: 'post'
|
||||
})
|
||||
}
|
@ -7,11 +7,11 @@
|
||||
v-show="showSearch"
|
||||
label-width="68px"
|
||||
>
|
||||
<el-form-item label="评选方案" prop="faid">
|
||||
<!-- <el-form-item label="评选方案" prop="faid">
|
||||
<el-select v-model="queryParams.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> -->
|
||||
<el-form-item label="基地校" prop="faid">
|
||||
<el-select v-model="queryParams.faid" placeholder="请选择基地校">
|
||||
<el-option v-for="dict in faOptions" :key="dict.id" :label="dict.name" :value="dict.id"></el-option>
|
||||
@ -58,16 +58,16 @@
|
||||
|
||||
<el-table v-loading="loading" :data="jdcxList" @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" :formatter="faFormat" />
|
||||
<el-table-column label="教师姓名" align="center" prop="jsid" />
|
||||
<el-table-column label="教师姓名" align="center" prop="jsid" :formatter="jsFormat" />
|
||||
<el-table-column label="基地校名称" align="center" prop="jdxid" :formatter="jdxmcFormat" />
|
||||
<el-table-column label="当前状态" align="center" prop="dqzt" :formatter="dqztFormat" />
|
||||
<el-table-column label="基地校审核状态" align="center" prop="jdxshzt" :formatter="jdxshztFormat" />
|
||||
<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" :formatter="qjshyjFormat" />
|
||||
<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="综合得分2" align="center" prop="zhdf2" /> -->
|
||||
|
||||
<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" />
|
||||
@ -122,43 +122,15 @@
|
||||
<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-form-item>
|
||||
<el-form-item label="教师编号" prop="jsid">
|
||||
<el-input v-model="form.jsid" placeholder="请输入教师编号" />
|
||||
</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 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-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="创建人" prop="createuserid">
|
||||
<el-input v-model="form.createuserid" 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-form-item label="教师名称" prop="jsid" :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-select>
|
||||
</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="qjshzt">
|
||||
<el-select v-model="form.qjshzt" placeholder="请选择区级审核状态">
|
||||
<el-option
|
||||
@ -169,17 +141,10 @@
|
||||
></el-option>
|
||||
</el-select>
|
||||
</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 label="区级审核建议" prop="qjshyj">
|
||||
<el-input v-model="form.qjshyj" placeholder="请输入审核建议" />
|
||||
</el-form-item>
|
||||
<el-form-item label="基地排序" prop="jdpx">
|
||||
<!-- <el-form-item label="基地排序" prop="jdpx">
|
||||
<el-input v-model="form.jdpx" placeholder="请输入基地排序" />
|
||||
</el-form-item>
|
||||
<el-form-item label="案例分析得分" prop="alfxdf">
|
||||
@ -194,6 +159,12 @@
|
||||
<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
|
||||
@ -228,6 +199,35 @@
|
||||
<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>
|
||||
@ -248,6 +248,7 @@ import {
|
||||
} from "@/api/jxjs/jdcx";
|
||||
|
||||
import { listJxzxpxfa } from "@/api/jxjs/jxzxpxfa";
|
||||
import { listJxjsjbxx, getJxjsjbxx } from "@/api/jxjs/jxjsjbxx";
|
||||
|
||||
export default {
|
||||
name: "Jdcx",
|
||||
@ -273,12 +274,14 @@ export default {
|
||||
open: false,
|
||||
// 当前状态字典
|
||||
dqztOptions: [],
|
||||
// 基地校审核状态字典
|
||||
// 基地校审核意见字典
|
||||
jdxshztOptions: [],
|
||||
// 区级审核状态字典
|
||||
qjshztOptions: [],
|
||||
// 区级审核意见字典
|
||||
qjshyjOptions: [],
|
||||
// 教师列表
|
||||
jsOptions: [],
|
||||
//方案
|
||||
faOptions: [],
|
||||
// 查询参数
|
||||
@ -349,18 +352,19 @@ export default {
|
||||
created() {
|
||||
this.getFaList();
|
||||
this.getList();
|
||||
this.getJsList();
|
||||
this.getDicts("sys_dm_shzt").then((response) => {
|
||||
this.dqztOptions = response.data;
|
||||
});
|
||||
this.getDicts("sys_dm_shzt").then((response) => {
|
||||
this.getDicts("sys_dm_shyj").then((response) => {
|
||||
this.jdxshztOptions = response.data;
|
||||
});
|
||||
this.getDicts("sys_dm_shzt").then((response) => {
|
||||
this.getDicts("sys_dm_shyj").then((response) => {
|
||||
this.qjshztOptions = response.data;
|
||||
});
|
||||
this.getDicts("sys_dm_shyj").then((response) => {
|
||||
this.qjshyjOptions = response.data;
|
||||
});
|
||||
// this.getDicts("sys_dm_shyj").then((response) => {
|
||||
// this.qjshyjOptions = response.data;
|
||||
// });
|
||||
},
|
||||
methods: {
|
||||
// 字典翻译
|
||||
@ -388,10 +392,47 @@ export default {
|
||||
this.loading = true;
|
||||
listJdcx(this.queryParams).then((response) => {
|
||||
this.jdcxList = response.rows;
|
||||
// 过滤未审核和未同意的人员
|
||||
this.jdcxList = this.jdcxList.filter(function(item) {
|
||||
return item.dqzt == 2 && item.jdxshzt == 1;
|
||||
});
|
||||
this.total = response.total;
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
// 获取教师信息
|
||||
getJsList() {
|
||||
listJxjsjbxx(null).then((response) => {
|
||||
this.jsOptions = response.rows;
|
||||
//console.log(this.jsOptions);
|
||||
});
|
||||
},
|
||||
// 基地校名称字典翻译
|
||||
jdxmcFormat(row, column) {
|
||||
// return this.selectDictLabel(this.classOptions, row.classid);
|
||||
var actions = [];
|
||||
var datas = this.jsOptions;
|
||||
Object.keys(datas).map((key) => {
|
||||
if (datas[key].id == "" + row.jsid) {
|
||||
actions.push(datas[key].jdxid);
|
||||
return false;
|
||||
}
|
||||
});
|
||||
return actions.join("");
|
||||
},
|
||||
// 字典翻译
|
||||
jsFormat(row, column) {
|
||||
// return this.selectDictLabel(this.classOptions, row.classid);
|
||||
var actions = [];
|
||||
var datas = this.jsOptions;
|
||||
Object.keys(datas).map((key) => {
|
||||
if (datas[key].id == "" + row.jsid) {
|
||||
actions.push(datas[key].name);
|
||||
return false;
|
||||
}
|
||||
});
|
||||
return actions.join("");
|
||||
},
|
||||
// 当前状态字典翻译
|
||||
dqztFormat(row, column) {
|
||||
return this.selectDictLabel(this.dqztOptions, row.dqzt);
|
||||
@ -470,6 +511,7 @@ export default {
|
||||
const id = row.id || this.ids;
|
||||
getJdcx(id).then((response) => {
|
||||
this.form = response.data;
|
||||
console.log(this.form);
|
||||
this.open = true;
|
||||
this.title = "修改基地区级审核";
|
||||
});
|
||||
|
@ -381,6 +381,7 @@ export default {
|
||||
this.title = "基地校初选";
|
||||
listJxjsjbxx(null).then((response) => {
|
||||
this.jss = response.rows;
|
||||
console.log(this.jss + '-------------');
|
||||
});
|
||||
},
|
||||
/** 修改按钮操作 */
|
||||
@ -392,6 +393,7 @@ export default {
|
||||
this.form = response.data;
|
||||
listJxjsjbxx(null).then((response) => {
|
||||
this.jss = response.rows;
|
||||
|
||||
});
|
||||
this.checkedJss.push(response.data.jsid);
|
||||
this.open = true;
|
||||
|
@ -127,7 +127,7 @@
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-edit"
|
||||
icon="el-icon-document-copy"
|
||||
@click="handleCopy(scope.row)"
|
||||
v-hasPermi="['jxjs:jxzxpxfa:add']"
|
||||
>复制</el-button>
|
||||
|
@ -13,13 +13,19 @@
|
||||
</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-select v-model="queryParams.jsid" filterable placeholder="请选择教师">
|
||||
<el-option v-for="item in jsOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="录取状态" prop="lqzt">
|
||||
<el-select v-model="queryParams.lqzt" filterable placeholder="请选择录取状态">
|
||||
<el-option
|
||||
v-for="item in lqztOptions"
|
||||
:key="item.dictValue"
|
||||
:label="item.dictLable"
|
||||
:value="item.dictValue"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
||||
@ -38,16 +44,6 @@
|
||||
v-hasPermi="['jxjs:jdcx:edit']"
|
||||
>确认</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="danger"
|
||||
icon="el-icon-delete"
|
||||
size="mini"
|
||||
:disabled="multiple"
|
||||
@click="handleDelete"
|
||||
v-hasPermi="['jxjs:jdcx:remove']"
|
||||
>删除</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="info"
|
||||
@ -70,38 +66,22 @@
|
||||
</el-row>
|
||||
|
||||
<el-table v-loading="loading" :data="jdcxList" @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" :formatter="faFormat" />
|
||||
<el-table-column label="教师姓名" align="center" prop="jsid" />
|
||||
<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="faid" :formatter="faFormat" /> -->
|
||||
<el-table-column label="教师姓名" align="center" prop="jsid" :formatter="jsFormat" />
|
||||
<el-table-column label="当前状态" align="center" prop="dqzt" :formatter="dqztFormat" />
|
||||
<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" :formatter="qjshyjFormat" />
|
||||
<el-table-column label="综合得分" align="center" prop="zhdf" />
|
||||
<!-- <el-table-column label="综合得分2" align="center" prop="zhdf2" /> -->
|
||||
|
||||
<!-- <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="lqzt" :formatter="lqztFormat" />
|
||||
<el-table-column label="区级审核意见" align="center" prop="qjshzt" :formatter="qjshztFormat" />
|
||||
<!-- <el-table-column label="区级审核意见" align="center" prop="qjshyj" :formatter="qjshyjFormat" /> -->
|
||||
<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" prop="zhdf" />
|
||||
<el-table-column label="基地排序" align="center" prop="jdpx" />
|
||||
<el-table-column label="模拟课堂教学得分" align="center" prop="msjgmnktjxdf" />
|
||||
<el-table-column label="演讲得分" align="center" prop="yjdf" />
|
||||
<el-table-column label="面试综合得分" align="center" prop="zhdf2" />
|
||||
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
<template slot-scope="scope">
|
||||
@ -111,14 +91,8 @@
|
||||
icon="el-icon-edit"
|
||||
@click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['jxjs:jdcx:edit']"
|
||||
v-show="isShow(scope.row)"
|
||||
>确认</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
v-hasPermi="['jxjs:jdcx:remove']"
|
||||
>删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@ -134,113 +108,16 @@
|
||||
<!-- 添加或修改基地区级审核对话框 -->
|
||||
<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-form-item>
|
||||
<el-form-item label="教师编号" prop="jsid">
|
||||
<el-input v-model="form.jsid" placeholder="请输入教师编号" />
|
||||
</el-form-item>
|
||||
<el-form-item label="当前状态" prop="dqzt">
|
||||
<el-select v-model="form.dqzt" placeholder="请选择当前状态">
|
||||
<el-form-item label="录取状态" prop="lqzt">
|
||||
<el-select v-model="form.lqzt" placeholder="请选择录取状态">
|
||||
<el-option
|
||||
v-for="dict in dqztOptions"
|
||||
v-for="dict in lqztOptions"
|
||||
: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-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="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="qjshzt">
|
||||
<el-select v-model="form.qjshzt" placeholder="请选择区级审核状态">
|
||||
<el-option
|
||||
v-for="dict in qjshztOptions"
|
||||
:key="dict.dictValue"
|
||||
:label="dict.dictLabel"
|
||||
:value="dict.dictValue"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</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="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="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>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||
@ -251,17 +128,12 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {
|
||||
listJdcx,
|
||||
getJdcx,
|
||||
delJdcx,
|
||||
addJdcx,
|
||||
updateJdcx,
|
||||
exportJdcx,
|
||||
} from "@/api/jxjs/jdcx";
|
||||
import { listJdcx, getJdcx, updateJdcx, exportJdcx } from "@/api/jxjs/jdcx";
|
||||
|
||||
import { listJxzxpxfa } from "@/api/jxjs/jxzxpxfa";
|
||||
|
||||
import { listJxjsjbxx, getJxjsjbxx } from "@/api/jxjs/jxjsjbxx";
|
||||
|
||||
export default {
|
||||
name: "Jdcx",
|
||||
data() {
|
||||
@ -286,14 +158,14 @@ export default {
|
||||
open: false,
|
||||
// 当前状态字典
|
||||
dqztOptions: [],
|
||||
// 基地校审核状态字典
|
||||
jdxshztOptions: [],
|
||||
// 区级审核状态字典
|
||||
qjshztOptions: [],
|
||||
// 区级审核意见字典
|
||||
qjshyjOptions: [],
|
||||
// 录取状态字典
|
||||
lqztOptions: [],
|
||||
//方案
|
||||
faOptions: [],
|
||||
//教师
|
||||
jsOptions: [],
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
@ -314,11 +186,12 @@ export default {
|
||||
gbzdf: null,
|
||||
zhdf: null,
|
||||
cjdrcreateTime: null,
|
||||
msqr: null,
|
||||
msqr: "1",
|
||||
msqrcreateTime: null,
|
||||
msjgmnktjxdf: null,
|
||||
yjdf: null,
|
||||
zhdf2: null,
|
||||
lqzt: null,
|
||||
},
|
||||
// 查询参数
|
||||
queryParams_fa: {
|
||||
@ -328,54 +201,35 @@ export default {
|
||||
form: {},
|
||||
// 表单校验
|
||||
rules: {
|
||||
faid: [
|
||||
{ required: true, message: "方案编号不能为空", trigger: "blur" },
|
||||
],
|
||||
jsid: [
|
||||
{ required: true, message: "教师编号不能为空", trigger: "blur" },
|
||||
],
|
||||
dqzt: [
|
||||
{ required: true, message: "当前状态不能为空", trigger: "blur" },
|
||||
],
|
||||
jdxshzt: [
|
||||
{
|
||||
required: true,
|
||||
message: "基地校审核状态不能为空",
|
||||
trigger: "blur",
|
||||
},
|
||||
],
|
||||
qjshzt: [
|
||||
{ required: true, message: "区级审核状态不能为空", trigger: "blur" },
|
||||
],
|
||||
qjshyj: [
|
||||
{ required: true, message: "区级审核意见不能为空", trigger: "blur" },
|
||||
],
|
||||
zhdf: [
|
||||
{ required: true, message: "综合得分不能为空", trigger: "blur" },
|
||||
],
|
||||
zhdf2: [
|
||||
{ required: true, message: "综合得分2不能为空", trigger: "blur" },
|
||||
lqzt: [
|
||||
{ required: true, message: "录取状态不能为空", trigger: "blur" },
|
||||
],
|
||||
},
|
||||
};
|
||||
},
|
||||
created() {
|
||||
this.getFaList();
|
||||
this.getJsList();
|
||||
this.getList();
|
||||
this.getDicts("sys_dm_shzt").then((response) => {
|
||||
this.dqztOptions = response.data;
|
||||
});
|
||||
this.getDicts("sys_dm_shzt").then((response) => {
|
||||
this.jdxshztOptions = response.data;
|
||||
});
|
||||
this.getDicts("sys_dm_shzt").then((response) => {
|
||||
this.getDicts("sys_dm_shyj").then((response) => {
|
||||
this.qjshztOptions = response.data;
|
||||
});
|
||||
this.getDicts("sys_dm_shyj").then((response) => {
|
||||
this.qjshyjOptions = response.data;
|
||||
this.getDicts("sys_dm_lqzt").then((response) => {
|
||||
this.lqztOptions = response.data;
|
||||
});
|
||||
},
|
||||
methods: {
|
||||
isShow(row) {
|
||||
console.log(row.dqzt);
|
||||
if (row.dqzt == "9") {
|
||||
return false;
|
||||
} else {
|
||||
return true;
|
||||
}
|
||||
},
|
||||
// 字典翻译
|
||||
faFormat(row, column) {
|
||||
// return this.selectDictLabel(this.classOptions, row.classid);
|
||||
@ -390,12 +244,30 @@ export default {
|
||||
});
|
||||
return actions.join("");
|
||||
},
|
||||
// 字典翻译
|
||||
jsFormat(row, column) {
|
||||
// return this.selectDictLabel(this.classOptions, row.classid);
|
||||
var actions = [];
|
||||
var datas = this.jsOptions;
|
||||
Object.keys(datas).map((key) => {
|
||||
if (datas[key].id == "" + row.jsid) {
|
||||
actions.push(datas[key].name);
|
||||
return false;
|
||||
}
|
||||
});
|
||||
return actions.join("");
|
||||
},
|
||||
getFaList() {
|
||||
this.queryParams_fa.fazt = "1";
|
||||
listJxzxpxfa(this.queryParams_fa).then((response) => {
|
||||
this.faOptions = response.rows;
|
||||
});
|
||||
},
|
||||
getJsList() {
|
||||
listJxjsjbxx(null).then((response) => {
|
||||
this.jsOptions = response.rows;
|
||||
});
|
||||
},
|
||||
/** 查询基地区级审核列表 */
|
||||
getList() {
|
||||
this.loading = true;
|
||||
@ -405,22 +277,18 @@ export default {
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
// 录取状态字典翻译
|
||||
lqztFormat(row, column) {
|
||||
return this.selectDictLabel(this.lqztOptions, row.lqzt);
|
||||
},
|
||||
// 当前状态字典翻译
|
||||
dqztFormat(row, column) {
|
||||
return this.selectDictLabel(this.dqztOptions, row.dqzt);
|
||||
},
|
||||
// 基地校审核状态字典翻译
|
||||
jdxshztFormat(row, column) {
|
||||
return this.selectDictLabel(this.jdxshztOptions, row.jdxshzt);
|
||||
},
|
||||
// 区级审核状态字典翻译
|
||||
qjshztFormat(row, column) {
|
||||
return this.selectDictLabel(this.qjshztOptions, row.qjshzt);
|
||||
},
|
||||
// 区级审核意见字典翻译
|
||||
qjshyjFormat(row, column) {
|
||||
return this.selectDictLabel(this.qjshyjOptions, row.qjshyj);
|
||||
},
|
||||
// 取消按钮
|
||||
cancel() {
|
||||
this.open = false;
|
||||
@ -452,6 +320,7 @@ export default {
|
||||
msjgmnktjxdf: null,
|
||||
yjdf: null,
|
||||
zhdf2: null,
|
||||
lqzt: null,
|
||||
};
|
||||
this.resetForm("form");
|
||||
},
|
||||
@ -471,12 +340,6 @@ export default {
|
||||
this.single = selection.length !== 1;
|
||||
this.multiple = !selection.length;
|
||||
},
|
||||
/** 新增按钮操作 */
|
||||
handleAdd() {
|
||||
this.reset();
|
||||
this.open = true;
|
||||
this.title = "添加基地区级审核";
|
||||
},
|
||||
/** 修改按钮操作 */
|
||||
handleUpdate(row) {
|
||||
this.reset();
|
||||
@ -484,25 +347,18 @@ export default {
|
||||
getJdcx(id).then((response) => {
|
||||
this.form = response.data;
|
||||
this.open = true;
|
||||
this.title = "修改基地区级审核";
|
||||
this.title = "面试结果审核";
|
||||
});
|
||||
},
|
||||
/** 提交按钮 */
|
||||
submitForm() {
|
||||
this.$refs["form"].validate((valid) => {
|
||||
if (valid) {
|
||||
this.form.dqzt = "9";
|
||||
if (this.form.id != null) {
|
||||
updateJdcx(this.form).then((response) => {
|
||||
if (response.code === 200) {
|
||||
this.msgSuccess("修改成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
}
|
||||
});
|
||||
} else {
|
||||
addJdcx(this.form).then((response) => {
|
||||
if (response.code === 200) {
|
||||
this.msgSuccess("新增成功");
|
||||
this.msgSuccess("录取成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
}
|
||||
@ -511,27 +367,6 @@ export default {
|
||||
}
|
||||
});
|
||||
},
|
||||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
const ids = row.id || this.ids;
|
||||
this.$confirm(
|
||||
'是否确认删除基地区级审核编号为"' + ids + '"的数据项?',
|
||||
"警告",
|
||||
{
|
||||
confirmButtonText: "确定",
|
||||
cancelButtonText: "取消",
|
||||
type: "warning",
|
||||
}
|
||||
)
|
||||
.then(function () {
|
||||
return delJdcx(ids);
|
||||
})
|
||||
.then(() => {
|
||||
this.getList();
|
||||
this.msgSuccess("删除成功");
|
||||
})
|
||||
.catch(function () {});
|
||||
},
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
const queryParams = this.queryParams;
|
||||
|
Reference in New Issue
Block a user