Merge branch 'iteration-20241016' into jenkins-main

src/views/afterSchoolManager/components/examinationDetail.vue

@@ -87,6 +87,17 @@
         </el-table-column>
         <el-table-column prop="subjectName" align="left" label="声部名称">
         </el-table-column>
+        <el-table-column prop="memo" align="left" label="练习说明">
+          <template slot-scope="scope">
+            <Tooltip
+              :content="
+                scope.row.memo
+                  ? scope.row.memo
+                  : '--'
+              "
+            />
+          </template>
+        </el-table-column>
         <el-table-column prop="trainingTime" align="left" label="完成时间">
           <template slot-scope="scope">
             <div>{{ scope.row.trainingTime | dateForMinFormat }}</div>
@@ -130,6 +141,15 @@ export default {
           lessonExaminationId: this.courseScheduleId,
           subjectId: this.subjectId
         });
+        const result = res.data || []
+        result.forEach(item => {
+          const detailDtos = item.detailDtos || []
+          if(detailDtos.length > 0) {
+            item.memo = detailDtos[0].memo || ''
+          } else {
+            item.memo = ''
+          }
+        })
         this.list = res.data;
       } catch (e) {
         console.log(e);