Skip to content

C
confucius
Commit a87693af authored by 罗超's avatar 罗超
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius into master

parents 61bac6cf 093d8041
Show whitespace changes
Inline Side-by-side
Showing with 65 additions and 29 deletions
src/components/course/lesson-form.vue
View file @ a87693af
......@@ -52,7 +52,8 @@
height: 120px;
}
.lesson_Form .el-calendar-table:not(.is-range) td.next, .lesson_Form .el-calendar-table:not(.is-range) td.prev{
.lesson_Form .el-calendar-table:not(.is-range) td.next,
.lesson_Form .el-calendar-table:not(.is-range) td.prev {
pointer-events: none;
}
......@@ -172,9 +173,11 @@
.lesson_Form .el-calendar__header {
display: none;
}
.lesson_Form .on-left{
margin-right:5px;
.lesson_Form .on-left {
margin-right: 5px;
}
</style>
<template>
<div v-if="!isShowSign">
......@@ -182,9 +185,6 @@
<div class="calenderHeader">
<div>
<el-radio-group v-model="checkedType" size="mini">
<!-- <el-radio-button label="日"></el-radio-button>
<el-radio-button label="月"></el-radio-button>
<el-radio-button style="margin-left:20px;border-left:1px solid #DCDFE6;" label="今天"></el-radio-button> -->
<el-radio-button :label="1">列表模式</el-radio-button>
<el-radio-button :label="2">日历模式</el-radio-button>
</el-radio-group>
......@@ -246,10 +246,10 @@
@change="getClassPlan()" placeholder="选择月">
</el-date-picker>
</div>
<template v-if="checkedType===1">
<q-table style="margin:20px;" :pagination="msg" no-data-label="暂无相关数据" flat class="sticky-column-table sticky-right-column-table"
separator="none" :data="calendarData" :columns="columns" row-key="name">
<q-table style="margin:20px;" :pagination="msg" no-data-label="暂无相关数据" flat
class="sticky-column-table sticky-right-column-table" separator="none" :data="calendarData" :columns="columns"
row-key="name">
<template v-slot:body-cell-TimeList="props">
<q-td auto-width :props="props">
<div v-for="(item,index) in props.row.TimeList">
......@@ -259,7 +259,9 @@
</template>
<template v-slot:body-cell-CheckNum="props">
<q-td>
<span style="color:green;">{{props.row.CheckNum}}</span>/<span style="color:red;">{{props.row.NoCheckNum}}</span>
<div v-for="(item,index) in props.row.TimeList">
<span style="color:green;">{{item.CheckNum}}</span>/<span style="color:red;">{{item.NoCheckNum}}</span>
</div>
</q-td>
</template>
<template v-slot:body-cell-optioned="props">
......@@ -318,12 +320,16 @@
</q-banner>
</q-popup-proxy>
</q-btn>
<q-btn flat size="xs" icon="iconfont icon-View" color="accent" style="font-weight:400" label="查看"
@click.stop="getClicked(props.row)"></q-btn>
<q-btn flat size="xs" icon="edit" color="negative" style="font-weight:400" label="删除"
@click.stop="delInfo(props.row)"></q-btn>
</q-td>
</template>
<template v-slot:body-cell-signUser="props">
<div v-for="(item,index) in props.row.TimeList">
<q-btn flat size="xs" icon="iconfont icon-View" color="accent" style="font-weight:400" label="签到"
@click.stop="getClicked(props.row,item)"></q-btn>
</div>
</template>
<template v-slot:bottom>
</template>
</q-table>
......@@ -334,7 +340,7 @@
<template slot="dateCell" slot-scope="{date, data}">
<!--自定义内容-->
<div class="calendar-day">{{ data.day.split('-').slice(2).join('-') }}</div>
<div v-for="item in calendarData" @click="getClicked(item)">
<div v-for="item in calendarData" >
<div v-if="item.ClassDateStr==data.day">
<div class="calendarTop">
<div>{{item.RoomName}}</div>
......@@ -397,7 +403,7 @@
</div>
</div>
<div class="calendarInner">
<div v-for="(subItem,subIndex) in item.TimeList">
<div v-for="(subItem,subIndex) in item.TimeList" @click="getClicked(item,subItem)">
{{subIndex+1}}节课 {{subItem.StartTime}}-{{subItem.EndTime}}
</div>
</div>
......@@ -554,17 +560,22 @@
ClassRoomList: [], //教室下拉数据
isShowMenu: false, //是否显示弹出
isShowEdit: false, //是否显示修改弹出
isShowCanlder: false, //是否显示日历修改日期
isShowSign: false,
dayMsg: { //获取某一天的计划信息请求
ClassPlanId: 0,
School_Id: 0,
ClassId: 0
ClassId: 0,
ClassTimeId: 0, //签到的第几节课
},
dayObj: {},
isShowSignBtn: false, //是否显示签到提交按钮
comChecked: {}, //点击选中复制
comChecked: {
ClassDate: "",
ClassRoomId: 0,
TeacherId: 0,
ClassTimeId: 0,
}, //点击选中复制
isSigned: true,
columns: [{
name: 'RoomName',
......@@ -600,6 +611,12 @@
label: '操作',
field: 'QuestionId',
align: 'center'
},
{
name: 'signUser',
label: '签到',
field: 'signUser',
align: 'center'
}
],
msg: {
......@@ -609,7 +626,6 @@
ClassId: 0,
QMonth: ''
},
columns2: [{
name: 'GuestName',
label: '学生姓名',
......@@ -649,14 +665,12 @@
}
},
mounted() {
//this.initData();
var d = new Date();
this.comMsg.QMonth = d.getFullYear() + '-' + (d.getMonth() + 1);
this.GetTeacherList();
this.getClassRoomList();
this.addMsg.TeacherId = this.setingObj.Teacher_Id;
this.addMsg.ClassDate = this.setingObj.OpenTime;
this.getClassPlan();
},
methods: {
......@@ -812,13 +826,17 @@
});
},
//点击日历
getClicked(item) {
getClicked(item, subItem) {
if (item.IsEndDate) {
this.isShowSign = true;
this.dayMsg.ClassPlanId = item.ClassPlanId;
this.dayMsg.School_Id = this.setingObj.School_Id;
this.dayMsg.ClassId = this.setingObj.ClassId;
this.comChecked = item;
this.dayMsg.ClassTimeId = subItem.ClassTimeId;
this.comChecked.ClassDate = item.ClassDateStr;
this.comChecked.ClassRoomId = item.ClassRoomId;
this.comChecked.TeacherId = item.TeacherId;
this.comChecked.ClassTimeId = subItem.ClassTimeId;
this.getDayClassPlan();
}
},
......@@ -871,13 +889,14 @@
this.dayObj.GuestList.forEach(x => {
let obj = {
classId: this.setingObj.ClassId,
ClassDate: this.comChecked.ClassDateStr,
ClassDate: this.comChecked.ClassDate,
ClassRoomId: this.comChecked.ClassRoomId,
School_Id: this.setingObj.School_Id,
TeacherId: this.comChecked.TeacherId,
OrderGuestId: x.Id,
CheckStatus: x.IsCheck,
StudyNum: x.StudyNum == '' ? 0 : x.StudyNum
StudyNum: x.StudyNum == '' ? 0 : x.StudyNum,
ClassTimeId: this.comChecked.ClassTimeId,
}
signMsg.push(obj);
})
......
src/components/schedul/schedul-orderlist.vue
View file @ a87693af
......@@ -137,6 +137,10 @@
justify-content: space-between;
align-items: center;
height: 25px;
position: absolute;
bottom:10px;
width:100%;
right:0;
}
.tufa_xiugai {
......@@ -290,7 +294,7 @@
</template>
</div>
</template>
<template v-if="workAuthObj.isShowEditAndDelete">
<template v-if="workAuthObj.isShowEditAndDelete&&WorkObj.ItemImgList&&WorkObj.ItemImgList.length>0">
<el-upload class="schedul_Upload MyUpload" style="display:inline;" action="" list-type="picture-card"
:show-file-list="false" :http-request="UploadWorkFile">
<i class="el-icon-plus"></i>
......@@ -318,13 +322,13 @@
<div class="tufa_xiugai">
<template v-if="WorkObj.ItemType==1 && workAuthObj.isShowEditAndDelete">
<q-btn color="primary" flat v-if="WorkObj.IsChecked==0" dense style="margin-left:10px;" slot="reference"
@click="WorkObj.IsChecked=1,saveOrder()" label="确认完成" />
<q-btn v-if="WorkObj.IsChecked==1" dense flat @click="WorkObj.IsChecked=0,saveOrder()"
@click="saveOrder(1)" label="确认完成" />
<q-btn v-if="WorkObj.IsChecked==1" dense flat @click="saveOrder(0)"
style="margin-left:10px;" class="schedu_red" label="取消完成" />
</template>
<template v-if="WorkObj.ItemType==2 && workAuthObj.isShowEditAndDelete">
<q-btn color="primary" flat dense style="margin-left:10px;" v-if="isShowSure" slot="reference"
@click="saveOrder()" label="确认完成" />
@click="saveOrder(1)" label="确认完成" />
</template>
</div>
</div>
......@@ -623,7 +627,6 @@
this.HandoverList = res.Data.HandoverList;
this.EmergenciesList = res.Data.EmergenciesList;
this.WorkList = res.Data.WorkList;
console.log(this.WorkList, 'WorkList');
if (this.EmergenciesList && this.EmergenciesList.length > 0) {
this.EmergenciesObj = this.EmergenciesList[this.EmergenciesIndex];
}
......@@ -725,6 +728,20 @@
},
//保存工作清单
saveOrder(type) {
if(this.WorkObj.FileList==null){
this.WorkObj.FileList=[];
}
if(type==1){
if(this.WorkObj.ItemImgList.length>0&&this.WorkObj.FileList.length==0){
this.$q.notify({
type: 'negative',
message: '请上传图片',
position: 'top'
})
return
}
}
this.WorkObj.IsChecked=type;
var saveWorkMsg = {
Id: this.WorkObj.Id, //编号
PlanShift: this.saveObj.Shift, //值班班次
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment