From 94ebc746fb6240e76d9b8971e9ddc73fc879acce Mon Sep 17 00:00:00 2001
From: sk1551 <15175617877@163.com>
Date: Mon, 24 Aug 2020 11:28:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9F=BA=E5=9C=B0=E5=8C=BA?=
=?UTF-8?q?=E7=BA=A7=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-ui/src/views/jxjs/jdcx/index.vue | 32 +++++++++++++++-----------
1 file changed, 19 insertions(+), 13 deletions(-)
diff --git a/ruoyi-ui/src/views/jxjs/jdcx/index.vue b/ruoyi-ui/src/views/jxjs/jdcx/index.vue
index 7b29565fb..0fc4bb327 100644
--- a/ruoyi-ui/src/views/jxjs/jdcx/index.vue
+++ b/ruoyi-ui/src/views/jxjs/jdcx/index.vue
@@ -7,24 +7,21 @@
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 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-form-item>
+ <el-form-item label="基地校" prop="jdxid">
+ <el-select v-model="queryParams.jdxid" filterable placeholder="请选择基地校">
+ <el-option v-for="item in jdxOptions" :key="item.id" :label="item.jdxmc" :value="item.id"></el-option>
</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>
<el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -59,7 +56,7 @@
<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="jsid" :formatter="jsFormat" />
- <el-table-column label="基地校名称" align="center" prop="jdxid" :formatter="jdxmcFormat" />
+ <el-table-column label="基地校名称" align="center" prop="jdxmc" />
<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" />
@@ -249,6 +246,7 @@ import {
import { listJxzxpxfa } from "@/api/jxjs/jxzxpxfa";
import { listJxjsjbxx, getJxjsjbxx } from "@/api/jxjs/jxjsjbxx";
+import { listJdx } from "@/api/jxjs/jdx";
export default {
name: "Jdcx",
@@ -277,6 +275,8 @@ export default {
dqztOptions: [],
// 基地校审核意见字典
jdxshztOptions: [],
+ //基地校
+ jdxOptions: [],
// 区级审核状态字典
qjshztOptions: [],
// 区级审核意见字典
@@ -352,6 +352,7 @@ export default {
},
created() {
this.getFaList();
+ this.getJdxList();
this.getList();
this.getJsList();
this.getDicts("sys_dm_shzt").then((response) => {
@@ -368,6 +369,11 @@ export default {
// });
},
methods: {
+ getJdxList() {
+ listJdx(null).then((response) => {
+ this.jdxOptions = response.rows;
+ });
+ },
// 字典翻译
faFormat(row, column) {
// return this.selectDictLabel(this.classOptions, row.classid);