|  | @@ -19,7 +19,7 @@
 | 
	
		
			
				|  |  |              clearable
 | 
	
		
			
				|  |  |              type="number"
 | 
	
		
			
				|  |  |              @keydown.enter.native="
 | 
	
		
			
				|  |  | -              (e) => {
 | 
	
		
			
				|  |  | +              e => {
 | 
	
		
			
				|  |  |                  e.target.blur();
 | 
	
		
			
				|  |  |                  $refs.searchForm.save();
 | 
	
		
			
				|  |  |                  search();
 | 
	
	
		
			
				|  | @@ -60,7 +60,7 @@
 | 
	
		
			
				|  |  |              type="number"
 | 
	
		
			
				|  |  |              clearable
 | 
	
		
			
				|  |  |              @keydown.enter.native="
 | 
	
		
			
				|  |  | -              (e) => {
 | 
	
		
			
				|  |  | +              e => {
 | 
	
		
			
				|  |  |                  e.target.blur();
 | 
	
		
			
				|  |  |                  $refs.searchForm.save();
 | 
	
		
			
				|  |  |                  search();
 | 
	
	
		
			
				|  | @@ -74,7 +74,7 @@
 | 
	
		
			
				|  |  |              v-model.trim="searchForm.courseScheduleId"
 | 
	
		
			
				|  |  |              clearable
 | 
	
		
			
				|  |  |              @keydown.enter.native="
 | 
	
		
			
				|  |  | -              (e) => {
 | 
	
		
			
				|  |  | +              e => {
 | 
	
		
			
				|  |  |                  e.target.blur();
 | 
	
		
			
				|  |  |                  $refs.searchForm.save();
 | 
	
		
			
				|  |  |                  search();
 | 
	
	
		
			
				|  | @@ -85,7 +85,10 @@
 | 
	
		
			
				|  |  |            ></el-input>
 | 
	
		
			
				|  |  |          </el-form-item>
 | 
	
		
			
				|  |  |          <el-form-item prop="groupType">
 | 
	
		
			
				|  |  | -          <el-select v-model.trim="searchForm.groupType" placeholder="请选择课程组类型">
 | 
	
		
			
				|  |  | +          <el-select
 | 
	
		
			
				|  |  | +            v-model.trim="searchForm.groupType"
 | 
	
		
			
				|  |  | +            placeholder="请选择课程组类型"
 | 
	
		
			
				|  |  | +          >
 | 
	
		
			
				|  |  |              <el-option
 | 
	
		
			
				|  |  |                v-for="(item, index) in courseListType"
 | 
	
		
			
				|  |  |                :key="index"
 | 
	
	
		
			
				|  | @@ -165,7 +168,12 @@
 | 
	
		
			
				|  |  |              prop="courseSchedule.organization.name"
 | 
	
		
			
				|  |  |              label="分部"
 | 
	
		
			
				|  |  |            ></el-table-column>
 | 
	
		
			
				|  |  | -          <el-table-column align="center" prop="username" label="学生姓名" width="110px">
 | 
	
		
			
				|  |  | +          <el-table-column
 | 
	
		
			
				|  |  | +            align="center"
 | 
	
		
			
				|  |  | +            prop="username"
 | 
	
		
			
				|  |  | +            label="学生姓名"
 | 
	
		
			
				|  |  | +            width="110px"
 | 
	
		
			
				|  |  | +          >
 | 
	
		
			
				|  |  |              <template slot-scope="scope">
 | 
	
		
			
				|  |  |                <div>
 | 
	
		
			
				|  |  |                  {{ scope.row.username }}
 | 
	
	
		
			
				|  | @@ -197,14 +205,27 @@
 | 
	
		
			
				|  |  |                </div>
 | 
	
		
			
				|  |  |              </template>
 | 
	
		
			
				|  |  |            </el-table-column>
 | 
	
		
			
				|  |  | -          <el-table-column align="center" prop="courseScheduleId" label="课程编号">
 | 
	
		
			
				|  |  | +          <el-table-column
 | 
	
		
			
				|  |  | +            align="center"
 | 
	
		
			
				|  |  | +            prop="courseScheduleId"
 | 
	
		
			
				|  |  | +            label="课程编号"
 | 
	
		
			
				|  |  | +          >
 | 
	
		
			
				|  |  |              <template slot-scope="scope">
 | 
	
		
			
				|  |  |                <div>
 | 
	
		
			
				|  |  |                  <copy-text>{{ scope.row.courseScheduleId }}</copy-text>
 | 
	
		
			
				|  |  |                </div>
 | 
	
		
			
				|  |  |              </template>
 | 
	
		
			
				|  |  |            </el-table-column>
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | +          <el-table-column
 | 
	
		
			
				|  |  | +            align="center"
 | 
	
		
			
				|  |  | +            prop="subjectName"
 | 
	
		
			
				|  |  | +            label="专业"
 | 
	
		
			
				|  |  | +          ></el-table-column>
 | 
	
		
			
				|  |  | +          <el-table-column
 | 
	
		
			
				|  |  | +            align="center"
 | 
	
		
			
				|  |  | +            prop="musicGroupName"
 | 
	
		
			
				|  |  | +            label="课程组名称"
 | 
	
		
			
				|  |  | +          ></el-table-column>
 | 
	
		
			
				|  |  |            <el-table-column
 | 
	
		
			
				|  |  |              align="center"
 | 
	
		
			
				|  |  |              prop="courseSchedule.name"
 | 
	
	
		
			
				|  | @@ -221,14 +242,22 @@
 | 
	
		
			
				|  |  |                </div>
 | 
	
		
			
				|  |  |              </template>
 | 
	
		
			
				|  |  |            </el-table-column> -->
 | 
	
		
			
				|  |  | -          <el-table-column align="center" prop="startClassTime" label="课程组类型">
 | 
	
		
			
				|  |  | +          <el-table-column
 | 
	
		
			
				|  |  | +            align="center"
 | 
	
		
			
				|  |  | +            prop="startClassTime"
 | 
	
		
			
				|  |  | +            label="课程组类型"
 | 
	
		
			
				|  |  | +          >
 | 
	
		
			
				|  |  |              <template slot-scope="scope">
 | 
	
		
			
				|  |  |                <div>
 | 
	
		
			
				|  |  |                  {{ scope.row.groupType | coursesType }}
 | 
	
		
			
				|  |  |                </div>
 | 
	
		
			
				|  |  |              </template>
 | 
	
		
			
				|  |  |            </el-table-column>
 | 
	
		
			
				|  |  | -          <el-table-column align="center" prop="startClassTime" label="课程类型">
 | 
	
		
			
				|  |  | +          <el-table-column
 | 
	
		
			
				|  |  | +            align="center"
 | 
	
		
			
				|  |  | +            prop="startClassTime"
 | 
	
		
			
				|  |  | +            label="课程类型"
 | 
	
		
			
				|  |  | +          >
 | 
	
		
			
				|  |  |              <template slot-scope="scope">
 | 
	
		
			
				|  |  |                <div>
 | 
	
		
			
				|  |  |                  {{ scope.row.courseSchedule.type | coursesType }}
 | 
	
	
		
			
				|  | @@ -241,13 +270,15 @@
 | 
	
		
			
				|  |  |                  <!-- {{ scope.row.courseSchedule.newCourseId > 0 ? "是" : "否" }} -->
 | 
	
		
			
				|  |  |                  {{
 | 
	
		
			
				|  |  |                    scope.row.courseSchedule.newCourseId > 0 &&
 | 
	
		
			
				|  |  | -                  scope.row.courseSchedule.newCourseId == scope.row.courseScheduleId
 | 
	
		
			
				|  |  | +                  scope.row.courseSchedule.newCourseId ==
 | 
	
		
			
				|  |  | +                    scope.row.courseScheduleId
 | 
	
		
			
				|  |  |                      ? "合并课"
 | 
	
		
			
				|  |  |                      : null
 | 
	
		
			
				|  |  |                  }}
 | 
	
		
			
				|  |  |                  {{
 | 
	
		
			
				|  |  |                    scope.row.courseSchedule.newCourseId > 0 &&
 | 
	
		
			
				|  |  | -                  scope.row.courseSchedule.newCourseId != scope.row.courseScheduleId
 | 
	
		
			
				|  |  | +                  scope.row.courseSchedule.newCourseId !=
 | 
	
		
			
				|  |  | +                    scope.row.courseScheduleId
 | 
	
		
			
				|  |  |                      ? "被合并课"
 | 
	
		
			
				|  |  |                      : null
 | 
	
		
			
				|  |  |                  }}
 | 
	
	
		
			
				|  | @@ -263,7 +294,9 @@
 | 
	
		
			
				|  |  |              <template slot-scope="scope">
 | 
	
		
			
				|  |  |                <div>
 | 
	
		
			
				|  |  |                  {{ scope.row.courseSchedule.classDate | dayjsFormat }}
 | 
	
		
			
				|  |  | -                {{ scope.row.courseSchedule.startClassTime | dayjsFormatMinute }}-{{
 | 
	
		
			
				|  |  | +                {{
 | 
	
		
			
				|  |  | +                  scope.row.courseSchedule.startClassTime | dayjsFormatMinute
 | 
	
		
			
				|  |  | +                }}-{{
 | 
	
		
			
				|  |  |                    scope.row.courseSchedule.endClassTime | dayjsFormatMinute
 | 
	
		
			
				|  |  |                  }}
 | 
	
		
			
				|  |  |                </div>
 | 
	
	
		
			
				|  | @@ -298,7 +331,7 @@
 | 
	
		
			
				|  |  |                <div
 | 
	
		
			
				|  |  |                  v-if="
 | 
	
		
			
				|  |  |                    scope.row.courseSchedule &&
 | 
	
		
			
				|  |  | -                  scope.row.courseSchedule.status != 'NOT_START'
 | 
	
		
			
				|  |  | +                    scope.row.courseSchedule.status != 'NOT_START'
 | 
	
		
			
				|  |  |                  "
 | 
	
		
			
				|  |  |                >
 | 
	
		
			
				|  |  |                  {{ scope.row.status | clockingIn }}
 | 
	
	
		
			
				|  | @@ -323,7 +356,8 @@
 | 
	
		
			
				|  |  |                  <el-button
 | 
	
		
			
				|  |  |                    type="text"
 | 
	
		
			
				|  |  |                    v-if="
 | 
	
		
			
				|  |  | -                    permission(getFullPermission('visit/add')) && !scope.row.visitFlag
 | 
	
		
			
				|  |  | +                    permission(getFullPermission('visit/add')) &&
 | 
	
		
			
				|  |  | +                      !scope.row.visitFlag
 | 
	
		
			
				|  |  |                    "
 | 
	
		
			
				|  |  |                    @click="addVisit(scope.row)"
 | 
	
		
			
				|  |  |                    >新增回访</el-button
 | 
	
	
		
			
				|  | @@ -333,7 +367,7 @@
 | 
	
		
			
				|  |  |                    @click="lookVisit(scope.row)"
 | 
	
		
			
				|  |  |                    v-if="
 | 
	
		
			
				|  |  |                      scope.row.visitFlag &&
 | 
	
		
			
				|  |  | -                    permission(getFullPermission('visit/queryPage'))
 | 
	
		
			
				|  |  | +                      permission(getFullPermission('visit/queryPage'))
 | 
	
		
			
				|  |  |                    "
 | 
	
		
			
				|  |  |                    >查看回访</el-button
 | 
	
		
			
				|  |  |                  >
 | 
	
	
		
			
				|  | @@ -395,7 +429,7 @@ export default {
 | 
	
		
			
				|  |  |          courseScheduleType: "",
 | 
	
		
			
				|  |  |          organId: "",
 | 
	
		
			
				|  |  |          visitFlag: "",
 | 
	
		
			
				|  |  | -        dates: [],
 | 
	
		
			
				|  |  | +        dates: []
 | 
	
		
			
				|  |  |        },
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |        courseType,
 | 
	
	
		
			
				|  | @@ -409,8 +443,8 @@ export default {
 | 
	
		
			
				|  |  |          limit: 10, // 限制显示条数
 | 
	
		
			
				|  |  |          page: 1, // 当前页
 | 
	
		
			
				|  |  |          total: 0, // 总条数
 | 
	
		
			
				|  |  | -        page_size: [10, 20, 40, 50], // 选择限制显示条数
 | 
	
		
			
				|  |  | -      },
 | 
	
		
			
				|  |  | +        page_size: [10, 20, 40, 50] // 选择限制显示条数
 | 
	
		
			
				|  |  | +      }
 | 
	
		
			
				|  |  |      };
 | 
	
		
			
				|  |  |    },
 | 
	
		
			
				|  |  |    //生命周期 - 创建完成(可以访问当前this实例)
 | 
	
	
		
			
				|  | @@ -461,7 +495,11 @@ export default {
 | 
	
		
			
				|  |  |          page: this.rules.page,
 | 
	
		
			
				|  |  |          rows: this.rules.limit,
 | 
	
		
			
				|  |  |          ids: this.$route.query.ids,
 | 
	
		
			
				|  |  | -        ...getTimes(dates, ["startDateOfCourse", "endDateOfCourse"], "YYYY-MM-DD"),
 | 
	
		
			
				|  |  | +        ...getTimes(
 | 
	
		
			
				|  |  | +          dates,
 | 
	
		
			
				|  |  | +          ["startDateOfCourse", "endDateOfCourse"],
 | 
	
		
			
				|  |  | +          "YYYY-MM-DD"
 | 
	
		
			
				|  |  | +        )
 | 
	
		
			
				|  |  |        };
 | 
	
		
			
				|  |  |        await Export(
 | 
	
		
			
				|  |  |          this,
 | 
	
	
		
			
				|  | @@ -469,7 +507,7 @@ export default {
 | 
	
		
			
				|  |  |            url: "/api-web/export/studentCourseAttendance",
 | 
	
		
			
				|  |  |            fileName: "学生考勤列表.xls",
 | 
	
		
			
				|  |  |            method: "post",
 | 
	
		
			
				|  |  | -          params: qs.stringify(cleanDeep(obj)),
 | 
	
		
			
				|  |  | +          params: qs.stringify(cleanDeep(obj))
 | 
	
		
			
				|  |  |          },
 | 
	
		
			
				|  |  |          "您确定导出学员考勤列表?"
 | 
	
		
			
				|  |  |        );
 | 
	
	
		
			
				|  | @@ -484,7 +522,11 @@ export default {
 | 
	
		
			
				|  |  |          ...rest,
 | 
	
		
			
				|  |  |          page: this.rules.page,
 | 
	
		
			
				|  |  |          rows: this.rules.limit,
 | 
	
		
			
				|  |  | -        ...getTimes(dates, ["startDateOfCourse", "endDateOfCourse"], "YYYY-MM-DD"),
 | 
	
		
			
				|  |  | +        ...getTimes(
 | 
	
		
			
				|  |  | +          dates,
 | 
	
		
			
				|  |  | +          ["startDateOfCourse", "endDateOfCourse"],
 | 
	
		
			
				|  |  | +          "YYYY-MM-DD"
 | 
	
		
			
				|  |  | +        )
 | 
	
		
			
				|  |  |        };
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |        // let obj = {
 | 
	
	
		
			
				|  | @@ -498,8 +540,8 @@ export default {
 | 
	
		
			
				|  |  |        //   ),
 | 
	
		
			
				|  |  |        // };
 | 
	
		
			
				|  |  |        findStudentAttendance(obj, {
 | 
	
		
			
				|  |  | -        ids: this.$route.query.ids,
 | 
	
		
			
				|  |  | -      }).then((res) => {
 | 
	
		
			
				|  |  | +        ids: this.$route.query.ids
 | 
	
		
			
				|  |  | +      }).then(res => {
 | 
	
		
			
				|  |  |          if (res.code == 200) {
 | 
	
		
			
				|  |  |            this.tableList = res.data.rows;
 | 
	
		
			
				|  |  |            this.rules.total = res.data.total;
 | 
	
	
		
			
				|  | @@ -519,7 +561,7 @@ export default {
 | 
	
		
			
				|  |  |            status: undefined,
 | 
	
		
			
				|  |  |            visitFlag: undefined,
 | 
	
		
			
				|  |  |            start: undefined,
 | 
	
		
			
				|  |  | -          end: undefined,
 | 
	
		
			
				|  |  | +          end: undefined
 | 
	
		
			
				|  |  |          });
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |      },
 | 
	
	
		
			
				|  | @@ -536,10 +578,10 @@ export default {
 | 
	
		
			
				|  |  |      lookVisit(row) {
 | 
	
		
			
				|  |  |        this.$router.push({
 | 
	
		
			
				|  |  |          path: "/studentManager/returnVisitList",
 | 
	
		
			
				|  |  | -        query: { search: row.id, tabrouter: "2" },
 | 
	
		
			
				|  |  | +        query: { search: row.id, tabrouter: "2" }
 | 
	
		
			
				|  |  |        });
 | 
	
		
			
				|  |  | -    },
 | 
	
		
			
				|  |  | -  },
 | 
	
		
			
				|  |  | +    }
 | 
	
		
			
				|  |  | +  }
 | 
	
		
			
				|  |  |  };
 | 
	
		
			
				|  |  |  </script>
 | 
	
		
			
				|  |  |  <style lang="scss" scoped></style>
 |