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

src/views/stuRecodeManager/index.vue

@@ -233,7 +233,16 @@
               </div>
             </template>
           </el-table-column>
-
+          <el-table-column
+            align="center"
+            label="是否被合并"
+          >
+            <template slot-scope="scope">
+              <div>
+                {{ scope.row.courseSchedule.newCourseId > 0 ? '是' : '否' }}
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column
             align="center"
             prop="startClassTime"

src/views/studentManager/components/studentRecord.vue

@@ -194,6 +194,13 @@
               </div>
             </template>
           </el-table-column>
+          <el-table-column align="center" label="是否被合并">
+            <template slot-scope="scope">
+              <div>
+                {{ scope.row.courseSchedule.newCourseId > 0 ? '是' : '否' }}
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column align="center" label="签到时间" width="180px">
             <template slot-scope="scope">
               <div>

src/views/studentManager/components/teamAndcourse.vue

@@ -5,7 +5,12 @@
                 :header-cell-style="{background:'#EDEEF0',color:'#444'}">
         <el-table-column align="center"
                          prop="musicGroupId"
-                         label="乐团编号"></el-table-column>
+                         width="180px"
+                         label="乐团编号">
+          <template slot-scope="scope">
+            <copy-text>{{ scope.row.musicGroupId }}</copy-text>
+          </template>
+        </el-table-column>
         <el-table-column align="center"
                          prop="joinMusicGroupDate"
                          label="入团时间">
@@ -13,7 +18,8 @@
         </el-table-column>
         <el-table-column align="center"
                          prop="musicGroupName"
-                         label="乐团名称"></el-table-column>
+                         label="乐团名称">
+        </el-table-column>
         <el-table-column align="center"
                          label="乐团状态">
           <template slot-scope="scope">{{ scope.row.musicGroupStatus | musicGroupType }}</template>
@@ -53,7 +59,7 @@
                          label="操作">
           <template slot-scope="scope">
             <el-button @click="onCourse(scope.row)"
-                       v-permission="'studentManage/findStudentCourses'"
+                       v-permission="'studentAttendance/findStudentAttendance'"
                        type="text">排课详情</el-button>
           </template>
         </el-table-column>
@@ -71,10 +77,10 @@
               class="searchForm"
               v-model.trim="searchForm">
         <el-form-item>
-          <el-select v-model.trim="searchForm.classGroupType"
+          <el-select v-model.trim="searchForm.courseScheduleType"
                     clearable
                     filterable
-                    placeholder="课程类型">
+                    placeholder="请选择课程类型">
             <el-option v-for="(item, index) in courseArray"
                       :key="index"
                       :label="item.label"
@@ -92,7 +98,11 @@
                       :value="item.value"></el-option>
           </el-select>
         </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>
           <el-input placeholder="班级名称"
                     @keyup.enter.native="search"
                     v-model.trim="searchForm.classGroupName"></el-input>
@@ -101,47 +111,54 @@
           <el-input placeholder="老师姓名"
                     @keyup.enter.native="search"
                     v-model.trim="searchForm.teacherName"></el-input>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item>
-          <div @click="search"
-              class="searchBtn">搜索</div>
+          <el-button type="danger" @click="search">搜索</el-button>
         </el-form-item>
       </el-form>
-      <!-- 查询列表 -->
-      <!-- <div v-if="coursesShow" class="searchWrap">
-        <p>查询条件:</p>
-        <div class="searchItem"
-            @click="closeSearch(item)"
-            v-for="(item,index) in searchLsit" :key="index">
-          {{ item.key }}
-          <i class="el-icon-close"></i>
-        </div>
-      </div>-->
         <div v-if="coursesShow"
             class="tableWrap">
           <el-table :data="coursesInfo"
                     :header-cell-style="{background:'#EDEEF0',color:'#444'}">
             <el-table-column align="center"
-                            prop="classGroupId"
-                            label="编号"></el-table-column>
+                            prop="courseScheduleId"
+                            label="课程编号">
+              <template slot-scope="scope">
+                <copy-text>{{ scope.row.courseScheduleId }}</copy-text>
+              </template>
+            </el-table-column>
             <el-table-column align="center"
