Merge branch 'online' into 05/27-备份

src/router/index.js

@@ -296,6 +296,8 @@ export const asyncRoutes = {
   // 乐团缴费详情
   strudentPayInfo: () => import('@/views/resetTeaming/components/strudentPayInfo'),
   // 学生缴费金额设置
-  studentPayBase: () => import('@/views/resetTeaming/components/studentPayBase')
+  studentPayBase: () => import('@/views/resetTeaming/components/studentPayBase'),
+  // 考情列表
+  recodeList: () => import('@/views/recodeManager/recodeList')
 }
 export default router

src/views/recodeManager/recodeList.vue

@@ -0,0 +1,132 @@
+<!--  -->
+<template>
+  <div class="m-container">
+    <h2>
+      <div class="squrt"></div>考勤列表
+    </h2>
+    <div class="m-core">
+      <el-form :inline="true"
+               :model="searchForm">
+        <el-form-item>
+          <el-input v-model.trim="searchForm.search"
+                    @keyup.enter.native="search"
+                    placeholder='老师编号或老师学生'></el-input>
+        </el-form-item>
+        <el-form-item prop="organId">
+          <el-select class="multiple"
+                     v-model.trim="searchForm.organIdList"
+                     filterable
+                     clearable
+                     placeholder="请选择分部">
+            <el-option v-for="(item,index) in organList"
+                       :key="index"
+                       :label="item.name"
+                       :value="item.id"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="课程类型">
+          <el-select v-model.trim="searchForm.courseScheduleType"
+                     @change="chioseList">
+            <el-option v-for='(item,index) in courseType'
+                       :key="index"
+                       :value="item.value"
+                       :label="item.label"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-date-picker v-model.trim="courseTime"
+                          style="width:410px;"
+                          type="daterange"
+                          value-format="yyyy-MM-dd"
+                          range-separator="至"
+                          start-placeholder="开始日期"
+                          end-placeholder="结束日期">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <div class="tableWrap">
+        <el-table style="width: 100%"
+                  :header-cell-style="{background:'#EDEEF0',color:'#444'}"
+                  :data="tableList">
+          <el-table-column align="center"
+                           prop="studentId"
+                           label="分部"></el-table-column>
+        </el-table>
+        <pagination :total="rules.total"
+                    :page.sync="rules.page"
+                    :limit.sync="rules.limit"
+                    :page-sizes="rules.page_size"
+                    @pagination="getList" />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import axios from "axios";
+import { getToken } from "@/utils/auth";
+import pagination from "@/components/Pagination/index";
+import load from "@/utils/loading";
+import { getTeacher, getEmployeeOrgan } from "@/api/buildTeam";
+import { getTeacherPersonalAttendances } from "@/api/teacherManager";
+import { coursesType } from '@/utils/searchArray'
+
+export default {
+  components: { pagination },
+  data () {
+    return {
+      searchForm: {
+        search: null,
+        organIdList: null,
+        courseTime: [],
+      },
+      coursesType,
+      // teacherList: [],
+      tableList: [],
+      organList: [],
+      rules: {
+        // 分页规则
+        limit: 10, // 限制显示条数
+        page: 1, // 当前页
+        total: 0, // 总条数
+        page_size: [10, 20, 40, 50] // 选择限制显示条数
+      },
+    };
+  },
+  //生命周期 - 创建完成（可以访问当前this实例）
+  created () { },
+  //生命周期 - 挂载完成（可以访问DOM元素）
+  mounted () {
+    // getTeacher().then(res => {
+    //   if (res.code == 200) {
+    //     this.teacherList = res.data;
+    //   }
+    // });
+    // 获取分部
+    getEmployeeOrgan().then(res => {
+      if (res.code == 200) {
+        this.organList = res.data;
+      }
+    });
+    this.init();
+
+
+  },
+  activated () {
+    this.init();
+  },
+  methods: {
+    init () {
+    },
+    getList () {
+      getTeacherPersonalAttendances().then(res => {
+        if (res.code == 200) {
+          this.tableList = res.data.rows;
+        }
+      })
+    }
+  }
+};
+</script>
+<style lang='scss' scoped>
+</style>

src/views/resetTeaming/components/resetPayList.vue

@@ -110,7 +110,7 @@
                       prop="deadlinePaymentDate">
           <el-date-picker v-model.trim="payForm.deadlinePaymentDate"
                           type="date"
-                          :picker-options="pickerOptions"
+                          :picker-options="bigin"
                           value-format="yyyy-MM-dd"
                           placeholder="开始日期"></el-date-picker>
         </el-form-item>
@@ -207,6 +207,7 @@ export default {
       qrcodes: true,
       qrcode: null,
       codeUrl: null,
+      bigin: this.beginDate(),
     };
   },
   //生命周期 - 创建完成（可以访问当前this实例）
@@ -320,6 +321,19 @@ export default {
       isdate = new Date((isdate / 1000 + (86400 * dayCount)) * 1000);  //日期加1天
       let pdate = isdate.getFullYear() + "-" + (isdate.getMonth() + 1) + "-" + (isdate.getDate());   //把日期格式转换成字符串
       return pdate;
+    },
+    beginDate () {
+      let self = this
+      return {
+        disabledDate (time) {
+          if (self.payForm.startPaymentDate) {
+            return new Date(self.payForm.startPaymentDate).getTime() > time.getTime()
+          } else {
+            return time.getTime() >= Date.now()
+            //开始时间不选时，结束时间最大值小于等于当天
+          }
+        }
+      }
     }
   },
   watch: {
@@ -333,7 +347,8 @@ export default {
         this.payForm = {
           startPaymentDate: null,
           type: null,
-          memo: null
+          memo: null,
+          deadlinePaymentDate: null
         }
         this.$refs['payForm'].resetFields()
       }

src/views/resetTeaming/components/studentPayBase.vue

@@ -148,6 +148,7 @@ export default {
           return time.getTime() + 86400000 <= new Date().getTime();
         }
       },
+
       payForm: {
         startDate: null
       },
@@ -164,12 +165,7 @@ export default {
   //生命周期 - 挂载完成（可以访问DOM元素）
   mounted () {
     // 获取声部
-    this.teamid = this.$route.query.id;
-    findSound({ musicGroupId: this.teamid }).then(res => {
-      if (res.code == 200) {
-        this.soundList = res.data;
-      }
-    });
+
     // 获取分部
 
     this.init();
@@ -181,6 +177,12 @@ export default {
   },
   methods: {
     init () {
+      this.teamid = this.$route.query.id;
+      findSound({ musicGroupId: this.teamid }).then(res => {
+        if (res.code == 200) {
+          this.soundList = res.data;
+        }
+      });
       this.getList()
     },
     getList () {