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

store/lesson.js

@@ -10,6 +10,7 @@ const api = {
   pluralUpdate: `/api/train/lesson/uplessones`,
   teaclass: `/api/train/lesson/teaclass`,
   confirm: `/api/train/lesson/check`, //锁死课表
+  newArrange: `/api/train/lesson/newarrange`,
 };
 const state = () => ({});
 const mutations = {};
@@ -67,6 +68,11 @@ const actions = {
     const res = await this.$axios.$post(`${api.confirm}`, { ids: payload });
     return res;
   },
+  // 新排课表 payload :{ids,planid}
+  async newArrange({ commit }, payload) {
+    const res = await this.$axios.$post(`${api.newArrange}`, payload);
+    return res;
+  },
   //批量修改
   async pluralUpdate({ commit }, payload) {
     const res = await this.$axios.$post(`${api.pluralUpdate}`, payload);

store/student.js

@@ -13,6 +13,7 @@ const api = {
   deleteAll: '/api/train/student/deletestus',
   batUpdateBedroom: `/api/train/student/updatabedroom`,
   computedIsFine: `/api/train/student/finestudent`,
+  export: `/api/train/student/export`,
 };
 const state = () => ({});
 const mutations = {};
@@ -70,6 +71,11 @@ const actions = {
     const res = await this.$axios.$get(`${api.computedIsFine}/${payload}`);
     return res;
   },
+  // 导出条件下的学生
+  async toExport({ commit }, payload) {
+    const res = await this.$axios.$post(`${api.export}`, payload);
+    return res;
+  },
   async mergeRequest({ commit, dispatch }, { method, data }) {
     let toRequest = () => {
       let res = [];