-                            prop="courseDate"
-                            label="时间">
-              <template slot-scope="scope">{{ scope.row.courseDate | dateForMinFormat }}</template>
+                            width="180px"
+                            label="上课时间">
+              <template slot-scope="scope">
+                {{ scope.row.courseSchedule.classDate | dayjsFormat }} 
+                {{
+                  scope.row.courseSchedule.startClassTime | dayjsFormatMinute
+                }}-{{
+                  scope.row.courseSchedule.endClassTime | dayjsFormatMinute
+                }}
+              </template>
             </el-table-column>
             <el-table-column align="center"
-                            prop="classGroupName"
-                            label="班级名称"></el-table-column>
+                            prop="courseSchedule.name"
+                            label="课程名称"></el-table-column>
             <el-table-column align="center"
                             label="课程类型">
-              <template slot-scope="scope">{{ scope.row.classGroupType | coursesType }}</template>
+              <template slot-scope="scope">{{ scope.row.courseSchedule.type | coursesType }}</template>
             </el-table-column>
             <el-table-column align="center"
                             label="课程状态">
-              <template slot-scope="scope">{{ scope.row.courseStatus | coursesStatus }}</template>
+              <template slot-scope="scope">{{ scope.row.courseSchedule.status | coursesStatus }}</template>
+            </el-table-column>
+            <el-table-column align="center" label="是否被合并">
+              <template slot-scope="scope">
+                <div>
+                  {{ scope.row.courseSchedule.newCourseId > 0 ? '是' : '否' }}
+                </div>
+              </template>
             </el-table-column>
             <el-table-column align="center"
-                            prop="teacherName"
+                            prop="courseSchedule.teacherName"
                             label="老师姓名"></el-table-column>
           </el-table>
           <pagination :total="pageInfo.total"
@@ -157,7 +174,7 @@
 <script>
 import pagination from "@/components/Pagination/index";
 import {musicCourseType} from "@/utils/searchArray"
-
+import { findStudentAttendance } from "@/api/buildTeam";
 import {
   findStudentMusicGroups,
   findStudentCourses
@@ -173,12 +190,11 @@ export default {
       coursesShow: false, // 排课列表是否显示
       searchLsit: [],
       searchForm: {
-        studentId: null,
+        studentID: null,
         musicGroupId: null,
-        classGroupType: null,
+        courseScheduleType: null,
         courseStatus: null,
-        classGroupName: null,
-        teacherName: null
+        teacherId: null
       },
       courseArray: musicCourseType,
       courseStatus: [
@@ -197,12 +213,12 @@ export default {
   },
   mounted () {
     this.userId = this.$route.query.userId;
-    this.searchForm.studentId = this.$route.query.userId;
+    this.searchForm.studentID = this.$route.query.userId;
     this.__init();
   },
   activated () {
     this.userId = this.$route.query.userId;
-    this.searchForm.studentId = this.$route.query.userId;
+    this.searchForm.studentID = this.$route.query.userId;
     this.__init();
   },
   methods: {
@@ -216,12 +232,11 @@ export default {
     onCourse (row) {
       this.coursesShow = true;
       this.searchForm = {
-        studentId: this.$route.query.userId,
+        studentID: this.$route.query.userId,
         musicGroupId: row.musicGroupId,
-        classGroupType: null,
+        courseScheduleType: null,
         courseStatus: null,
-        classGroupName: null,
-        teacherName: null
+        teacherId: null
       };
       this.getStudentCourses();
     },
@@ -233,7 +248,8 @@ export default {
       let params = this.searchForm;
       params.rows = this.pageInfo.limit;
       params.page = this.pageInfo.page;
-      findStudentCourses(params).then(res => {
+      console.log(params)
+      findStudentAttendance(params).then(res => {
         if (res.code == 200) {
           this.coursesInfo = res.data.rows;
           this.pageInfo.total = res.data.total;