Merge branch 'master' of http://git.dayaedu.com/molingzhide/dy-admin-manager

src/api/studentManager.js

@@ -0,0 +1,13 @@
+// 系统专项设置api文件
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取学生列表
+export function queryStudentList(data) {
+    return request({
+        url: '/web-server/studentManage/queryStudentList',
+        method: 'get',
+        params: data
+    })
+}
+

src/views/categroyManager/insideSetting/adminManager.vue

@@ -53,7 +53,11 @@ export default {
   },
   methods: {
     getList () { 
-      roleQueryPage({ organId: this.organId }).then(res => {
+      roleQueryPage({ 
+        organId: this.organId,
+        rows: this.pageInfo.limit,
+        page: this.pageInfo.page
+      }).then(res => {
         if(res.code == 200 && res.data && res.data.rows.length > 0) {
           this.tableList = res.data.rows
         }

src/views/categroyManager/insideSetting/staffManager.vue

@@ -195,7 +195,11 @@ export default {
       }
     },
     getList () {
-      queryEmployByOrganId({ organId: this.organId }).then(res => {
+      queryEmployByOrganId({ 
+        organId: this.organId,
+        rows: this.pageInfo.limit,
+        page: this.pageInfo.page
+      }).then(res => {
         if(res.code == 200 && res.data) {
           this.tableList = res.data.rows
         }

src/views/categroyManager/specialSetup/typesManager.vue

@@ -135,7 +135,10 @@ export default {
       }
     },
     getList () { 
-      chargeTypeList().then(res => {
+      chargeTypeList({
+        rows: this.pageInfo.limit,
+        page: this.pageInfo.page
+      }).then(res => {
         let result = res.data
         if(res.code == 200) {
           result.rows.forEach(row => {

src/views/studentManager/studentList.vue

@@ -2,67 +2,56 @@
   <div class="m-container">
     <h2>学员列表</h2>
     <div class="m-core">
-      <div class="newBand">声部调整</div>
+      <!-- <div class="newBand">声部调整</div> -->
       <!-- 搜索标题 -->
       <el-form :inline="true"
                class="searchForm"
                v-model="searchForm">
         <el-form-item>
-          <el-select v-model="searchForm.name"
-                     placeholder="课程类型">
-            <el-option label="哈哈哈"
-                       value="1"></el-option>
-          </el-select>
+          <el-input placeholder="编号，姓名，电话" v-model="searchForm.name">
+            <i slot="suffix" class="el-input__icon el-icon-search"></i>
+          </el-input>
         </el-form-item>
       </el-form>
       <!-- 查询 -->
-      <div class="searchWrap">
+      <!-- <div class="searchWrap">
         <p>查询条件:</p>
         <div class="searchItem"
              @click="closeSearch(item)"
-             v-for="(item,index) in searchLsit">
+             v-for="(item,index) in searchList" :key="index">
           {{ item.key }}
           <i class="el-icon-close"></i>
         </div>
-      </div>
+      </div> -->
       <!-- 列表 -->
       <div class="tableWrap">
         <el-table :data='tableList'>
-          <el-table-column align='center'
+          <el-table-column align='center' prop="userId"
                            label="学员编号">
           </el-table-column>
-          <el-table-column align='center'
+          <el-table-column align='center' prop="userName"
                            label="学员姓名">
           </el-table-column>
-          <el-table-column align='center'
+          <el-table-column align='center' prop="gender"
                            label="性别">
           </el-table-column>
-          <el-table-column align='center'
-                           label="联系电话">
-          </el-table-column>
-          <el-table-column align='center'
-                           label="所属学校">
-          </el-table-column>
-          <el-table-column align='center'
-                           label="在读乐团">
-          </el-table-column>
-          <el-table-column align='center'
-                           label="乐团状态">
-          </el-table-column>
-          <el-table-column align='center'
-                           label="购买小课班数">
+          <el-table-column align='center' prop="phone"
+                           label="家长姓名">
           </el-table-column>
-          <el-table-column align='center'
-                           label="在读VIP课">
+          <el-table-column align='center' prop="phone"
+                           label="家长联系电话">
           </el-table-column>
           <el-table-column align='center'
-                           label="教务老师">
+                           label="操作">
+            <template slot-scope="scope">
+              <el-button type="text">查看</el-button>
+            </template>
           </el-table-column>
         </el-table>
-        <pagination :total="rules.total"
-                    :page.sync="rules.page"
-                    :limit.sync="rules.limit"
-                    :page-sizes="rules.page_size"
+        <pagination :total="pageInfo.total"
+                    :page.sync="pageInfo.page"
+                    :limit.sync="pageInfo.limit"
+                    :page-sizes="pageInfo.page_size"
                     @pagination="getList" />
       </div>
     </div>
@@ -70,17 +59,20 @@
 </template>
 <script>
 import pagination from '@/components/Pagination/index'
+import { queryStudentList } from '@/api/studentManager'
+import store from '@/store'
 export default {
   name: 'studentList',
   components: { pagination },
   data () {
     return {
       searchForm: {
-        name: '',
+        name: ''
       },
-      searchLsit: [],
+      searchList: [],
       tableList: [],
-      rules: {
+      organId: store.getters.organ,
+      pageInfo: {
         // 分页规则
         limit: 10, // 限制显示条数
         page: 1, // 当前页
@@ -89,8 +81,22 @@ export default {
       },
     }
   },
+  mounted() {
+    this.getList()
+  },
   methods: {
-    getList () { }
+    getList () { 
+      queryStudentList({
+        organId: this.organId,
+        rows: this.pageInfo.limit,
+        page: this.pageInfo.page
+      }).then(res => {
+        if(res.code == 200) {
+          this.tableList = res.data.rows
+          this.pageInfo.total = res.data.total
+        }
+      })
+    }
   }
 }
 </script>