Merge branch '02/23reviewBUG' into jenkins

dist/static/css/chunk-2ec75aa6.ccbb5849.css

@@ -1 +0,0 @@
-.micon[data-v-315d8dae]{position:absolute;top:3px;right:2px}.serverInfo[data-v-315d8dae]{line-height:30px}.serverInfo span[data-v-315d8dae]{color:red;font-weight:700}.infoWrap[data-v-315d8dae]{margin-top:30px}.infoWrap span[data-v-315d8dae]{color:red;font-weight:400}.titleWrap[data-v-315d8dae]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.m-container h2[data-v-315d8dae]{-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}

dist/static/css/chunk-42bf704a.ef26cb67.css

@@ -0,0 +1 @@
+.dialog-footer[data-v-07e9e40c]{display:block;text-align:right;margin-top:20px}.title[data-v-fe3a3f3e]{margin-bottom:30px;font-size:16px;color:#000}.dialog-footer[data-v-4d102b4c]{display:block;text-align:right;margin-top:20px}.newBand[data-v-72255ea4]{display:inline-block;margin-right:10px}.right-code .title[data-v-72255ea4]{font-size:18px;text-align:center;padding-bottom:8px}[data-v-72255ea4] .studentInfo .multiple.el-select{width:185px!important}.red[data-v-72255ea4]{color:red}.demo-table-expand label[data-v-72255ea4]{width:150px;color:#99a9bf}.demo-table-expand .el-form-item[data-v-72255ea4]{margin-right:0;margin-bottom:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;padding-right:10px;position:relative}.demo-table-expand .el-form-item__label[data-v-72255ea4]{z-index:100}[data-v-72255ea4] .el-table__expanded-cell[class*=cell]{padding:20px 0 20px 110px}.schoolWrap[data-v-72255ea4]{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}

dist/static/css/chunk-4ae1f8e9.975b9fc7.css

@@ -0,0 +1 @@
+.micon[data-v-d25bf722]{position:absolute;top:3px;right:2px}.serverInfo[data-v-d25bf722]{line-height:30px}.serverInfo span[data-v-d25bf722]{color:red;font-weight:700}.infoWrap[data-v-d25bf722]{margin-top:30px}.infoWrap span[data-v-d25bf722]{color:red;font-weight:400}.titleWrap[data-v-d25bf722]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.m-container h2[data-v-d25bf722]{-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}

dist/static/css/chunk-fbc2b746.1a748545.css

@@ -1 +0,0 @@
-.dialog-footer[data-v-07e9e40c]{display:block;text-align:right;margin-top:20px}.title[data-v-fe3a3f3e]{margin-bottom:30px;font-size:16px;color:#000}.dialog-footer[data-v-4d102b4c]{display:block;text-align:right;margin-top:20px}.newBand[data-v-245cded0]{display:inline-block;margin-right:10px}.right-code .title[data-v-245cded0]{font-size:18px;text-align:center;padding-bottom:8px}[data-v-245cded0] .studentInfo .multiple.el-select{width:185px!important}.red[data-v-245cded0]{color:red}.demo-table-expand label[data-v-245cded0]{width:150px;color:#99a9bf}.demo-table-expand .el-form-item[data-v-245cded0]{margin-right:0;margin-bottom:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;padding-right:10px;position:relative}.demo-table-expand .el-form-item__label[data-v-245cded0]{z-index:100}[data-v-245cded0] .el-table__expanded-cell[class*=cell]{padding:20px 0 20px 110px}.schoolWrap[data-v-245cded0]{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}

src/views/studentManager/studentList.vue

@@ -205,7 +205,6 @@
               <el-form
                 label-position="left"
                 class="demo-table-expand"
-                :inline="true"
               >
                 <el-row>
                   <el-col :span="6">
@@ -261,22 +260,26 @@
                 <el-row>
                   <el-col :span="6">
                     <el-form-item label="VIP老师" v-if="tenantId == 1">
-                      <span>{{ props.row.vipTeacherName ? props.row.vipTeacherName  : "--" }}</span>
+                      <Tooltip :content='props.row.vipTeacherName ? props.row.vipTeacherName  : "--" ' />
+
                     </el-form-item></el-col
                   >
                   <el-col :span="4">
                     <el-form-item label="网管课老师">
-                      <span>{{ props.row.practiceTeacherName ? props.row.practiceTeacherName  : "--"  }}</span>
+                      <Tooltip :content='props.row.practiceTeacherName ? props.row.practiceTeacherName  : "--"' />
+
                     </el-form-item></el-col
                   >
                   <el-col :span="4">
                     <el-form-item label="声部课老师">
-                      <span>{{ props.row.normalTeacherName ? props.row.normalTeacherName  : "--"  }}</span>
+                      <Tooltip :content='props.row.normalTeacherName ? props.row.normalTeacherName  : "--"' />
+
                     </el-form-item></el-col
                   >
                   <el-col :span="4">
                     <el-form-item label="合奏课老师">
-                      <span>{{ props.row.mixTeacherName ? props.row.mixTeacherName  : "--"  }}</span>
+                      <Tooltip :content='props.row.mixTeacherName ? props.row.mixTeacherName  : "--"' />
+
                     </el-form-item></el-col
                   >
                   <el-col :span="4">
@@ -1026,9 +1029,10 @@ import { getToken, getTenantId } from "@/utils/auth";
 import load from "@/utils/loading";
 import createMember from "./modals/createMember";
 import studentExt from "./modals/studentExt";
+import Tooltip from '@/components/Tooltip'
 export default {
   name: "studentManagerList",
-  components: { pagination, qrCode, createMember, protocolModel, studentExt },
+  components: { pagination, qrCode, createMember, protocolModel, studentExt,Tooltip },
   data() {
     return {
       extVisible: false,
@@ -1050,6 +1054,7 @@ export default {
         isNewUser: null,
         hasTeacher: null,
         isRecord: null,
+        hasMember:null
       },
       memberVisible: false,
       multipleSelection: [],
@@ -1236,6 +1241,7 @@ export default {
         isNewUser: searchForm.isNewUser + "" ? searchForm.isNewUser : null,
         hasTeacher: searchForm.hasTeacher + "" ? searchForm.hasTeacher : null,
         isRecord: searchForm.isRecord + "" ? searchForm.isRecord : null,
+        hasMember:searchForm.hasMember+""?searchForm.hasMember:null
       };
       const options = {
         method: "POST",