Merge branch 'master' of http://git.cc-lotus.info/new_train/train-center

src/views/new-plan/arrange/director-arrange.vue

@@ -145,8 +145,8 @@ export default {
       } 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));
-        // 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) {
           return {
             rowspan: num.length,