04/01 14:20

课外训练加分部

src/views/afterSchoolManager/afterSchoolList.vue

@@ -23,6 +23,22 @@
             ></el-option>
           </el-select>
         </el-form-item>
+         <el-form-item prop="organId">
+          <el-select
+            class="multiple"
+            v-model.trim="searchForm.organId"
+            filterable
+            clearable
+            placeholder="请选择分部"
+          >
+            <el-option
+              v-for="(item,index) in organList"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <el-date-picker
             v-model.trim="searchForm.timer"
@@ -34,19 +50,6 @@
             end-placeholder="结束日期"
           ></el-date-picker>
         </el-form-item>
-
-        <!-- <el-form-item>
-          <el-select placeholder="是否提交" v-model="searchForm.hasReport" clearable>
-            <el-option label="是" value="1"></el-option>
-            <el-option label="否" value="0"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item>
-          <el-select placeholder="是否回复" v-model="searchForm.hasReport" clearable>
-            <el-option label="是" value="1"></el-option>
-            <el-option label="否" value="0"></el-option>
-          </el-select>
-        </el-form-item>-->
         <el-form-item>
           <el-button type="danger" @click="search">搜索</el-button>
           <el-button @click="onReSet" type="primary">重置</el-button>
@@ -60,6 +63,8 @@
         >
           <el-table-column align="center" prop="createTime" label="布置时间"></el-table-column>
           <el-table-column align="center" prop="title" label="训练标题"></el-table-column>
+          <el-table-column align="center" prop="organName" label="分部"></el-table-column>
+          
           <el-table-column align="center" prop="expireDate" label="截止时间"></el-table-column>
           <el-table-column align="center" prop="teacherName" label="老师姓名">
             <template slot-scope="scope">
@@ -129,7 +134,7 @@
 <script>
 import pagination from "@/components/Pagination/index";
 import { queryPageList } from "@/api/afterSchool";
-import { getTeacher } from "@/api/buildTeam";
+import { getTeacher,getEmployeeOrgan } from "@/api/buildTeam";
 export default {
   components: { pagination },
   data() {
@@ -138,6 +143,7 @@ export default {
         search: null,
         timer: [],
         teacherId:null,
+        organId:null
       },
       rules: {
         // 分页规则
@@ -148,6 +154,7 @@ export default {
       },
       teacherList: [],
       tableList: [],
+      organList: [],
       visibleForm: {
         createTime:
           "啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦"
@@ -164,6 +171,12 @@ export default {
         this.teacherList = res.data;
       }
     });
+      getEmployeeOrgan().then(res => {
+      if (res.code == 200) {
+        this.organList = res.data;
+      }
+    });
+    // 获取分部
     this.init();
   },
   activated() {
@@ -209,6 +222,7 @@ export default {
          obj.rows= this.rules.limit,
       this.searchForm.teacherId?obj.teacherId = this.searchForm.teacherId:null;
       this.searchForm.search?obj.title = this.searchForm.search:null;
+      this.searchForm.organId?obj.organId = this.searchForm.organId:null;
       queryPageList(obj).then(res => {
         if (res.code == 200) {
           this.tableList = res.data.rows;
@@ -220,7 +234,15 @@ export default {
       this.rules.page = 1;
       this.getList();
     },
-    onReSet() {},
+    onReSet() {
+       this.searchForm= {
+        search: null,
+        timer: [],
+        teacherId:null,
+        organId:null
+      }
+      this.search();
+    },
     lookDetail(row) {
       // this.afterSchoolVisible = true;
 

src/views/afterSchoolManager/afterWorkList.vue

@@ -13,16 +13,22 @@
             placeholder="请输入标题 学生姓名"
           ></el-input>
         </el-form-item>
-        <!-- <el-form-item>
-          <el-select placeholder="老师姓名" v-model="searchForm.teacherId" clearable filterable>
+        <el-form-item prop="organId">
+          <el-select
+            class="multiple"
+            v-model.trim="searchForm.organId"
+            filterable
+            clearable
+            placeholder="请选择分部"
+          >
             <el-option
-              v-for="(item,index) in teacherList"
-              :label="item.realName"
-              :value="item.id"
+              v-for="(item,index) in organList"
               :key="index"
+              :label="item.name"
+              :value="item.id"
             ></el-option>
           </el-select>
-        </el-form-item>-->
+        </el-form-item>
 
 
         <el-form-item>
@@ -75,6 +81,7 @@
               </div>
             </template>
           </el-table-column>
+           <el-table-column align="center" prop="organName" label="分部"></el-table-column>
           <el-table-column align="center" prop="createTime" label="学生姓名">
             <template slot-scope="scope">
               <div>
@@ -175,7 +182,7 @@ import {
   extracurricularExercisesReply,
   findStudentExtraExerciseDetail
 } from "@/api/afterSchool";
-import { getTeacher } from "@/api/buildTeam";
+import { getEmployeeOrgan } from "@/api/buildTeam";
 export default {
   props: ["id"],
   components: { pagination },
@@ -186,7 +193,8 @@ export default {
         timer: [],
         status: null,
         isReplied: null,
-        isView: null
+        isView: null,
+        organId:null
       },
       rules: {
         // 分页规则
@@ -197,6 +205,7 @@ export default {
       },
       teacherList: [],
       tableList: [],
+      organList:[],
       visibleForm: {
         expiryDate: "啦啦啦啦",
         teacherName: "",
@@ -215,9 +224,9 @@ export default {
   created() {},
   //生命周期 - 挂载完成（可以访问DOM元素）
   mounted() {
-    getTeacher().then(res => {
+       getEmployeeOrgan().then(res => {
       if (res.code == 200) {
-        this.teacherList = res.data;
+        this.organList = res.data;
       }
     });
     this.init();
@@ -265,6 +274,7 @@ export default {
       this.extracurricularExercisesId
         ? (obj.extracurricularExercisesId = this.extracurricularExercisesId)
         : null;
+        this.searchForm.organId?obj.organId = this.searchForm.organId:null;
       extracurricularExercisesReply(obj).then(res => {
         if (res.code == 200) {
           this.tableList = res.data.rows;
@@ -282,7 +292,8 @@ export default {
         timer: [],
         status: null,
         isReplied: null,
-        isView: null
+        isView: null,
+        organId:null
       };
       this.extracurricularExercisesId = null;
       this.getList();