update

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

@@ -365,7 +365,6 @@ export default {
     },
     //添加/修改事件
     eventClick(event) {
-      console.log('nihao');
       if (_.isObject(event)) {
         this.formIsNew = false;
         let res = this.events.find(f => f.term == event.term);

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

@@ -131,9 +131,10 @@ export default {
                   f.every(e => {
                     let eb = _.get(e, 'batch');
                     let cb = _.get(ncla, 'batch');
-                    let en = _.get(e, 'name');
-                    let cn = _.get(ncla, 'name');
-                    return eb == cb && en == cn;
+                    // let en = _.get(e, 'name');
+                    // let cn = _.get(ncla, 'name');
+                    // && en == cn
+                    return eb == cb;
                   })
                 );
                 // console.log(ncla);
@@ -165,13 +166,20 @@ export default {
           for (const bn of bl) {
             for (const a of al) {
               let mid = _.get(a, bn);
-              if (mid) rl.push(mid);
+              if (mid) {
+                let h = _.head(mid);
+                if (parseInt(h.name)) rl.push(mid);
+                else {
+                  let r = rl.findIndex(f => f.find(ff => ff.batch == h.batch));
+                  if (r < 0) rl.push(mid);
+                  else rl[r].push(...mid);
+                }
+              }
             }
           }
           obj[i] = rl;
         }
       });
-
       //整理列数最大值
       let lenl = [];
       for (const o of arr) {
@@ -189,6 +197,8 @@ export default {
           obj[i].push([]);
         }
       }
+      //合并同批次特殊班
+      obj;
       this.$set(this, `list`, obj);
       msg.close();
     },

src/views/new-plan/index.vue

@@ -211,7 +211,8 @@ export default {
       let res = await this.sUpdate(duplicate);
       if (this.$checkRes(res, '设置成功', res.errmsg)) {
         // this.$router.push({ path: '/' });
-        window.location.href = '/';
+        let url = window.location.href;
+        window.location.href = url;
         // this.search();
       }
     },