mo 4 年 前
コミット
b691b387c4
2 ファイル変更59 行追加15 行削除
  1. 8 0
      src/api/studentManager.js
  2. 51 15
      src/views/buildVip/index.vue

+ 8 - 0
src/api/studentManager.js

@@ -12,6 +12,14 @@ export function queryStudentList (data) {
   })
 }
 
+// 获取分部学生列表
+export function queryOrganStudentList (data) {
+  return request({
+    url: api + '/studentManage/queryOrganStudentList',
+    method: 'get',
+    params: data
+  })
+}
 // 获取学生vip课
 export function findStudentVipGroupClass (data) {
   return request({

+ 51 - 15
src/views/buildVip/index.vue

@@ -245,7 +245,10 @@
           class="vipMsg"
         ></el-alert>
 
-        <p class="submitP" v-if="minCourseNum&&maxCourseNum&&this.hotType == 'DISCOUNT'">
+        <p
+          class="submitP"
+          v-if="minCourseNum && maxCourseNum && this.hotType == 'DISCOUNT'"
+        >
           该活动最小课时数:<span style="color: red">{{ minCourseNum }}</span
           >节 最大课时数:<span style="color: red">{{ maxCourseNum }}</span
           >节
@@ -582,7 +585,7 @@
         <div class="planTop">
           <p>已排课程</p>
         </div>
-        <div class="planCore">
+        <div class="planCore" v-if="this.lookList.length>0">
           <div v-for="(item, index) in this.lookList" class="row" :key="index">
             <div class="name">{{ item.type }}</div>
             <div class="week">{{ item.week }}</div>
@@ -594,6 +597,9 @@
             </div>
           </div>
         </div>
+        <div class="nomore" v-else>
+          暂无数据
+        </div>
         <div slot="footer" style="margin-top: 20px" class="dialog-footer">
           <el-button @click="dialogFormVisible = false">取 消</el-button>
           <el-button type="primary" @click="setTimeTable">确 定</el-button>
@@ -630,6 +636,7 @@ import { getTeachSchool, getTeacherBySubject } from "@/api/teacherManager";
 import axios from "axios";
 import { getToken } from "@/utils/auth";
 import { diffTimerFormMinute, addTimerFormMinute } from "@/utils/date";
+import { queryOrganStudentList } from "@/api/studentManager";
 import dayjs from "dayjs";
 export default {
   name: "buildVip",
@@ -918,6 +925,7 @@ export default {
         },
       };
     },
+
     processDate() {
       //提出结束时间必须大于提出开始时间
       let self = this;
@@ -1235,13 +1243,11 @@ export default {
       } else if (giveClassType == "OFFLINE") {
         offline += giveNum;
       }
-      if( !this.maskForm.courseStartOnline){
-         this.$message.error("请选择课程开始时间");
+      if (!this.maskForm.courseStartOnline) {
+        this.$message.error("请选择课程开始时间");
         return;
       }
 
-
-
       // 这里判断是否选择了排课开始时间
       // if (online && !this.maskForm.courseStartOnline) {
       //   this.$message.error("选择了线上课 但没有线上课开始时间");
@@ -1254,7 +1260,7 @@ export default {
       // }
       let date, date1;
       date = new Date(this.maskForm.courseStartOnline.getTime());
-       date1 = new Date(this.maskForm.courseStartOnline.getTime());
+      date1 = new Date(this.maskForm.courseStartOnline.getTime());
       // if (this.maskForm.courseStartOnline) {
       //   date = new Date(this.maskForm.courseStartOnline.getTime());
       // }
@@ -1350,11 +1356,21 @@ export default {
       }
       //  (this.timeTable);
 
-      this.timeTable.sort((a,b)=>{
-        let aStr = dayjs(dayjs(a.classDate).format('YYYY-MM-DD')+' '+a.startClassTimeStr+':00').valueOf()
-        let bStr =  dayjs(dayjs(b.classDate).format('YYYY-MM-DD')+' '+b.startClassTimeStr+':00').valueOf()
-         return aStr-bStr
-      })
+      this.timeTable.sort((a, b) => {
+        let aStr = dayjs(
+          dayjs(a.classDate).format("YYYY-MM-DD") +
+            " " +
+            a.startClassTimeStr +
+            ":00"
+        ).valueOf();
+        let bStr = dayjs(
+          dayjs(b.classDate).format("YYYY-MM-DD") +
+            " " +
+            b.startClassTimeStr +
+            ":00"
+        ).valueOf();
+        return aStr - bStr;
+      });
       this.dialogFormVisible = false;
     },
     getThinkDate(date, num) {
@@ -1645,6 +1661,7 @@ export default {
 
       // this.leftForm.courseType = null;
       if (val) {
+        this.getOrganStudentList(val)
         vipGroupCategory({
           organId: val,
         }).then((res) => {
@@ -1746,6 +1763,18 @@ export default {
 
       //subjectIdList
     },
+    getOrganStudentList(organId) {
+      if (organId) {
+        queryOrganStudentList({
+          rows: 50,
+          organId:organId,
+        }).then((res) => {
+          if (res.code == 200) {
+            this.studentList = res.data.rows;
+          }
+        });
+      }
+    },
     remoteMethod(query) {
       if (query !== "") {
         this.remoteLoading = true;
@@ -1892,9 +1921,9 @@ export default {
   //   width: 400px;
   // }
 
-  // .right {
-  //   width: 400px;
-  // }
+  .right {
+    margin-top: 20px;
+  }
 }
 .vipMsg {
   margin-bottom: 20px;
@@ -1939,6 +1968,13 @@ export default {
       // }
     }
   }
+  .nomore {
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+    align-items: center;
+    height: 40px;
+  }
 }
 
 .okBtn {