|
@@ -58,7 +58,8 @@
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
- <el-button @click="search" type="primary">搜索</el-button>
|
|
|
+ <el-button @click="search"
|
|
|
+ type="primary">搜索</el-button>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
<!-- 列表 -->
|
|
@@ -144,9 +145,11 @@
|
|
|
|
|
|
<!-- 未结算没有点击功能 -->
|
|
|
<el-button v-if="scope.row.status == 'OVER' && !scope.row.isSalary && permission('teacherAttendance/updateTeacherAttendance')"
|
|
|
- type="text" @click="onMarkAttendance(scope.row)">补考勤</el-button>
|
|
|
+ type="text"
|
|
|
+ @click="onMarkAttendance(scope.row)">补考勤</el-button>
|
|
|
<el-button v-if="scope.row.status == 'OVER' && !scope.row.isSalary && permission('studentAttendance/updateStudentAttendances')"
|
|
|
- type="text" @click="onCallName(scope.row)">点名表</el-button>
|
|
|
+ type="text"
|
|
|
+ @click="onCallName(scope.row)">点名表</el-button>
|
|
|
<!-- <el-button type="text" v-permission="'vipGroupManage/classStartDateAdjust'"
|
|
|
@click="resetClass(scope.row)">课程调整</el-button> -->
|
|
|
</div>
|
|
@@ -235,14 +238,15 @@
|
|
|
:visible.sync="markAttendance.status">
|
|
|
<el-form>
|
|
|
<el-form-item label="签到状态">{{ markAttendance.dataInfo.signInStatus | attendanceType }} </el-form-item>
|
|
|
- <el-form-item label="签到时间">{{ markAttendance.dataInfo.startClassTime}}</el-form-item>
|
|
|
+ <el-form-item label="签到时间">{{ markAttendance.dataInfo.signInTime}}</el-form-item>
|
|
|
<el-form-item label="签退状态">{{ markAttendance.dataInfo.signOutStatus | attendanceOutType }} </el-form-item>
|
|
|
- <el-form-item label="签退时间">{{ markAttendance.dataInfo.endClassTime}}</el-form-item>
|
|
|
+ <el-form-item label="签退时间">{{ markAttendance.dataInfo.signOutTime}}</el-form-item>
|
|
|
</el-form>
|
|
|
<div slot="footer"
|
|
|
class="dialog-footer">
|
|
|
<el-button @click="markAttendance.status = false">取 消</el-button>
|
|
|
- <el-button type="primary" :disabled="markAttendance.dataInfo.signOutStatus == 1 && markAttendance.dataInfo.signInStatus == 1 ? true : false"
|
|
|
+ <el-button type="primary"
|
|
|
+ :disabled="markAttendance.dataInfo.signOutStatus == 1 && markAttendance.dataInfo.signInStatus == 1 ? true : false"
|
|
|
@click="batchAdjustmentTime">确定补卡</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
@@ -251,19 +255,37 @@
|
|
|
width="700px"
|
|
|
:visible.sync="rollCall.status">
|
|
|
<el-table :data="rollCall.gridData">
|
|
|
- <el-table-column align='center' property="userName" label="学员姓名"></el-table-column>
|
|
|
- <el-table-column align='center' property="phone" label="手机号"></el-table-column>
|
|
|
- <el-table-column align='center' property="subjectName" label="学员声部"></el-table-column>
|
|
|
- <el-table-column align='center' label="到课状态">
|
|
|
+ <el-table-column align='center'
|
|
|
+ property="userName"
|
|
|
+ label="学员姓名"></el-table-column>
|
|
|
+ <el-table-column align='center'
|
|
|
+ property="phone"
|
|
|
+ label="手机号"></el-table-column>
|
|
|
+ <el-table-column align='center'
|
|
|
+ property="subjectName"
|
|
|
+ label="学员声部"></el-table-column>
|
|
|
+ <el-table-column align='center'
|
|
|
+ label="到课状态">
|
|
|
<template slot-scope="scope">
|
|
|
{{ scope.row.status | studentCallName }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column align='center' label="操作" width="220px">
|
|
|
+ <el-table-column align='center'
|
|
|
+ label="操作"
|
|
|
+ width="220px">
|
|
|
<template slot-scope="scope">
|
|
|
- <el-button size="small" @click="onChangeRollCall('TRUANT', scope.row)" type="primary" round>未到</el-button>
|
|
|
- <el-button size="small" @click="onChangeRollCall('LEAVE', scope.row)" type="warning" round>请假</el-button>
|
|
|
- <el-button size="small" @click="onChangeRollCall('NORMAL', scope.row)" type="success" round>到课</el-button>
|
|
|
+ <el-button size="small"
|
|
|
+ @click="onChangeRollCall('TRUANT', scope.row)"
|
|
|
+ type="primary"
|
|
|
+ round>未到</el-button>
|
|
|
+ <el-button size="small"
|
|
|
+ @click="onChangeRollCall('LEAVE', scope.row)"
|
|
|
+ type="warning"
|
|
|
+ round>请假</el-button>
|
|
|
+ <el-button size="small"
|
|
|
+ @click="onChangeRollCall('NORMAL', scope.row)"
|
|
|
+ type="success"
|
|
|
+ round>到课</el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
@@ -342,12 +364,12 @@ export default {
|
|
|
},
|
|
|
mounted () {
|
|
|
this.__init()
|
|
|
- },
|
|
|
- activated() {
|
|
|
+ },
|
|
|
+ activated () {
|
|
|
this.__init()
|
|
|
},
|
|
|
methods: {
|
|
|
- __init() {
|
|
|
+ __init () {
|
|
|
let id = this.$route.query.id;
|
|
|
this.id = id;
|
|
|
// 获取vip教学记录
|
|
@@ -404,7 +426,7 @@ export default {
|
|
|
"signOutStatus": 1
|
|
|
}
|
|
|
updateTeacherAttendance(params).then(res => {
|
|
|
- if(res.code == 200) {
|
|
|
+ if (res.code == 200) {
|
|
|
this.$message.success('补卡成功')
|
|
|
this.markAttendance.status = false
|
|
|
this.getList()
|
|
@@ -413,18 +435,18 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
- onMarkAttendance(item) { // 补考勤
|
|
|
+ onMarkAttendance (item) { // 补考勤
|
|
|
this.markAttendance = {
|
|
|
status: true,
|
|
|
dataInfo: item
|
|
|
}
|
|
|
},
|
|
|
- onCallName(item) { // 点名表
|
|
|
+ onCallName (item) { // 点名表
|
|
|
this.rollCall.page = 1
|
|
|
this.rollCall.selectItem = item
|
|
|
this.getCallName()
|
|
|
},
|
|
|
- getCallName() {
|
|
|
+ getCallName () {
|
|
|
let rollCall = this.rollCall
|
|
|
let params = {
|
|
|
page: rollCall.page,
|
|
@@ -434,23 +456,23 @@ export default {
|
|
|
findAttendanceStudentByCourseWithPage(params).then(res => {
|
|
|
let result = res.data
|
|
|
rollCall.status = true
|
|
|
- if(res.code == 200) {
|
|
|
+ if (res.code == 200) {
|
|
|
rollCall.gridData = result.rows
|
|
|
rollCall.total = result.total
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
- onChangeRollCall(type, row) {
|
|
|
+ onChangeRollCall (type, row) {
|
|
|
let rollCall = this.rollCall
|
|
|
let params = {
|
|
|
courseScheduleId: rollCall.selectItem.id,
|
|
|
- studentAttendances:[{
|
|
|
- userId: row.studentId,
|
|
|
- status: type
|
|
|
+ studentAttendances: [{
|
|
|
+ userId: row.studentId,
|
|
|
+ status: type
|
|
|
}]
|
|
|
}
|
|
|
updateStudentAttendances(params).then(res => {
|
|
|
- if(res.code == 200) {
|
|
|
+ if (res.code == 200) {
|
|
|
this.$message.success('修改成功')
|
|
|
row.status = type
|
|
|
this.getList()
|