|
@@ -70,6 +70,12 @@
|
|
<el-option label="差" value="差"></el-option>
|
|
<el-option label="差" value="差"></el-option>
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
|
+ <el-form-item>
|
|
|
|
+ <el-select placeholder="是否到课" v-model="searchForm.hasArrived" clearable>
|
|
|
|
+ <el-option label="到课" value="1"></el-option>
|
|
|
|
+ <el-option label="未到" value="0"></el-option>
|
|
|
|
+ </el-select>
|
|
|
|
+ </el-form-item>
|
|
<el-form-item>
|
|
<el-form-item>
|
|
<el-date-picker
|
|
<el-date-picker
|
|
:clearable="false"
|
|
:clearable="false"
|
|
@@ -127,6 +133,13 @@
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column align="center" prop="courseReview" label="教务评价"></el-table-column>
|
|
<el-table-column align="center" prop="courseReview" label="教务评价"></el-table-column>
|
|
|
|
+ <el-table-column align="center" label="是否到课">
|
|
|
|
+ <template slot-scope="scope">
|
|
|
|
+ <div>
|
|
|
|
+ {{scope.row.attendanceId>0?'到课':'未到'}}
|
|
|
|
+ </div>
|
|
|
|
+ </template>
|
|
|
|
+ </el-table-column>
|
|
<el-table-column align="center" label="操作">
|
|
<el-table-column align="center" label="操作">
|
|
<!-- v-permission="'evaluateList/look'" -->
|
|
<!-- v-permission="'evaluateList/look'" -->
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
@@ -286,6 +299,7 @@ export default {
|
|
hasHandHomework: null,
|
|
hasHandHomework: null,
|
|
hasReview: null,
|
|
hasReview: null,
|
|
courseReview: null,
|
|
courseReview: null,
|
|
|
|
+ hasArrived:null,
|
|
month: []
|
|
month: []
|
|
},
|
|
},
|
|
organList: [],
|
|
organList: [],
|
|
@@ -369,6 +383,7 @@ export default {
|
|
obj.hasHandHomework = this.searchForm.hasHandHomework || null;
|
|
obj.hasHandHomework = this.searchForm.hasHandHomework || null;
|
|
obj.hasReview = this.searchForm.hasReview || null;
|
|
obj.hasReview = this.searchForm.hasReview || null;
|
|
obj.courseReview = this.searchForm.courseReview || null;
|
|
obj.courseReview = this.searchForm.courseReview || null;
|
|
|
|
+ obj.hasArrived = this.searchForm.hasArrived || null;
|
|
obj.search = this.searchForm.search;
|
|
obj.search = this.searchForm.search;
|
|
if (this.searchForm.month.length > 0) {
|
|
if (this.searchForm.month.length > 0) {
|
|
obj.startTime = this.searchForm.month[0];
|
|
obj.startTime = this.searchForm.month[0];
|
|
@@ -433,7 +448,8 @@ export default {
|
|
hasHandHomework: null,
|
|
hasHandHomework: null,
|
|
hasReview: null,
|
|
hasReview: null,
|
|
courseReview: null,
|
|
courseReview: null,
|
|
- month: null
|
|
|
|
|
|
+ month: null,
|
|
|
|
+ hasArrived:null
|
|
};
|
|
};
|
|
var now = new Date();
|
|
var now = new Date();
|
|
|
|
|
|
@@ -465,6 +481,7 @@ export default {
|
|
this.searchForm.hasReview ?obj.hasReview = this.searchForm.hasReview : null;
|
|
this.searchForm.hasReview ?obj.hasReview = this.searchForm.hasReview : null;
|
|
this.searchForm.courseReview?obj.courseReview = this.searchForm.courseReview : null;
|
|
this.searchForm.courseReview?obj.courseReview = this.searchForm.courseReview : null;
|
|
this.searchForm.search?obj.search = this.searchForm.search:null;
|
|
this.searchForm.search?obj.search = this.searchForm.search:null;
|
|
|
|
+ this.searchForm.hasArrived?obj.hasArrived = this.searchForm.hasArrived:null;
|
|
if (this.searchForm.month.length > 0) {
|
|
if (this.searchForm.month.length > 0) {
|
|
obj.startTime = this.searchForm.month[0];
|
|
obj.startTime = this.searchForm.month[0];
|
|
obj.endTime = this.searchForm.month[1];
|
|
obj.endTime = this.searchForm.month[1];
|