|
|
@@ -3,112 +3,56 @@
|
|
|
<h2>
|
|
|
<div class="squrt"></div>
|
|
|
课表管理
|
|
|
- <filter-search
|
|
|
- ref="filterSearch"
|
|
|
- @reload="reloadSearch"
|
|
|
- @setTimeForSearch="setTimeForSearch"
|
|
|
- :keys="['searchType']"
|
|
|
- :moreKeys="['start', 'end', 'organId']"
|
|
|
- v-if="permission('courseSchedule/abnormal')"
|
|
|
- />
|
|
|
+ <filter-search ref="filterSearch" @reload="reloadSearch" @setTimeForSearch="setTimeForSearch" :keys="['searchType']"
|
|
|
+ :moreKeys="['start', 'end', 'organId']" v-if="permission('courseSchedule/abnormal')" />
|
|
|
</h2>
|
|
|
<div class="m-core">
|
|
|
<!-- 搜索类型 -->
|
|
|
- <save-form
|
|
|
- :inline="true"
|
|
|
- class="searchForm"
|
|
|
- @submit="search"
|
|
|
- @reset="reset"
|
|
|
- ref="searchForm"
|
|
|
- :model.sync="searchForm"
|
|
|
- >
|
|
|
+ <save-form :inline="true" class="searchForm" @submit="search" @reset="reset" ref="searchForm"
|
|
|
+ :model.sync="searchForm">
|
|
|
<el-form-item>
|
|
|
- <el-input
|
|
|
- type="number"
|
|
|
- v-model.trim="searchForm.courseIdSearch"
|
|
|
- clearable
|
|
|
- placeholder="课程编号"
|
|
|
- />
|
|
|
+ <el-input type="number" v-model.trim="searchForm.courseIdSearch" clearable placeholder="课程编号" />
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
- <remote-search
|
|
|
- :commit="'setTeachers'"
|
|
|
- v-model="searchForm.teacherIdList"
|
|
|
- :demissionFlag="true"
|
|
|
- :isForzenWithQueryCondition="true"
|
|
|
- />
|
|
|
+ <remote-search :commit="'setTeachers'" v-model="searchForm.teacherIdList" :demissionFlag="true"
|
|
|
+ :isForzenWithQueryCondition="true" />
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
- <el-select
|
|
|
- v-model.trim="searchForm.courseType"
|
|
|
- clearable
|
|
|
- filterable
|
|
|
- placeholder="课程类型"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(item, index) in courseType"
|
|
|
- :key="index"
|
|
|
- :value="item.value"
|
|
|
- :label="item.label"
|
|
|
- ></el-option>
|
|
|
+ <el-select v-model.trim="searchForm.courseType" clearable filterable 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>
|
|
|
- <el-select
|
|
|
- v-model.trim="searchForm.courseStatus"
|
|
|
- clearable
|
|
|
- filterable
|
|
|
- placeholder="课程状态"
|
|
|
- >
|
|
|
+ <el-select v-model.trim="searchForm.courseStatus" clearable filterable placeholder="课程状态">
|
|
|
<el-option label="未开始" value="NOT_START"></el-option>
|
|
|
<el-option label="进行中" value="UNDERWAY"></el-option>
|
|
|
<el-option label="已结束" value="OVER"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
- <el-date-picker
|
|
|
- v-model.trim="searchForm.timer"
|
|
|
- type="daterange"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
- range-separator="-"
|
|
|
- start-placeholder="上课开始日期"
|
|
|
- end-placeholder="上课结束日期"
|
|
|
- :picker-options="{
|
|
|
+ <el-date-picker v-model.trim="searchForm.timer" type="daterange" value-format="yyyy-MM-dd" range-separator="-"
|
|
|
+ start-placeholder="上课开始日期" end-placeholder="上课结束日期" :picker-options="{
|
|
|
firstDayOfWeek: 1,
|
|
|
- }"
|
|
|
- ></el-date-picker>
|
|
|
+ }"></el-date-picker>
|
|
|
</el-form-item>
|
|
|
|
|
|
<el-form-item>
|
|
|
- <el-button
|
|
|
- :type="isSearch ? 'primary' : 'info'"
|
|
|
- icon="el-icon-circle-plus-outline"
|
|
|
- @click="showMove = true"
|
|
|
- >更多选项</el-button
|
|
|
- >
|
|
|
+ <el-button :type="isSearch ? 'primary' : 'info'" icon="el-icon-circle-plus-outline"
|
|
|
+ @click="showMove = true">更多选项</el-button>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
<el-button native-type="submit" type="primary">搜索</el-button>
|
|
|
<el-button native-type="reset" type="danger">重置</el-button>
|
|
|
|
|
|
- <el-button
|
|
|
- v-permission="'export/superFindCourseSchedules'"
|
|
|
- @click="onCourseExport"
|
|
|
- type="primary"
|
|
|
- >导出课表</el-button
|
|
|
- >
|
|
|
+ <el-button v-permission="'export/superFindCourseSchedules'" @click="onCourseExport"
|
|
|
+ type="primary">导出课表</el-button>
|
|
|
</el-form-item>
|
|
|
</save-form>
|
|
|
<!-- 列表 -->
|
|
|
<div class="tableWrap">
|
|
|
- <el-table
|
|
|
- :data="tableList"
|
|
|
- ref="tableList"
|
|
|
- :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
|
|
|
- @selection-change="handleSelectionChange"
|
|
|
- @select="onTableSelect"
|
|
|
- row-key="id"
|
|
|
- >
|
|
|
+ <el-table :data="tableList" ref="tableList" :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
|
|
|
+ @selection-change="handleSelectionChange" @select="onTableSelect" row-key="id">
|
|
|
>
|
|
|
<el-table-column type="selection" width="55"></el-table-column>
|
|
|
<el-table-column type="expand">
|
|
|
@@ -118,43 +62,33 @@
|
|
|
<el-col :span="4">
|
|
|
<el-form-item label="考勤申诉:">
|
|
|
<span>{{ props.row.isComplaints == 1 ? "是" : "否" }}</span>
|
|
|
- </el-form-item></el-col
|
|
|
- >
|
|
|
+ </el-form-item></el-col>
|
|
|
<el-col :span="4">
|
|
|
<el-form-item label="是否冻结:">
|
|
|
<span>{{ props.row.isLock ? "是" : "否" }}</span>
|
|
|
- </el-form-item></el-col
|
|
|
- >
|
|
|
+ </el-form-item></el-col>
|
|
|
|
|
|
<el-col :span="4">
|
|
|
<el-form-item label="云教练课程:">
|
|
|
{{ props.row.memberFlag ? "是" : "否" }}
|
|
|
- </el-form-item></el-col
|
|
|
- >
|
|
|
+ </el-form-item></el-col>
|
|
|
<el-col :span="4">
|
|
|
<el-form-item label="是否点名:">
|
|
|
{{ props.row.isCallNames ? "是" : "否" }}
|
|
|
- </el-form-item></el-col
|
|
|
- >
|
|
|
+ </el-form-item></el-col>
|
|
|
</el-row>
|
|
|
<el-row style="margin-left: 64px" v-if="props.row.newCourseId">
|
|
|
<el-col :span="4">
|
|
|
<el-form-item label="合并类型:">
|
|
|
<span>
|
|
|
<div>
|
|
|
- <span
|
|
|
- v-if="
|
|
|
- props.row.newCourseId > 0 &&
|
|
|
- props.row.newCourseId == props.row.id
|
|
|
- "
|
|
|
- >合并课
|
|
|
+ <span v-if="props.row.newCourseId > 0 &&
|
|
|
+ props.row.newCourseId == props.row.id
|
|
|
+ ">合并课
|
|
|
</span>
|
|
|
- <p
|
|
|
- v-if="
|
|
|
- props.row.newCourseId > 0 &&
|
|
|
- props.row.newCourseId != props.row.id
|
|
|
- "
|
|
|
- >
|
|
|
+ <p v-if="props.row.newCourseId > 0 &&
|
|
|
+ props.row.newCourseId != props.row.id
|
|
|
+ ">
|
|
|
被合并课
|
|
|
</p>
|
|
|
<p v-if="props.row.newCourseId == 0">无</p>
|
|
|
@@ -167,35 +101,20 @@
|
|
|
<el-button type="text" @click="common(props.row)">
|
|
|
{{ props.row.newCourseId }}
|
|
|
</el-button>
|
|
|
- </el-form-item></el-col
|
|
|
- >
|
|
|
+ </el-form-item></el-col>
|
|
|
<el-col :span="4">
|
|
|
<el-form-item label="被合并课编号:">
|
|
|
- <el-button
|
|
|
- type="text"
|
|
|
- @click="common1(item)"
|
|
|
- :key="index"
|
|
|
- v-for="(item, index) in props.row.mergedCourseIds.split(',')"
|
|
|
- >
|
|
|
+ <el-button type="text" @click="common1(item)" :key="index"
|
|
|
+ v-for="(item, index) in props.row.mergedCourseIds.split(',')">
|
|
|
{{ item }}
|
|
|
</el-button>
|
|
|
- </el-form-item></el-col
|
|
|
- >
|
|
|
+ </el-form-item></el-col>
|
|
|
</el-row>
|
|
|
</el-form>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
- align="left"
|
|
|
- prop="organName"
|
|
|
- label="分部名称"
|
|
|
- ></el-table-column>
|
|
|
- <el-table-column
|
|
|
- align="center"
|
|
|
- width="170px"
|
|
|
- prop="musicGroupId"
|
|
|
- label="乐团/课程组编号"
|
|
|
- >
|
|
|
+ <el-table-column align="left" prop="organName" label="分部名称"></el-table-column>
|
|
|
+ <el-table-column align="center" width="170px" prop="musicGroupId" label="乐团/课程组编号">
|
|
|
<template slot-scope="scope">
|
|
|
<div style="color: var(--color-primary)" @click="gotoCourse(scope.row)">
|
|
|
<copy-text>{{ scope.row.musicGroupId }}</copy-text>
|
|
|
@@ -219,20 +138,16 @@
|
|
|
<p>
|
|
|
{{
|
|
|
scope.row.startClassTime
|
|
|
- ? scope.row.startClassTime.substr(0, 16)
|
|
|
- : ""
|
|
|
+ ? scope.row.startClassTime.substr(0, 16)
|
|
|
+ : ""
|
|
|
}}-{{
|
|
|
- scope.row.endClassTime ? scope.row.endClassTime.substr(11, 5) : ""
|
|
|
- }}
|
|
|
+ scope.row.endClassTime ? scope.row.endClassTime.substr(11, 5) : ""
|
|
|
+}}
|
|
|
</p>
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
- align="center"
|
|
|
- prop="subjectName"
|
|
|
- label="声部"
|
|
|
- ></el-table-column>
|
|
|
+ <el-table-column align="center" prop="subjectName" label="声部"></el-table-column>
|
|
|
<el-table-column prop="name" width="150px" label="主教老师/课程名称">
|
|
|
<template slot-scope="scope">
|
|
|
<div>
|
|
|
@@ -249,7 +164,7 @@
|
|
|
{{ scope.row.teachMode | teachMode }}
|
|
|
</p>
|
|
|
<p>
|
|
|
- {{ scope.row.schoolName ? scope.row.schoolName : "网络教室" }}
|
|
|
+ {{ scope.row.schoolName ? scope.row.schoolName : scope.row.type === 'LIVE' ? '线上直播间' : "网络教室" }}
|
|
|
</p>
|
|
|
</div>
|
|
|
</template>
|
|
|
@@ -257,22 +172,11 @@
|
|
|
<el-table-column align="center" label="详情" fixed="right" width="220px">
|
|
|
<template slot-scope="scope">
|
|
|
<div>
|
|
|
- <el-button
|
|
|
- v-if="'/teamCourseListDetail'"
|
|
|
- type="text"
|
|
|
- @click="lookDetail(scope.row)"
|
|
|
- >详情</el-button
|
|
|
- >
|
|
|
- <el-button
|
|
|
- type="text"
|
|
|
- v-if="
|
|
|
- permission('courseSchedule/classStartDateAdjust?hight') &&
|
|
|
- !scope.row.isLock &&
|
|
|
- !(scope.row.newCourseId > 0 && scope.row.newCourseId != scope.row.id)
|
|
|
- "
|
|
|
- @click="resetClass(scope.row)"
|
|
|
- >调整</el-button
|
|
|
- >
|
|
|
+ <el-button v-if="'/teamCourseListDetail'" type="text" @click="lookDetail(scope.row)">详情</el-button>
|
|
|
+ <el-button type="text" v-if="permission('courseSchedule/classStartDateAdjust?hight') &&
|
|
|
+ !scope.row.isLock &&
|
|
|
+ !(scope.row.newCourseId > 0 && scope.row.newCourseId != scope.row.id)
|
|
|
+ " @click="resetClass(scope.row)">调整</el-button>
|
|
|
|
|
|
<!-- <el-button
|
|
|
type="text"
|
|
|
@@ -299,38 +203,20 @@
|
|
|
@click="cancleCompound(scope.row)"
|
|
|
>取消合课</el-button
|
|
|
> -->
|
|
|
- <el-button
|
|
|
- type="text"
|
|
|
- v-if="
|
|
|
- scope.row.newCourseId == scope.row.id &&
|
|
|
- permission('courseSchedule/mergeCourseSplit') &&
|
|
|
- scope.row.status != 'OVER'
|
|
|
- "
|
|
|
- @click="resetCompound(scope.row)"
|
|
|
- >取消合并</el-button
|
|
|
- >
|
|
|
- <el-button
|
|
|
- type="text"
|
|
|
- v-if="
|
|
|
- scope.row.status == 'OVER' &&
|
|
|
- !scope.row.isSettlement &&
|
|
|
- permission('courseSchedule/cleanAttendance')
|
|
|
- "
|
|
|
- @click="clearAttend(scope.row)"
|
|
|
- >清除考勤</el-button
|
|
|
- >
|
|
|
+ <el-button type="text" v-if="scope.row.newCourseId == scope.row.id &&
|
|
|
+ permission('courseSchedule/mergeCourseSplit') &&
|
|
|
+ scope.row.status != 'OVER'
|
|
|
+ " @click="resetCompound(scope.row)">取消合并</el-button>
|
|
|
+ <el-button type="text" v-if="scope.row.status == 'OVER' &&
|
|
|
+ !scope.row.isSettlement &&
|
|
|
+ permission('courseSchedule/cleanAttendance')
|
|
|
+ " @click="clearAttend(scope.row)">清除考勤</el-button>
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
- <pagination
|
|
|
- :total.sync="rules.total"
|
|
|
- :page.sync="rules.page"
|
|
|
- :limit.sync="rules.limit"
|
|
|
- :page-sizes="rules.page_size"
|
|
|
- @pagination="getList"
|
|
|
- sync
|
|
|
- />
|
|
|
+ <pagination :total.sync="rules.total" :page.sync="rules.page" :limit.sync="rules.limit"
|
|
|
+ :page-sizes="rules.page_size" @pagination="getList" sync />
|
|
|
</div>
|
|
|
</div>
|
|
|
<el-dialog title="课表详情" :visible.sync="classVisible" width="1000px">
|
|
|
@@ -364,106 +250,63 @@
|
|
|
<el-tooltip placement="top" popper-class="mTooltip">
|
|
|
<div slot="content">学员和老师同时在教室里的时长。</div>
|
|
|
|
|
|
- <i
|
|
|
- class="el-icon-question micon el-tooltip"
|
|
|
- style="font-size: 18px; color: #f56c6c"
|
|
|
- v-permission="'export/teacherSalary'"
|
|
|
- ></i>
|
|
|
+ <i class="el-icon-question micon el-tooltip" style="font-size: 18px; color: #f56c6c"
|
|
|
+ v-permission="'export/teacherSalary'"></i>
|
|
|
</el-tooltip>
|
|
|
</div>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="学员考勤" v-if="maskForm.status != 'NOT_START'">
|
|
|
- <div
|
|
|
- class="inputStyle"
|
|
|
- :class="maskForm.errorAttendanceNum != 0 ? 'red' : 'green'"
|
|
|
- >
|
|
|
+ <div class="inputStyle" :class="maskForm.errorAttendanceNum != 0 ? 'red' : 'green'">
|
|
|
{{ maskForm.errorAttendanceNum != 0 ? "异常" : "正常" }}
|
|
|
</div>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="老师考勤" v-if="maskForm.status != 'NOT_START'">
|
|
|
- <div
|
|
|
- class="inputStyle"
|
|
|
- :class="
|
|
|
- maskForm.signInStatusEnum == 1 && maskForm.signOutStatusEnum == 1
|
|
|
- ? 'green'
|
|
|
- : 'red'
|
|
|
- "
|
|
|
- >
|
|
|
+ <div class="inputStyle" :class="maskForm.signInStatusEnum == 1 && maskForm.signOutStatusEnum == 1
|
|
|
+ ? 'green'
|
|
|
+ : 'red'
|
|
|
+ ">
|
|
|
{{
|
|
|
maskForm.signInStatusEnum == 1 && maskForm.signOutStatusEnum == 1
|
|
|
- ? "正常"
|
|
|
- : "异常"
|
|
|
+ ? "正常"
|
|
|
+ : "异常"
|
|
|
}}
|
|
|
</div>
|
|
|
</el-form-item>
|
|
|
<el-form-item v-if="maskForm.school" label="教学点">
|
|
|
{{ maskForm.school.name }}
|
|
|
<el-tooltip content="查看教学点" :open-delay="0.5">
|
|
|
- <i
|
|
|
- @click="openLocation(maskForm.school)"
|
|
|
- class="el-icon-map-location"
|
|
|
- style="cursor: pointer"
|
|
|
- ></i>
|
|
|
+ <i @click="openLocation(maskForm.school)" class="el-icon-map-location" style="cursor: pointer"></i>
|
|
|
</el-tooltip>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
|
|
|
<el-tabs v-model.trim="activeName" type="card" @tab-click="handleClick">
|
|
|
- <el-tab-pane
|
|
|
- label="学员列表"
|
|
|
- name="first"
|
|
|
- v-if="permission('/teamCourseListDetailStudnetList')"
|
|
|
- >
|
|
|
+ <el-tab-pane label="学员列表" name="first" v-if="permission('/teamCourseListDetailStudnetList')">
|
|
|
<div v-if="activeName == 'first'">
|
|
|
- <studentRollCall
|
|
|
- :courseScheduleId="maskForm.id"
|
|
|
- :isMainGo="isMainGo"
|
|
|
- ></studentRollCall>
|
|
|
+ <studentRollCall :courseScheduleId="maskForm.id" :isMainGo="isMainGo"></studentRollCall>
|
|
|
</div>
|
|
|
</el-tab-pane>
|
|
|
|
|
|
- <el-tab-pane
|
|
|
- label="老师列表"
|
|
|
- name="second"
|
|
|
- v-if="permission('/teamCourseListDetailTeacherList')"
|
|
|
- >
|
|
|
+ <el-tab-pane label="老师列表" name="second" v-if="permission('/teamCourseListDetailTeacherList')">
|
|
|
<div v-if="activeName == 'second'">
|
|
|
- <teacherList
|
|
|
- :courseScheduleId="maskForm.id"
|
|
|
- :teachMode="maskForm.teachMode"
|
|
|
- :courseStatus="maskForm.status"
|
|
|
- @syncTeacherAttend="syncTeacherAttend"
|
|
|
- ></teacherList>
|
|
|
+ <teacherList :courseScheduleId="maskForm.id" :teachMode="maskForm.teachMode" :courseStatus="maskForm.status"
|
|
|
+ @syncTeacherAttend="syncTeacherAttend"></teacherList>
|
|
|
</div>
|
|
|
</el-tab-pane>
|
|
|
|
|
|
- <el-tab-pane
|
|
|
- label="训练"
|
|
|
- name="third"
|
|
|
- v-if="permission('/teamCourseListDetailWorkList') && maskForm.status == 'OVER'"
|
|
|
- >
|
|
|
+ <el-tab-pane label="训练" name="third"
|
|
|
+ v-if="permission('/teamCourseListDetailWorkList') && maskForm.status == 'OVER'">
|
|
|
<div v-if="activeName == 'third'">
|
|
|
- <studentWork
|
|
|
- :courseScheduleId="maskForm.id"
|
|
|
- v-if="maskForm.versionTag == 'v1'"
|
|
|
- ></studentWork>
|
|
|
+ <studentWork :courseScheduleId="maskForm.id" v-if="maskForm.versionTag == 'v1'"></studentWork>
|
|
|
<studentWorks :courseScheduleId="maskForm.id" v-else></studentWorks>
|
|
|
</div>
|
|
|
</el-tab-pane>
|
|
|
- <el-tab-pane
|
|
|
- label="评论"
|
|
|
- name="four"
|
|
|
- v-if="permission('/teamCourseListDetailCommentList')"
|
|
|
- >
|
|
|
+ <el-tab-pane label="评论" name="four" v-if="permission('/teamCourseListDetailCommentList')">
|
|
|
<div v-if="activeName == 'four'">
|
|
|
<courseEvaluate :courseScheduleId="maskForm.id"></courseEvaluate>
|
|
|
</div>
|
|
|
</el-tab-pane>
|
|
|
- <el-tab-pane
|
|
|
- label="调整记录"
|
|
|
- v-if="permission('/teamCourseListDetailAdjust')"
|
|
|
- name="five"
|
|
|
- >
|
|
|
+ <el-tab-pane label="调整记录" v-if="permission('/teamCourseListDetailAdjust')" name="five">
|
|
|
<div v-if="activeName == 'five'">
|
|
|
<infoMsg :courseScheduleId="maskForm.id"></infoMsg>
|
|
|
</div>
|
|
|
@@ -471,96 +314,42 @@
|
|
|
</el-tabs>
|
|
|
</el-dialog>
|
|
|
<el-dialog :visible.sync="show" width="400px" title="课程调整">
|
|
|
- <resetClass
|
|
|
- :show="show"
|
|
|
- v-if="show"
|
|
|
- @closeReset="closeReset"
|
|
|
- @getList="getList"
|
|
|
- :id="id"
|
|
|
- />
|
|
|
+ <resetClass :show="show" v-if="show" @closeReset="closeReset" @getList="getList" :id="id" />
|
|
|
</el-dialog>
|
|
|
<el-dialog title="查看教学点" :visible.sync="locationVisible">
|
|
|
- <school-location
|
|
|
- v-if="maskForm.school"
|
|
|
- :longitudeLatitude="maskForm.school.longitudeLatitude"
|
|
|
- :address="maskForm.school.address"
|
|
|
- />
|
|
|
+ <school-location v-if="maskForm.school" :longitudeLatitude="maskForm.school.longitudeLatitude"
|
|
|
+ :address="maskForm.school.address" />
|
|
|
</el-dialog>
|
|
|
<el-dialog title="更多选项" :visible.sync="showMove" v-if="showMove" width="700px">
|
|
|
- <el-form
|
|
|
- :inline="true"
|
|
|
- class="searchForm"
|
|
|
- @submit="search"
|
|
|
- @reset="reset"
|
|
|
- ref="searchForm2"
|
|
|
- :model.sync="searchForm"
|
|
|
- label-width="120px"
|
|
|
- >
|
|
|
+ <el-form :inline="true" class="searchForm" @submit="search" @reset="reset" ref="searchForm2"
|
|
|
+ :model.sync="searchForm" label-width="120px">
|
|
|
<el-form-item label="课程组编号/名称" prop="search">
|
|
|
- <el-input
|
|
|
- style="width: 180px !important"
|
|
|
- v-model.trim="searchForm.search"
|
|
|
- clearable
|
|
|
- placeholder="课程组编号/课程名称"
|
|
|
- />
|
|
|
+ <el-input style="width: 180px !important" v-model.trim="searchForm.search" clearable placeholder="课程组编号/课程名称" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="教学点" prop="schoolId">
|
|
|
- <el-select
|
|
|
- style="width: 180px !important"
|
|
|
- v-model.trim="searchForm.schoolId"
|
|
|
- clearable
|
|
|
- filterable
|
|
|
- placeholder="请选择教学点"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(item, index) in selects.schools"
|
|
|
- :key="index"
|
|
|
- :value="item.id"
|
|
|
- :label="item.name"
|
|
|
- ></el-option>
|
|
|
+ <el-select style="width: 180px !important" v-model.trim="searchForm.schoolId" clearable filterable
|
|
|
+ placeholder="请选择教学点">
|
|
|
+ <el-option v-for="(item, index) in selects.schools" :key="index" :value="item.id"
|
|
|
+ :label="item.name"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="分部" prop="organIdList">
|
|
|
- <el-select
|
|
|
- style="width: 180px !important"
|
|
|
- class="multiple"
|
|
|
- v-model.trim="searchForm.organIdList"
|
|
|
- filterable
|
|
|
- clearable
|
|
|
- placeholder="请选择分部"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(item, index) in selects.branchs"
|
|
|
- :key="index"
|
|
|
- :label="item.name"
|
|
|
- :value="item.id"
|
|
|
- ></el-option>
|
|
|
+ <el-select style="width: 180px !important" class="multiple" v-model.trim="searchForm.organIdList" filterable
|
|
|
+ clearable placeholder="请选择分部">
|
|
|
+ <el-option v-for="(item, index) in selects.branchs" :key="index" :label="item.name"
|
|
|
+ :value="item.id"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="课程组类型" prop="groupType">
|
|
|
- <el-select
|
|
|
- style="width: 180px !important"
|
|
|
- v-model.trim="searchForm.groupType"
|
|
|
- clearable
|
|
|
- filterable
|
|
|
- placeholder="课程组类型"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="item in courseListType"
|
|
|
- :key="item.value"
|
|
|
- :value="item.value"
|
|
|
- :label="item.label"
|
|
|
- ></el-option>
|
|
|
+ <el-select style="width: 180px !important" v-model.trim="searchForm.groupType" clearable filterable
|
|
|
+ placeholder="课程组类型">
|
|
|
+ <el-option v-for="item in courseListType" :key="item.value" :value="item.value"
|
|
|
+ :label="item.label"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="教学模式" prop="teachMode">
|
|
|
- <el-select
|
|
|
- style="width: 180px !important"
|
|
|
- v-model.trim="searchForm.teachMode"
|
|
|
- clearable
|
|
|
- filterable
|
|
|
- placeholder="教学模式"
|
|
|
- >
|
|
|
+ <el-select style="width: 180px !important" v-model.trim="searchForm.teachMode" clearable filterable
|
|
|
+ placeholder="教学模式">
|
|
|
<el-option label="线上课" value="ONLINE"></el-option>
|
|
|
<el-option label="线下课" value="OFFLINE"></el-option>
|
|
|
</el-select>
|
|
|
@@ -579,90 +368,45 @@
|
|
|
</el-select>
|
|
|
</el-form-item> -->
|
|
|
<el-form-item label="合并课类型" prop="mergeCourseType">
|
|
|
- <el-select
|
|
|
- style="width: 180px !important"
|
|
|
- v-model.trim="searchForm.mergeCourseType"
|
|
|
- clearable
|
|
|
- filterable
|
|
|
- placeholder="合并课程类型"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(item, index) in mergeCourseTypeOptions"
|
|
|
- :key="index"
|
|
|
- :value="item.value"
|
|
|
- :label="item.label"
|
|
|
- ></el-option>
|
|
|
+ <el-select style="width: 180px !important" v-model.trim="searchForm.mergeCourseType" clearable filterable
|
|
|
+ placeholder="合并课程类型">
|
|
|
+ <el-option v-for="(item, index) in mergeCourseTypeOptions" :key="index" :value="item.value"
|
|
|
+ :label="item.label"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="老师类型" prop="teachType">
|
|
|
- <el-select
|
|
|
- style="width: 180px !important"
|
|
|
- v-model.trim="searchForm.teachType"
|
|
|
- clearable
|
|
|
- filterable
|
|
|
- placeholder="老师类型"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="item in workTypeOptions"
|
|
|
- :key="item.label"
|
|
|
- :label="item.label"
|
|
|
- :value="item.value"
|
|
|
- ></el-option>
|
|
|
+ <el-select style="width: 180px !important" v-model.trim="searchForm.teachType" clearable filterable
|
|
|
+ placeholder="老师类型">
|
|
|
+ <el-option v-for="item in workTypeOptions" :key="item.label" :label="item.label"
|
|
|
+ :value="item.value"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="是否点名" prop="isCallNames">
|
|
|
- <el-select
|
|
|
- style="width: 180px !important"
|
|
|
- v-model.trim="searchForm.isCallNames"
|
|
|
- clearable
|
|
|
- filterable
|
|
|
- placeholder="是否点名"
|
|
|
- >
|
|
|
+ <el-select style="width: 180px !important" v-model.trim="searchForm.isCallNames" clearable filterable
|
|
|
+ placeholder="是否点名">
|
|
|
<el-option label="是" value="1"></el-option>
|
|
|
<el-option label="否" value="0"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="云教练课程" prop="memberFlag">
|
|
|
- <el-select
|
|
|
- style="width: 180px !important"
|
|
|
- v-model.trim="searchForm.memberFlag"
|
|
|
- clearable
|
|
|
- filterable
|
|
|
- placeholder="云教练课程"
|
|
|
- >
|
|
|
+ <el-select style="width: 180px !important" v-model.trim="searchForm.memberFlag" clearable filterable
|
|
|
+ placeholder="云教练课程">
|
|
|
<el-option label="是" value="1"></el-option>
|
|
|
<el-option label="否" value="0"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="创建日期" prop="creatTimer">
|
|
|
- <el-date-picker
|
|
|
- v-model.trim="searchForm.creatTimer"
|
|
|
- type="daterange"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
- range-separator="-"
|
|
|
- start-placeholder="创建开始日期"
|
|
|
- end-placeholder="创建结束日期"
|
|
|
- :picker-options="{
|
|
|
+ <el-date-picker v-model.trim="searchForm.creatTimer" type="daterange" value-format="yyyy-MM-dd"
|
|
|
+ range-separator="-" start-placeholder="创建开始日期" end-placeholder="创建结束日期" :picker-options="{
|
|
|
firstDayOfWeek: 1,
|
|
|
- }"
|
|
|
- ></el-date-picker>
|
|
|
+ }"></el-date-picker>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="课程时间" prop="courseTime">
|
|
|
- <el-time-picker
|
|
|
- is-range
|
|
|
- :picker-options="{
|
|
|
- selectableRange: '06:00:00 - 23:59:59',
|
|
|
- }"
|
|
|
- style="width: 350px !important"
|
|
|
- v-model="searchForm.courseTime"
|
|
|
- range-separator="-"
|
|
|
- start-placeholder="上课开始时间"
|
|
|
- end-placeholder="上课结束时间"
|
|
|
- placeholder="选择时间范围"
|
|
|
- value-format="HH:mm:ss"
|
|
|
- format="HH:mm"
|
|
|
- @change="changeCourseTime"
|
|
|
- >
|
|
|
+ <el-time-picker is-range :picker-options="{
|
|
|
+ selectableRange: '06:00:00 - 23:59:59',
|
|
|
+ }" style="width: 350px !important" v-model="searchForm.courseTime" range-separator="-"
|
|
|
+ start-placeholder="上课开始时间" end-placeholder="上课结束时间" placeholder="选择时间范围" value-format="HH:mm:ss"
|
|
|
+ format="HH:mm" @change="changeCourseTime">
|
|
|
</el-time-picker>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
@@ -672,16 +416,9 @@
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
|
|
|
- <addCompound
|
|
|
- ref="addCompound"
|
|
|
- :compoundList="deleteList"
|
|
|
- v-if="permission('courseSchedule/courseMerge')"
|
|
|
- v-show="deleteList.length > 0"
|
|
|
- @clearCom="clearCom"
|
|
|
- @getList="getList"
|
|
|
- @removeCourse="removeCourse"
|
|
|
- @cancleCompound="cancleCompound"
|
|
|
- />
|
|
|
+ <addCompound ref="addCompound" :compoundList="deleteList" v-if="permission('courseSchedule/courseMerge')"
|
|
|
+ v-show="deleteList.length > 0" @clearCom="clearCom" @getList="getList" @removeCourse="removeCourse"
|
|
|
+ @cancleCompound="cancleCompound" />
|
|
|
</div>
|
|
|
</template>
|
|
|
<script>
|
|
|
@@ -1025,7 +762,7 @@ export default {
|
|
|
load.endLoading();
|
|
|
});
|
|
|
})
|
|
|
- .catch(() => {});
|
|
|
+ .catch(() => { });
|
|
|
},
|
|
|
getList() {
|
|
|
if (!this.getSearchForm()) {
|
|
|
@@ -1113,7 +850,7 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
})
|
|
|
- .catch(() => {});
|
|
|
+ .catch(() => { });
|
|
|
},
|
|
|
cancleMore() {
|
|
|
// this.$refs.searchForm2.resetFields()
|
|
|
@@ -1175,7 +912,7 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
})
|
|
|
- .catch(() => {});
|
|
|
+ .catch(() => { });
|
|
|
},
|
|
|
handleSelectionChange(arr) {
|
|
|
// this.deleteList = arr;
|
|
|
@@ -1271,23 +1008,29 @@ export default {
|
|
|
.courseRed {
|
|
|
color: #808080;
|
|
|
}
|
|
|
+
|
|
|
.courseYellow {
|
|
|
color: #ff802c;
|
|
|
}
|
|
|
+
|
|
|
.coruseGreen {
|
|
|
color: #01c1b5;
|
|
|
}
|
|
|
+
|
|
|
.visible {
|
|
|
visibility: hidden;
|
|
|
}
|
|
|
+
|
|
|
.cl-container {
|
|
|
.topFrom {
|
|
|
margin: 20px 30px 0;
|
|
|
+
|
|
|
.classlist {
|
|
|
display: flex;
|
|
|
flex-direction: row;
|
|
|
justify-content: flex-start;
|
|
|
align-items: center;
|
|
|
+
|
|
|
ul {
|
|
|
li {
|
|
|
list-style: none;
|
|
|
@@ -1295,24 +1038,30 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
.searchForm {
|
|
|
margin: 0 30px;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
.btnWraps {
|
|
|
display: flex;
|
|
|
flex-direction: row;
|
|
|
justify-content: flex-start;
|
|
|
+
|
|
|
div {
|
|
|
margin-right: 20px;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
.inputStyle {
|
|
|
width: 180px;
|
|
|
}
|
|
|
+
|
|
|
.red {
|
|
|
color: red;
|
|
|
}
|
|
|
+
|
|
|
.green {
|
|
|
color: var(--color-primary);
|
|
|
}
|
|
|
@@ -1320,6 +1069,7 @@ export default {
|
|
|
.exportBtn {
|
|
|
background: var(--color-primary);
|
|
|
}
|
|
|
+
|
|
|
.newBand {
|
|
|
margin-top: 30px;
|
|
|
}
|
