|
@@ -569,7 +569,10 @@
|
|
|
</el-dialog>
|
|
|
|
|
|
<el-dialog title="点名表" width="700px" :visible.sync="rollCall.status">
|
|
|
- <el-table :data="rollCall.gridData">
|
|
|
+ <el-table
|
|
|
+ :data="rollCall.gridData"
|
|
|
+ :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
|
|
|
+ >
|
|
|
<el-table-column
|
|
|
align="center"
|
|
|
property="userName"
|
|
@@ -930,9 +933,9 @@ export default {
|
|
|
return {
|
|
|
firstDayOfWeek: 1,
|
|
|
disabledDate(time) {
|
|
|
- if (self.expireForm.tempCoursesExpireDate) {
|
|
|
+ if (self.tableList[self.tableList.length -1].classDate) {
|
|
|
return (
|
|
|
- new Date(self.expireForm.tempCoursesExpireDate).getTime() >
|
|
|
+ new Date(self.tableList[self.tableList.length -1].classDate).getTime() >=
|
|
|
time.getTime()
|
|
|
);
|
|
|
} else {
|
|
@@ -942,22 +945,19 @@ export default {
|
|
|
},
|
|
|
};
|
|
|
},
|
|
|
- startBigin(){
|
|
|
+ startBigin() {
|
|
|
let timer;
|
|
|
- if(this.tableList[0]?.classDate){
|
|
|
- timer = this.tableList[0]?.classDate
|
|
|
- }
|
|
|
+ if (this.tableList[0]?.classDate) {
|
|
|
+ timer = this.tableList[0]?.classDate;
|
|
|
+ }
|
|
|
return {
|
|
|
firstDayOfWeek: 1,
|
|
|
disabledDate(time) {
|
|
|
// 该时间不可调整到课程组第一节课程开始时间之后
|
|
|
if (timer) {
|
|
|
- return (
|
|
|
- new Date(timer).getTime() <
|
|
|
- time.getTime()
|
|
|
- );
|
|
|
+ return new Date(timer).getTime() < time.getTime();
|
|
|
} else {
|
|
|
- return time.getTime() >= Date.now()
|
|
|
+ return time.getTime() >= Date.now();
|
|
|
//开始时间不选时,结束时间最大值小于等于当天
|
|
|
}
|
|
|
},
|
|
@@ -974,8 +974,15 @@ export default {
|
|
|
if (res.code == 200) {
|
|
|
this.$message.success("有效期修改成功");
|
|
|
this.$router.push({
|
|
|
- query: merge(this.$route.query, { coursesStartDate: this.expireForm.coursesStartDate,coursesExpireDate:this.expireForm.coursesExpireDate }),
|
|
|
+ query: merge(this.$route.query, {
|
|
|
+ coursesStartDate: this.expireForm.coursesStartDate,
|
|
|
+ coursesExpireDate: this.expireForm.coursesExpireDate,
|
|
|
+ }),
|
|
|
});
|
|
|
+ this.timers =
|
|
|
+ this.expireForm.coursesStartDate+
|
|
|
+ "至" +
|
|
|
+ this.expireForm.coursesExpireDate;
|
|
|
this.expireVisible = false;
|
|
|
this.getCourseGroup();
|
|
|
this.getList();
|