|
|
@@ -2,48 +2,48 @@
|
|
|
<div class="m-container">
|
|
|
<div class="titlewrap">
|
|
|
<h2>
|
|
|
- <el-page-header @back="goBack" :content="name"></el-page-header>
|
|
|
+ <el-page-header @back="goBack"
|
|
|
+ :content="name"></el-page-header>
|
|
|
</h2>
|
|
|
<p style="margin-bottom:10px; margin-left:30px;">课程有效期:{{ timers }}</p>
|
|
|
</div>
|
|
|
|
|
|
<!-- v-permission="'vipGroupManage/updateVipBaseInfo'" -->
|
|
|
<div class="wrap">
|
|
|
- <div
|
|
|
- class="newBand"
|
|
|
- @click="resetTeachers"
|
|
|
- v-if="courseType&&courseType!='TRIAL'"
|
|
|
- v-permission="'courseSchedule/practiceGroupTeacherAdjust'"
|
|
|
- >课程组调整</div>
|
|
|
+ <div class="newBand"
|
|
|
+ @click="resetTeachers"
|
|
|
+ v-if="courseType&&courseType!='TRIAL'"
|
|
|
+ v-permission="'courseSchedule/practiceGroupTeacherAdjust'">课程组调整</div>
|
|
|
<!-- // accompanys/addCourse -->
|
|
|
- <div
|
|
|
- v-permission="{ child:'courseSchedule/batchAddCourses',parent:'/accompanys'}"
|
|
|
- class="newBand"
|
|
|
- @click="addCourse"
|
|
|
- >网管课加课</div>
|
|
|
- <div
|
|
|
- class="newBand"
|
|
|
- v-if="courseType&&courseType!='TRIAL'"
|
|
|
- v-permission="'courseSchedule/batchUpdateCourseSchedule'"
|
|
|
- @click="adjustment"
|
|
|
- >批量调整</div>
|
|
|
+ <div v-permission="{ child:'courseSchedule/batchAddCourses',parent:'/accompanys'}"
|
|
|
+ class="newBand"
|
|
|
+ @click="addCourse">网管课加课</div>
|
|
|
+ <div class="newBand"
|
|
|
+ v-if="courseType&&courseType!='TRIAL'"
|
|
|
+ v-permission="'courseSchedule/batchUpdateCourseSchedule'"
|
|
|
+ @click="adjustment">批量调整</div>
|
|
|
|
|
|
<div class="newBand"
|
|
|
- v-permission="'courseSchedule/updateCoursesExpireDate'"
|
|
|
- @click="expireVisible = true"
|
|
|
- >有效期调整</div>
|
|
|
+ v-permission="'courseSchedule/updateCoursesExpireDate'"
|
|
|
+ @click="expireVisible = true">有效期调整</div>
|
|
|
</div>
|
|
|
-
|
|
|
+
|
|
|
<div class="tableWrap">
|
|
|
- <el-table
|
|
|
- :data="tableList"
|
|
|
- :header-cell-style="{background:'#EDEEF0',color:'#444'}"
|
|
|
- @selection-change="handleSelectionChange"
|
|
|
- >
|
|
|
- <el-table-column type="selection" :selectable="isDisabled" width="55"></el-table-column>
|
|
|
- <el-table-column label="课程编号" align="center" prop="id"></el-table-column>
|
|
|
- <el-table-column label="课程名称" align="center" prop="name"></el-table-column>
|
|
|
- <el-table-column label="主教老师" align="center" prop="teacherName"></el-table-column>
|
|
|
+ <el-table :data="tableList"
|
|
|
+ :header-cell-style="{background:'#EDEEF0',color:'#444'}"
|
|
|
+ @selection-change="handleSelectionChange">
|
|
|
+ <el-table-column type="selection"
|
|
|
+ :selectable="isDisabled"
|
|
|
+ width="55"></el-table-column>
|
|
|
+ <el-table-column label="课程编号"
|
|
|
+ align="center"
|
|
|
+ prop="id"></el-table-column>
|
|
|
+ <el-table-column label="课程名称"
|
|
|
+ align="center"
|
|
|
+ prop="name"></el-table-column>
|
|
|
+ <el-table-column label="主教老师"
|
|
|
+ align="center"
|
|
|
+ prop="teacherName"></el-table-column>
|
|
|
<!-- <el-table-column label="主教老师" align="center" >
|
|
|
<template slot-scope="scope">
|
|
|
<div v-show="scope.row.teacher">
|
|
|
@@ -55,31 +55,42 @@
|
|
|
align="center"
|
|
|
prop="classGroupId">
|
|
|
</el-table-column>-->
|
|
|
- <el-table-column label="上课日期" align="center" prop="classDate">
|
|
|
+ <el-table-column label="上课日期"
|
|
|
+ align="center"
|
|
|
+ prop="classDate">
|
|
|
<template slot-scope="scope">
|
|
|
<div>{{ scope.row.classDate | formatTimer}}</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="是否点名" align="center" prop="status">
|
|
|
+ <el-table-column label="是否点名"
|
|
|
+ align="center"
|
|
|
+ prop="status">
|
|
|
<template slot-scope="scope">{{ scope.row.isCallNames ? '是' : '否' }}</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="课程状态" align="center" prop="status">
|
|
|
+ <el-table-column label="课程状态"
|
|
|
+ align="center"
|
|
|
+ prop="status">
|
|
|
<template slot-scope="scope">
|
|
|
<div>{{ scope.row.status | coursesStatus }}</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="结算状态" align="center">
|
|
|
+ <el-table-column label="结算状态"
|
|
|
+ align="center">
|
|
|
<template slot-scope="scope">
|
|
|
<div>{{scope.row.isSettlement?'已结算':'未结算'}}</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="开始时间" align="center" prop="startClassTimeStr">
|
|
|
- <template slot-scope="scope">
|
|
|
+ <el-table-column label="开始时间"
|
|
|
+ align="center"
|
|
|
+ prop="startClassTimeStr">
|
|
|
+ <template slot-scope="scope">
|
|
|
<div>{{ scope.row.startClassTimeStr | timerForMinFormat}}</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="结束时间" align="center" prop="endClassTimeStr">
|
|
|
- <template slot-scope="scope">
|
|
|
+ <el-table-column label="结束时间"
|
|
|
+ align="center"
|
|
|
+ prop="endClassTimeStr">
|
|
|
+ <template slot-scope="scope">
|
|
|
<div>{{ scope.row.endClassTimeStr | timerForMinFormat}}</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -88,125 +99,125 @@
|
|
|
<div>{{scope.row.schoolName?scope.row.schoolName:'网络教室'}}</div>
|
|
|
</template>
|
|
|
</el-table-column>-->
|
|
|
- <el-table-column label="操作" width="250px" align="center" fixed="right">
|
|
|
+ <el-table-column label="操作"
|
|
|
+ width="250px"
|
|
|
+ align="center"
|
|
|
+ fixed="right">
|
|
|
<template slot-scope="scope">
|
|
|
<div>
|
|
|
- <el-button
|
|
|
- type="text"
|
|
|
- v-if="!scope.row.isSettlement && permission('courseSchedule/classStartDateAdjust')"
|
|
|
- @click="resetClass(scope.row)"
|
|
|
- >调整</el-button>
|
|
|
- <el-button
|
|
|
- type="text"
|
|
|
- v-if="!scope.row.isSettlement && scope.row.status == 'NOT_START' && permission('accompanys/remove')"
|
|
|
- @click="removeClass(scope.row)"
|
|
|
- >删除</el-button>
|
|
|
- <el-button
|
|
|
- type="text"
|
|
|
- v-if="scope.row.status == 'NOT_START'&&courseType!='TRIAL'&& permission('courseSchedule/practiceCourseTeacherAdjust')"
|
|
|
- @click="resetTeacher(scope.row)"
|
|
|
- >更换老师</el-button>
|
|
|
- <el-button v-if="scope.row.status == 'OVER' && scope.row.isSettlement == 0 && permission('teacherAttendance/updateTeacherAttendance', '/accompanys')" type="text" @click="onMarkAttendance(scope.row)"
|
|
|
- >补考勤</el-button>
|
|
|
+ <el-button type="text"
|
|
|
+ v-if="!scope.row.isSettlement && permission('courseSchedule/classStartDateAdjust')"
|
|
|
+ @click="resetClass(scope.row)">调整</el-button>
|
|
|
+ <el-button type="text"
|
|
|
+ v-if="!scope.row.isSettlement && scope.row.status == 'NOT_START' && permission('accompanys/remove')"
|
|
|
+ @click="removeClass(scope.row)">删除</el-button>
|
|
|
+ <el-button type="text"
|
|
|
+ v-if="scope.row.status == 'NOT_START'&&courseType!='TRIAL'&& permission('courseSchedule/practiceCourseTeacherAdjust')"
|
|
|
+ @click="resetTeacher(scope.row)">更换老师</el-button>
|
|
|
+ <el-button v-if="scope.row.status == 'OVER' && scope.row.isSettlement == 0 && permission('teacherAttendance/updateTeacherAttendance', '/accompanys')"
|
|
|
+ type="text"
|
|
|
+ @click="onMarkAttendance(scope.row)">补考勤</el-button>
|
|
|
<!-- && permission('studentAttendance/updateStudentAttendances', '/accompanys') -->
|
|
|
- <el-button v-if="scope.row.status == 'OVER' && scope.row.isSettlement == 0 && permission('studentAttendance/updateStudentAttendances', '/accompanys')" type="text" @click="onCallName(scope.row)">点名表</el-button>
|
|
|
- <el-button
|
|
|
- type="text"
|
|
|
- v-if="!scope.row.isSettlement && permission('accompanys/cleanAttendance')"
|
|
|
- @click="clearAttend(scope.row)"
|
|
|
- >清除考勤</el-button>
|
|
|
+ <el-button v-if="scope.row.status == 'OVER' && scope.row.isSettlement == 0 && permission('studentAttendance/updateStudentAttendances', '/accompanys')"
|
|
|
+ type="text"
|
|
|
+ @click="onCallName(scope.row)">点名表</el-button>
|
|
|
+ <el-button type="text"
|
|
|
+ v-if="!scope.row.isSettlement && permission('accompanys/cleanAttendance')"
|
|
|
+ @click="clearAttend(scope.row)">清除考勤</el-button>
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
- <pagination
|
|
|
- :total="rules.total"
|
|
|
- :page.sync="rules.page"
|
|
|
- :limit.sync="rules.limit"
|
|
|
- :page-sizes="rules.page_size"
|
|
|
- @pagination="getList"
|
|
|
- />
|
|
|
+ <pagination :total="rules.total"
|
|
|
+ :page.sync="rules.page"
|
|
|
+ :limit.sync="rules.limit"
|
|
|
+ :page-sizes="rules.page_size"
|
|
|
+ @pagination="getList" />
|
|
|
</div>
|
|
|
- <el-dialog title="有效期调整" width="400px" :before-close="expireClose" :visible.sync="expireVisible">
|
|
|
- <el-form
|
|
|
- :model="expireForm"
|
|
|
- ref="expireForm"
|
|
|
- :rules="expireRules"
|
|
|
- label-position="right"
|
|
|
- label-width="80px;"
|
|
|
- :inline="true">
|
|
|
- <el-form-item label="课程结束时间" prop="coursesExpireDate">
|
|
|
- <el-date-picker
|
|
|
- v-model.trim="expireForm.coursesExpireDate"
|
|
|
- style="width:200px!important;"
|
|
|
- type="date"
|
|
|
- :picker-options="bigin"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
- placeholder="选择日期"
|
|
|
- ></el-date-picker>
|
|
|
- </el-form-item >
|
|
|
+ <el-dialog title="有效期调整"
|
|
|
+ width="400px"
|
|
|
+ :before-close="expireClose"
|
|
|
+ :visible.sync="expireVisible">
|
|
|
+ <el-form :model="expireForm"
|
|
|
+ ref="expireForm"
|
|
|
+ :rules="expireRules"
|
|
|
+ label-position="right"
|
|
|
+ label-width="80px;"
|
|
|
+ :inline="true">
|
|
|
+ <el-form-item label="课程结束时间"
|
|
|
+ prop="coursesExpireDate">
|
|
|
+ <el-date-picker v-model.trim="expireForm.coursesExpireDate"
|
|
|
+ style="width:200px!important;"
|
|
|
+ type="date"
|
|
|
+ :picker-options="bigin"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
+ placeholder="选择日期"></el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
<div style="padding-left: 15px; color: red;">课程结束时间不得早于，{{ expireForm.tempCoursesExpireDate }}</div>
|
|
|
</el-form>
|
|
|
- <div slot="footer" class="dialog-footer">
|
|
|
+ <div slot="footer"
|
|
|
+ class="dialog-footer">
|
|
|
<el-button @click="expireVisible = false">取 消</el-button>
|
|
|
- <el-button type="primary" @click="submitExpireDate">确 定</el-button>
|
|
|
+ <el-button type="primary"
|
|
|
+ @click="submitExpireDate">确 定</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
- <el-dialog title="补考勤" width="400px" :visible.sync="markAttendance.status">
|
|
|
+ <el-dialog title="补考勤"
|
|
|
+ width="400px"
|
|
|
+ :visible.sync="markAttendance.status">
|
|
|
<el-form>
|
|
|
<el-form-item label="签到状态">{{ markAttendance.dataInfo.isSignIn | attendanceType }}</el-form-item>
|
|
|
<el-form-item label="签到时间">{{ markAttendance.dataInfo.signInTime}}</el-form-item>
|
|
|
<el-form-item label="签退状态">{{ markAttendance.dataInfo.isSignOut | attendanceOutType }}</el-form-item>
|
|
|
<el-form-item label="签退时间">{{ markAttendance.dataInfo.signOutTime}}</el-form-item>
|
|
|
</el-form>
|
|
|
- <div slot="footer" class="dialog-footer">
|
|
|
+ <div slot="footer"
|
|
|
+ class="dialog-footer">
|
|
|
<el-button @click="markAttendance.status = false">取 消</el-button>
|
|
|
- <el-button
|
|
|
- type="primary"
|
|
|
- :disabled="markAttendance.dataInfo.isSignIn == 1 && markAttendance.dataInfo.isSignOut == 1 ? true : false"
|
|
|
- @click="batchAdjustmentTime"
|
|
|
- >确定补卡</el-button>
|
|
|
+ <el-button type="primary"
|
|
|
+ :disabled="markAttendance.dataInfo.isSignIn == 1 && markAttendance.dataInfo.isSignOut == 1 ? true : false"
|
|
|
+ @click="batchAdjustmentTime">确定补卡</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
- <el-dialog title="课程调整" width="400px" :before-close="handleClose" :visible.sync="courseVisible">
|
|
|
- <el-form
|
|
|
- :model="maskForm"
|
|
|
- ref="maskForm"
|
|
|
- :rules="maskRules"
|
|
|
- label-position="right"
|
|
|
- label-width="80px;"
|
|
|
- :inline="true"
|
|
|
- >
|
|
|
- <el-form-item label="上课日期" prop="date" v-if="courseType != 'TRIAL'">
|
|
|
- <el-date-picker
|
|
|
- v-model.trim="maskForm.date"
|
|
|
- style="width:200px!important;"
|
|
|
- type="date"
|
|
|
- :picker-options="courseOption"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
- placeholder="选择日期"
|
|
|
- ></el-date-picker>
|
|
|
- </el-form-item >
|
|
|
- <el-form-item label="上课日期" prop="date" v-else>
|
|
|
- <el-date-picker
|
|
|
- v-model.trim="maskForm.date"
|
|
|
- style="width:200px!important;"
|
|
|
- type="date"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
- placeholder="选择日期"
|
|
|
- ></el-date-picker>
|
|
|
+ <el-dialog title="课程调整"
|
|
|
+ width="400px"
|
|
|
+ :before-close="handleClose"
|
|
|
+ :visible.sync="courseVisible">
|
|
|
+ <el-form :model="maskForm"
|
|
|
+ ref="maskForm"
|
|
|
+ :rules="maskRules"
|
|
|
+ label-position="right"
|
|
|
+ label-width="80px;"
|
|
|
+ :inline="true">
|
|
|
+ <el-form-item label="上课日期"
|
|
|
+ prop="date"
|
|
|
+ v-if="courseType != 'TRIAL'">
|
|
|
+ <el-date-picker v-model.trim="maskForm.date"
|
|
|
+ style="width:200px!important;"
|
|
|
+ type="date"
|
|
|
+ :picker-options="courseOption"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
+ placeholder="选择日期"></el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="上课日期"
|
|
|
+ prop="date"
|
|
|
+ v-else>
|
|
|
+ <el-date-picker v-model.trim="maskForm.date"
|
|
|
+ style="width:200px!important;"
|
|
|
+ type="date"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
+ placeholder="选择日期"></el-date-picker>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="开始时间" prop="startTime">
|
|
|
- <el-time-select
|
|
|
- placeholder="起始时间"
|
|
|
- style="width:200px!important;"
|
|
|
- v-model.trim="startTime"
|
|
|
- :picker-options="{
|
|
|
+ <el-form-item label="开始时间"
|
|
|
+ prop="startTime">
|
|
|
+ <el-time-select placeholder="起始时间"
|
|
|
+ style="width:200px!important;"
|
|
|
+ v-model.trim="startTime"
|
|
|
+ :picker-options="{
|
|
|
start: '08:30',
|
|
|
step: '00:30',
|
|
|
end: '23:00'
|
|
|
- }"
|
|
|
- ></el-time-select>
|
|
|
+ }"></el-time-select>
|
|
|
</el-form-item>
|
|
|
<!-- <el-form-item label="结束时间"
|
|
|
prop="endTime">
|
|
|
@@ -237,149 +248,157 @@
|
|
|
</el-select>
|
|
|
</el-form-item> 1-->
|
|
|
</el-form>
|
|
|
- <div slot="footer" class="dialog-footer">
|
|
|
+ <div slot="footer"
|
|
|
+ class="dialog-footer">
|
|
|
<el-button @click="courseVisible = false">取 消</el-button>
|
|
|
- <el-button type="primary" @click="submitResetClass">确 定</el-button>
|
|
|
+ <el-button type="primary"
|
|
|
+ @click="submitResetClass">确 定</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
|
|
|
- <el-dialog
|
|
|
- title="课程组调整"
|
|
|
- width="400px"
|
|
|
- :before-close="teacherClose"
|
|
|
- :visible.sync="teacherVisible">
|
|
|
- <el-form
|
|
|
- :model="teacherForm"
|
|
|
- ref="teacherForm"
|
|
|
- :rules="teacherRules"
|
|
|
- label-position="right"
|
|
|
- label-width="80px;"
|
|
|
- :inline="true"
|
|
|
- >
|
|
|
- <el-form-item label="课程班名称" v-show="isMultiple">
|
|
|
- <el-input v-model.trim="teacherForm.name" disabled></el-input>
|
|
|
+ <el-dialog title="课程组调整"
|
|
|
+ width="400px"
|
|
|
+ :before-close="teacherClose"
|
|
|
+ :visible.sync="teacherVisible">
|
|
|
+ <el-form :model="teacherForm"
|
|
|
+ ref="teacherForm"
|
|
|
+ :rules="teacherRules"
|
|
|
+ label-position="right"
|
|
|
+ label-width="80px;"
|
|
|
+ :inline="true">
|
|
|
+ <el-form-item label="课程班名称"
|
|
|
+ v-show="isMultiple">
|
|
|
+ <el-input v-model.trim="teacherForm.name"
|
|
|
+ disabled></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="课程组声部" v-show="isMultiple">
|
|
|
- <el-select
|
|
|
- v-model.trim="teacherForm.subjectId"
|
|
|
- @change="changeSound"
|
|
|
- filterable
|
|
|
- clearable
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(item,index) in subjectList"
|
|
|
- :key="index"
|
|
|
- :value="item.id"
|
|
|
- :label="item.name"
|
|
|
- ></el-option>
|
|
|
+ <el-form-item label="课程组声部"
|
|
|
+ v-show="isMultiple">
|
|
|
+ <el-select v-model.trim="teacherForm.subjectId"
|
|
|
+ @change="changeSound"
|
|
|
+ filterable
|
|
|
+ clearable>
|
|
|
+ <el-option v-for="(item,index) in subjectList"
|
|
|
+ :key="index"
|
|
|
+ :value="item.id"
|
|
|
+ :label="item.name"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="课程组老师">
|
|
|
- <el-select v-model.trim="teacherForm.teacher" filterable clearable>
|
|
|
- <el-option
|
|
|
- v-for="(item,index) in teacherList"
|
|
|
- :key="index"
|
|
|
- :value="item.id"
|
|
|
- :label="item.realName"
|
|
|
- ></el-option>
|
|
|
+ <el-select v-model.trim="teacherForm.teacher"
|
|
|
+ filterable
|
|
|
+ clearable>
|
|
|
+ <el-option v-for="(item,index) in teacherList"
|
|
|
+ :key="index"
|
|
|
+ :value="item.id"
|
|
|
+ :label="item.realName"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="教务老师">
|
|
|
- <el-select v-model.trim="teacherForm.educationalTeacherId" filterable clearable>
|
|
|
- <el-option
|
|
|
- v-for="(item,index) in educationList"
|
|
|
- :key="index"
|
|
|
- :value="item.userId"
|
|
|
- :label="item.userName"
|
|
|
- ></el-option>
|
|
|
+ <el-select v-model.trim="teacherForm.educationalTeacherId"
|
|
|
+ filterable
|
|
|
+ clearable>
|
|
|
+ <el-option v-for="(item,index) in educationList"
|
|
|
+ :key="index"
|
|
|
+ :value="item.userId"
|
|
|
+ :label="item.userName"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item v-show="isMultiple">
|
|
|
<p style="color:#FF5353">*更改课程组老师，将更换全部未开始课程的老师</p>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
- <div slot="footer" class="dialog-footer">
|
|
|
+ <div slot="footer"
|
|
|
+ class="dialog-footer">
|
|
|
<el-button @click="teacherVisible = false">取 消</el-button>
|
|
|
- <el-button type="primary" @click="subresetTeacher">确 定</el-button>
|
|
|
+ <el-button type="primary"
|
|
|
+ @click="subresetTeacher">确 定</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
- <el-dialog :title="adjustmentName" width="800px" :visible.sync="adjustmentVisible">
|
|
|
- <el-form
|
|
|
- :model="adjustmentForm"
|
|
|
- label-position="right"
|
|
|
- label-width="120px"
|
|
|
- ref="adjustmentForm"
|
|
|
- :rules="adjustmentRules"
|
|
|
- :inline="true"
|
|
|
- >
|
|
|
- <el-form-item label="已选择课时数" v-if="!isaddCourse">
|
|
|
- <el-input disabled v-model.trim="adjustmentForm.count"></el-input>
|
|
|
+ <el-dialog :title="adjustmentName"
|
|
|
+ width="800px"
|
|
|
+ :visible.sync="adjustmentVisible">
|
|
|
+ <el-form :model="adjustmentForm"
|
|
|
+ label-position="right"
|
|
|
+ label-width="120px"
|
|
|
+ ref="adjustmentForm"
|
|
|
+ :rules="adjustmentRules"
|
|
|
+ :inline="true">
|
|
|
+ <el-form-item label="已选择课时数"
|
|
|
+ v-if="!isaddCourse">
|
|
|
+ <el-input disabled
|
|
|
+ v-model.trim="adjustmentForm.count"></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="添加课时数" prop="addCount" v-if="isaddCourse">
|
|
|
- <el-input type="number" @mousewheel.native.prevent v-model.trim="adjustmentForm.addCount"></el-input>
|
|
|
+ <el-form-item label="添加课时数"
|
|
|
+ prop="addCount"
|
|
|
+ v-if="isaddCourse">
|
|
|
+ <el-input type="number"
|
|
|
+ @mousewheel.native.prevent
|
|
|
+ v-model.trim="adjustmentForm.addCount"></el-input>
|
|
|
</el-form-item>
|
|
|
<br />
|
|
|
<!-- <el-form-item label="单课费用" prop="fee" v-show="isaddCourse">
|
|
|
<el-input v-model.trim="adjustmentForm.fee"></el-input>
|
|
|
</el-form-item>-->
|
|
|
- <el-form-item label="排课起始时间" prop="courseTime">
|
|
|
- <el-date-picker
|
|
|
- v-model.trim="adjustmentForm.courseTime"
|
|
|
- :picker-options="pickerOptions"
|
|
|
- style="width:200px!important;"
|
|
|
- type="date"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
- placeholder="选择日期"
|
|
|
- ></el-date-picker>
|
|
|
- <el-checkbox style="margin-left:10px;" v-model.trim="adjustmentForm.checked">是否跳过节假日</el-checkbox>
|
|
|
+ <el-form-item label="排课起始时间"
|
|
|
+ prop="courseTime">
|
|
|
+ <el-date-picker v-model.trim="adjustmentForm.courseTime"
|
|
|
+ :picker-options="pickerOptions"
|
|
|
+ style="width:200px!important;"
|
|
|
+ type="date"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
+ placeholder="选择日期"></el-date-picker>
|
|
|
+ <el-checkbox style="margin-left:10px;"
|
|
|
+ v-model.trim="adjustmentForm.checked">是否跳过节假日</el-checkbox>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
<div class="WeekWrap">
|
|
|
<h3 style="margin-bottom:20px;">
|
|
|
循环次数
|
|
|
- <el-button type="text" style="margin-left:10px;" @click="addWeek">添加</el-button>
|
|
|
+ <el-button type="text"
|
|
|
+ style="margin-left:10px;"
|
|
|
+ @click="addWeek">添加</el-button>
|
|
|
</h3>
|
|
|
- <div class="countWrap" style="margin-bottom:10px;">
|
|
|
- <div
|
|
|
- class="countItem"
|
|
|
- style="margin-bottom:20px;"
|
|
|
- v-for="(item,index) in weekList"
|
|
|
- :key="index"
|
|
|
- >
|
|
|
+ <div class="countWrap"
|
|
|
+ style="margin-bottom:10px;">
|
|
|
+ <div class="countItem"
|
|
|
+ style="margin-bottom:20px;"
|
|
|
+ v-for="(item,index) in weekList"
|
|
|
+ :key="index">
|
|
|
<span>循环周期:</span>
|
|
|
- <el-select v-model.trim="item.dayOfWeek" filterable clearable>
|
|
|
- <el-option
|
|
|
- v-for="(item,index) in weekDateList"
|
|
|
- :key="index"
|
|
|
- :label="item.label"
|
|
|
- :value="item.value"
|
|
|
- ></el-option>
|
|
|
+ <el-select v-model.trim="item.dayOfWeek"
|
|
|
+ filterable
|
|
|
+ clearable>
|
|
|
+ <el-option v-for="(item,index) in weekDateList"
|
|
|
+ :key="index"
|
|
|
+ :label="item.label"
|
|
|
+ :value="item.value"></el-option>
|
|
|
</el-select>
|
|
|
<span style="margin-left:10px;">开始时间</span>
|
|
|
- <el-time-select
|
|
|
- style="margin-left:10px;"
|
|
|
- placeholder
|
|
|
- v-model.trim="item.startClassTime"
|
|
|
- :picker-options="{
|
|
|
+ <el-time-select style="margin-left:10px;"
|
|
|
+ placeholder
|
|
|
+ v-model.trim="item.startClassTime"
|
|
|
+ :picker-options="{
|
|
|
start: '04:30',
|
|
|
step: '00:05',
|
|
|
end: '23:55'
|
|
|
- }"
|
|
|
- ></el-time-select>
|
|
|
- <el-button
|
|
|
- style="margin-left:10px;"
|
|
|
- type="danger"
|
|
|
- @click="removeWeek(item)"
|
|
|
- icon="el-icon-delete"
|
|
|
- circle
|
|
|
- ></el-button>
|
|
|
+ }"></el-time-select>
|
|
|
+ <el-button style="margin-left:10px;"
|
|
|
+ type="danger"
|
|
|
+ @click="removeWeek(item)"
|
|
|
+ icon="el-icon-delete"
|
|
|
+ circle></el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div slot="footer" class="dialog-footer">
|
|
|
+ <div slot="footer"
|
|
|
+ class="dialog-footer">
|
|
|
<el-button @click="adjustmentVisible = false">取 消</el-button>
|
|
|
- <el-button type="primary" v-show="!isaddCourse" @click="submitAdjustment">确 定</el-button>
|
|
|
- <el-button type="primary" v-show="isaddCourse" @click="addCourseSubmit">确 定</el-button>
|
|
|
+ <el-button type="primary"
|
|
|
+ v-show="!isaddCourse"
|
|
|
+ @click="submitAdjustment">确 定</el-button>
|
|
|
+ <el-button type="primary"
|
|
|
+ v-show="isaddCourse"
|
|
|
+ @click="addCourseSubmit">确 定</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
|
|
|
@@ -461,7 +480,7 @@ export default {
|
|
|
components: {
|
|
|
pagination
|
|
|
},
|
|
|
- data() {
|
|
|
+ data () {
|
|
|
return {
|
|
|
adjustmentName: "",
|
|
|
isaddCourse: false,
|
|
|
@@ -475,7 +494,7 @@ export default {
|
|
|
FsearchForm: null,
|
|
|
userId: null,
|
|
|
activeRow: null,
|
|
|
- courseType:null,
|
|
|
+ courseType: null,
|
|
|
rules: {
|
|
|
// 分页规则
|
|
|
limit: 20, // 限制显示条数
|
|
|
@@ -525,7 +544,7 @@ export default {
|
|
|
teacher: null,
|
|
|
name: null,
|
|
|
subjectId: null,
|
|
|
- educationalTeacherId:null
|
|
|
+ educationalTeacherId: null
|
|
|
},
|
|
|
courseOption: null,
|
|
|
coursesExpireDate: null,
|
|
|
@@ -536,7 +555,7 @@ export default {
|
|
|
fee: [{ required: true, message: "请输入费用" }]
|
|
|
},
|
|
|
pickerOptions: {
|
|
|
- disabledDate(time) {
|
|
|
+ disabledDate (time) {
|
|
|
return time.getTime() + 86400000 <= new Date().getTime();
|
|
|
}
|
|
|
},
|
|
|
@@ -577,14 +596,14 @@ export default {
|
|
|
}
|
|
|
};
|
|
|
},
|
|
|
- mounted() {
|
|
|
+ mounted () {
|
|
|
this.init();
|
|
|
},
|
|
|
- activated() {
|
|
|
+ activated () {
|
|
|
this.init();
|
|
|
},
|
|
|
methods: {
|
|
|
- init() {
|
|
|
+ init () {
|
|
|
this.practiceId = this.$route.query.id;
|
|
|
this.userId = this.$route.query.userId;
|
|
|
this.courseType = this.$route.query.type;
|
|
|
@@ -669,7 +688,7 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
- getCourseGroup() {
|
|
|
+ getCourseGroup () {
|
|
|
practiceGroupManage({ search: this.practiceId }).then(res => {
|
|
|
if (res.code == 200) {
|
|
|
this.courseData = res.data.rows;
|
|
|
@@ -683,13 +702,11 @@ export default {
|
|
|
let originalStartDate = this.courseData[0].coursesStartDate ? new Date(this.courseData[0].coursesStartDate) : new Date()
|
|
|
let buyMonths = this.courseData[0].buyMonths
|
|
|
let lastDayNum = nextMonthLastDay(originalStartDate.getFullYear(), (originalStartDate.getMonth() + buyMonths + 1))
|
|
|
- if(lastDayNum[2] >= originalStartDate.getDate()) {
|
|
|
+ if (lastDayNum[2] >= originalStartDate.getDate()) {
|
|
|
originalStartDate.setMonth(originalStartDate.getMonth() + buyMonths)
|
|
|
} else {
|
|
|
originalStartDate = new Date(lastDayNum.join('-'))
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
originalStartDate.setDate(originalStartDate.getDate() - 1)
|
|
|
let overTime = originalStartDate.getFullYear() + '-' + (originalStartDate.getMonth() + 1) + '-' + originalStartDate.getDate()
|
|
|
this.expireForm.tempCoursesExpireDate = overTime
|
|
|
@@ -697,7 +714,7 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
- permission(str, parent) {
|
|
|
+ permission (str, parent) {
|
|
|
return permission(str, parent);
|
|
|
},
|
|
|
beginDate () {
|
|
|
@@ -713,7 +730,7 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
- submitExpireDate() {
|
|
|
+ submitExpireDate () {
|
|
|
this.$refs.expireForm.validate(some => {
|
|
|
if (some) {
|
|
|
updateCoursesExpireDate({
|
|
|
@@ -733,16 +750,16 @@ export default {
|
|
|
return;
|
|
|
}
|
|
|
});
|
|
|
-
|
|
|
+
|
|
|
},
|
|
|
- onMarkAttendance(item) {
|
|
|
+ onMarkAttendance (item) {
|
|
|
// 补考勤
|
|
|
this.markAttendance = {
|
|
|
status: true,
|
|
|
dataInfo: item
|
|
|
};
|
|
|
},
|
|
|
- batchAdjustmentTime() {
|
|
|
+ batchAdjustmentTime () {
|
|
|
let tempData = this.markAttendance.dataInfo;
|
|
|
let params = {
|
|
|
teacherId: tempData.actualTeacherId,
|
|
|
@@ -760,7 +777,7 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
- getList() {
|
|
|
+ getList () {
|
|
|
findPracticeGroupCourseSchedules({ practiceId: this.practiceId }).then(
|
|
|
res => {
|
|
|
if (res.code == 200) {
|
|
|
@@ -770,18 +787,18 @@ export default {
|
|
|
}
|
|
|
);
|
|
|
},
|
|
|
- goBack() {
|
|
|
+ goBack () {
|
|
|
this.$router.push({
|
|
|
path: "/business/accompany",
|
|
|
query: { rules: this.Frules, searchForm: this.FsearchForm }
|
|
|
});
|
|
|
},
|
|
|
- teacherClose() {
|
|
|
+ teacherClose () {
|
|
|
this.isMultiple = true;
|
|
|
this.teacherForm.teacher = null;
|
|
|
this.teacherVisible = false;
|
|
|
},
|
|
|
- handleClose() {
|
|
|
+ handleClose () {
|
|
|
this.courseVisible = false;
|
|
|
this.startTime = "";
|
|
|
this.maskForm = {
|
|
|
@@ -791,12 +808,12 @@ export default {
|
|
|
};
|
|
|
this.$refs["maskForm"].resetFields();
|
|
|
},
|
|
|
- expireClose() {
|
|
|
+ expireClose () {
|
|
|
this.expireVisible = false;
|
|
|
this.expireForm.coursesExpireDate = null
|
|
|
this.$refs["expireForm"].resetFields();
|
|
|
},
|
|
|
- submitResetClass() {
|
|
|
+ submitResetClass () {
|
|
|
// endClassTimeStr: this.maskForm.endTime,
|
|
|
if (!this.startTime) {
|
|
|
this.$message.error("请填写修改时间");
|
|
|
@@ -817,7 +834,7 @@ export default {
|
|
|
// }
|
|
|
});
|
|
|
},
|
|
|
- resetClass(row) {
|
|
|
+ resetClass (row) {
|
|
|
/**
|
|
|
* maskForm.startTime
|
|
|
*
|
|
|
@@ -831,14 +848,14 @@ export default {
|
|
|
// 修改课时
|
|
|
this.courseVisible = true;
|
|
|
},
|
|
|
- resetTeacher(row) {
|
|
|
+ resetTeacher (row) {
|
|
|
// 单节课
|
|
|
this.isMultiple = false;
|
|
|
this.activeRow = row;
|
|
|
this.teacherForm.teacher = row.actualTeacherId;
|
|
|
this.teacherVisible = true;
|
|
|
},
|
|
|
- resetTeachers() {
|
|
|
+ resetTeachers () {
|
|
|
// 课程组
|
|
|
this.isMultiple = true;
|
|
|
this.teacherForm.teacher = this.courseData[0].userId;
|
|
|
@@ -848,7 +865,7 @@ export default {
|
|
|
this.teacherVisible = true;
|
|
|
},
|
|
|
// 提交课程组修改
|
|
|
- subresetTeacher() {
|
|
|
+ subresetTeacher () {
|
|
|
this.$refs.teacherForm.validate(some => {
|
|
|
if (some) {
|
|
|
if (this.isMultiple) {
|
|
|
@@ -858,7 +875,7 @@ export default {
|
|
|
practiceGroupId: this.practiceId,
|
|
|
teacherId: this.teacherForm.teacher,
|
|
|
subjectId: this.teacherForm.subjectId,
|
|
|
- educationalTeacherId:this.teacherForm.educationalTeacherId
|
|
|
+ educationalTeacherId: this.teacherForm.educationalTeacherId
|
|
|
}).then(res => {
|
|
|
if (res.code == 200) {
|
|
|
this.$message.success("修改成功");
|
|
|
@@ -885,7 +902,7 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
- coursesDate() {
|
|
|
+ coursesDate () {
|
|
|
let self = this;
|
|
|
return {
|
|
|
disabledDate: time => {
|
|
|
@@ -901,7 +918,7 @@ export default {
|
|
|
};
|
|
|
},
|
|
|
// 是否允许批量调整
|
|
|
- isDisabled(row, index) {
|
|
|
+ isDisabled (row, index) {
|
|
|
// || !row.isCallNames
|
|
|
if (row.isSettlement) {
|
|
|
return false;
|
|
|
@@ -909,11 +926,11 @@ export default {
|
|
|
return true;
|
|
|
}
|
|
|
},
|
|
|
- onCourseExpireDate() {
|
|
|
+ onCourseExpireDate () {
|
|
|
// 修改课程有效期
|
|
|
|
|
|
},
|
|
|
- adjustment() {
|
|
|
+ adjustment () {
|
|
|
this.adjustmentName = "批量调整";
|
|
|
this.isaddCourse = false;
|
|
|
if (this.adjustmentForm.count <= 0) {
|
|
|
@@ -922,7 +939,7 @@ export default {
|
|
|
this.adjustmentVisible = true;
|
|
|
}
|
|
|
},
|
|
|
- changeSound(val) {
|
|
|
+ changeSound (val) {
|
|
|
if (val) {
|
|
|
this.subjectList.forEach(item => {
|
|
|
if (item.id == val) {
|
|
|
@@ -932,7 +949,7 @@ export default {
|
|
|
});
|
|
|
}
|
|
|
},
|
|
|
- addWeek() {
|
|
|
+ addWeek () {
|
|
|
// 添加循环周期
|
|
|
this.weekList.push({
|
|
|
dayOfWeek: "",
|
|
|
@@ -942,7 +959,7 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
// 删除循环周
|
|
|
- removeWeek(item) {
|
|
|
+ removeWeek (item) {
|
|
|
for (let i in this.weekList) {
|
|
|
if (this.weekList[i].id == item.id) {
|
|
|
this.weekList.splice(i, 1);
|
|
|
@@ -950,7 +967,7 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
// 批量调整
|
|
|
- submitAdjustment() {
|
|
|
+ submitAdjustment () {
|
|
|
this.$refs["adjustmentForm"].validate(item => {
|
|
|
if (item) {
|
|
|
let week = this.weekList;
|
|
|
@@ -984,11 +1001,11 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
- handleSelectionChange(val) {
|
|
|
+ handleSelectionChange (val) {
|
|
|
this.adjustmentForm.count = val.length;
|
|
|
this.activeList = val;
|
|
|
},
|
|
|
- clearAttend(row) {
|
|
|
+ clearAttend (row) {
|
|
|
this.$confirm("是否清除考勤记录?", "提示", {
|
|
|
confirmButtonText: "确定",
|
|
|
cancelButtonText: "取消",
|
|
|
@@ -1004,16 +1021,16 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
})
|
|
|
- .catch(() => {});
|
|
|
+ .catch(() => { });
|
|
|
},
|
|
|
// 网管课加课弹窗
|
|
|
- addCourse() {
|
|
|
+ addCourse () {
|
|
|
this.adjustmentName = "网管课加课";
|
|
|
this.isaddCourse = true;
|
|
|
this.adjustmentVisible = true;
|
|
|
},
|
|
|
// 网管课加课提交
|
|
|
- addCourseSubmit() {
|
|
|
+ addCourseSubmit () {
|
|
|
this.$refs["adjustmentForm"].validate(item => {
|
|
|
if (item) {
|
|
|
let week = this.weekList;
|
|
|
@@ -1042,7 +1059,7 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
// 删除
|
|
|
- removeClass(row) {
|
|
|
+ removeClass (row) {
|
|
|
this.$confirm("是否删除该课程?", "提示", {
|
|
|
confirmButtonText: "确定",
|
|
|
cancelButtonText: "取消",
|
|
|
@@ -1074,7 +1091,7 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
watch: {
|
|
|
- adjustmentVisible(val) {
|
|
|
+ adjustmentVisible (val) {
|
|
|
if (!val) {
|
|
|
this.$refs.adjustmentForm.resetFields();
|
|
|
}
|
