1120 21:08

11

src/views/categroyManager/vipNewActive.vue

@@ -193,8 +193,8 @@ export default {
         { min: 1, max: 25, message: '长度在 1 到 25 个字符', trigger: 'blur' }],
         desc: [{ required: true, message: '请输入文字描述', trigger: 'blur' },
         { min: 1, max: 200, message: '长度在 1 到 200 个字符', trigger: 'blur' }],
-        activeTime: [{ required: true, message: '请选择活动时间', trigger: 'blur' }],
-        courseTime: [{ required: true, message: '请选择课程时间', trigger: 'blur' }],
+        activeTime: [{ required: false, message: '请选择活动时间', trigger: 'blur' }],
+        courseTime: [{ required: false, message: '请选择课程时间', trigger: 'blur' }],
       },
       courseStatusList: [], // 获取所有课程形式
       activeType: '',

src/views/teamBuild/components/teamBaseInfo.vue

@@ -697,7 +697,7 @@ export default {
 
               } else {
                 this.$message.success('修改乐团成功')
-                this.$router.push({ path: '/business/teamDetails', query: { id: this.teamid, name: this.topFrom.name } })
+                // this.$router.push({ path: '/business/teamDetails', query: { id: this.teamid, name: this.topFrom.name } })
               }
 
             }

src/views/teamBuild/teamSeting/components/improvementClass.vue

@@ -108,10 +108,11 @@
         </el-form-item>
         <el-form-item label="主教老师"
                       prop="teacher">
-          <el-select v-model="maskForm.teacher">
+          <el-select v-model="maskForm.teacher"
+                     filterable>
             <el-option v-for="(item,index) in teacherList"
                        :key="index"
-                       :label="item.name"
+                       :label="item.realName"
                        :value="item.userId"></el-option>
           </el-select>
         </el-form-item>
@@ -229,10 +230,15 @@ export default {
         this.soundList = res.data;
       }
     })
-    findMusicGroupClassTeacher({ musicGroupId: this.teamid }).then(res => {
+    // findMusicGroupClassTeacher({ musicGroupId: this.teamid }).then(res => {
+    //   if (res.code == 200) {
+    //     this.teacherList = res.data
+    //     // console.log(res.data);
+    //   }
+    // })
+    getTeacher().then(res => {
       if (res.code == 200) {
         this.teacherList = res.data
-        // console.log(res.data);
       }
     })
     // 获取乐团老师

src/views/teamDetail/components/studentSignin.vue

@@ -9,6 +9,43 @@
     <div class='m-core'>
       <!-- <div class="searchBtn">导出</div> -->
       <!-- table  -->
+      <el-form :inline="true"
+               :model="searchForm">
+        <el-form-item label='开课时间'>
+          <el-date-picker v-model="searchForm.times"
+                          type="datetimerange"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          range-separator="至"
+                          start-placeholder="开始日期"
+                          end-placeholder="结束日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label='课程名称'>
+          <el-input v-model="searchForm.courseName"></el-input>
+        </el-form-item>
+        <el-form-item label='学生名字'>
+          <el-input v-model="searchForm.studentName"></el-input>
+        </el-form-item>
+        <el-form-item label='签到'>
+          <el-select v-model="searchForm.sign">
+            <el-option label="正常"
+                       value="NORMAL"></el-option>
+            <el-option label="旷课"
+                       value="TRUANT"></el-option>
+            <el-option label="请假"
+                       value="LEAVE"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="danger"
+                     @click="search">搜索</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary"
+                     @click="reset">重置</el-button>
+        </el-form-item>
+      </el-form>
       <div class="tableList">
         <el-table :data='tableList'>
           <el-table-column align='center'
@@ -60,6 +97,13 @@ export default {
         total: 0, // 总条数
         page_size: [10, 20, 40, 50] // 选择限制显示条数
       },
+      searchForm: {
+        times: [],
+        courseName: '',
+        studentName: '',
+        sign: ''
+      },
+
       teamid: ''
     }
   },
@@ -70,6 +114,20 @@ export default {
     this.getList()
   },
   methods: {
+    search () {
+      this.rules.page = 1;
+      this.getList()
+    },
+    reset () {
+      this.searchForm = {
+        times: [],
+        courseName: '',
+        studentName: '',
+        sign: ''
+      }
+      this.rules.page = 1;
+      this.getList()
+    },
     onCancel () {
       // history.go(-1)
       let params = this.$route.query
@@ -85,7 +143,17 @@ export default {
     },
     getList () {
       // console.log(111);
-      getStudentRecord({ search: this.teamid }).then(res => {
+      if (!this.searchForm.times) {
+        this.searchForm.times = []
+      }
+      let startTime = this.searchForm.times[0] || null
+      let endTime = this.searchForm.times[1] || null
+      let courseScheduleName = this.searchForm.courseName || null
+      let userName = this.searchForm.studentName || null
+      let signStatus = this.searchForm.sign || null
+      console.log(signStatus)
+      let musicGroupId = this.teamid
+      getStudentRecord({ musicGroupId, page: this.rules.page, rows: this.rules.limit, startTime, endTime, courseScheduleName, userName, signStatus }).then(res => {
         if (res.code == 200) {
           this.tableList = res.data.rows;
           this.rules.total = res.data.total;