|
@@ -145,8 +145,8 @@ export default {
|
|
|
} else if (prop === 'term7') {
|
|
} else if (prop === 'term7') {
|
|
|
let data = _.flatten(_.toPairs(_.groupBy(this.list, 'term'))).filter(_.isArray);
|
|
let data = _.flatten(_.toPairs(_.groupBy(this.list, 'term'))).filter(_.isArray);
|
|
|
let num = data.find(i => i.every(e => e.term === row.term));
|
|
let num = data.find(i => i.every(e => e.term === row.term));
|
|
|
- // let newOder = _.orderBy(num, ['startdate'], ['asc']);
|
|
|
|
|
- let rowi = num.findIndex(i => i.startdate == row.startdate);
|
|
|
|
|
|
|
+ let newOder = _.orderBy(num, ['startdate'], ['asc']);
|
|
|
|
|
+ let rowi = newOder.findIndex(i => i.startdate == row.startdate);
|
|
|
if (rowi === 0) {
|
|
if (rowi === 0) {
|
|
|
return {
|
|
return {
|
|
|
rowspan: num.length,
|
|
rowspan: num.length,
|
