Merge branch '0601Action' into test

src/views/studentManager/components/studentVip.vue

@@ -28,14 +28,17 @@
         :data="tableList"
       >
         <el-table-column label="VIP课程组编号" align="center" prop="vipGroupId">
-          <template slot-scope="scope" >
-             <el-button type="text" @click="gotoVip(scope.row.vipGroupId)">
-                 <copy-text>{{ scope.row.vipGroupId }}</copy-text>
+          <template slot-scope="scope">
+            <el-button type="text" @click="gotoVip(scope.row.vipGroupId)">
+              <copy-text>{{ scope.row.vipGroupId }}</copy-text>
             </el-button>
-
           </template>
         </el-table-column>
-        <el-table-column label="VIP课程组名称" align="center" prop="vipGroupName">
+        <el-table-column
+          label="VIP课程组名称"
+          align="center"
+          prop="vipGroupName"
+        >
           <template slot-scope="scope">
             <el-button type="text" @click="gotoVip(scope.row.vipGroupName)">
               <copy-text>{{ scope.row.vipGroupName }}</copy-text>
@@ -110,12 +113,11 @@
       />
 
       <el-dialog :title="dialogTitle" :visible.sync="dialogTableVisible">
-        <el-table :data="gridData" :header-cell-style="{ background: '#EDEEF0', color: '#444' }">
-          <el-table-column
-            prop="courseDate"
-            label="时间"
-            align="center"
-          >
+        <el-table
+          :data="gridData"
+          :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
+        >
+          <el-table-column prop="courseDate" label="时间" align="center">
             <template slot-scope="scope">{{
               scope.row.courseDate | dateForMinFormat
             }}</template>
@@ -136,6 +138,13 @@
             }}</template>
           </el-table-column>
         </el-table>
+        <pagination
+          :total="studentInfo.total"
+          :page.sync="studentInfo.page"
+          :limit.sync="studentInfo.limit"
+          :page-sizes="studentInfo.page_size"
+          @pagination="onCourse"
+        />
       </el-dialog>
     </div>
   </div>
@@ -168,9 +177,17 @@ export default {
         total: 0, // 总条数
         page_size: [10, 20, 40, 50], // 选择限制显示条数
       },
+      studentInfo: {
+        // 分页规则
+        limit: 10, // 限制显示条数
+        page: 1, // 当前页
+        total: 0, // 总条数
+        page_size: [10, 20, 40, 50], // 选择限制显示条数
+      },
       dialogTitle: "",
       gridData: [],
       userId: "",
+      activeRow: null,
     };
   },
   created() {
@@ -203,12 +220,19 @@ export default {
       });
     },
     onCourse(row) {
+      if (row.vipGroupId) {
+        console.log(row.vipGroupId)
+        this.activeRow = row;
+      }
       findStudentVipGroups({
-        vipGroupId: row.vipGroupId,
+        vipGroupId: this.activeRow.vipGroupId,
         studentId: this.userId,
+        page:this.studentInfo.page,
+        rows:this.studentInfo.limit
       }).then((res) => {
-        this.dialogTitle = row.vipGroupName;
+        this.dialogTitle = this.activeRow.vipGroupName;
         if (res.code == 200) {
+          this.studentInfo.total = res.data.total
           this.gridData = res.data.rows;
           this.dialogTableVisible = true;
         }
@@ -219,7 +243,10 @@ export default {
       this.getCourseList();
     },
     gotoVip(str) {
-       this.$router.push({path:'/vipManager/vipList',query:{search:str}})
+      this.$router.push({
+        path: "/vipManager/vipList",
+        query: { search: str },
+      });
     },
   },
 };