Jelajahi Sumber

12/22 学生考勤列表加搜索条件

mo 4 tahun lalu
induk
melakukan
faa95e9099

+ 1 - 1
src/components/remote-search/index.vue

@@ -61,7 +61,7 @@ export default {
     },
     getOptions(query) {
       this.options = this.list.filter(item=>{
-        return item.userName.toLowerCase().indexOf(query.toLowerCase())>-1
+        return item.userName.toLowerCase().indexOf(query.toLowerCase())>-1 || item.userId == query
       })
     },
     changeValue(val){

+ 39 - 14
src/views/stuRecodeManager/index.vue

@@ -13,7 +13,7 @@
         @submit="search"
         @reset="onReSet"
       >
-        <el-form-item>
+        <el-form-item prop="studentID">
           <el-input
             v-model.trim="searchForm.studentID"
             clearable
@@ -21,7 +21,10 @@
             placeholder="学生编号"
           ></el-input>
         </el-form-item>
-        <el-form-item>
+        <el-form-item prop="teacherId">
+          <remote-search :commit='"setTeachers"' v-model='searchForm.teacherId' />
+        </el-form-item>
+        <el-form-item prop="musicGroupId">
           <el-input
             v-model.trim="searchForm.musicGroupId"
             clearable
@@ -29,7 +32,7 @@
             placeholder="乐团编号"
           ></el-input>
         </el-form-item>
-        <el-form-item>
+        <el-form-item prop="courseScheduleId">
           <el-input
             v-model.trim="searchForm.courseScheduleId"
             clearable
@@ -37,7 +40,7 @@
             placeholder="课程编号"
           ></el-input>
         </el-form-item>
-        <el-form-item>
+        <el-form-item prop="groupType">
           <el-select
             v-model.trim="searchForm.groupType"
             placeholder="请选择课程组类型"
@@ -50,10 +53,24 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item>
+         <el-form-item prop="courseScheduleType">
+          <el-select
+            v-model.trim="searchForm.courseScheduleType"
+            clearable
+            placeholder="请选择课程类型"
+          >
+            <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 prop="status">
           <el-select
             v-model.trim="searchForm.status"
-            placeholder="请选择学生状态"
+            placeholder="请选择考勤状态"
           >
             <el-option
               v-for="(item, index) in attendanceStatus"
@@ -63,6 +80,16 @@
             ></el-option>
           </el-select>
         </el-form-item>
+            <el-form-item prop="dates" >
+          <el-date-picker
+            v-model="dates"
+            type="daterange"
+            style="width: 405px;"
+            range-separator="至"
+            start-placeholder="课程开始日期"
+            end-placeholder="课程结束日期">
+          </el-date-picker>
+        </el-form-item>
         <el-form-item>
           <el-button native-type="submit" type="danger">搜索</el-button>
           <el-button native-type="reset" type="primary">重置</el-button>
@@ -199,7 +226,7 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="学生状态">
+          <el-table-column align="center" label="考勤状态">
             <template slot-scope="scope">
               <div>
                 {{ scope.row.status | clockingIn }}
@@ -225,6 +252,7 @@ import axios from "axios";
 import { getToken } from "@/utils/auth";
 import pagination from "@/components/Pagination/index";
 import load from "@/utils/loading";
+import { getTimes } from "@/utils";
 import qs from "qs";
 import { findStudentAttendance } from "@/api/buildTeam";
 
@@ -244,7 +272,10 @@ export default {
         musicGroupId: "",
         courseScheduleId: "",
         status: "",
+        teacherId:'',
+        courseScheduleType:''
       },
+      dates:[],
       courseType,
       courseListType,
       attendanceStatus,
@@ -276,6 +307,7 @@ export default {
         page: this.rules.page,
         rows: this.rules.limit,
         ...this.searchForm,
+          ...getTimes(this.dates, ["startDateOfCourse", "endDateOfCourse"]),
       };
       findStudentAttendance(obj).then((res) => {
         if (res.code == 200) {
@@ -289,13 +321,6 @@ export default {
       this.getList();
     },
     onReSet() {
-      this.searchForm = {
-        search: null,
-        groupType: "MUSIC",
-        musicGroupId: "",
-        courseScheduleId: "",
-        status: "",
-      };
       this.$refs["searchForm"].resetFields();
       this.search();
     },

+ 2 - 2
vue.config.js

@@ -20,8 +20,8 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // let target = 'http://dyme.utools.club' //test环境
 // let target = 'http://192.168.3.139:8000' // 箭河
 // let target = 'http://192.168.3.38:8000' //邹璇
-// let target = 'http://192.168.3.57:8000' //勇哥
-let target = 'http://dev.dayaedu.com' // 测试服
+let target = 'http://192.168.3.57:8000' //勇哥
+// let target = 'http://dev.dayaedu.com' // 测试服
 // let target = 'http://192.168.3.196' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {