|
@@ -1,7 +1,7 @@
|
|
<template>
|
|
<template>
|
|
<div class="record-warp">
|
|
<div class="record-warp">
|
|
<div class="record-main">
|
|
<div class="record-main">
|
|
- <el-row>
|
|
|
|
|
|
+ <el-row >
|
|
<el-col :span="24">
|
|
<el-col :span="24">
|
|
<div class="search-head">
|
|
<div class="search-head">
|
|
<el-input v-model="name" clearable placeholder="请输入姓名"></el-input
|
|
<el-input v-model="name" clearable placeholder="请输入姓名"></el-input
|
|
@@ -61,14 +61,9 @@
|
|
</div>
|
|
</div>
|
|
</el-col>
|
|
</el-col>
|
|
</el-row>
|
|
</el-row>
|
|
- <el-row class="add_user_class">
|
|
|
|
- <el-col :span="24">
|
|
|
|
- <div class="search-head"></div>
|
|
|
|
- </el-col>
|
|
|
|
- </el-row>
|
|
|
|
-
|
|
|
|
<div class="table-content">
|
|
<div class="table-content">
|
|
<el-table
|
|
<el-table
|
|
|
|
+ height="100%"
|
|
:data="tableData"
|
|
:data="tableData"
|
|
:row-style="{ height: '0px' }"
|
|
:row-style="{ height: '0px' }"
|
|
:cell-style="{ padding: '5px' }"
|
|
:cell-style="{ padding: '5px' }"
|
|
@@ -437,14 +432,17 @@ export default {
|
|
},
|
|
},
|
|
//根据现有情况进行搜索
|
|
//根据现有情况进行搜索
|
|
searchList() {
|
|
searchList() {
|
|
|
|
+ console.log(this.userInfo)
|
|
let url = `/user/findUserListByPage?pageSize=${this.pageSize}&pageNum=${
|
|
let url = `/user/findUserListByPage?pageSize=${this.pageSize}&pageNum=${
|
|
this.pageNum
|
|
this.pageNum
|
|
- }${this.sex == "" ? "" : `&gender=${this.sex}`}${
|
|
|
|
|
|
+ }&roleType=1${this.sex == "" ? "" : `&gender=${this.sex}`}${
|
|
this.group.length == 0 ? `&orgNo=${this.userInfo.orgNo}` : `&orgNo=${this.group[this.group.length - 1]}`
|
|
this.group.length == 0 ? `&orgNo=${this.userInfo.orgNo}` : `&orgNo=${this.group[this.group.length - 1]}`
|
|
}${this.name == "" ? "" : `&userName=${this.name}`}${
|
|
}${this.name == "" ? "" : `&userName=${this.name}`}${
|
|
this.studentNumber == "" ? "" : `&userNo=${this.studentNumber}`
|
|
this.studentNumber == "" ? "" : `&userNo=${this.studentNumber}`
|
|
}`;
|
|
}`;
|
|
|
|
+ debugger;
|
|
this.$http.get(url, {}, (res) => {
|
|
this.$http.get(url, {}, (res) => {
|
|
|
|
+ debugger;
|
|
console.log(res);
|
|
console.log(res);
|
|
if (res && res.code == 200) {
|
|
if (res && res.code == 200) {
|
|
this.tableData = res.data.content;
|
|
this.tableData = res.data.content;
|
|
@@ -507,6 +505,8 @@ export default {
|
|
height: 100%;
|
|
height: 100%;
|
|
box-sizing: border-box;
|
|
box-sizing: border-box;
|
|
overflow-y: auto;
|
|
overflow-y: auto;
|
|
|
|
+ display: flex;
|
|
|
|
+ flex-direction: column;
|
|
|
|
|
|
.search-head {
|
|
.search-head {
|
|
width: 100%;
|
|
width: 100%;
|
|
@@ -522,7 +522,10 @@ export default {
|
|
}
|
|
}
|
|
|
|
|
|
.table-content {
|
|
.table-content {
|
|
|
|
+ display: flex;
|
|
|
|
+ flex: 1;
|
|
margin: 10px 0;
|
|
margin: 10px 0;
|
|
|
|
+ overflow: auto;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|