Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
confucius
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
罗超
confucius
Commits
16c8c268
Commit
16c8c268
authored
Sep 02, 2024
by
youjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
试听课兼容手机
parent
4e423b93
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
143 additions
and
77 deletions
+143
-77
reserve-form.vue
src/components/schedul/reserve-form.vue
+12
-7
reservestudentlist.vue
src/components/schedul/reservestudentlist.vue
+44
-9
audition.vue
src/pages/h5page/audition.vue
+58
-54
reserveClassStudent.vue
src/pages/sale/reserveClassStudent.vue
+29
-7
No files found.
src/components/schedul/reserve-form.vue
View file @
16c8c268
...
@@ -11,7 +11,8 @@
...
@@ -11,7 +11,8 @@
</q-card-section>
</q-card-section>
<q-card-section
class=
"q-pt-none scroll"
style=
"max-height: 70vh"
>
<q-card-section
class=
"q-pt-none scroll"
style=
"max-height: 70vh"
>
<div
class=
"row wrap"
>
<div
class=
"row wrap"
>
<q-input
filled
v-model=
"objOption.ClassDate"
class=
"col-6 q-pr-lg q-pb-lg"
<q-input
filled
v-model=
"objOption.ClassDate"
class=
""
:class=
"[$q.platform.is.desktop?'col-6 q-pr-lg q-pb-lg':'col-12 q-pb-sm']"
:rules=
"[val => !!val || '请选择预约日期']"
ref=
"ClassDate"
mask=
"date"
label=
"预约日期"
>
:rules=
"[val => !!val || '请选择预约日期']"
ref=
"ClassDate"
mask=
"date"
label=
"预约日期"
>
<template
v-slot:append
>
<template
v-slot:append
>
<q-icon
name=
"event"
class=
"cursor-pointer"
>
<q-icon
name=
"event"
class=
"cursor-pointer"
>
...
@@ -21,8 +22,9 @@
...
@@ -21,8 +22,9 @@
</q-icon>
</q-icon>
</
template
>
</
template
>
</q-input>
</q-input>
<div
class=
"Sysuser_Date col-6 q-pb-lg"
>
<div
class=
"Sysuser_Date"
<q-field>
:class=
"[$q.platform.is.desktop?'col-6 q-pb-lg':'col-12 q-pb-sm']"
>
<q-field
filled
dense
>
<
template
v-slot:control
>
<
template
v-slot:control
>
<el-time-select
v-model=
"objOption.ClassTime"
ref=
"ClassTime"
style=
"width:50%"
:picker-options=
"
{
<el-time-select
v-model=
"objOption.ClassTime"
ref=
"ClassTime"
style=
"width:50%"
:picker-options=
"
{
start: '09:00',
start: '09:00',
...
@@ -42,15 +44,18 @@
...
@@ -42,15 +44,18 @@
</q-field>
</q-field>
</div>
</div>
<q-select
filled
stack-label
option-value=
"TId"
option-label=
"TeacherName"
v-model=
"objOption.TeacherId"
<q-select
filled
stack-label
option-value=
"TId"
option-label=
"TeacherName"
v-model=
"objOption.TeacherId"
ref=
"TeacherId"
:options=
"TeacherList"
label=
"选择教师"
:dense=
"false"
class=
"col-6 q-pr-lg q-pb-lg"
emit-value
ref=
"TeacherId"
:options=
"TeacherList"
label=
"选择教师"
:dense=
"false"
class=
"col-6 q-pr-lg"
:class=
"[$q.platform.is.desktop?'q-pb-lg':'q-pb-sm']"
emit-value
map-options
/>
map-options
/>
<q-select
filled
stack-label
option-value=
"RoomId"
option-label=
"RoomName"
v-model=
"objOption.ClassRoomId"
<q-select
filled
stack-label
option-value=
"RoomId"
option-label=
"RoomName"
v-model=
"objOption.ClassRoomId"
ref=
"ClassRoomId"
:options=
"ClassRoomList"
label=
"关联教室"
:dense=
"false"
class=
"col-6 q-pb-lg"
emit-value
ref=
"ClassRoomId"
:options=
"ClassRoomList"
label=
"关联教室"
:dense=
"false"
class=
"col-6"
:class=
"[$q.platform.is.desktop?'q-pb-lg':'q-pb-sm']"
emit-value
map-options
/>
map-options
/>
<q-select
filled
stack-label
option-value=
"Id"
option-label=
"LessonName"
v-model=
"objOption.TrialLessonId"
<q-select
filled
stack-label
option-value=
"Id"
option-label=
"LessonName"
v-model=
"objOption.TrialLessonId"
:options=
"TrialList"
label=
"试听课程"
:dense=
"false"
class=
"col-6 q-pb-lg q-pr-lg"
emit-value
map-options
/>
:options=
"TrialList"
label=
"试听课程"
:dense=
"false"
class=
"col-6 q-pr-lg"
:class=
"[$q.platform.is.desktop?'q-pb-lg':'q-pb-sm']"
emit-value
map-options
/>
<q-select
filled
stack-label
option-value=
"Name"
option-label=
"Name"
v-model=
"objOption.ClassContent"
<q-select
filled
stack-label
option-value=
"Name"
option-label=
"Name"
v-model=
"objOption.ClassContent"
ref=
"ClassContent"
:options=
"ContentList"
label=
"主讲内容"
:dense=
"false"
class=
"col-12 q-pb-lg"
emit-value
ref=
"ClassContent"
:options=
"ContentList"
label=
"主讲内容"
:dense=
"false"
class=
"col-12 q-pb-lg"
emit-value
...
...
src/components/schedul/reservestudentlist.vue
View file @
16c8c268
<
template
>
<
template
>
<div
class=
"page-content"
>
<div
class=
"page-content"
<q-table
:pagination=
"pageMsg"
:loading=
"loading"
no-data-label=
"暂无相关数据"
flat
:class=
"[$q.platform.is.desktop?'':'']"
>
<q-table
v-if=
"$q.platform.is.desktop"
:pagination=
"pageMsg"
:loading=
"loading"
no-data-label=
"暂无相关数据"
flat
class=
"sticky-column-table sticky-right-column-table"
separator=
"none"
:data=
"data"
:columns=
"columns"
class=
"sticky-column-table sticky-right-column-table"
separator=
"none"
:data=
"data"
:columns=
"columns"
:visible-columns=
"visibleColumns"
row-key=
"name"
>
:visible-columns=
"visibleColumns"
row-key=
"name"
>
<template
v-slot:top
>
<template
v-slot:top
>
<div
class=
"col-2 q-table__title"
>
试听开课管理
</div>
<div
class=
"q-table__title"
:class=
"[$q.platform.is.desktop?'col-2':'col-12']"
>
试听开课管理
</div>
<q-space
/>
<q-space
/>
</
template
>
</
template
>
...
@@ -38,6 +40,39 @@
...
@@ -38,6 +40,39 @@
<
template
v-slot:bottom
>
<
template
v-slot:bottom
>
</
template
>
</
template
>
</q-table>
</q-table>
<
template
v-if=
"$q.platform.is.mobile"
>
<q-card
class=
"light-shadow q-pa-md bg-grey-1 rounded-borders q-mb-md"
flat
v-for=
"(x, index) in data"
:key=
"index"
>
<div
class=
"row justify-between"
>
<div>
学生:
<span
class=
"text-blue-5"
>
{{
x
.
StuName
}}
</span></div>
<div>
试听日期:
<span
class=
"text-blue-5"
>
{{
timeFormatSeconds
(
x
.
ReservationDate
)
}}
</span></div>
</div>
<div
class=
"bg-white q-pa-sm q-mt-sm"
style=
"border-radius: 8px;"
>
<div>
<span
class=
"text-grey-6"
>
试听需求:
</span><span
v-html=
""
>
{{
x
.
Demand
}}
</span>
</div>
</div>
<div
class=
" q-pa-sm border-radius q-mt-sm"
v-if=
"x.ClassDateStr||x.TeacherName||x.LessonName||x.RoomName"
>
<div
class=
"row justify-between"
v-if=
"x.ClassDateStr||x.TeacherName"
>
<span
v-if=
"x.ClassDateStr"
>
预约时间:
<span
class=
"text-blue-5"
>
{{
x
.
ClassDateStr
}}
</span></span>
<span
v-if=
"x.TeacherName"
>
主讲老师:
<span
class=
"text-blue-5"
>
{{
x
.
TeacherName
}}
</span></span>
</div>
<div
class=
"row justify-between"
v-if=
"x.LessonName||x.RoomName"
>
<span
v-if=
"x.LessonName"
>
课程名称:
<span
class=
"text-blue-5"
>
{{
x
.
LessonName
}}
</span></span>
<span
v-if=
"x.RoomName"
>
教室:
<span
class=
"text-blue-5"
>
{{
x
.
RoomName
}}
</span></span>
</div>
</div>
<div
class=
"row justify-end"
>
<q-btn
label=
"修改"
color=
"primary"
flat
@
click=
"editVisitor(x)"
/>
<q-btn
label=
"删除"
color=
"teal-10"
flat
@
click=
"DeleteVisitorReserve(x.Id)"
/>
</div>
</q-card>
</
template
>
<reserveForm
v-if=
"isShowReserve"
:save-obj=
"reserveObj"
@
close=
"closeReserveForm"
@
success=
"refreshPage"
>
<reserveForm
v-if=
"isShowReserve"
:save-obj=
"reserveObj"
@
close=
"closeReserveForm"
@
success=
"refreshPage"
>
</reserveForm>
</reserveForm>
</div>
</div>
...
...
src/pages/h5page/audition.vue
View file @
16c8c268
...
@@ -5,15 +5,16 @@
...
@@ -5,15 +5,16 @@
</
style
>
</
style
>
<
template
>
<
template
>
<div
:class=
"[
type?'q-pa-md
':'']"
>
<div
:class=
"[
$q.platform.is.mobile?'q-pa-md bg-grey-1
':'']"
>
<p
class=
"text-center small text-weight-bold
"
v-if=
"type==1
"
>
试听开课
</p>
<p
class=
"text-center small text-weight-bold
text-h6"
v-if=
"type
"
>
试听开课
</p>
<div
class=
"row wrap"
>
<div
class=
"row wrap"
>
<div
style=
"width:100%;margin-bottom:15px;"
>
试听时间:
<span
style=
"color:red;"
>
{{
timeFormatSeconds
(
setClassMsg
.
ReservationDate
)
}}
</span></div>
<div
style=
"width:100%;margin-bottom:15px;"
>
试听时间:
<span
style=
"color:red;"
>
{{
timeFormatSeconds
(
setClassMsg
.
ReservationDate
)
}}
</span></div>
<div
style=
"width:100%;margin-bottom:15px;"
>
试听需求:
<span
style=
"color:red;"
>
{{
setClassMsg
.
Demand
}}
</span></div>
<div
style=
"width:100%;margin-bottom:15px;"
>
试听需求:
<span
style=
"color:red;"
>
{{
setClassMsg
.
Demand
}}
</span></div>
</div>
</div>
<q-card
class=
"bg-white q-pa-md"
flat
>
<div
class=
"row studentDate"
>
<div
class=
"row studentDate"
>
<q-field
filled
dense
<q-field
filled
dense
:class=
"[typ
e?'col-12 q-pb-sm':'col-6 q-pr-lg q-pb-lg']"
>
:class=
"[$q.platform.is.mobil
e?'col-12 q-pb-sm':'col-6 q-pr-lg q-pb-lg']"
>
<template
v-slot:control
>
<template
v-slot:control
>
<el-date-picker
v-model=
"setClassMsg.ClassDate"
ref=
"ClassDate"
:rules=
"[val => !!val || '请选择预约日期']"
<el-date-picker
v-model=
"setClassMsg.ClassDate"
ref=
"ClassDate"
:rules=
"[val => !!val || '请选择预约日期']"
style=
"width:100%"
size=
"mini"
type=
"date"
placeholder=
"预约日期"
value-format=
"yyyy-MM-dd"
>
style=
"width:100%"
size=
"mini"
type=
"date"
placeholder=
"预约日期"
value-format=
"yyyy-MM-dd"
>
...
@@ -21,17 +22,17 @@
...
@@ -21,17 +22,17 @@
</
template
>
</
template
>
</q-field>
</q-field>
<div
class=
"Student_Date "
<div
class=
"Student_Date "
:class=
"[typ
e?'col-12 q-pb-sm':'col-6 q-pr-lg q-pb-lg']"
>
:class=
"[$q.platform.is.mobil
e?'col-12 q-pb-sm':'col-6 q-pr-lg q-pb-lg']"
>
<q-field
filled
class=
""
dense
>
<q-field
filled
class=
""
dense
>
<
template
v-slot:control
>
<
template
v-slot:control
>
<el-time-select
v-model=
"setClassMsg.ClassTime"
size=
"mini"
ref=
"ClassTime"
style=
"width:50%
"
:picker-options=
"
{
<el-time-select
v-model=
"setClassMsg.ClassTime"
size=
"mini"
ref=
"ClassTime"
style=
"width:49%;margin-right: 1%;
"
:picker-options=
"
{
start: '09:00',
start: '09:00',
step: '00:15',
step: '00:15',
end: '21:00',
end: '21:00',
maxTime: setClassMsg.EndTime
maxTime: setClassMsg.EndTime
}" placeholder="预约开始时间">
}" placeholder="预约开始时间">
</el-time-select>
</el-time-select>
<el-time-select
v-model=
"setClassMsg.EndTime"
size=
"mini"
dense
ref=
"EndTime"
style=
"width:50%
"
<el-time-select
v-model=
"setClassMsg.EndTime"
size=
"mini"
dense
ref=
"EndTime"
style=
"width:49%;margin-left: 1%;
"
:picker-options=
"
{
:picker-options=
"
{
start: '09:00',
start: '09:00',
step: '00:15',
step: '00:15',
...
@@ -46,21 +47,23 @@
...
@@ -46,21 +47,23 @@
<div
class=
"row wrap"
>
<div
class=
"row wrap"
>
<q-select
filled
stack-label
option-value=
"TId"
option-label=
"TeacherName"
v-model=
"setClassMsg.TeacherId"
<q-select
filled
stack-label
option-value=
"TId"
option-label=
"TeacherName"
v-model=
"setClassMsg.TeacherId"
ref=
"TeacherId"
:options=
"TeacherList"
label=
"选择教师"
dense
class=
"col-6"
ref=
"TeacherId"
:options=
"TeacherList"
label=
"选择教师"
dense
class=
"col-6"
:class=
"[typ
e?'q-pr-sm q-pb-sm':'q-pr-lg q-pb-lg']"
emit-value
:class=
"[$q.platform.is.mobil
e?'q-pr-sm q-pb-sm':'q-pr-lg q-pb-lg']"
emit-value
map-options
/>
map-options
/>
<q-select
filled
stack-label
option-value=
"RoomId"
dense
option-label=
"RoomName"
v-model=
"setClassMsg.ClassRoomId"
<q-select
filled
stack-label
option-value=
"RoomId"
dense
option-label=
"RoomName"
v-model=
"setClassMsg.ClassRoomId"
ref=
"ClassRoomId"
:options=
"ClassRoomList"
label=
"关联教室"
class=
"col-6"
ref=
"ClassRoomId"
:options=
"ClassRoomList"
label=
"关联教室"
class=
"col-6"
:class=
"[typ
e?'q-pl-sm q-pb-sm':'q-pr-lg q-pb-lg']"
emit-value
:class=
"[$q.platform.is.mobil
e?'q-pl-sm q-pb-sm':'q-pr-lg q-pb-lg']"
emit-value
map-options
/>
map-options
/>
<q-select
filled
stack-label
option-value=
"Id"
dense
option-label=
"LessonName"
v-model=
"setClassMsg.TrialLessonId"
<q-select
filled
stack-label
option-value=
"Id"
dense
option-label=
"LessonName"
v-model=
"setClassMsg.TrialLessonId"
:options=
"TrialList"
label=
"试听课程"
class=
"col-6"
:options=
"TrialList"
label=
"试听课程"
class=
"col-6"
:class=
"[typ
e?'q-pr-sm':'q-pr-lg q-pb-lg']"
emit-value
map-options
/>
:class=
"[$q.platform.is.mobil
e?'q-pr-sm':'q-pr-lg q-pb-lg']"
emit-value
map-options
/>
</div>
</div>
</q-card>
<div
slot=
"footer"
class=
"dialog-footer"
<div
slot=
"footer"
class=
"dialog-footer"
:class=
"[
typ
e?'text-center q-pt-lg row':'text-right q-pb-lg']"
>
:class=
"[
$q.platform.is.mobil
e?'text-center q-pt-lg row':'text-right q-pb-lg']"
>
<el-button
v-if=
"!
typ
e"
@
click=
"closeShitingKaiKe()"
>
取 消
</el-button>
<el-button
v-if=
"!
$q.platform.is.mobil
e"
@
click=
"closeShitingKaiKe()"
>
取 消
</el-button>
<el-button
type=
"primary"
@
click=
"SetVisitorReserveClass()"
<el-button
type=
"primary"
@
click=
"SetVisitorReserveClass()"
:class=
"[
typ
e?'col-12':'']"
>
确 定
</el-button>
:class=
"[
$q.platform.is.mobil
e?'col-12':'']"
>
确 定
</el-button>
</div>
</div>
<statusPrompt
v-if=
"isSuccess"
:isSuccess=
"isSuccess"
:isSuccessTitle=
"isSuccessTitle"
></statusPrompt>
<statusPrompt
v-if=
"isSuccess"
:isSuccess=
"isSuccess"
:isSuccessTitle=
"isSuccessTitle"
></statusPrompt>
</div>
</div>
...
@@ -214,6 +217,10 @@
...
@@ -214,6 +217,10 @@
}
}
SetVisitorReserveClass
(
this
.
setClassMsg
).
then
(
res
=>
{
SetVisitorReserveClass
(
this
.
setClassMsg
).
then
(
res
=>
{
if
(
res
.
Code
==
1
)
{
if
(
res
.
Code
==
1
)
{
if
(
this
.
type
){
this
.
isSuccess
=
true
this
.
isSuccessTitle
=
'试听课开课成功!'
}
else
{
this
.
$q
.
notify
({
this
.
$q
.
notify
({
icon
:
"iconfont icon-chenggong"
,
icon
:
"iconfont icon-chenggong"
,
color
:
"accent"
,
color
:
"accent"
,
...
@@ -221,9 +228,6 @@
...
@@ -221,9 +228,6 @@
message
:
res
.
Message
,
message
:
res
.
Message
,
position
:
"top"
position
:
"top"
});
});
if
(
this
.
type
){
this
.
isSuccess
=
true
this
.
isSuccessTitle
=
'试听课开课成功!'
}
}
this
.
$emit
(
"success"
);
this
.
$emit
(
"success"
);
}
else
{
}
else
{
...
...
src/pages/sale/reserveClassStudent.vue
View file @
16c8c268
...
@@ -6,10 +6,13 @@
...
@@ -6,10 +6,13 @@
</
style
>
</
style
>
<
template
>
<
template
>
<div
class=
"page-body"
>
<div
class=
"page-body"
>
<div
class=
"page-search row items-center"
>
<div
class=
"page-search"
<div
class=
"col row wrap q-mr-lg q-col-gutter-md"
>
:class=
"[$q.platform.is.desktop?'row items-center':'']"
>
<div
class=
"col-3"
>
<div
class=
"col row wrap q-col-gutter-md"
<div
class=
"col-4 Sysuser_Date"
>
:class=
"[$q.platform.is.desktop?'q-mr-lg':'']"
>
<div
:class=
"[$q.platform.is.desktop?'col-3':'col-12']"
>
<div
class=
"Sysuser_Date"
>
<q-field
filled
>
<q-field
filled
>
<template
v-slot:control
>
<template
v-slot:control
>
<el-date-picker
v-model=
"msg.StartClassDate"
value-format=
"yyyy-MM-dd"
type=
"date"
placeholder=
"开始时间"
<el-date-picker
v-model=
"msg.StartClassDate"
value-format=
"yyyy-MM-dd"
type=
"date"
placeholder=
"开始时间"
...
@@ -38,6 +41,21 @@
...
@@ -38,6 +41,21 @@
</div>
</div>
</div>
</div>
<reservelist
:data=
"dataList"
:authObj=
"authObj"
:loading=
"loading"
@
success=
"refreshPage"
></reservelist>
<reservelist
:data=
"dataList"
:authObj=
"authObj"
:loading=
"loading"
@
success=
"refreshPage"
></reservelist>
<q-card
class=
"light-shadow q-pa-md bg-white rounded-borders q-mb-md"
v-if=
"msg.pageCount > 0"
flat
>
<q-pagination
v-if=
"$q.platform.is.mobile"
class=
"full-width justify-end"
v-model=
"msg.pageIndex"
color=
"primary"
:max=
"msg.pageCount"
:input=
"true"
@
update:model-value=
"changePageHandler"
/>
</q-card>
<q-pagination
class=
"full-width justify-end"
v-model=
"msg.pageIndex"
color=
"primary"
:max=
"PageCount"
:input=
"true"
<q-pagination
class=
"full-width justify-end"
v-model=
"msg.pageIndex"
color=
"primary"
:max=
"PageCount"
:input=
"true"
@
input=
"changePage"
/>
@
input=
"changePage"
/>
</div>
</div>
...
@@ -106,6 +124,10 @@
...
@@ -106,6 +124,10 @@
this
.
getList
()
this
.
getList
()
},
},
methods
:
{
methods
:
{
changePageHandler
(
n
)
{
this
.
msg
.
pageIndex
=
n
;
this
.
getList
();
},
//重新查询
//重新查询
resetSearch
()
{
resetSearch
()
{
this
.
msg
.
pageIndex
=
1
;
this
.
msg
.
pageIndex
=
1
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment