Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/pages/stuMan/AppointmentStatistics.vue

@@ -12,7 +12,10 @@
         </el-date-picker>
       </div>
     </div>
-    <stuAppointmentList :tableData="tableData" @refresh="refreshPage" :loading="loading"></stuAppointmentList>
+    <stuAppointmentList :tableData="tableData" 
+    @chang="getPlanAppointmentList"
+    @refresh="refreshPage"
+     :loading="loading"></stuAppointmentList>
   </div>
 </template>
 

src/pages/stuMan/ClassEliminationStatistics.vue

 <template>
-  <div class="page-body MainPlan xg">
+  <div class="page-body MainPlan xg listBox">
     <div class="col row wrap q-col-gutter-md">
       <div class="col-2 flex">
         <el-select v-model="msg.TeacherAccountId" style="width: 100%" placeholder="教师" size="small"
@@ -55,7 +55,9 @@
         <q-btn color="accent" size="sm" class="q-mr-md" label="下载计划" @click="DownLoadStuLearnChapterStatic()" />
       </div>
     </div>
-    <consumptionCourseList v-loading="loading" :dataList="tableData" :MaxLength="MaxLength" :loading="loading">
+    <consumptionCourseList 
+    
+    v-loading="loading" :dataList="tableData" :MaxLength="MaxLength" :loading="loading">
     </consumptionCourseList>
   </div>
 </template>
@@ -111,6 +113,7 @@
         MaxLength: 0,
         GuestStateList: [], //学员状态
         StuList: [], //学员列表
+        tableHeight: 500,
       };
     },
     created() {
@@ -129,6 +132,10 @@
       this.queryCourseRate();
       this.getStateList();
       this.queryStuList();
+      setTimeout(() => {
+        this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 90;
+        // this.tableHeight = window.innerHeight - 200;
+      }, 100)
     },
     mounted() {
       // this.getPlanList();
@@ -206,6 +213,9 @@
   };
 </script>
 <style lang="scss">
+  .listBox{
+    height: calc(100% - 90px);
+  }
   .xg .el-input--prefix .el-input__inner {
     padding-left: 50px;
   }

src/pages/stuMan/components/consumptionCourseList.vue

@@ -29,9 +29,11 @@
         </div>
       </div>
     </div> -->
-    <div v-if="dataList.length>0" class="list-box">
+    <!-- :style="{'height':tableHeight+'px'}" -->
+    <div v-if="dataList.length>0" ref="table" class="list-box" :style="{'height':tableHeight+'px'}">
         <table style="border-collapse: collapse;"
-        :style="{'width':dataList.length>20?'1900px':'auto'}"
+        
+        :style="{'width':dataList.length>20?'1900px':'auto',}"
       class="tableBox" border="1px">
         <tr>
           <td class="cancelClassList-left" style="width: 70px;">
@@ -115,6 +117,7 @@
     },
     data() {
       return {
+        tableHeight: 500,
         titleList: [{
             name: '课程名称'
           },
@@ -138,7 +141,10 @@
       };
     },
     created() {
-
+      setTimeout(() => {
+        // this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 90;
+        this.tableHeight = window.innerHeight - 200;
+      }, 100)
     },
     mounted() {
 
@@ -162,7 +168,8 @@
 </script>
 <style lang="scss" scoped>
   .list-box{
-    width: 100%;height:700px;overflow: auto;
+    width: 100%;
+    overflow: auto;
   }
   .tableBox tr,.tableBox tr td{
     text-align: center;

src/pages/stuMan/components/stuAppointmentList.vue

@@ -25,7 +25,7 @@
                 </div>
                 <div class="content-name">
                   <div v-for="S in i.StuList">
-                    <q-badge color="blue">
+                    <q-badge color="blue" @click="getStuRight(S)">
                       {{S.StuName}}
                     </q-badge>
                   </div>
@@ -38,11 +38,22 @@
       </div>
     </div>
     <appointmentDetails v-if="isShowDetails" :showItem="showItem" @refreshpage="refreshpage"></appointmentDetails>
+    <!-- 学员信息抽屉 -->
+    <studentRight-form
+      v-if="isShowStuRight"
+      :isJudgeTrans="isJudgeTrans"
+      :BelongType="BelongType"
+      :save-obj="stuOption"
+      @close="closeStuForm"
+      @success="refreshStuList"
+      @reload="refreshStuList"
+    >
+    </studentRight-form>
   </div>
 </template>
 <script>
-
   import appointmentDetails from "./appointmentDetails";
+  import studentRightForm from "../../../components/school/student/studentRight-form";//学员信息
   export default {
     props: {
       tableData: {
@@ -58,7 +69,8 @@
       title: "学员预约统计",
     },
     components: {
-      appointmentDetails
+      appointmentDetails,
+      studentRightForm
     },
     data() {
       return {
@@ -82,11 +94,32 @@
         //是否显示预约详情
         isShowDetails: false,
         showItem: {},
+        isShowStuRight:false,
+        stuOption:null,
+        BelongType: 1,
+        isJudgeTrans: 1,
       };
     },
     created() {},
     mounted() {},
     methods: {
+      // 学员信息
+      getStuRight(obj) {
+        if (obj) {
+          this.stuOption = {
+            StuId: obj.StuId,
+            noEdit: true
+          };
+          this.BelongType = obj.BelongType;
+        }
+        this.isShowStuRight = true;
+      },
+      closeStuForm() {
+        this.isShowStuRight = false;
+      },
+      refreshStuList() {
+        this.$emit('chang')
+      },
       //刷新页面
       refreshpage() {
         this.isShowDetails=false;
@@ -119,6 +152,7 @@
   }
   .content-name div{
     margin-left: 5px;
+    cursor: pointer;
   }
   .content-name{
     height: 40px;