lrf402788946 4 년 전
부모
커밋
ce021278cb
1개의 변경된 파일17개의 추가작업 그리고 2개의 파일을 삭제
  1. 17 2
      parts/time-table.vue

+ 17 - 2
parts/time-table.vue

@@ -8,7 +8,7 @@
     <el-row class="rowLesson" type="flex" justify="center" ref="print">
       <el-col :span="21" class="timeTable">
         <el-col :span="24" class="top">
-          <el-col :span="24" class="title"> 2020年第({{ data.term }})期高校大学生就业能力拓展训练课程表({{ data.name }}) </el-col>
+          <el-col :span="24" class="title"> 2020年第({{ data.term }})期高校大学生就业能力拓展训练课程表({{ getClassName(data.name) }}) </el-col>
           <el-col :span="24" class="date"> ({{ th[0] }}—{{ th[th.length - 1] }}) </el-col>
         </el-col>
         <el-col :span="24" class="info">
@@ -38,6 +38,14 @@
                   <p>上课地点</p>
                   <p>{{ data.jslocation || '' }}</p>
                 </div>
+                <div class="classInfo">
+                  <p>用餐地点</p>
+                  <p>{{ data.yclocation || '' }}</p>
+                </div>
+                <div class="classInfo">
+                  <p>开班地点</p>
+                  <p>{{ data.kbyslocation || '' }}</p>
+                </div>
                 <div class="classInfo">
                   <p>班主任</p>
                   <p>{{ data.headteacher || '' }}</p>
@@ -89,14 +97,21 @@ export default {
       let r = this.lessons.find(f => f.date == date && f.time == time);
       if (!r) return '--';
       else {
-        let { subname, teaname = '' } = r;
+        let { subname, teaname = '', reason } = r;
         let text = `${subname}<br/><span style="color:red">${teaname}</span>`;
+        if (reason && teaname !== '') text = `${text}<br/><span style="color:red">${reason}</span>`;
         return text;
       }
     },
     toPrint() {
       this.$print(this.$refs.print);
     },
+    getClassName(data) {
+      if (data) {
+        if (_.isString(data) && data.includes('班')) return data;
+        else return `${data}班`;
+      }
+    },
   },
   filters: {
     getWeekDay(date) {