Commit e8e5068a authored by 黄奎's avatar 黄奎

页面修改

parent f54c5f6b
...@@ -186,7 +186,6 @@ ...@@ -186,7 +186,6 @@
.lesson_Form .q-btn__wrapper { .lesson_Form .q-btn__wrapper {
padding: 4px 5px; padding: 4px 5px;
} }
</style> </style>
<template> <template>
<div v-if="!isShowSign"> <div v-if="!isShowSign">
...@@ -225,7 +224,8 @@ ...@@ -225,7 +224,8 @@
<div style="display:flex;justify-content:flex-end;margin-bottom:20px;"> <div style="display:flex;justify-content:flex-end;margin-bottom:20px;">
<q-btn @click="addStep()" size="10px" round color="primary" icon="iconfont icon-img_haha" /> <q-btn @click="addStep()" size="10px" round color="primary" icon="iconfont icon-img_haha" />
</div> </div>
<div class="row wrap" style="position:relative;" v-for="(subItem,subIndex) in addMsg.PlanTimeList"> <div class="row wrap" style="position:relative;" v-for="(subItem,subIndex) in addMsg.PlanTimeList"
:key="subIndex">
<div class="col-4"> <div class="col-4">
<q-input filled v-model="subItem.StartTime" class="col-6 q-pr-lg q-pb-lg" mask="time"> <q-input filled v-model="subItem.StartTime" class="col-6 q-pr-lg q-pb-lg" mask="time">
<template v-slot:append> <template v-slot:append>
...@@ -258,8 +258,8 @@ ...@@ -258,8 +258,8 @@
</div> </div>
<div class="col-4"> <div class="col-4">
<q-input filled stack-label maxlength="10" :dense="false" v-model="subItem.TimeHour" <q-input filled stack-label maxlength="10" :dense="false" v-model="subItem.TimeHour"
ref="TimeHour" class="col-4 q-pr-lg q-pb-lg" label="消耗课时" ref="TimeHour" class="col-4 q-pr-lg q-pb-lg" label="消耗课时" :rules="[val => !!val || '请填写消耗课时']"
:rules="[val => !!val || '请填写消耗课时']" @keyup.native="checkPrice(subItem,'TimeHour')" /> @keyup.native="checkPrice(subItem,'TimeHour')" />
</div> </div>
<div class="delBtnStyle"> <div class="delBtnStyle">
<i @click="delStep(subIndex)" class="iconfont icon-guanbi"></i> <i @click="delStep(subIndex)" class="iconfont icon-guanbi"></i>
...@@ -288,23 +288,31 @@ ...@@ -288,23 +288,31 @@
row-key="name"> row-key="name">
<template v-slot:body-cell-TimeList="props"> <template v-slot:body-cell-TimeList="props">
<q-td auto-width :props="props"> <q-td auto-width :props="props">
<div v-for="(item,index) in props.row.TimeList" class="lessForm_Class"> <div v-for="(item,index) in props.row.TimeList" class="lessForm_Class" :key="index">
{{index+1}}节课 {{item.StartTime}}-{{item.EndTime}} {{index+1}}节课 {{item.StartTime}}-{{item.EndTime}}
</div> </div>
</q-td> </q-td>
</template> </template>
<template v-slot:body-cell-CheckNum="props"> <template v-slot:body-cell-CheckNum="props">
<q-td> <q-td>
<div v-for="(item,index) in props.row.TimeList" class="lessForm_Class"> <div v-for="(item,index) in props.row.TimeList" class="lessForm_Class" :key="index">
<span style="color:green;">{{item.CheckNum}}</span>/<span style="color:red;">{{item.NoCheckNum}}</span>/<span style="color:orange;">{{item.AskForLeaveNum}}</span> <span style="color:green;">{{item.CheckNum}}</span>/<span
style="color:red;">{{item.NoCheckNum}}</span>/<span
style="color:orange;">{{item.AskForLeaveNum}}</span>
</div> </div>
</q-td> </q-td>
</template> </template>
<template v-slot:body-cell-signUser="props"> <template v-slot:body-cell-signUser="props">
<q-td> <q-td>
<div v-for="(item,index) in props.row.TimeList" class="lessForm_Class"> <div v-for="(item,index) in props.row.TimeList" class="lessForm_Class" :key="index">
<q-btn v-if="props.row.IsEndDate" flat size="xs" icon="edit" color="accent" style="font-weight:400" label="签到" <template v-if="currentUser.Id==1">
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="签到"
@click.stop="getClicked(props.row,item)"></q-btn> @click.stop="getClicked(props.row,item)"></q-btn>
</template>
<template v-else>
<q-btn v-if="props.row.IsEndDate" flat size="xs" icon="edit" color="accent" style="font-weight:400"
label="签到" @click.stop="getClicked(props.row,item)"></q-btn>
</template>
</div> </div>
</q-td> </q-td>
</template> </template>
...@@ -338,7 +346,7 @@ ...@@ -338,7 +346,7 @@
<q-btn @click="addStep()" size="10px" round color="primary" icon="iconfont icon-img_haha" /> <q-btn @click="addStep()" size="10px" round color="primary" icon="iconfont icon-img_haha" />
</div> </div>
<div class="row wrap" style="position:relative;" <div class="row wrap" style="position:relative;"
v-for="(subItem,subIndex) in addMsg.PlanTimeList"> v-for="(subItem,subIndex) in addMsg.PlanTimeList" :key="subIndex">
<div class="col-4"> <div class="col-4">
<q-input filled v-model="subItem.StartTime" class="col-6 q-pr-lg q-pb-lg" mask="time"> <q-input filled v-model="subItem.StartTime" class="col-6 q-pr-lg q-pb-lg" mask="time">
<template v-slot:append> <template v-slot:append>
...@@ -401,11 +409,9 @@ ...@@ -401,11 +409,9 @@
</template> </template>
<template v-else> <template v-else>
<el-calendar v-model="value" id="calendar" style="margin-bottom:40px;"> <el-calendar v-model="value" id="calendar" style="margin-bottom:40px;">
<!-- 这里使用的是 2.5 slot 语法,对于新项目请使用 2.6 slot 语法-->
<template slot="dateCell" slot-scope="{date, data}"> <template slot="dateCell" slot-scope="{date, data}">
<!--自定义内容-->
<div class="calendar-day">{{ data.day.split('-').slice(2).join('-') }}</div> <div class="calendar-day">{{ data.day.split('-').slice(2).join('-') }}</div>
<div v-for="item in calendarData"> <div v-for="(item,index) in calendarData" :key="index">
<div v-if="item.ClassDateStr==data.day"> <div v-if="item.ClassDateStr==data.day">
<div class="calendarTop"> <div class="calendarTop">
<div>{{item.RoomName}}</div> <div>{{item.RoomName}}</div>
...@@ -438,7 +444,7 @@ ...@@ -438,7 +444,7 @@
icon="iconfont icon-img_haha" /> icon="iconfont icon-img_haha" />
</div> </div>
<div class="row wrap" style="position:relative;" <div class="row wrap" style="position:relative;"
v-for="(subItem,subIndex) in addMsg.PlanTimeList"> v-for="(subItem,subIndex) in addMsg.PlanTimeList" :key="subIndex">
<div class="col-4"> <div class="col-4">
<q-input filled v-model="subItem.StartTime" class="col-6 q-pr-lg q-pb-lg" mask="time"> <q-input filled v-model="subItem.StartTime" class="col-6 q-pr-lg q-pb-lg" mask="time">
<template v-slot:append> <template v-slot:append>
...@@ -472,7 +478,8 @@ ...@@ -472,7 +478,8 @@
<div class="col-4"> <div class="col-4">
<q-input filled stack-label maxlength="10" :dense="false" v-model="subItem.TimeHour" <q-input filled stack-label maxlength="10" :dense="false" v-model="subItem.TimeHour"
ref="TimeHour" class="col-4 q-pr-lg q-pb-lg" label="消耗课时" ref="TimeHour" class="col-4 q-pr-lg q-pb-lg" label="消耗课时"
:rules="[val => !!val || '请填写消耗课时']" @keyup.native="checkPrice(subItem,'TimeHour')" /> :rules="[val => !!val || '请填写消耗课时']"
@keyup.native="checkPrice(subItem,'TimeHour')" />
</div> </div>
<div class="delBtnStyle"> <div class="delBtnStyle">
<i @click="delStep(subIndex)" class="iconfont icon-guanbi"></i> <i @click="delStep(subIndex)" class="iconfont icon-guanbi"></i>
...@@ -489,12 +496,12 @@ ...@@ -489,12 +496,12 @@
</q-banner> </q-banner>
</q-popup-proxy> </q-popup-proxy>
</i> </i>
<i v-if="!item.IsEndDate&&isShowBtn" class="iconfont icon-guanbi Less_Close" style="margin-left:5px;" <i v-if="!item.IsEndDate&&isShowBtn" class="iconfont icon-guanbi Less_Close"
@click.stop="delInfo(item)"></i> style="margin-left:5px;" @click.stop="delInfo(item)"></i>
</div> </div>
</div> </div>
<div class="calendarInner"> <div class="calendarInner">
<div v-for="(subItem,subIndex) in item.TimeList" @click="getClicked(item,subItem)"> <div v-for="(subItem,subIndex) in item.TimeList" @click="getClicked(item,subItem)" :key="subIndex">
{{subIndex+1}}节课 {{subItem.StartTime}}-{{subItem.EndTime}} {{subIndex+1}}节课 {{subItem.StartTime}}-{{subItem.EndTime}}
</div> </div>
</div> </div>
...@@ -667,10 +674,7 @@ ...@@ -667,10 +674,7 @@
isSetMore: 1, //是否显示更多设置 isSetMore: 1, //是否显示更多设置
isSetMoreTwo: 1, isSetMoreTwo: 1,
ClassRoomList: [], //教室下拉数据 ClassRoomList: [], //教室下拉数据
isShowMenu: false, //是否显示弹出
isShowEdit: false, //是否显示修改弹出
isShowSign: false,
dayMsg: { //获取某一天的计划信息请求 dayMsg: { //获取某一天的计划信息请求
ClassPlanId: 0, ClassPlanId: 0,
School_Id: 0, School_Id: 0,
...@@ -678,7 +682,7 @@ ...@@ -678,7 +682,7 @@
ClassTimeId: 0, //签到的第几节课 ClassTimeId: 0, //签到的第几节课
}, },
dayObj: {}, dayObj: {},
isShowSignBtn: false, //是否显示签到提交按钮
comChecked: { comChecked: {
ClassDate: "", ClassDate: "",
ClassRoomId: 0, ClassRoomId: 0,
...@@ -766,15 +770,21 @@ ...@@ -766,15 +770,21 @@
align: 'center' align: 'center'
} }
], ],
isShowBtn:true isShowBtn: true,
isShowMenu: false, //是否显示弹出
isShowEdit: false, //是否显示修改弹出
isShowSign: false,
isShowSignBtn: false, //是否显示签到提交按钮
currentUser: {},
} }
}, },
created() { created() {
this.currentUser = this.getLocalStorage();
if (this.setingObj && this.setingObj.ClassId) { if (this.setingObj && this.setingObj.ClassId) {
this.addMsg.ClassId = this.setingObj.ClassId; this.addMsg.ClassId = this.setingObj.ClassId;
} }
if(this.isShowMyBtn==1){ if (this.isShowMyBtn == 1) {
this.isShowBtn=false; this.isShowBtn = false;
this.columns.pop(); this.columns.pop();
} }
}, },
...@@ -960,7 +970,6 @@ ...@@ -960,7 +970,6 @@
}, },
//点击日历 //点击日历
getClicked(item, subItem) { getClicked(item, subItem) {
if (item.IsEndDate) {
this.isShowSign = true; this.isShowSign = true;
this.dayMsg.ClassPlanId = item.ClassPlanId; this.dayMsg.ClassPlanId = item.ClassPlanId;
this.dayMsg.School_Id = this.setingObj.School_Id; this.dayMsg.School_Id = this.setingObj.School_Id;
...@@ -971,7 +980,6 @@ ...@@ -971,7 +980,6 @@
this.comChecked.TeacherId = item.TeacherId; this.comChecked.TeacherId = item.TeacherId;
this.comChecked.ClassTimeId = subItem.ClassTimeId; this.comChecked.ClassTimeId = subItem.ClassTimeId;
this.getDayClassPlan(); this.getDayClassPlan();
}
}, },
//获取某一天的计划信息 //获取某一天的计划信息
getDayClassPlan() { getDayClassPlan() {
...@@ -1047,5 +1055,4 @@ ...@@ -1047,5 +1055,4 @@
} }
} }
} }
</script> </script>
\ No newline at end of file
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