|
|
@@ -2267,7 +2267,7 @@
|
|
|
<div class="people_top_right">
|
|
|
<div class="people_search">
|
|
|
<el-input
|
|
|
- placeholder="搜索成员"
|
|
|
+ placeholder="搜索成员名称"
|
|
|
v-model="searchPeople"
|
|
|
></el-input>
|
|
|
<div class="search_img" @click="searchStudent">
|
|
|
@@ -2306,13 +2306,13 @@
|
|
|
:before-close="handleClose"
|
|
|
class="addNewPP"
|
|
|
>
|
|
|
- <div class="people" style="height: 300px">
|
|
|
+ <div class="people all_choose2" style="height: 300px">
|
|
|
<div class="people_top">
|
|
|
<div class="people_nav">选择班级</div>
|
|
|
</div>
|
|
|
<el-checkbox-group
|
|
|
v-model="checkboxList2"
|
|
|
- class="people_name all_choose2"
|
|
|
+ class="people_name"
|
|
|
>
|
|
|
<div v-for="(item, index) in grade" :key="item.id">
|
|
|
<el-checkbox :label="item.id">
|
|
|
@@ -2342,13 +2342,12 @@
|
|
|
:before-close="handleClose"
|
|
|
class="addNewPP customWidth"
|
|
|
>
|
|
|
- <div class="people">
|
|
|
+ <div class="people all_choose2">
|
|
|
<div class="people_top">
|
|
|
- <div class="people_nav">选择成员</div>
|
|
|
<div class="people_top_right">
|
|
|
<div class="people_search">
|
|
|
<el-input
|
|
|
- placeholder="搜索成员"
|
|
|
+ placeholder="搜索成员名称"
|
|
|
v-model="searchTN"
|
|
|
@keyup.enter.native="getTeacher"
|
|
|
></el-input>
|
|
|
@@ -2357,10 +2356,11 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
+ <div class="people_nav">选择成员</div>
|
|
|
</div>
|
|
|
<el-checkbox-group
|
|
|
v-model="checkboxList3"
|
|
|
- class="people_name all_choose2"
|
|
|
+ class="people_name "
|
|
|
v-if="teacherJuri.length"
|
|
|
>
|
|
|
<el-checkbox
|
|
|
@@ -2368,7 +2368,17 @@
|
|
|
:key="item.userid"
|
|
|
:label="item.userid"
|
|
|
>
|
|
|
- {{ (item.name ? item.name : "暂无姓名") + " " + item.username }}
|
|
|
+ <div class="t_j_box">
|
|
|
+ <el-tooltip placement="top" :content="item.name ? item.name : '暂无姓名'">
|
|
|
+ <span>{{ item.name ? item.name : "暂无姓名" }}</span>
|
|
|
+ </el-tooltip>
|
|
|
+ <el-tooltip placement="top" :content="item.username">
|
|
|
+ <span>{{ item.username }}</span>
|
|
|
+ </el-tooltip>
|
|
|
+ <el-tooltip placement="top" :content="item.school">
|
|
|
+ <span>{{ item.school }}</span>
|
|
|
+ </el-tooltip>
|
|
|
+ </div>
|
|
|
</el-checkbox>
|
|
|
</el-checkbox-group>
|
|
|
<div style="text-align: center; margin-top: 10px" v-else>暂无数据</div>
|
|
|
@@ -4341,12 +4351,18 @@ export default {
|
|
|
},
|
|
|
getTeacher() {
|
|
|
let params = {
|
|
|
- oid: this.oid,
|
|
|
+ oid: this.org && this.org != "undefined" ? this.org : this.oid,
|
|
|
cu: "",
|
|
|
cn: this.searchTN,
|
|
|
};
|
|
|
this.ajax
|
|
|
- .get(this.$store.state.api + "selectTeacherAdd", params)
|
|
|
+ .get(
|
|
|
+ this.$store.state.api +
|
|
|
+ (this.org && this.org != "undefined"
|
|
|
+ ? "selectTeacherAddOrg"
|
|
|
+ : "selectTeacherAdd"),
|
|
|
+ params
|
|
|
+ )
|
|
|
.then((res) => {
|
|
|
let teacherJuri = res.data[0];
|
|
|
for (var i = 0; i < teacherJuri.length; i++) {
|
|
|
@@ -6620,13 +6636,21 @@ export default {
|
|
|
.people_top {
|
|
|
display: flex;
|
|
|
width: 100%;
|
|
|
- justify-content: space-between;
|
|
|
- align-items: center;
|
|
|
+ /* justify-content: space-between; */
|
|
|
+ /* align-items: center; */
|
|
|
+ flex-direction: column;
|
|
|
+ padding: 10px 25px 0;
|
|
|
+ box-sizing: border-box;
|
|
|
}
|
|
|
|
|
|
.people_nav,
|
|
|
.people_top_right {
|
|
|
- padding: 20px 0 0 20px;
|
|
|
+ /* padding: 20px 0 0 20px; */
|
|
|
+}
|
|
|
+
|
|
|
+.people_top_right {
|
|
|
+ height: 40px;
|
|
|
+ margin-bottom: 10px;
|
|
|
}
|
|
|
|
|
|
.people_search {
|
|
|
@@ -6635,7 +6659,7 @@ export default {
|
|
|
}
|
|
|
|
|
|
.people_search >>> .el-input__inner {
|
|
|
- height: 25px;
|
|
|
+ /* height: 25px; */
|
|
|
width: 95%;
|
|
|
}
|
|
|
|
|
|
@@ -6643,8 +6667,9 @@ export default {
|
|
|
width: 20px;
|
|
|
height: 20px;
|
|
|
position: absolute;
|
|
|
- right: 15px;
|
|
|
- top: 3px;
|
|
|
+ right: 30px;
|
|
|
+ top: 50%;
|
|
|
+ transform: translateY(-50%);
|
|
|
}
|
|
|
|
|
|
.search_img > img {
|
|
|
@@ -8322,4 +8347,26 @@ ol {
|
|
|
top: 0;
|
|
|
position: absolute;
|
|
|
}
|
|
|
+
|
|
|
+.t_j_box {
|
|
|
+ display: flex;
|
|
|
+}
|
|
|
+.t_j_box span:nth-child(1) {
|
|
|
+ width: 15%;
|
|
|
+ overflow: hidden;
|
|
|
+ margin-right: 10px;
|
|
|
+ text-overflow: ellipsis;
|
|
|
+ white-space: nowrap;
|
|
|
+}
|
|
|
+.t_j_box span:nth-child(2) {
|
|
|
+ width: 30%;
|
|
|
+ overflow: hidden;
|
|
|
+ text-overflow: ellipsis;
|
|
|
+ margin-right: 10px;
|
|
|
+}
|
|
|
+.t_j_box span:nth-child(3) {
|
|
|
+ width: calc(55% - 20px);
|
|
|
+ overflow: hidden;
|
|
|
+ text-overflow: ellipsis;
|
|
|
+}
|
|
|
</style>
|
