Merge branch '01/21VipReset' of http://git.dayaedu.com/molingzhide/dy-admin-manager into 01/21VipReset

src/router/notKeepAliveList.js

@@ -76,6 +76,7 @@ export default [
   '/orderList/incomeOut', // 对外订单管理
   '/business/signupList', // 报名缴费
   '/business/teamDetails', //进行中 查看
+  '/business/teamTeacherRecord', // 进行中 查看 上课记录
   '/business/teamLookBase', // 筹备中 乐团信息
   '/business/vipReset', // vip修改
   '/business/vipDetail', // vip查看

src/views/studentManager/components/studentInfo.vue

@@ -1,100 +1,123 @@
 <template>
-  <div class='studentDetail'>
-    <el-form :inline="true">
-      <el-form-item label="学生姓名">
-        <el-input disabled
-                  :value="studentForm.username"></el-input>
-      </el-form-item>
-      <el-form-item label="学生性别">
-        <el-input :value="studentForm.gender ? '男':'女'"
-                  disabled></el-input>
-      </el-form-item>
-      <el-form-item label="出生年月">
-        <el-input :value="studentForm.birthdate"
-                  disabled></el-input>
-      </el-form-item>
-      <el-form-item label="家长姓名">
-        <el-input :value="studentForm.realName"
-                  disabled></el-input>
-      </el-form-item>
-      <el-form-item label="联系电话">
-        <el-input :value="studentForm.parentsPhone"
-                  disabled></el-input>
-      </el-form-item>
-      <!-- <el-form-item label="所在学校">
-        <el-input :value=""
-                  disabled></el-input>
-      </el-form-item> -->
-      <!-- <el-form-item label="所属分部">
-        <el-input :value="1"
-                  disabled></el-input>
-      </el-form-item> -->
-      <el-form-item label="年级班级">
-        <el-input :value="studentForm.currentGrade + studentForm.currentClass"
-                  disabled></el-input>
-      </el-form-item>
+  <div class="studentDetail">
+    <el-form ref="form" label-width="130px">
+      <el-row>
+        <el-col :xl="6" :lg="8" :md="8" :xs="12">
+          <el-form-item label="学生姓名">
+            <el-input disabled :value="studentForm.username"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :xl="6" :lg="8" :md="8" :xs="12">
+          <el-form-item label="学生性别">
+            <el-input :value="studentForm.gender ? '男' : '女'" disabled></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :xl="6" :lg="8" :md="8" :xs="12">
+          <el-form-item label="出生年月">
+            <el-input :value="studentForm.birthdate" disabled></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :xl="6" :lg="8" :md="8" :xs="12">
+          <el-form-item label="家长姓名">
+            <el-input :value="studentForm.realName" disabled></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :xl="6" :lg="8" :md="8" :xs="12">
+          <el-form-item label="联系电话">
+            <el-input :value="studentForm.parentsPhone" disabled></el-input>
+          </el-form-item>
+        </el-col>
+
+        <!-- <el-col :xl="6" :lg="8" :md="8" :xs="12">
+          <el-form-item label="年级班级">
+            <el-input
+              :value="studentForm.currentGrade + studentForm.currentClass"
+              disabled
+            ></el-input>
+          </el-form-item>
+        </el-col> -->
+
+        <el-col :xl="6" :lg="8" :md="8" :xs="12">
+          <el-form-item label="所属分部">
+            <el-input :value="studentForm.organName" disabled ></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :xl="6" :lg="8" :md="8" :xs="12">
+          <el-form-item label="学员声部">
+            <el-input :value="studentForm.subjectName" disabled ></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :xl="6" :lg="8" :md="8" :xs="12">
+          <el-form-item label="是否运营">
+            <el-input :value="studentForm.operatingTag ? '是' : '否'" disabled></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :xl="6" :lg="8" :md="8" :xs="12">
+          <el-form-item label="是否服务">
+            <el-input :value="studentForm.serviceTag ? '是' : '否'" disabled></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :xl="6" :lg="8" :md="8" :xs="12">
+          <el-form-item label="指导老师">
+            <el-input :value="studentForm.teacherName" disabled></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :xl="6" :lg="8" :md="8" :xs="12">
+          <el-form-item label="是否是新用户">
+            <template slot="label">
+              <p style="position: relative">
+                是否是新用户
+                <el-tooltip placement="top" popper-class="mTooltip">
+                  <div slot="content">
+                    没有有效的VIP课程或未参与2020年双十一活动的用户为新用户
+                  </div>
+                  <i
+                    class="el-icon-question"
+                    style="font-size: 18px; color: #f56c6c"
+                  ></i>
+                </el-tooltip>
+              </p>
+            </template>
+            <el-input :value="studentForm.isNewUser ? '是' : '否'" disabled></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
-    <!-- <div class="teamList">
-      <h4>乐团1</h4>
-      <el-form :inline="true">
-        <el-form-item label="入团日期">
-          <el-input value="2019-09-26"></el-input>
-        </el-form-item>
-        <el-form-item label="所在乐团">
-          <el-input value="2019-09-26"></el-input>
-        </el-form-item>
-        <el-form-item label="报名声部">
-          <el-input value="2019-09-26"></el-input>
-        </el-form-item>
-        <el-form-item label="乐团状态">
-          <el-input value="2019-09-26"></el-input>
-        </el-form-item>
-        <el-form-item label="乐器来源">
-          <el-input value="2019-09-26"></el-input>
-        </el-form-item>
-        <el-form-item label="所选乐器">
-          <el-input value="2019-09-26"></el-input>
-        </el-form-item>
-        <el-form-item label="XX价格">
-          <el-input value="2019-09-26"></el-input>
-        </el-form-item>
-      </el-form>
-    </div> -->
+
   </div>
 </template>
 <script>
-import { findStudentBaseInfo, findStudentMusicGroups } from '@/api/studentManager'
+// import {
+//   findStudentBaseInfo
+// } from "@/api/studentManager";
 export default {
-  name: 'studentInfo',
-  data () {
+  name: "studentInfo",
+  data() {
+    const query = this.$route.query
     return {
-      userId: null,
-      studentForm: {},
-      musicGroupInfo: [] // 乐团信息
-    }
+      studentForm: query || {},
+    };
   },
-  mounted () {
-    this.__init()
+  mounted() {
+    this.__init();
   },
   methods: {
-    __init () {
-      this.userId = this.$route.query.userId
-      findStudentBaseInfo({ userId: this.userId }).then(res => {
-        if (res.code == 200) {
-          this.studentForm = res.data
-        }
-      })
-      // findStudentMusicGroups(this.userId).then(res => {
-      //   if(res.code == 200) {
-      //     this.musicGroupInfo.push(...res.data)
+    __init() {
+      // this.userId = this.$route.query.userId;
+      // findStudentBaseInfo({ userId: this.userId }).then(res => {
+      //   if (res.code == 200) {
+      //     this.studentForm = res.data;
       //   }
-      // })
+      // });
     }
   }
-}
+};
 </script>
 <style lang="scss" scope>
 .studentDetail {
+  margin-top: 20px;
   .teamList {
     margin-top: 20px;
     h4 {

src/views/studentManager/index.vue

@@ -6,31 +6,31 @@
     <div class="m-core">
       <!-- navMenu -->
       <tab-router v-model.trim="activeIndex" type="card" @tab-click="handleClick">
-        <el-tab-pane label="基本信息" v-if="permissionList.studentInfo" name="1">
+        <el-tab-pane label="基本信息" lazy v-if="permissionList.studentInfo" name="1">
           <studentInfo v-if="activeIndex == 1" />
         </el-tab-pane>
-        <el-tab-pane label="乐团&课程" v-if="permissionList.teamAndcourse" name="2">
+        <el-tab-pane label="乐团&课程" lazy v-if="permissionList.teamAndcourse" name="2">
           <teamAndcourse v-if="activeIndex == 2" />
         </el-tab-pane>
-        <el-tab-pane label="VIP课" v-if="permissionList.studentVip" name="3">
+        <el-tab-pane label="VIP课" lazy v-if="permissionList.studentVip" name="3">
           <studentVip v-if="activeIndex == 3" />
         </el-tab-pane>
-        <el-tab-pane label="对外课" v-if="permissionList.studentOutList" name="4">
+        <el-tab-pane label="对外课" lazy v-if="permissionList.studentOutList" name="4">
           <studentOutList v-if="activeIndex == 4" />
         </el-tab-pane>
-        <el-tab-pane label="网管课" v-if="permissionList.studentNetwork" name="9">
+        <el-tab-pane label="网管课" lazy v-if="permissionList.studentNetwork" name="9">
           <studentNetwork v-if="activeIndex == 9" />
         </el-tab-pane>
-        <el-tab-pane label="课表详情" v-if="permissionList.studentRecord" name="5">
+        <el-tab-pane label="课表详情" lazy v-if="permissionList.studentRecord" name="5">
           <studentRecord v-if="activeIndex == 5" />
         </el-tab-pane>
-        <el-tab-pane label="扣费记录" v-if="permissionList.studentPayList" name="6">
+        <el-tab-pane label="扣费记录" lazy v-if="permissionList.studentPayList" name="6">
           <studentPayList v-if="activeIndex == 6" />
         </el-tab-pane>
-        <el-tab-pane label="学员订单" v-if="permissionList.studentOrder" name="7">
+        <el-tab-pane label="学员订单" lazy v-if="permissionList.studentOrder" name="7">
           <studentOrder v-if="activeIndex == 7" />
         </el-tab-pane>
-        <el-tab-pane label="学员提现" v-if="permissionList.studentCashout" name="8">
+        <el-tab-pane label="学员提现" lazy v-if="permissionList.studentCashout" name="8">
           <studentCashout v-if="activeIndex == 8" />
         </el-tab-pane>
       </tab-router>
@@ -86,7 +86,7 @@ export default {
     if (this.$route.query.rules) {
       this.Frules = this.$route.query.rules;
     }
-    this.studentName = this.$route.query.studentName;
+    this.studentName = this.$route.query.username;
   },
   activated() {
     if (this.$route.query.search) {
@@ -95,7 +95,7 @@ export default {
     if (this.$route.query.rules) {
       this.Frules = this.$route.query.rules;
     }
-    this.studentName = this.$route.query.studentName;
+    this.studentName = this.$route.query.username;
   },
   methods: {
     onCancel() {

src/views/studentManager/studentList.vue

@@ -252,11 +252,10 @@
                 v-permission="'/studentDetail'"
                 class="el-button--text"
                 :to="{
-                  path: `/business/studentDetail?userId=${scope.row.userId}`,
-                  query: { studentName: scope.row.username },
+                  path: `/business/studentDetail`,
+                  query: { ...scope.row },
                 }"
-                >查看</router-link
-              >
+                >查看</router-link>
               <el-button
                 type="text"
                 style="padding-left: 10px;"

src/views/teamDetail/components/studentList.vue

@@ -45,8 +45,9 @@
     <div style="margin-bottom: 15px;">
       <el-button type="primary" v-permission="'studentRegistration/insertStudent'"
               @click="addStudentVisible = true">新增学员</el-button>
-      <el-button type="primary" v-permission="'/studentSignin'"
-              @click="gotoSignin">点名总览</el-button>
+      <!-- 可以直接去学生考勤查看 -->
+      <!-- <el-button type="primary" v-permission="'/studentSignin'"
+              @click="gotoSignin">点名总览</el-button> -->
       <el-button type="primary" v-permission="'studentManage/queryStudentSubTotalCourseTimes'"
               @click="viewTimer">剩余时长明细</el-button>
     </div>

src/views/teamDetail/components/teacherList.vue

@@ -32,11 +32,12 @@
       <el-form-item>
         <el-button native-type="submit" type="danger">搜索</el-button>
       </el-form-item>
-      <el-form-item style="float: right">
+      <!-- 可以直接去老师考勤列表里面查 -->
+      <!-- <el-form-item style="float: right">
         <div class="right newBand" style="margin-bottom: 0" @click="gotoRecord">
           上课记录
         </div>
-      </el-form-item>
+      </el-form-item> -->
     </save-form>
 
     <!-- 列表 -->

src/views/teamDetail/components/teamTeacherRecord.vue

@@ -99,8 +99,9 @@ export default {
     pagination
   },
   data () {
+    const query = this.$route.query
     return {
-      name: '',
+      name: query.name,
       searchForm: {
         teacher: '',
         timer: []
@@ -117,11 +118,11 @@ export default {
       },
     }
   },
-  created () {
-    this.teamId = this.$route.query.id;
-  },
+  // created () {
+  //   this.teamId = this.$route.query.id;
+  // },
   mounted () {
-    this.name = localStorage.getItem('teamName');
+    // this.name = localStorage.getItem('teamName');
     // findMusicGroupClassTeacher({ musicGroupId: this.teamId }).then(res => {
     //   if (res.code == 200) {
     //     this.teacherList = res.data;