Explorar el Código

03/28 12:35

对外作业修改
Xiao_Mo hace 5 años
padre
commit
27e34523d8

+ 6 - 4
src/router/index.js

@@ -267,9 +267,11 @@ export const asyncRoutes = {
   helpContent: () => import('@/views/helpCenter/helpContent'),
   // 对外订单
   incomeOut: () => import('@/views/businessManager/orderManager/incomeOut'),
-  // 课外训练
-  afterSchoolList:()=>import('@/views/afterSchoolManager/afterSchoolList'),
-  // 课外作业
-  afterWorkList:()=>import('@/views/afterSchoolManager/afterWorkList'),
+  // // 课外训练
+  // afterSchoolList:()=>import('@/views/afterSchoolManager/afterSchoolList'),
+  // // 课外作业
+  // afterWorkList:()=>import('@/views/afterSchoolManager/afterWorkList'),
+  // 课外管理
+  afterSchoolManager:()=>import('@/views/afterSchoolManager'),
 }
 export default router

+ 7 - 5
src/views/afterSchoolManager/afterSchoolList.vue

@@ -1,9 +1,9 @@
 <!--  -->
 <template>
-  <div class="m-container">
-    <h2>
+  <div class="">
+    <!-- <h2>
       <div class="squrt"></div>课外训练
-    </h2>
+    </h2> -->
     <div class="m-core">
       <el-form :inline="true" :model="searchForm">
         <el-form-item>
@@ -213,9 +213,11 @@ export default {
     onReSet() {},
     lookDetail(row) {
       // this.afterSchoolVisible = true;
-      console.log(row.id);
-      this.$router.push({path:'/business/afterWorkList',query:{extracurricularExercisesId:row.id}})
+      // console.log(row.id);
+      // this.$router.push({path:'/business/afterWorkList',query:{extracurricularExercisesId:row.id}})
       // this.extracurricularExercisesId
+      // getExtracurricularExercisesId
+      this.$emit('getExtracurricularExercisesId',row.id)
     }
   }
 };

+ 8 - 8
src/views/afterSchoolManager/afterWorkList.vue

@@ -1,9 +1,9 @@
 <!--  -->
 <template>
-  <div class="m-container">
-    <h2>
+  <div class="">
+    <!-- <h2>
       <div class="squrt"></div>课外作业
-    </h2>
+    </h2> -->
     <div class="m-core">
       <el-form :inline="true" :model="searchForm">
         <el-form-item>
@@ -170,6 +170,7 @@ import {
 } from "@/api/afterSchool";
 import { getTeacher } from "@/api/buildTeam";
 export default {
+  props:['id'],
   components: { pagination },
   data() {
     return {
@@ -200,9 +201,9 @@ export default {
       afterSchoolVisible: false,
       workVisible: false,
       activeSrc: "",
-      extracurricularExercisesId: "",
       Fsearch:null,
-      Frules:null
+      Frules:null,
+      extracurricularExercisesId:null
     };
   },
   //生命周期 - 创建完成(可以访问当前this实例)
@@ -242,8 +243,7 @@ export default {
     if (this.$route.query.rules) {
       this.Frules = this.$route.query.rules
     }
-      this.extracurricularExercisesId =
-        this.$route.query.extracurricularExercisesId || null;
+    this.extracurricularExercisesId = this.id;
       this.getList();
     },
     getList() {
@@ -259,7 +259,7 @@ export default {
           ? (obj.teacherId = this.searchForm.teacherId)
           : null;
       this.searchForm.search ? (obj.search = this.searchForm.search) : null;
-      this.extracurricularExercisesId
+      this.id
         ? (obj.extracurricularExercisesId = this.extracurricularExercisesId)
         : null;
       extracurricularExercisesReply(obj).then(res => {

+ 57 - 0
src/views/afterSchoolManager/index.vue

@@ -0,0 +1,57 @@
+<!--  -->
+<template>
+  <div class="m-container">
+    <h2>
+      <div class="squrt"></div>课外管理
+    </h2>
+    <div class="m-core">
+      <el-tabs v-model.trim="activeIndex" type="card" @tab-click="handleClick">
+        <el-tab-pane label="课外训练" name="1">
+          <afterSchoolList v-if="activeIndex == 1" @getExtracurricularExercisesId='getExtracurricularExercisesId'></afterSchoolList>
+        </el-tab-pane>
+        <el-tab-pane label="课外作业" name="2">
+          <afterWorkList
+            v-if="activeIndex == 2"
+            :id="extracurricularExercisesId"
+          ></afterWorkList>
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+  </div>
+</template>
+
+<script>
+import afterSchoolList from "@/views/afterSchoolManager/afterSchoolList";
+import afterWorkList from "@/views/afterSchoolManager/afterWorkList";
+export default {
+  components: { afterSchoolList, afterWorkList },
+  data() {
+    return {
+      activeIndex: "1",
+      extracurricularExercisesId: null
+    };
+  },
+  //生命周期 - 创建完成(可以访问当前this实例)
+  created() {},
+  //生命周期 - 挂载完成(可以访问DOM元素)
+  mounted() {
+    this.init();
+  },
+  activated() {},
+  methods: {
+    init() {
+      this.$route.query.activeIndex
+        ? (this.activeIndex = this.$route.query.activeIndex)
+        : this.activeIndex;
+    },
+    getExtracurricularExercisesId(val){
+        console.log(val);
+        this.extracurricularExercisesId = val;
+        this.activeIndex = '2'
+    },
+    handleClick(){}
+  }
+};
+</script>
+<style lang='scss' scoped>
+</style>