Skip to content

C
confucius
Commit be0eebb0 authored by 黄奎's avatar 黄奎
Browse files
Options

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

parents 175610ac 55e3072e
Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 60 deletions
src/components/course/mateitem.vue
View file @ be0eebb0
......@@ -11,6 +11,7 @@
<span v-if="subItem.TimeStr==='下午'" class="commonTimeStr blueTime">{{subItem.TimeStr}}</span>
<span v-if="subItem.TimeStr==='晚上'" class="commonTimeStr orangeTime">{{subItem.TimeStr}}</span>
<span v-if="subItem.ClassType==2">试听课</span>
<span v-if="subItem.ClassType==3">预约课</span>
<span style="color:red;margin:0 5px;">{{subItem.TeacherName}}</span>
<span>[{{subItem.RoomName}}]</span>
</div>
......
src/components/stuMan/subscribe/detail.vue
View file @ be0eebb0
......@@ -27,7 +27,7 @@
<div>{{ saveObj.ClassName }}</div>
</template>
</q-field>
<q-field
<!-- <q-field
filled
label="等级"
stack-label
......@@ -37,7 +37,7 @@
<template v-slot:control>
<div>{{ saveObj.CourseGradeName }}</div>
</template>
</q-field>
</q-field> -->
<q-field filled label="类型" stack-label class="col-6">
<template v-slot:control>
<div>
......@@ -54,7 +54,7 @@
</q-field>
<q-field filled label="进度" stack-label class="col-6">
<template v-slot:control>
<div>{{ saveObj.Ranks }}/{{ saveObj.TotalPlanNum }}</div>
<div>{{ saveObj.Ranks }}/{{ saveObj.TotalPlanNum }} <span class="q-ml-sm">({{ saveObj.CourseGradeName }})</span></div>
</template>
</q-field>
<q-field
......@@ -66,17 +66,18 @@
>
<template v-slot:control>
<div>
<span v-if="saveObj.AppointState == 1">待确认</span
><span v-if="saveObj.AppointState == 2">已确认</span>
<span v-if="saveObj.AppointState == 1" style="color:#ef5350">待确认</span
><span v-if="saveObj.AppointState == 2" style="color:#21ba45">已确认</span>
</div>
<q-btn
color="accent"
size="xs"
label="确认"
v-if="saveObj.AppointState == 1"
v-if="saveObj.AppointState == 1&&saveObj.GuestList.length>=saveObj.ScrollMinNum"
@click="confirmSub"
class="q-ml-md"
/>
<q-badge rounded color="red" label="未成班" style="position:absolute;top:0;right:0" class="q-ml-sm" v-if="saveObj.AppointState == 1&&saveObj.GuestList.length<saveObj.ScrollMinNum"/>
</template>
</q-field>
<q-field
......@@ -90,7 +91,7 @@
<div>{{ saveObj.ScrollMinNum }}</div>
</template>
</q-field>
<q-field
<!-- <q-field
filled
label="最大成班人数："
stack-label
......@@ -100,7 +101,7 @@
<template v-slot:control>
<div>{{ saveObj.ScrollMaxNum }}</div>
</template>
</q-field>
</q-field> -->
<q-field
filled
label="已约学员："
......
src/pages/studyAbroad/subscribe.vue
View file @ be0eebb0
......@@ -68,7 +68,7 @@
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
:clearable="false"
@change="getData"
@change="changeDate"
>
</el-date-picker>
</template>
......@@ -160,6 +160,7 @@
:key="__index"
class="my-event justify-center ellipsis courseItem"
:class="badgeClasses(__item, 'body', _item.TeacherId)"
style="overflow:hidden;box-shadow: 0px 10px 10px 0 rgba(36, 36, 36, 0.2);"
:style="
badgeStyles(
__item,
......@@ -174,30 +175,33 @@
showDetail(__item, item.ClassDate, _item.TeacherId)
"
>
<el-popover
placement="top-start"
width="200"
trigger="hover"
>
<div slot="reference" style="height:100vh">
<el-popover placement="top-start" width="200" trigger="hover">
<div slot="reference" style="height:80vh;position:relative">
<q-badge rounded color="red" label="未成班" style="position:absolute;top:0;right:0" v-if="viewType=='day'&&isShowTag(__item.GuestList.length, __item.ScrollMinNum)"/>
<q-icon name="lock" color="res" style="position:absolute;top:0;right:0" v-if="viewType=='week'&&isShowTag(__item.GuestList.length, __item.ScrollMinNum)"/>
<div
v-if="viewType == 'day' || item.RList.length == 1"
class="q-pa-xs"
>
<div class="flex">
<!-- <div class="flex">
<span class="detailLabel">老师：</span
><span>{{ _item.TeacherName }}</span>
</div>
</div> -->
<div class="flex">
<span class="detailLabel">教室：</span
>{{ __item.RoomName }}
</div>
<div class="flex no-wrap" v-if="__item.ClassType !== 2">
<span class="detailLabel">进度：</span
><span
>{{ __item.Ranks }}/{{ __item.TotalPlanNum }}</span
>
</div>
<div class="row flex no-wrap">
<span class="detailLabel">课程：</span
><span style="flex-grow:1">{{
><div class="detailValue">{{
__item.CourseName
}}</span>
}}</div>
</div>
<div class="flex no-wrap">
<span class="detailLabel">班级：</span
......@@ -218,13 +222,14 @@
>
</div>
<div class="flex no-wrap">
<div class="flex no-wrap" v-if="__item.ClassType !== 2">
<span class="detailLabel">进度：</span
><span
>{{__item.Ranks}}/{{__item.TotalPlanNum}}</span
>{{ __item.Ranks }}/{{ __item.TotalPlanNum }}</span
>
<span class="q-ml-sm">{{__item.CourseGradeName}}</span>
</div>
<div class="flex no-wrap">
<div class="flex no-wrap" v-if="__item.ClassType !== 2">
<span class="detailLabel">学员：</span
><span>{{
__item.GuestList.map(e => e.GuestName).toString()
......@@ -232,9 +237,9 @@
</div>
<div class="flex no-wrap" v-if="__item.ClassType == 3">
<span class="detailLabel">
预约状态：<span></span
><span v-if="__item.AppointState == 1">待确认</span
><span v-if="__item.AppointState == 2">已确认</span>
状态：<span></span
><span v-if="__item.AppointState == 1" style="color:#ef5350">待确认</span
><span v-if="__item.AppointState == 2" style="color:#21ba45">已确认</span>
<q-btn
color="accent"
size="xs"
......@@ -254,14 +259,14 @@
<span class="">最小成班人数：</span
><span>{{ __item.ScrollMinNum }}</span>
</div>
<div class="flex no-wrap" v-if="__item.ClassType == 3">
<!-- <div class="flex no-wrap" v-if="__item.ClassType == 3">
<span class="">最大成班人数：</span
><span>{{ __item.ScrollMaxNum }}</span>
</div>
<div></div>
</div> -->
</div>
</div>
<div>
<div style="position:relative">
<q-badge rounded color="red" label="未成班" style="position:absolute;top:0;right:0" v-if="isShowTag(__item.GuestList.length, __item.ScrollMinNum)"/>
<div class="flex">
<span class="detailLabel">老师：</span
><span>{{ _item.TeacherName }}</span>
......@@ -282,6 +287,11 @@
<span class="detailLabel">时间：</span
><span>{{ __item.StartTime }}-{{ __item.EndTime }}</span>
</div>
<div class="flex no-wrap" v-if="__item.ClassType !== 2">
<span class="detailLabel">进度</span
><span>{{ __item.Ranks }}/{{ __item.TotalPlanNum }}</span>
<span class="q-ml-sm">{{__item.CourseGradeName}}</span>
</div>
<div class="flex no-wrap">
<span class="detailLabel">
类型：<span></span
......@@ -291,13 +301,7 @@
>
</div>
<div class="flex no-wrap">
<span class="detailLabel">进度：</span
><span
>{{__item.Ranks}}/{{__item.TotalPlanNum}}</span
>
</div>
<div class="flex no-wrap">
<div class="flex no-wrap" v-if="__item.ClassType !== 2">
<span class="detailLabel">学员：</span
><span>{{
__item.GuestList.map(e => e.GuestName).toString()
......@@ -305,9 +309,9 @@
</div>
<div class="flex no-wrap" v-if="__item.ClassType == 3">
<span class="detailLabel">
预约状态：<span></span
><span v-if="__item.AppointState == 1">待确认</span
><span v-if="__item.AppointState == 2">已确认</span>
状态：<span></span
><span v-if="__item.AppointState == 1" style="color:#ef5350">待确认</span
><span v-if="__item.AppointState == 2" style="color:#21ba45">已确认</span>
<q-btn
color="accent"
size="xs"
......@@ -323,11 +327,10 @@
<span class="">最小成班人数：</span
><span>{{ __item.ScrollMinNum }}</span>
</div>
<div class="flex no-wrap" v-if="__item.ClassType == 3">
<!-- <div class="flex no-wrap" v-if="__item.ClassType == 3">
<span class="">最大成班人数：</span
><span>{{ __item.ScrollMaxNum }}</span>
</div>
<div></div>
</div> -->
</div>
</el-popover>
</div>
......@@ -423,7 +426,7 @@ export default {
"blue-grey",
"purple",
"orange",
"red",
"pink",
"green",
"teal",
"secondary",
......@@ -552,6 +555,13 @@ export default {
this.events = res.Data;
});
},
changeDate() {
setTimeout(() => {
this.msg.StartDate = this.$refs.calendar.lastStart;
this.msg.EndDate = this.$refs.calendar.lastEnd;
this.getData();
}, 500);
},
calcGap(s, e) {
let timeStamp = Date.now();
let formatStr = date.formatDate(timeStamp, "YYYY-MM-DD");
......@@ -569,29 +579,18 @@ export default {
});
return bg;
},
onModelChanged(date) {
},
onClickDate2(data) {
},
onClickDayHeader2(data) {
},
onClickInterval2(data) {
},
onModelChanged(date) {},
onClickDate2(data) {},
onClickDayHeader2(data) {},
onClickInterval2(data) {},
onClickTime2(data) {
this.showForm = true;
this.editType = 1;
this.saveObj = {};
this.dateObj = data.scope.timestamp;
},
onClickIntervalHeader2(data) {
},
onClickIntervalHeader2(data) {},
showDetail(data, date, tid) {
this.showForm = true;
this.editType = 2;
this.dateObj.date = date;
......@@ -625,6 +624,13 @@ export default {
},
successHandle() {
this.getData();
},
isShowTag(n,min){
if(n<min){
return true
}else{
return false
}
}
}
};
......@@ -680,4 +686,8 @@ export default {
width: 40px;
white-space: nowrap;
}
.detailValue{
width: 100%;
display: inline-block;
}
</style>
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