Browse Source

添加各科老师

1
mo 2 years ago
parent
commit
4a55cfc2db
2 changed files with 33 additions and 14 deletions
  1. 2 2
      src/store/modules/selects.js
  2. 31 12
      src/views/studentManager/studentList.vue

+ 2 - 2
src/store/modules/selects.js

@@ -128,8 +128,8 @@ export default {
     async setTeachers({ commit, state }, force) {
       if (!loadings.commit_teachers) {
         loadings.commit_teachers = getTeacher({
-          demissionFlag: force.demissionFlag,
-          isForzenWithQueryCondition: force.isForzenWithQueryCondition
+          demissionFlag: force?.demissionFlag,
+          isForzenWithQueryCondition: force?.isForzenWithQueryCondition
         });
         try {
           const res = await loadings.commit_teachers;

+ 31 - 12
src/views/studentManager/studentList.vue

@@ -79,7 +79,7 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item prop="hasTeacher">
+        <!-- <el-form-item prop="hasTeacher">
           <el-select
             class="multiple"
             v-model.trim="searchForm.hasTeacher"
@@ -89,7 +89,7 @@
             <el-option label="是" value="1"></el-option>
             <el-option label="否" value="0"></el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item prop="operatingTag" v-if="tenantId == 1">
           <el-select
             class="multiple"
@@ -259,17 +259,35 @@
                   >
                 </el-row>
                 <el-row>
-                  <!-- <el-col :span="6">
-                    <el-form-item label="指导老师">
-                      <span>{{ props.row.teacherName }}</span>
-                    </el-form-item></el-col
-                  > -->
                   <el-col :span="6">
+                    <el-form-item label="VIP老师" v-if="tenantId == 1">
+                      <span>{{ props.row.vipTeacherName ? props.row.vipTeacherName  : "--" }}</span>
+                    </el-form-item></el-col
+                  >
+                  <el-col :span="4">
+                    <el-form-item label="网管课老师">
+                      <span>{{ props.row.practiceTeacherName ? props.row.practiceTeacherName  : "--"  }}</span>
+                    </el-form-item></el-col
+                  >
+                  <el-col :span="4">
+                    <el-form-item label="声部课老师">
+                      <span>{{ props.row.normalTeacherName ? props.row.normalTeacherName  : "--"  }}</span>
+                    </el-form-item></el-col
+                  >
+                  <el-col :span="4">
+                    <el-form-item label="合奏课老师">
+                      <span>{{ props.row.mixTeacherName ? props.row.mixTeacherName  : "--"  }}</span>
+                    </el-form-item></el-col
+                  >
+                  <el-col :span="4">
                     <el-form-item label="是否运营" v-if="tenantId == 1">
                       <span>{{ props.row.operatingTag ? "是" : "否" }}</span>
                     </el-form-item></el-col
                   >
-                  <el-col :span="4">
+                </el-row>
+                <el-row>
+
+                  <el-col :span="6">
                     <el-form-item label="账户余额(元)">
                       <span>{{ props.row.balance | moneyFormat }}</span>
                     </el-form-item></el-col
@@ -286,19 +304,20 @@
                       }}</span>
                     </el-form-item></el-col
                   >
-                </el-row>
-                <el-row>
-                  <el-col :span="6">
+                  <el-col :span="4">
                     <el-form-item label="学员年级">
                       <span>{{ props.row.currentGrade }}</span>
                     </el-form-item></el-col
                   >
-                  <el-col :span="6">
+                  <el-col :span="4">
                     <el-form-item label="学员班级">
                       <span>{{ props.row.currentClass }}</span>
                     </el-form-item></el-col
                   >
                 </el-row>
+                <!-- <el-row>
+
+                </el-row> -->
               </el-form>
             </template>
           </el-table-column>