修改bug

src/api/studentManager.js

@@ -12,6 +12,16 @@ export function queryStudentList (data) {
   })
 }
 
+// 获取学生vip课
+export function findStudentVipGroupClass (data) {
+  return request({
+    url: api + `/studentManage/findStudentVipGroupClass`,
+    method: 'get',
+    params: data
+  })
+}
+
+
 // 根据学生ID获取学生基本报名信息
 export function findStudentBaseInfo (data) {
   return request({

src/utils/vueFilter.js

@@ -329,3 +329,16 @@ Vue.filter('teacherStatus', value => {
   }
   return template[value]
 })
+
+// vip课状态
+Vue.filter('vipCourseStatus', value => {
+  let template = {
+    0: "未开始",
+    1: "报名中",
+    5:"报名结束",
+    2: "进行中",
+    4: "已结束",
+    3: "取消"
+  }
+  return template[value]
+})

src/views/studentManager/components/studentOrder.vue

@@ -82,6 +82,14 @@
           </template>
         </el-table-column>
         <el-table-column width="180px"
+                         label="应付金额"
+                         prop="expectAmount">
+        </el-table-column>
+        <el-table-column width="180px"
+                         label="余额支付"
+                         prop="balancePaymentAmount">
+        </el-table-column>
+        <el-table-column width="180px"
                          label="实际金额"
                          prop="actualAmount">
         </el-table-column>

src/views/studentManager/components/studentVip.vue

@@ -1,3 +1,4 @@
+
 <template>
   <div class='studentvip'>
     <!-- <div class="topCard">
@@ -40,42 +41,67 @@
     <div class="tableWrap">
       <el-table :header-cell-style="{background:'#EDEEF0',color:'#444'}"
                 :data='tableList'>
-        <el-table-column label="时间"
-                         prop='courseDate'>
+        <el-table-column label="VIP编号" align='center'
+                         prop='vipGroupId'>
         </el-table-column>
-        <el-table-column label="课程名称"
-                         prop="classGroupName">
+        <el-table-column label="VIP课名称" align='center'
+                         prop="vipGroupName">
         </el-table-column>
-        <el-table-column label="课程类型">
+        <el-table-column label="VIP课状态" align='center'>
           <template slot-scope="scope">
-            {{ scope.row.teachMode == 'ONLINE' ? '线上' : '线下' }}
+            {{ scope.row.vipGroupStatus | vipCourseStatus }}
           </template>
         </el-table-column>
-        <!-- <el-table-column label="当前课次">
-        </el-table-column> -->
-        <el-table-column label="指导老师"
-                         prop="realName">
+        <el-table-column label="指导老师" align='center'
+                         prop="teacherName">
         </el-table-column>
-        <el-table-column label="学员数量"
+        <el-table-column label="班级人数" align='center'
                          prop="studentNum">
         </el-table-column>
-        <!-- <el-table-column label="剩余课时">
+        <el-table-column label="活动方案" align='center'
+                         prop="activeName">
+        </el-table-column>
+        <el-table-column label="开课时间" align='center'
+                         prop="courseStartDate">
+        </el-table-column>
+        <el-table-column label="当前课次" align='center' prop="currentClassTimes">
+        </el-table-column>
+        <el-table-column label="操作" align='center'>
           <template slot-scope="scope">
-            {{ scope.row.totalClassTimes +'/'+ scope.row.currentClassTimes }}
+            <el-button @click="onCourse(scope.row)"
+                       type="text">课表</el-button>
           </template>
-        </el-table-column> -->
+        </el-table-column>
       </el-table>
       <pagination :total="pageInfo.total"
                   :page.sync="pageInfo.page"
                   :limit.sync="pageInfo.limit"
                   :page-sizes="pageInfo.page_size"
                   @pagination="getCourseList" />
+      
+
+      <el-dialog :title="dialogTitle" :visible.sync="dialogTableVisible">
+        <el-table :data="gridData">
+          <el-table-column prop="courseDate" label="时间" align='center' width="150"></el-table-column>
+          <el-table-column prop="classGroupName" label="课程名称" align='center' width="200"></el-table-column>
+          <el-table-column label="课程类型" align='center'>
+             <template slot-scope="scope">
+              {{ scope.row.teachMode == 'ONLINE' ? '线上' : '线下' }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="courseStatus" align='center' label="课程状态">
+            <template slot-scope="scope">
+              {{ scope.row.courseStatus |coursesStatus }}
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-dialog>
     </div>
   </div>
 </template>
 <script>
 import pagination from '@/components/Pagination/index'
-import { findStudentVipGroups, findStudentCourses } from '@/api/studentManager'
+import { findStudentVipGroups, findStudentVipGroupClass, findStudentCourses } from '@/api/studentManager'
 export default {
   name: 'studentvip',
   components: { pagination },
@@ -86,6 +112,7 @@ export default {
         classGroupName: null
       },
       checkIndex: null, // 选中的课程
+      dialogTableVisible: false,
       searchLsit: [],
       tableList: [],
       courseList: [],
@@ -96,7 +123,8 @@ export default {
         total: 0, // 总条数
         page_size: [10, 20, 40, 50] // 选择限制显示条数
       },
-
+      dialogTitle: '',
+      gridData: []
     }
   },
   mounted () {
@@ -111,13 +139,22 @@ export default {
       let params = this.searchForm
       params.rows = this.pageInfo.limit
       params.page = this.pageInfo.page
-      findStudentVipGroups(params).then(res => {
+      findStudentVipGroupClass(params).then(res => {
         if (res.code == 200) {
           this.tableList = res.data.rows
           this.pageInfo.total = res.data.total
         }
       })
     },
+    onCourse(row) {
+      findStudentVipGroups({ vipGroupId: row.vipGroupId }).then(res => {
+        this.dialogTitle = row.vipGroupName
+        if(res.code == 200) {
+          this.gridData = res.data.rows
+          this.dialogTableVisible = true
+        }
+      })
+    },
     onSearch () {
       this.pageInfo.page = 1
       this.getCourseList()

src/views/teacherManager/teacherList.vue

@@ -40,7 +40,7 @@
         </el-form-item>
         <el-form-item>
           <el-select v-model="searchForm.organId"
-                     placeholder="所属分部">
+                     placeholder="请选择分部">
             <el-option v-for="item in branchList"
                        :key="item.value"
                        :label="item.label"
@@ -85,6 +85,10 @@
                            label="老师名称">
           </el-table-column>
           <el-table-column align='center'
+                           prop="organName"
+                           label="所属分部">
+          </el-table-column>
+          <el-table-column align='center'
                            prop="subjectId"
                            label="老师状态">
             <template slot-scope="scope">