浏览代码

修改老师基本显示报错位置更换

lex-xin 4 年之前
父节点
当前提交
d4d15122ed
共有 2 个文件被更改,包括 26 次插入24 次删除
  1. 21 21
      src/views/stuRecodeManager/index.vue
  2. 5 3
      src/views/teacherManager/teacherDetail/components/teacherInfo.vue

+ 21 - 21
src/views/stuRecodeManager/index.vue

@@ -202,41 +202,50 @@
             </template>
           </el-table-column> -->
           <el-table-column
-          width="180px"
             align="center"
             prop="startClassTime"
-            label="上课时间"
+            label="课程组类型"
           >
             <template slot-scope="scope">
               <div>
-                   {{ scope.row.courseSchedule.classDate | dayjsFormat }}
-                {{
-                  scope.row.courseSchedule.startClassTime | dayjsFormatMinute
-                }}-{{
-                  scope.row.courseSchedule.endClassTime | dayjsFormatMinute
-                }}
+                {{ scope.row.groupType | coursesType }}
               </div>
             </template>
           </el-table-column>
           <el-table-column
             align="center"
             prop="startClassTime"
-            label="课程类型"
+            label="课程类型"
           >
             <template slot-scope="scope">
               <div>
-                {{ scope.row.groupType | coursesType }}
+                {{ scope.row.courseSchedule.type | coursesType }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="合并类型">
+            <template slot-scope="scope">
+              <div>
+                <!-- {{ scope.row.courseSchedule.newCourseId > 0 ? "是" : "否" }} -->
+                {{ scope.row.courseSchedule.newCourseId > 0 && scope.row.courseSchedule.newCourseId == scope.row.courseScheduleId ? '合并课' : null }}
+                {{ scope.row.courseSchedule.newCourseId > 0 && scope.row.courseSchedule.newCourseId != scope.row.courseScheduleId ? '被合并课' : null }}
               </div>
             </template>
           </el-table-column>
           <el-table-column
+          width="180px"
             align="center"
             prop="startClassTime"
-            label="课程类型"
+            label="上课时间"
           >
             <template slot-scope="scope">
               <div>
-                {{ scope.row.courseSchedule.type | coursesType }}
+                   {{ scope.row.courseSchedule.classDate | dayjsFormat }}
+                {{
+                  scope.row.courseSchedule.startClassTime | dayjsFormatMinute
+                }}-{{
+                  scope.row.courseSchedule.endClassTime | dayjsFormatMinute
+                }}
               </div>
             </template>
           </el-table-column>
@@ -247,15 +256,6 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="合并类型">
-            <template slot-scope="scope">
-              <div>
-                <!-- {{ scope.row.courseSchedule.newCourseId > 0 ? "是" : "否" }} -->
-                {{ scope.row.courseSchedule.newCourseId > 0 && scope.row.courseSchedule.newCourseId == scope.row.courseScheduleId ? '合并课' : null }}
-                {{ scope.row.courseSchedule.newCourseId > 0 && scope.row.courseSchedule.newCourseId != scope.row.courseScheduleId ? '被合并课' : null }}
-              </div>
-            </template>
-          </el-table-column>
           <el-table-column
             align="center"
             prop="startClassTime"

+ 5 - 3
src/views/teacherManager/teacherDetail/components/teacherInfo.vue

@@ -228,9 +228,11 @@ export default {
         let tempData = this.teacherInfo
           tempData.subjectName = this.joinArray(tempData.subjectName)
           let sn = []
-          tempData.teacherSchools.forEach(item => {
-            sn.push(item.name)
-          })
+          if(tempData.teacherSchools && tempData.teacherSchools.length > 0) {
+            tempData.teacherSchools.forEach(item => {
+              sn.push(item.name)
+            })
+          }
           tempData.teacherSchools = this.joinArray(sn, ',') // 教学点
           tempData.entryDate = this.formatTimer(tempData.entryDate)
           tempData.jobNature = this.jobNature(tempData.jobNature)