lrf402788946 5 years ago
parent
commit
e3b3584e00
2 changed files with 3 additions and 2 deletions
  1. 1 1
      src/views/plan/classes.vue
  2. 2 1
      src/views/plan/lesson-plan.vue

+ 1 - 1
src/views/plan/classes.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="plan">
     <!-- 根据计划,获取所有期数及期数下批次,然后提供选择期数;查询出该期数下学校上报的学生,选择学生手动分班 -->
-    <list-frame :title="mainTitle" @query="stuSearch" :total="total" :filter="filterFields" :needAdd="false">
+    <list-frame :title="mainTitle" @query="stuSearch" :total="total" :filter="filterFields" :needAdd="false" returns="/plan/index">
       <template #options="{item}">
         <template v-if="item.model === 'termid'">
           <el-option v-for="(i, index) in termList" :key="index" :label="`第${i.term}期`" :value="i._id"></el-option>

+ 2 - 1
src/views/plan/lesson-plan.vue

@@ -150,7 +150,6 @@ const { mapActions: location } = createNamespacedHelpers('location'); //地点
 const { mapActions: subject } = createNamespacedHelpers('subject'); //科目
 const { mapActions: teacher } = createNamespacedHelpers('teacher'); //教师
 const { mapActions: teaPlan } = createNamespacedHelpers('teaPlan'); //教师申请
-const { mapActions: director } = createNamespacedHelpers('director'); //教师 //TODO 接口合并,可能不需要了
 const { mapActions: dept } = createNamespacedHelpers('dept'); //配合教师表使用的部门表
 const { mapActions: dirPlan } = createNamespacedHelpers('dirPlan'); //班主任不能上课的列表
 
@@ -329,6 +328,8 @@ export default {
       if (this.$checkRes(res)) this.$set(this, `locationList`, res.data);
       res = await this.getSubjectList();
       if (this.$checkRes(res)) this.$set(this, `subjectList`, res.data);
+      //TODO 班主任表中的人员也可以成为礼仪老师,现在应该没有
+      // TODO派生:涉及之后回显问题,是要将这个人在教师/班主任表中都查然后获得到
       res = await this.getTeacherList({ islyteacher: '1' });
       if (this.$checkRes(res)) this.$set(this, `lyTeacherList`, res.data);
       res = await this.getDeptList();