04/18

111

dist/static/css/chunk-08d71bca.45003817.css

@@ -1 +0,0 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.newBand[data-v-61345924]{display:inline-block;margin-right:10px}.right-code .title[data-v-61345924]{font-size:18px;text-align:center;padding-bottom:8px}[data-v-61345924] .studentInfo .el-dialog__body{padding-top:0;padding-bottom:0}[data-v-61345924] .studentInfo .multiple.el-select{width:185px!important}

dist/static/css/chunk-c836ceb2.40b343ff.css

@@ -0,0 +1 @@
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.newBand[data-v-2d88ce5b]{display:inline-block;margin-right:10px}.right-code .title[data-v-2d88ce5b]{font-size:18px;text-align:center;padding-bottom:8px}[data-v-2d88ce5b] .studentInfo .el-dialog__body{padding-top:0;padding-bottom:0}[data-v-2d88ce5b] .studentInfo .multiple.el-select{width:185px!important}

src/views/studentManager/studentList.vue

@@ -31,6 +31,17 @@
             ></el-option>
           </el-select>
         </el-form-item>
+
+        <el-form-item>
+          <el-select placeholder="指导老师" v-model="searchForm.teacherId" clearable filterable>
+            <el-option
+              v-for="(item,index) in teacherList"
+              :label="item.realName"
+              :value="item.id"
+              :key="index"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item prop="isActive">
           <el-select
             class="multiple"
@@ -113,6 +124,7 @@
           <el-table-column align="center" prop="userId" label="学员编号"></el-table-column>
           <el-table-column align="center" prop="username" label="学员姓名"></el-table-column>
           <el-table-column align="center" prop="organName" label="所属分部"></el-table-column>
+          <el-table-column align="center" prop="teacherName" label="指导老师"></el-table-column>
           <el-table-column align="center" label="性别">
             <template slot-scope="scope">{{ scope.row.gender ? '男': '女' }}</template>
           </el-table-column>
@@ -237,7 +249,16 @@
             <el-option value="0" label="否"></el-option>
           </el-select>
         </el-form-item>
-
+          <el-form-item label="指导老师" prop="teacherId">
+          <el-select class="multiple" v-model.trim="studentForm.teacherId" clearable>
+            <el-option
+              v-for="(item,index) in teacherList"
+              :label="item.realName"
+              :value="item.id"
+              :key="index"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="家长姓名">
           <el-input v-model.trim="studentForm.parseName"></el-input>
         </el-form-item>
@@ -315,7 +336,7 @@ import {
   studentHasCourse
 } from "@/api/studentManager";
 import { vaildStudentUrl } from "@/utils/validate";
-import { getEmployeeOrgan, resetPassword2 } from "@/api/buildTeam";
+import { getEmployeeOrgan, resetPassword2,getTeacher } from "@/api/buildTeam";
 import QRCode from "qrcodejs2";
 import store from "@/store";
 import axios from "axios";
@@ -338,11 +359,13 @@ export default {
         isMake: null,
         hasPracticeCourse: null,
         operatingTag: null,
-        serviceTag: null
+        serviceTag: null,
+        teacherId:null
       },
       searchList: [],
       tableList: [],
       organList: [],
+      teacherList:[],
       pageInfo: {
         // 分页规则
         limit: 10, // 限制显示条数
@@ -359,7 +382,8 @@ export default {
         date: "",
         nation: "",
         serviceTag: null,
-        operatingTag: null
+        operatingTag: null,
+        teacherId:null
       },
       studentRules: {
         name: [{ required: true, message: "请输入学生姓名" }],
@@ -368,7 +392,8 @@ export default {
         organId: [{ required: true, message: "请选择分部" }],
         nation: [{ required: true, message: "请输入名族" }],
         serviceTag: [{ required: true, message: "请选择是否参与服务" }],
-        operatingTag: [{ required: true, message: "请选择是否参与运营" }]
+        operatingTag: [{ required: true, message: "请选择是否参与运营" }],
+        teacherId: [{ required: true, message: "请选择指导老师" }],
       },
       isNew: false,
       active: null,
@@ -401,6 +426,11 @@ export default {
         this.organList = res.data;
       }
     });
+      getTeacher().then(res => {
+      if (res.code == 200) {
+        this.teacherList = res.data;
+      }
+    });
     this.getList();
   },
   methods: {
@@ -453,7 +483,8 @@ export default {
         isMake: null,
         hasPracticeCourse: null,
         operatingTag: null,
-        serviceTag: null
+        serviceTag: null,
+        teacherId:null,
       };
     },
     downLoadStudent() {
@@ -469,7 +500,8 @@ export default {
           ? searchForm.hasPracticeCourse
           : null,
         operatingTag: searchForm.operatingTag ? searchForm.operatingTag : null,
-        serviceTag: searchForm.serviceTag ? searchForm.serviceTag : null
+        serviceTag: searchForm.serviceTag ? searchForm.serviceTag : null,
+        teacherId:searchForm.teacherId ? searchForm.teacherId:null
       };
       const options = {
         method: "POST",
@@ -559,7 +591,8 @@ export default {
             organId: this.studentForm.organId,
             nation: this.studentForm.nation,
             serviceTag: this.studentForm.serviceTag,
-            operatingTag: this.studentForm.operatingTag
+            operatingTag: this.studentForm.operatingTag,
+            teacherId:this.studentForm.teacherId
           };
           registerStudent(obj).then(res => {
             if (res.code == 200) {
@@ -585,7 +618,8 @@ export default {
             id: this.active.userId,
             nation: this.studentForm.nation,
             serviceTag: this.studentForm.serviceTag,
-            operatingTag: this.studentForm.operatingTag
+            operatingTag: this.studentForm.operatingTag,
+            teacherId:this.studentForm.teacherId
           };
           updateStudent(obj).then(res => {
             if (res.code == 200) {
@@ -617,7 +651,8 @@ export default {
         organId: row.organId,
         nation: row.nation,
         serviceTag: row.serviceTag+'',
-        operatingTag: row.operatingTag+''
+        operatingTag: row.operatingTag+'',
+        teacherId:row.teacherId
       };
     },
     resetPassWrod(row) {
@@ -670,7 +705,8 @@ export default {
           date: "",
           nation: "",
           serviceTag: null,
-          operatingTag: null
+          operatingTag: null,
+          teacherId:null
         };
         this.$refs["studentForm"].resetFields();
       }

src/views/teacherManager/teacherList.vue

@@ -461,7 +461,7 @@ export default {
     gotoOperating(row) {
         this.$router.push({
         path: "/operateManager/operateStudent",
-        query: { teacherId: row.teacherId,operatingTag:'1' }
+        query: { teacherId: row.id,operatingTag:'1' }
       });
     }
   }