调整记录修改

src/views/teamDetail/componentCourse/infoMsg.vue

@@ -64,10 +64,12 @@ export default {
   },
   methods: {
     filterKeys(item) {
+      const teachingTeacherNames = (item.teachingTeacherNames || '').split(',').sort((a, b) => (a || '').localeCompare((b || ''), 'zh'))
+      console.log(teachingTeacherNames.join(','), item.teachingTeacherNames)
       return {
         name: item.name,
         actualTeacherName: item.actualTeacherName,
-        teacherName: item.teacherName,
+        teachingTeacherNames: teachingTeacherNames.join(','),
         startClassTime: item.startClassTime,
         classDate: item.classDate,
         endClassTime: item.endClassTime,

src/views/teamDetail/componentCourse/infoMsgContent.vue

@@ -6,15 +6,21 @@
           <el-form-item label="主教老师">
             <!-- <div>{{item.actualTeacherName}}</div> -->
             <div v-if="diff.hasOwnProperty('actualTeacherName')">
-              <el-tag type="danger"><s>{{before.actualTeacherName}}</s></el-tag>
-              <el-tag type="success">{{after.actualTeacherName}}</el-tag>
+              <el-tag type="danger" v-if="before.actualTeacherName"><s>{{before.actualTeacherName}}</s></el-tag>
+              <el-tag type="success" v-if="after.actualTeacherName">{{after.actualTeacherName}}</el-tag>
             </div>
             <div v-else>{{after.actualTeacherName}}</div>
           </el-form-item>
         </el-col>
+        <el-form-item :span="12" label="助教老师">
+          <div v-if="diff.hasOwnProperty('teachingTeacherNames')">
+            <el-tag type="danger" v-if="before.teachingTeacherNames"><s>{{before.teachingTeacherNames}}</s></el-tag>
+            <el-tag type="success" v-if="after.teachingTeacherNames">{{after.teachingTeacherNames}}</el-tag>
+          </div>
+          <div v-else>{{after.teachingTeacherNames}}</div>
+        </el-form-item>
         <el-col :span="12">
           <el-form-item label="上课时间">
-            <!-- <div>{{ item.startClassTime ? item.startClassTime.substr(0, 16) : '' }}-{{ item.endClassTime ? item.endClassTime.substr(11,5) : ''}}</div> -->
             <div v-if="diff.hasOwnProperty('startClassTime')">
               <el-tag type="danger"><s>{{ before.startClassTime ? before.startClassTime.substr(0, 16) : '' }}-{{ before.endClassTime ? before.endClassTime.substr(11,5) : ''}}</s></el-tag>
               <el-tag type="success">{{ after.startClassTime ? after.startClassTime.substr(0, 16) : '' }}-{{ after.endClassTime ? after.endClassTime.substr(11,5) : ''}}</el-tag>
@@ -24,10 +30,9 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="课程时长">
-            <!-- <div>{{getTimers(item)}}分钟</div> -->
             <div v-if="diff.hasOwnProperty('timers')">
-              <el-tag type="danger"><s>{{before.timers}} 分钟</s></el-tag>
-              <el-tag type="success">{{after.timers}} 分钟</el-tag>
+              <el-tag type="danger" v-if="before.timers"><s>{{before.timers}} 分钟</s></el-tag>
+              <el-tag type="success" v-if="after.timers">{{after.timers}} 分钟</el-tag>
             </div>
             <div v-else>{{after.timers}} 分钟</div>
           </el-form-item>
@@ -36,17 +41,17 @@
           <el-form-item label="课程类型">
             <!-- <div>{{item.teachMode| teachMode}}</div> -->
             <div v-if="diff.hasOwnProperty('teachMode')">
-              <el-tag type="danger"><s>{{before.teachMode | teachMode}}</s></el-tag>
-              <el-tag type="success">{{after.teachMode | teachMode}}</el-tag>
+              <el-tag type="danger" v-if="before.teachMode"><s>{{before.teachMode | teachMode}}</s></el-tag>
+              <el-tag type="success" v-if="after.teachMode">{{after.teachMode | teachMode}}</el-tag>
             </div>
             <div v-else>{{after.teachMode | teachMode}}</div>
           </el-form-item>
         </el-col>
-        <el-col :span="24">
+        <el-col :span="12">
           <el-form-item label="教学地点">
             <div v-if="diff.hasOwnProperty('schoolName')">
-              <el-tag type="danger"><s>{{before.schoolName}}</s></el-tag>
-              <el-tag type="success">{{after.schoolName}}</el-tag>
+              <el-tag type="danger" v-if="before.schoolName"><s>{{before.schoolName}}</s></el-tag>
+              <el-tag type="success" v-if="after.schoolName">{{after.schoolName}}</el-tag>
             </div>
             <div v-else>{{after.schoolName}}</div>
           </el-form-item>