Parcourir la source

11/30 课表列表修复

mo il y a 4 ans
Parent
commit
544f34b654

+ 1 - 0
debug.log

@@ -1 +1,2 @@
 
+[1130/102700.836:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)

+ 9 - 0
src/api/buildTeam.js

@@ -1377,3 +1377,12 @@ export function queryCourseAdjustDetail (data) {
     data: qs.stringify(data)
   })
 }
+
+// 获取合课学生
+export function getCourseStudents (data) {
+  return request({
+    url: api + '/courseScheduleStudentPayment/getCourseStudents',
+    method: 'get',
+    params: data
+  })
+}

+ 5 - 1
src/views/teamDetail/componentCourse/addCompound.vue

@@ -83,6 +83,7 @@
                      @closeReset='closeReset'
                      :isDisabled='true'
                      @getList='getList'
+                     :idList='idList'
                      :id='radio' />
     </el-dialog>
   </div>
@@ -98,7 +99,7 @@ export default {
       dataList: this.compoundList,
       isLook: false,
       show: false,
-
+      idList:''
     }
   },
   methods: {
@@ -115,8 +116,10 @@ export default {
         return
       }
       let arr = []
+      let idList = []
       this.dataList.forEach(com => {
         arr.push(com.type)
+        idList.push(com.id)
       })
       arr = [... new Set(arr)]
       if (arr.length != 1) {
@@ -128,6 +131,7 @@ export default {
         return
       }
       // 做判断 
+      this.idList = idList.join(',')
       this.show = true;
       this.isLook = false
 

+ 11 - 3
src/views/teamDetail/componentCourse/compoundClass.vue

@@ -21,7 +21,7 @@
             <div style="width:220px!important">
               <a href="#"
                  class="studentTitle"
-                 @click="studentListModalVisible=true"> 学生列表>></a>
+                 @click="lookStudentList"> 学生列表>></a>
             </div>
           </el-form-item>
         </el-col>
@@ -165,13 +165,13 @@
 </template>
 <script>
 import { diffTimerFormMinute, addTimerFormMinute } from '@/utils/date'
-import { getTeacher, resetCourse, getCourseScheduleDetail } from "@/api/buildTeam";
+import { getTeacher, resetCourse, getCourseScheduleDetail,getCourseStudents } from "@/api/buildTeam";
 import viewStudentList from '../components/modals/view-student-list'
 import { getTeachSchool } from "@/api/teacherManager";
 import cleanDeep from 'clean-deep'
 import dayjs from 'dayjs';
 export default {
-  props: ["show", "id", "isDisabled"],
+  props: ["show", "id", "isDisabled","idList"],
   components: { viewStudentList },
   data () {
     return {
@@ -313,6 +313,14 @@ export default {
           }
         }
       })
+    },
+    lookStudentList(){
+      getCourseStudents({courseIds:this.idList}).then(res=>{
+        if(res.code == 200){
+          this.studentListModal = res.data;
+          this.studentListModalVisible = true;
+        }
+      })
     }
   },
 

+ 10 - 4
src/views/teamDetail/components/modals/view-student-list.vue

@@ -7,13 +7,13 @@
       tooltip-effect="dark"
     >
       <el-table-column
-        prop="name"
+        prop="userId"
         align="center"
         width="120"
         label="学员编号"
       ></el-table-column>
       <el-table-column
-        prop="name"
+        prop="nickName"
         align="center"
         width="120"
         label="学员姓名"
@@ -25,13 +25,13 @@
         label="性别"
       ></el-table-column>
       <el-table-column
-        prop="name"
+        prop="phone"
         align="center"
         width="120"
         label="联系电话"
       ></el-table-column>
       <el-table-column
-        prop="name"
+        prop="subjectNames"
         align="center"
         width="120"
         label="专业"
@@ -47,3 +47,9 @@ export default {
   props: ['list'],
 };
 </script>
+<style lang="scss" scoped>
+.dialog-footer{
+  margin-top: 10px;
+}
+  
+</style>

+ 0 - 1
src/views/teamDetail/teamCourseList.vue

@@ -727,7 +727,6 @@ export default {
     }
   },
   watch: {
-
     classVisible (val) {
       if (!val) {
         this.activeName = null;