|
@@ -30,10 +30,10 @@
|
|
|
<!-- rowspan="5" 班主任,礼仪课教师等其他信息 -->
|
|
|
<tr v-for="(time, ti) in tr" :key="ti">
|
|
|
<td rowspan="2" v-if="ti == 0">上午</td>
|
|
|
- <td rowspan="3" v-if="ti == 2">下午</td>
|
|
|
+ <td :rowspan="length" v-if="ti == 2">下午</td>
|
|
|
<td>{{ time }}</td>
|
|
|
<td v-for="(date, di) in th" :key="di" v-html="getLesson(date, time)"></td>
|
|
|
- <td rowspan="5" v-if="ti == 0">
|
|
|
+ <td rowspan="6" v-if="ti == 0">
|
|
|
<div class="classInfo">
|
|
|
<p>上课地点</p>
|
|
|
<p>{{ data.jslocation || '' }}</p>
|
|
@@ -66,12 +66,7 @@
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td colspan="2">教师签字</td>
|
|
|
- <td></td>
|
|
|
- <td></td>
|
|
|
- <td></td>
|
|
|
- <td></td>
|
|
|
- <td></td>
|
|
|
- <td colspan="2"></td>
|
|
|
+ <td v-for="(date, di) in th" :key="di"></td>
|
|
|
</tr>
|
|
|
</table>
|
|
|
</el-col>
|
|
@@ -93,11 +88,14 @@ export default {
|
|
|
data: null,
|
|
|
},
|
|
|
components: {},
|
|
|
- data: () => ({}),
|
|
|
- created() {},
|
|
|
+ data: () => ({
|
|
|
+ length: 0,
|
|
|
+ }),
|
|
|
+ async created() {},
|
|
|
computed: {},
|
|
|
methods: {
|
|
|
getLesson(date, time) {
|
|
|
+ this.$set(this, `length`, this.tr.length - 2);
|
|
|
let r = this.lessons.find(f => f.date == date && f.time == time);
|
|
|
if (!r) return '--';
|
|
|
else {
|