|
@@ -130,18 +130,18 @@ export default {
|
|
|
if (prop === 'term') {
|
|
|
let data = _.flatten(_.toPairs(_.groupBy(this.list, 'term'))).filter(_.isArray);
|
|
|
let num = data.find(i => i.every(e => e.term === row.term));
|
|
|
- let rowi = num.findIndex(i => i.startdate == row.startdate);
|
|
|
- // if (rowi === 0) {
|
|
|
- // return {
|
|
|
- // rowspan: num.length,
|
|
|
- // colspan: 1,
|
|
|
- // };
|
|
|
- // } else {
|
|
|
- // return {
|
|
|
- // rowspan: 0,
|
|
|
- // colspan: 0,
|
|
|
- // };
|
|
|
- // }
|
|
|
+ let head = _.head(num);
|
|
|
+ if (_.isEqual(head, row)) {
|
|
|
+ return {
|
|
|
+ rowspan: num.length,
|
|
|
+ colspan: 1,
|
|
|
+ };
|
|
|
+ } else {
|
|
|
+ return {
|
|
|
+ rowspan: 0,
|
|
|
+ colspan: 0,
|
|
|
+ };
|
|
|
+ }
|
|
|
} else if (prop === 'term7') {
|
|
|
let data = _.flatten(_.toPairs(_.groupBy(this.list, 'term'))).filter(_.isArray);
|
|
|
let num = data.find(i => i.every(e => e.term === row.term));
|